Merging changes up to 2.0.4

[fa-stable.git] / sales / includes / ui / sales_order_ui.inc

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index e2c004abb09d44221551079a7a8d06d6ac4b960b..2b2b028465ea5d045677f52ec424a38fa8f3bd29 100644 (file)
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -182,6 +182,10 @@ 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)) ||
+                       ($order->Branch != get_post('branch_id', -1)) ||
+                       list_updated('customer_id')) {
+
                if (!isset($_POST['branch_id']) || $_POST['branch_id'] == "")
                {
                        // ignore errors on customer search box call
@@ -193,8 +197,6 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
                    $order->Branch = 0;
                } else
                {
-               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']);
@@ -225,8 +227,8 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
                                }
                                unset($old_order);
                        }
-               } // changed branch
                set_global_customer($_POST['customer_id']);
+               } // changed branch
        }
 
        if ($_SESSION['Items']->trans_type!=30) {