Changed license type to GPLv3 in top of files

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

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index 03639e75482a03983bf9c3c89b23af3a34b7a138..5c871834e8e3540d7d172dfd305f9d6ce296e65d 100644 (file)
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -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");
@@ -84,6 +93,18 @@ function can_process()
                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');
@@ -118,9 +139,18 @@ if (isset($_POST['_DateBanked_changed'])) {
 //----------------------------------------------------------------------------------------------
 
 if (isset($_POST['AddPaymentItem'])) {
+       
+       $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');
+
        $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_']);
+               input_num('amount'), input_num('discount'), $_POST['memo_'], $rate);
        meta_forward($_SERVER['PHP_SELF'], "AddedID=$payment_no");
 }
 
@@ -148,10 +178,9 @@ 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);
@@ -172,8 +201,8 @@ function display_item_form()
 
        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) . "%";
 
@@ -185,9 +214,7 @@ function display_item_form()
 
                date_row(_("Date of Deposit:"), 'DateBanked','',null, 0, 0, 0, null, true);
 
-               echo "</table>";
-               echo "</td><td valign=top class='tableseparator'>"; // outer table
-               echo "<table>";
+               table_section(2);
 
                bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, true);
 
@@ -195,17 +222,14 @@ 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);
                }
 
                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."));