details: https://code.openbravo.com/erp/devel/pi/rev/64fe941faa56
changeset: 20232:64fe941faa56
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Mon Apr 29 18:19:42 2013 +0200
summary: Fixes issue 23519: In Trial Balance Report 'Page x of y' could not
be translated
diffstat:
src-db/database/sourcedata/AD_MESSAGE.xml | 12
++++++++
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java | 1 +
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalancePDF.jrxml | 15
+++++----
3 files changed, 21 insertions(+), 7 deletions(-)
diffs (84 lines):
diff -r aae254b2941b -r 64fe941faa56 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Mon Apr 29 18:10:06 2013 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Mon Apr 29 18:19:42 2013 +0200
@@ -22288,6 +22288,18 @@
<!--B8AB7082A7DD4CF6B836E2A8DBC39564-->
<ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
<!--B8AB7082A7DD4CF6B836E2A8DBC39564--></AD_MESSAGE>
+<!--B8B0D0E5ABD94742AA20B7257DCF7D28--><AD_MESSAGE>
+<!--B8B0D0E5ABD94742AA20B7257DCF7D28-->
<AD_MESSAGE_ID><![CDATA[B8B0D0E5ABD94742AA20B7257DCF7D28]]></AD_MESSAGE_ID>
+<!--B8B0D0E5ABD94742AA20B7257DCF7D28-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B8B0D0E5ABD94742AA20B7257DCF7D28--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B8B0D0E5ABD94742AA20B7257DCF7D28--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B8B0D0E5ABD94742AA20B7257DCF7D28-->
<VALUE><![CDATA[PageOfNumber]]></VALUE>
+<!--B8B0D0E5ABD94742AA20B7257DCF7D28--> <MSGTEXT><![CDATA[Page {P}
of]]></MSGTEXT>
+<!--B8B0D0E5ABD94742AA20B7257DCF7D28--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--B8B0D0E5ABD94742AA20B7257DCF7D28-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B8B0D0E5ABD94742AA20B7257DCF7D28-->
<ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--B8B0D0E5ABD94742AA20B7257DCF7D28--></AD_MESSAGE>
+
<!--B90DAD98BE6B409FA4D10CD01397A735--><AD_MESSAGE>
<!--B90DAD98BE6B409FA4D10CD01397A735-->
<AD_MESSAGE_ID><![CDATA[B90DAD98BE6B409FA4D10CD01397A735]]></AD_MESSAGE_ID>
<!--B90DAD98BE6B409FA4D10CD01397A735-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r aae254b2941b -r 64fe941faa56
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java Mon Apr
29 18:10:06 2013 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java Mon Apr
29 18:19:42 2013 +0200
@@ -644,6 +644,7 @@
parameters.put("PageNo", strPageNo);
parameters.put("DATE_FROM", strDateFrom);
parameters.put("DATE_TO", strDateTo);
+ parameters.put("PAGEOF", Utility.messageBD(this, "PageOfNumber",
vars.getLanguage()));
renderJR(vars, response, strReportName, "pdf", parameters, data, null);
}
diff -r aae254b2941b -r 64fe941faa56
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalancePDF.jrxml
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalancePDF.jrxml
Mon Apr 29 18:10:06 2013 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalancePDF.jrxml
Mon Apr 29 18:19:42 2013 +0200
@@ -2,9 +2,9 @@
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports
http://jasperreports.sourceforge.net/xsd/jasperreport.xsd";
name="ReportTrialBalancePDF" pageWidth="595" pageHeight="842" columnWidth="535"
leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20">
<property name="ireport.scriptlethandling" value="0"/>
<property name="ireport.encoding" value="UTF-8"/>
- <property name="ireport.zoom" value="2.0"/>
- <property name="ireport.x" value="0"/>
- <property name="ireport.y" value="0"/>
+ <property name="ireport.zoom" value="7.59499667166483"/>
+ <property name="ireport.x" value="3206"/>
+ <property name="ireport.y" value="1488"/>
<import value="net.sf.jasperreports.engine.*"/>
<import value="java.util.*"/>
<import value="net.sf.jasperreports.engine.data.*"/>
@@ -54,6 +54,7 @@
<parameter name="PageNo" class="java.lang.String"
isForPrompting="false"/>
<parameter name="DATE_FROM" class="java.lang.String"
isForPrompting="false"/>
<parameter name="DATE_TO" class="java.lang.String"/>
+ <parameter name="PAGEOF" class="java.lang.String"/>
<queryString>
<![CDATA[SELECT ID, ACCOUNT_ID, NAME,
SUM(SALDO_INICIAL) AS SALDO_INICIAL,
@@ -763,7 +764,7 @@
<text><![CDATA[other footer data]]></text>
</staticText>
<textField pattern="" isBlankWhenNull="false">
- <reportElement key="textField-35"
style="Report_Footer" x="467" y="16" width="45" height="16"/>
+ <reportElement key="textField-35"
style="Report_Footer" x="245" y="15" width="257" height="16"/>
<box topPadding="2" leftPadding="5">
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -773,14 +774,14 @@
<textElement textAlignment="Right"
verticalAlignment="Middle">
<font fontName="Bitstream Vera Sans"
size="8"/>
</textElement>
- <textFieldExpression
class="java.lang.String"><![CDATA["Page " + new
java.lang.Integer(($V{PAGE_NUMBER}.intValue())
+(Integer.parseInt($P{PageNo}))-(1) ) + " of "]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[$P{PAGEOF}.replace("{P}",(new
java.lang.Integer(($V{PAGE_NUMBER}.intValue())
+(Integer.parseInt($P{PageNo}))-(1) )).toString())]]></textFieldExpression>
</textField>
<textField evaluationTime="Report">
- <reportElement x="515" y="17" width="19"
height="16"/>
+ <reportElement key="" x="504" y="16" width="28"
height="16"/>
<textElement textAlignment="Left"
verticalAlignment="Middle">
<font size="8"/>
</textElement>
- <textFieldExpression
class="java.lang.Integer"><![CDATA[new
java.lang.Integer($V{PAGE_NUMBER})]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[(new
java.lang.Integer($V{PAGE_NUMBER})).toString()]]></textFieldExpression>
</textField>
</band>
</pageFooter>
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
