Added Bank Charge field to Customer Payment and Supplier Payment and a new default...
[fa-stable.git] / sales / customer_payments.php
index de86600d802e644e54bbb13bc11ff25f732437bb..a184b079d31f70c2d2020174edde60e1a647dcf8 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $path_to_root="..";
 $page_security = 3;
 include_once($path_to_root . "/includes/session.inc");
@@ -24,20 +33,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;
@@ -75,6 +93,24 @@ function can_process()
                return false;
        }
 
+       if (isset($_POST['charge']) && !check_num('charge', 0)) {
+               display_error(_("The entered amount is invalid or negative and cannot be processed."));
+               set_focus('charge');
+               return false;
+       }
+
+       if (isset($_POST['_ex_rate']) && !check_num('_ex_rate', 0.000001))
+       {
+               display_error(_("The exchange rate must be numeric and greater than zero."));
+               set_focus('_ex_rate');
+               return false;
+       }
+
+       if ($_POST['discount'] == "") 
+       {
+               $_POST['discount'] = 0;
+       }
+
        if (!check_num('discount')) {
                display_error(_("The entered discount is not a valid number."));
                set_focus('discount');
@@ -99,14 +135,30 @@ if (isset($_POST['AddPaymentItem'])) {
                unset($_POST['AddPaymentItem']);
        }
 }
-
+if (isset($_POST['_customer_id_button'])) {
+//     unset($_POST['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'],
-               input_num('amount'), input_num('discount'), $_POST['memo_']);
+       
+       $cust_currency = get_customer_currency($_POST['customer_id']);
+       $bank_currency = get_bank_account_currency($_POST['bank_account']);
+       $comp_currency = get_company_currency();
+       if ($comp_currency != $bank_currency && $bank_currency != $cust_currency)
+               $rate = 0;
+       else
+               $rate = input_num('_ex_rate');
+
+       new_doc_date($_POST['DateBanked']);
 
+       $payment_no = write_customer_payment(0, $_POST['customer_id'], $_POST['BranchID'],
+               $_POST['bank_account'], $_POST['DateBanked'], $_POST['ref'],
+               input_num('amount'), input_num('discount'), $_POST['memo_'], $rate, input_num('charge'));
        meta_forward($_SERVER['PHP_SELF'], "AddedID=$payment_no");
 }
 
@@ -134,21 +186,19 @@ function read_customer_data()
 function display_item_form()
 {
        global $table_style2;
-       start_table($table_style2, 5, 7);
-       echo "<tr><td valign=top>"; // outer table
 
-       echo "<table>";
+       start_outer_table($table_style2, 5);
+       table_section(1);
 
        if (!isset($_POST['customer_id']))
                $_POST['customer_id'] = get_global_customer(false);
        if (!isset($_POST['DateBanked'])) {
-               $_POST['DateBanked'] = Today();
+               $_POST['DateBanked'] = new_doc_date();
                if (!is_date_in_fiscalyear($_POST['DateBanked'])) {
                        $_POST['DateBanked'] = end_fiscalyear();
                }
        }
        customer_list_row(_("From Customer:"), 'customer_id', null, false, true);
-
        if (db_customer_has_branches($_POST['customer_id'])) {
                customer_branches_list_row(_("Branch:"), $_POST['customer_id'], 'BranchID', null, false, true, true);
        } else {
@@ -158,10 +208,9 @@ 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'");
+               end_outer_table();
+               display_error(_("This customer account is on hold."));
        } else {
                $display_discount_percent = percent_format($_POST['pymt_discount']*100) . "%";
 
@@ -171,11 +220,11 @@ function display_item_form()
 
                label_row(_("Customer prompt payment discount :"), $display_discount_percent);
 
-               date_row(_("Date of Deposit:"), 'DateBanked');
+               amount_row(_("Bank Charge:"), 'charge');
 
-               echo "</table>";
-               echo "</td><td valign=top class='tableseparator'>"; // outer table
-               echo "<table>";
+               table_section(2);
+
+               date_row(_("Date of Deposit:"), 'DateBanked', '', true, 0, 0, 0, null, true);
 
                bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, true);
 
@@ -183,29 +232,24 @@ function display_item_form()
                $bank_currency = get_bank_account_currency($_POST['bank_account']);
 
                if ($cust_currency != $bank_currency) {
-                       exchange_rate_display($cust_currency, $bank_currency, $_POST['DateBanked']);
+                       exchange_rate_display($bank_currency, $cust_currency, $_POST['DateBanked'], true);
                }
 
-               bank_trans_types_list_row(_("Type:"), 'ReceiptType', null);
-
                text_row(_("Reference:"), 'ref', null, 20, 40);
 
                textarea_row(_("Memo:"), 'memo_', null, 22, 4);
 
-               echo "</table>";
-
-               echo "</td></tr>";
-               end_table(); // outer table
+               end_outer_table(1);
 
                if ($cust_currency != $bank_currency)
                        display_note(_("Amount and discount are in customer's currency."));
 
-               echo"<br>";
+               br();
 
-               submit_center('AddPaymentItem', _("Add Payment"));
+               submit_center('AddPaymentItem', _("Add Payment"), true, '', 'default');
        }
 
-       echo "<br>";
+       br();
 }
 
 //----------------------------------------------------------------------------------------------