Vlrsnup according to Apmuthu's list.

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

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index 3521f30b5879a859927b17973d9eac4bd0c7db1e..956023bbcf14933bb17609686ca63dc1a1b651f6 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']) {
@@ -313,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');
        }
 }
@@ -338,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 {
@@ -405,4 +412,3 @@ start_form();
 
 end_form();
 end_page();
-?>