details: /erp/devel/pi/rev/9d26e80ed49c
changeset: 10355:9d26e80ed49c
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Thu Feb 03 12:25:05 2011 +0100
summary: Fixes issue 0015797: Quantity column in Sales and Shipments
Dimensional Report
It has been fixed the jasper reports template for all dimensional reports non
comparatives to make the quantity of group 1 to sum by level 1. It was
incorrectly grouping by level 5
diffstat:
src/org/openbravo/erpCommon/ad_reports/WeightDimensionalNoComparative.jrxml |
1894 +++++-----
1 files changed, 947 insertions(+), 947 deletions(-)
diffs (truncated from 2749 to 300 lines):
diff -r 0ee185c69279 -r 9d26e80ed49c
src/org/openbravo/erpCommon/ad_reports/WeightDimensionalNoComparative.jrxml
---
a/src/org/openbravo/erpCommon/ad_reports/WeightDimensionalNoComparative.jrxml
Thu Feb 03 11:40:16 2011 +0100
+++
b/src/org/openbravo/erpCommon/ad_reports/WeightDimensionalNoComparative.jrxml
Thu Feb 03 12:25:05 2011 +0100
@@ -288,43 +288,43 @@
</parameter>
<parameter name="NUMBERFORMAT" isForPrompting="false"
class="java.text.DecimalFormat"/>
<parameter name="LOCALE" isForPrompting="false"
class="java.util.Locale"/>
- <queryString><![CDATA[SELECT NIVEL1, NIVEL2, NIVEL3, NIVEL4, NIVEL5,
NIVEL6, NIVEL7, NIVEL8, NIVEL9,
- SUM(AMOUNT) AS AMOUNT, SUM(QTY) AS QTY, SUM(WEIGHT) AS WEIGHT,
- SUM(AMOUNTREF) AS AMOUNTREF, SUM(QTYREF) AS QTYREF, SUM(WEIGHTREF) AS
WEIGHTREF, UOMSYMBOL,
- SUM(CONVAMOUNT) AS CONVAMOUNT,
- C_CURRENCY_SYMBOL('102', 0, 'Y') AS CONVSYM,
- SUM(CONVAMOUNTREF) AS CONVAMOUNTREF,
- C_CURRENCY_ISOSYM('102') AS CONVISOSYM
- FROM (SELECT NIVEL1, NIVEL2, NIVEL3, NIVEL4, NIVEL5, NIVEL6, NIVEL7,
NIVEL8, NIVEL9,
- SUM(LINENETAMT) AS AMOUNT, SUM(QTYORDERED) AS QTY, SUM(WEIGHT) AS
WEIGHT,
- SUM(LINENETREF) AS AMOUNTREF, SUM(QTYORDEREDREF) AS QTYREF,
SUM(WEIGHTREF) AS WEIGHTREF, UOMSYMBOL,
- C_CURRENCY_CONVERT(SUM(LINENETAMT), TRCURRENCYID, '102',
TO_DATE(TRDATE), NULL, TRCLIENTID, TRORGID) AS CONVAMOUNT,
- 0 AS CONVAMOUNTREF,
- TRCURRENCYID, TRDATE, TRCLIENTID, TRORGID
- FROM (SELECT to_char('1') AS NIVEL1, to_char('2') AS NIVEL2,
to_char('3') AS NIVEL3, to_char('4') AS NIVEL4, to_char('5') AS NIVEL5,
to_char('6') AS NIVEL6, to_char('7') AS NIVEL7, to_char('10') AS NIVEL8,
to_char('11') AS NIVEL9,
- C_ORDERLINE.LINENETAMT, C_ORDERLINE.QTYORDERED,
C_ORDERLINE.QTYORDERED*M_PRODUCT.WEIGHT AS WEIGHT,
- 0 AS LINENETREF, 0 AS QTYORDEREDREF, 0 AS WEIGHTREF, C_UOM.UOMSYMBOL,
- COALESCE(C_ORDERLINE.C_CURRENCY_ID, C_ORDER.C_CURRENCY_ID) AS
TRCURRENCYID,
- COALESCE(TO_DATE(C_ORDERLINE.DATEORDERED),
TO_DATE(C_ORDER.DATEORDERED), TO_DATE(NOW())) AS TRDATE,
- C_ORDERLINE.AD_CLIENT_ID AS TRCLIENTID,
- C_ORDERLINE.AD_ORG_ID AS TRORGID
- FROM C_ORDER left join AD_USER on C_ORDER.SALESREP_ID =
AD_USER.AD_USER_ID,
- C_BPARTNER left join C_BPARTNER CB on C_BPARTNER.SALESREP_ID =
CB.C_BPARTNER_ID,
- C_BP_GROUP, C_ORDERLINE, M_PRODUCT, M_PRODUCT_CATEGORY, M_WAREHOUSE,
C_UOM, AD_ORG
- WHERE C_ORDER.C_BPARTNER_ID = C_BPARTNER.C_BPARTNER_ID
- AND C_BPARTNER.C_BP_GROUP_ID = C_BP_GROUP.C_BP_GROUP_ID
- AND C_ORDER.C_ORDER_ID = C_ORDERLINE.C_ORDER_ID
- AND C_ORDERLINE.M_PRODUCT_ID = M_PRODUCT.M_PRODUCT_ID
- AND M_PRODUCT.M_PRODUCT_CATEGORY_ID =
M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID
- AND C_ORDER.M_WAREHOUSE_ID = M_WAREHOUSE.M_WAREHOUSE_ID
- AND C_ORDERLINE.C_UOM_ID = C_UOM.C_UOM_ID
- AND C_ORDER.AD_ORG_ID = AD_ORG.AD_ORG_ID
- AND C_ORDER.ISSOTRX = 'Y'
- AND C_ORDER.PROCESSED = 'Y'
- AND 0=0 AND C_ORDER.AD_ORG_ID IN ('1')
- AND C_ORDER.AD_CLIENT_ID IN ('8')
- AND 1=1) AA
- GROUP BY NIVEL1, NIVEL2, NIVEL3, NIVEL4, NIVEL5, NIVEL6, NIVEL7, NIVEL8,
NIVEL9, UOMSYMBOL, TRCURRENCYID, TRDATE, TRCLIENTID, TRORGID) ZZ
+ <queryString><![CDATA[SELECT NIVEL1, NIVEL2, NIVEL3, NIVEL4, NIVEL5,
NIVEL6, NIVEL7, NIVEL8, NIVEL9,
+ SUM(AMOUNT) AS AMOUNT, SUM(QTY) AS QTY, SUM(WEIGHT) AS WEIGHT,
+ SUM(AMOUNTREF) AS AMOUNTREF, SUM(QTYREF) AS QTYREF, SUM(WEIGHTREF) AS
WEIGHTREF, UOMSYMBOL,
+ SUM(CONVAMOUNT) AS CONVAMOUNT,
+ C_CURRENCY_SYMBOL('102', 0, 'Y') AS CONVSYM,
+ SUM(CONVAMOUNTREF) AS CONVAMOUNTREF,
+ C_CURRENCY_ISOSYM('102') AS CONVISOSYM
+ FROM (SELECT NIVEL1, NIVEL2, NIVEL3, NIVEL4, NIVEL5, NIVEL6, NIVEL7,
NIVEL8, NIVEL9,
+ SUM(LINENETAMT) AS AMOUNT, SUM(QTYORDERED) AS QTY, SUM(WEIGHT) AS
WEIGHT,
+ SUM(LINENETREF) AS AMOUNTREF, SUM(QTYORDEREDREF) AS QTYREF,
SUM(WEIGHTREF) AS WEIGHTREF, UOMSYMBOL,
+ C_CURRENCY_CONVERT(SUM(LINENETAMT), TRCURRENCYID, '102',
TO_DATE(TRDATE), NULL, TRCLIENTID, TRORGID) AS CONVAMOUNT,
+ 0 AS CONVAMOUNTREF,
+ TRCURRENCYID, TRDATE, TRCLIENTID, TRORGID
+ FROM (SELECT to_char('1') AS NIVEL1, to_char('2') AS NIVEL2,
to_char('3') AS NIVEL3, to_char('4') AS NIVEL4, to_char('5') AS NIVEL5,
to_char('6') AS NIVEL6, to_char('7') AS NIVEL7, to_char('10') AS NIVEL8,
to_char('11') AS NIVEL9,
+ C_ORDERLINE.LINENETAMT, C_ORDERLINE.QTYORDERED,
C_ORDERLINE.QTYORDERED*M_PRODUCT.WEIGHT AS WEIGHT,
+ 0 AS LINENETREF, 0 AS QTYORDEREDREF, 0 AS WEIGHTREF, C_UOM.UOMSYMBOL,
+ COALESCE(C_ORDERLINE.C_CURRENCY_ID, C_ORDER.C_CURRENCY_ID) AS
TRCURRENCYID,
+ COALESCE(TO_DATE(C_ORDERLINE.DATEORDERED),
TO_DATE(C_ORDER.DATEORDERED), TO_DATE(NOW())) AS TRDATE,
+ C_ORDERLINE.AD_CLIENT_ID AS TRCLIENTID,
+ C_ORDERLINE.AD_ORG_ID AS TRORGID
+ FROM C_ORDER left join AD_USER on C_ORDER.SALESREP_ID =
AD_USER.AD_USER_ID,
+ C_BPARTNER left join C_BPARTNER CB on C_BPARTNER.SALESREP_ID =
CB.C_BPARTNER_ID,
+ C_BP_GROUP, C_ORDERLINE, M_PRODUCT, M_PRODUCT_CATEGORY, M_WAREHOUSE,
C_UOM, AD_ORG
+ WHERE C_ORDER.C_BPARTNER_ID = C_BPARTNER.C_BPARTNER_ID
+ AND C_BPARTNER.C_BP_GROUP_ID = C_BP_GROUP.C_BP_GROUP_ID
+ AND C_ORDER.C_ORDER_ID = C_ORDERLINE.C_ORDER_ID
+ AND C_ORDERLINE.M_PRODUCT_ID = M_PRODUCT.M_PRODUCT_ID
+ AND M_PRODUCT.M_PRODUCT_CATEGORY_ID =
M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID
+ AND C_ORDER.M_WAREHOUSE_ID = M_WAREHOUSE.M_WAREHOUSE_ID
+ AND C_ORDERLINE.C_UOM_ID = C_UOM.C_UOM_ID
+ AND C_ORDER.AD_ORG_ID = AD_ORG.AD_ORG_ID
+ AND C_ORDER.ISSOTRX = 'Y'
+ AND C_ORDER.PROCESSED = 'Y'
+ AND 0=0 AND C_ORDER.AD_ORG_ID IN ('1')
+ AND C_ORDER.AD_CLIENT_ID IN ('8')
+ AND 1=1) AA
+ GROUP BY NIVEL1, NIVEL2, NIVEL3, NIVEL4, NIVEL5, NIVEL6, NIVEL7, NIVEL8,
NIVEL9, UOMSYMBOL, TRCURRENCYID, TRDATE, TRCLIENTID, TRORGID) ZZ
GROUP BY NIVEL1, NIVEL2, NIVEL3, NIVEL4, NIVEL5, NIVEL6, NIVEL7, NIVEL8,
NIVEL9, UOMSYMBOL, CONVSYM, CONVISOSYM, 1]]></queryString>
<field name="NIVEL1" class="java.lang.String"/>
@@ -376,7 +376,7 @@
<variable name="QTY_SUM2" class="java.math.BigDecimal"
resetType="Group" resetGroup="NIVEL2" calculation="Sum">
<variableExpression><![CDATA[$F{QTY}]]></variableExpression>
</variable>
- <variable name="QTY_SUM1" class="java.math.BigDecimal"
resetType="Group" resetGroup="LEVEL5" calculation="Sum">
+ <variable name="QTY_SUM1" class="java.math.BigDecimal"
resetType="Group" resetGroup="NIVEL1" calculation="Sum">
<variableExpression><![CDATA[$F{QTY}]]></variableExpression>
</variable>
<variable name="CONVAMOUNT_TOTAL" class="java.math.BigDecimal"
resetType="Report" calculation="Sum">
@@ -476,12 +476,12 @@
<groupFooter>
<band height="20" isSplitAllowed="true" >
<textField isStretchWithOverflow="false"
pattern="" isBlankWhenNull="false" evaluationTime="Report" hyperlinkType="None"
hyperlinkTarget="Self" >
- <reportElement
- style="Total_Field"
- x="572"
- y="2"
- width="82"
- height="18"
+ <reportElement
+ style="Total_Field"
+ x="572"
+ y="2"
+ width="82"
+ height="18"
key="textField-57"/>
<box leftPadding="5">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -495,12 +495,12 @@
<textFieldExpression
class="java.lang.String"><![CDATA[($V{WEIGHT_TOTAL}!=null)?$P{NUMBERFORMAT}.format($V{WEIGHT_TOTAL}):new
String(" ")]]></textFieldExpression>
</textField>
<staticText>
- <reportElement
- style="Report_Data_Label"
- x="395"
- y="2"
- width="50"
- height="18"
+ <reportElement
+ style="Report_Data_Label"
+ x="395"
+ y="2"
+ width="50"
+ height="18"
key="staticText-9"/>
<box leftPadding="5">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -513,12 +513,12 @@
<text><![CDATA[Totals]]></text>
</staticText>
<textField isStretchWithOverflow="false"
pattern="" isBlankWhenNull="false" evaluationTime="Report" hyperlinkType="None"
hyperlinkTarget="Self" >
- <reportElement
- style="Total_Field"
- x="445"
- y="2"
- width="103"
- height="18"
+ <reportElement
+ style="Total_Field"
+ x="445"
+ y="2"
+ width="103"
+ height="18"
key="textField-58"/>
<box leftPadding="5">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -532,23 +532,23 @@
<textFieldExpression
class="java.lang.String"><![CDATA[($V{CONVAMOUNT_TOTAL}!=null)?$P{NUMBERFORMAT}.format($V{CONVAMOUNT_TOTAL}):new
String(" ")]]></textFieldExpression>
</textField>
<line direction="TopDown">
- <reportElement
- x="0"
- y="1"
- width="729"
- height="0"
+ <reportElement
+ x="0"
+ y="1"
+ width="729"
+ height="0"
key="line-5"/>
<graphicElement
stretchType="NoStretch"/>
</line>
<textField isStretchWithOverflow="false"
pattern="" isBlankWhenNull="false" evaluationTime="Group"
evaluationGroup="NIVEL2" hyperlinkType="None" hyperlinkTarget="Self" >
- <reportElement
- style="Level2_Line"
- mode="Opaque"
- x="548"
- y="2"
- width="24"
- height="18"
- key="textField-96"
+ <reportElement
+ style="Level2_Line"
+ mode="Opaque"
+ x="548"
+ y="2"
+ width="24"
+ height="18"
+ key="textField-96"
stretchType="RelativeToBandHeight"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -561,13 +561,13 @@
<textFieldExpression
class="java.lang.String"><![CDATA[$F{CONVSYM}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="false"
isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
- <reportElement
- style="Detail_Header"
- x="0"
- y="2"
- width="15"
- height="18"
- key="textField-97"
+ <reportElement
+ style="Detail_Header"
+ x="0"
+ y="2"
+ width="15"
+ height="18"
+ key="textField-97"
positionType="FixRelativeToBottom"/>
<box leftPadding="5">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -581,13 +581,13 @@
<textFieldExpression
class="java.lang.String"><![CDATA[(($P{DIMENSIONS}.compareTo(new
Integer(1))>=0)?"1":"")]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="false"
isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
- <reportElement
- style="Detail_Header"
- x="15"
- y="2"
- width="15"
- height="18"
- key="textField-98"
+ <reportElement
+ style="Detail_Header"
+ x="15"
+ y="2"
+ width="15"
+ height="18"
+ key="textField-98"
positionType="FixRelativeToBottom"/>
<box leftPadding="5">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -601,13 +601,13 @@
<textFieldExpression
class="java.lang.String"><![CDATA[(($P{DIMENSIONS}.compareTo(new
Integer(2))>=0)?"2":"")]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="false"
isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
- <reportElement
- style="Detail_Header"
- x="30"
- y="2"
- width="15"
- height="18"
- key="textField-99"
+ <reportElement
+ style="Detail_Header"
+ x="30"
+ y="2"
+ width="15"
+ height="18"
+ key="textField-99"
positionType="FixRelativeToBottom"/>
<box leftPadding="5">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -621,13 +621,13 @@
<textFieldExpression
class="java.lang.String"><![CDATA[(($P{DIMENSIONS}.compareTo(new
Integer(3))>=0)?"3":"")]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="false"
isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
- <reportElement
- style="Detail_Header"
- x="45"
- y="2"
- width="15"
- height="18"
- key="textField-100"
+ <reportElement
+ style="Detail_Header"
+ x="45"
+ y="2"
+ width="15"
+ height="18"
+ key="textField-100"
positionType="FixRelativeToBottom"/>
<box leftPadding="5">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -641,13 +641,13 @@
<textFieldExpression
class="java.lang.String"><![CDATA[(($P{DIMENSIONS}.compareTo(new
Integer(4))>=0)?"4":"")]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="false"
isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
- <reportElement
- style="Detail_Header"
- x="60"
- y="2"
- width="15"
- height="18"
- key="textField-101"
+ <reportElement
+ style="Detail_Header"
+ x="60"
+ y="2"
+ width="15"
+ height="18"
+ key="textField-101"
positionType="FixRelativeToBottom"/>
<box leftPadding="5">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -661,13 +661,13 @@
<textFieldExpression
class="java.lang.String"><![CDATA[(($P{DIMENSIONS}.compareTo(new
Integer(5))>=0)?"5":"")]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="false"
isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
- <reportElement
- style="Detail_Header"
- x="75"
- y="2"
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
