Global fixes in SQL queries aimed to make them more readible and easier for maintence.

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

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index c2fe7c6113f9d7cfcdb62c792b55392903396107..8a0ab8cb49b3296385eda82b417bdadd162c0bda 100644 (file)
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -170,27 +170,12 @@ function check_data()
                return false;
        }
 
-       if (!$Refs->is_valid($_SESSION['supp_trans']->reference)) 
+       if (!check_reference($_SESSION['supp_trans']->reference, ST_SUPPCREDIT, $_SESSION['supp_trans']->trans_no))
        {
-               display_error(_("You must enter an credit note reference."));
                set_focus('reference');
                return false;
        }
 
-       if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPCREDIT, $_SESSION['supp_trans']->trans_no))
-       {
-               display_error(_("The entered reference is already in use."));
-               set_focus('reference');
-               return false;
-       }
-
-       if (!$Refs->is_valid($_SESSION['supp_trans']->supp_reference)) 
-       {
-               display_error(_("You must enter a supplier's credit note reference."));
-               set_focus('supp_reference');
-               return false;
-       }
-
        if (!is_date($_SESSION['supp_trans']->tran_date))
        {
                display_error(_("The credit note as entered cannot be processed because the date entered is not valid."));
@@ -219,7 +204,8 @@ function check_data()
                                        $stock = get_item($item->item_code);
                                        display_error(_("The return cannot be processed because there is an insufficient quantity for item:") .
                                                " " . $stock['stock_id'] . " - " . $stock['description'] . " - " .
-                                               _("Quantity On Hand") . " = " . number_format2($qoh, get_qty_dec($stock['stock_id'])));
+                                               _("Quantity On Hand") . " = " . number_format2(get_qoh_on_date($stock['stock_id'], null, 
+                                               $_SESSION['supp_trans']->tran_date), get_qty_dec($stock['stock_id'])));
                                        return false;
                                }
                        }
@@ -285,6 +271,7 @@ function commit_item_data($n)
                $_POST['prev_quantity_inv'.$n], input_num('This_QuantityCredited'.$n),
                $_POST['order_price'.$n], input_num('ChgPrice'.$n),
                $_POST['std_cost_unit'.$n], "");
+               reset_tax_input();
        }
 }