X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=dfeb153279eccdc426ca84180ecf0f610f08942e;hb=e8623dd6746abb8eec4eb3ddd583d208e531b8e7;hp=0524212b0e352aac7c874a254bf33905fc6ff8f4;hpb=dd1a21a371699b6f894d21c6950b668cda0f7b29;p=fa-stable.git

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 0524212b..dfeb1532 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,31 +178,44 @@ 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() {
+  global 	$Ajax;
 
+  $Ajax->activate('items_table');
+  set_focus('_stock_id_edit');
+}
 //--------------------------------------------------------------------------------
 
 function can_process() {
 	if (!is_date($_POST['OrderDate'])) {
 		display_error(_("The entered date is invalid."));
+		set_focus('OrderDate');
 		return false;
 	}
 	if ($_SESSION['Items']->trans_type!=30 && !is_date_in_fiscalyear($_POST['OrderDate'])) {
 		display_error(_("The entered date is not in fiscal year"));
+		set_focus('OrderDate');
 		return false;
 	}
 	if (count($_SESSION['Items']->line_items) == 0)	{
 		display_error(_("You must enter at least one non empty item line."));
+		set_focus('AddItem');
 		return false;
 	}
 	if (strlen($_POST['deliver_to']) <= 1) {
 		display_error(_("You must enter the person or company to whom delivery should be made to."));
+		set_focus('deliver_to');
 		return false;
 	}
 	if (strlen($_POST['delivery_address']) <= 1) {
 		display_error( _("You should enter the street address in the box provided. Orders cannot be accepted without a valid street address."));
+		set_focus('delivery_address');
 		return false;
 	}
 
@@ -211,21 +224,25 @@ function can_process() {
 
 	if (!check_num('freight_cost',0)) {
 		display_error(_("The shipping cost entered is expected to be numeric."));
+		set_focus('freight_cost');
 		return false;
 	}
 	if (!is_date($_POST['delivery_date'])) {
 		display_error(_("The delivery date is invalid."));
+		set_focus('delivery_date');
 		return false;
 	}
-	if (date1_greater_date2($_SESSION['Items']->document_date, $_POST['delivery_date'])) {
+	//if (date1_greater_date2($_SESSION['Items']->document_date, $_POST['delivery_date'])) {
+	if (date1_greater_date2($_POST['OrderDate'], $_POST['delivery_date'])) {
 		display_error(_("The requested delivery date is before the date of the order."));
+		set_focus('delivery_date');
 		return false;
 	}
 	if ($_SESSION['Items']->trans_type != 30 && !references::is_valid($_POST['ref'])) {
 		display_error(_("You must enter a reference."));
+		set_focus('ref');
 		return false;
 	}
-
 	return true;
 }
 
@@ -261,13 +278,16 @@ function check_item_data()
 
 	if (!check_num('qty', 0) || !check_num('Disc', 0, 100)) {
 		display_error( _("The item could not be updated because you are attempting to set the quantity ordered to less than 0, or the discount percent to more than 100."));
+		set_focus('qty');
 		return false;
 	} elseif (!check_num('price', 0)) {
 		display_error( _("Price for item must be entered and can not be less than 0"));
+		set_focus('price');
 		return false;
 	} elseif (isset($_POST['LineNo']) && isset($_SESSION['Items']->line_items[$_POST['LineNo']])
 	    && !check_num('qty', $_SESSION['Items']->line_items[$_POST['LineNo']]->qty_done)) {
 
+		set_focus('qty');
 		display_error(_("You attempting to make the quantity ordered a quantity less than has already been delivered. The quantity delivered cannot be modified retrospectively."));
 		return false;
 	}
@@ -280,10 +300,10 @@ 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();
+  line_start_focus();
 }
 
 //--------------------------------------------------------------------------------
@@ -291,23 +311,25 @@ 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."));
     }
+    line_start_focus();
 }
 
 //--------------------------------------------------------------------------------
 
 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();
 }
 
 //--------------------------------------------------------------------------------
@@ -358,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) {
@@ -370,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();
 
@@ -393,8 +411,11 @@ if (isset($_POST['UpdateItem']))
 if (isset($_POST['AddItem']))
 	handle_new_item();
 
-//--------------------------------------------------------------------------------
+if (isset($_POST['CancelItemChanges'])) {
+	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."));
@@ -435,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