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 0834f2a12c4f4d3b255b1262614bf707938fb27b..fca9417f998dc7371106bb11728e363a72910394 100644 (file)
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -73,13 +73,13 @@ 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();
        }               
@@ -94,13 +94,11 @@ function display_controls()
 
        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);
 
        table_section(2);
-       //echo "</table>";
-       //echo "</td><td valign=top class='tableseparator'>"; // outer table
-       //echo "<table>";
 
     supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true);
 
@@ -115,14 +113,11 @@ function display_controls()
 
     ref_row(_("Reference:"), 'ref', '', references::get_next(22));
 
-    text_row(_("Memo:"), 'memo_', null, 52,50);
-
-       //echo "</table>";
+       textarea_row(_("Memo:"), 'memo_', null, 22, 4);
 
-       //echo "</td></tr>";
        end_outer_table(1); // outer table
 
-       submit_center('ProcessSuppPayment',_("Enter Payment"), true, '', true);
+       submit_center('ProcessSuppPayment',_("Enter Payment"), true, '', 'default');
 
        if ($bank_currency != $supplier_currency) 
        {
@@ -148,6 +143,12 @@ 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."));
@@ -217,8 +218,8 @@ function handle_add_payment()
 
        $payment_id = add_supp_payment($_POST['supplier_id'], $_POST['DatePaid'],
                $_POST['bank_account'], input_num('amount'), input_num('discount'), 
-               $_POST['ref'], $_POST['memo_'], $rate);
-
+               $_POST['ref'], $_POST['memo_'], $rate, input_num('charge'));
+       new_doc_date($_POST['DatePaid']);
        //unset($_POST['supplier_id']);
        unset($_POST['bank_account']);
        unset($_POST['DatePaid']);