X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=6a2c2b067e481fb8fef786df43fc745d21bcf072;hb=231addc23887aa8b906dca18ea0b2a6fe63c3c39;hp=fcec49da05b23651aa0c842fcecb72ef31a39dea;hpb=24ad43d2a06e7f1986f8a2c246939b90ae021513;p=fa-stable.git

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index fcec49da..6a2c2b06 100644
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -146,7 +146,6 @@ if (isset($_GET['AddedID'])) {
 	display_footer_exit();
 } else
 	check_edit_conflicts();
-
 //-----------------------------------------------------------------------------
 
 function copy_to_cart()
@@ -234,8 +233,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."));
@@ -307,7 +306,7 @@ if (isset($_POST['ProcessOrder']) && can_process()) {
 	}
 	$trans_no = key($_SESSION['Items']->trans_no);
 	$trans_type = $_SESSION['Items']->trans_type;
-
+	new_doc_date($_SESSION['Items']->document_date);
 	processing_end();
 	if ($modified) {
 		meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$trans_no");
@@ -361,8 +360,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'] );
@@ -422,7 +419,7 @@ function  handle_cancel_order()
 			}
 		} else {
 			processing_end();
-			meta_forward($path_to_root.'/index.php?application=orders');
+			meta_forward($path_to_root.'/index.php','application=orders');
 		}
 	}
 	$Ajax->activate('_page_body');
@@ -435,7 +432,7 @@ function  handle_cancel_order()
 //--------------------------------------------------------------------------------
 
 function create_cart($type, $trans_no)
-{
+{ 
 	processing_start();
 	$doc_type = $type;
 
@@ -445,7 +442,7 @@ function create_cart($type, $trans_no)
 		$doc = new Cart(30, array($trans_no));
 		$doc->trans_type = $type;
 		$doc->trans_no = 0;
-		$doc->document_date = Today(); // 2006-06-15. Added so Invoices and Deliveries get current day
+		$doc->document_date = new_doc_date();
 		if ($type == 10) {
 			$doc->due_date = get_invoice_duedate($doc->customer_id, $doc->document_date);
 			$doc->pos = user_pos();
@@ -513,6 +510,7 @@ if ($_SESSION['Items']->trans_type == 10) {
 	$corder = _("Commit Order Changes");
 }
 start_form();
+
 hidden('cart_id');
 
 $customer_error = display_order_header($_SESSION['Items'],
@@ -532,6 +530,7 @@ if ($customer_error == "") {
 
 		submit_center_first('ProcessOrder', $porder,
 		    _('Check entered data and save document'), 'default');
+		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'), 'default');