From fece6eec982487fe954cbad8ead3a431684e7f72 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Sun, 21 Jun 2009 10:39:55 +0000 Subject: [PATCH] If no additional costs (overhead/labour) it should reduce the average additional costs. $ /manufacturing/includes/db/work_orders_quick_db.inc --- CHANGELOG.txt | 4 ++++ manufacturing/includes/db/work_orders_quick_db.inc | 12 ++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index b15d702..ea0d028 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,10 @@ Legend: ! -> Note $ -> Affected files +21-Jun-2009 Joe Hunt +# If no additional costs (overhead/labour) it should reduce the average additional costs. +$ /manufacturing/includes/db/work_orders_quick_db.inc + 20-Jun-2009 Janusz Dobrowolski ! Php notices removed from logging to avoid flood from @ constructs. $ /includes/errors.inc diff --git a/manufacturing/includes/db/work_orders_quick_db.inc b/manufacturing/includes/db/work_orders_quick_db.inc index 52b5081..6e36101 100644 --- a/manufacturing/includes/db/work_orders_quick_db.inc +++ b/manufacturing/includes/db/work_orders_quick_db.inc @@ -24,12 +24,10 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, $date = date2sql($date_); if (!isset($costs) || ($costs == "")) $costs = 0; - if ($costs != 0) - add_overhead_cost($stock_id, $units_reqd, $date_, $costs); + add_overhead_cost($stock_id, $units_reqd, $date_, $costs); if (!isset($labour) || ($labour == "")) $labour = 0; - if ($labour != 0) - add_labour_cost($stock_id, $units_reqd, $date_, $labour); + add_labour_cost($stock_id, $units_reqd, $date_, $labour); $sql = "INSERT INTO ".TB_PREF."workorders (wo_ref, loc_code, units_reqd, units_issued, stock_id, type, additional_costs, date_, released_date, required_by, released, closed) @@ -131,14 +129,12 @@ function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced $lcost = 0; while ($row = db_fetch($result)) $lcost += -$row['amount']; - if ($lcost != 0) - add_labour_cost($stock_id, $units_reqd, $date_, $lcost * $units_reqd / $wo['units_reqd']); + add_labour_cost($stock_id, $units_reqd, $date_, $lcost * $units_reqd / $wo['units_reqd']); $result = get_gl_wo_cost_trans($woid, WO_OVERHEAD); $ocost = 0; while ($row = db_fetch($result)) $ocost += -$row['amount']; - if ($ocost != 0) - add_overhead_cost($stock_id, $units_reqd, $date_, $ocost * $units_reqd / $wo['units_reqd']); + add_overhead_cost($stock_id, $units_reqd, $date_, $ocost * $units_reqd / $wo['units_reqd']); } // credit additional costs $item_accounts = get_stock_gl_code($stock_id); -- 2.30.2