Javascript bugfix in selecting orders as template

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

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index 82aa967cb074ddae2ebdd34dfe7d881a55c48906..4c99f95d00aef928f0f146b8950baecbf1540c7a 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);
 
 
@@ -39,16 +41,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();
 }
 
 //----------------------------------------------------------------------------------------
@@ -120,12 +117,13 @@ 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;
        }
 
@@ -134,37 +132,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."));
+               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;
        }
 
@@ -177,7 +181,7 @@ function handle_add_payment()
 {
        $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_']);
 
        //unset($_POST['supplier_id']);
        unset($_POST['bank_account']);