details: /erp/devel/pi/rev/f263796bd669
changeset: 12242:f263796bd669
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Wed May 18 19:25:56 2011 +0200
summary: Fixes issue 0016309: General Ledger Journal in XLS format , the
format of numbers are not correct
It has been created a new report for excel with the correct formatting options
details: /erp/devel/pi/rev/5f7a1c15677a
changeset: 12243:5f7a1c15677a
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Thu May 19 11:31:59 2011 +0200
summary: Fixes issue 0016309: General Ledger Journal in XLS format , the
format of numbers are not correct
Added translations for database consistency
diffstat:
src-db/database/sourcedata/AD_TEXTINTERFACES.xml |
33 +
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java |
11 +-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournalExcel.jrxml |
657 ++++++++++
3 files changed, 699 insertions(+), 2 deletions(-)
diffs (truncated from 739 to 300 lines):
diff -r 316dfc2e8c16 -r 5f7a1c15677a
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Thu May 19 09:49:04
2011 +0200
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Thu May 19 11:31:59
2011 +0200
@@ -13075,6 +13075,17 @@
<!--023D343FA6294F3B9B0F8B1CA57712FB-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--023D343FA6294F3B9B0F8B1CA57712FB--></AD_TEXTINTERFACES>
+<!--02E4CF0415C84120B759B7E2E5146558--><AD_TEXTINTERFACES>
+<!--02E4CF0415C84120B759B7E2E5146558-->
<AD_TEXTINTERFACES_ID><![CDATA[02E4CF0415C84120B759B7E2E5146558]]></AD_TEXTINTERFACES_ID>
+<!--02E4CF0415C84120B759B7E2E5146558-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--02E4CF0415C84120B759B7E2E5146558--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--02E4CF0415C84120B759B7E2E5146558--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--02E4CF0415C84120B759B7E2E5146558--> <TEXT><![CDATA[Entry]]></TEXT>
+<!--02E4CF0415C84120B759B7E2E5146558-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournalExcel.jrxml]]></FILENAME>
+<!--02E4CF0415C84120B759B7E2E5146558--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--02E4CF0415C84120B759B7E2E5146558-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--02E4CF0415C84120B759B7E2E5146558--></AD_TEXTINTERFACES>
+
<!--04AF48556B2E4A22AB53FFA3B4BF2DD3--><AD_TEXTINTERFACES>
<!--04AF48556B2E4A22AB53FFA3B4BF2DD3-->
<AD_TEXTINTERFACES_ID><![CDATA[04AF48556B2E4A22AB53FFA3B4BF2DD3]]></AD_TEXTINTERFACES_ID>
<!--04AF48556B2E4A22AB53FFA3B4BF2DD3-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -13218,6 +13229,17 @@
<!--0DC6787C63254C90841C71EFF51A4618-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--0DC6787C63254C90841C71EFF51A4618--></AD_TEXTINTERFACES>
+<!--0DE9FA0801ED4174BC5A57641357BB68--><AD_TEXTINTERFACES>
+<!--0DE9FA0801ED4174BC5A57641357BB68-->
<AD_TEXTINTERFACES_ID><![CDATA[0DE9FA0801ED4174BC5A57641357BB68]]></AD_TEXTINTERFACES_ID>
+<!--0DE9FA0801ED4174BC5A57641357BB68-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0DE9FA0801ED4174BC5A57641357BB68--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0DE9FA0801ED4174BC5A57641357BB68--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0DE9FA0801ED4174BC5A57641357BB68--> <TEXT><![CDATA[Carry-Over:]]></TEXT>
+<!--0DE9FA0801ED4174BC5A57641357BB68-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournalExcel.jrxml]]></FILENAME>
+<!--0DE9FA0801ED4174BC5A57641357BB68--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--0DE9FA0801ED4174BC5A57641357BB68-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0DE9FA0801ED4174BC5A57641357BB68--></AD_TEXTINTERFACES>
+
<!--0EFFED00AF6748E6931F601F3D503C92--><AD_TEXTINTERFACES>
<!--0EFFED00AF6748E6931F601F3D503C92-->
<AD_TEXTINTERFACES_ID><![CDATA[0EFFED00AF6748E6931F601F3D503C92]]></AD_TEXTINTERFACES_ID>
<!--0EFFED00AF6748E6931F601F3D503C92-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -17452,6 +17474,17 @@
<!--819A66AA424F4169949E75C372C9938C-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--819A66AA424F4169949E75C372C9938C--></AD_TEXTINTERFACES>
+<!--824818EB1076489EAC986E497180AF22--><AD_TEXTINTERFACES>
+<!--824818EB1076489EAC986E497180AF22-->
<AD_TEXTINTERFACES_ID><![CDATA[824818EB1076489EAC986E497180AF22]]></AD_TEXTINTERFACES_ID>
+<!--824818EB1076489EAC986E497180AF22-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--824818EB1076489EAC986E497180AF22--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--824818EB1076489EAC986E497180AF22--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--824818EB1076489EAC986E497180AF22--> <TEXT><![CDATA[Carry
Forward:]]></TEXT>
+<!--824818EB1076489EAC986E497180AF22-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournalExcel.jrxml]]></FILENAME>
+<!--824818EB1076489EAC986E497180AF22--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--824818EB1076489EAC986E497180AF22-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--824818EB1076489EAC986E497180AF22--></AD_TEXTINTERFACES>
+
<!--829E2B2EFCBA3DFBE040007F01013C0D--><AD_TEXTINTERFACES>
<!--829E2B2EFCBA3DFBE040007F01013C0D-->
<AD_TEXTINTERFACES_ID><![CDATA[829E2B2EFCBA3DFBE040007F01013C0D]]></AD_TEXTINTERFACES_ID>
<!--829E2B2EFCBA3DFBE040007F01013C0D-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 316dfc2e8c16 -r 5f7a1c15677a
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java
Thu May 19 09:49:04 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java
Thu May 19 11:31:59 2011 +0200
@@ -594,8 +594,15 @@
strSubtitle += " - " + Utility.messageBD(this, "Period",
vars.getLanguage()) + ": "
+ strDateFrom + " - " + strDateTo;
- String strOutput = vars.commandIn("PDF") ? "pdf" : "xls";
- String strReportName =
"@basedesign@/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml";
+ String strOutput;
+ String strReportName;
+ if (vars.commandIn("PDF")) {
+ strOutput = "pdf";
+ strReportName =
"@basedesign@/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml";
+ } else {
+ strOutput = "xls";
+ strReportName =
"@basedesign@/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournalExcel.jrxml";
+ }
HashMap<String, Object> parameters = new HashMap<String, Object>();
parameters.put("Subtitle", strSubtitle);
diff -r 316dfc2e8c16 -r 5f7a1c15677a
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournalExcel.jrxml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournalExcel.jrxml
Thu May 19 11:31:59 2011 +0200
@@ -0,0 +1,657 @@
+<?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="ReportGeneralLedgerJournal"
+ columnCount="1"
+ printOrder="Vertical"
+ orientation="Landscape"
+ pageWidth="1133"
+ pageHeight="842"
+ columnWidth="1133"
+ columnSpacing="0"
+ leftMargin="0"
+ rightMargin="0"
+ topMargin="0"
+ bottomMargin="0"
+ 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="default"
+ isDefault="false"
+ vAlign="Middle"
+ fontName="Bitstream Vera Sans"
+ fontSize="11"
+ >
+ </style>
+ <style
+ name="Report_Title"
+ isDefault="false"
+ fontName="Bitstream Vera Sans"
+ fontSize="18"
+ >
+ </style>
+ <style
+ name="Report_Subtitle"
+ isDefault="false"
+ forecolor="#555555"
+ fontName="Bitstream Vera Sans"
+ fontSize="14"
+ >
+ </style>
+ <style
+ name="Total_Field"
+ isDefault="false"
+ mode="Opaque"
+ forecolor="#000000"
+ backcolor="#CCCCCC"
+ vAlign="Middle"
+ fontName="Bitstream Vera Sans"
+ fontSize="11"
+ isBold="true"
+ >
+ </style>
+ <style
+ name="Detail_Header"
+ isDefault="false"
+ mode="Opaque"
+ forecolor="#FFFFFF"
+ backcolor="#5D5D5D"
+ vAlign="Middle"
+ fontName="Bitstream Vera Sans"
+ fontSize="11"
+ isBold="true"
+ >
+ </style>
+ <style
+ name="GroupHeader_DarkGray"
+ isDefault="false"
+ mode="Opaque"
+ forecolor="#FFFFFF"
+ backcolor="#555555"
+ vAlign="Middle"
+ fontName="Bitstream Vera Sans"
+ fontSize="18"
+ isBold="true"
+ >
+ </style>
+ <style
+ name="GroupHeader_Gray"
+ isDefault="false"
+ mode="Opaque"
+ backcolor="#999999"
+ >
+ </style>
+ <style
+ name="Detail_Line"
+ isDefault="false"
+ fontName="Bitstream Vera Sans"
+ fontSize="11"
+ >
+
+ <conditionalStyle>
+ <conditionExpression><![CDATA[new
Boolean($V{REPORT_COUNT}.intValue()%2==1)]]></conditionExpression>
+ <style
+ name="Detail_Line"
+ isDefault="false"
+ mode="Opaque"
+ backcolor="#CCCCCC"
+ >
+ </style>
+ </conditionalStyle>
+ </style>
+ <style
+ name="Total_Gray"
+ isDefault="false"
+ mode="Opaque"
+ forecolor="#000000"
+ backcolor="#CCCCCC"
+ >
+ </style>
+ <style
+ name="Report_Data_Label"
+ isDefault="false"
+ fontName="Bitstream Vera Sans"
+ fontSize="11"
+ isBold="true"
+ >
+ </style>
+ <style
+ name="Report_Data_Field"
+ isDefault="false"
+ fontName="Bitstream Vera Sans"
+ fontSize="11"
+ isBold="false"
+ >
+ </style>
+ <style
+ name="Report_Footer"
+ isDefault="true"
+ fontName="Bitstream Vera Sans"
+ fontSize="11"
+ >
+ </style>
+ <style
+ name="Group_Data_Label"
+ isDefault="false"
+ fontName="Bitstream Vera Sans"
+ fontSize="14"
+ isBold="true"
+ >
+ </style>
+ <style
+ name="Group_Data_Field"
+ isDefault="false"
+ fontName="Bitstream Vera Sans"
+ fontSize="14"
+ >
+ </style>
+ <style
+ name="Detail_Data_Label"
+ isDefault="false"
+ mode="Opaque"
+ backcolor="#CCCCCC"
+ fontName="Bitstream Vera Sans"
+ fontSize="11"
+ isBold="true"
+ >
+ </style>
+ <style
+ name="Detail_Data_Field"
+ isDefault="false"
+ mode="Opaque"
+ backcolor="#CCCCCC"
+ fontName="Bitstream Vera Sans"
+ fontSize="11"
+ >
+ </style>
+ <style
+ name="Group_Footer"
+ isDefault="false"
+ fontName="Bitstream Vera Sans"
+ fontSize="11"
+ isBold="true"
+ >
+ </style>
+
+ <parameter name="Subtitle" isForPrompting="false"
class="java.lang.String"/>
+ <parameter name="NUMBERFORMAT" isForPrompting="false"
class="java.text.DecimalFormat">
+ <defaultValueExpression ><![CDATA[new
DecimalFormat("#,##0.00",new
DecimalFormatSymbols(Locale.US))]]></defaultValueExpression>
+ </parameter>
+ <parameter name="LOCALE" isForPrompting="false"
class="java.util.Locale"/>
+ <parameter name="PageNo" isForPrompting="false"
class="java.lang.String">
+ <defaultValueExpression
><![CDATA["1"]]></defaultValueExpression>
+ </parameter>
+ <parameter name="InitialBalance" isForPrompting="false"
class="java.math.BigDecimal">
+ <defaultValueExpression
><![CDATA[BigDecimal.ZERO]]></defaultValueExpression>
+ </parameter>
+ <parameter name="InitialEntryNumber" isForPrompting="false"
class="java.lang.String">
+ <defaultValueExpression
><![CDATA["1"]]></defaultValueExpression>
+ </parameter>
+ <parameter name="TaxID" isForPrompting="false"
class="java.lang.String"/>
+ <queryString><![CDATA[SELECT SCHEMA_ID, SCHEMA_NAME, IDENTIFIER,
DATEACCT, VALUE, NAME, ID, AD_TABLE_ID, DOCBASETYPE, SEQNO, '' AS TOTAL, '' AS
DESCRIPTION,
+ (CASE FACTACCTTYPE WHEN 'O' THEN 1 WHEN 'N' THEN 2 WHEN 'R' THEN 3 ELSE
4 END) AS FACTACCTTYPE2,
+ (CASE AMTACCTDR WHEN 0 THEN NULL ELSE AMTACCTDR END) AS AMTACCTDR, (CASE
AMTACCTCR WHEN 0 THEN NULL ELSE AMTACCTCR END) AS AMTACCTCR
+ FROM
+ (SELECT F.C_ACCTSCHEMA_ID AS SCHEMA_ID, SC.NAME AS SCHEMA_NAME,
F.FACT_ACCT_GROUP_ID AS IDENTIFIER, F.DATEACCT,
+ F.ACCTVALUE AS VALUE, F.ACCTDESCRIPTION || F.DESCRIPTION AS
NAME,F.RECORD_ID AS ID, F.AD_TABLE_ID, F.DOCBASETYPE,
+ sum(F.AMTACCTDR) AS AMTACCTDR, sum(F.AMTACCTCR) AS AMTACCTCR, MIN(SEQNO)
AS SEQNO, F.FACTACCTTYPE AS FACTACCTTYPE
+ FROM FACT_ACCT F, C_ACCTSCHEMA SC
+ WHERE f.C_ACCTSCHEMA_ID = SC.C_ACCTSCHEMA_ID
+ GROUP BY f.C_ACCTSCHEMA_ID, SC.NAME, F.AD_TABLE_ID, F.DATEACCT,
F.ACCTDESCRIPTION || F.DESCRIPTION, F.ACCTVALUE, F.DOCBASETYPE, F.RECORD_ID,
+ F.FACT_ACCT_GROUP_ID, F.ACCOUNT_ID,F.FACTACCTTYPE,
+ (CASE F.AMTACCTDR WHEN 0 THEN (CASE SIGN(F.AMTACCTCR) WHEN -1 THEN 1
ELSE 2 END) ELSE (CASE SIGN(F.AMTACCTDR) WHEN -1 THEN 3 ELSE 4 END) END)) AA
+ ORDER BY SCHEMA_NAME, DATEACCT, FACTACCTTYPE2, IDENTIFIER,
SEQNO]]></queryString>
+
+ <field name="SCHEMA_ID" class="java.lang.String"/>
+ <field name="SCHEMA_NAME" class="java.lang.String"/>
+ <field name="IDENTIFIER" class="java.lang.String"/>
+ <field name="DATEACCT" class="java.util.Date"/>
+ <field name="VALUE" class="java.lang.String"/>
+ <field name="NAME" class="java.lang.String"/>
------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its
next-generation tools to help Windows* and Linux* C/C++ and Fortran
developers boost performance applications - including clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
