From 9af5690af5e9bf0b24a94a07b57b31a6e5b8179f Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Mon, 9 Nov 2015 09:42:38 +0100 Subject: [PATCH] Fixing check for non supplier reference. Cleanup. --- purchasing/po_entry_items.php | 2 -- purchasing/supplier_credit.php | 14 ++++++++++++++ purchasing/supplier_invoice.php | 8 ++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php index 4362ea16..244322e1 100644 --- 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 08040582..6bf9f22f 100644 --- 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 faf540e3..73a3dfbc 100644 --- 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; } -- 2.30.2