Merged changes up to 2.3.16 into unstable

[fa-stable.git] / purchasing / supplier_payment.php

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index dd2a09d46cb8ed3e978792093ac76db215ca840b..800591df6baff9227e1cf8d9bde9235806e70094 100644 (file)
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -135,7 +135,7 @@ function check_inputs()
        }
 
        if (isset($_POST['charge']) && input_num('charge') > 0) {
-               $charge_acct = get_company_pref('bank_charge_act');
+               $charge_acct = get_bank_charge_account($_POST['bank_account']);
                if (get_gl_account($charge_acct) == false) {
                        display_error(_("The Bank Charge Account has not been set in System and General GL Setup."));
                        set_focus('charge');
@@ -178,7 +178,7 @@ function check_inputs()
        } 
        elseif (!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;
        }
@@ -281,12 +281,12 @@ start_form();
        }
 
        set_global_supplier($_POST['supplier_id']);
-       
+
        if (!list_updated('bank_account'))
                $_POST['bank_account'] = get_default_supplier_bank_account($_POST['supplier_id']);              
-       
+
     bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true);
-       
+
        bank_balance_row($_POST['bank_account']);
 
        table_section(2);