From 5df81a74c67c228f64e9b4747dcbcb5936a053b6 Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Tue, 5 Apr 2022 20:50:19 +0200
Subject: [PATCH] Fixed QU conversion form from_qu_id initialisation (fixes
 #1843)

---
 views/quantityunitconversionform.blade.php | 30 +++++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/views/quantityunitconversionform.blade.php b/views/quantityunitconversionform.blade.php
index 025c2886..986db8e1 100644
--- a/views/quantityunitconversionform.blade.php
+++ b/views/quantityunitconversionform.blade.php
@@ -56,10 +56,32 @@
 					name="from_qu_id">
 					<option></option>
 					@foreach($quantityunits as $quantityunit)
-					<option @if(($product
-						!=null
-						&&
-						$quantityunit->id == $product->qu_id_stock) || ($defaultQuUnit != null && $quantityunit->id == $defaultQuUnit->id))) selected="selected" @endif value="{{ $quantityunit->id }}" data-plural-form="{{ $quantityunit->name_plural }}">{{ $quantityunit->name }}</option>
+					@php
+					$selected = false;
+					if ($mode == 'edit' && $quantityunit->id == $quConversion->from_qu_id)
+					{
+					$selected = true;
+					}
+					else
+					{
+					if ($product != null && $quantityunit->id == $product->qu_id_stock)
+					{
+					$selected = true;
+					}
+					else
+					{
+					if ($quantityunit->id == $defaultQuUnit->id)
+					{
+					$selected = true;
+					}
+					}
+					}
+					@endphp
+					<option @if($selected)
+						selected="selected"
+						@endif
+						value="{{ $quantityunit->id }}"
+						data-plural-form="{{ $quantityunit->name_plural }}">{{ $quantityunit->name }}</option>
 					@endforeach
 				</select>
 				<div class="invalid-feedback">{{ $__t('A quantity unit is required') }}</div>