Moving 2.0 development version to main trunk.
[fa-stable.git] / sales / sales_order_entry.php
index c8c75bd468187983008f9eb2211f64a0d01497bc..dfeb153279eccdc426ca84180ecf0f610f08942e 100644 (file)
 <?php
+//-----------------------------------------------------------------------------
+//
+//     Entry/Modify Sales Order
+//     Entry Direct Delivery
+//     Entry Direct Invoice
+//
 
 $page_security = 1;
 $path_to_root="..";
-include_once($path_to_root . "/sales/includes/cart_class.inc");
 
+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 = '';
 
-$js = get_js_form_entry("StockID2", "stock_id", "qty");
-if ($use_popup_windows)
+if ($use_popup_windows) {
        $js .= get_js_open_window(900, 500);
-if ($use_date_picker)
+}
+
+if ($use_date_picker) {
        $js .= get_js_date_picker();
+}
 
-if (isset($_GET['ModifyOrderNumber'])) 
-{
-       page(_("Modifying Sales Order") . " #".$_GET['ModifyOrderNumber'], false, false, "", $js); 
-}      
-elseif (isset($_GET['NewInvoice']) || (isset($_SESSION['Items']) && $_SESSION['Items']->direct_invoice)) 
-{
-       page(_("Sales Invoices"), false, false, "", $js); 
-} 
-else 
-{
-       page(_("Sales Order Entry"), false, false, "", $js); 
+if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) {
+
+       $_SESSION['page_title'] = _("Direct Sales Delivery");
+       create_cart(13, $_GET['NewDelivery']);
+
+} elseif (isset($_GET['NewInvoice']) && is_numeric($_GET['NewInvoice'])) {
+
+       $_SESSION['page_title'] = _("Direct Sales Invoice");
+       create_cart(10, $_GET['NewInvoice']);
+
+} elseif (isset($_GET['ModifyOrderNumber']) && is_numeric($_GET['ModifyOrderNumber'])) {
+
+       $help_page_title = _('Modifying Sales Order');
+       $_SESSION['page_title'] = sprintf( _("Modifying Sales Order # %d"), $_GET['ModifyOrderNumber']);
+       create_cart(30, $_GET['ModifyOrderNumber']);
+
+} elseif (isset($_GET['NewOrder'])) {
+
+       $_SESSION['page_title'] = _("New Sales Order Entry");
+       create_cart(30, 0);
 }
 
+page($_SESSION['page_title'], false, false, "", $js);
+//-----------------------------------------------------------------------------
 
-//--------------------------------------------------------------------------------
-if (isset($_GET['AddedID'])) 
-{
+if (isset($_GET['AddedID'])) {
        $order_no = $_GET['AddedID'];
-       $trans_type = systypes::sales_order();
+       print_hidden_script(30);
 
-       display_notification_centered(_("Order has been entered.") . " #$order_no");
+       display_notification_centered(sprintf( _("Order # %d has been entered."),$order_no));
 
-       display_note(get_trans_view_str($trans_type, $order_no, _("View this order")));
+       display_note(get_trans_view_str(30, $order_no, _("View This Order")));
+       echo '<br>';
+       display_note(print_document_link($order_no, _("Print This Order"), true, 30));
 
-       hyperlink_params($path_to_root . "/sales/customer_invoice.php", _("Confirm Order Delivery Quantities and Produce Invoice"), "OrderNumber=$order_no");
+       hyperlink_params($path_to_root . "/sales/customer_delivery.php",
+               _("Make Delivery Against This Order"), "OrderNumber=$order_no");
 
-       hyperlink_params($_SERVER['PHP_SELF'], _("Enter a New Order"), "NewOrder=Yes");
+       hyperlink_params($_SERVER['PHP_SELF'], _("Enter a New Order"), "NewOrder=0");
 
        display_footer_exit();
-}
-//--------------------------------------------------------------------------------
 
-if (isset($_GET['UpdatedID'])) 
-{
+} elseif (isset($_GET['UpdatedID'])) {
        $order_no = $_GET['UpdatedID'];
-       $trans_type = systypes::sales_order();
+       print_hidden_script(30);
+
+       display_notification_centered(sprintf( _("Order # %d has been updated."),$order_no));
+
+       display_note(get_trans_view_str(30, $order_no, _("View This Order")));
+       echo '<br>';
+       display_note(print_document_link($order_no, _("Print This Order"), true, 30));
+
+       hyperlink_params($path_to_root . "/sales/customer_delivery.php",
+               _("Confirm Order Quantities and Make Delivery"), "OrderNumber=$order_no");
+
+       hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",
+               _("Select A Different Order"), "OutstandingOnly=1");
+
+       display_footer_exit();
+
+} elseif (isset($_GET['AddedDN'])) {
+       $delivery = $_GET['AddedDN'];
+       print_hidden_script(13);
+
+       display_notification_centered(sprintf(_("Delivery # %d has been entered."),$delivery));
+
+       display_note(get_trans_view_str(13, $delivery, _("View This Delivery")));
+       echo '<br>';
+       display_note(print_document_link($delivery, _("Print Delivery Note"), true, 13));
+
+       hyperlink_params($path_to_root . "/sales/customer_invoice.php",
+       _("Make Invoice Against This Delivery"), "DeliveryNumber=$delivery");
+
+       if ((isset($_GET['Type']) && $_GET['Type'] == 1))
+       hyperlink_params("inquiry/sales_orders_view.php",
+               _("Enter a New Template Delivery"), "DeliveryTemplates=Yes");
+       else
+       hyperlink_params($_SERVER['PHP_SELF'], _("Enter a New Delivery"), "NewDelivery=0");
 
-       display_notification_centered(_("Order has been updated.") . " #$order_no");
+       display_footer_exit();
 
-       display_note(get_trans_view_str($trans_type, $order_no, _("View this order")));
+} elseif (isset($_GET['AddedDI'])) {
+       $invoice = $_GET['AddedDI'];
+       print_hidden_script(10);
 
-       hyperlink_params($path_to_root . "/sales/customer_invoice.php", _("Confirm Order Delivery Quantities and Produce Invoice"), "OrderNumber=$order_no");
+       display_notification_centered(sprintf(_("Invoice # %d has been entered."),$invoice));
 
-       hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php", _("Select A Different Order"), "OutstandingOnly=1");
+       display_note(get_trans_view_str(10, $invoice, _("View This Invoice")));
+       echo '<br>';
+       display_note(print_document_link($invoice, _("Print Sales Invoice"), true, 10));
+
+       if ((isset($_GET['Type']) && $_GET['Type'] == 1))
+       hyperlink_params("inquiry/sales_orders_view.php",
+               _("Enter a New Template Invoice"), "InvoiceTemplates=Yes");
+       else
+       hyperlink_params($_SERVER['PHP_SELF'], _("Enter a New Direct Invoice"), "NewInvoice=0");
 
        display_footer_exit();
 }
 
-//--------------------------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 
-function copy_to_so()
+function copy_to_cart()
 {
-       if ($_SESSION['Items']->direct_invoice)
-               $_SESSION['Items']->memo_ = $_POST['InvoiceText'];
-
-       $_SESSION['Items']->orig_order_date = $_POST['OrderDate'];
-       $_SESSION['Items']->delivery_date = $_POST['delivery_date'];
-       $_SESSION['Items']->cust_ref = $_POST['cust_ref'];
-       $_SESSION['Items']->freight_cost = $_POST['freight_cost'];
-       $_SESSION['Items']->Comments = $_POST['Comments'];
-
-       $_SESSION['Items']->deliver_to = $_POST['deliver_to'];
-       $_SESSION['Items']->delivery_address = $_POST["delivery_address"];
-       $_SESSION['Items']->phone = $_POST["phone"];
-       $_SESSION['Items']->Location = $_POST["Location"];
-       $_SESSION['Items']->ship_via = $_POST["ship_via"];
+       $cart = &$_SESSION['Items'];
+
+       if ($cart->trans_type!=30) {
+               $cart->reference = $_POST['ref'];
+       }
+       $cart->Comments =  $_POST['Comments'];
+
+       $cart->document_date = $_POST['OrderDate'];
+       $cart->due_date = $_POST['delivery_date'];
+       $cart->cust_ref = $_POST['cust_ref'];
+       $cart->freight_cost = input_num('freight_cost');
+       $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'];
+
+       if (isset($_POST['email']))
+               $cart->email =$_POST['email'];
+       else
+               $cart->email = '';
+       $cart->customer_id      = $_POST['customer_id'];
+       $cart->Branch = $_POST['branch_id'];
+       $cart->sales_type = $_POST['sales_type'];
 }
 
-//--------------------------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 
-function copy_from_so()
+function copy_from_cart()
 {
-       if ($_SESSION['Items']->direct_invoice)
-               $_POST['InvoiceText'] = $_SESSION['Items']->memo_;
-
-       $_POST['OrderDate'] = $_SESSION['Items']->orig_order_date;
-       $_POST['delivery_date'] = $_SESSION['Items']->delivery_date;
-       $_POST['cust_ref'] = $_SESSION['Items']->cust_ref;
-       $_POST['freight_cost'] = $_SESSION['Items']->freight_cost;
-       $_POST['Comments'] = $_SESSION['Items']->Comments;
-
-       $_POST['deliver_to'] = $_SESSION['Items']->deliver_to;
-       $_POST["delivery_address"] = $_SESSION['Items']->delivery_address;
-       $_POST["phone"] = $_SESSION['Items']->phone;
-       $_POST["Location"] = $_SESSION['Items']->Location;
-       $_POST["ship_via"] = $_SESSION['Items']->ship_via;
+       $cart = &$_SESSION['Items'];
+       if ($cart->trans_type!=30) {
+               $_POST['ref'] = $cart->reference;
+       }
+       $_POST['Comments'] = $cart->Comments;
+
+       $_POST['OrderDate'] = $cart->document_date;
+       $_POST['delivery_date'] = $cart->due_date;
+       $_POST['cust_ref'] = $cart->cust_ref;
+       $_POST['freight_cost'] = price_format($cart->freight_cost);
+
+       $_POST['deliver_to'] = $cart->deliver_to;
+       $_POST['delivery_address'] = $cart->delivery_address;
+       $_POST['phone'] = $cart->phone;
+       $_POST['Location'] = $cart->Location;
+       $_POST['ship_via'] = $cart->ship_via;
+
+       $_POST['customer_id'] = $cart->customer_id;
+
+       $_POST['branch_id'] = $cart->Branch;
+       $_POST['sales_type'] = $cart->sales_type;
 }
+//--------------------------------------------------------------------------------
 
+function line_start_focus() {
+  global       $Ajax;
 
-function can_process()
-{
-       if ($_SESSION['Items']->direct_invoice) 
-       {
-               $edate = _("The entered invoice date is invalid.");
-       } 
-       else 
-       {       
-               $edate = _("The entered order date is invalid.");
-       }       
-       if (!is_date($_POST['OrderDate'])) 
-       {
-               display_error($edate);
+  $Ajax->activate('items_table');
+  set_focus('_stock_id_edit');
+}
+//--------------------------------------------------------------------------------
+
+function can_process() {
+       if (!is_date($_POST['OrderDate'])) {
+               display_error(_("The entered date is invalid."));
+               set_focus('OrderDate');
                return false;
        }
-       if ($_SESSION['Items']->direct_invoice && !is_date_in_fiscalyear($_POST['OrderDate'])) 
-       {
+       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;
        }
-       else
-       {
-               $_SESSION['Items']->orig_order_date = $_POST['OrderDate'];
-       }
-       if (count($_SESSION['Items']->line_items) == 0)
-       {
-               display_error(_("You must enter at least one line entry."));
+       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)
-       {
+       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)
-       {
+       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;
        }
 
        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."));
+               set_focus('freight_cost');
                return false;
        }
-
-       if (!is_date($_POST['delivery_date'])) 
-       {
+       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']->orig_order_date, $_POST['delivery_date'])) 
-       {
+       //if (date1_greater_date2($_SESSION['Items']->document_date, $_POST['delivery_date'])) {
+       if (date1_greater_date2($_POST['OrderDate'], $_POST['delivery_date'])) {
                display_error(_("The requested delivery date is before the date of the order."));
+               set_focus('delivery_date');
                return false;
        }
-
-       $_SESSION['Items']->deliver_to = $_POST['deliver_to'];
-       $_SESSION['Items']->delivery_date = $_POST['delivery_date'];
-       $_SESSION['Items']->delivery_address = $_POST['delivery_address'];
-       $_SESSION['Items']->phone =$_POST['phone'];
-       if (isset($_POST['email']))
-               $_SESSION['Items']->email =$_POST['email'];
-       else    
-               $_SESSION['Items']->email = "";
-       $_SESSION['Items']->Location = $_POST['Location'];
-       $_SESSION['Items']->cust_ref = $_POST['cust_ref'];
-       $_SESSION['Items']->Comments = $_POST['Comments'];
-       $_SESSION['Items']->freight_cost = $_POST['freight_cost'];
-       $_SESSION['Items']->ship_via = $_POST['ship_via'];
-
-    return true;
-}
-
-//-----------------------------------------------------------------------------------------------------------
-
-if (isset($_POST['ProcessOrder']) && $_SESSION['Items']->order_no == 0 && can_process())
-{
-
-       $order_no = add_sales_order($_SESSION['Items']);
-       
-       if ($_SESSION['Items']->direct_invoice) 
-       {
-               $_SESSION['Items']->memo_ = $_POST['InvoiceText'];
-               $_SESSION['Items']->memo_ = str_replace("'", "\\'", $_SESSION['Items']->memo_);
-               $_SESSION['Items']->order_no = $order_no;
-               meta_forward("$path_to_root/sales/customer_invoice.php", "process_invoice=Yes");
-               
-       } 
-       else 
-       {
-       
-               unset($_SESSION['Items']->line_items);
-               unset($_SESSION['Items']);
-
-               meta_forward($_SERVER['PHP_SELF'], "AddedID=$order_no");
-       }       
+       if ($_SESSION['Items']->trans_type != 30 && !references::is_valid($_POST['ref'])) {
+               display_error(_("You must enter a reference."));
+               set_focus('ref');
+               return false;
+       }
+       return true;
 }
 
-//-------------------------------------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 
-if (isset($_POST['ProcessOrder']) && $_SESSION['Items']->order_no != 0 && can_process())
-{
+if (isset($_POST['ProcessOrder']) && can_process()) {
+       copy_to_cart();
 
-       update_sales_order($_SESSION['Items']->order_no, $_SESSION['Items']);
+       $modified = ($_SESSION['Items']->trans_no != 0);
+       $so_type = $_SESSION['Items']->so_type;
 
-       $order_no = $_SESSION['Items']->order_no;
+       $_SESSION['Items']->write(1);
 
-       unset($_SESSION['Items']->line_items);
-       unset($_SESSION['Items']);
+       $trans_no = key($_SESSION['Items']->trans_no);
+       $trans_type = $_SESSION['Items']->trans_type;
 
-       meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$order_no");
+       processing_end();
+       if ($modified) {
+               meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$trans_no");
+       } elseif ($trans_type == 30) {
+               meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
+       } elseif ($trans_type == 10) {
+               meta_forward($_SERVER['PHP_SELF'], "AddedDI=$trans_no&Type=$so_type");
+       } else {
+               meta_forward($_SERVER['PHP_SELF'], "AddedDN=$trans_no&Type=$so_type");
+       }
 }
 
-
 //--------------------------------------------------------------------------------
 
-function check_item_data() 
+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."));
+               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($_SESSION['Items']->some_already_delivered($_POST['stock_id']) != 0 &&
-               $_SESSION['Items']->line_items[$_POST['stock_id']]->price != $_POST['price']) 
-       {
-               display_error(_("The item you attempting to modify the price for has already had some quantity invoiced at the old price. The item unit price cannot be modified retrospectively."));
-               return false;
-       } 
-       elseif($_SESSION['Items']->some_already_delivered($_POST['stock_id']) != 0 && 
-               $_SESSION['Items']->line_items[$_POST['stock_id']]->discount_percent != ($_POST['Disc']/100)) 
-       {
-               display_error(_("The item you attempting to modify has had some quantity invoiced at the old discount percent. The items discount cannot be modified retrospectively."));
-               return false;
-       } 
-       elseif (isset($_SESSION['Items']->line_items[$_POST['stock_id']]) && $_SESSION['Items']->line_items[$_POST['stock_id']]->qty_inv > $_POST['qty'])
-       {
-               display_error(_("You attempting to make the quantity ordered a quantity less than has already been invoiced. The quantity delivered and invoiced cannot be modified retrospectively."));
-               return false;
-       }       
-       return true;
+       } 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;
+       }
+       return true;
 }
 
-function handle_update_item() 
+//--------------------------------------------------------------------------------
+
+function handle_update_item()
 {
-    if($_POST['UpdateItem'] != "" && check_item_data())
-    {
-       $_SESSION['Items']->update_cart_item($_POST['stock_id'], $_POST['qty'], 
-               $_POST['price'], ($_POST['Disc'] / 100));
-    }
+       if ($_POST['UpdateItem'] != '' && check_item_data()) {
+               $_SESSION['Items']->update_cart_item($_POST['LineNo'],
+                input_num('qty'), input_num('price'),
+                input_num('Disc') / 100 );
+       }
+  line_start_focus();
 }
 
 //--------------------------------------------------------------------------------
 
-function handle_delete_item() 
-{   
-    if($_GET['Delete'] != "")
-    {
-       $stock_id = $_GET['Delete']; 
-       if($_SESSION['Items']->some_already_delivered($stock_id) == 0)
-       {
-               $_SESSION['Items']->remove_from_cart($stock_id);
-       } 
-       else 
-       {
-               display_error(_("This item cannot be deleted because some of it has already been invoiced."));
-       }
+function handle_delete_item($line_no)
+{
+    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();
 }
 
 //--------------------------------------------------------------------------------
 
 function handle_new_item()
 {
-       if (!check_item_data())
-               return;
-               
-       add_to_order($_SESSION['Items'], $_POST['stock_id'], $_POST['qty'], 
-               $_POST['price'], $_POST['Disc']/100);
-       $_POST['StockID2'] = $_POST['stock_id'] = "";
+
+       if (!check_item_data()) {
+                       return;
+       }
+       add_to_order($_SESSION['Items'], $_POST['stock_id'], input_num('qty'),
+               input_num('price'), input_num('Disc') / 100);
+       $_POST['_stock_id_edit'] = $_POST['stock_id']   = "";
+       line_start_focus();
 }
 
-//--------------------------------------------------------------------------------     
+//--------------------------------------------------------------------------------
 
 function  handle_cancel_order()
 {
        global $path_to_root;
-       
-    if ($_POST['CancelOrder'] != "") 
-    {
-       $ok_to_delete = 1;      //assume this in the first instance
-    
-               if (($_SESSION['Items']->order_no != 0) && 
-                       sales_order_has_invoices($_SESSION['Items']->order_no)) 
-               {
-                       $ok_to_delete = 0;
-                       display_error(_("This order cannot be cancelled because some of it has already been invoiced. However, the line item quantities may be modified."));
+
+       if ($_POST['CancelOrder'] != "") {
+
+       if ($_SESSION['Items']->trans_type == 13) {
+                       display_note(_("Direct delivery entry has been cancelled as requested."), 1);
+                       hyperlink_params($path_to_root . "/sales/sales_order_entry.php",
+                                       _("Enter a New Sales Delivery"), SID . "&NewDelivery=0");
+       } elseif ($_SESSION['Items']->trans_type == 10) {
+                       display_note(_("Direct invoice entry has been cancelled as requested."), 1);
+                       hyperlink_params($path_to_root . "/sales/sales_order_entry.php",
+                                       _("Enter a New Sales Delivery"), SID . "&NewDelivery=0");
+       } else {
+               if ($_SESSION['Items']->trans_no != 0) {
+                       if (sales_order_has_deliveries(key($_SESSION['Items']->trans_no)))
+                               display_error(_("This order cannot be cancelled because some of it has already been invoiced or dispatched. However, the line item quantities may be modified."));
+                       else
+                               delete_sales_order(key($_SESSION['Items']->trans_no));
                }
-    
-       if ($ok_to_delete == 1)
-       {
-               if($_SESSION['Items']->order_no != 0)
-               {
-                       delete_sales_order($_SESSION['Items']->order_no);
-               }
-               $diriv = $_SESSION['Items']->direct_invoice;
-               $_SESSION['Items']->clear_items();
-               $_SESSION['Items'] = new cart;
-               $_SESSION['Items']->direct_invoice = $diriv;
-               if ($diriv) 
-               {
-                       display_note(_("This sales invoice has been cancelled as requested."), 1);
-                               hyperlink_params($path_to_root . "/sales/sales_order_entry.php", _("Enter a New Sales Invoice"), SID . "&NewInvoice=Yes");
-               } 
-               else 
-               {
-                       display_note(_("This sales order has been cancelled as requested."), 1);
-                               hyperlink_params($path_to_root . "/sales/sales_order_entry.php", _("Enter a New Sales Order"), SID . "&NewOrder=Yes");
-               }
-               br(1);
-               end_page();                     
-               exit;
-       }
-    }
-}
-       
-//--------------------------------------------------------------------------------
 
-function handle_new_order() 
-{
-       /*New order entry - clear any existing order details from the Items object and initiate a newy*/
-       if (isset($_SESSION['Items']))
-       {
-               unset ($_SESSION['Items']->line_items);
-               unset ($_SESSION['Items']);
+                       display_note(_("This sales order has been cancelled as requested."), 1);
+                               hyperlink_params($path_to_root . "/sales/sales_order_entry.php",
+                               _("Enter a New Sales Order"), SID . "&NewOrder=Yes");
+               }
+               processing_end();
+               br(1);
+               end_page();
+               exit;
        }
-       
-       session_register("Items");
-
-       $_SESSION['Items'] = new cart;
-       if (isset($_GET['NewInvoice']))
-               $_SESSION['Items']->direct_invoice = true;
-       $_SESSION['Items']->customer_id = "";
-       $_POST['OrderDate'] = Today();          
-       if (!is_date_in_fiscalyear($_POST['OrderDate']))
-               $_POST['OrderDate'] = end_fiscalyear();
-       $_SESSION['Items']->orig_order_date = $_POST['OrderDate'];
 }
 
-//--------------------------------------------------------------------------------     
+//--------------------------------------------------------------------------------
 
-if (isset($_GET['ModifyOrderNumber']) && $_GET['ModifyOrderNumber'] != "")
+function create_cart($type, $trans_no)
 {
-
-       if (isset($_SESSION['Items']))
-       {
-               unset ($_SESSION['Items']->line_items);
-               unset ($_SESSION['Items']);
-       }
-
-       session_register("Items");
-
-       $_SESSION['Items'] = new cart;
-       $_SESSION['Items']->order_no = $_GET['ModifyOrderNumber']; 
-
-       /*read in all the selected order into the Items cart  */
-       
-       read_sales_order($_SESSION['Items']->order_no, $_SESSION['Items']);
+       processing_start();
+       $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->document_date = Today(); // 2006-06-15. Added so Invoices and Deliveries get current day
+               if ($type == 10)
+                       $doc->due_date = get_invoice_duedate($doc->customer_id, $doc->document_date);
+               else
+                       $doc->due_date = $doc->document_date;
+               $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));
+       copy_from_cart();
 }
 
 //--------------------------------------------------------------------------------
 
 if (isset($_POST['CancelOrder']))
-       handle_cancel_order();
+       handle_cancel_order();
 
-if (isset($_GET['Delete']) || isset($_GET['Edit']))
-       copy_from_so();
-       
-if (isset($_GET['Delete']))
-       handle_delete_item();
+$id = find_submit('Delete');
+if ($id!=-1)
+       handle_delete_item($id);
 
-if (isset($_POST['UpdateItem']) || isset($_POST['AddItem']))
-       copy_to_so();
-       
 if (isset($_POST['UpdateItem']))
        handle_update_item();
 
 if (isset($_POST['AddItem']))
        handle_new_item();
-       
-//--------------------------------------------------------------------------------
 
-if (isset($_GET['NewOrder']) || isset($_GET['NewInvoice']))
-{
-       handle_new_order();
-} 
-else 
-{
-       if (!isset($_POST['customer_id']))
-               $_POST['customer_id'] = $_SESSION['Items']->customer_id;
-       if (!isset($_POST['branch_id']))                
-               $_POST['branch_id'] = $_SESSION['Items']->Branch;
-       if (!isset($_POST['OrderDate']))                
-               $_POST['OrderDate'] = $_SESSION['Items']->orig_order_date;
+if (isset($_POST['CancelItemChanges'])) {
+       line_start_focus();
 }
 
-//--------------------------------------------------------------------------------     
-
+//--------------------------------------------------------------------------------
 check_db_has_stock_items(_("There are no inventory items defined in the system."));
 
-check_db_has_customer_branches(_("There are no customers, or there are no customers with branches. Please define customers and customer branches."));          
+check_db_has_customer_branches(_("There are no customers, or there are no customers with branches. Please define customers and customer branches."));
 
-if ($_SESSION['Items']->direct_invoice) 
-{
+if ($_SESSION['Items']->trans_type == 10) {
        $idate = _("Invoice Date:");
        $orderitems = _("Sales Invoice Items");
        $deliverydetails = _("Enter Delivery Details and Confirm Invoice");
        $cancelorder = _("Cancel Invoice");
-} 
-else 
-{
+       $porder = _("Place Invoice");
+} elseif ($_SESSION['Items']->trans_type == 13) {
+       $idate = _("Delivery Date:");
+       $orderitems = _("Delivery Note Items");
+       $deliverydetails = _("Enter Delivery Details and Confirm Dispatch");
+       $cancelorder = _("Cancel Delivery");
+       $porder = _("Place Delivery");
+} else {
        $idate = _("Order Date:");
        $orderitems = _("Sales Order Items");
        $deliverydetails = _("Enter Delivery Details and Confirm Order");
        $cancelorder = _("Cancel Order");
+       $porder = _("Place Order");
+       $corder = _("Commit Order Changes");
 }
 start_form(false, true);
 
-$customer_error = display_order_header($_SESSION['Items'], 
+$customer_error = display_order_header($_SESSION['Items'],
        ($_SESSION['Items']->any_already_delivered() == 0), $idate);
 
-if ($customer_error == "")
-{
+if ($customer_error == "") {
        start_table("$table_style width=80%", 10);
-       echo "<tr><td>";                
+       echo "<tr><td>";
        display_order_summary($orderitems, $_SESSION['Items'], true);
        echo "</td></tr>";
-       echo "<tr><td>";                
+       echo "<tr><td>";
        display_delivery_details($_SESSION['Items']);
        echo "</td></tr>";
-       end_table(1);           
-} 
-else
-{
-       display_error($customer_error);
-}
+       end_table(1);
 
-if ($_SESSION['Items']->direct_invoice) 
-{
-       $porder = _("Place Invoice");
-       $corder = _("Commit Invoice Changes");
-       $eorder = _("Edit Invoice Items");
-} 
-else 
-{
-       $porder = _("Place Order");
-       $corder = _("Commit Order Changes");
-       $eorder = _("Edit Order Items");
-}
+       if ($_SESSION['Items']->trans_no == 0) {
 
-if ($_SESSION['Items']->order_no == 0)
-{
-       submit_center_first('ProcessOrder', $porder);
-} 
-else 
-{
-       submit_center_first('ProcessOrder', $corder);
-}
+               submit_center_first('ProcessOrder', $porder,
+                   _('Check entered data and save document'), true);
+       } else {
+               submit_center_first('ProcessOrder', $corder,
+                   _('Validate changes and update document'), true);
+       }
 
-/*    
-echo " ";
-submit('EditOrder', $eorder);
-if ($_SESSION['Items']->count_items() >= 1)
-{
-       echo " ";
-       submit('DeliveryDetails', $deliverydetails);
-       echo "   ";
+       submit_center_last('CancelOrder', $cancelorder,
+          _('Cancels document entry or removes sales order when editing an old document'));
+} else {
+       display_error($customer_error);
 }
-*/             
-submit_center_last('CancelOrder', $cancelorder);
-       
 end_form();
-
-//--------------------------------------------------------------------------------
-
-if (!isset($_SESSION['Items']))
-{
-       /* It must be a new order being created $_SESSION['Items'] would be set up from the order
-       modification code above if a modification to an existing order.  */
-
-       session_register("Items");
-
-       $_SESSION['Items'] = new cart;
-       if (isset($_GET['NewInvoice']))
-               $_SESSION['Items']->direct_invoice = true;
-       $_SESSION['Items']->order_no = 0;       
-}
-
-//--------------------------------------------------------------------------------
-
 end_page();
+
 ?>
\ No newline at end of file