details: https://code.openbravo.com/erp/devel/pi/rev/e743fc0891a1 changeset: 15916:e743fc0891a1 user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Mar 27 09:33:17 2012 +0200 summary: Related to issue 17941: Changed format of report for newest Jasper library
details: https://code.openbravo.com/erp/devel/pi/rev/14b59080a8da changeset: 15917:14b59080a8da user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Mar 27 09:38:40 2012 +0200 summary: Fixes issue 17941: Changed static strings to labels for traduction. diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 44 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.jrxml | 1050 ++++----- 2 files changed, 494 insertions(+), 600 deletions(-) diffs (truncated from 1199 to 300 lines): diff -r 88e488e5b6c1 -r 14b59080a8da modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Tue Mar 27 15:50:55 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Tue Mar 27 09:38:40 2012 +0200 @@ -319,6 +319,17 @@ <!--3276B307A1404A97A4F885E3B26A890C--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--3276B307A1404A97A4F885E3B26A890C--></AD_TEXTINTERFACES> +<!--32DA8F09FE50434A9E243863138F2E9C--><AD_TEXTINTERFACES> +<!--32DA8F09FE50434A9E243863138F2E9C--> <AD_TEXTINTERFACES_ID><![CDATA[32DA8F09FE50434A9E243863138F2E9C]]></AD_TEXTINTERFACES_ID> +<!--32DA8F09FE50434A9E243863138F2E9C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--32DA8F09FE50434A9E243863138F2E9C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--32DA8F09FE50434A9E243863138F2E9C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--32DA8F09FE50434A9E243863138F2E9C--> <TEXT><![CDATA[Date:]]></TEXT> +<!--32DA8F09FE50434A9E243863138F2E9C--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.jrxml]]></FILENAME> +<!--32DA8F09FE50434A9E243863138F2E9C--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--32DA8F09FE50434A9E243863138F2E9C--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--32DA8F09FE50434A9E243863138F2E9C--></AD_TEXTINTERFACES> + <!--354E5EF7FCD142078572A472031A4F8D--><AD_TEXTINTERFACES> <!--354E5EF7FCD142078572A472031A4F8D--> <AD_TEXTINTERFACES_ID><![CDATA[354E5EF7FCD142078572A472031A4F8D]]></AD_TEXTINTERFACES_ID> <!--354E5EF7FCD142078572A472031A4F8D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -726,6 +737,17 @@ <!--62BA1CFBB74F40A8A7FABBE150773580--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--62BA1CFBB74F40A8A7FABBE150773580--></AD_TEXTINTERFACES> +<!--62F16D530BE843859BFC4D25B1F77297--><AD_TEXTINTERFACES> +<!--62F16D530BE843859BFC4D25B1F77297--> <AD_TEXTINTERFACES_ID><![CDATA[62F16D530BE843859BFC4D25B1F77297]]></AD_TEXTINTERFACES_ID> +<!--62F16D530BE843859BFC4D25B1F77297--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--62F16D530BE843859BFC4D25B1F77297--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--62F16D530BE843859BFC4D25B1F77297--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--62F16D530BE843859BFC4D25B1F77297--> <TEXT><![CDATA[Financial Account:]]></TEXT> +<!--62F16D530BE843859BFC4D25B1F77297--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.jrxml]]></FILENAME> +<!--62F16D530BE843859BFC4D25B1F77297--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--62F16D530BE843859BFC4D25B1F77297--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--62F16D530BE843859BFC4D25B1F77297--></AD_TEXTINTERFACES> + <!--6402E58FEDE74C20988E64541D441CE9--><AD_TEXTINTERFACES> <!--6402E58FEDE74C20988E64541D441CE9--> <AD_TEXTINTERFACES_ID><![CDATA[6402E58FEDE74C20988E64541D441CE9]]></AD_TEXTINTERFACES_ID> <!--6402E58FEDE74C20988E64541D441CE9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -2024,28 +2046,6 @@ <!--949AA49A4D8E6BEAE040007F0100565C--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--949AA49A4D8E6BEAE040007F0100565C--></AD_TEXTINTERFACES> -<!--949AA49A4D916BEAE040007F0100565C--><AD_TEXTINTERFACES> -<!--949AA49A4D916BEAE040007F0100565C--> <AD_TEXTINTERFACES_ID><![CDATA[949AA49A4D916BEAE040007F0100565C]]></AD_TEXTINTERFACES_ID> -<!--949AA49A4D916BEAE040007F0100565C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--949AA49A4D916BEAE040007F0100565C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--949AA49A4D916BEAE040007F0100565C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--949AA49A4D916BEAE040007F0100565C--> <TEXT><![CDATA[per]]></TEXT> -<!--949AA49A4D916BEAE040007F0100565C--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.jrxml]]></FILENAME> -<!--949AA49A4D916BEAE040007F0100565C--> <ISUSED><![CDATA[Y]]></ISUSED> -<!--949AA49A4D916BEAE040007F0100565C--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--949AA49A4D916BEAE040007F0100565C--></AD_TEXTINTERFACES> - -<!--949AA49A4D946BEAE040007F0100565C--><AD_TEXTINTERFACES> -<!--949AA49A4D946BEAE040007F0100565C--> <AD_TEXTINTERFACES_ID><![CDATA[949AA49A4D946BEAE040007F0100565C]]></AD_TEXTINTERFACES_ID> -<!--949AA49A4D946BEAE040007F0100565C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--949AA49A4D946BEAE040007F0100565C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--949AA49A4D946BEAE040007F0100565C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--949AA49A4D946BEAE040007F0100565C--> <TEXT><![CDATA[for]]></TEXT> -<!--949AA49A4D946BEAE040007F0100565C--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.jrxml]]></FILENAME> -<!--949AA49A4D946BEAE040007F0100565C--> <ISUSED><![CDATA[Y]]></ISUSED> -<!--949AA49A4D946BEAE040007F0100565C--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--949AA49A4D946BEAE040007F0100565C--></AD_TEXTINTERFACES> - <!--949AA49A4D976BEAE040007F0100565C--><AD_TEXTINTERFACES> <!--949AA49A4D976BEAE040007F0100565C--> <AD_TEXTINTERFACES_ID><![CDATA[949AA49A4D976BEAE040007F0100565C]]></AD_TEXTINTERFACES_ID> <!--949AA49A4D976BEAE040007F0100565C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 88e488e5b6c1 -r 14b59080a8da modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.jrxml --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.jrxml Tue Mar 27 15:50:55 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.jrxml Tue Mar 27 09:38:40 2012 +0200 @@ -1,655 +1,549 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!-- Created with iReport - A designer for JasperReports --> -<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd";> -<jasperReport - name="ReportReconciliation" - columnCount="1" - printOrder="Vertical" - orientation="Portrait" - pageWidth="595" - pageHeight="842" - columnWidth="495" - columnSpacing="0" - leftMargin="50" - rightMargin="50" - topMargin="50" - bottomMargin="50" - whenNoDataType="NoPages" - isTitleNewPage="false" - isSummaryNewPage="false"> - <property name="ireport.scriptlethandling" value="0" /> - <property name="ireport.encoding" value="UTF-8" /> - <import value="java.util.*" /> - <import value="net.sf.jasperreports.engine.*" /> - <import value="net.sf.jasperreports.engine.data.*" /> - - <style - name="Gray" - isDefault="false" - mode="Opaque" - forecolor="#000000" - backcolor="#CCCCCC" - /> - <style - name="DarkGray" - isDefault="false" - mode="Opaque" - forecolor="#FFFFFF" - backcolor="#555555" - vAlign="Middle" - leftPadding="5" - fontName="Bitstream Vera Sans" - fontSize="18" - isBold="true" - /> - - <parameter name="SUBREPORT_DIR" isForPrompting="true" class="java.lang.String"> - <defaultValueExpression ><![CDATA["./"]]></defaultValueExpression> +<?xml version="1.0" encoding="UTF-8"?> +<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="ReportReconciliation" pageWidth="595" pageHeight="842" columnWidth="495" leftMargin="50" rightMargin="50" topMargin="50" bottomMargin="50"> + <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"/> + <import value="net.sf.jasperreports.engine.*"/> + <import value="java.util.*"/> + <import value="net.sf.jasperreports.engine.data.*"/> + <style name="Gray" mode="Opaque" forecolor="#000000" backcolor="#CCCCCC"/> + <style name="DarkGray" mode="Opaque" forecolor="#FFFFFF" backcolor="#555555" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="18" isBold="true"> + <box leftPadding="5"/> + </style> + <parameter name="SUBREPORT_DIR" class="java.lang.String"> + <defaultValueExpression><![CDATA["./"]]></defaultValueExpression> </parameter> - <parameter name="SUBREP_OUTPAYMENT" isForPrompting="false" class="net.sf.jasperreports.engine.JasperReport"/> - <parameter name="SUBREP_OUTDEPOSIT" isForPrompting="false" class="net.sf.jasperreports.engine.JasperReport"/> - <parameter name="SUBREP_UNRECBS" isForPrompting="false" class="net.sf.jasperreports.engine.JasperReport"/> - <parameter name="DATE" isForPrompting="false" class="java.util.Date"/> - <parameter name="NUMBERFORMAT" isForPrompting="false" class="java.text.DecimalFormat"/> - <parameter name="ACC_BAL_OB" isForPrompting="false" class="java.math.BigDecimal"/> - <parameter name="ADJ_ACC_BAL_OB" isForPrompting="false" class="java.math.BigDecimal"/> - <parameter name="FINACCOUNT_INFO" isForPrompting="false" class="java.lang.String"/> - <parameter name="RECONCILIATION_ID" isForPrompting="false" class="java.lang.String"/> - <parameter name="DATEFORMAT" isForPrompting="false" class="java.text.SimpleDateFormat"/> - <parameter name="END_BALANCE" isForPrompting="false" class="java.math.BigDecimal"/> - <parameter name="REPORT_TYPE" isForPrompting="false" class="java.lang.String"> - <defaultValueExpression ><![CDATA["DETAIL"]]></defaultValueExpression> + <parameter name="SUBREP_OUTPAYMENT" class="net.sf.jasperreports.engine.JasperReport" isForPrompting="false"/> + <parameter name="SUBREP_OUTDEPOSIT" class="net.sf.jasperreports.engine.JasperReport" isForPrompting="false"/> + <parameter name="SUBREP_UNRECBS" class="net.sf.jasperreports.engine.JasperReport" isForPrompting="false"/> + <parameter name="DATE" class="java.util.Date" isForPrompting="false"/> + <parameter name="NUMBERFORMAT" class="java.text.DecimalFormat" isForPrompting="false"/> + <parameter name="ACC_BAL_OB" class="java.math.BigDecimal" isForPrompting="false"/> + <parameter name="ADJ_ACC_BAL_OB" class="java.math.BigDecimal" isForPrompting="false"/> + <parameter name="FINACCOUNT_INFO" class="java.lang.String" isForPrompting="false"/> + <parameter name="RECONCILIATION_ID" class="java.lang.String" isForPrompting="false"/> + <parameter name="DATEFORMAT" class="java.text.SimpleDateFormat" isForPrompting="false"/> + <parameter name="END_BALANCE" class="java.math.BigDecimal" isForPrompting="false"/> + <parameter name="REPORT_TYPE" class="java.lang.String" isForPrompting="false"> + <defaultValueExpression><![CDATA["DETAIL"]]></defaultValueExpression> </parameter> - <parameter name="AMT_OUT_PAYMENT" isForPrompting="false" class="java.math.BigDecimal"/> - <parameter name="AMT_OUT_DEPOSIT" isForPrompting="false" class="java.math.BigDecimal"/> - <parameter name="AMT_UNREC_BSLINE" isForPrompting="false" class="java.math.BigDecimal"/> - <parameter name="SHOW_BAND_PAYMENT" isForPrompting="false" class="java.lang.Boolean"/> - <parameter name="SHOW_BAND_DEPOSIT" isForPrompting="false" class="java.lang.Boolean"/> - <parameter name="SHOW_BAND_BSLINE" isForPrompting="false" class="java.lang.Boolean"/> - <queryString><![CDATA[SELECT 1 as dummy FROM DUAL]]></queryString> - + <parameter name="AMT_OUT_PAYMENT" class="java.math.BigDecimal" isForPrompting="false"/> + <parameter name="AMT_OUT_DEPOSIT" class="java.math.BigDecimal" isForPrompting="false"/> + <parameter name="AMT_UNREC_BSLINE" class="java.math.BigDecimal" isForPrompting="false"/> + <parameter name="SHOW_BAND_PAYMENT" class="java.lang.Boolean" isForPrompting="false"/> + <parameter name="SHOW_BAND_DEPOSIT" class="java.lang.Boolean" isForPrompting="false"/> + <parameter name="SHOW_BAND_BSLINE" class="java.lang.Boolean" isForPrompting="false"/> + <queryString> + <![CDATA[SELECT 1 as dummy FROM DUAL]]> + </queryString> <field name="DUMMY" class="java.math.BigDecimal"/> - - - <group name="Opening Balance" > - <groupExpression><![CDATA[]]></groupExpression> - <groupHeader> - <band height="30" isSplitAllowed="true" > + <group name="Opening Balance"> + <groupExpression><![CDATA[]]></groupExpression> + <groupHeader> + <band height="30" splitType="Stretch"> <rectangle> - <reportElement - style="Gray" - x="0" - y="7" - width="495" - height="15" - key="rectangle-1"/> - <graphicElement stretchType="NoStretch"/> + <reportElement key="rectangle-1" style="Gray" x="0" y="7" width="495" height="15"/> </rectangle> - <textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > - <reportElement - x="1" - y="8" - width="70" - height="14" - key="textField-3"/> - <box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/> - <textElement verticalAlignment="Middle"> - <font/> - </textElement> - <textFieldExpression class="java.util.Date"><![CDATA[$P{DATE}]]></textFieldExpression> + <textField isBlankWhenNull="false"> + <reportElement key="textField-3" x="1" y="8" width="70" height="14"/> + <box leftPadding="5"> + <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + </box> + <textElement verticalAlignment="Middle"/> + <textFieldExpression class="java.util.Date"><![CDATA[$P{DATE}]]></textFieldExpression> </textField> - <textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > - <reportElement - x="380" - y="8" - width="115" - height="14" - key="textField-6"/> - <box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" rightPadding="5" bottomBorder="None" bottomBorderColor="#000000"/> - <textElement textAlignment="Right" verticalAlignment="Middle"> - <font/> - </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[($P{ACC_BAL_OB}!=null) ? $P{NUMBERFORMAT}.format($P{ACC_BAL_OB}).toString() : new String(" ")]]></textFieldExpression> + <textField isBlankWhenNull="false"> + <reportElement key="textField-6" x="380" y="8" width="115" height="14"/> + <box rightPadding="5"> + <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + </box> + <textElement textAlignment="Right" verticalAlignment="Middle"/> + <textFieldExpression class="java.lang.String"><![CDATA[($P{ACC_BAL_OB}!=null) ? $P{NUMBERFORMAT}.format($P{ACC_BAL_OB}).toString() : new String(" ")]]></textFieldExpression> </textField> <staticText> - <reportElement - x="70" - y="8" - width="310" - height="14" - key="staticText-23"/> - <box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/> - <textElement verticalAlignment="Middle"> - <font/> - </textElement> - <text><![CDATA[Account Balance In Openbravo]]></text> + <reportElement key="staticText-23" x="70" y="8" width="310" height="14"/> + <box leftPadding="5"> + <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + </box> + <textElement verticalAlignment="Middle"/> + <text><![CDATA[Account Balance In Openbravo]]></text> </staticText> </band> - </groupHeader> - <groupFooter> - <band height="40" isSplitAllowed="true" > + </groupHeader> + <groupFooter> + <band height="40" splitType="Stretch"> <rectangle> - <reportElement - style="Gray" - x="0" - y="3" - width="495" - height="15" - key="rectangle-2"/> - <graphicElement stretchType="NoStretch"/> + <reportElement key="rectangle-2" style="Gray" x="0" y="3" width="495" height="15"/> </rectangle> - <textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > - <reportElement - x="1" - y="4" - width="70" - height="14" - key="textField-7"/> - <box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/> - <textElement verticalAlignment="Middle"> - <font/> - </textElement> - <textFieldExpression class="java.util.Date"><![CDATA[$P{DATE}]]></textFieldExpression> ------------------------------------------------------------------------------ This SF email is sponsosred by: Try Windows Azure free for 90 days Click Here http://p.sf.net/sfu/sfd2d-msazure _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
