details: https://code.openbravo.com/erp/devel/pi/rev/97fe6cfd4944
changeset: 30684:97fe6cfd4944
user: Alejandro <alekosmp86 <at> gmail.com>
date: Fri Nov 25 11:27:36 2016 +0100
summary: Fixes issue 34498: Duplicity in lines printing a sales order
When printing a sales order that contains a product that is part of a BOM
product,
it was appearing twice. The report was changed so it now returns the product
only
once.
diffstat:
src/org/openbravo/erpReports/C_OrderLinesJR_new.jrxml | 2 +-
src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR_new.jrxml | 2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
diffs (31 lines):
diff -r 5befe78d2de5 -r 97fe6cfd4944
src/org/openbravo/erpReports/C_OrderLinesJR_new.jrxml
--- a/src/org/openbravo/erpReports/C_OrderLinesJR_new.jrxml Fri Nov 25
10:01:39 2016 +0100
+++ b/src/org/openbravo/erpReports/C_OrderLinesJR_new.jrxml Fri Nov 25
11:27:36 2016 +0100
@@ -46,7 +46,7 @@
AND M_PRODUCT.C_UOM_ID = C_UOM.C_UOM_ID
AND C_ORDERLINE.C_ORDER_ID = $P{C_ORDER_ID}
AND C_ORDERLINE.C_ORDER_ID=C_ORDER.C_ORDER_ID
- AND C_ORDERLINE.BOM_PARENT_ID IS NOT NULL
+ AND C_ORDERLINE.BOM_PARENT_ID IS NOT NULL
UNION
SELECT 3 AS ISBOM, TO_NUMBER(null) AS LINE, C_TAX.NAME AS
PRODUCT_NAME, TO_NUMBER(NULL) AS QUANTITY, '' AS UOM, TO_NUMBER(NULL) AS
PRICEACTUAL,
C_ORDERTAX.TAXBASEAMT AS BASE, C_ORDERTAX.TAXAMT AS LINENETAMT,
C_ORDERTAX.LINE AS TAXLINE, C_ORDER.docstatus AS STATUS,
diff -r 5befe78d2de5 -r 97fe6cfd4944
src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR_new.jrxml
--- a/src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR_new.jrxml Fri Nov
25 10:01:39 2016 +0100
+++ b/src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR_new.jrxml Fri Nov
25 11:27:36 2016 +0100
@@ -35,6 +35,7 @@
C_ORDER
WHERE C_ORDERLINE.C_ORDER_ID = $P{C_ORDER_ID}
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 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,
@@ -45,6 +46,7 @@
AND M_PRODUCT.C_UOM_ID = C_UOM.C_UOM_ID
AND C_ORDERLINE.C_ORDER_ID = $P{C_ORDER_ID}
AND C_ORDERLINE.C_ORDER_ID=C_ORDER.C_ORDER_ID
+ AND C_ORDERLINE.BOM_PARENT_ID IS NOT NULL
UNION
SELECT 3 AS ISBOM, TO_NUMBER(null) AS LINE, C_TAX.NAME AS
PRODUCT_NAME, TO_NUMBER(NULL) AS QUANTITY, '' AS UOM, TO_NUMBER(NULL) AS
PRICEACTUAL,
C_ORDERTAX.TAXBASEAMT AS BASE, C_ORDERTAX.TAXAMT AS LINENETAMT,
C_ORDERTAX.LINE AS TAXLINE, C_ORDER.docstatus AS STATUS,
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
