X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcredit_note_entry.php;h=fe9bd274a7468c8cac970a4ca132817030caea59;hb=492d633dd684e8308c7aafd5922ec52cbfc60498;hp=5b2af3b2e63b388152d7ea34859f7d3d37e1ced4;hpb=5af53b13622ca77bc851cccaa087d7e2aedc3401;p=fa-stable.git

diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index 5b2af3b2..fe9bd274 100644
--- a/sales/credit_note_entry.php
+++ b/sales/credit_note_entry.php
@@ -54,6 +54,11 @@ if (isset($_GET['AddedID'])) {
 
 	display_footer_exit();
 }
+//--------------------------------------------------------------------------------
+
+function line_start_focus() {
+  set_focus(get_company_pref('no_supplier_list') ? 'stock_id_edit' : 'StockID2');
+}
 
 //-----------------------------------------------------------------------------
 
@@ -102,17 +107,21 @@ function can_process()
 	if($_SESSION['Items']->trans_no == 0) {
 	    if (!references::is_valid($_POST['ref'])) {
 		display_error( _("You must enter a reference."));
+		set_focus('ref');
 		$input_error = 1;
 	    } elseif (!is_new_reference($_POST['ref'], 11))	{
 		display_error( _("The entered reference is already in use."));
+		set_focus('ref');
 		$input_error = 1;
 	    } 
 	}
 	if (!is_date($_POST['OrderDate'])) {
 		display_error(_("The entered date for the credit note is invalid."));
+		set_focus('OrderDate');
 		$input_error = 1;
 	} elseif (!is_date_in_fiscalyear($_POST['OrderDate'])) {
 		display_error(_("The entered date is not in fiscal year."));
+		set_focus('OrderDate');
 		$input_error = 1;
 	}
 	return ($input_error == 0);
@@ -142,14 +151,17 @@ function check_item_data()
 {
 	if (!check_num('qty',0)) {
 		display_error(_("The quantity must be greater than zero."));
+		set_focus('qty');
 		return false;
 	}
 	if (!check_num('price',0)) {
 		display_error(_("The entered price is negative or invalid."));
+		set_focus('price');
 		return false;
 	}
 	if (!check_num('Disc', 0, 100)) {
 		display_error(_("The entered discount percent is negative, greater than 100 or invalid."));
+		set_focus('Disc');
 		return false;
 	}
 	return true;
@@ -163,7 +175,7 @@ function handle_update_item()
 		$_SESSION['Items']->update_cart_item($_POST['line_no'], input_num('qty'),
 			input_num('price'), input_num('Disc') / 100);
 	}
-    set_focus('StockID2');
+    line_start_focus();
 }
 
 //-----------------------------------------------------------------------------
@@ -171,7 +183,7 @@ function handle_update_item()
 function handle_delete_item($line_no)
 {
 	$_SESSION['Items']->remove_from_cart($line_no);
-    set_focus('StockID2');
+    line_start_focus();
 }
 
 //-----------------------------------------------------------------------------
@@ -184,7 +196,7 @@ function handle_new_item()
 
 	add_to_order($_SESSION['Items'], $_POST['stock_id'], input_num('qty'),
 		input_num('price'), input_num('Disc') / 100);
-    set_focus('StockID2');
+    line_start_focus();
 }
 //-----------------------------------------------------------------------------
 $id = find_submit('Delete');
@@ -201,7 +213,7 @@ if (isset($_POST['UpdateItem']))
 	handle_update_item();
 
 if (isset($_POST['CancelItemChanges']) || isset($_POST['UpdateItem']))
-	set_focus('StockID2');
+	line_start_focus();
 
 //-----------------------------------------------------------------------------