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 a9fb1bf1d03024ea96c128a391d24692662f2a6c..d893c5446ebc9b009297ec652b2b07b223f36b46 100644 (file)
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -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();
@@ -592,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
@@ -725,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,
@@ -740,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);
 }