Fixed location changes in Direct Invoice.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ecbb01a5d312b2e9996394187bc1dafde4f523ee..5723698aebd127d73843ae61db28c8f58edf750b 100644 (file)
--- 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 7ececedb4e6aeb5f93940ab71dcc01b13a3711ac..370894df2d86ff3e993039c2ef0e4d5ffd3bed23 100644 (file)
--- 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 63ff122c0f1459f6c6aceefe9d3c97c80b3a5cb0..856c5a235c1c457a0835f2341de4209a1a146bef 100644 (file)
--- 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'];