Fixed wrong calculaiton of standard cost during Advanced Manufacturing. Petros.

[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..9f14876ece7740c40b514e621e158369909fda08 100644 (file)
--- a/manufacturing/includes/db/work_orders_db.inc
+++ b/manufacturing/includes/db/work_orders_db.inc
@@ -11,7 +11,7 @@
 ***********************************************************************/
 //--------------------------------------------------------------------------------------
 
-function add_material_cost($stock_id, $qty, $date_, $advanced=false)
+function add_material_cost($stock_id, $qty, $date_, $advanced=false, $woid=0)
 {
        $m_cost = 0;
     $result = get_bom($stock_id);
@@ -21,19 +21,29 @@ function add_material_cost($stock_id, $qty, $date_, $advanced=false)
                $m_cost += ($bom_item['quantity'] * $standard_cost);
        }
        $bom_cost = $m_cost;
-       
+       // new Joe Hunt 2015.10.15      
+       // additilnal costs.
+       if ($woid != 0 && work_order_has_issues($woid))
+       {
+               $res = get_additional_issues($woid);
+               while ($issue = db_fetch($res))
+               {
+                       $standard_cost = get_standard_cost($issue['stock_id']);
+                       $m_cost += ($issue['qty_issued'] * $standard_cost);
+               }
+       }
        $sql = "SELECT material_cost, labour_cost, overhead_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'];
-       
+       /* no, why will we do that?? Joe Hunt 2015.10.17
        if ($advanced)
        {
                //reduce overhead_cost and labour_cost from price as those will remain as is
                $m_cost = $m_cost - $myrow['labour_cost'] - $myrow['overhead_cost'];
        }
-       
+       */
        $qoh = get_qoh_on_date($stock_id);
        $cost_adjust = false;
        if ($qoh < 0)
@@ -42,9 +52,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_);        
        
@@ -87,13 +101,15 @@ function add_overhead_cost($stock_id, $qty, $date_, $costs, $adj_only=false)
                                -$costs);
                        //GL Posting to inventory adjustment account
                        add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, 
-                               $stock_gl_code["adjustment_account"],
+                               $stock_gl_code["assembly_account"], // changed 2015.10.14 from adjustment to assembly account. Petros.
                                $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo,
                                $costs);
                                
                        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
@@ -101,7 +117,7 @@ function add_overhead_cost($stock_id, $qty, $date_, $costs, $adj_only=false)
                if ($qoh + $qty != 0)   
                        $overhead_cost = ($qoh * $overhead_cost + $qty * $costs) /      ($qoh + $qty);
        }
-       $sql = "UPDATE ".TB_PREF."stock_master SET overhead_cost=".db_escape($overhead_cost)."
+       $sql = "UPDATE ".TB_PREF."stock_master SET overhead_cost=overhead_cost+".db_escape($overhead_cost)."
                WHERE stock_id=".db_escape($stock_id);
        db_query($sql,"The cost details for the inventory item could not be updated");
 }
@@ -140,13 +156,15 @@ function add_labour_cost($stock_id, $qty, $date_, $costs, $adj_only=false)
                                -$costs);
                        //GL Posting to inventory adjustment account
                        add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, 
-                               $stock_gl_code["adjustment_account"],
+                               $stock_gl_code["assembly_account"], // changed 2015.10.14 from adjustment to assembly account. Petros.
                                $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo,
                                $costs);
                                
                        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
@@ -154,7 +172,7 @@ function add_labour_cost($stock_id, $qty, $date_, $costs, $adj_only=false)
                if ($qoh + $qty != 0)   
                        $labour_cost = ($qoh * $labour_cost + $qty * $costs) /  ($qoh + $qty);
        }       
-       $sql = "UPDATE ".TB_PREF."stock_master SET labour_cost=".db_escape($labour_cost)."
+       $sql = "UPDATE ".TB_PREF."stock_master SET labour_cost=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");
 }
@@ -193,13 +211,15 @@ function add_issue_cost($stock_id, $qty, $date_, $costs, $adj_only=false)
                                -$costs);
                        //GL Posting to inventory adjustment account
                        add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, 
-                               $stock_gl_code["adjustment_account"],
+                               $stock_gl_code["assembly_account"], // changed 2015.10.14 from adjustment to assembly account. Petros.
                                $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo,
                                $costs);
                                
                        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
@@ -433,7 +453,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']);
@@ -449,7 +468,6 @@ function void_work_order($woid)
 
                $result = get_work_order_issues($woid);
                $cost = 0;
-               $issue_no = 0;
                while ($row = db_fetch($result))
                {
                        void_work_order_issue($row['issue_no']);
@@ -524,6 +542,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 +563,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;
 }