# HG changeset patch
# User Jacqueline Lim <jacq09@gmail.com>
# Date 1376565046 -14400
# Node ID 994a4a671e2234dfe6a370f800ebb18b09d46d5f
# Parent  3fbf3113169edee9c0d431d607c0c0800c2c826c
Fixes issue 19526

diff --git a/src-db/database/model/functions/M_PRODUCTION_RUN.xml b/src-db/database/model/functions/M_PRODUCTION_RUN.xml
--- a/src-db/database/model/functions/M_PRODUCTION_RUN.xml
+++ b/src-db/database/model/functions/M_PRODUCTION_RUN.xml
@@ -348,6 +348,7 @@
               now(), p_User, CUR_BOM.M_ProductBOM_ID, -CUR_BOM.ProductionQty*CUR_BOM.BOMQty,
               CUR_BOM.M_Locator_ID, CUR_BOM.C_UOM_ID
           );
+	  v_QtyAcumulated := CUR_BOM.BOMQTY*CUR_BOM.ProductionQty;
         END IF;
         v_Line:=v_Line;
         IF (v_QtyAcumulated < CUR_BOM.BOMQTY*CUR_BOM.ProductionQty) AND MustBeStocked='Y' THEN
@@ -533,10 +534,12 @@
         SELECT pl.M_ProductionLine_ID, pl.AD_Client_ID, pl.AD_Org_ID, p.MovementDate,
             pl.M_Product_ID, pl.M_AttributeSetInstance_ID, pl.MovementQty, pl.M_Locator_ID,
             pl.M_Product_UOM_ID, pl.QuantityOrder, pl.C_UOM_ID, pl.LINE
-        FROM M_PRODUCTION p, M_PRODUCTIONLINE pl, M_PRODUCTIONPLAN pp
+        FROM M_PRODUCTION p, M_PRODUCTIONLINE pl, M_PRODUCTIONPLAN pp, M_PRODUCT
         WHERE p.M_Production_ID=pp.M_Production_ID
           AND pp.M_ProductionPlan_ID=pl.M_ProductionPlan_ID
           AND pp.M_Production_ID=v_Record_ID
+          AND pl.M_PRODUCT_ID=M_PRODUCT.M_PRODUCT_ID
+          AND M_PRODUCT.IsStocked='Y'
         ORDER BY pp.Line, pl.Line
     ) LOOP
       -- M_ProductionLine_ID, AD_Client_ID, AD_Org_ID, MovementDate, M_Product_ID, MovementQty, M_Locator_ID