From: Janusz Dobrowolski Date: Mon, 15 Mar 2010 18:03:27 +0000 (+0000) Subject: Missing check for supplier selection. X-Git-Tag: 2.3-final~933 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=8440d01cf34fab02ef02e91e16ac983970e0c28e;p=fa-stable.git Missing check for supplier selection. --- diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php index 34cce553..df67182d 100644 --- a/purchasing/po_entry_items.php +++ b/purchasing/po_entry_items.php @@ -66,22 +66,22 @@ if (isset($_GET['AddedID'])) function copy_from_cart() { - $_POST['supplier_id'] = $_SESSION['PO']->supplier_id; - $_POST['OrderDate'] = $_SESSION['PO']->orig_order_date; + $_POST['supplier_id'] = $_SESSION['PO']->supplier_id; + $_POST['OrderDate'] = $_SESSION['PO']->orig_order_date; $_POST['Requisition'] = $_SESSION['PO']->requisition_no; $_POST['ref'] = $_SESSION['PO']->reference; $_POST['Comments'] = $_SESSION['PO']->Comments; $_POST['StkLocation'] = $_SESSION['PO']->Location; - $_POST['delivery_address'] = $_SESSION['PO']->delivery_address; + $_POST['delivery_address'] = $_SESSION['PO']->delivery_address; } function copy_to_cart() { - $_SESSION['PO']->supplier_id = $_POST['supplier_id']; + $_SESSION['PO']->supplier_id = $_POST['supplier_id']; $_SESSION['PO']->orig_order_date = $_POST['OrderDate']; $_SESSION['PO']->reference = $_POST['ref']; $_SESSION['PO']->requisition_no = $_POST['Requisition']; - $_SESSION['PO']->Comments = $_POST['Comments']; + $_SESSION['PO']->Comments = $_POST['Comments']; $_SESSION['PO']->Location = $_POST['StkLocation']; $_SESSION['PO']->delivery_address = $_POST['delivery_address']; } @@ -268,6 +268,13 @@ function can_commit() { global $Refs; + if (!get_post('supplier_id')) + { + display_error(_("There is no supplier selected.")); + set_focus('supplier_id'); + return false; + } + if (!is_date($_POST['OrderDate'])) { display_error(_("The entered order date is invalid.")); diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php index 13402c62..3dde32cd 100644 --- a/purchasing/supplier_invoice.php +++ b/purchasing/supplier_invoice.php @@ -381,7 +381,7 @@ start_form(); invoice_header($_SESSION['supp_trans']); if ($_POST['supplier_id']=='') - display_error('No supplier found for entered search text'); + display_error(_("There is no supplier selected.")); else { display_grn_items($_SESSION['supp_trans'], 1); diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php index e0aa2d08..ddc1bf43 100644 --- a/purchasing/supplier_payment.php +++ b/purchasing/supplier_payment.php @@ -17,7 +17,6 @@ include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/includes/banking.inc"); include_once($path_to_root . "/includes/data_checks.inc"); -//include_once($path_to_root . "/purchasing/includes/ui/supp_alloc_ui.inc"); include_once($path_to_root . "/purchasing/includes/purchasing_db.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); @@ -88,6 +87,13 @@ function check_inputs() { global $Refs; + if (!get_post('supplier_id')) + { + display_error(_("There is no supplier selected.")); + set_focus('supplier_id'); + return false; + } + if ($_POST['amount'] == "") { $_POST['amount'] = price_format(0);