X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=3b0489e352e8000db7a3b8a48be480d78602c117;hb=cf015790b7363cfcf29b98c82d20787c8d703fc1;hp=fa628d91331ce7ce3d26c85379fbeb14f40fc6a5;hpb=6e349a924dd02e35d94555807d34b25e4427ab6e;p=fa-stable.git

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index fa628d91..3b0489e3 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -62,6 +62,8 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
 		$order->set_location($myrow["default_location"], $myrow["location_name"]);
 		$order->set_delivery($myrow["default_ship_via"], $myrow["br_name"],
 		$address);
+		if ($order->trans_type == 10)
+			$order->due_date = get_invoice_duedate($customer_id, $order->document_date);
 	}
 
 	return $ret_error;
@@ -203,6 +205,11 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 				$_POST['deliver_to'] = $order->deliver_to;
 				$_POST['delivery_address'] = $order->delivery_address;
 				$_POST['phone'] = $order->phone;
+				if ($order->trans_type == 10)
+				{
+					$_POST['delivery_date'] = $order->due_date;
+					$Ajax->activate('delivery_date');
+				}
 				$Ajax->activate('Location');
 				$Ajax->activate('deliver_to');
 				$Ajax->activate('phone');
@@ -331,6 +338,7 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
 		if(isset($_POST['_stock_id_update'])) {
 			    $Ajax->activate('price');
 			    $Ajax->activate('units');
+			    $Ajax->activate('qty');
 			    $Ajax->activate('line_total');
 		}
 
@@ -371,7 +379,6 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
 				_('Cancel changes'));
 		hidden('LineNo', $line_no);
 		set_focus('qty');
-		$Ajax->addFocus(true, 'qty');
 	}
 	else
 	{