Merged bugfixes upto [0000072] (version 2.0.3).

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

diff --git a/manufacturing/includes/db/work_orders_quick_db.inc b/manufacturing/includes/db/work_orders_quick_db.inc
index cb16e374123e8759e708fd4fc2d89d27bfbfc05f..1eccbdcfc05605b9ce491cf3054460d4dcec7a4f 100644 (file)
--- a/manufacturing/includes/db/work_orders_quick_db.inc
+++ b/manufacturing/includes/db/work_orders_quick_db.inc
@@ -71,7 +71,7 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type,
 
 //--------------------------------------------------------------------------------------
 
-function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $additional_costs)
+function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $additional_costs, $advanced=false)
 {
        $result = get_bom($stock_id);
 
@@ -84,11 +84,31 @@ function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $addition
 
                $bom_cost = $bom_item["standard_cost"] * $bom_item["quantity"] * $units_reqd;
 
+               if ($advanced)
+               {
+                       // insert a -ve stock move for each item
+                       add_stock_move(systypes::work_order(), $bom_item["component"], $woid,
+                               $bom_item["loc_code"], $date_, "", -$bom_item["quantity"] * $units_reqd, 0);
+               }
                add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $bom_accounts["inventory_account"], 0, 0,
                        null, -$bom_cost);
 
                $total_cost += $bom_cost;
        }
+       if ($advanced)
+       {
+               // also take the additional issues
+               $res = get_additional_issues($woid);
+               while ($item = db_fetch($res))
+               {
+                       $standard_cost = get_standard_cost($item['stock_id']);
+                       $issue_cost = $standard_cost * $item['qty_issued'];
+                       $issue = get_stock_gl_code($item['stock_id']);
+                       add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $issue["inventory_account"], 0, 0,
+                               null, -$issue_cost);
+                       $total_cost += $issue_cost;
+               }
+       }
        // credit additional costs
        $item_accounts = get_stock_gl_code($stock_id);
        add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $item_accounts["assembly_account"],