details: /erp/devel/pi/rev/b2eca3eb6512
changeset: 11614:b2eca3eb6512
user: Egoitz Castillo <egoitz.castillo <at> openbravo.com>
date: Wed Apr 20 10:26:48 2011 +0200
summary: Fixes issue 0016210: the organization is not shown in General Ledger
Journal
diffstat:
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java |
3 +++
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml |
8 ++++----
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql |
10 ++++++++++
3 files changed, 17 insertions(+), 4 deletions(-)
diffs (72 lines):
diff -r b750b36d757e -r b2eca3eb6512
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java
Thu Apr 14 15:11:11 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java
Wed Apr 20 10:26:48 2011 +0200
@@ -587,6 +587,9 @@
String strSubtitle = Utility.messageBD(this, "CompanyName",
vars.getLanguage()) + ": "
+ ReportGeneralLedgerJournalData.selectCompany(this, vars.getClient());
+ if (!("0".equals(strOrg)))
+ strSubtitle += " - " + ReportGeneralLedgerJournalData.selectOrg(this,
strOrg);
+
if (!"".equals(strDateFrom) || !"".equals(strDateTo))
strSubtitle += " - " + Utility.messageBD(this, "Period",
vars.getLanguage()) + ": "
+ strDateFrom + " - " + strDateTo;
diff -r b750b36d757e -r b2eca3eb6512
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml
Thu Apr 14 15:11:11 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml
Wed Apr 20 10:26:48 2011 +0200
@@ -415,7 +415,7 @@
</band>
</background>
<title>
- <band height="66" isSplitAllowed="true" >
+ <band height="87" isSplitAllowed="true" >
<line direction="TopDown">
<reportElement
x="0"
@@ -431,7 +431,7 @@
x="0"
y="28"
width="534"
- height="20"
+ height="39"
key="textField-4"/>
<box leftPadding="5">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -465,7 +465,7 @@
<reportElement
style="Report_Subtitle"
x="58"
- y="48"
+ y="68"
width="141"
height="18"
key="textField-20"/>
@@ -482,7 +482,7 @@
<textField isStretchWithOverflow="false"
isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
<reportElement
x="0"
- y="48"
+ y="68"
width="56"
height="18"
key="textField-21"/>
diff -r b750b36d757e -r b2eca3eb6512
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql
---
a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql
Thu Apr 14 15:11:11 2011 +0200
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql
Wed Apr 20 10:26:48 2011 +0200
@@ -271,6 +271,16 @@
]]></Sql>
<Parameter name="client"/>
</SqlMethod>
+ <SqlMethod name="selectOrg" type="preparedStatement" return="string"
default="0">
+ <SqlMethodComment></SqlMethodComment>
+ <Sql>
+ <![CDATA[
+ SELECT NAME
+ FROM AD_ORG
+ WHERE AD_ORG_ID = ?
+ ]]></Sql>
+ <Parameter name="orgId"/>
+ </SqlMethod>
<SqlMethod name="selectOrgTaxID" type="preparedStatement" return="string">
<SqlMethodComment></SqlMethodComment>
<Sql>
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
