From: Janusz Dobrowolski <janusz@frontaccouting.eu>
Date: Thu, 24 Jan 2013 15:11:17 +0000 (+0100)
Subject: Partially delivered Sales Order can now be closed using 'Cancel Order' button on... 
X-Git-Tag: 2.3-final~332
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=168210eba8649ac5538fd063f7d6c274025c037e;p=fa-stable.git

Partially delivered Sales Order can now be closed using 'Cancel Order' button on edition.
---

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 98cf5411..50cc4470 100644
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -586,28 +586,28 @@ function  handle_cancel_order()
 	if ($_SESSION['Items']->trans_type == ST_CUSTDELIVERY) {
 		display_notification(_("Direct delivery entry has been cancelled as requested."), 1);
 		submenu_option(_("Enter a New Sales Delivery"),	"/sales/sales_order_entry.php?NewDelivery=1");
-
 	} elseif ($_SESSION['Items']->trans_type == ST_SALESINVOICE) {
 		display_notification(_("Direct invoice entry has been cancelled as requested."), 1);
 		submenu_option(_("Enter a New Sales Invoice"),	"/sales/sales_order_entry.php?NewInvoice=1");
-	} else {
+	} elseif ($_SESSION['Items']->trans_type == ST_SALESQUOTE)
+	{
+		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
 		if ($_SESSION['Items']->trans_no != 0) {
-			if ($_SESSION['Items']->trans_type == ST_SALESORDER && 
-				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 {
+			$order_no = key($_SESSION['Items']->trans_no);
+			if (sales_order_has_deliveries($order_no))
+			{
+				close_sales_order($order_no);
+				display_notification(_("Undelivered part of order has been cancelled as requested."), 1);
+				submenu_option(_("Select Another Sales Order for Edition"), "/sales/inquiry/sales_orders_view.php?type=".ST_SALESORDER);
+			} else {
 				delete_sales_order(key($_SESSION['Items']->trans_no), $_SESSION['Items']->trans_type);
-				if ($_SESSION['Items']->trans_type == ST_SALESQUOTE)
-				{
-					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
-				{
-					display_notification(_("This sales order has been cancelled as requested."), 1);
-					submenu_option(_("Enter a New Sales Order"), "/sales/sales_order_entry.php?NewOrder=Yes");
-				}
-			}	
+
+				display_notification(_("This sales order has been cancelled as requested."), 1);
+				submenu_option(_("Enter a New Sales Order"), "/sales/sales_order_entry.php?NewOrder=Yes");
+			}
 		} else {
 			processing_end();
 			meta_forward($path_to_root.'/index.php','application=orders');
@@ -731,6 +731,8 @@ if ($customer_error == "") {
 		    _('Check entered data and save document'), 'default');
 		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');
 	}