Delivery notes removed from Customer Balnces, warning fix.
[fa-stable.git] / sales / sales_order_entry.php
index 1a5320d9b16423d5e10765aed95b24a15bdd33f6..fe40810de3ed36539212a00b5beeceb5c8be4aed 100644 (file)
@@ -11,10 +11,10 @@ $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");
@@ -140,7 +140,7 @@ function copy_to_cart()
        $cart->document_date = $_POST['OrderDate'];
        $cart->due_date = $_POST['delivery_date'];
        $cart->cust_ref = $_POST['cust_ref'];
-       $cart->freight_cost = $_POST['freight_cost'];
+       $cart->freight_cost = input_num('freight_cost');
        $cart->deliver_to = $_POST['deliver_to'];
        $cart->delivery_address = $_POST['delivery_address'];
        $cart->phone = $_POST['phone'];
@@ -153,6 +153,7 @@ function copy_to_cart()
                $cart->email = '';
        $cart->customer_id      = $_POST['customer_id'];
        $cart->Branch = $_POST['branch_id'];
+       $cart->sales_type = $_POST['sales_type'];
 }
 
 //-----------------------------------------------------------------------------
@@ -168,7 +169,7 @@ function copy_from_cart()
        $_POST['OrderDate'] = $cart->document_date;
        $_POST['delivery_date'] = $cart->due_date;
        $_POST['cust_ref'] = $cart->cust_ref;
-       $_POST['freight_cost'] = $cart->freight_cost;
+       $_POST['freight_cost'] = price_format($cart->freight_cost);
 
        $_POST['deliver_to'] = $cart->deliver_to;
        $_POST['delivery_address'] = $cart->delivery_address;
@@ -178,6 +179,7 @@ function copy_from_cart()
 
        $_POST['customer_id'] = $cart->customer_id;
        $_POST['branch_id'] = $cart->Branch;
+       $_POST['sales_type'] = $cart->sales_type;
 }
 
 //--------------------------------------------------------------------------------
@@ -205,9 +207,9 @@ function can_process() {
        }
 
        if ($_POST['freight_cost'] == "")
-               $_POST['freight_cost'] = 0;
+               $_POST['freight_cost'] = price_format(0);
 
-       if (!is_numeric($_POST['freight_cost'])) {
+       if (!check_num('freight_cost',0)) {
                display_error(_("The shipping cost entered is expected to be numeric."));
                return false;
        }
@@ -256,15 +258,15 @@ if (isset($_POST['ProcessOrder']) && can_process()) {
 
 function check_item_data()
 {
-       if (!is_numeric($_POST['qty']) || $_POST['qty'] < 0 || $_POST['Disc'] > 100 || $_POST['Disc'] < 0) {
+
+       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."));
                return false;
-       } elseif (!is_numeric($_POST['price']) || $_POST['price'] < 0) {
-
-               display_error( _("Price for item must be entered and can not be less then 0"));
+       } elseif (!check_num('price', 0)) {
+               display_error( _("Price for item must be entered and can not be less than 0"));
                return false;
        } elseif (isset($_POST['LineNo']) && isset($_SESSION['Items']->line_items[$_POST['LineNo']])
-               && $_SESSION['Items']->line_items[$_POST['LineNo']]->qty_done > $_POST['qty']) {
+           && !check_num('qty', $_SESSION['Items']->line_items[$_POST['LineNo']]->qty_done)) {
 
                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;
@@ -277,23 +279,22 @@ function check_item_data()
 function handle_update_item()
 {
        if ($_POST['UpdateItem'] != '' && check_item_data()) {
-               $_SESSION['Items']->update_cart_item($_POST['LineNo'], $_POST['qty'],
-                       $_POST['price'], ($_POST['Disc'] / 100));
+               $_SESSION['Items']->update_cart_item($_POST['LineNo'],
+                input_num('qty'), input_num('price'), 
+                input_num('Disc') / 100 );
        }
+  copy_from_cart();
 }
 
 //--------------------------------------------------------------------------------
 
-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."));
+    }
 }
 
 //--------------------------------------------------------------------------------
@@ -303,8 +304,8 @@ function handle_new_item()
        if (!check_item_data()) {
                        return;
        }
-       add_to_order($_SESSION['Items'], $_POST['stock_id'], $_POST['qty'],
-               $_POST['price'], $_POST['Disc'] / 100);
+       add_to_order($_SESSION['Items'], $_POST['stock_id'], input_num('qty'),
+               input_num('price'), input_num('Disc') / 100);
 
        $_POST['StockID2'] = $_POST['stock_id'] = "";
 }
@@ -352,32 +353,39 @@ function create_cart($type, $trans_no)
        $doc_type = $type;
 
        if($type != 30 && $trans_no != 0) { // this is template
-       $doc_type = 30;
-
-       $doc = new Cart(30, array($trans_no));
-       $doc->trans_type = $type;
-       $doc->trans_no = 0;
-
-       $doc->due_date = $doc->document_date = Today();
-       $doc->reference = references::get_next($doc->trans_type);
-       $doc->Comments='';
-       foreach($doc->line_items as $line_no => $line) {
-               $doc->line_items[$line_no]->qty_done = 0;
-       }
-       $_SESSION['Items'] = $doc;
+               $doc_type = 30;
+
+               $doc = new Cart(30, array($trans_no));
+               $doc->trans_type = $type;
+               $doc->trans_no = 0;
+               if ($type == 10)
+                       $doc->due_date = get_invoice_duedate($doc->customer_id, $doc->document_date);
+               else
+                       $doc->due_date = $doc->document_date = Today();
+               $doc->reference = references::get_next($doc->trans_type);
+               $doc->Comments='';
+               foreach($doc->line_items as $line_no => $line) {
+                       $doc->line_items[$line_no]->qty_done = 0;
+               }
+               $_SESSION['Items'] = $doc;
        } else
-       $_SESSION['Items'] = new Cart($type,array($trans_no));
+               $_SESSION['Items'] = new Cart($type,array($trans_no));
 
        copy_from_cart();
 }
 
 //--------------------------------------------------------------------------------
 
+
+//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();