Merged changes up to 2.3.16 into unstable

[fa-stable.git] / sales / customer_payments.php

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index d0a0ea8b04e0038429615fdd88c108e1af5f68b2..42a84fb2fd4b83e59abcdafb3aac86a812290665 100644 (file)
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -148,7 +148,7 @@ function can_process()
                set_focus('DateBanked');
                return false;
        } elseif (!is_date_in_fiscalyear($_POST['DateBanked'])) {
-               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('DateBanked');
                return false;
        }
@@ -185,7 +185,7 @@ function can_process()
                return false;
        }
        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');
@@ -238,6 +238,18 @@ if (isset($_POST['_DateBanked_changed'])) {
   $Ajax->activate('_ex_rate');
 }
 
+//Chaitanya : 13-OCT-2011 - To support Edit feature
+if (isset($_POST['ref']) && $_SESSION['alloc']->trans_no == 0) // added by Joe to fix the browser back button
+{
+       $tno = get_customer_trans_from_ref(ST_CUSTPAYMENT, $_POST['ref']);
+       if ($tno != false)
+       {
+               display_error( _("The entered reference is already in use."));
+               display_footer_exit();
+       }
+}
+$new = $_SESSION['alloc']->trans_no == 0;
+
 //----------------------------------------------------------------------------------------------
 
 if (get_post('AddPaymentItem') && can_process()) {
@@ -363,7 +375,6 @@ start_form();
        //Chaitanya : 13-OCT-2011 - Is AJAX call really needed ???
        //bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, true);
        bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, false);
-
        text_row(_("Reference:"), 'ref', null, 20, 40);
 
        table_section(3);