details: https://code.openbravo.com/erp/devel/pi/rev/b1d5597b22aa
changeset: 19069:b1d5597b22aa
user: Carlos Aristu <carlos.aristu <at> openbravo.com>
date: Tue Dec 18 16:05:33 2012 +0100
summary: related to issue 22459: reports updated
diffstat:
src/org/openbravo/erpReports/C_OrderJR.jrxml | 8 ++++----
src/org/openbravo/erpReports/C_QuotationJR.jrxml | 8 ++++----
src/org/openbravo/erpReports/C_RMOrderJR.jrxml | 4 ++--
src/org/openbravo/erpReports/RptC_Invoice.jrxml | 6 +++---
src/org/openbravo/erpReports/RptC_OrderPO.jrxml | 4 ++--
src/org/openbravo/erpReports/RptFIN_Payment.jrxml | 6 +++---
src/org/openbravo/erpReports/RptM_InOut.jrxml | 4 ++--
src/org/openbravo/erpReports/RptM_Requisition.jrxml | 7 ++++---
src/org/openbravo/erpReports/RptM_Requisition_Lines.jrxml | 5 +++--
9 files changed, 27 insertions(+), 25 deletions(-)
diffs (268 lines):
diff -r a88d31ec3ee1 -r b1d5597b22aa
src/org/openbravo/erpReports/C_OrderJR.jrxml
--- a/src/org/openbravo/erpReports/C_OrderJR.jrxml Tue Dec 18 15:51:58
2012 +0100
+++ b/src/org/openbravo/erpReports/C_OrderJR.jrxml Tue Dec 18 16:05:33
2012 +0100
@@ -218,7 +218,7 @@
<rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Right"/>
- <textFieldExpression
class="java.util.Date"><![CDATA[$F{DATEORDERED}]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[org.openbravo.erpCommon.utility.Utility.applyCountryDateFormat($F{DATEORDERED},$F{ORGANIZATIONID})]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="false">
<reportElement key="textField-16"
x="121" y="168" width="275" height="55" forecolor="#FF0000"/>
@@ -312,7 +312,7 @@
<printWhenExpression><![CDATA[$F{ISTAXINCLUDED}.equals("N")]]></printWhenExpression>
</reportElement>
<subreportParameter name="NUMBERFORMAT">
-
<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
+
<subreportParameterExpression><![CDATA[org.openbravo.erpCommon.utility.Utility.getCountryNumberFormat($F{ORGANIZATIONID},$P{NUMBERFORMAT})]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="LOCALE">
<subreportParameterExpression><![CDATA[$P{LOCALE}]]></subreportParameterExpression>
@@ -331,7 +331,7 @@
<printWhenExpression><![CDATA[$F{ISTAXINCLUDED}.equals("Y")]]></printWhenExpression>
</reportElement>
<subreportParameter name="NUMBERFORMAT">
-
<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
+
<subreportParameterExpression><![CDATA[org.openbravo.erpCommon.utility.Utility.getCountryNumberFormat($F{ORGANIZATIONID},$P{NUMBERFORMAT})]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="LOCALE">
<subreportParameterExpression><![CDATA[$P{LOCALE}]]></subreportParameterExpression>
@@ -352,7 +352,7 @@
<printWhenExpression><![CDATA[$F{ISTAXINCLUDED}.equals("Y")]]></printWhenExpression>
</reportElement>
<subreportParameter name="NUMBERFORMAT">
-
<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
+
<subreportParameterExpression><![CDATA[org.openbravo.erpCommon.utility.Utility.getCountryNumberFormat($F{ORGANIZATIONID},$P{NUMBERFORMAT})]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="LOCALE">
<subreportParameterExpression><![CDATA[$P{LOCALE}]]></subreportParameterExpression>
diff -r a88d31ec3ee1 -r b1d5597b22aa
src/org/openbravo/erpReports/C_QuotationJR.jrxml
--- a/src/org/openbravo/erpReports/C_QuotationJR.jrxml Tue Dec 18 15:51:58
2012 +0100
+++ b/src/org/openbravo/erpReports/C_QuotationJR.jrxml Tue Dec 18 16:05:33
2012 +0100
@@ -218,7 +218,7 @@
<rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Right"/>
- <textFieldExpression
class="java.util.Date"><![CDATA[$F{DATEORDERED}]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[org.openbravo.erpCommon.utility.Utility.applyCountryDateFormat($F{DATEORDERED},$F{ORGANIZATIONID})]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="false">
<reportElement key="textField-16"
x="121" y="168" width="275" height="55" forecolor="#FF0000"/>
@@ -303,7 +303,7 @@
<printWhenExpression><![CDATA[$F{ISTAXINCLUDED}.equals("N")]]></printWhenExpression>
</reportElement>
<subreportParameter name="NUMBERFORMAT">
-
<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
+
<subreportParameterExpression><![CDATA[org.openbravo.erpCommon.utility.Utility.getCountryNumberFormat($F{ORGANIZATIONID},$P{NUMBERFORMAT})]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="LOCALE">
<subreportParameterExpression><![CDATA[$P{LOCALE}]]></subreportParameterExpression>
@@ -322,7 +322,7 @@
<printWhenExpression><![CDATA[$F{ISTAXINCLUDED}.equals("Y")]]></printWhenExpression>
</reportElement>
<subreportParameter name="NUMBERFORMAT">
-
<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
+
<subreportParameterExpression><![CDATA[org.openbravo.erpCommon.utility.Utility.getCountryNumberFormat($F{ORGANIZATIONID},$P{NUMBERFORMAT})]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="LOCALE">
<subreportParameterExpression><![CDATA[$P{LOCALE}]]></subreportParameterExpression>
@@ -343,7 +343,7 @@
<printWhenExpression><![CDATA[$F{ISTAXINCLUDED}.equals("Y")]]></printWhenExpression>
</reportElement>
<subreportParameter name="NUMBERFORMAT">
-
<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
+
<subreportParameterExpression><![CDATA[org.openbravo.erpCommon.utility.Utility.getCountryNumberFormat($F{ORGANIZATIONID},$P{NUMBERFORMAT})]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="LOCALE">
<subreportParameterExpression><![CDATA[$P{LOCALE}]]></subreportParameterExpression>
diff -r a88d31ec3ee1 -r b1d5597b22aa
src/org/openbravo/erpReports/C_RMOrderJR.jrxml
--- a/src/org/openbravo/erpReports/C_RMOrderJR.jrxml Tue Dec 18 15:51:58
2012 +0100
+++ b/src/org/openbravo/erpReports/C_RMOrderJR.jrxml Tue Dec 18 16:05:33
2012 +0100
@@ -211,7 +211,7 @@
<rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Right"/>
- <textFieldExpression
class="java.util.Date"><![CDATA[$F{DATEORDERED}]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[org.openbravo.erpCommon.utility.Utility.applyCountryDateFormat($F{DATEORDERED},$F{ORGANIZATIONID})]]></textFieldExpression>
</textField>
<image scaleImage="RetainShape" hAlign="Right"
vAlign="Top" isUsingCache="true">
<reportElement key="image-1" x="313"
y="0" width="170" height="91">
@@ -334,7 +334,7 @@
<subreportParameterExpression><![CDATA[$F{C_ORDER_ID}]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="NUMBERFORMAT">
-
<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
+
<subreportParameterExpression><![CDATA[org.openbravo.erpCommon.utility.Utility.getCountryNumberFormat($F{ORGANIZATIONID},$P{NUMBERFORMAT})]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="LOCALE">
<subreportParameterExpression><![CDATA[$P{LOCALE}]]></subreportParameterExpression>
diff -r a88d31ec3ee1 -r b1d5597b22aa
src/org/openbravo/erpReports/RptC_Invoice.jrxml
--- a/src/org/openbravo/erpReports/RptC_Invoice.jrxml Tue Dec 18 15:51:58
2012 +0100
+++ b/src/org/openbravo/erpReports/RptC_Invoice.jrxml Tue Dec 18 16:05:33
2012 +0100
@@ -186,7 +186,7 @@
<textElement textAlignment="Right">
<font fontName="Times-Roman"
size="10"/>
</textElement>
- <textFieldExpression
class="java.util.Date"><![CDATA[$F{DATEINVOICED}]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[org.openbravo.erpCommon.utility.Utility.applyCountryDateFormat($F{DATEINVOICED},$F{ORGANIZATIONID})]]></textFieldExpression>
</textField>
<staticText>
<reportElement key="element-90"
style="Group_Data_Label" mode="Transparent" x="-3" y="217" width="149"
height="18" forecolor="#999999" backcolor="#FFFFFF"/>
@@ -317,7 +317,7 @@
<subreport isUsingCache="true">
<reportElement key="subreport-2"
style="Report_Footer" positionType="Float" x="0" y="0" width="482" height="16"/>
<subreportParameter name="NUMBERFORMAT">
-
<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
+
<subreportParameterExpression><![CDATA[org.openbravo.erpCommon.utility.Utility.getCountryNumberFormat($F{ORGANIZATIONID},$P{NUMBERFORMAT})]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="LOCALE">
<subreportParameterExpression><![CDATA[$P{LOCALE}]]></subreportParameterExpression>
@@ -355,7 +355,7 @@
<subreport isUsingCache="true">
<reportElement key="subreport-3"
style="Report_Footer" x="0" y="0" width="482" height="16"/>
<subreportParameter name="NUMBERFORMAT">
-
<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
+
<subreportParameterExpression><![CDATA[org.openbravo.erpCommon.utility.Utility.getCountryNumberFormat($F{ORGANIZATIONID},$P{NUMBERFORMAT})]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="LOCALE">
<subreportParameterExpression><![CDATA[$P{LOCALE}]]></subreportParameterExpression>
diff -r a88d31ec3ee1 -r b1d5597b22aa
src/org/openbravo/erpReports/RptC_OrderPO.jrxml
--- a/src/org/openbravo/erpReports/RptC_OrderPO.jrxml Tue Dec 18 15:51:58
2012 +0100
+++ b/src/org/openbravo/erpReports/RptC_OrderPO.jrxml Tue Dec 18 16:05:33
2012 +0100
@@ -243,7 +243,7 @@
<textElement textAlignment="Right">
<font size="10"/>
</textElement>
- <textFieldExpression
class="java.util.Date"><![CDATA[$F{DATEORDERED}]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[org.openbravo.erpCommon.utility.Utility.applyCountryDateFormat($F{DATEORDERED},$F{ORGANIZATIONID})]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="false">
<reportElement key="textField-19"
style="Report_Footer" x="126" y="167" width="275" height="55"
forecolor="#FF0000"/>
@@ -323,7 +323,7 @@
<subreportParameterExpression><![CDATA[$P{LOCALE}]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="NUMBERFORMAT">
-
<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
+
<subreportParameterExpression><![CDATA[org.openbravo.erpCommon.utility.Utility.getCountryNumberFormat($F{ORGANIZATIONID},$P{NUMBERFORMAT})]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="ISO_CODE">
<subreportParameterExpression><![CDATA[$F{ISO_CODE}]]></subreportParameterExpression>
diff -r a88d31ec3ee1 -r b1d5597b22aa
src/org/openbravo/erpReports/RptFIN_Payment.jrxml
--- a/src/org/openbravo/erpReports/RptFIN_Payment.jrxml Tue Dec 18 15:51:58
2012 +0100
+++ b/src/org/openbravo/erpReports/RptFIN_Payment.jrxml Tue Dec 18 16:05:33
2012 +0100
@@ -215,7 +215,7 @@
<rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement
verticalAlignment="Middle"/>
- <textFieldExpression
class="java.util.Date"><![CDATA[$F{PAYMENT_DATE}]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[org.openbravo.erpCommon.utility.Utility.applyCountryDateFormat($F{PAYMENT_DATE},$F{LEGALENTITY})]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="false">
<reportElement key="textField-5"
x="125" y="131" width="136" height="13"/>
@@ -226,7 +226,7 @@
<rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement
verticalAlignment="Middle"/>
- <textFieldExpression
class="java.lang.String"><![CDATA[$P{NUMBERFORMAT}.format($F{TOTAL}).toString()]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[org.openbravo.erpCommon.utility.Utility.getCountryNumberFormat($F{LEGALENTITY},$P{NUMBERFORMAT}).format($F{TOTAL}).toString()]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="false">
<reportElement key="textField-9"
x="125" y="105" width="136" height="13"/>
@@ -331,7 +331,7 @@
<subreportParameterExpression><![CDATA[$P{DOCUMENT_ID}]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="NUMBERFORMAT">
-
<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
+
<subreportParameterExpression><![CDATA[org.openbravo.erpCommon.utility.Utility.getCountryNumberFormat($F{LEGALENTITY},$P{NUMBERFORMAT})]]></subreportParameterExpression>
</subreportParameter>
<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
<subreportExpression
class="net.sf.jasperreports.engine.JasperReport"><![CDATA[$P{SUBREP_RptFIN_PaymentLines}]]></subreportExpression>
diff -r a88d31ec3ee1 -r b1d5597b22aa
src/org/openbravo/erpReports/RptM_InOut.jrxml
--- a/src/org/openbravo/erpReports/RptM_InOut.jrxml Tue Dec 18 15:51:58
2012 +0100
+++ b/src/org/openbravo/erpReports/RptM_InOut.jrxml Tue Dec 18 16:05:33
2012 +0100
@@ -153,7 +153,7 @@
<textElement>
<font fontName="Arial"
size="10" isBold="false"/>
</textElement>
- <textFieldExpression
class="java.sql.Timestamp"><![CDATA[$F{movementdate}]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[org.openbravo.erpCommon.utility.Utility.applyCountryDateFormat($F{movementdate},$F{organizationid})]]></textFieldExpression>
</textField>
<image scaleImage="RetainShape" hAlign="Right"
vAlign="Top" isUsingCache="true">
<reportElement key="image-1" x="307"
y="0" width="176" height="91">
@@ -260,7 +260,7 @@
<subreportParameterExpression><![CDATA[$F{m_inout_id}]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="NUMBERFORMAT">
-
<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
+
<subreportParameterExpression><![CDATA[org.openbravo.erpCommon.utility.Utility.getCountryNumberFormat($F{organizationid},$P{NUMBERFORMAT})]]></subreportParameterExpression>
</subreportParameter>
<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
<subreportExpression
class="net.sf.jasperreports.engine.JasperReport"><![CDATA[$P{SUBREP_Rptm_InOut_Lines}]]></subreportExpression>
diff -r a88d31ec3ee1 -r b1d5597b22aa
src/org/openbravo/erpReports/RptM_Requisition.jrxml
--- a/src/org/openbravo/erpReports/RptM_Requisition.jrxml Tue Dec 18
15:51:58 2012 +0100
+++ b/src/org/openbravo/erpReports/RptM_Requisition.jrxml Tue Dec 18
16:05:33 2012 +0100
@@ -64,7 +64,7 @@
<queryString>
<![CDATA[SELECT M_REQUISITION.M_REQUISITION_ID,
M_REQUISITION.DOCUMENTNO,
AD_COLUMN_IDENTIFIER(to_char('AD_User'),
to_char(M_REQUISITION.AD_USER_ID), $P{LANGUAGE}) AS REQUESTER,
- REPLACE(M_REQUISITION.DESCRIPTION, CHR(10), '') AS DESCRIPTION
+ REPLACE(M_REQUISITION.DESCRIPTION, CHR(10), '') AS DESCRIPTION,
M_REQUISITION.AD_ORG_ID AS ORGANIZATIONID
FROM M_REQUISITION
WHERE M_REQUISITION.M_REQUISITION_ID IN $P!{REQUISITION_ID}]]>
</queryString>
@@ -80,6 +80,7 @@
<field name="DESCRIPTION" class="java.lang.String">
<fieldDescription><![CDATA[]]></fieldDescription>
</field>
+ <field name="ORGANIZATIONID" class="java.lang.String"/>
<group name="M_REQUISITION_ID" isStartNewPage="true"
isResetPageNumber="true" isReprintHeaderOnEachPage="true">
<groupExpression><![CDATA[$F{M_REQUISITION_ID}]]></groupExpression>
<groupHeader>
@@ -191,7 +192,7 @@
<subreport isUsingCache="true">
<reportElement key="subreport-1" x="0" y="0"
width="483" height="76"/>
<subreportParameter name="NUMBERFORMAT">
-
<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
+
<subreportParameterExpression><![CDATA[org.openbravo.erpCommon.utility.Utility.getCountryNumberFormat($F{ORGANIZATIONID},$P{NUMBERFORMAT})]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="REQUISITION_ID">
<subreportParameterExpression><![CDATA[$F{M_REQUISITION_ID}]]></subreportParameterExpression>
@@ -251,7 +252,7 @@
<rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement/>
- <textFieldExpression
class="java.util.Date"><![CDATA[new Date()]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[org.openbravo.erpCommon.utility.Utility.applyCountryDateFormat(new
java.util.Date(),$F{ORGANIZATIONID})]]></textFieldExpression>
</textField>
<line>
<reportElement key="line-5" x="1" y="6"
width="482" height="1"/>
diff -r a88d31ec3ee1 -r b1d5597b22aa
src/org/openbravo/erpReports/RptM_Requisition_Lines.jrxml
--- a/src/org/openbravo/erpReports/RptM_Requisition_Lines.jrxml Tue Dec 18
15:51:58 2012 +0100
+++ b/src/org/openbravo/erpReports/RptM_Requisition_Lines.jrxml Tue Dec 18
16:05:33 2012 +0100
@@ -46,7 +46,7 @@
<parameter name="NUMBERFORMAT" class="java.text.NumberFormat"
isForPrompting="false"/>
<queryString>
<![CDATA[SELECT M_PRODUCT.VALUE, M_PRODUCT.NAME,
M_REQUISITIONLINE.QTY,
- C_UOM.UOMSYMBOL AS UOMSYMBOL, M_REQUISITIONLINE.LINENETAMT,
+ C_UOM.UOMSYMBOL AS UOMSYMBOL, M_REQUISITIONLINE.LINENETAMT,
M_REQUISITIONLINE.AD_ORG_ID AS ORGANIZATIONID,
M_REQUISITIONLINE.PRICEACTUAL, M_REQUISITIONLINE.NEEDBYDATE,
(CASE WHEN M_ATTRIBUTESETINSTANCE.M_ATTRIBUTESET_ID IS NULL THEN ''
WHEN M_ATTRIBUTESETINSTANCE.M_ATTRIBUTESET_ID='0' THEN ''
@@ -65,6 +65,7 @@
<field name="PRICEACTUAL" class="java.math.BigDecimal"/>
<field name="NEEDBYDATE" class="java.util.Date"/>
<field name="ATTRIBUTE" class="java.lang.String"/>
+ <field name="ORGANIZATIONID" class="java.lang.String"/>
<variable name="AMOUNT_SUM" class="java.math.BigDecimal"
resetType="Group" resetGroup="REQUISITION_ID" calculation="Sum">
<variableExpression><![CDATA[$F{LINENETAMT}]]></variableExpression>
</variable>
@@ -298,7 +299,7 @@
<rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Left"
verticalAlignment="Top"/>
- <textFieldExpression
class="java.util.Date"><![CDATA[$F{NEEDBYDATE}]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[org.openbravo.erpCommon.utility.Utility.applyCountryDateFormat($F{NEEDBYDATE},$F{ORGANIZATIONID})]]></textFieldExpression>
</textField>
</band>
</detail>
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
