details: /erp/stable/2.50/rev/7e54b0a4f188
changeset: 9355:7e54b0a4f188
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Mon Apr 11 17:10:50 2011 +0200
summary: Fixes Smoke Test Failure.
Previousle, when creating invoices comming from employees expenses, the
non-default document type had priority over the default one. This is not
correct. Moreover, smoke test was failing because of this
details: /erp/stable/2.50/rev/a8b3de8cb94e
changeset: 9356:a8b3de8cb94e
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Mon Apr 11 17:29:24 2011 +0200
summary: Fixes issue 16750.
Added the org name (after client name) in the report. More space is provided
just in case it's not enough for so much text
diffstat:
src-db/database/model/functions/AD_GET_DOCTYPE_EXPENSES.xml |
2 +-
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 ++++++++++
4 files changed, 18 insertions(+), 5 deletions(-)
diffs (84 lines):
diff -r 3f8a7a0ad260 -r a8b3de8cb94e
src-db/database/model/functions/AD_GET_DOCTYPE_EXPENSES.xml
--- a/src-db/database/model/functions/AD_GET_DOCTYPE_EXPENSES.xml Mon Apr
11 17:07:09 2011 +0200
+++ b/src-db/database/model/functions/AD_GET_DOCTYPE_EXPENSES.xml Mon Apr
11 17:29:24 2011 +0200
@@ -45,7 +45,7 @@
ORDER BY
AD_ISORGINCLUDED(p_OrgId, AD_Org_ID, p_ClientId),
IsExpense DESC,
- IsDefault,
+ IsDefault DESC,
C_DocType_ID
)
LOOP
diff -r 3f8a7a0ad260 -r a8b3de8cb94e
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java
Mon Apr 11 17:07:09 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java
Mon Apr 11 17:29:24 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 3f8a7a0ad260 -r a8b3de8cb94e
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml
Mon Apr 11 17:07:09 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml
Mon Apr 11 17:29:24 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 3f8a7a0ad260 -r a8b3de8cb94e
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql
---
a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql
Mon Apr 11 17:07:09 2011 +0200
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql
Mon Apr 11 17:29:24 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>
------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
