From d5618f84e921515fa6ce6ec05180f0651119c297 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Wed, 14 Oct 2015 15:34:41 +0200 Subject: [PATCH] Changed the GL accounts in Manufacturing to go from Cost accounts to Assembly Accounts. Petros. --- manufacturing/includes/db/work_order_issues_db.inc | 6 ++++-- manufacturing/includes/db/work_order_produce_items_db.inc | 3 ++- manufacturing/includes/db/work_orders_db.inc | 6 +++--- manufacturing/includes/db/work_orders_quick_db.inc | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/manufacturing/includes/db/work_order_issues_db.inc b/manufacturing/includes/db/work_order_issues_db.inc index ca2f4a86..13f4e840 100644 --- a/manufacturing/includes/db/work_order_issues_db.inc +++ b/manufacturing/includes/db/work_order_issues_db.inc @@ -75,7 +75,8 @@ function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $w if (!is_service($issue["mb_flag"])) $ivaccount = $issue["inventory_account"]; else - $ivaccount = $issue["cogs_account"]; + // $ivaccount = $issue["cogs_account"]; + $ivaccount = $issue["assembly_account"]; // changed 2015.10.14 by Petros . $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $ivaccount, 0, 0, $date_.": "._("Issue of")." ".$stockitem["description"], -$issue_cost); @@ -200,7 +201,8 @@ function void_work_order_issue($type_no) if (!is_service($issue["mb_flag"])) $ivaccount = $issue["inventory_account"]; else - $ivaccount = $issue["cogs_account"]; + // $ivaccount = $issue["cogs_account"]; + $ivaccount = $issue["assembly_account"]; // changed 2015.10.14 by Petros . if ($issue_cost != 0) { diff --git a/manufacturing/includes/db/work_order_produce_items_db.inc b/manufacturing/includes/db/work_order_produce_items_db.inc index 38af2add..b37dd23c 100644 --- a/manufacturing/includes/db/work_order_produce_items_db.inc +++ b/manufacturing/includes/db/work_order_produce_items_db.inc @@ -150,7 +150,8 @@ function void_work_order_produce($type_no) if (!is_service($issue["mb_flag"])) $ivaccount = $issue["inventory_account"]; else - $ivaccount = $issue["cogs_account"]; + //$ivaccount = $issue["cogs_account"]; + $ivaccount = $issue["assembly_account"]; // changed 2015.10.14 by Petros . if ($issue_cost != 0) { diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc index 52695e9d..431743a9 100644 --- a/manufacturing/includes/db/work_orders_db.inc +++ b/manufacturing/includes/db/work_orders_db.inc @@ -91,7 +91,7 @@ function add_overhead_cost($stock_id, $qty, $date_, $costs, $adj_only=false) -$costs); //GL Posting to inventory adjustment account add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, - $stock_gl_code["adjustment_account"], + $stock_gl_code["assembly_account"], // changed 2015.10.14 from adjustment to assembly account. Petros. $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, $costs); @@ -146,7 +146,7 @@ function add_labour_cost($stock_id, $qty, $date_, $costs, $adj_only=false) -$costs); //GL Posting to inventory adjustment account add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, - $stock_gl_code["adjustment_account"], + $stock_gl_code["assembly_account"], // changed 2015.10.14 from adjustment to assembly account. Petros. $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, $costs); @@ -201,7 +201,7 @@ function add_issue_cost($stock_id, $qty, $date_, $costs, $adj_only=false) -$costs); //GL Posting to inventory adjustment account add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, - $stock_gl_code["adjustment_account"], + $stock_gl_code["assembly_account"], // changed 2015.10.14 from adjustment to assembly account. Petros. $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, $costs); diff --git a/manufacturing/includes/db/work_orders_quick_db.inc b/manufacturing/includes/db/work_orders_quick_db.inc index 43e0d5bb..63c69475 100644 --- a/manufacturing/includes/db/work_orders_quick_db.inc +++ b/manufacturing/includes/db/work_orders_quick_db.inc @@ -144,7 +144,8 @@ function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced if (!is_service($bom_accounts["mb_flag"])) $ivaccount = $bom_accounts["inventory_account"]; else - $ivaccount = $bom_accounts["cogs_account"]; + // $ivaccount = $bom_accounts["cogs_account"]; + $ivaccount = $bom_accounts["assembly_account"]; // changed 2015.10.14 by Petros . $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $ivaccount, 0, 0, $memo, -$bom_cost); $total_material_cost += $bom_cost; @@ -154,7 +155,7 @@ function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced //Chaitanya: Material cost added at time of production as per BOM at the time and in adjustment mode. add_material_cost($stock_id, $units_reqd, $date_, true); - $wo = get_work_order($woid); + // $wo = get_work_order($woid); // also take the additional issues // moved to work_order_issues_db.inc /* -- 2.30.2