Material cost doubles itself, if quantity = 0. Fixed.

[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 2aed7c1912876680a39523f78f77e181dc342497..52695e9d524932f6d3c2232d4bea1307aa73d84d 100644 (file)
--- a/manufacturing/includes/db/work_orders_db.inc
+++ b/manufacturing/includes/db/work_orders_db.inc
@@ -42,9 +42,13 @@ function add_material_cost($stock_id, $qty, $date_, $advanced=false)
                        $cost_adjust = true;
                $qoh = 0;
        }               
-       if ($qoh + $qty != 0)   
-               $material_cost = ($qoh * $material_cost + $qty * $m_cost) /     ($qoh + $qty);
-       
+       if ($qoh + $qty != 0)
+       {
+               if ($qoh == 0) // 27.10.2014 apmuthu and dz.
+                       $material_cost = $m_cost;
+               else    
+                       $material_cost = ($qoh * $material_cost + $qty * $m_cost) /     ($qoh + $qty);
+       }
        if ($advanced && $cost_adjust) // new 2010-02-10
                adjust_deliveries($stock_id, $bom_cost, $date_);        
        
@@ -71,7 +75,7 @@ function add_overhead_cost($stock_id, $qty, $date_, $costs, $adj_only=false)
                        $costs = $qty * $costs;
                if ($qoh>0)
                        $overhead_cost = ($qoh * $overhead_cost + $costs) / $qoh;
-               else // Journal Entry if QOH is 0/negative \r
+               else // Journal Entry if QOH is 0/negative 
                {
                        global $Refs;
 
@@ -93,7 +97,9 @@ function add_overhead_cost($stock_id, $qty, $date_, $costs, $adj_only=false)
                                
                        add_audit_trail(ST_JOURNAL, $id, $date_);
                        add_comments(ST_JOURNAL, $id, $date_, $memo);
-                       $Refs->save(ST_JOURNAL, $id, $ref);     
+                       $Refs->save(ST_JOURNAL, $id, $ref);
+                       if ($qty != 0) // 27.10.2014 dz
+                               $overhead_cost = ($qoh * $overhead_cost + $costs) / $qty;
                }
        }
        else
@@ -124,7 +130,7 @@ function add_labour_cost($stock_id, $qty, $date_, $costs, $adj_only=false)
                        $costs = $qty * $costs;
                if ($qoh>0)
                        $labour_cost = ($qoh * $labour_cost + $costs) / $qoh;   
-               else // Journal Entry if QOH is 0/negative \r
+               else // Journal Entry if QOH is 0/negative 
                {
                        global $Refs;
 
@@ -147,13 +153,15 @@ function add_labour_cost($stock_id, $qty, $date_, $costs, $adj_only=false)
                        add_audit_trail(ST_JOURNAL, $id, $date_);
                        add_comments(ST_JOURNAL, $id, $date_, $memo);
                        $Refs->save(ST_JOURNAL, $id, $ref);     
+                       if ($qty != 0) // 27.10.2014 dz
+                               $labour_cost = ($qoh * $labour_cost + $costs) / $qty;
                }
        }
        else
        {               
                if ($qoh + $qty != 0)   
                        $labour_cost = ($qoh * $labour_cost + $qty * $costs) /  ($qoh + $qty);
-       }       \r
+       }       
        $sql = "UPDATE ".TB_PREF."stock_master SET labour_cost=".db_escape($labour_cost)."
                WHERE stock_id=".db_escape($stock_id);
        db_query($sql,"The cost details for the inventory item could not be updated");
@@ -177,7 +185,7 @@ function add_issue_cost($stock_id, $qty, $date_, $costs, $adj_only=false)
                        $costs = $qty * $costs;
                if ($qoh>0)
                        $material_cost = $costs / $qoh;
-               else // Journal Entry if QOH is 0/negative\r
+               else // Journal Entry if QOH is 0/negative
                {
                        global $Refs;
 
@@ -199,14 +207,16 @@ function add_issue_cost($stock_id, $qty, $date_, $costs, $adj_only=false)
                                
                        add_audit_trail(ST_JOURNAL, $id, $date_);
                        add_comments(ST_JOURNAL, $id, $date_, $memo);
-                       $Refs->save(ST_JOURNAL, $id, $ref);     
+                       $Refs->save(ST_JOURNAL, $id, $ref);
+                       if ($qty != 0) // 27.10.2014 dz
+                               $material_cost = $costs / $qty; 
                }
        }
        else
        {
                if ($qoh + $qty != 0)   
                        $material_cost = ($qty * $costs) /      ($qoh + $qty);
-       }       \r
+       }       
        $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=material_cost+"
                .db_escape($material_cost)
                ." WHERE stock_id=".db_escape($stock_id);
@@ -433,7 +443,6 @@ function void_work_order($woid)
                $date = sql2date($work_order['date_']);
                
                $result = get_work_order_productions($woid); // check the produced quantity
-               $qty = 0;
                while ($row = db_fetch($result))
                {
                        void_work_order_produce($row['id']);
@@ -444,12 +453,11 @@ function void_work_order($woid)
                                continue;
                        $memo_ = _("Voiding Work Order Trans # ").$woid;
                        add_audit_trail(ST_MANURECEIVE, $row['id'], today(), _("Voided.")."\n".$memo_);
-                       add_voided_entry(ST_MANURECEIVE, $row['id'], today(), $memo_);\r
+                       add_voided_entry(ST_MANURECEIVE, $row['id'], today(), $memo_);
                }
-\r
+
                $result = get_work_order_issues($woid);
                $cost = 0;
-               $issue_no = 0;
                while ($row = db_fetch($result))
                {
                        void_work_order_issue($row['issue_no']);
@@ -463,13 +471,13 @@ function void_work_order($woid)
                        add_voided_entry(ST_MANUISSUE, $row['issue_no'], today(), $memo_);                              
                }
 
-               //Adust avg labour cost\r
-               $cost = get_gl_wo_cost($woid, WO_LABOUR); \r
+               //Adust avg labour cost
+               $cost = get_gl_wo_cost($woid, WO_LABOUR); 
                if ($cost != 0)
                        add_labour_cost($work_order['stock_id'], 1, $date, -$cost, true);
-                       \r
-               //Adust avg overhead cost\r
-               $cost = get_gl_wo_cost($woid, WO_OVERHEAD); \r
+                       
+               //Adust avg overhead cost
+               $cost = get_gl_wo_cost($woid, WO_OVERHEAD); 
                if ($cost != 0)
                        add_overhead_cost($work_order['stock_id'], 1, $date, -$cost, true);
                
@@ -524,6 +532,11 @@ function get_sql_for_work_orders($outstanding_only, $all_items)
                $sql .= " AND workorder.loc_code=".db_escape($_POST['StockLocation']);
        }
 
+       if (isset($_POST['OrderId']) && $_POST['OrderId'] != "")
+       {
+               $sql .= " AND workorder.id LIKE ".db_escape('%'.$_POST['OrderId'].'%');
+       }
+
        if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "")
        {
                $sql .= " AND workorder.wo_ref LIKE ".db_escape('%'.$_POST['OrderNumber'].'%');
@@ -540,6 +553,7 @@ function get_sql_for_work_orders($outstanding_only, $all_items)
 
                $sql .= " AND workorder.required_by < '$Today' ";
        }
+       $sql .= " ORDER BY workorder.id DESC";
        return $sql;
 }