details: https://code.openbravo.com/erp/devel/pi/rev/8480f4ad0b06
changeset: 16524:8480f4ad0b06
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Mon May 14 13:04:52 2012 +0200
summary: Fixes bug 20483: Incremental build is broken at Jenkins
diffstat:
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java | 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_data.xsql | 14
+++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
diffs (52 lines):
diff -r 537ed5d4a7f3 -r 8480f4ad0b06
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java Mon May
14 10:46:16 2012 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java Mon May
14 13:04:52 2012 +0200
@@ -282,8 +282,8 @@
vars.setSessionValue("inpElementValueIdTo_DES", strcelementvaluetodes);
}
Long initMainSelect = System.currentTimeMillis();
- data = ReportGeneralLedgerData.select2(this, "0", strGroupByText,
strGroupBy, strAllaccounts,
- strcelementvaluefrom, strcelementvalueto,
+ data = ReportGeneralLedgerData.select2(this, rowNum, strGroupByText,
strGroupBy,
+ strAllaccounts, strcelementvaluefrom, strcelementvalueto,
Utility.getContext(this, vars, "#AccessibleOrgTree",
"ReportGeneralLedger"),
Utility.getContext(this, vars, "#User_Client",
"ReportGeneralLedger"), strcAcctSchemaId,
strDateFrom, toDatePlusOne, strOrgFamily, strcBpartnerId,
strmProductId, strcProjectId,
diff -r 537ed5d4a7f3 -r 8480f4ad0b06
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_data.xsql
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_data.xsql
Mon May 14 10:46:16 2012 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_data.xsql
Mon May 14 13:04:52 2012 +0200
@@ -149,9 +149,9 @@
WHEN 'Project' THEN c_project.c_project_id
ELSE '' END AS groupbyid,
CASE ?
- WHEN 'BPartner' THEN (select name from c_bpartner b where
b.c_bpartner_id = c_bpartner.c_bpartner_id)
- WHEN 'Product' THEN (select value || ' - ' || name from
m_product p where p.m_product_id = m_product.m_product_id)
- WHEN 'Project' THEN (select name from c_project pj where
pj.c_project_id = c_project.c_project_id)
+ WHEN 'BPartner' THEN (select to_char(name) from c_bpartner b
where b.c_bpartner_id = c_bpartner.c_bpartner_id)
+ WHEN 'Product' THEN (select to_char(value || ' - ' || name)
from m_product p where p.m_product_id = m_product.m_product_id)
+ WHEN 'Project' THEN (select to_char(name) from c_project pj
where pj.c_project_id = c_project.c_project_id)
ELSE '' END AS groupbyname,
CASE WHEN AMTACCTDR <> 0 THEN 'Y' ELSE 'N' END AS ISDEBIT,
CASE WHEN FACT_ACCT.FACTACCTTYPE = 'O' THEN 1 ELSE (CASE WHEN
FACT_ACCT.FACTACCTTYPE = 'N' THEN 2 ELSE (CASE WHEN FACT_ACCT.FACTACCTTYPE =
'R' THEN 3 ELSE (CASE WHEN FACT_ACCT.FACTACCTTYPE = 'C' THEN 4 END) END) END)
END AS FACTACCTTYPE
@@ -212,7 +212,7 @@
<SqlMethodComment></SqlMethodComment>
<Sql>
<![CDATA[
- SELECT COALESCE(SUM(AMTACCTDR),0) AS AMTACCTDR,
COALESCE(SUM(AMTACCTCR)) AS AMTACCTCR
+ SELECT COALESCE(SUM(AMTACCTDR),0) AS AMTACCTDR,
COALESCE(SUM(AMTACCTCR),0) AS AMTACCTCR
FROM ( SELECT '0' AS RN1, C.* FROM (
SELECT VALUE, NAME, DATEACCT,
COALESCE(SUM(AMTACCTDR),0) AS AMTACCTDR, COALESCE(SUM(AMTACCTCR),0)
AS AMTACCTCR,
@@ -235,9 +235,9 @@
WHEN 'Project' THEN c_project.c_project_id
ELSE '' END AS groupbyid,
CASE ?
- WHEN 'BPartner' THEN (select name from c_bpartner b where
b.c_bpartner_id = c_bpartner.c_bpartner_id)
- WHEN 'Product' THEN (select value || ' - ' || name from
m_product p where p.m_product_id = m_product.m_product_id)
- WHEN 'Project' THEN (select name from c_project pj where
pj.c_project_id = c_project.c_project_id)
+ WHEN 'BPartner' THEN (select to_char(name) from c_bpartner b
where b.c_bpartner_id = c_bpartner.c_bpartner_id)
+ WHEN 'Product' THEN (select to_char(value || ' - ' || name)
from m_product p where p.m_product_id = m_product.m_product_id)
+ WHEN 'Project' THEN (select to_char(name) from c_project pj
where pj.c_project_id = c_project.c_project_id)
ELSE '' END AS groupbyname,
CASE WHEN AMTACCTDR <> 0 THEN 'Y' ELSE 'N' END AS ISDEBIT,
CASE WHEN FACT_ACCT.FACTACCTTYPE = 'O' THEN 1 ELSE (CASE WHEN
FACT_ACCT.FACTACCTTYPE = 'N' THEN 2 ELSE (CASE WHEN FACT_ACCT.FACTACCTTYPE =
'R' THEN 3 ELSE (CASE WHEN FACT_ACCT.FACTACCTTYPE = 'C' THEN 4 END) END) END)
END AS FACTACCTTYPE
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
