X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=1980f9f7f81cbb7eeb66202e709858abbf16b973;hb=40a86b30aa459c05925c41d55bbeff2c293a7ce5;hp=f2dd4af50800e2cccff408bdb87e0e17a1dec78c;hpb=fd069bba86276f15311ff6ab10b22d4a06a55513;p=fa-stable.git

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index f2dd4af5..1980f9f7 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -502,13 +502,14 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
 		if ($order->fixed_asset)
 			stock_disposable_fa_list_cells(null,'stock_id', null, _('[Select item]'), true, $order->line_items);
 		else
-			sales_items_list_cells(null,'stock_id', null, false, true, true);
 		if (list_updated('stock_id')) {
-			    $Ajax->activate('price');
-			    $Ajax->activate('units');
-			    $Ajax->activate('qty');
-			    $Ajax->activate('line_total');
-		}
+            sales_items_list_cells(null,'stock_id', null, false, true, true);
+		    $Ajax->activate('price');
+		    $Ajax->activate('units');
+		    $Ajax->activate('qty');
+		    $Ajax->activate('line_total');
+		} else
+			 sales_items_list_cells(null,'stock_id', last_sales_order_detail($order, 'stk_code'), false, true, true);
 
 		$item_info = get_item_edit_info($_POST['stock_id']);
 		$units = $item_info["units"];
@@ -607,7 +608,7 @@ function display_delivery_details(&$order)
 		table_section(1);
 
 		locations_list_row(_("Deliver from Location:"), 'Location', null, false, true, $order->fixed_asset);
-		if ($order->payment_terms['days_before_due'] < 0)
+		if ($order->payment_terms['days_before_due'] == -1)
 		{
 			$Ajax->addUpdate('items_table', 'prep_amount', price_format($order->get_trans_total())); // bind to items_table update
 			if (!$order->is_started())