Made an improment to the date picker. Shows the week number as well. Many delivery...

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

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 39a90fe5d808c4fc6d3408ad96afcac9d95e1726..25d381a4004561b7b8916f48b0f328e8a0e9fa78 100644 (file)
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -11,14 +11,13 @@ $path_to_root="..";
 
 include_once($path_to_root . "/sales/includes/cart_class.inc");
 include_once($path_to_root . "/includes/session.inc");
-include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/sales/includes/sales_ui.inc");
 include_once($path_to_root . "/sales/includes/ui/sales_order_ui.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 include_once($path_to_root . "/sales/includes/db/sales_types_db.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
-$js = get_js_form_entry("StockID2", "stock_id", "qty");
+$js = '';
 if ($use_popup_windows) {
        $js .= get_js_open_window(900, 500);
 }
@@ -136,7 +135,7 @@ function copy_to_cart()
        if ($cart->trans_type!=30) {
                $cart->reference = $_POST['ref'];
        }
-       $cart->Comments =  str_replace("'", "\\'", $_POST['Comments']);
+       $cart->Comments =  $_POST['Comments'];
 
        $cart->document_date = $_POST['OrderDate'];
        $cart->due_date = $_POST['delivery_date'];
@@ -182,28 +181,37 @@ function copy_from_cart()
        $_POST['branch_id'] = $cart->Branch;
        $_POST['sales_type'] = $cart->sales_type;
 }
+//--------------------------------------------------------------------------------
 
+function line_start_focus() {
+  set_focus(get_company_pref('no_supplier_list') ? 'stock_id_edit' : 'StockID2');
+}
 //--------------------------------------------------------------------------------
 
 function can_process() {
        if (!is_date($_POST['OrderDate'])) {
                display_error(_("The entered date is invalid."));
+               set_focus('OrderDate');
                return false;
        }
        if ($_SESSION['Items']->trans_type!=30 && !is_date_in_fiscalyear($_POST['OrderDate'])) {
                display_error(_("The entered date is not in fiscal year"));
+               set_focus('OrderDate');
                return false;
        }
        if (count($_SESSION['Items']->line_items) == 0) {
                display_error(_("You must enter at least one non empty item line."));
+               set_focus('AddItem');
                return false;
        }
        if (strlen($_POST['deliver_to']) <= 1) {
                display_error(_("You must enter the person or company to whom delivery should be made to."));
+               set_focus('deliver_to');
                return false;
        }
        if (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;
        }
 
@@ -212,18 +220,22 @@ function can_process() {
 
        if (!check_num('freight_cost',0)) {
                display_error(_("The shipping cost entered is expected to be numeric."));
+               set_focus('freight_cost');
                return false;
        }
        if (!is_date($_POST['delivery_date'])) {
                display_error(_("The delivery date is invalid."));
+               set_focus('delivery_date');
                return false;
        }
        if (date1_greater_date2($_SESSION['Items']->document_date, $_POST['delivery_date'])) {
                display_error(_("The requested delivery date is before the date of the order."));
+               set_focus('delivery_date');
                return false;
        }
        if ($_SESSION['Items']->trans_type != 30 && !references::is_valid($_POST['ref'])) {
                display_error(_("You must enter a reference."));
+               set_focus('ref');
                return false;
        }
 
@@ -262,13 +274,16 @@ function check_item_data()
 
        if (!check_num('qty', 0) || !check_num('Disc', 0, 100)) {
                display_error( _("The item could not be updated because you are attempting to set the quantity ordered to less than 0, or the discount percent to more than 100."));
+               set_focus('qty');
                return false;
        } elseif (!check_num('price', 0)) {
                display_error( _("Price for item must be entered and can not be less than 0"));
+               set_focus('price');
                return false;
        } elseif (isset($_POST['LineNo']) && isset($_SESSION['Items']->line_items[$_POST['LineNo']])
            && !check_num('qty', $_SESSION['Items']->line_items[$_POST['LineNo']]->qty_done)) {
 
+               set_focus('qty');
                display_error(_("You attempting to make the quantity ordered a quantity less than has already been delivered. The quantity delivered cannot be modified retrospectively."));
                return false;
        }
@@ -285,20 +300,19 @@ function handle_update_item()
                 input_num('Disc') / 100 );
        }
   copy_from_cart();
+  line_start_focus();
 }
 
 //--------------------------------------------------------------------------------
 
-function handle_delete_item()
+function handle_delete_item($line_no)
 {
-       if ($_GET['Delete'] != ""){
-               $line_no = $_GET['Delete'];
-               if ($_SESSION['Items']->some_already_delivered($line_no) == 0) {
-                       $_SESSION['Items']->remove_from_cart($line_no);
-               } else {
-                       display_error(_("This item cannot be deleted because some of it has already been delivered."));
-               }
-       }
+    if ($_SESSION['Items']->some_already_delivered($line_no) == 0) {
+       $_SESSION['Items']->remove_from_cart($line_no);
+    } else {
+       display_error(_("This item cannot be deleted because some of it has already been delivered."));
+    }
+    line_start_focus();
 }
 
 //--------------------------------------------------------------------------------
@@ -312,6 +326,7 @@ function handle_new_item()
                input_num('price'), input_num('Disc') / 100);
 
        $_POST['StockID2'] = $_POST['stock_id'] = "";
+       line_start_focus();
 }
 
 //--------------------------------------------------------------------------------
@@ -381,14 +396,15 @@ function create_cart($type, $trans_no)
 //--------------------------------------------------------------------------------
 
 
-if (isset($_GET['Delete']) || isset($_GET['Edit']))
-       copy_from_cart(); // GET method need form restore
+//if (isset($_GET['Delete']) || isset($_GET['Edit']))
+//     copy_from_cart(); // GET method need form restore
 
 if (isset($_POST['CancelOrder']))
        handle_cancel_order();
 
-if (isset($_GET['Delete']))
-       handle_delete_item();
+$id = find_submit('Delete');
+if ($id!=-1)
+       handle_delete_item($id);
 
 if (isset($_POST['UpdateItem']))
        handle_update_item();
@@ -396,6 +412,9 @@ if (isset($_POST['UpdateItem']))
 if (isset($_POST['AddItem']))
        handle_new_item();
 
+if (isset($_POST['CancelItemChanges']) || isset($_POST['UpdateItem']))
+       line_start_focus();
+
 //--------------------------------------------------------------------------------
 
 check_db_has_stock_items(_("There are no inventory items defined in the system."));