Reverted invalid changes in manufacturing accounts back to cogs_account for BOM servi...

This partially reverts commit d5618f84e921515fa6ce6ec05180f0651119c297.

diff --git a/manufacturing/includes/db/work_order_issues_db.inc b/manufacturing/includes/db/work_order_issues_db.inc
index 13f4e84036191414e48e1c9870ad5629b77e789d..ca2f4a86883b5d213f556cc460a5c738b3b41275 100644 (file)
--- a/manufacturing/includes/db/work_order_issues_db.inc
+++ b/manufacturing/includes/db/work_order_issues_db.inc
@@ -75,8 +75,7 @@ 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["assembly_account"]; // changed 2015.10.14 by Petros .             
+                       $ivaccount = $issue["cogs_account"];            
                
         $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $ivaccount, 0, 0,
                 $date_.": "._("Issue of")." ".$stockitem["description"], -$issue_cost);                        
@@ -201,8 +200,7 @@ function void_work_order_issue($type_no)
                if (!is_service($issue["mb_flag"]))
                        $ivaccount = $issue["inventory_account"];
                else
-                       // $ivaccount = $issue["cogs_account"];         
-                        $ivaccount = $issue["assembly_account"]; // changed 2015.10.14 by Petros .             
+                       $ivaccount = $issue["cogs_account"];            
                
                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 2b72be3f9854774f5370080dcd1642b570f06767..d67d2e9048dce7891e853f813b9ed290434c0077 100644 (file)
--- a/manufacturing/includes/db/work_order_produce_items_db.inc
+++ b/manufacturing/includes/db/work_order_produce_items_db.inc
@@ -163,8 +163,7 @@ function void_work_order_produce($type_no)
                if (!is_service($issue["mb_flag"]))
                        $ivaccount = $issue["inventory_account"];
                else
-                       //$ivaccount = $issue["cogs_account"];          
-                       $ivaccount = $issue["assembly_account"]; // changed 2015.10.14 by Petros .              
+                       $ivaccount = $issue["cogs_account"];            
                
                if ($issue_cost != 0)
                {

diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc
index 5b9bea5268e659b927119039a09aebc90ef48890..50fdf8162da865d2cca625273efc70cb85180b8c 100644 (file)
--- a/manufacturing/includes/db/work_orders_db.inc
+++ b/manufacturing/includes/db/work_orders_db.inc
@@ -106,7 +106,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["assembly_account"], // changed 2015.10.14 from adjustment to assembly account. Petros.
+                               $stock_gl_code["assembly_account"],
                                $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo,
                                $costs);
                                
@@ -164,7 +164,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["assembly_account"], // changed 2015.10.14 from adjustment to assembly account. Petros.
+                               $stock_gl_code["assembly_account"],
                                $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo,
                                $costs);
                                
@@ -217,7 +217,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["assembly_account"], // changed 2015.10.14 from adjustment to assembly account. Petros.
+                               $stock_gl_code["assembly_account"],
                                $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 e28ee7f09de1dc35de2135035fab40872a806ef6..3700fa35cd3248719ba59db1536a18a07dee075c 100644 (file)
--- a/manufacturing/includes/db/work_orders_quick_db.inc
+++ b/manufacturing/includes/db/work_orders_quick_db.inc
@@ -144,8 +144,7 @@ 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["assembly_account"]; // changed 2015.10.14 by Petros .               
+                       $ivaccount = $bom_accounts["cogs_account"];
                $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $ivaccount, 0, 0,
                        $memo, -$bom_cost);
                $total_material_cost += $bom_cost;