From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Mon, 10 Nov 2008 22:31:21 +0000 (+0000)
Subject: Fixed page update after customer/branch change.
X-Git-Tag: v2.4.2~19^2~1769
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=26f7d5bdd85e7717436e3dcb67c9a6be1fe20e15;p=fa-stable.git

Fixed page update after customer/branch change.
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 267c7706..0a162c86 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -28,8 +28,8 @@ $ /admin/db/maintenance_db.inc
 $ /gl/manage/bank_accounts.php
 # Fixed for MySQL <4.0.18, removed bank_trans_types
 $ /sql/alter2.1.sql
-# Fixed hangups on ajax update of nonexistent element.
-$ /js/utils.js
+# Fixed page update after branch/customer change.
+$ /sales/includes/ui/sales_order_ui.inc
 
 10-Nov-2008 Joe Hunt
 ! changing the default.css style sheets to handle the new navibar/buttons
diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index ae2bd964..49cc8b73 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -211,17 +211,21 @@ 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;
-				$_POST['cash'] = $order->cash;
-				if ($order->trans_type == 10)
-				{
-					$_POST['delivery_date'] = $order->due_date;
-					$Ajax->activate('delivery_date');
+				if (get_post('cash') !== $order->cash) {
+					$_POST['cash'] = $order->cash;
+					$Ajax->activate('delivery');
+					$Ajax->activate('cash');
+				} else {
+					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');
+					$Ajax->activate('delivery_address');
 				}
-				$Ajax->activate('Location');
-				$Ajax->activate('deliver_to');
-				$Ajax->activate('phone');
-				$Ajax->activate('delivery_address');
-				$Ajax->activate('cash');
 				// change prices if necessary
 				// what about discount in template case?
 				if ($old_order->customer_currency != $order->customer_currency) {