Early payment discount option moved from branch to payment terms.

[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 44c93b864d0392bf07dc5bca3562e4e70e4caf7b..608e75a0f4f2b9a79140bb57fed9cbaf6e9a40b8 100644 (file)
--- a/manufacturing/includes/db/work_order_produce_items_db.inc
+++ b/manufacturing/includes/db/work_order_produce_items_db.inc
@@ -14,7 +14,7 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo, $close_wo)
        global $Refs;
 
 // FIXME: support for WO_UNASSEMBLY case
-       begin_transaction();
+       begin_transaction(__FUNCTION__, func_get_args());
 
        $args = func_get_args();
        $args = (object)array_combine(array('woid', 'ref', 'quantity', 'date_', 'memo','close_wo'),
@@ -81,10 +81,11 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo, $close_wo)
 
                $unit_cost = $total_cost/($product['units_issued']+$quantity);
 
+               // first update material cost
+               update_material_cost($product['stock_id'], $product['units_issued']+$quantity, $unit_cost, $date_);
+
                add_stock_move(ST_WORKORDER, $product["stock_id"], $woid,
                        $product["loc_code"], $date_, $ref, $product['units_issued']+$quantity, $unit_cost);
-
-               update_material_cost($product['stock_id'], $product['units_issued']+$quantity, $unit_cost, $date_);
        }
 
        if ($memo)
@@ -146,7 +147,7 @@ function check_void_wo_production($prod_no)
 
 function void_work_order_produce($type_no)
 {
-       begin_transaction();
+       begin_transaction(__FUNCTION__, func_get_args());
        hook_db_prevoid(ST_MANURECEIVE, $type_no);
 
        // Skip processing already voided entry i.e. explicitly voided