Merged changes from stable branch up to 2.3.12

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

diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index 439d6b6e0e63982bd79bb6d0d7def31a619174b0..1dbc3939c0ed714558ad897b7dc2649f33d6a6cb 100644 (file)
--- a/gl/bank_transfer.php
+++ b/gl/bank_transfer.php
@@ -118,7 +118,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;
        }
@@ -159,7 +159,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;