details: https://code.openbravo.com/erp/devel/pi/rev/047e3c5c51ab
changeset: 13158:047e3c5c51ab
user: Ioritz Cia <ioritz.cia <at> openbravo.com>
date: Fri Jul 15 09:34:32 2011 +0200
summary: Issue 17546: Order and Invoice reports have 'Price' column always in
English and another problems.
diffstat:
src/org/openbravo/erpReports/C_OrderJR.jrxml | 49 ++++++++-
src/org/openbravo/erpReports/C_OrderLinesJR.jrxml | 94 +++++++++---------
src/org/openbravo/erpReports/RptC_Invoice.jrxml | 74 ++++++++++----
src/org/openbravo/erpReports/RptC_Invoice_Lines.jrxml | 48 +++------
src/org/openbravo/erpReports/RptC_OrderPO.jrxml | 28 +++++-
src/org/openbravo/erpReports/RptC_OrderPO_Lines.jrxml | 33 ++---
6 files changed, 197 insertions(+), 129 deletions(-)
diffs (truncated from 635 to 300 lines):
diff -r 87b0a2f932f2 -r 047e3c5c51ab
src/org/openbravo/erpReports/C_OrderJR.jrxml
--- a/src/org/openbravo/erpReports/C_OrderJR.jrxml Thu Jul 14 17:56:41
2011 +0200
+++ b/src/org/openbravo/erpReports/C_OrderJR.jrxml Fri Jul 15 09:34:32
2011 +0200
@@ -72,7 +72,7 @@
COALESCE(TO_CHAR(ADDRESS1), '') || CASE WHEN ADDRESS1 IS null THEN '' ELSE
CHR(13) END || COALESCE(TO_CHAR(POSTAL), '') || CASE WHEN POSTAL IS null THEN
'' ELSE CHR(13) END ||
COALESCE(TO_CHAR(C_BPARTNER_LOCATION.PHONE), '') || CASE WHEN
C_BPARTNER_LOCATION.PHONE IS null THEN '' ELSE CHR(13) END ||
COALESCE(TO_CHAR(C_BPARTNER_LOCATION.FAX), '') ||
CASE WHEN C_BPARTNER_LOCATION.FAX IS null THEN '' ELSE CHR(13) END) AS
BP_DATA, AD_ORGINFO.TAXID AS ORG_TAXID, SHOWLOGO, SHOWCOMPANYDATA, HEADERMARGIN,
-AD_ORG.NAME AS ORG_NAME, DELIVERYRULE.NAME AS DELIVERYTERM, PAYMENTTERM.TERM
AS PAYMENTTERM, C_POC_DOCTYPE_TEMPLATE.NAME AS DOC_TYPE
+AD_ORG.NAME AS ORG_NAME, DELIVERYRULE.NAME AS DELIVERYTERM, PAYMENTTERM.TERM
AS PAYMENTTERM, C_POC_DOCTYPE_TEMPLATE.NAME AS DOC_TYPE, C_CURRENCY.ISO_CODE as
CURRENCY_ISO
FROM C_BPARTNER_LOCATION left join C_LOCATION L on
C_BPARTNER_LOCATION.C_LOCATION_ID = L.C_LOCATION_ID
left join C_REGION R on L.C_REGION_ID = R.C_REGION_ID,
AD_USER right join C_ORDER on AD_USER.AD_USER_ID = C_ORDER.AD_USER_ID
@@ -84,7 +84,7 @@
AND AD_LANGUAGE IN ($P{LANGUAGE})) DELIVERYRULE,
(SELECT C_PAYMENTTERM.C_PAYMENTTERM_ID, COALESCE( C_PAYMENTTERM_TRL.NAME,
C_PAYMENTTERM.NAME) AS TERM
FROM C_PAYMENTTERM LEFT JOIN C_PAYMENTTERM_TRL ON
C_PAYMENTTERM.C_PAYMENTTERM_ID = C_PAYMENTTERM_TRL.C_PAYMENTTERM_ID
- AND C_PAYMENTTERM_TRL.AD_LANGUAGE IN ($P{LANGUAGE})) PAYMENTTERM
+ AND C_PAYMENTTERM_TRL.AD_LANGUAGE IN ($P{LANGUAGE})) PAYMENTTERM,
C_CURRENCY
WHERE C_ORDER.C_BPARTNER_LOCATION_ID =
C_BPARTNER_LOCATION.C_BPARTNER_LOCATION_ID
AND C_ORDER.C_BPARTNER_ID = C_BPARTNER.C_BPARTNER_ID
AND AD_ORG.ad_org_id = AD_ORGINFO.ad_org_id
@@ -94,7 +94,8 @@
AND C_ORDER.AD_CLIENT_ID = AD_CLIENT.AD_CLIENT_ID
AND C_ORDER.C_ORDER_ID IN ($P{DOCUMENT_ID})
AND C_ORDER.DELIVERYRULE = DELIVERYRULE.VALUE
-AND C_ORDER.C_PAYMENTTERM_ID = PAYMENTTERM.C_PAYMENTTERM_ID]]>
+AND C_ORDER.C_PAYMENTTERM_ID = PAYMENTTERM.C_PAYMENTTERM_ID
+AND C_CURRENCY.C_CURRENCY_ID=C_ORDER.C_CURRENCY_ID]]>
</queryString>
<field name="C_ORDER_ID" class="java.lang.String"/>
<field name="NAME" class="java.lang.String"/>
@@ -119,6 +120,7 @@
<field name="DELIVERYTERM" class="java.lang.String"/>
<field name="PAYMENTTERM" class="java.lang.String"/>
<field name="DOC_TYPE" class="java.lang.String"/>
+ <field name="CURRENCY_ISO" class="java.lang.String"/>
<group name="PrintLarge" isReprintHeaderOnEachPage="true">
<groupExpression><![CDATA[]]></groupExpression>
<groupHeader>
@@ -232,13 +234,48 @@
<textElement textAlignment="Right"/>
<textFieldExpression
class="java.lang.String"><![CDATA[($F{LOCATION}==null ? $F{ORG_NAME} + "\n" +
$F{ORG_TAXID} + "\n" : $F{ORG_NAME} + "\n" + $F{ORG_TAXID} + "\n" +
$F{LOCATION})]]></textFieldExpression>
</textField>
+ <staticText>
+ <reportElement key="staticText-11"
style="Group_Data_Label" x="210" y="214" width="150" height="18"
forecolor="#999999" backcolor="#FFFFFF"/>
+ <box>
+ <topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0"
lineColor="#000000"/>
+ <rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement textAlignment="Left"
verticalAlignment="Top">
+ <font size="11" isBold="true"
pdfFontName="Helvetica"/>
+ </textElement>
+ <text><![CDATA[Currency]]></text>
+ </staticText>
<textField isBlankWhenNull="false">
- <reportElement key="textField-23" x="0"
y="6" width="250" height="37"/>
+ <reportElement key="textField-24"
x="210" y="234" width="150" height="20"/>
+ <box>
+ <topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0"
lineColor="#000000"/>
+ <rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement/>
+ <textFieldExpression
class="java.lang.String"><![CDATA[$F{CURRENCY_ISO}]]></textFieldExpression>
+ </textField>
+ <staticText>
+ <reportElement key="staticText-12"
x="0" y="6" width="310" height="37">
+
<printWhenExpression><![CDATA[new
Boolean($F{DOC_TYPE}.equalsIgnoreCase("Purchase Order Report
template"))]]></printWhenExpression>
+ </reportElement>
<textElement>
<font size="26"/>
</textElement>
- <textFieldExpression
class="java.lang.String"><![CDATA[($F{DOC_TYPE}.equalsIgnoreCase("Purchase
Order Report template")) == true ? "PURCHASE ORDER" : "SALES
ORDER"]]></textFieldExpression>
- </textField>
+ <text><![CDATA[PURCHASE ORDER]]></text>
+ </staticText>
+ <staticText>
+ <reportElement key="staticText-13"
x="0" y="6" width="310" height="37">
+
<printWhenExpression><![CDATA[new
Boolean($F{DOC_TYPE}.equalsIgnoreCase("Purchase Order Report template") ==
false)]]></printWhenExpression>
+ </reportElement>
+ <textElement>
+ <font size="26"/>
+ </textElement>
+ <text><![CDATA[SALES ORDER]]></text>
+ </staticText>
</band>
</groupHeader>
<groupFooter>
diff -r 87b0a2f932f2 -r 047e3c5c51ab
src/org/openbravo/erpReports/C_OrderLinesJR.jrxml
--- a/src/org/openbravo/erpReports/C_OrderLinesJR.jrxml Thu Jul 14 17:56:41
2011 +0200
+++ b/src/org/openbravo/erpReports/C_OrderLinesJR.jrxml Fri Jul 15 09:34:32
2011 +0200
@@ -23,34 +23,31 @@
<queryString>
<![CDATA[SELECT 1 AS ISBOM, C_ORDERLINE.LINE,
COALESCE(M_PRODUCT.NAME, C_ORDERLINE.DESCRIPTION) AS PRODUCT_NAME,
C_ORDERLINE.QTYORDERED AS QUANTITY,
TO_CHAR(C_UOM.NAME) AS UOM, C_ORDERLINE.PRICEACTUAL, TO_NUMBER(NULL)
AS BASE, C_ORDERLINE.LINENETAMT, TO_NUMBER(NULL) AS TAXLINE,
- TO_CHAR(C_CURRENCY.CURSYMBOL) as CURRENCY, C_ORDER.docstatus AS
STATUS, C_CURRENCY.ISO_CODE as CURRENCY_ISO, TO_CHAR(M_PRODUCT.VALUE) AS VALUE
+ C_ORDER.docstatus AS STATUS, TO_CHAR(M_PRODUCT.VALUE) AS VALUE
FROM C_ORDERLINE left join M_PRODUCT on C_ORDERLINE.M_PRODUCT_ID =
M_PRODUCT.M_PRODUCT_ID
left join C_UOM on C_ORDERLINE.C_UOM_ID =
C_UOM.C_UOM_ID,
- C_ORDER, C_CURRENCY
+ 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_CURRENCY.C_CURRENCY_ID=C_ORDER.C_CURRENCY_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,
- TO_CHAR(C_CURRENCY.ISO_CODE) as CURRENCY, C_ORDER.docstatus AS STATUS,
C_CURRENCY.ISO_CODE as CURRENCY_ISO, TO_CHAR(M_PRODUCT.VALUE) AS VALUE
- FROM M_PRODUCT_BOM, M_PRODUCT, C_ORDERLINE, C_UOM, C_ORDER, C_CURRENCY
+ 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
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}
AND C_ORDERLINE.C_ORDER_ID=C_ORDER.C_ORDER_ID
- AND C_CURRENCY.C_CURRENCY_ID=C_ORDER.C_CURRENCY_ID
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, TO_CHAR(C_CURRENCY.CURSYMBOL) as CURRENCY,
C_ORDER.docstatus AS STATUS,
- C_CURRENCY.ISO_CODE as CURRENCY_ISO, '' AS VALUE
- FROM C_ORDER, C_ORDERTAX, C_TAX, C_CURRENCY
+ C_ORDERTAX.TAXBASEAMT AS BASE, C_ORDERTAX.TAXAMT AS LINENETAMT,
C_ORDERTAX.LINE AS TAXLINE, C_ORDER.docstatus AS STATUS,
+ '' AS VALUE
+ FROM C_ORDER, C_ORDERTAX, C_TAX
WHERE C_ORDER.C_ORDER_ID = C_ORDERTAX.C_ORDER_ID
AND C_TAX.C_TAX_ID = C_ORDERTAX.C_TAX_ID
AND C_ORDERTAX.TAXAMT <> 0
AND C_ORDER.C_ORDER_ID = $P{C_ORDER_ID}
- AND C_CURRENCY.C_CURRENCY_ID=C_ORDER.C_CURRENCY_ID
ORDER BY LINE,ISBOM, TAXLINE]]>
</queryString>
<field name="ISBOM" class="java.lang.Integer"/>
@@ -62,9 +59,7 @@
<field name="BASE" class="java.math.BigDecimal"/>
<field name="LINENETAMT" class="java.math.BigDecimal"/>
<field name="TAXLINE" class="java.math.BigDecimal"/>
- <field name="CURRENCY" class="java.lang.String"/>
<field name="STATUS" class="java.lang.String"/>
- <field name="CURRENCY_ISO" class="java.lang.String"/>
<field name="VALUE" class="java.lang.String"/>
<variable name="SUM_LINENETAMT" class="java.math.BigDecimal"
calculation="Sum">
<variableExpression><![CDATA[$F{LINENETAMT}]]></variableExpression>
@@ -74,7 +69,7 @@
<groupHeader>
<band height="20" splitType="Stretch">
<staticText>
- <reportElement key="staticText"
style="Detail_Header" mode="Opaque" x="235" y="3" width="55" height="17"
forecolor="#FFFFFF" backcolor="#666666"/>
+ <reportElement key="staticText"
style="Detail_Header" mode="Opaque" x="235" y="3" width="60" height="17"
forecolor="#FFFFFF" backcolor="#666666"/>
<box leftPadding="2" rightPadding="2">
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -112,29 +107,36 @@
</textElement>
<text><![CDATA[PRODUCT NAME]]></text>
</staticText>
- <textField isBlankWhenNull="false">
- <reportElement key="textField-3"
style="Detail_Header" x="290" y="3" width="65" height="17"/>
+ <staticText>
+ <reportElement key="staticText-1"
style="Detail_Header" x="1" y="3" width="65" height="17"/>
+ <textElement verticalAlignment="Top">
+ <font isBold="false"/>
+ </textElement>
+ <text><![CDATA[REFERENCE]]></text>
+ </staticText>
+ <staticText>
+ <reportElement key="staticText-2"
style="Detail_Header" x="295" y="3" width="60" height="17" forecolor="#FFFFFF"
backcolor="#666666"/>
<textElement textAlignment="Right"
verticalAlignment="Top">
- <font size="10" isBold="false"/>
+ <font isBold="false"
pdfFontName="Helvetica"/>
</textElement>
- <textFieldExpression
class="java.lang.String"><![CDATA["PRICE (" + $F{CURRENCY_ISO} +
")"]]></textFieldExpression>
- </textField>
- <textField isBlankWhenNull="false">
- <reportElement key="textField-4"
style="Detail_Header" x="355" y="3" width="60" height="17"/>
+ <text><![CDATA[PRICE]]></text>
+ </staticText>
+ <staticText>
+ <reportElement key="staticText-3"
style="Detail_Header" x="355" y="3" width="60" height="17" forecolor="#FFFFFF"
backcolor="#666666"/>
<textElement textAlignment="Right"
verticalAlignment="Top">
- <font size="10" isBold="false"/>
+ <font isBold="false"
pdfFontName="Helvetica"/>
</textElement>
- <textFieldExpression
class="java.lang.String"><![CDATA["BASE (" + $F{CURRENCY_ISO} +
")"]]></textFieldExpression>
- </textField>
- <textField isBlankWhenNull="false">
- <reportElement key="textField-5"
style="Detail_Header" x="415" y="3" width="60" height="17"/>
+ <text><![CDATA[BASE]]></text>
+ </staticText>
+ <staticText>
+ <reportElement key="staticText-4"
style="Detail_Header" x="415" y="3" width="60" height="17" forecolor="#FFFFFF"
backcolor="#666666"/>
<textElement textAlignment="Right"
verticalAlignment="Top">
- <font size="10" isBold="false"/>
+ <font isBold="false"
pdfFontName="Helvetica"/>
</textElement>
- <textFieldExpression
class="java.lang.String"><![CDATA["NET (" + $F{CURRENCY_ISO} +
")"]]></textFieldExpression>
- </textField>
+ <text><![CDATA[NET]]></text>
+ </staticText>
<line>
- <reportElement key="line-14" x="290"
y="3" width="1" height="17" forecolor="#FFFFFF"/>
+ <reportElement key="line-14" x="295"
y="3" width="1" height="17" forecolor="#FFFFFF"/>
</line>
<line>
<reportElement key="line-15" x="0"
y="3" width="1" height="17" forecolor="#FFFFFF"/>
@@ -154,13 +156,6 @@
<line>
<reportElement key="line-20" x="475"
y="3" width="1" height="17" forecolor="#FFFFFF"/>
</line>
- <staticText>
- <reportElement key="staticText-1"
style="Detail_Header" x="1" y="3" width="65" height="17"/>
- <textElement verticalAlignment="Top">
- <font isBold="false"/>
- </textElement>
- <text><![CDATA[REFERENCE]]></text>
- </staticText>
<line>
<reportElement key="line-21" x="65"
y="3" width="1" height="17" forecolor="#FFFFFF"/>
</line>
@@ -193,8 +188,8 @@
<rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
</box>
</frame>
- <textField pattern="" isBlankWhenNull="true">
- <reportElement key="textField" style="default"
x="235" y="0" width="55" height="16" forecolor="#000000"/>
+ <textField pattern="" isBlankWhenNull="false">
+ <reportElement key="textField" style="default"
x="235" y="0" width="60" height="16" forecolor="#000000"/>
<box leftPadding="2" rightPadding="2">
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -232,8 +227,8 @@
</textElement>
<textFieldExpression
class="java.lang.String"><![CDATA[$F{PRODUCT_NAME}]]></textFieldExpression>
</textField>
- <textField pattern="" isBlankWhenNull="true">
- <reportElement key="textField" style="default"
x="290" y="0" width="65" height="16" forecolor="#000000"/>
+ <textField pattern="" isBlankWhenNull="false">
+ <reportElement key="textField" style="default"
x="295" y="0" width="60" height="16" forecolor="#000000"/>
<box leftPadding="2" rightPadding="2">
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -245,7 +240,7 @@
</textElement>
<textFieldExpression
class="java.lang.String"><![CDATA[($F{PRICEACTUAL}!=null)?$P{NUMBERFORMAT}.format($F{PRICEACTUAL}).toString():new
String(" ")]]></textFieldExpression>
</textField>
- <textField pattern="" isBlankWhenNull="true">
+ <textField pattern="" isBlankWhenNull="false">
<reportElement key="textField" style="default"
x="355" y="0" width="60" height="16" forecolor="#000000"/>
<box leftPadding="2" rightPadding="2">
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -258,7 +253,7 @@
</textElement>
<textFieldExpression
class="java.lang.String"><![CDATA[($F{BASE}!=null)?$P{NUMBERFORMAT}.format($F{BASE}).toString()
:new String(" ")]]></textFieldExpression>
</textField>
- <textField pattern="" isBlankWhenNull="true">
+ <textField pattern="" isBlankWhenNull="false">
<reportElement key="textField" style="default"
x="415" y="0" width="60" height="16" forecolor="#000000"/>
<box leftPadding="2" rightPadding="2">
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -281,7 +276,7 @@
<reportElement key="line-4"
stretchType="RelativeToBandHeight" x="235" y="0" width="1" height="16"/>
</line>
<line>
- <reportElement key="line-5"
stretchType="RelativeToBandHeight" x="290" y="0" width="1" height="16"/>
+ <reportElement key="line-5"
stretchType="RelativeToBandHeight" x="295" y="0" width="1" height="16"/>
</line>
<line>
<reportElement key="line-6"
stretchType="RelativeToBandHeight" x="355" y="0" width="1" height="16"/>
@@ -292,7 +287,7 @@
<line>
<reportElement key="line-8"
stretchType="RelativeToBandHeight" x="475" y="0" width="1" height="16"/>
</line>
- <textField isBlankWhenNull="true">
+ <textField isBlankWhenNull="false">
<reportElement key="textField-6"
style="default" x="1" y="0" width="65" height="16"/>
<textElement verticalAlignment="Middle">
<font size="8"/>
@@ -328,11 +323,6 @@
</textElement>
<textFieldExpression
class="java.lang.String"><![CDATA[($V{SUM_LINENETAMT}!=null)?$P{NUMBERFORMAT}.format($V{SUM_LINENETAMT}):new
String(" ")]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="false">
- <reportElement key="textField-2" x="319" y="2"
width="78" height="16"/>
- <textElement textAlignment="Left"
verticalAlignment="Middle"/>
- <textFieldExpression
class="java.lang.String"><![CDATA[" TOTAL ("+$F{CURRENCY_ISO}+"):
"]]></textFieldExpression>
- </textField>
<line>
<reportElement key="line-10" x="318" y="3"
width="1" height="15"/>
</line>
@@ -345,6 +335,12 @@
<line>
<reportElement key="line-13" x="475" y="3"
width="1" height="15"/>
</line>
+ <staticText>
+ <reportElement key="staticText-5" x="319" y="2"
width="78" height="16"/>
+ <box leftPadding="2"/>
+ <textElement textAlignment="Left"
verticalAlignment="Middle"/>
------------------------------------------------------------------------------
AppSumo Presents a FREE Video for the SourceForge Community by Eric
Ries, the creator of the Lean Startup Methodology on "Lean Startup
Secrets Revealed." This video shows you how to validate your ideas,
optimize your ideas and identify your business strategy.
http://p.sf.net/sfu/appsumosfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
