Fixes in sales reports to use debtor_trans.tax_included field instead of trans_tax_de...

[fa-stable.git] / gl / bank_transfer.php

diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index 1f7cbe3efec1c028b345f3254ebced02e8fda0b7..d99402b4ae3fad9d6e0b0d63f882499bbcf55a19 100644 (file)
--- a/gl/bank_transfer.php
+++ b/gl/bank_transfer.php
@@ -113,7 +113,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;
        }
@@ -134,7 +134,7 @@ function check_valid_entries()
 
        $amnt_tr = input_num('charge') + input_num('amount');
 
-       if ($limit != null && ($limit < $amnt_tr)))
+       if ($limit != null && ($limit < $amnt_tr))
        {
                display_error(sprintf(_("The total bank amount exceeds allowed limit (%s) for source account."), price_format($limit)));
                set_focus('amount');
@@ -154,7 +154,7 @@ function check_valid_entries()
                set_focus('charge');
                return false;
        }
-       if (isset($_POST['charge']) && input_num('charge') > 0 && get_company_pref('bank_charge_act') == '') {
+       if (isset($_POST['charge']) && input_num('charge') > 0 && get_bank_charge_account($_POST['FromBankAccount']) == '') {
                display_error(_("The Bank Charge Account has not been set in System and General GL Setup."));
                set_focus('charge');
                return false;