Further changes in manufacturing, added unit_cost in issues and requirements

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

diff --git a/manufacturing/includes/db/work_order_requirements_db.inc b/manufacturing/includes/db/work_order_requirements_db.inc
index 9422961f7c69ff8275ebcdcf35200181c4ca0e57..395ad6534b1aa4298d4565cfc301968b4c3e3c8f 100644 (file)
--- a/manufacturing/includes/db/work_order_requirements_db.inc
+++ b/manufacturing/includes/db/work_order_requirements_db.inc
@@ -12,7 +12,10 @@
 function get_wo_requirements($woid)
 {
        $sql = "SELECT req.*, item.description, item.mb_flag, loc.location_name, 
-                       center.name AS WorkCentreDescription
+                       center.name AS WorkCentreDescription,
+                       (item.material_cost+item.overhead_cost+item.labour_cost) as ComponentCost,
+                       item.inventory_account,
+                       item.assembly_account
                FROM (".TB_PREF."wo_requirements req,"
                        .TB_PREF."locations loc,"
                        .TB_PREF."workcentres center)
@@ -24,25 +27,27 @@ function get_wo_requirements($woid)
        return db_query($sql, "The work order requirements could not be retrieved");    
 }
 
+function get_requirements_costs($woid)
+{
+       $sql = "SELECT SUM(units_req*unit_cost) cost
+               FROM ".TB_PREF."wo_requirements
+               WHERE workorder_id=".db_escape($woid);
+
+       $result = db_query($sql, "The work order requirements costs could not be retrieved");
+       $costs = db_fetch($result);
+
+       return $costs['cost'] ? $costs['cost'] : 0;
+}
+
 //--------------------------------------------------------------------------------------
 
 function create_wo_requirements($woid, $stock_id)
 {
-       // create Work Order Requirements based on the bom
-       $result = get_bom($stock_id);
-
-       while ($myrow = db_fetch($result)) 
-       {
+       $sql = "INSERT INTO ".TB_PREF."wo_requirements (workorder_id, stock_id, workcentre, units_req, loc_code)
+               SELECT ".db_escape($woid).", component, workcentre_added, quantity, loc_code
+               FROM ".TB_PREF."bom WHERE parent=".db_escape($stock_id);
 
-               $sql = "INSERT INTO ".TB_PREF."wo_requirements (workorder_id, stock_id, workcentre, units_req, loc_code)
-                       VALUES (".db_escape($woid).", '" .
-                       $myrow["component"] . "', '"    .
-                       $myrow["workcentre_added"] . "', '"     .
-                       $myrow["quantity"] . "', '"     .
-                       $myrow["loc_code"] . "')";
-
-        db_query($sql, "The work order requirements could not be added");
-       }
+    db_query($sql, "The work order requirements could not be added");
 }
 
 //--------------------------------------------------------------------------------------
@@ -55,11 +60,15 @@ function delete_wo_requirements($woid)
 
 
 //--------------------------------------------------------------------------------------
-
-function update_wo_requirement_issued($woid, $stock_id, $quantity)
+/*
+       Update total component units issued and average component cost
+*/
+function update_wo_requirement_issued($id, $quantity, $cost)
 {
-       $sql = "UPDATE ".TB_PREF."wo_requirements SET units_issued = units_issued + ".db_escape($quantity)."
-               WHERE workorder_id = ".db_escape($woid)." AND stock_id = ".db_escape($stock_id);
+       $sql = "UPDATE ".TB_PREF."wo_requirements SET 
+                               unit_cost = (units_issued*unit_cost+".$quantity*$cost.")/(units_issued+".$quantity."),
+                               units_issued = units_issued + ".db_escape($quantity)."
+                       WHERE id = ".db_escape($id);
 
        db_query($sql, "The work requirements issued quantity couldn't be updated");
 }
@@ -68,8 +77,8 @@ function update_wo_requirement_issued($woid, $stock_id, $quantity)
 
 function void_wo_requirements($woid)
 {
-       $sql = "UPDATE ".TB_PREF."wo_requirements SET units_issued = 0 WHERE workorder_id = "
-       .db_escape($woid);
+       $sql = "UPDATE ".TB_PREF."wo_requirements SET units_issued = 0
+               WHERE workorder_id = ".db_escape($woid);
 
        db_query($sql, "The work requirements issued quantity couldn't be voided");     
 }