projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Final fixes in html layout
[fa-stable.git]
/
gl
/
gl_payment.php
diff --git
a/gl/gl_payment.php
b/gl/gl_payment.php
index 696506820f84fc88939acc867b4fa4773f3f886a..0b96feec3c0c27f74e2770d80c8bb419a427d281 100644
(file)
--- a/
gl/gl_payment.php
+++ b/
gl/gl_payment.php
@@
-12,13
+12,13
@@
include_once($path_to_root . "/gl/includes/ui/gl_payment_ui.inc");
include_once($path_to_root . "/gl/includes/gl_db.inc");
include_once($path_to_root . "/gl/includes/gl_ui.inc");
include_once($path_to_root . "/gl/includes/gl_db.inc");
include_once($path_to_root . "/gl/includes/gl_ui.inc");
-$js =
get_js_form_entry("CodeID2", "code_id", "amount")
;
+$js =
''
;
if ($use_popup_windows)
$js .= get_js_open_window(800, 500);
if ($use_date_picker)
$js .= get_js_date_picker();
if ($use_popup_windows)
$js .= get_js_open_window(800, 500);
if ($use_date_picker)
$js .= get_js_date_picker();
-
$js .= get_js_
set_focus('CodeID2');
-page(_("Bank Account Payment Entry"), false, false,
"setFocus()"
, $js);
+set_focus('CodeID2');
+page(_("Bank Account Payment Entry"), false, false,
''
, $js);
//-----------------------------------------------------------------------------------------------
//-----------------------------------------------------------------------------------------------
@@
-102,21
+102,25
@@
if (isset($_POST['Process']))
if (!references::is_valid($_POST['ref']))
{
display_error( _("You must enter a reference."));
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'], systypes::bank_payment()))
{
display_error( _("The entered reference is already in use."));
$input_error = 1;
}
elseif (!is_new_reference($_POST['ref'], systypes::bank_payment()))
{
display_error( _("The entered reference is already in use."));
+ set_focus('ref');
$input_error = 1;
}
elseif (!is_date($_POST['date_']))
{
display_error(_("The entered date for the payment is invalid."));
$input_error = 1;
}
elseif (!is_date($_POST['date_']))
{
display_error(_("The entered date for the payment is invalid."));
+ set_focus('date_');
$input_error = 1;
}
elseif (!is_date_in_fiscalyear($_POST['date_']))
{
display_error(_("The entered date is not in fiscal year."));
$input_error = 1;
}
elseif (!is_date_in_fiscalyear($_POST['date_']))
{
display_error(_("The entered date is not in fiscal year."));
+ set_focus('date_');
$input_error = 1;
}
$input_error = 1;
}
@@
-149,18
+153,21
@@
function check_item_data()
if (!check_num('amount', 0))
{
display_error( _("The amount entered is not a valid number or is less than zero."));
if (!check_num('amount', 0))
{
display_error( _("The amount entered is not a valid number or is less than zero."));
+ set_focus('amount');
return false;
}
if ($_POST['code_id'] == $_POST['bank_account'])
{
display_error( _("The source and destination accouts cannot be the same."));
return false;
}
if ($_POST['code_id'] == $_POST['bank_account'])
{
display_error( _("The source and destination accouts cannot be the same."));
+ set_focus('code_id');
return false;
}
if (is_bank_account($_POST['code_id']))
{
display_error( _("You cannot make a payment to a bank account. Please use the transfer funds facility for this."));
return false;
}
if (is_bank_account($_POST['code_id']))
{
display_error( _("You cannot make a payment to a bank account. Please use the transfer funds facility for this."));
+ set_focus('code_id');
return false;
}
return false;
}
@@
-237,9
+244,13
@@
end_table(1);
if (!isset($_POST['Process']))
{
if (!isset($_POST['Process']))
{
- submit_center_first('Update', _("Update"));
if ($_SESSION['pay_items']->count_gl_items() >= 1)
if ($_SESSION['pay_items']->count_gl_items() >= 1)
+ {
+ submit_center_first('Update', _("Update"));
submit_center_last('Process', _("Process Payment"));
submit_center_last('Process', _("Process Payment"));
+ }
+ else
+ submit_center('Update', _("Update"));
}
end_form();
}
end_form();