Fixed regresion in cash sales invoice.

[fa-stable.git] / sales / sales_order_entry.php

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 63ff122c0f1459f6c6aceefe9d3c97c80b3a5cb0..60ba5def06fef3a04777098b255db7d39500353a 100644 (file)
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -238,16 +238,22 @@ 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']) {
-               $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 = '';
+               if ($newpayment) {
+                       $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 +261,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'];
@@ -269,7 +275,7 @@ function copy_to_cart()
        if ($cart->trans_type!=ST_SALESORDER && $cart->trans_type!=ST_SALESQUOTE) { // 2008-11-12 Joe Hunt
                $cart->dimension_id = $_POST['dimension_id'];
                $cart->dimension2_id = $_POST['dimension2_id'];
-       }       
+       }
 }
 
 //-----------------------------------------------------------------------------