Added Bank Charge field to Customer Payment and Supplier Payment and a new default...

[fa-stable.git] / purchasing / supplier_payment.php

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index a530ecb4d8863134066d557f8b266af0c47c72ca..fca9417f998dc7371106bb11728e363a72910394 100644 (file)
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.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 = 5;
 include_once($path_to_root . "/includes/session.inc");
@@ -64,31 +73,32 @@ if (isset($_GET['AddedID']))
 function display_controls()
 {
        global $table_style2;
-       start_form(false, true);
+       start_form();
 
        if (!isset($_POST['supplier_id']))
                $_POST['supplier_id'] = get_global_supplier(false);
        if (!isset($_POST['DatePaid']))
        {
-               $_POST['DatePaid'] = Today();
+               $_POST['DatePaid'] = new_doc_date();
                if (!is_date_in_fiscalyear($_POST['DatePaid']))
                        $_POST['DatePaid'] = end_fiscalyear();
        }               
-       start_table($table_style2, 5, 7);
-       echo "<tr><td valign=top>"; // outer table
-
-       echo "<table>";
+       //start_table($table_style2, 5, 7);
+       //echo "<tr><td valign=top>"; // outer table
+       start_outer_table($table_style2, 5);
 
+       //echo "<table>";
+       table_section(1);
+       
     bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true);
 
        amount_row(_("Amount of Payment:"), 'amount');
        amount_row(_("Amount of Discount:"), 'discount');
+       amount_row(_("Bank Charge:"), 'charge');
 
-    date_row(_("Date Paid") . ":", 'DatePaid', '', null, 0, 0, 0, null, true);
+    date_row(_("Date Paid") . ":", 'DatePaid', '', true, 0, 0, 0, null, true);
 
-       echo "</table>";
-       echo "</td><td valign=top class='tableseparator'>"; // outer table
-       echo "<table>";
+       table_section(2);
 
     supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true);
 
@@ -98,19 +108,16 @@ function display_controls()
        $bank_currency = get_bank_account_currency($_POST['bank_account']);
        if ($bank_currency != $supplier_currency) 
        {
-               exchange_rate_display($bank_currency, $supplier_currency, $_POST['DatePaid']);
+               exchange_rate_display($bank_currency, $supplier_currency, $_POST['DatePaid'], true);
        }
 
     ref_row(_("Reference:"), 'ref', '', references::get_next(22));
 
-    text_row(_("Memo:"), 'memo_', null, 52,50);
+       textarea_row(_("Memo:"), 'memo_', null, 22, 4);
 
-       echo "</table>";
+       end_outer_table(1); // outer table
 
-       echo "</td></tr>";
-       end_table(1); // outer table
-
-       submit_center('ProcessSuppPayment',_("Enter Payment"), true, '', true);
+       submit_center('ProcessSuppPayment',_("Enter Payment"), true, '', 'default');
 
        if ($bank_currency != $supplier_currency) 
        {
@@ -136,6 +143,19 @@ function check_inputs()
                return false;
        }
 
+       if (isset($_POST['charge']) && !check_num('charge', 0)) {
+               display_error(_("The entered amount is invalid or less than zero."));
+               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;
@@ -150,7 +170,7 @@ function check_inputs()
 
        if (input_num('amount') - input_num('discount') <= 0) 
        {
-               display_error(_("The total of the amount and the discount negative. Please enter positive values."));
+               display_error(_("The total of the amount and the discount is zero or negative. Please enter positive values."));
                set_focus('amount');
                return false;
        }
@@ -188,10 +208,18 @@ function check_inputs()
 
 function handle_add_payment()
 {
+       $supp_currency = get_supplier_currency($_POST['supplier_id']);
+       $bank_currency = get_bank_account_currency($_POST['bank_account']);
+       $comp_currency = get_company_currency();
+       if ($comp_currency != $bank_currency && $bank_currency != $supp_currency)
+               $rate = 0;
+       else
+               $rate = input_num('_ex_rate');
+
        $payment_id = add_supp_payment($_POST['supplier_id'], $_POST['DatePaid'],
                $_POST['bank_account'], input_num('amount'), input_num('discount'), 
-               $_POST['ref'], $_POST['memo_']);
-
+               $_POST['ref'], $_POST['memo_'], $rate, input_num('charge'));
+       new_doc_date($_POST['DatePaid']);
        //unset($_POST['supplier_id']);
        unset($_POST['bank_account']);
        unset($_POST['DatePaid']);