details: https://code.openbravo.com/erp/devel/pi/rev/3e2bbe99b2dd
changeset: 22830:3e2bbe99b2dd
user: Jon AlegrÃa <jon.alegria <at> openbravo.com>
date: Fri Apr 04 11:10:07 2014 +0200
summary: Backout issue 26158
diffstat:
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java |
12 +++++-----
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql |
9 ++-----
2 files changed, 9 insertions(+), 12 deletions(-)
diffs (69 lines):
diff -r f7078a85289e -r 3e2bbe99b2dd
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java
Thu Apr 03 13:30:46 2014 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java
Fri Apr 04 11:10:07 2014 +0200
@@ -469,8 +469,8 @@
strDateFrom, DateTimeData.nDaysAfter(this, strDateTo, "1"),
strDocument,
strcAcctSchemaId, strOrgFamily, strCheck, data[0].dateacct,
data[0].identifier);
} else {
- data = ReportGeneralLedgerJournalData.selectDirect(this,
"Y".equals(strShowDescription) ? "'Y'"
- : "'N'", Utility.getContext(this, vars, "#User_Client",
"ReportGeneralLedger"),
+ data = ReportGeneralLedgerJournalData.selectDirect(this,
+ Utility.getContext(this, vars, "#User_Client",
"ReportGeneralLedger"),
Utility.getContext(this, vars, "#AccessibleOrgTree",
"ReportGeneralLedger"), strTable,
strRecord, strcAcctSchemaId, vars.getLanguage(), initRecordNumber,
intRecordRangePredefined);
@@ -482,8 +482,8 @@
strTable, strRecord, strFactAcctGroupId, data[0].dateacct,
data[0].identifier);
}
} else if (vars.commandIn("DIRECT")) {
- data = ReportGeneralLedgerJournalData.selectDirect(this,
"Y".equals(strShowDescription) ? "'Y'"
- : "'N'", Utility.getContext(this, vars, "#User_Client",
"ReportGeneralLedger"),
+ data = ReportGeneralLedgerJournalData.selectDirect(this,
+ Utility.getContext(this, vars, "#User_Client",
"ReportGeneralLedger"),
Utility.getContext(this, vars, "#AccessibleOrgTree",
"ReportGeneralLedger"), strTable,
strRecord, strcAcctSchemaId, vars.getLanguage());
if (data != null && data.length > 0)
@@ -660,8 +660,8 @@
DateTimeData.nDaysAfter(this, strDateTo, "1"), strDocument,
strcAcctSchemaId,
strOrgFamily, strCheck, vars.getLanguage());
} else
- data = ReportGeneralLedgerJournalData.selectDirect(this,
"Y".equals(strShowDescription) ? "'Y'"
- : "'N'", Utility.getContext(this, vars, "#User_Client",
"ReportGeneralLedger"),
+ data = ReportGeneralLedgerJournalData.selectDirect(this,
+ Utility.getContext(this, vars, "#User_Client",
"ReportGeneralLedger"),
Utility.getContext(this, vars, "#AccessibleOrgTree",
"ReportGeneralLedger"), strTable,
strRecord, strcAcctSchemaId, vars.getLanguage());
diff -r f7078a85289e -r 3e2bbe99b2dd
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql
---
a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql
Thu Apr 03 13:30:46 2014 +0200
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql
Fri Apr 04 11:10:07 2014 +0200
@@ -157,11 +157,10 @@
SELECT SCHEMA_ID, SCHEMA_NAME, IDENTIFIER, DATEACCT, AA.VALUE, AA.NAME,
ID, AD_TABLE_ID, DOCBASETYPE,AR.NAME as DOCNAME, SEQNO, '' AS TOTAL,
(CASE FACTACCTTYPE WHEN 'O' THEN 1 WHEN 'N' THEN 2 WHEN 'R' THEN 3 WHEN
'D' THEN 4 ELSE 5 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,
- AD_GETTAB_FROM_TABLE(AA.AD_TABLE_ID, AA.DOCBASETYPE, AA.AD_CLIENT_ID) AS
TAB_ID , '' as newStyle, DESCRIPTION
+ AD_GETTAB_FROM_TABLE(AA.AD_TABLE_ID, AA.DOCBASETYPE, AA.AD_CLIENT_ID) AS
TAB_ID , '' as newStyle
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 AS NAME, CASE WHEN 'Y' = 'Y'
THEN TO_CHAR(F.DESCRIPTION) ELSE TO_CHAR('') END AS DESCRIPTION,
- F.RECORD_ID AS ID, F.AD_TABLE_ID, F.DOCBASETYPE,
+ F.ACCTVALUE AS VALUE, F.ACCTDESCRIPTION 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, F.AD_CLIENT_ID
FROM FACT_ACCT F, C_ACCTSCHEMA SC
WHERE F.AD_CLIENT_ID IN ('1')
@@ -171,14 +170,12 @@
AND f.C_ACCTSCHEMA_ID = ?
GROUP BY f.C_ACCTSCHEMA_ID, SC.NAME, F.AD_TABLE_ID, F.DATEACCT,
F.ACCTDESCRIPTION, 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),
F.AD_CLIENT_ID,
- TO_CHAR(F.DESCRIPTION)
+ (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),
F.AD_CLIENT_ID
HAVING (sum(F.AMTACCTDR) <> 0 OR sum(F.AMTACCTCR) <> 0)) AA
LEFT JOIN (select * from AD_REF_LIST_V WHERE AD_REFERENCE_ID = '183'
AND AD_LANGUAGE=?) AR ON AR.VALUE=AA.DOCBASETYPE
ORDER BY SCHEMA_NAME, DATEACCT, FACTACCTTYPE2, IDENTIFIER, AA.AMTACCTDR
DESC, AA.AMTACCTCR DESC, SEQNO
]]></Sql>
<Field name="rownum" value="count"/>
- <Parameter name="descriptionGrouping" type="replace" optional="true"
after="AS NAME, CASE WHEN " text="'Y'"/>
<Parameter name="adUserClient" type="replace" optional="true" after="WHERE
F.AD_CLIENT_ID IN (" text="'1'"/>
<Parameter name="adUserOrg" type="replace" optional="true" after="AND
F.AD_ORG_ID IN(" text="'1'"/>
<Parameter name="table" optional="true" after="AND 1=1"><![CDATA[ AND
f.ad_table_Id = ?]]></Parameter>
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
