X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=4d85035946d618611016c262871251a0f653d610;hb=0e484731f1e6036625f5f22a59be003d0b409ef2;hp=16098b0f1b8744eb5b10aed975035fdb60c028d0;hpb=6183e9450dcd7e4c747889c10903f6ff1b0add33;p=fa-stable.git

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 16098b0f..4d850359 100644
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -16,11 +16,12 @@ include_once($path_to_root . "/sales/includes/ui/sales_order_ui.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 include_once($path_to_root . "/sales/includes/db/sales_types_db.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
-
 $js = '';
+
 if ($use_popup_windows) {
 	$js .= get_js_open_window(900, 500);
 }
+
 if ($use_date_picker) {
 	$js .= get_js_date_picker();
 }
@@ -48,7 +49,6 @@ if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) {
 }
 
 page($_SESSION['page_title'], false, false, "", $js);
-
 //-----------------------------------------------------------------------------
 
 if (isset($_GET['AddedID'])) {
@@ -135,7 +135,7 @@ function copy_to_cart()
 	if ($cart->trans_type!=30) {
 		$cart->reference = $_POST['ref'];
 	}
-	$cart->Comments =  str_replace("'", "\\'", $_POST['Comments']);
+	$cart->Comments =  $_POST['Comments'];
 
 	$cart->document_date = $_POST['OrderDate'];
 	$cart->due_date = $_POST['delivery_date'];
@@ -178,13 +178,17 @@ function copy_from_cart()
 	$_POST['ship_via'] = $cart->ship_via;
 
 	$_POST['customer_id'] = $cart->customer_id;
+
 	$_POST['branch_id'] = $cart->Branch;
 	$_POST['sales_type'] = $cart->sales_type;
 }
 //--------------------------------------------------------------------------------
 
 function line_start_focus() {
-  set_focus(get_company_pref('no_supplier_list') ? 'stock_id_edit' : 'StockID2');
+  global 	$Ajax;
+
+  $Ajax->activate('items_table');
+  set_focus('_stock_id_edit');
 }
 //--------------------------------------------------------------------------------
 
@@ -238,7 +242,6 @@ function can_process() {
 		set_focus('ref');
 		return false;
 	}
-
 	return true;
 }
 
@@ -296,7 +299,7 @@ function handle_update_item()
 {
 	if ($_POST['UpdateItem'] != '' && check_item_data()) {
 		$_SESSION['Items']->update_cart_item($_POST['LineNo'],
-		 input_num('qty'), input_num('price'), 
+		 input_num('qty'), input_num('price'),
 		 input_num('Disc') / 100 );
 	}
   copy_from_cart();
@@ -308,7 +311,7 @@ function handle_update_item()
 function handle_delete_item($line_no)
 {
     if ($_SESSION['Items']->some_already_delivered($line_no) == 0) {
-	$_SESSION['Items']->remove_from_cart($line_no);
+	    $_SESSION['Items']->remove_from_cart($line_no);
     } else {
 	display_error(_("This item cannot be deleted because some of it has already been delivered."));
     }
@@ -319,13 +322,13 @@ function handle_delete_item($line_no)
 
 function handle_new_item()
 {
+
 	if (!check_item_data()) {
 			return;
 	}
 	add_to_order($_SESSION['Items'], $_POST['stock_id'], input_num('qty'),
 		input_num('price'), input_num('Disc') / 100);
-
-	$_POST['StockID2'] = $_POST['stock_id']	= "";
+	$_POST['_stock_id_edit'] = $_POST['stock_id']	= "";
 	line_start_focus();
 }
 
@@ -377,10 +380,11 @@ 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
 		if ($type == 10)
 			$doc->due_date = get_invoice_duedate($doc->customer_id, $doc->document_date);
 		else
-			$doc->due_date = $doc->document_date = Today();
+			$doc->due_date = $doc->document_date;
 		$doc->reference = references::get_next($doc->trans_type);
 		$doc->Comments='';
 		foreach($doc->line_items as $line_no => $line) {
@@ -389,16 +393,11 @@ function create_cart($type, $trans_no)
 		$_SESSION['Items'] = $doc;
 	} else
 		$_SESSION['Items'] = new Cart($type,array($trans_no));
-
 	copy_from_cart();
 }
 
 //--------------------------------------------------------------------------------
 
-
-//if (isset($_GET['Delete']) || isset($_GET['Edit']))
-//	copy_from_cart(); // GET method need form restore
-
 if (isset($_POST['CancelOrder']))
 	handle_cancel_order();
 
@@ -412,11 +411,11 @@ if (isset($_POST['UpdateItem']))
 if (isset($_POST['AddItem']))
 	handle_new_item();
 
-if (isset($_POST['CancelItemChanges']) || isset($_POST['UpdateItem']))
+if (isset($_POST['CancelItemChanges']) || isset($_POST['UpdateItem'])) {
 	line_start_focus();
+}
 
 //--------------------------------------------------------------------------------
-
 check_db_has_stock_items(_("There are no inventory items defined in the system."));
 
 check_db_has_customer_branches(_("There are no customers, or there are no customers with branches. Please define customers and customer branches."));
@@ -457,16 +456,20 @@ if ($customer_error == "") {
 	end_table(1);
 
 	if ($_SESSION['Items']->trans_no == 0) {
-		submit_center_first('ProcessOrder', $porder);
+
+		submit_center_first('ProcessOrder', $porder,
+		    _('Check entered data and save document'), true);
 	} else {
-		submit_center_first('ProcessOrder', $corder);
+		submit_center_first('ProcessOrder', $corder,
+		    _('Validate changes and update document'), true);
 	}
 
-	submit_center_last('CancelOrder', $cancelorder);
+	submit_center_last('CancelOrder', $cancelorder,
+	   _('Cancels document entry or removes sales order when editing an old document'));
 } else {
 	display_error($customer_error);
 }
 end_form();
-//--------------------------------------------------------------------------------
 end_page();
+
 ?>
\ No newline at end of file