Fixed 0000097,0000098 and view of credit notes with empty lines.

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

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index 82aa967cb074ddae2ebdd34dfe7d881a55c48906..834e5de1b8e08a28a30cb43347c57621c5cccf59 100644 (file)
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -13,6 +13,8 @@ include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 $js = "";
 if ($use_popup_windows)
        $js .= get_js_open_window(900, 500);
+if ($use_date_picker)
+       $js .= get_js_date_picker();
 page(_("Supplier Payment Entry"), false, false, "", $js);
 
 
@@ -29,6 +31,19 @@ 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['supplier_id']))
+               $_POST['supplier_id'] = $ret['supplier_id'];
+}
+if (isset($_POST['_supplier_id_editor'])) {
+       context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'], 
+               array( 'supplier_id', 'bank_account', 'DatePaid', 
+                       'PaymentType', 'ref', 'amount', 'discount', 'memo_') );
+}
+if (isset($_POST['_DatePaid_changed'])) {
+  $Ajax->activate('_ex_rate');
+}
 //----------------------------------------------------------------------------------------
 
 if (isset($_GET['AddedID'])) 
@@ -39,16 +54,11 @@ if (isset($_GET['AddedID']))
 
     display_note(get_gl_view_str(22, $payment_id, _("View the GL Journal Entries for this Payment")));
 
-       echo "<center><br>";
     hyperlink_params($path_to_root . "/purchasing/allocations/supplier_allocate.php", _("Allocate this Payment"), "trans_no=$payment_id&trans_type=22");
 
-       echo "<br><br>";
        hyperlink_params($_SERVER['PHP_SELF'], _("Enter another supplier payment"), "supplier_id=" . $_POST['supplier_id']);
 
-       echo "</center><br><br>";
-
-       end_page();
-       exit;
+       display_footer_exit();
 }
 
 //----------------------------------------------------------------------------------------
@@ -76,7 +86,7 @@ function display_controls()
        amount_row(_("Amount of Payment:"), 'amount');
        amount_row(_("Amount of Discount:"), 'discount');
 
-    date_row(_("Date Paid") . ":", 'DatePaid');
+    date_row(_("Date Paid") . ":", 'DatePaid', '', null, 0, 0, 0, null, true);
 
        echo "</table>";
        echo "</td><td valign=top class='tableseparator'>"; // outer table
@@ -90,12 +100,12 @@ 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);
        }
 
        bank_trans_types_list_row(_("Payment Type:"), 'PaymentType', null);
 
-    ref_row(_("Reference:"), 'ref', references::get_next(22));
+    ref_row(_("Reference:"), 'ref', '', references::get_next(22));
 
     text_row(_("Memo:"), 'memo_', null, 52,50);
 
@@ -104,7 +114,7 @@ function display_controls()
        echo "</td></tr>";
        end_table(1); // outer table
 
-       submit_center('ProcessSuppPayment',_("Enter Payment"));
+       submit_center('ProcessSuppPayment',_("Enter Payment"), true, '', true);
 
        if ($bank_currency != $supplier_currency) 
        {
@@ -120,12 +130,20 @@ function check_inputs()
 {
        if ($_POST['amount'] == "") 
        {
-               $_POST['amount'] = 0;
+               $_POST['amount'] = price_format(0);
        }
 
-       if (!is_numeric($_POST['amount']) || $_POST['amount'] < 0) 
+       if (!check_num('amount', 0))
        {
                display_error(_("The entered amount is invalid or less than zero."));
+               set_focus('amount');
+               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;
        }
 
@@ -134,37 +152,43 @@ function check_inputs()
                $_POST['discount'] = 0;
        }
 
-       if (!is_numeric($_POST['discount']) OR $_POST['discount'] < 0) 
+       if (!check_num('discount', 0))
        {
                display_error(_("The entered discount is invalid or less than zero."));
+               set_focus('amount');
                return false;
        }
 
-       if ($_POST['amount'] - $_POST['discount'] <= 0) 
+       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;
        }
 
        if (!is_date($_POST['DatePaid']))
        {
                display_error(_("The entered date is invalid."));
+               set_focus('DatePaid');
                return false;
        } 
        elseif (!is_date_in_fiscalyear($_POST['DatePaid'])) 
        {
                display_error(_("The entered date is not in fiscal year."));
+               set_focus('DatePaid');
                return false;
        }
     if (!references::is_valid($_POST['ref'])) 
     {
                display_error(_("You must enter a reference."));
+               set_focus('ref');
                return false;
        }
 
        if (!is_new_reference($_POST['ref'], 22)) 
        {
                display_error(_("The entered reference is already in use."));
+               set_focus('ref');
                return false;
        }
 
@@ -175,9 +199,17 @@ 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['PaymentType'], $_POST['bank_account'],
-               $_POST['amount'], $_POST['discount'], $_POST['ref'], $_POST['memo_']);
+               input_num('amount'), input_num('discount'), $_POST['ref'], $_POST['memo_'], $rate);
 
        //unset($_POST['supplier_id']);
        unset($_POST['bank_account']);