0027944: Not Stocked BOM lines are printed without price in orders

diff --git a/src/org/openbravo/erpReports/C_OrderLinesJR_new.jrxml b/src/org/openbravo/erpReports/C_OrderLinesJR_new.jrxml
--- a/src/org/openbravo/erpReports/C_OrderLinesJR_new.jrxml
+++ b/src/org/openbravo/erpReports/C_OrderLinesJR_new.jrxml
@@ -37,11 +37,11 @@
               AND C_ORDERLINE.C_ORDER_ID=C_ORDER.C_ORDER_ID
               AND C_ORDERLINE.BOM_PARENT_ID IS NULL
         UNION
-        SELECT 2 AS ISBOM, C_ORDERLINE.LINE, M_PRODUCT.NAME AS PRODUCT_NAME, C_ORDERLINE.QTYORDERED*M_PRODUCT_BOM.BOMQTY AS QUANTITY,
-        TO_CHAR(C_UOM.NAME) AS UOM, TO_NUMBER(NULL) AS PRICEACTUAL, TO_NUMBER(NULL) AS BASE, TO_NUMBER(NULL) AS LINENETAMT, TO_NUMBER(NULL) AS TAXLINE,
+        SELECT 2 AS ISBOM, C_ORDERLINE.LINE, M_PRODUCT.NAME AS PRODUCT_NAME, C_ORDERLINE.QTYORDERED AS QUANTITY,
+        TO_CHAR(C_UOM.NAME) AS UOM, CASE WHEN $P{ISTAXINCLUDED} = 'N' THEN C_ORDERLINE.PRICEACTUAL ELSE C_ORDERLINE.GROSS_UNIT_PRICE END AS PRICEACTUAL, TO_NUMBER(NULL) AS BASE, CASE WHEN $P{ISTAXINCLUDED} = 'N' THEN C_ORDERLINE.LINENETAMT ELSE C_ORDERLINE.LINE_GROSS_AMOUNT END AS LINENETAMT, TO_NUMBER(NULL) AS TAXLINE,
         C_ORDER.docstatus AS STATUS, TO_CHAR(M_PRODUCT.VALUE) AS VALUE
         FROM M_PRODUCT_BOM, M_PRODUCT, C_ORDERLINE, C_UOM,  C_ORDER
-        WHERE  C_ORDERLINE.M_PRODUCT_ID = M_PRODUCT_BOM.M_PRODUCT_ID
+        WHERE  C_ORDERLINE.M_PRODUCT_ID = M_PRODUCT_BOM.M_PRODUCTBOM_ID
             AND M_PRODUCT_BOM.M_PRODUCTBOM_ID = M_PRODUCT.M_PRODUCT_ID
             AND M_PRODUCT.C_UOM_ID = C_UOM.C_UOM_ID
             AND C_ORDERLINE.C_ORDER_ID = $P{C_ORDER_ID}
diff --git a/src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR_new.jrxml b/src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR_new.jrxml
--- a/src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR_new.jrxml
+++ b/src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR_new.jrxml
@@ -36,11 +36,11 @@
         WHERE C_ORDERLINE.C_ORDER_ID = $P{C_ORDER_ID}
               AND C_ORDERLINE.C_ORDER_ID=C_ORDER.C_ORDER_ID
         UNION
-        SELECT 2 AS ISBOM, C_ORDERLINE.LINE, M_PRODUCT.NAME AS PRODUCT_NAME, C_ORDERLINE.QTYORDERED*M_PRODUCT_BOM.BOMQTY AS QUANTITY,
-        TO_CHAR(C_UOM.NAME) AS UOM, TO_NUMBER(NULL) AS PRICEACTUAL, TO_NUMBER(NULL) AS BASE, TO_NUMBER(NULL) AS LINENETAMT, TO_NUMBER(NULL) AS TAXLINE,
+        SELECT 2 AS ISBOM, C_ORDERLINE.LINE, M_PRODUCT.NAME AS PRODUCT_NAME, C_ORDERLINE.QTYORDERED AS QUANTITY,
+        TO_CHAR(C_UOM.NAME) AS UOM, CASE WHEN $P{ISTAXINCLUDED} = 'N' THEN C_ORDERLINE.PRICEACTUAL ELSE C_ORDERLINE.GROSS_UNIT_PRICE END AS PRICEACTUAL, TO_NUMBER(NULL) AS BASE, CASE WHEN $P{ISTAXINCLUDED} = 'N' THEN C_ORDERLINE.LINENETAMT ELSE C_ORDERLINE.LINE_GROSS_AMOUNT END AS LINENETAMT, TO_NUMBER(NULL) AS TAXLINE,
         C_ORDER.docstatus AS STATUS, TO_CHAR(M_PRODUCT.VALUE) AS VALUE
         FROM M_PRODUCT_BOM, M_PRODUCT, C_ORDERLINE, C_UOM,  C_ORDER
-        WHERE  C_ORDERLINE.M_PRODUCT_ID = M_PRODUCT_BOM.M_PRODUCT_ID
+        WHERE  C_ORDERLINE.M_PRODUCT_ID = M_PRODUCT_BOM.M_PRODUCTBOM_ID
             AND M_PRODUCT_BOM.M_PRODUCTBOM_ID = M_PRODUCT.M_PRODUCT_ID
             AND M_PRODUCT.C_UOM_ID = C_UOM.C_UOM_ID
             AND C_ORDERLINE.C_ORDER_ID = $P{C_ORDER_ID}