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

IDEMPIERE-3874 Process Recalculate Cube not loading GL journal facts due to c_calendar_id

This commit is contained in:
Carlos Ruiz 2019-04-18 15:31:12 +02:00
parent 0a9d7335de
commit eb82017e1e
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.adempiere.base.callout/src/org/compiere/model/CalloutGLJournal.java
View File

@ -121,18 +121,14 @@ public class CalloutGLJournal extends CalloutEngine
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
String PeriodType = rs.getString(1);
Timestamp StartDate = rs.getTimestamp(2); Timestamp StartDate = rs.getTimestamp(2);
Timestamp EndDate = rs.getTimestamp(3); Timestamp EndDate = rs.getTimestamp(3);
if (PeriodType.equals("S")) // Standard Periods
{
// out of range - set to last day // out of range - set to last day
if (DateAcct == null if (DateAcct == null
|| DateAcct.before(StartDate) || DateAcct.after(EndDate)) || DateAcct.before(StartDate) || DateAcct.after(EndDate))
mTab.setValue("DateAcct", EndDate); mTab.setValue("DateAcct", EndDate);
} }
} }
}
catch (SQLException e) catch (SQLException e)
{ {
log.log(Level.SEVERE, sql, e); log.log(Level.SEVERE, sql, e);

3
org.adempiere.base/src/org/compiere/model/MJournal.java
View File

@ -322,6 +322,9 @@ public class MJournal extends X_GL_Journal implements DocAction
} }
else if (C_Period_ID != getC_Period_ID()) else if (C_Period_ID != getC_Period_ID())
{ {
/* special case when assigning an adjustment period */
MPeriod currentPeriod = MPeriod.get(getCtx(), getC_Period_ID());
if (currentPeriod.isStandardPeriod())
setC_Period_ID(C_Period_ID); setC_Period_ID(C_Period_ID);
} }
} }

3
org.adempiere.base/src/org/compiere/model/MJournalBatch.java
View File

@ -954,6 +954,9 @@ public class MJournalBatch extends X_GL_JournalBatch implements DocAction
} }
else if (C_Period_ID != getC_Period_ID()) else if (C_Period_ID != getC_Period_ID())
{ {
/* special case when assigning an adjustment period */
MPeriod currentPeriod = MPeriod.get(getCtx(), getC_Period_ID());
if (currentPeriod.isStandardPeriod())
setC_Period_ID(C_Period_ID); setC_Period_ID(C_Period_ID);
} }
} }