Selecting the cancel button in confirming the voiding of document did not work properly.

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

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 50cc4470c5cd731199ee9b2a851f5742d6e048bb..d893c5446ebc9b009297ec652b2b07b223f36b46 100644 (file)
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -62,12 +62,12 @@ if ($use_date_picker) {
 if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) {
 
        $_SESSION['page_title'] = _($help_context = "Direct Sales Delivery");
-       create_cart(ST_CUSTDELIVERY, 0);
+       create_cart(ST_CUSTDELIVERY, $_GET['NewDelivery']);
 
 } elseif (isset($_GET['NewInvoice']) && is_numeric($_GET['NewInvoice'])) {
 
        $_SESSION['page_title'] = _($help_context = "Direct Sales Invoice");
-       create_cart(ST_SALESINVOICE, 0);
+       create_cart(ST_SALESINVOICE, $_GET['NewInvoice']);
 
 } elseif (isset($_GET['ModifyOrderNumber']) && is_numeric($_GET['ModifyOrderNumber'])) {
 
@@ -231,6 +231,9 @@ if (isset($_GET['AddedID'])) {
                submenu_option(_("Enter a &New Direct Invoice"),
                        "/sales/sales_order_entry.php?NewInvoice=0");
 
+       if ($row === false)
+               submenu_option(_("Entry &customer payment for this invoice"), "/sales/customer_payments.php?SInvoice=".$invoice);
+
        submenu_option(_("Add an Attachment"), "/admin/attachments.php?filterType=".ST_SALESINVOICE."&trans_no=$invoice");
 
        display_footer_exit();
@@ -284,6 +287,7 @@ function copy_to_cart()
                $cart->dimension_id = $_POST['dimension_id'];
                $cart->dimension2_id = $_POST['dimension2_id'];
        }
+       $cart->ex_rate = input_num('_ex_rate', null);
 }
 
 //-----------------------------------------------------------------------------
@@ -314,9 +318,9 @@ function copy_from_cart()
        if ($cart->trans_type!=ST_SALESORDER && $cart->trans_type!=ST_SALESQUOTE) { // 2008-11-12 Joe Hunt
                $_POST['dimension_id'] = $cart->dimension_id;
                $_POST['dimension2_id'] = $cart->dimension2_id;
-       }       
+       }
        $_POST['cart_id'] = $cart->cart_id;
-               
+       $_POST['_ex_rate'] = $cart->ex_rate;
 }
 //--------------------------------------------------------------------------------
 
@@ -591,7 +595,8 @@ function  handle_cancel_order()
                submenu_option(_("Enter a New Sales Invoice"),  "/sales/sales_order_entry.php?NewInvoice=1");
        } elseif ($_SESSION['Items']->trans_type == ST_SALESQUOTE)
        {
-               delete_sales_order(key($_SESSION['Items']->trans_no), $_SESSION['Items']->trans_type);
+               if ($_SESSION['Items']->trans_no != 0) 
+                       delete_sales_order(key($_SESSION['Items']->trans_no), $_SESSION['Items']->trans_type);
                display_notification(_("This sales quotation has been cancelled as requested."), 1);
                submenu_option(_("Enter a New Sales Quotation"), "/sales/sales_order_entry.php?NewQuotation=Yes");
        } else { // sales order
@@ -724,7 +729,7 @@ if ($customer_error == "") {
        display_delivery_details($_SESSION['Items']);
        echo "</td></tr>";
        end_table(1);
-
+/*
        if ($_SESSION['Items']->trans_no == 0) {
 
                submit_center_first('ProcessOrder', $porder,
@@ -739,6 +744,25 @@ if ($customer_error == "") {
 
        submit_center_last('CancelOrder', $cancelorder,
           _('Cancels document entry or removes sales order when editing an old document'));
+*/        
+       if ($_SESSION['Items']->trans_no == 0) {
+
+               submit_center_first('ProcessOrder', $porder,
+                   _('Check entered data and save document'), 'default');
+               submit_center_last('CancelOrder', $cancelorder,
+                       _('Cancels document entry or removes sales order when editing an old document'), true);
+               submit_js_confirm('CancelOrder', _('You are about to void this Document.\nDo you want to continue?'));
+       } else {
+               submit_center_first('ProcessOrder', $corder,
+                   _('Validate changes and update document'), 'default');
+               submit_center_last('CancelOrder', $cancelorder,
+                       _('Cancels document entry or removes sales order when editing an old document'), true);
+               if ($_SESSION['Items']->trans_type==ST_SALESORDER)
+                       submit_js_confirm('CancelOrder', _('You are about to cancel undelivered part of this order.\nDo you want to continue?'));
+               else
+                       submit_js_confirm('CancelOrder', _('You are about to void this Document.\nDo you want to continue?'));
+       }
+
 } else {
        display_error($customer_error);
 }