CItem Cost Update will also regulate the stock moves standard cost to mirror correct GL.

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

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 0511097a72198fd542850a882d868afe5bcc59e4..f73a6d5fd8f5d5feb4ccee9db55fbd93a8b41ace 100644 (file)
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -734,16 +734,20 @@ if ($customer_error == "") {
 
                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 {
-               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?'));
                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?'));
        }
 
-       submit_center_last('CancelOrder', $cancelorder,
-          _('Cancels document entry or removes sales order when editing an old document'));
 } else {
        display_error($customer_error);
 }