Changed so 'Allow Negative Stock' will update the GL cogs/inventory when

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

diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc
index a88f96d93804a66585a70cf2441eee654198c894..24754e4b1867611190464207f38983b97973f51a 100644 (file)
--- a/manufacturing/includes/db/work_orders_db.inc
+++ b/manufacturing/includes/db/work_orders_db.inc
@@ -21,17 +21,21 @@ function add_material_cost($stock_id, $qty, $date_)
                $m_cost += ($bom_item['quantity'] * $standard_cost);
        }
        $dec = user_price_dec();
-       $m_cost = price_decimal_format($m_cost, $dec);
+       price_decimal_format($m_cost, $dec);
        $sql = "SELECT material_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
                .db_escape($stock_id);
        $result = db_query($sql);
        $myrow = db_fetch($result);
        $material_cost =  $myrow['material_cost'];
        $qoh = get_qoh_on_date($stock_id, null, $date_);
+       /*
        if ($qoh + $qty <= 0)
                $material_cost = 0;
        else
-               $material_cost = ($qoh * $material_cost + $qty * $m_cost) /     ($qoh + $qty);
+       */
+       if ($qoh < 0)
+               $qoh = 0;
+       $material_cost = ($qoh * $material_cost + $qty * $m_cost) /     ($qoh + $qty);
        $material_cost = round2($material_cost, $dec);  
        $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=$material_cost
                WHERE stock_id=".db_escape($stock_id);
@@ -41,7 +45,7 @@ function add_material_cost($stock_id, $qty, $date_)
 function add_overhead_cost($stock_id, $qty, $date_, $costs)
 {
        $dec = user_price_dec();
-       $costs = price_decimal_format($costs, $dec); 
+       price_decimal_format($costs, $dec); 
        if ($qty != 0)
                $costs /= $qty;
        $sql = "SELECT overhead_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
@@ -50,10 +54,14 @@ function add_overhead_cost($stock_id, $qty, $date_, $costs)
        $myrow = db_fetch($result);
        $overhead_cost =  $myrow['overhead_cost'];
        $qoh = get_qoh_on_date($stock_id, null, $date_);
+       /*
        if ($qoh + $qty <= 0)
                $overhead_cost = 0;
        else
-               $overhead_cost = ($qoh * $overhead_cost + $qty * $costs) /      ($qoh + $qty);
+       */
+       if ($qoh < 0)
+               $qoh = 0;
+       $overhead_cost = ($qoh * $overhead_cost + $qty * $costs) /      ($qoh + $qty);
        $overhead_cost = round2($overhead_cost, $dec);  
        $sql = "UPDATE ".TB_PREF."stock_master SET overhead_cost=".db_escape($overhead_cost)."
                WHERE stock_id=".db_escape($stock_id);
@@ -63,7 +71,7 @@ function add_overhead_cost($stock_id, $qty, $date_, $costs)
 function add_labour_cost($stock_id, $qty, $date_, $costs)
 {
        $dec = user_price_dec();
-       $costs = price_decimal_format($costs, $dec); 
+       price_decimal_format($costs, $dec); 
        if ($qty != 0)
                $costs /= $qty;
        $sql = "SELECT labour_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
@@ -72,10 +80,14 @@ function add_labour_cost($stock_id, $qty, $date_, $costs)
        $myrow = db_fetch($result);
        $labour_cost =  $myrow['labour_cost'];
        $qoh = get_qoh_on_date($stock_id, null, $date_);
+       /*
        if ($qoh + $qty <= 0)
                $labour_cost = 0;
        else
-               $labour_cost = ($qoh * $labour_cost + $qty * $costs) /  ($qoh + $qty);
+       */
+       if ($qoh < 0)
+               $qoh = 0;
+       $labour_cost = ($qoh * $labour_cost + $qty * $costs) /  ($qoh + $qty);
        $labour_cost = round2($labour_cost, $dec);      
        $sql = "UPDATE ".TB_PREF."stock_master SET labour_cost=".db_escape($labour_cost)."
                WHERE stock_id=".db_escape($stock_id);
@@ -94,10 +106,14 @@ function add_issue_cost($stock_id, $qty, $date_, $costs)
        $dec = user_price_dec();
        $material_cost = price_decimal_format($material_cost, $dec); 
        $qoh = get_qoh_on_date($stock_id, null, $date_);
+       /*
        if ($qoh + $qty  <= 0)
                $material_cost = 0;
        else
-               $material_cost = ($qty * $costs) /      ($qoh + $qty);
+       */
+       if ($qoh < 0)
+               $qoh = 0;
+       $material_cost = ($qty * $costs) /      ($qoh + $qty);
        $material_cost = round2($material_cost, $dec);  
        $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=material_cost+"
                .db_escape($material_cost)