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 08e8e7d6bd67b267c43ce204479f60f1bb627636..60ba5def06fef3a04777098b255db7d39500353a 100644 (file)
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -237,17 +237,23 @@ function copy_to_cart()
        $cart->Comments =  $_POST['Comments'];
 
        $cart->document_date = $_POST['OrderDate'];
-//     if ($cart->trans_type == ST_SALESINVOICE) {
+
+       $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 = '';//$_POST['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'];
@@ -265,11 +271,11 @@ function copy_to_cart()
        $cart->customer_id      = $_POST['customer_id'];
        $cart->Branch = $_POST['branch_id'];
        $cart->sales_type = $_POST['sales_type'];
-       // POS
+
        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'];
-       }       
+       }
 }
 
 //-----------------------------------------------------------------------------
@@ -354,7 +360,7 @@ function can_process() {
        }
 
 
-               if (strlen($_POST['delivery_address']) <= 1) {
+               if ($_SESSION['Items']->trans_type != ST_SALESQUOTE && strlen($_POST['delivery_address']) <= 1) {
                        display_error( _("You should enter the street address in the box provided. Orders cannot be accepted without a valid street address."));
                        set_focus('delivery_address');
                        return false;
@@ -587,11 +593,7 @@ function create_cart($type, $trans_no)
        if (isset($_GET['NewQuoteToSalesOrder']))
        {
                $trans_no = $_GET['NewQuoteToSalesOrder'];
-               $doc = new Cart(ST_SALESQUOTE, $trans_no);
-               $doc->trans_no = 0;
-               $doc->trans_type = ST_SALESORDER;
-               $doc->reference = $Refs->get_next($doc->trans_type);
-               $doc->document_date = $doc->due_date = new_doc_date();
+               $doc = new Cart(ST_SALESQUOTE, $trans_no, true);
                $doc->Comments = _("Sales Quotation") . " # " . $trans_no;
                $_SESSION['Items'] = $doc;
        }