Fixed regression in cash invoice entry (location change ignored)

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index 370894df2d86ff3e993039c2ef0e4d5ffd3bed23..efe856f243415a4a2e1974ce2b71b691d07c04ce 100644 (file)
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -410,7 +410,7 @@ function display_order_header(&$order, $editable, $date_text)
        }
 
        if($editable) {
-               $str = sales_types_list_row(_("Price List"), 'sales_type', null, true);
+               $str = sales_types_list_row(_("Price List:"), 'sales_type', null, true);
        } else {
                label_row(_("Price List:"), $order->sales_type_name);
        }

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index ff37813a64fbe31518d9e62e3a6441014ef965b9..fd9723dfe6841dc5695e4be418563529014ebb9e 100644 (file)
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -252,8 +252,6 @@ function copy_to_cart()
                        $cart->phone = $cart->cust_ref = $cart->delivery_address = '';
                        $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'];
@@ -262,8 +260,8 @@ function copy_to_cart()
                $cart->delivery_address = $_POST['delivery_address'];
                $cart->phone = $_POST['phone'];
                $cart->ship_via = $_POST['ship_via'];
-               $cart->Location = $_POST['Location'];
        }
+       $cart->Location = $_POST['Location'];
        $cart->freight_cost = input_num('freight_cost');
        if (isset($_POST['email']))
                $cart->email =$_POST['email'];
@@ -429,6 +427,7 @@ if (isset($_POST['ProcessOrder']) && can_process()) {
        copy_to_cart();
        $modified = ($_SESSION['Items']->trans_no != 0);
        $so_type = $_SESSION['Items']->so_type;
+       
        $_SESSION['Items']->write(1);
        if (count($messages)) { // abort on failure or error messages are lost
                $Ajax->activate('_page_body');