Merged changes from stable branch up to 2.3.23.

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

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index e32f5a8f58ab1e181eed4df3bc098eaa068a983d..c2f09eff56da7a50d62f1974539cea2b7fb1717e 100644 (file)
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -21,10 +21,10 @@ include_once($path_to_root . "/sales/includes/sales_db.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
-if ($use_popup_windows) {
+if ($SysPrefs->use_popup_windows) {
        $js .= get_js_open_window(900, 500);
 }
-if ($use_date_picker) {
+if (user_use_date_picker()) {
        $js .= get_js_date_picker();
 }
 add_js_file('payalloc.js');
@@ -54,6 +54,7 @@ if (!isset($_POST['bank_account'])) { // first page call
                if($inv) {
                        $_SESSION['alloc']->person_id = $_POST['customer_id'] = $inv['debtor_no'];
                        $_SESSION['alloc']->read();
+                       $_POST['BranchID'] = $inv['branch_code'];
                        $_POST['DateBanked'] = sql2date($inv['tran_date']);
                        foreach($_SESSION['alloc']->allocs as $line => $trans) {
                                if ($trans->type == ST_SALESINVOICE && $trans->type_no == $_GET['SInvoice']) {
@@ -153,7 +154,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;
        }
@@ -190,7 +191,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');
@@ -247,9 +248,6 @@ if (isset($_POST['_customer_id_button'])) {
 //     unset($_POST['branch_id']);
        $Ajax->activate('BranchID');
 }
-//if (isset($_POST['_DateBanked_changed'])) {
-//  $Ajax->activate('_ex_rate');
-//}
 
 //----------------------------------------------------------------------------------------------
 
@@ -316,7 +314,7 @@ if (isset($_GET['trans_no']) && $_GET['trans_no'] > 0 )
                $_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT,$_POST['trans_no']);
        else
        {
-               $_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT,0);
+               $_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT, $_POST['trans_no']);
                $Ajax->activate('alloc_tbl');
        }
 }
@@ -341,6 +339,12 @@ start_form();
                hidden('customer_id', $_POST['customer_id']);
        }
 
+       if (list_updated('customer_id') || ($new && list_updated('bank_account'))) {
+               $_SESSION['alloc']->read();
+               $_POST['memo_'] = $_POST['amount'] = $_POST['discount'] = '';
+               $Ajax->activate('alloc_tbl');
+       }
+
        if (db_customer_has_branches($_POST['customer_id'])) {
                customer_branches_list_row(_("Branch:"), $_POST['customer_id'], 'BranchID', null, false, true, true);
        } else {
@@ -408,4 +412,3 @@ start_form();
 
 end_form();
 end_page();
-?>