Rewritten for paged query results.

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

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index 6cf626691dc8ad6fa124d212c47b25dd49b19d75..a530ecb4d8863134066d557f8b266af0c47c72ca 100644 (file)
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -29,8 +29,19 @@ check_db_has_suppliers(_("There are no suppliers 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['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', 'ref', 'amount', 
+                       'discount', 'memo_') );
+}
+if (isset($_POST['_DatePaid_changed'])) {
+  $Ajax->activate('_ex_rate');
+}
 //----------------------------------------------------------------------------------------
 
 if (isset($_GET['AddedID'])) 
@@ -39,11 +50,11 @@ if (isset($_GET['AddedID']))
 
        display_notification_centered( _("Payment has been sucessfully entered"));
 
-    display_note(get_gl_view_str(22, $payment_id, _("View the GL Journal Entries for this Payment")));
+    display_note(get_gl_view_str(22, $payment_id, _("View the GL &Journal Entries for this Payment")));
 
-    hyperlink_params($path_to_root . "/purchasing/allocations/supplier_allocate.php", _("Allocate this Payment"), "trans_no=$payment_id&trans_type=22");
+    hyperlink_params($path_to_root . "/purchasing/allocations/supplier_allocate.php", _("&Allocate this Payment"), "trans_no=$payment_id&trans_type=22");
 
-       hyperlink_params($_SERVER['PHP_SELF'], _("Enter another supplier payment"), "supplier_id=" . $_POST['supplier_id']);
+       hyperlink_params($_SERVER['PHP_SELF'], _("Enter another supplier &payment"), "supplier_id=" . $_POST['supplier_id']);
 
        display_footer_exit();
 }
@@ -73,7 +84,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,9 +101,7 @@ function display_controls()
                exchange_rate_display($bank_currency, $supplier_currency, $_POST['DatePaid']);
        }
 
-       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);
 
@@ -101,7 +110,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) 
        {
@@ -123,6 +132,7 @@ function check_inputs()
        if (!check_num('amount', 0))
        {
                display_error(_("The entered amount is invalid or less than zero."));
+               set_focus('amount');
                return false;
        }
 
@@ -134,34 +144,40 @@ function check_inputs()
        if (!check_num('discount', 0))
        {
                display_error(_("The entered discount is invalid or less than zero."));
+               set_focus('amount');
                return false;
        }
 
        if (input_num('amount') - input_num('discount') <= 0) 
        {
                display_error(_("The total of the amount and the discount 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;
        }
 
@@ -173,13 +189,12 @@ function check_inputs()
 function handle_add_payment()
 {
        $payment_id = add_supp_payment($_POST['supplier_id'], $_POST['DatePaid'],
-               $_POST['PaymentType'], $_POST['bank_account'],
-               input_num('amount'), input_num('discount'), $_POST['ref'], $_POST['memo_']);
+               $_POST['bank_account'], input_num('amount'), input_num('discount'), 
+               $_POST['ref'], $_POST['memo_']);
 
        //unset($_POST['supplier_id']);
        unset($_POST['bank_account']);
        unset($_POST['DatePaid']);
-       unset($_POST['PaymentType']);
        unset($_POST['currency']);
        unset($_POST['memo_']);
        unset($_POST['amount']);