X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=sales%2Fcredit_note_entry.php;h=1946aca1e339a6728e548e8db38f8e039b5dedf1;hb=781557dd6312e10be5e693ee5a63b7a309dc0591;hp=5de3dfb9d11332e39dc29748257186ad60ab71a8;hpb=0ad7b92c6cf2e4e65ca0fa94ba31f30f7b292ba8;p=fa-stable.git
diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index 5de3dfb9..1946aca1 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,13 +175,15 @@ function handle_update_item()
$_SESSION['Items']->update_cart_item($_POST['line_no'], input_num('qty'),
input_num('price'), input_num('Disc') / 100);
}
+ line_start_focus();
}
//-----------------------------------------------------------------------------
-function handle_delete_item()
+function handle_delete_item($line_no)
{
- $_SESSION['Items']->remove_from_cart($_GET['Delete']);
+ $_SESSION['Items']->remove_from_cart($line_no);
+ line_start_focus();
}
//-----------------------------------------------------------------------------
@@ -182,13 +196,12 @@ function handle_new_item()
add_to_order($_SESSION['Items'], $_POST['stock_id'], input_num('qty'),
input_num('price'), input_num('Disc') / 100);
+ line_start_focus();
}
//-----------------------------------------------------------------------------
-if (isset($_GET['Delete']) || isset($_GET['Edit']))
- copy_from_cn();
-
-if (isset($_GET['Delete']))
- handle_delete_item();
+$id = find_submit('Delete');
+if ($id!=-1)
+ handle_delete_item($id);
if (isset($_POST['AddItem']) || isset($_POST['UpdateItem']))
copy_to_cn();
@@ -199,6 +212,9 @@ if (isset($_POST['AddItem']))
if (isset($_POST['UpdateItem']))
handle_update_item();
+if (isset($_POST['CancelItemChanges']) || isset($_POST['UpdateItem']))
+ line_start_focus();
+
//-----------------------------------------------------------------------------
if (!processing_active()) {
@@ -230,7 +246,7 @@ if ($customer_error == "") {
echo "