X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=25d381a4004561b7b8916f48b0f328e8a0e9fa78;hb=8fd0c50cc4a19a07c61ee87a632377419d096a5a;hp=3b1dacb1ad197eb06b25ec06309d9b67ddc446a0;hpb=56f1ebc86a522e3fd004f5957805eb4f5807d342;p=fa-stable.git

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 3b1dacb1..25d381a4 100644
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -11,14 +11,13 @@ $path_to_root="..";
 
 include_once($path_to_root . "/sales/includes/cart_class.inc");
 include_once($path_to_root . "/includes/session.inc");
-include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/sales/includes/sales_ui.inc");
 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 = get_js_form_entry("StockID2", "stock_id", "qty");
+$js = '';
 if ($use_popup_windows) {
 	$js .= get_js_open_window(900, 500);
 }
@@ -136,12 +135,12 @@ 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'];
 	$cart->cust_ref = $_POST['cust_ref'];
-	$cart->freight_cost = $_POST['freight_cost'];
+	$cart->freight_cost = input_num('freight_cost');
 	$cart->deliver_to = $_POST['deliver_to'];
 	$cart->delivery_address = $_POST['delivery_address'];
 	$cart->phone = $_POST['phone'];
@@ -170,7 +169,7 @@ function copy_from_cart()
 	$_POST['OrderDate'] = $cart->document_date;
 	$_POST['delivery_date'] = $cart->due_date;
 	$_POST['cust_ref'] = $cart->cust_ref;
-	$_POST['freight_cost'] = $cart->freight_cost;
+	$_POST['freight_cost'] = price_format($cart->freight_cost);
 
 	$_POST['deliver_to'] = $cart->deliver_to;
 	$_POST['delivery_address'] = $cart->delivery_address;
@@ -182,48 +181,61 @@ function copy_from_cart()
 	$_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');
+}
 //--------------------------------------------------------------------------------
 
 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;
 	}
 
 	if ($_POST['freight_cost'] == "")
-		$_POST['freight_cost'] = 0;
+		$_POST['freight_cost'] = price_format(0);
 
-	if (!is_numeric($_POST['freight_cost'])) {
+	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'])) {
 		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;
 	}
 
@@ -259,16 +271,19 @@ if (isset($_POST['ProcessOrder']) && can_process()) {
 
 function check_item_data()
 {
-	if (!is_numeric($_POST['qty']) || $_POST['qty'] < 0 || $_POST['Disc'] > 100 || $_POST['Disc'] < 0) {
+
+	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 (!is_numeric($_POST['price']) || $_POST['price'] < 0) {
-
-		display_error( _("Price for item must be entered and can not be less then 0"));
+	} 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']])
-		&& $_SESSION['Items']->line_items[$_POST['LineNo']]->qty_done > $_POST['qty']) {
+	    && !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,23 +295,24 @@ function check_item_data()
 function handle_update_item()
 {
 	if ($_POST['UpdateItem'] != '' && check_item_data()) {
-		$_SESSION['Items']->update_cart_item($_POST['LineNo'], $_POST['qty'],
-			$_POST['price'], ($_POST['Disc'] / 100));
+		$_SESSION['Items']->update_cart_item($_POST['LineNo'],
+		 input_num('qty'), input_num('price'), 
+		 input_num('Disc') / 100 );
 	}
+  copy_from_cart();
+  line_start_focus();
 }
 
 //--------------------------------------------------------------------------------
 
-function handle_delete_item()
+function handle_delete_item($line_no)
 {
-	if ($_GET['Delete'] != ""){
-		$line_no = $_GET['Delete'];
-		if ($_SESSION['Items']->some_already_delivered($line_no) == 0) {
-			$_SESSION['Items']->remove_from_cart($line_no);
-		} else {
-			display_error(_("This item cannot be deleted because some of it has already been delivered."));
-		}
-	}
+    if ($_SESSION['Items']->some_already_delivered($line_no) == 0) {
+	$_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();
 }
 
 //--------------------------------------------------------------------------------
@@ -306,10 +322,11 @@ function handle_new_item()
 	if (!check_item_data()) {
 			return;
 	}
-	add_to_order($_SESSION['Items'], $_POST['stock_id'], $_POST['qty'],
-		$_POST['price'], $_POST['Disc'] / 100);
+	add_to_order($_SESSION['Items'], $_POST['stock_id'], input_num('qty'),
+		input_num('price'), input_num('Disc') / 100);
 
 	$_POST['StockID2'] = $_POST['stock_id']	= "";
+	line_start_focus();
 }
 
 //--------------------------------------------------------------------------------
@@ -355,32 +372,39 @@ function create_cart($type, $trans_no)
 	$doc_type = $type;
 
 	if($type != 30 && $trans_no != 0) { // this is template
-	$doc_type = 30;
-
-	$doc = new Cart(30, array($trans_no));
-	$doc->trans_type = $type;
-	$doc->trans_no = 0;
-
-	$doc->due_date = $doc->document_date = Today();
-	$doc->reference = references::get_next($doc->trans_type);
-	$doc->Comments='';
-	foreach($doc->line_items as $line_no => $line) {
-		$doc->line_items[$line_no]->qty_done = 0;
-	}
-	$_SESSION['Items'] = $doc;
+		$doc_type = 30;
+
+		$doc = new Cart(30, array($trans_no));
+		$doc->trans_type = $type;
+		$doc->trans_no = 0;
+		if ($type == 10)
+			$doc->due_date = get_invoice_duedate($doc->customer_id, $doc->document_date);
+		else
+			$doc->due_date = $doc->document_date = Today();
+		$doc->reference = references::get_next($doc->trans_type);
+		$doc->Comments='';
+		foreach($doc->line_items as $line_no => $line) {
+			$doc->line_items[$line_no]->qty_done = 0;
+		}
+		$_SESSION['Items'] = $doc;
 	} else
-	$_SESSION['Items'] = new Cart($type,array($trans_no));
+		$_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();
 
-if (isset($_GET['Delete']))
-	handle_delete_item();
+$id = find_submit('Delete');
+if ($id!=-1)
+	handle_delete_item($id);
 
 if (isset($_POST['UpdateItem']))
 	handle_update_item();
@@ -388,6 +412,9 @@ if (isset($_POST['UpdateItem']))
 if (isset($_POST['AddItem']))
 	handle_new_item();
 
+if (isset($_POST['CancelItemChanges']) || isset($_POST['UpdateItem']))
+	line_start_focus();
+
 //--------------------------------------------------------------------------------
 
 check_db_has_stock_items(_("There are no inventory items defined in the system."));