Bug 5083: manufacturing creates bank transactions but void does not delete them....

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

diff --git a/manufacturing/includes/db/work_order_costing_db.inc b/manufacturing/includes/db/work_order_costing_db.inc
index c81b3c689f45b89db2a0942c06224ec8c9351a5f..cff4b6e30dc8be0c319202f5cc944b612bb35537 100644 (file)
--- a/manufacturing/includes/db/work_order_costing_db.inc
+++ b/manufacturing/includes/db/work_order_costing_db.inc
@@ -48,8 +48,8 @@ function update_material_cost($stock_id, $qty, $unit_cost, $date)
 {
        global $Refs;
 
-       $product = get_item($stock_id);
-       $avg_cost =  $product['material_cost'];
+       $item = get_item($stock_id);
+       $avg_cost =  $item['material_cost'];
 
        $qoh = get_qoh_on_date($stock_id, null, $date);
 
@@ -104,7 +104,7 @@ function update_material_cost($stock_id, $qty, $unit_cost, $date)
        }
 
        if ($qty > 0 && ($qoh != -$qty))
-               $avg_cost = ($avg_cost*($qoh+$qty_delayed)+$unit_cost*$qty_new)/($qoh+$qty);
+        $avg_cost = ($avg_cost*($qoh+$qty_delayed)+$unit_cost*$qty_new)/($qoh+$qty);
 
        $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=".db_escape($avg_cost)."
                    WHERE stock_id=".db_escape($stock_id);
@@ -161,13 +161,30 @@ function add_wo_costs_journal($wo_id, $amount, $cost_type, $cr_acc, $date, $dim1
 */
 function work_order_production_gl($woid, $stock_id, $quantity, $date_, $rcv_no)
 {
+       global $SysPrefs, $path_to_root;
+
+       $memo = "";
+       if ($SysPrefs->loc_notification() == 1)
+       {
+               include_once($path_to_root . "/sales/includes/cart_class.inc");
+               include_once($path_to_root . "/inventory/includes/inventory_db.inc");
+               $st_ids = array();
+               $st_names = array();
+               $st_num = array();
+               $st_reorder = array();
+       }
+       
        $result = get_wo_requirements($woid);
 
        // credit all the components
        $total_cost = 0;
        while ($bom_item = db_fetch($result))
        {
-
+               if ($SysPrefs->loc_notification() == 1 && is_inventory_item($bom_item['stock_id']))
+               {
+                       $line = new line_details($bom_item['stock_id'], $bom_item["units_req"] * $quantity, 0, 0, 0, 0, $bom_item['description']);
+                       $loc = calculate_reorder_level($bom_item["loc_code"], $line, $st_ids, $st_names, $st_num, $st_reorder); 
+               }
                update_wo_requirement_issued($bom_item['id'], $bom_item["units_req"] * $quantity, $bom_item["ComponentCost"]);
 
                // insert a -ve stock move for each item
@@ -188,6 +205,8 @@ function work_order_production_gl($woid, $stock_id, $quantity, $date_, $rcv_no)
        $wo = get_work_order($woid);
     add_gl_trans_std_cost(ST_MANURECEIVE, $rcv_no, $date_, $wo['wip_account'],
         0, 0, $memo, -$total_cost);
+       if ($SysPrefs->loc_notification() == 1 && count($st_ids) > 0)
+               send_reorder_email($loc, $st_ids, $st_names, $st_num, $st_reorder);
 }
 
 function check_wo_costing($type, $trans_no)
@@ -210,6 +229,10 @@ function void_wo_costing($wo_id)
 
        while($row = db_fetch($res))
        {
+               $is_bank_to = is_bank_account($row['account']);
+               if ($is_bank_to)
+                       void_bank_trans($row['trans_type'], $row['trans_no']);
+
                // void any related gl trans
                $date = Today();
                $type = $row['trans_type'];