--- /opt/OpenbravoERP-2.50MP51/src-db/database/model/functions/MA_PRODUCTION_COST.xml
+++ /home/cheli/mercurial250/OpenbravoERP-2.50MP51/src-db/database/model/functions/MA_PRODUCTION_COST.xml
@@ -438,14 +438,14 @@
                       FROM M_TRANSACTION
                       WHERE M_PRODUCT_ID = Cur_ProductionLine.M_PRODUCT_ID
                         AND MOVEMENTDATE < v_ProductionDate
-                        AND (M_PRODUCTIONLINE_ID <> Cur_ProductionLine.M_PRODUCTIONLINE_ID OR M_PRODUCTIONLINE_ID IS NULL)
-                      UNION ALL
+                        AND M_PRODUCTIONLINE_ID <> Cur_ProductionLine.M_PRODUCTIONLINE_ID
+                      UNION
                       SELECT MT.M_PRODUCTIONLINE_ID, MT.MOVEMENTQTY
                       FROM M_TRANSACTION MT, M_PRODUCTIONLINE MP
                       WHERE MT.M_PRODUCT_ID = Cur_ProductionLine.M_PRODUCT_ID
                         AND MT.MOVEMENTDATE = v_ProductionDate
                         AND MT.M_PRODUCTIONLINE_ID = MP.M_PRODUCTIONLINE_ID
-                        AND (MT.M_PRODUCTIONLINE_ID <> Cur_ProductionLine.M_PRODUCTIONLINE_ID OR MT.M_PRODUCTIONLINE_ID IS NULL)
+                        AND MT.M_PRODUCTIONLINE_ID <> Cur_ProductionLine.M_PRODUCTIONLINE_ID
                         AND MP.CALCULATED = 'Y') T ;
                 --LEFT JOIN M_PRODUCTIONLINE ON T.M_PRODUCTIONLINE_ID = M_PRODUCTIONLINE.M_PRODUCTIONLINE_ID
                 --AND CALCULATED = 'Y';
@@ -478,7 +478,7 @@
                       FROM M_TRANSACTION
                       WHERE M_PRODUCT_ID = Cur_ProductionLine.M_PRODUCT_ID
                         AND MOVEMENTDATE <= v_ProductionDate
-                        AND (M_PRODUCTIONLINE_ID <> Cur_ProductionLine.M_PRODUCTIONLINE_ID OR M_PRODUCTIONLINE_ID IS NULL)) T LEFT JOIN M_PRODUCTIONLINE ON T.M_PRODUCTIONLINE_ID = M_PRODUCTIONLINE.M_PRODUCTIONLINE_ID AND CALCULATED = 'Y';
+                        AND M_PRODUCTIONLINE_ID <> Cur_ProductionLine.M_PRODUCTIONLINE_ID ) T LEFT JOIN M_PRODUCTIONLINE ON T.M_PRODUCTIONLINE_ID = M_PRODUCTIONLINE.M_PRODUCTIONLINE_ID AND CALCULATED = 'Y';
 
                 --Insert new calculated cost
                 Ad_Sequence_Next('M_Costing', Cur_ProductionLine.AD_ORG_ID, v_NextNo);