Stable merged into unstable again (due to failure on binary file during previous...

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

diff --git a/manufacturing/includes/db/work_order_produce_items_db.inc b/manufacturing/includes/db/work_order_produce_items_db.inc
index 38af2add9b98efd04427682b1d22abdcb67aa694..dcac240cb831ba4020f5b989cac60b7672c86a85 100644 (file)
--- a/manufacturing/includes/db/work_order_produce_items_db.inc
+++ b/manufacturing/includes/db/work_order_produce_items_db.inc
@@ -44,11 +44,10 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo)
        db_query($sql,"A work order manufacture could not be added");
 
        $id = db_insert_id();
-       
+
        // -------------------------------------------------------------------------
 
        work_order_quick_costs($woid, $details["stock_id"], $quantity, $date_, $id);
-       
        // -------------------------------------------------------------------------
 
        // Chaitanya: stamp BOM cost to finished item
@@ -58,7 +57,7 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo)
        {
                $standard_cost = get_standard_cost($bom_item['component']);
                $m_cost += ($bom_item['quantity'] * $standard_cost);
-       }       
+       }
 
        // insert a +ve stock move for the item being manufactured
        // negative means "unproduce" or unassemble
@@ -118,7 +117,7 @@ function void_work_order_produce($type_no)
 {
        begin_transaction();
        hook_db_prevoid(ST_MANURECEIVE, $type_no);
-       
+
        //Chaitanya : Skip processing already voided entry i.e. explicitly voided
        $void_entry = get_voided_entry(ST_MANURECEIVE, $type_no);
        if ($void_entry)
@@ -145,25 +144,24 @@ function void_work_order_produce($type_no)
                $issue_cost = $myrow["qty"]*$myrow["standard_cost"];
                $issue = get_stock_gl_code($myrow["stock_id"]);
         $stockitem = get_item($myrow["stock_id"]);
-               
+
                //Chaitanya : Compatibility for Service Items
                if (!is_service($issue["mb_flag"]))
                        $ivaccount = $issue["inventory_account"];
                else
-                       $ivaccount = $issue["cogs_account"];            
-               
+                       $ivaccount = $issue["cogs_account"];
+
                if ($issue_cost != 0)
                {
                        add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $ivaccount, 0, 0,
                                $date_.": "._("Reversed the production ")." ".$stockitem["description"],
                                -$issue_cost);
                }
-       }       
-                       
+       }
        // clear the production record
        $sql = "UPDATE ".TB_PREF."wo_manufacture SET quantity=0 WHERE id=".db_escape($type_no);
-       db_query($sql, "Cannot void a wo production");                  
-       
+       db_query($sql, "Cannot void a wo production");
+
        //Chaitanya : Shifted below
        // void all related stock moves
        void_stock_move(ST_MANURECEIVE, $type_no);