details: /erp/devel/pi/rev/70c809859a5c
changeset: 8017:70c809859a5c
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Wed Aug 04 13:33:17 2010 +0200
summary: Fixed bug 13311: RGL excel file is also ready to be translated
diffstat:
src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 11 +++
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java | 1 -
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml | 34
++++-----
3 files changed, 25 insertions(+), 21 deletions(-)
diffs (90 lines):
diff -r 9e6ace807564 -r 70c809859a5c
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Wed Aug 04 10:31:45
2010 +0200
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Wed Aug 04 13:33:17
2010 +0200
@@ -16465,6 +16465,17 @@
<!--286B7E52905C48ABBDA74561A3C13F6D-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--286B7E52905C48ABBDA74561A3C13F6D--></AD_TEXTINTERFACES>
+<!--2A1D06FA18B54BFE9CF2ACB115B588E3--><AD_TEXTINTERFACES>
+<!--2A1D06FA18B54BFE9CF2ACB115B588E3-->
<AD_TEXTINTERFACES_ID><![CDATA[2A1D06FA18B54BFE9CF2ACB115B588E3]]></AD_TEXTINTERFACES_ID>
+<!--2A1D06FA18B54BFE9CF2ACB115B588E3-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2A1D06FA18B54BFE9CF2ACB115B588E3--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2A1D06FA18B54BFE9CF2ACB115B588E3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2A1D06FA18B54BFE9CF2ACB115B588E3--> <TEXT><![CDATA[General Ledger
Report]]></TEXT>
+<!--2A1D06FA18B54BFE9CF2ACB115B588E3-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml]]></FILENAME>
+<!--2A1D06FA18B54BFE9CF2ACB115B588E3--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--2A1D06FA18B54BFE9CF2ACB115B588E3-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2A1D06FA18B54BFE9CF2ACB115B588E3--></AD_TEXTINTERFACES>
+
<!--2B21DC35615C450F83BD69A744CA0764--><AD_TEXTINTERFACES>
<!--2B21DC35615C450F83BD69A744CA0764-->
<AD_TEXTINTERFACES_ID><![CDATA[2B21DC35615C450F83BD69A744CA0764]]></AD_TEXTINTERFACES_ID>
<!--2B21DC35615C450F83BD69A744CA0764-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 9e6ace807564 -r 70c809859a5c
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java Wed Aug
04 10:31:45 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java Wed Aug
04 13:33:17 2010 +0200
@@ -630,7 +630,6 @@
String strLanguage = vars.getLanguage();
- parameters.put("Title", classInfo.name);
StringBuilder strSubTitle = new StringBuilder();
strSubTitle.append(Utility.messageBD(this, "DateFrom", strLanguage) + ":
" + strDateFrom
+ " - " + Utility.messageBD(this, "DateTo", strLanguage) + ": " +
strDateTo + " (");
diff -r 9e6ace807564 -r 70c809859a5c
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml
Wed Aug 04 10:31:45 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml
Wed Aug 04 13:33:17 2010 +0200
@@ -221,9 +221,6 @@
<parameter name="strDateFormat" isForPrompting="false"
class="java.lang.String">
<defaultValueExpression
><![CDATA["dd/MM/yyyy"]]></defaultValueExpression>
</parameter>
- <parameter name="Title" isForPrompting="false" class="java.lang.String">
- <defaultValueExpression ><![CDATA["General Ledger
Report"]]></defaultValueExpression>
- </parameter>
<queryString><![CDATA[SELECT value, name, dateacct,
SUM(AMTACCTDR) AS amtacctdr, SUM(AMTACCTCR) AS amtacctcr,
(SUM(AMTACCTDR)-SUM(AMTACCTCR)) AS total,
FACT_ACCT_GROUP_ID, id, bpname, bpid, pdname, pdid, pjname, pjid,
@@ -368,23 +365,6 @@
</textElement>
<textFieldExpression
class="java.lang.String"><![CDATA[$P{REPORT_SUBTITLE}]]></textFieldExpression>
</textField>
- <textField isStretchWithOverflow="false"
isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
- <reportElement
- x="0"
- y="0"
- width="1500"
- height="25"
- key="textField-23"/>
- <box leftPadding="5">
<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>
- <font fontName="SansSerif"
size="18"/>
- </textElement>
- <textFieldExpression
class="java.lang.String"><![CDATA[$P{Title}]]></textFieldExpression>
- </textField>
<staticText>
<reportElement
style="Detail_Header"
@@ -529,6 +509,20 @@
</textElement>
<text><![CDATA[Account Name]]></text>
</staticText>
+ <staticText>
+ <reportElement
+ style="Report_Footer"
+ x="0"
+ y="0"
+ width="1500"
+ height="25"
+ key="staticText-1"/>
+ <box></box>
+ <textElement>
+ <font fontName="SansSerif"
size="18"/>
+ </textElement>
+ <text><![CDATA[General Ledger Report]]></text>
+ </staticText>
</band>
</pageHeader>
<columnHeader>
------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
