Merged latest changes from stable branch.

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

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index 3521f30b5879a859927b17973d9eac4bd0c7db1e..3b44bc67e8613ee7bb906ae6eed66ff6da497777 100644 (file)
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -313,7 +313,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 +338,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 {