Fixing check for non supplier reference. Cleanup.

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index 4362ea1658c312709ee252064abde0661538a170..244322e1f50478042e480b64519570b0bdb00a7d 100644 (file)
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -350,8 +350,6 @@ function can_commit()
        {
        if (!check_reference(get_post('ref'), $_SESSION['PO']->trans_type))
        {
-               _vd("bad reference");
-               exit;
                        set_focus('ref');
                return false;
        }

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index 08040582a3b7dec469eec0a7c5ab6f6a5554bd45..6bf9f22f1e92f6016060dd3801119b78173c6324 100644 (file)
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -194,6 +194,20 @@ function check_data()
                return false;
        }
 
+       if (trim(get_post('supp_reference')) == false)
+       {
+               display_error(_("You must enter a supplier's invoice reference."));
+               set_focus('supp_reference');
+               return false;
+       }
+
+       if (is_reference_already_there($_SESSION['supp_trans']->supplier_id, $_POST['supp_reference'], $_SESSION['supp_trans']->trans_no))
+       {       /*Transaction reference already entered */
+               display_error(_("This invoice number has already been entered. It cannot be entered again.") . " (" . $_POST['supp_reference'] . ")");
+               set_focus('supp_reference');
+               return false;
+       }
+
        if (!$SysPrefs->allow_negative_stock()) {
                foreach ($_SESSION['supp_trans']->grn_items as $n => $item) {
                        if (is_inventory_item($item->item_code))

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index faf540e334c19c4cd261c4c7b9f55e986c726559..73a3dfbcb5ff3980f2710bef0c8812227d8d0288 100644 (file)
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -203,9 +203,17 @@ function check_data()
                return false;
        }
 
+       if (trim(get_post('supp_reference')) == false)
+       {
+               display_error(_("You must enter a supplier's invoice reference."));
+               set_focus('supp_reference');
+               return false;
+       }
+
        if (is_reference_already_there($_SESSION['supp_trans']->supplier_id, $_POST['supp_reference'], $_SESSION['supp_trans']->trans_no))
        {       /*Transaction reference already entered */
                display_error(_("This invoice number has already been entered. It cannot be entered again.") . " (" . $_POST['supp_reference'] . ")");
+               set_focus('supp_reference');
                return false;
        }