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

[fa-stable.git] / manufacturing / includes / db / work_order_produce_items_db.inc

diff --git a/manufacturing/includes/db/work_order_produce_items_db.inc b/manufacturing/includes/db/work_order_produce_items_db.inc
index b9fd16f0e9198ad61d94b74a281e21b4aebc84b8..d67d2e9048dce7891e853f813b9ed290434c0077 100644 (file)
--- a/manufacturing/includes/db/work_order_produce_items_db.inc
+++ b/manufacturing/includes/db/work_order_produce_items_db.inc
@@ -14,6 +14,11 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo)
        global $Refs;
 
        begin_transaction();
+       $args = func_get_args();
+       $args = (object)array_combine(array('woid', 'ref', 'quantity', 'date_', 'memo_','close_wo'),
+               $args);
+       $args->trans_no = 0;
+       hook_db_prewrite($args, ST_MANURECEIVE);
 
        $details = get_work_order($woid);
 
@@ -39,26 +44,50 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo)
        db_query($sql,"A work order manufacture could not be added");
 
        $id = db_insert_id();
-
+       
        // -------------------------------------------------------------------------
 
        work_order_quick_costs($woid, $details["stock_id"], $quantity, $date_, $id);
-
+       
        // -------------------------------------------------------------------------
+
+       // Chaitanya: stamp BOM cost to finished item
+       $m_cost = 0;
+       $result = get_bom($details["stock_id"]);
+       while ($bom_item = db_fetch($result))
+       {
+               $standard_cost = get_standard_cost($bom_item['component']);
+               $m_cost += ($bom_item['quantity'] * $standard_cost);
+       }
+       // new Joe Hunt 2015.10.15      
+       // additilnal costs.
+       if (work_order_has_issues($woid))
+       {
+               $res = get_additional_issues($woid);
+               while ($issue = db_fetch($res))
+               {
+                       $standard_cost = get_standard_cost($issue['stock_id']);
+                       $m_cost += ($issue['qty_issued'] * $standard_cost) / $quantity;
+               }
+       }
+       $m_cost += (get_gl_wo_cost($woid, WO_LABOUR) / $quantity);
+       $m_cost += (get_gl_wo_cost($woid, WO_OVERHEAD) / $quantity);
+
        // insert a +ve stock move for the item being manufactured
        // negative means "unproduce" or unassemble
        add_stock_move(ST_MANURECEIVE, $details["stock_id"], $id,
-               $details["loc_code"], $date_, $memo_, $quantity, 0);
+               $details["loc_code"], $date_, $ref, $quantity, $m_cost);
        // update wo quantity and close wo if requested
        work_order_update_finished_quantity($woid, $quantity, $close_wo);
 
-
        if ($memo_)
                add_comments(ST_MANURECEIVE, $id, $date_, $memo_);
 
        $Refs->save(ST_MANURECEIVE, $id, $ref);
        add_audit_trail(ST_MANURECEIVE, $id, $date_, _("Production."));
 
+       $args->trans_no = $id;
+       hook_db_postwrite($args, ST_MANURECEIVE);
        commit_transaction();
 }
 
@@ -101,24 +130,57 @@ function exists_work_order_produce($id)
 function void_work_order_produce($type_no)
 {
        begin_transaction();
+       hook_db_prevoid(ST_MANURECEIVE, $type_no);
+       
+       //Chaitanya : Skip processing already voided entry i.e. explicitly voided
+       $void_entry = get_voided_entry(ST_MANURECEIVE, $type_no);
+       if ($void_entry)
+               return; 
 
        $row = get_work_order_produce($type_no);
 
        // deduct the quantity of this production from the parent work order
        work_order_update_finished_quantity($row["workorder_id"], -$row["quantity"]);
 
-       work_order_quick_costs($row['workorder_id'], $row['stock_id'], -$row['quantity'], sql2date($row['date_']), $type_no);
+       //Chaitanya : skipped this step as BOM may have got changed
+       //work_order_quick_costs($row['workorder_id'], $row['stock_id'], -$row['quantity'], sql2date($row['date_']), $type_no);
 
+       // void any related gl trans
+       //Chaitanya : Nothing happens due to next statement as all gl postings are done against WO
+       //void_gl_trans(ST_MANURECEIVE, $type_no, true);
+       
+       $woid = $row["workorder_id"];
+       $date_ = sql2date($row["date_"]);
+               
+       $result = get_stock_moves(ST_MANURECEIVE, $type_no);
+       while ($myrow = db_fetch($result))
+       {
+               $issue_cost = $myrow["qty"]*$myrow["standard_cost"];
+               $issue = get_stock_gl_code($myrow["stock_id"]);
+        $stockitem = get_item($myrow["stock_id"]);
+               
+               //Chaitanya : Compatibility for Service Items
+               if (!is_service($issue["mb_flag"]))
+                       $ivaccount = $issue["inventory_account"];
+               else
+                       $ivaccount = $issue["cogs_account"];            
+               
+               if ($issue_cost != 0)
+               {
+                       add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $ivaccount, 0, 0,
+                               $date_.": "._("Reversed the production ")." ".$stockitem["description"],
+                               -$issue_cost);
+               }
+       }       
+                       
        // clear the production record
        $sql = "UPDATE ".TB_PREF."wo_manufacture SET quantity=0 WHERE id=".db_escape($type_no);
-       db_query($sql, "Cannot void a wo production");
-
+       db_query($sql, "Cannot void a wo production");                  
+       
+       //Chaitanya : Shifted below
        // void all related stock moves
        void_stock_move(ST_MANURECEIVE, $type_no);
 
-       // void any related gl trans
-       void_gl_trans(ST_MANURECEIVE, $type_no, true);
-
        commit_transaction();
 }