Backup and Restore: system settings has not been refreshed after restore (typo).

[fa-stable.git] / includes / db / manufacturing_db.inc

diff --git a/includes/db/manufacturing_db.inc b/includes/db/manufacturing_db.inc
index c47cc561815c1387fb6a024c3bb51bb69c6a53f0..6473ba4bcf0f335e067402879389325cc222e6c8 100644 (file)
--- a/includes/db/manufacturing_db.inc
+++ b/includes/db/manufacturing_db.inc
@@ -41,7 +41,7 @@ function load_stock_levels($location)
        $sql = "SELECT stock_id, SUM(qty) FROM ".TB_PREF."stock_moves WHERE tran_date <= '$date'";
        if ($location != '') $sql .= " AND loc_code = ".db_escape($location);
        $sql .= " GROUP BY stock_id";
-       $result = db_query($sql, "QOH calulcation failed");
+       $result = db_query($sql, "QOH calculation failed");
        while ($row = db_fetch($result)) {
                $qoh_stock[$row[0]] = $row[1];
        }
@@ -61,8 +61,8 @@ function stock_demand_manufacture($stock_id, $qty, $demand_id, $location, $level
                $qoh_stock = array();
                load_stock_levels($location);
        }
-       $stock_qty = $qoh_stock[$stock_id];
-       if ($stock_qty == NULL) $stock_qty = 0;
+       if (empty($qoh_stock[$stock_id])) $stock_qty = 0;
+       else $stock_qty = $qoh_stock[$stock_id];
        if ($qty <= $stock_qty) return $demand;
        $bom = @$bom_list[$stock_id];
        if ($bom == NULL) {
@@ -109,7 +109,7 @@ function get_demand_asm_qty($stock_id, $location)
                $sql .= TB_PREF."sales_orders.from_stk_loc =".db_escape($location)." AND ";
        $sql .= TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent > 0 AND
                                   ".TB_PREF."stock_master.stock_id=".TB_PREF."sales_order_details.stk_code AND
-                                  (".TB_PREF."stock_master.mb_flag='M' OR ".TB_PREF."stock_master.mb_flag='A')
+                                  ".TB_PREF."stock_master.mb_flag='M'
                                   GROUP BY ".TB_PREF."sales_order_details.stk_code";
     $result = db_query($sql, "No transactions were returned");
        while ($row = db_fetch_row($result)) {
@@ -161,7 +161,7 @@ function get_on_worder_qty($stock_id, $location)
        else
                $qoo = 0.0;
        $flag = get_mb_flag($stock_id);
-       if ($flag == 'A' || $flag == 'M')
+       if ($flag == 'M')
        {
                $sql = "SELECT SUM((".TB_PREF."workorders.units_reqd-".TB_PREF."workorders.units_issued)) AS qoo
                        FROM ".TB_PREF."workorders 
@@ -179,19 +179,6 @@ function get_on_worder_qty($stock_id, $location)
        return $qoo;
 }
 
-function get_mb_flag($stock_id)
-{
-       $sql = "SELECT mb_flag FROM ".TB_PREF."stock_master WHERE stock_id = "
-               .db_escape($stock_id);
-       $result = db_query($sql, "retreive mb_flag from item");
-       
-       if (db_num_rows($result) == 0)
-               return -1;
-
-       $myrow = db_fetch_row($result);
-       return $myrow[0];
-}
-
 //--------------------------------------------------------------------------------------
 
 function add_bom($selected_parent, $component, $workcentre_added, $loc_code, $quantity)
@@ -205,7 +192,7 @@ function add_bom($selected_parent, $component, $workcentre_added, $loc_code, $qu
 }
 //--------------------------------------------------------------------------------------
 
-function update_bom($selected_parent, $selected_component, $work_centre_added, $loc_code, $quantity)
+function update_bom($selected_parent, $selected_component, $workcentre_added, $loc_code, $quantity)
 {
        $sql = "UPDATE ".TB_PREF."bom SET workcentre_added=".db_escape($workcentre_added)
         . ",loc_code=".db_escape($loc_code) . ",
@@ -283,7 +270,7 @@ function check_for_recursive_bom($ultimate_parent, $component_to_check)
        $sql = "SELECT component FROM ".TB_PREF."bom WHERE parent=".db_escape($component_to_check);
        $result = db_query($sql,"could not check recursive bom");
 
-       if ($result != 0)
+       if ($result)
        {
                while ($myrow = db_fetch_row($result))
                {
@@ -296,10 +283,9 @@ function check_for_recursive_bom($ultimate_parent, $component_to_check)
                        {
                                return 1;
                        }
-               } //(while loop)
-       } //end if $result is true
+               }
+       }
 
        return 0;
-} //end of function check_for_recursive_bom
+}
 
-?>