Allow search by Id in search work orders.

[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 a79c2574dab6e626556bc66d3ffb9a610fb71d3c..d8894401ce1de2a93e98be17324bafc695c46324 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_);        
        
@@ -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
@@ -147,6 +153,8 @@ 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
@@ -199,7 +207,9 @@ 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
@@ -524,6 +534,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'].'%');