Fixed manufacturing module voiding procedures.

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

diff --git a/manufacturing/includes/db/work_order_issues_db.inc b/manufacturing/includes/db/work_order_issues_db.inc
index d61e3fc22ab911b4d7b257fc97240a87d441df3d..037e10cbb4fe6d5aebb170206f60be8365896b4f 100644 (file)
--- a/manufacturing/includes/db/work_order_issues_db.inc
+++ b/manufacturing/includes/db/work_order_issues_db.inc
@@ -36,7 +36,7 @@ function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $w
 
        foreach ($items as $item)
        {
-               if ($to_work_order)
+               if ($to_work_order)     // otherwise it is material return to inventory
                        $item->quantity = -$item->quantity;
 
                $unit_cost = get_unit_cost($item->stock_id);
@@ -64,12 +64,8 @@ function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $w
 
         $total_cost += add_gl_trans_std_cost(ST_MANUISSUE, $number, $date_, $ivaccount, 0, 0,
                 $date_.": "._("Issue of")." ".$stockitem["description"], -$issue_cost);
-               $issue_total += $issue_cost;
        }
 
-       if ($issue_total != 0)  // Apply cost to QOH as adjustment only
-               add_issue_cost($wo['stock_id'], $wo['units_reqd'], $date_, $issue_total, true);
-
     $stockitem = get_item($wo['stock_id']);
 
        $wip_account = $stockitem["wip_account"];
@@ -113,7 +109,7 @@ function get_additional_issues($woid)
 
 function get_work_order_issue($issue_no)
 {
-       $sql = "SELECT DISTINCT issue.*, wo.stock_id,
+       $sql = "SELECT DISTINCT issue.*, wo.stock_id, wo.closed,
                item.description, loc.location_name, center.name AS WorkCentreName
                FROM ".TB_PREF."wo_issues issue,"
                        .TB_PREF."workorders wo,"
@@ -155,66 +151,39 @@ function exists_work_order_issue($issue_no)
 
 //--------------------------------------------------------------------------------------
 
+function check_void_wo_issue($issue_no)
+{
+       $issue = get_work_order_issue($issue_no);
+       return $issue['closed'] ? $issue['workorder_id'] : 0;
+}
+
+//--------------------------------------------------------------------------------------
+
 function void_work_order_issue($type_no)
 {
        begin_transaction();
        hook_db_prevoid(ST_MANUISSUE, $type_no);
 
-       //Chaitanya : Skip processing already voided entry i.e. explicitly voided
        $void_entry = get_voided_entry(ST_MANUISSUE, $type_no);
        if ($void_entry)
                return;
 
+       $issue = get_work_order_issue($type_no);
+
+       if (work_order_is_closed($issue['workorder_id']))
+               return;
+
+       // FIXME update issued material cost
+
        // void the actual issue items and their quantities
-       $sql = "UPDATE ".TB_PREF."wo_issue_items Set qty_issued = 0 WHERE issue_id="
-               .db_escape($type_no);
+       $sql = "UPDATE ".TB_PREF."wo_issue_items SET qty_issued = 0
+               WHERE issue_id=".db_escape($type_no);
+
        db_query($sql,"A work order issue item could not be voided");
 
-       // Reverse the gl posting
-       $issue = get_work_order_issue($type_no);
-       $manf_stock_id = $issue["stock_id"];
-       $date_ = sql2date($issue["issue_date"]);
-       $woid = $issue["workorder_id"];
-
-       $result = get_stock_moves(ST_MANUISSUE, $type_no);
-       $total_cost = 0;
-       $issue_total = 0;
-       while ($myrow = db_fetch($result))
-       {
-               $issue_cost = $myrow["qty"]*$myrow["standard_cost"];
-               $issue = get_stock_gl_code($myrow["stock_id"]);
-        $stockitem = get_item($myrow["stock_id"]);
+       void_gl_trans(ST_MANUISSUE, $type_no);
 
-               // Compatibility for Service Items
-               if (!is_service($issue["mb_flag"]))
-                       $ivaccount = $issue["inventory_account"];
-               else
-                       $ivaccount = $issue["cogs_account"];
-
-               if ($issue_cost != 0)
-               {
-                       $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $ivaccount, 0, 0,
-                               $date_.": "._("Reversed the issue of")." ".$stockitem["description"],
-                               -$issue_cost);
-                       $issue_total += $issue_cost;
-               }
-       }
-       if ($issue_total != 0)
-               // Revese cost effect on manfactured stock item as adjustment only
-               add_issue_cost($manf_stock_id, 0, $date_, $issue_total, true);
-       $issue = get_stock_gl_code($manf_stock_id);
-    $stockitem = get_item($manf_stock_id);
-       if ($total_cost != 0)
-               add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $issue["inventory_account"],
-                       0, 0, $date_.": "._("Reversed the issue to")." ".$stockitem["description"], 
-                       -$total_cost);
-
-       // Shifted below void all related stock moves
        void_stock_move(ST_MANUISSUE, $type_no);
 
        commit_transaction();
 }
-
-
-//--------------------------------------------------------------------------------------
-