midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-3728 Cannot report adjustment periods with Report Cube

This commit is contained in:
Carlos Ruiz 2018-06-07 09:20:03 +02:00
parent 5768442cfe
commit 667875b709
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.adempiere.base/src/org/compiere/model/MReportCube.java
View File

@ -63,8 +63,7 @@ public class MReportCube extends X_PA_ReportCube {
"INNER JOIN Fact_Acct fact ON (fact.dateacct between p.startdate and p.enddate " + "INNER JOIN Fact_Acct fact ON (fact.dateacct between p.startdate and p.enddate " +
" and fact.ad_client_id = c.ad_client_id) " + " and fact.ad_client_id = c.ad_client_id) " +
"WHERE c.PA_ReportCube_ID = ? " + "WHERE c.PA_ReportCube_ID = ? " +
"AND fact.updated > c.LastRecalculated " + "AND fact.updated > c.LastRecalculated";
"AND p.periodtype='S' ";
log.log (Level.FINE, sql); log.log (Level.FINE, sql);
@ -130,10 +129,9 @@ public class MReportCube extends X_PA_ReportCube {
"p.c_period_id, p.StartDate, COALESCE(SUM(AmtAcctDr),0), COALESCE(SUM(AmtAcctCr),0), " + "p.c_period_id, p.StartDate, COALESCE(SUM(AmtAcctDr),0), COALESCE(SUM(AmtAcctCr),0), " +
"COALESCE(SUM(Qty),0)"); "COALESCE(SUM(Qty),0)");
String from = " FROM fact_acct f " + String from = " FROM fact_acct f " +
" INNER JOIN C_Period p ON ( f.DateAcct BETWEEN p.StartDate AND p.EndDate ) " + " INNER JOIN C_Period p ON ( f.C_Period_ID = p.C_Period_ID ) " +
" INNER JOIN C_Year y ON ( p.C_Year_ID = y.C_Year_ID ) " + " INNER JOIN C_Year y ON ( p.C_Year_ID = y.C_Year_ID ) " +
" WHERE p.PeriodType = 'S' " + " WHERE y.C_Calendar_ID = ? AND f.AD_Client_ID = ? ";
" AND y.C_Calendar_ID = ? AND f.AD_Client_ID = ? ";
if ( getLastRecalculated() != null && !reset ) if ( getLastRecalculated() != null && !reset )
from += "AND p.C_Period_ID IN " + periods; from += "AND p.C_Period_ID IN " + periods;