From 2a1e11f80f2f95573f1089aa649daf48e1750653 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Mon, 5 Nov 2018 12:02:11 +0100 Subject: [PATCH 1/1] Cleanups (fixed obscure numeric references to some sql helpers results). --- dimensions/dimension_entry.php | 4 ++-- dimensions/view/view_dimension.php | 4 ++-- manufacturing/includes/db/work_orders_db.inc | 4 ++-- manufacturing/includes/manufacturing_ui.inc | 8 ++++---- manufacturing/work_order_add_finished.php | 4 ++-- manufacturing/work_order_costs.php | 6 +++--- manufacturing/work_order_entry.php | 4 ++-- purchasing/includes/db/invoice_db.inc | 10 +++++----- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dimensions/dimension_entry.php b/dimensions/dimension_entry.php index 98c1d120..3a11e665 100644 --- a/dimensions/dimension_entry.php +++ b/dimensions/dimension_entry.php @@ -217,9 +217,9 @@ start_table(TABLESTYLE2); if ($selected_id != -1) { - $myrow = get_dimension($selected_id); + $myrow = get_dimension($selected_id, true); - if (strlen($myrow[0]) == 0) + if ($myrow === false) { display_error(_("The dimension sent is not valid.")); display_footer_exit(); diff --git a/dimensions/view/view_dimension.php b/dimensions/view/view_dimension.php index 8b658278..b6b3df73 100644 --- a/dimensions/view/view_dimension.php +++ b/dimensions/view/view_dimension.php @@ -42,9 +42,9 @@ if (isset($_POST['Show'])) display_heading($systypes_array[ST_DIMENSION] . " # " . $id); br(1); -$myrow = get_dimension($id); +$myrow = get_dimension($id, true); -if (strlen($myrow[0]) == 0) +if ($myrow == false) { echo _("The dimension number sent is not valid."); exit; diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc index 5c7210e5..05ddbb6b 100644 --- a/manufacturing/includes/db/work_orders_db.inc +++ b/manufacturing/includes/db/work_orders_db.inc @@ -130,11 +130,11 @@ function get_work_order($woid, $allow_null=false) AND wo.id=".db_escape($woid)." GROUP BY wo.id"; - $result = db_query($sql, "The work order issues could not be retrieved"); + $result = db_query($sql, "The work order could not be retrieved"); if (!$allow_null && db_num_rows($result) == 0) { - display_db_error("Could not find work order $woid", $sql); + display_db_error("Could not find work order ".(int)$woid, $sql); return false; } diff --git a/manufacturing/includes/manufacturing_ui.inc b/manufacturing/includes/manufacturing_ui.inc index 812590ed..e3dbbfa3 100644 --- a/manufacturing/includes/manufacturing_ui.inc +++ b/manufacturing/includes/manufacturing_ui.inc @@ -277,9 +277,9 @@ function display_wo_details($woid, $suppress_view_link=false) { global $wo_types_array; - $myrow = get_work_order($woid); + $myrow = get_work_order($woid, true); - if (strlen($myrow[0]) == 0) + if ($myrow == false) { display_note(_("The work order number sent is not valid.")); exit; @@ -333,9 +333,9 @@ function display_wo_details_quick($woid, $suppress_view_link=false) { global $wo_types_array; - $myrow = get_work_order($woid); + $myrow = get_work_order($woid, true); - if (strlen($myrow[0]) == 0) + if ($myrow === false) { display_note(_("The work order number sent is not valid.")); exit; diff --git a/manufacturing/work_order_add_finished.php b/manufacturing/work_order_add_finished.php index 43072682..6d508c64 100644 --- a/manufacturing/work_order_add_finished.php +++ b/manufacturing/work_order_add_finished.php @@ -57,9 +57,9 @@ if (isset($_GET['AddedID'])) //-------------------------------------------------------------------------------------------------- -$wo_details = get_work_order($_POST['selected_id']); +$wo_details = get_work_order($_POST['selected_id'], true); -if (strlen($wo_details[0]) == 0) +if ($wo_details === false) { display_error(_("The order number sent is not valid.")); exit; diff --git a/manufacturing/work_order_costs.php b/manufacturing/work_order_costs.php index bd262f81..07efe640 100644 --- a/manufacturing/work_order_costs.php +++ b/manufacturing/work_order_costs.php @@ -56,9 +56,9 @@ if (isset($_GET['AddedID'])) //-------------------------------------------------------------------------------------------------- -$wo_details = get_work_order($_POST['selected_id']); +$wo_details = get_work_order($_POST['selected_id'], true); -if (strlen($wo_details[0]) == 0) +if ($wo_details === false) { display_error(_("The order number sent is not valid.")); exit; @@ -139,7 +139,7 @@ if (list_updated('PaymentType')) $item = get_item($wo_details['stock_id']); $r = get_default_bank_account(get_company_pref('curr_default')); -$_POST['cr_acc'] = $r[0]; +$_POST['cr_acc'] = $r['account_code']; $_POST['costs'] = price_format(get_post('PaymentType')==WO_OVERHEAD ? $item['overhead_cost'] : $item['labour_cost']); amount_row(_("Additional Costs:"), 'costs'); diff --git a/manufacturing/work_order_entry.php b/manufacturing/work_order_entry.php index aa13e8d5..4aea96fb 100644 --- a/manufacturing/work_order_entry.php +++ b/manufacturing/work_order_entry.php @@ -316,9 +316,9 @@ $existing_comments = ""; $dec = 0; if (isset($selected_id)) { - $myrow = get_work_order($selected_id); + $myrow = get_work_order($selected_id, true); - if (strlen($myrow[0]) == 0) + if ($myrow === false) { echo _("The order number sent is not valid."); safe_exit(); diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index aee0bfcc..503ed275 100644 --- a/purchasing/includes/db/invoice_db.inc +++ b/purchasing/includes/db/invoice_db.inc @@ -70,10 +70,10 @@ function update_supp_received_items_for_invoice($id, $po_detail_item, $qty_invoi $sql = "SELECT act_price, unit_price FROM ".TB_PREF."purch_order_details WHERE po_detail_item = ".db_escape($po_detail_item); $result = db_query($sql, "The old actual price of the purchase order line could not be retrieved"); - $row = db_fetch_row($result); - $ret = $row[0]; + $row = db_fetch($result); + $ret = $row['act_price']; - $unit_price = $row[1]; //Added by Rasmus + $unit_price = $row['unit_price']; //Added by Rasmus $sql = "SELECT delivery_date FROM ".TB_PREF."grn_batch grn," @@ -81,8 +81,8 @@ function update_supp_received_items_for_invoice($id, $po_detail_item, $qty_invoi WHERE grn.id = line.grn_batch_id AND line.id=".db_escape($id); $result = db_query($sql, "The old delivery date from the received record cout not be retrieved"); - $row = db_fetch_row($result); - $date = $row[0]; + $row = db_fetch($result); + $date = $row['delivery_date']; } else { -- 2.30.2