X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fbank_transfer.php;h=482539f4c9605044a5f404abe1148f438ea71397;hb=e735f0a06f8a43ed4885ff51a5c0b4332c130b40;hp=b7c7fcc5ef56ded16bb071e9b575b58cf4de588c;hpb=902f1015d874c33bd7946b17de2ad80b4f2144b6;p=fa-stable.git
diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index b7c7fcc5..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."));
@@ -34,7 +34,7 @@ check_db_has_bank_accounts(_("There are no bank accounts defined in the system."
if (isset($_GET['AddedID']))
{
$trans_no = $_GET['AddedID'];
- $trans_type = systypes::bank_transfer();
+ $trans_type = ST_BANKTRANSFER;
display_notification_centered( _("Transfer has been entered"));
@@ -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,12 +53,13 @@ if (isset($_POST['_DatePaid_changed'])) {
function gl_payment_controls()
{
- global $table_style2;
+ global $Refs;
+
$home_currency = get_company_currency();
start_form();
- start_outer_table($table_style2, 5);
+ start_outer_table(TABLESTYLE2);
table_section(1);
@@ -85,7 +86,7 @@ function gl_payment_controls()
table_section(2);
- ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::bank_transfer()));
+ ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_BANKTRANSFER));
textarea_row(_("Memo:"), 'memo_', null, 40,4);
@@ -100,6 +101,8 @@ function gl_payment_controls()
function check_valid_entries()
{
+ global $Refs;
+
if (!is_date($_POST['DatePaid']))
{
display_error(_("The entered date is invalid."));
@@ -108,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;
}
@@ -120,20 +123,34 @@ 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."));
set_focus('charge');
return false;
}
- if (!references::is_valid($_POST['ref']))
+ if (isset($_POST['charge']) && input_num('charge') > 0 && get_company_pref('bank_charge_act') == '') {
+ display_error(_("The Bank Charge Account has not been set in System and General GL Setup."));
+ set_focus('charge');
+ return false;
+ }
+ if (!$Refs->is_valid($_POST['ref']))
{
display_error(_("You must enter a reference."));
set_focus('ref');
return false;
}
- if (!is_new_reference($_POST['ref'], systypes::bank_transfer()))
+ if (!is_new_reference($_POST['ref'], ST_BANKTRANSFER))
{
display_error(_("The entered reference is already in use."));
set_focus('ref');
@@ -162,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();
}
}