X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=3950e133273704262df9f8ee00ef64c3b4ca3a5d;hb=a4db318fa0c84e099e0970ca82e36215782d661e;hp=5ef26f8cad0e7b3386da24c41a4cf16b772416f4;hpb=504553e5263bbf486ef2900dd0d8442d1bb32f9d;p=fa-stable.git

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index 5ef26f8c..3950e133 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -245,25 +245,27 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 		customer_branches_list_row(_("Branch:"),
 	  	  $_POST['customer_id'], 'branch_id', null, false, true, true);
 
-	if( ($order->customer_id != get_post('customer_id', -1)) ||
+		if( ($order->customer_id != get_post('customer_id', -1)) ||
 			($order->Branch != get_post('branch_id', -1)) ||
-			list_updated('customer_id')) {
-
-		if (!isset($_POST['branch_id']) || $_POST['branch_id'] == "")
+			list_updated('customer_id')) 
 		{
-			// ignore errors on customer search box call
-			if ($_POST['customer_id'] == '')
-			    $customer_error = _("No customer found for entered text.");
+
+			if (!isset($_POST['branch_id']) || $_POST['branch_id'] == "")
+			{
+				// ignore errors on customer search box call
+				if ($_POST['customer_id'] == '')
+					$customer_error = _("No customer found for entered text.");
+				else
+					$customer_error = _("The selected customer does not have any branches. Please create at least one branch.");
+				unset($_POST['branch_id']);
+				$order->Branch = 0;
+			} 
 			else
-			    $customer_error = _("The selected customer does not have any branches. Please create at least one branch.");
-		    unset($_POST['branch_id']);
-		    $order->Branch = 0;
-		} else
-		{
+			{
 
 				$old_order = (PHP_VERSION<5) ? $order : clone( $order );
-				$customer_error = get_customer_details_to_order($order, $_POST['customer_id'], $_POST['branch_id']);
 
+				$customer_error = get_customer_details_to_order($order, $_POST['customer_id'], $_POST['branch_id']);
 				$_POST['Location'] = $order->Location;
 				$_POST['deliver_to'] = $order->deliver_to;
 				$_POST['delivery_address'] = $order->delivery_address;
@@ -286,13 +288,13 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 				// change prices if necessary
 				// what about discount in template case?
 				if ($old_order->customer_currency != $order->customer_currency) {
-				    $change_prices = 1;
+					$change_prices = 1;
 				}
 				if ($old_order->sales_type != $order->sales_type) {
 				//  || $old_order->default_discount!=$order->default_discount
 					$_POST['sales_type'] = $order->sales_type;
-				    $Ajax->activate('sales_type');
-				    $change_prices = 1;
+					$Ajax->activate('sales_type');
+					$change_prices = 1;
 				}
 				if ($old_order->dimension_id != $order->dimension_id) {
 					$_POST['dimension_id'] = $order->dimension_id;
@@ -304,8 +306,15 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 				}
 				unset($old_order);
 			}
-		set_global_customer($_POST['customer_id']);
+			set_global_customer($_POST['customer_id']);
 		} // changed branch
+		else
+		{
+			$row = get_customer_to_order($_POST['customer_id']);
+			if ($row['dissallow_invoices'] == 1)
+				$customer_error = _("The selected customer account is currently on hold. Please contact the credit control personnel to discuss.");
+		
+		}
 	}
 
 	if ($order->trans_type != 30) {