X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=1df65425ab1da1f74faceeb4e8e1448c7416bdae;hb=c935a4090e3f152dd5549217d69b5b5036197024;hp=bf08381ce1949b836e7eff5dffa8d8f7ae1f2142;hpb=1ccb5999a69a19289b6ef53e0501913c4754747b;p=fa-stable.git

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index bf08381c..1df65425 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -159,8 +159,6 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 
 	$customer_error = "";
 	$change_prices = 0;
-	$newcust = ($order->customer_id != get_post('customer_id', -1));
-	$newbranch = ($order->Branch != get_post('branch_id', -1)) || $newcust;
 
 	if (isset($order) && !$editable)
 	{
@@ -174,7 +172,7 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 	{
 		customer_list_row(_("Customer:"), 'customer_id', null, false, true);
 
-		if ($newcust)
+		if ($order->customer_id != get_post('customer_id', -1))
 		{
 			// customer has changed
 			// clear the branch selection
@@ -195,7 +193,9 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 		    $order->Branch = 0;
 		} else
 		{
-			if($newcust || $newbranch) {
+		if( ($order->customer_id != get_post('customer_id', -1)) ||
+			($order->Branch != get_post('branch_id', -1))) {
+
 				$old_order = (PHP_VERSION<5) ? $order : clone( $order );
 				$customer_error = get_customer_details_to_order($order, $_POST['customer_id'], $_POST['branch_id']);