Changed hardcoded trans days in inquiries (30) to be a user preference.

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

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index ff37813a64fbe31518d9e62e3a6441014ef965b9..25d804fd5bf572ef14d0cdb3e779ff2e62545cd0 100644 (file)
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -87,6 +87,7 @@ if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) {
 }
 
 page($_SESSION['page_title'], false, false, "", $js);
+
 //-----------------------------------------------------------------------------
 
 if (list_updated('branch_id')) {
@@ -252,8 +253,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 +261,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'];
@@ -344,7 +343,7 @@ function can_process() {
                return false;
        }
        if ($_SESSION['Items']->trans_type!=ST_SALESORDER && $_SESSION['Items']->trans_type!=ST_SALESQUOTE && !is_date_in_fiscalyear($_POST['OrderDate'])) {
-               display_error(_("The entered date is not in fiscal year"));
+               display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
                set_focus('OrderDate');
                return false;
        }
@@ -429,6 +428,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');