X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=4df319c7641413d2a10dd6657f4b8e33d218985b;hb=f58466eea31b624deacaf5e5cd4b9de7995e0373;hp=f19b3cb6f6f9a96dc433f0ec6dcfaa40f8521eaa;hpb=5dec41f0d87e407e1c9ffcb8eb63b92e4e471a9b;p=fa-stable.git

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index f19b3cb6..4df319c7 100644
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -28,15 +28,6 @@ include_once($path_to_root . "/sales/includes/db/sales_types_db.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 $js = '';
 
-editor_redirect( array(
-	'customer_id' => $path_to_root.'/sales/manage/customers.php?debtor_no='.get_post('customer_id'),
-	'branch_id' => $path_to_root.'/sales/manage/customer_branches.php?branch_id='.get_post('branch_id'),
-	));
-
-editor_return( array(
-	'customer_id'=>'customer_id',
-	'branch_id'=>'branch_id'));
-
 if ($use_popup_windows) {
 	$js .= get_js_open_window(900, 500);
 }
@@ -70,6 +61,13 @@ if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) {
 page($_SESSION['page_title'], false, false, "", $js);
 //-----------------------------------------------------------------------------
 
+if (list_updated('branch_id')) {
+	// when branch is selected via external editor also customer can change
+	$br = get_branch(get_post('branch_id'));
+	$_POST['customer_id'] = $br['debtor_no'];
+	$Ajax->activate('customer_id');
+}
+
 if (isset($_GET['AddedID'])) {
 	$order_no = $_GET['AddedID'];
 	display_notification_centered(sprintf( _("Order # %d has been entered."),$order_no));