Transaction references extended with parametrized patterns, added check_reference...

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

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index e57ef09f973f68b41363259b3d098a5583ede44a..19337cbef13a094288de4dba7eca5b08cf439cf5 100644 (file)
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -21,7 +21,7 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
        $js .= get_js_date_picker();
@@ -161,7 +161,7 @@ if (isset($_POST['AddGLCodeToTrans'])) {
 
 function check_data()
 {
-       global $total_grn_value, $total_gl_value, $Refs, $SysPrefs;
+       global $Refs, $SysPrefs;
 
        if (!$_SESSION['supp_trans']->is_valid_trans_to_post())
        {
@@ -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."));
@@ -210,12 +195,6 @@ function check_data()
                return false;
        }
 
-       if ($_SESSION['supp_trans']->ov_amount < ($total_gl_value + $total_grn_value))
-       {
-               display_error(_("The credit note total as entered is less than the sum of the the general ledger entires (if any) and the charges for goods received. There must be a mistake somewhere, the credit note as entered will not be processed."));
-               return false;
-       }
-
        if (!$SysPrefs->allow_negative_stock()) {
                foreach ($_SESSION['supp_trans']->grn_items as $n => $item) {
                        if (is_inventory_item($item->item_code))
@@ -356,9 +335,9 @@ invoice_header($_SESSION['supp_trans']);
 if ($_POST['supplier_id']=='') 
        display_error('No supplier found for entered search text');
 else {
-       $total_grn_value = display_grn_items($_SESSION['supp_trans'], 1);
+       display_grn_items($_SESSION['supp_trans'], 1);
 
-       $total_gl_value = display_gl_items($_SESSION['supp_trans'], 1);
+       display_gl_items($_SESSION['supp_trans'], 1);
 
        div_start('inv_tot');
        invoice_totals($_SESSION['supp_trans']);