Fixed a couple of bugs in stock list and account list search.

[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 ba53b5a2b2e69192a086342608545835560790c8..9422961f7c69ff8275ebcdcf35200181c4ca0e57 100644 (file)
--- a/manufacturing/includes/db/work_order_requirements_db.inc
+++ b/manufacturing/includes/db/work_order_requirements_db.inc
@@ -11,16 +11,15 @@
 ***********************************************************************/
 function get_wo_requirements($woid)
 {
-       $sql = "SELECT ".TB_PREF."wo_requirements.*, ".TB_PREF."stock_master.description,
-               ".TB_PREF."stock_master.mb_flag, 
-               ".TB_PREF."locations.location_name, 
-               ".TB_PREF."workcentres.name AS WorkCentreDescription FROM 
-               (".TB_PREF."wo_requirements, ".TB_PREF."locations, "
-               .TB_PREF."workcentres) INNER JOIN ".TB_PREF."stock_master ON 
-               ".TB_PREF."wo_requirements.stock_id = ".TB_PREF."stock_master.stock_id 
+       $sql = "SELECT req.*, item.description, item.mb_flag, loc.location_name, 
+                       center.name AS WorkCentreDescription
+               FROM (".TB_PREF."wo_requirements req,"
+                       .TB_PREF."locations loc,"
+                       .TB_PREF."workcentres center)
+                       INNER JOIN ".TB_PREF."stock_master item ON req.stock_id=item.stock_id 
                WHERE workorder_id=".db_escape($woid)."
-               AND ".TB_PREF."locations.loc_code = ".TB_PREF."wo_requirements.loc_code
-               AND ".TB_PREF."workcentres.id=workcentre";
+               AND loc.loc_code = req.loc_code
+               AND center.id=workcentre";
 
        return db_query($sql, "The work order requirements could not be retrieved");    
 }
@@ -30,20 +29,20 @@ function get_wo_requirements($woid)
 function create_wo_requirements($woid, $stock_id)
 {
        // create Work Order Requirements based on the bom
-       $result = get_bom($stock_id);   
-       
+       $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)
                        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");
-       }               
+       }
 }
 
 //--------------------------------------------------------------------------------------
@@ -57,11 +56,11 @@ function delete_wo_requirements($woid)
 
 //--------------------------------------------------------------------------------------
 
-function update_wo_requirement_issued($woReqID, $quantity)
+function update_wo_requirement_issued($woid, $stock_id, $quantity)
 {
        $sql = "UPDATE ".TB_PREF."wo_requirements SET units_issued = units_issued + ".db_escape($quantity)."
-               WHERE id = ".db_escape($woReqID);
-                               
+               WHERE workorder_id = ".db_escape($woid)." AND stock_id = ".db_escape($stock_id);
+
        db_query($sql, "The work requirements issued quantity couldn't be updated");
 }
 
@@ -75,6 +74,3 @@ function void_wo_requirements($woid)
        db_query($sql, "The work requirements issued quantity couldn't be voided");     
 }
 
-//--------------------------------------------------------------------------------------
-
-?>
\ No newline at end of file