From 92a9f7c091c4833930a94db8249dc180ffea37c9 Mon Sep 17 00:00:00 2001
From: Janusz Dobrowolski <janusz@frontaccouting.eu>
Date: Fri, 18 Feb 2011 17:11:54 +0100
Subject: [PATCH] Fixed location changes in Direct Invoice.

---
 CHANGELOG.txt                        | 5 +++++
 sales/includes/ui/sales_order_ui.inc | 2 ++
 sales/sales_order_entry.php          | 8 ++++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ecbb01a5..5723698a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+18-Feb-2011 Joe Hunt
+# When changing Location in Direct Cash Invoice The first Location is always chosen.
+$ /sales/includes/ui/sales_order_ui.inc
+  /sales/sales_order_entry.php
+
 ------------------------------- Release 2.3.2 ------------------------------------
 14-Feb-2011 Joe Hunt
 ! Release 2.3.2
diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index 7ececedb..370894df 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -583,6 +583,8 @@ function display_delivery_details(&$order)
 		start_table(TABLESTYLE2, "width=60%");
 
 		locations_list_row(_("Deliver from Location:"), 'Location', null, false, true);
+ 		if (list_updated('Location'))
+ 			$Ajax->activate('items_table');
 		label_row(_("Cash account:"), $order->pos['bank_account_name']);
 		textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5);
 		end_table();
diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 63ff122c..856c5a23 100644
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -238,16 +238,20 @@ function copy_to_cart()
 
 	$cart->document_date = $_POST['OrderDate'];
 
+	$newpayment = false;
 	if (isset($_POST['payment']) && ($cart->payment != $_POST['payment'])) {
 		$cart->payment = $_POST['payment'];
 		$cart->payment_terms = get_payment_terms($_POST['payment']);
+		$newpayment = true;
 	}
-	if ($cart->payment_terms['cash_sale']) {
+	if ($newpayment && $cart->payment_terms['cash_sale']) {
 		$cart->due_date = $cart->document_date;
 		$cart->phone = $cart->cust_ref = $cart->delivery_address = '';
 		$cart->freight_cost = input_num('freight_cost');
 		$cart->ship_via = 1;
 		$cart->deliver_to = '';
+		$cart->Location = $cart->pos['pos_location'];
+		$cart->location_name = $cart->pos['location_name'];
 	} else {
 		$cart->due_date = $_POST['delivery_date'];
 		$cart->cust_ref = $_POST['cust_ref'];
@@ -255,8 +259,8 @@ function copy_to_cart()
 		$cart->deliver_to = $_POST['deliver_to'];
 		$cart->delivery_address = $_POST['delivery_address'];
 		$cart->phone = $_POST['phone'];
-		$cart->Location = $_POST['Location'];
 		$cart->ship_via = $_POST['ship_via'];
+		$cart->Location = $_POST['Location'];
 	}
 	if (isset($_POST['email']))
 		$cart->email =$_POST['email'];
-- 
2.30.2