Allowed multiply bank accounts on same gl account, removed bank trans type.

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

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index c93db3a1a704ae1a20da8336d48ef718764194e0..03639e75482a03983bf9c3c89b23af3a34b7a138 100644 (file)
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -24,20 +24,29 @@ check_db_has_customers(_("There are no customers defined in the system."));
 
 check_db_has_bank_accounts(_("There are no bank accounts defined in the system."));
 
-check_db_has_bank_trans_types(_("There are no bank payment types defined in the system."));
-
 //----------------------------------------------------------------------------------------
+if ($ret = context_restore()) {
+       if(isset($ret['customer_id']))
+               $_POST['customer_id'] = $ret['customer_id'];
+       if(isset($ret['branch_id']))
+               $_POST['BranchID'] = $ret['branch_id'];
+}
+if (isset($_POST['_customer_id_editor'])) {
+       context_call($path_to_root.'/sales/manage/customers.php?debtor_no='.$_POST['customer_id'], 
+               array( 'customer_id', 'BranchID', 'bank_account', 'DateBanked', 
+                       'ref', 'amount', 'discount', 'memo_') );
+}
 
 if (isset($_GET['AddedID'])) {
        $payment_no = $_GET['AddedID'];
 
        display_notification_centered(_("The customer payment has been successfully entered."));
 
-       display_note(get_gl_view_str(12, $payment_no, _("View the GL Journal Entries for this Customer Payment")));
+       display_note(get_gl_view_str(12, $payment_no, _("&View the GL Journal Entries for this Customer Payment")));
 
-       hyperlink_params($path_to_root . "/sales/allocations/customer_allocate.php", _("Allocate this Customer Payment"), "trans_no=$payment_no&trans_type=12");
+       hyperlink_params($path_to_root . "/sales/allocations/customer_allocate.php", _("&Allocate this Customer Payment"), "trans_no=$payment_no&trans_type=12");
 
-       hyperlink_no_params($path_to_root . "/sales/customer_payments.php", _("Enter Another Customer Payment"));
+       hyperlink_no_params($path_to_root . "/sales/customer_payments.php", _("Enter Another &Customer Payment"));
        br(1);
        end_page();
        exit;
@@ -101,15 +110,17 @@ if (isset($_POST['AddPaymentItem'])) {
 }
 if (isset($_POST['_customer_id_button'])) {
 //     unset($_POST['branch_id']);
-       $Ajax->activate('branch_id');
+       $Ajax->activate('BranchID');
+}
+if (isset($_POST['_DateBanked_changed'])) {
+  $Ajax->activate('_ex_rate');
 }
 //----------------------------------------------------------------------------------------------
 
 if (isset($_POST['AddPaymentItem'])) {
        $payment_no = write_customer_payment(0, $_POST['customer_id'], $_POST['BranchID'],
-               $_POST['bank_account'], $_POST['DateBanked'], $_POST['ReceiptType'], $_POST['ref'],
+               $_POST['bank_account'], $_POST['DateBanked'], $_POST['ref'],
                input_num('amount'), input_num('discount'), $_POST['memo_']);
-
        meta_forward($_SERVER['PHP_SELF'], "AddedID=$payment_no");
 }
 
@@ -160,7 +171,6 @@ function display_item_form()
        read_customer_data();
 
        set_global_customer($_POST['customer_id']);
-
        if (isset($_POST['HoldAccount']) && $_POST['HoldAccount'] != 0) {
                echo "</table></table>";
                display_note(_("This customer account is on hold."), 0, 0, "class='redfb'");
@@ -173,7 +183,7 @@ function display_item_form()
 
                label_row(_("Customer prompt payment discount :"), $display_discount_percent);
 
-               date_row(_("Date of Deposit:"), 'DateBanked');
+               date_row(_("Date of Deposit:"), 'DateBanked','',null, 0, 0, 0, null, true);
 
                echo "</table>";
                echo "</td><td valign=top class='tableseparator'>"; // outer table
@@ -188,8 +198,6 @@ function display_item_form()
                        exchange_rate_display($cust_currency, $bank_currency, $_POST['DateBanked']);
                }
 
-               bank_trans_types_list_row(_("Type:"), 'ReceiptType', null);
-
                text_row(_("Reference:"), 'ref', null, 20, 40);
 
                textarea_row(_("Memo:"), 'memo_', null, 22, 4);