X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fbank_transfer.php;h=482539f4c9605044a5f404abe1148f438ea71397;hb=e735f0a06f8a43ed4885ff51a5c0b4332c130b40;hp=f971fc569249772f9eced311c8d63ecd785dc6f6;hpb=cca5803c1eebf65e6ac5a54af26f1c2883f3a7d3;p=fa-stable.git
diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index f971fc56..482539f4 100644
--- a/gl/bank_transfer.php
+++ b/gl/bank_transfer.php
@@ -25,7 +25,7 @@ if ($use_popup_windows)
$js .= get_js_open_window(800, 500);
if ($use_date_picker)
$js .= get_js_date_picker();
-page(_("Transfer between Bank Accounts"), false, false, "", $js);
+page(_($help_context = "Transfer between Bank Accounts"), false, false, "", $js);
check_db_has_bank_accounts(_("There are no bank accounts defined in the system."));
@@ -42,7 +42,7 @@ if (isset($_GET['AddedID']))
hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter &Another Transfer"));
- safeExit();
+ display_footer_exit();
}
if (isset($_POST['_DatePaid_changed'])) {
@@ -53,13 +53,13 @@ if (isset($_POST['_DatePaid_changed'])) {
function gl_payment_controls()
{
- global $table_style2, $Refs;
+ global $Refs;
$home_currency = get_company_currency();
start_form();
- start_outer_table($table_style2, 5);
+ start_outer_table(TABLESTYLE2);
table_section(1);
@@ -111,7 +111,7 @@ function check_valid_entries()
}
if (!is_date_in_fiscalyear($_POST['DatePaid']))
{
- display_error(_("The entered date is not in fiscal year."));
+ display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
set_focus('DatePaid');
return false;
}
@@ -123,6 +123,15 @@ function check_valid_entries()
return false;
}
+ $limit = get_bank_account_limit($_POST['FromBankAccount'], $_POST['DatePaid']);
+
+ if ($limit != null && ($limit < (input_num('charge') + input_num('amount'))))
+ {
+ display_error(sprintf(_("The total bank amount exceeds allowed limit (%s) for source account."), price_format($limit)));
+ set_focus('amount');
+ return false;
+ }
+
if (isset($_POST['charge']) && !check_num('charge', 0))
{
display_error(_("The entered amount is invalid or less than zero."));
@@ -170,21 +179,11 @@ function handle_add_deposit()
//----------------------------------------------------------------------------------------
-function safeExit()
-{
- echo "
";
- end_page();
- exit;
-}
-
-//----------------------------------------------------------------------------------------
-
if (isset($_POST['AddPayment']))
{
if (check_valid_entries() == true)
{
handle_add_deposit();
- safeExit();
}
}