From 14402932d3256d0f89072d6d72516f6462830ce6 Mon Sep 17 00:00:00 2001
From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Mon, 20 Apr 2009 08:22:42 +0000
Subject: [PATCH] Javascript confirm dialog added for destructive submits.

---
 purchasing/includes/ui/invoice_ui.inc |  5 ++++-
 purchasing/supplier_invoice.php       | 14 ++------------
 sales/sales_order_entry.php           |  9 ++++-----
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index 14d02889..14ff76e2 100644
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -385,8 +385,11 @@ function display_grn_items_for_selection(&$supp_trans, $k)
         		submit_cells('grn_item_id'.$n, _("Add"), '', _("Add to Invoice"), true);
         	else	
         		submit_cells('grn_item_id'.$n, _("Add"), '', _("Add to Credit Note"), true);
-    		if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->access == 2)	// Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs
+    		if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->access == 2) {	// Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs
         		submit_cells('void_item_id'.$n, _("Remove"), '', _("WARNING! Be careful with removal. The operation is executed immediately and cannot be undone !!!"), true);
+				submit_js_confirm('void_item_id'.$n,
+					sprintf(_('You are about to remove all yet non-invoiced items from delivery line #%d. This operation also irreversibly changes related order line. Do you want to continue ?'), $n));
+			}
 			end_row();
     	}
     }
diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 148e7b92..b2ea26a3 100644
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -337,18 +337,8 @@ if ($id4 != -1)
 $id2 = -1;
 if ($_SESSION["wa_current_user"]->access == 2)
 {
-	$id3 = find_submit('void_item_id');
-	if ($id3 != -1) 
-	{
-		$js = "if(confirm(\""
-		.sprintf(_('You are about to remove all yet non-invoiced items from delivery line #%d. This operation also irreversibly changes related order line. Do you want to continue ?'), $id3)
-		."\")) {
-			JsHttpRequest.request(\"void_confirm".$id3."\");
-		}";
-		$Ajax->addScript(true,$js);
-	}
-	$id2 = find_submit('void_confirm');
-	if ($id2 != -1) // Added section 2008-10-18 Joe Hunt for voiding delivery lines
+	$id2 = find_submit('void_item_id');
+	if ($id2 != -1) 
 	{
 		begin_transaction();
 		
diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index d508c2ce..f6cf66d3 100644
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -141,7 +141,6 @@ if (isset($_GET['AddedID'])) {
 	display_footer_exit();
 } else
 	check_edit_conflicts();
-
 //-----------------------------------------------------------------------------
 
 function copy_to_cart()
@@ -229,8 +228,8 @@ function line_start_focus() {
   $Ajax->activate('items_table');
   set_focus('_stock_id_edit');
 }
-//--------------------------------------------------------------------------------
 
+//--------------------------------------------------------------------------------
 function can_process() {
 	if (!is_date($_POST['OrderDate'])) {
 		display_error(_("The entered date is invalid."));
@@ -356,8 +355,6 @@ function check_item_data()
 function handle_update_item()
 {
 	if ($_POST['UpdateItem'] != '' && check_item_data()) {
-		//alert("description=".$_POST['item_description']);
-		//$_SESSION['items']->line_items[$_POST['LineNo']]->item_description = $_POST['item_description'];
 		$_SESSION['Items']->update_cart_item($_POST['LineNo'],
 		 input_num('qty'), input_num('price'),
 		 input_num('Disc') / 100, $_POST['item_description'] );
@@ -432,7 +429,7 @@ function  handle_cancel_order()
 //--------------------------------------------------------------------------------
 
 function create_cart($type, $trans_no)
-{
+{ 
 	processing_start();
 	$doc_type = $type;
 
@@ -509,6 +506,7 @@ if ($_SESSION['Items']->trans_type == 10) {
 	$porder = _("Place Order");
 	$corder = _("Commit Order Changes");
 }
+
 start_form(false, true);
 hidden('cart_id');
 
@@ -529,6 +527,7 @@ if ($customer_error == "") {
 
 		submit_center_first('ProcessOrder', $porder,
 		    _('Check entered data and save document'), true);
+		submit_js_confirm('CancelOrder', _('You are about to void this Sales Order.\nDo you want to continue?'));
 	} else {
 		submit_center_first('ProcessOrder', $corder,
 		    _('Validate changes and update document'), true);
-- 
2.30.2