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

IDEMPIERE-3325 GLJournal reverse accrual date is hard coded to system date

This commit is contained in:
Carlos Ruiz 2017-04-03 22:13:20 +02:00
parent b20049e5a0
commit 67a903ef35
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -834,9 +834,13 @@ public class MJournal extends X_GL_Journal implements DocAction
// Journal // Journal
MJournal reverse = new MJournal (this); MJournal reverse = new MJournal (this);
reverse.setGL_JournalBatch_ID(GL_JournalBatch_ID); reverse.setGL_JournalBatch_ID(GL_JournalBatch_ID);
reverse.setDateDoc(new Timestamp(System.currentTimeMillis())); Timestamp reversalDate = Env.getContextAsDate(getCtx(), "#Date");
if (reversalDate == null) {
reversalDate = new Timestamp(System.currentTimeMillis());
}
reverse.setDateDoc(reversalDate);
reverse.set_ValueNoCheck ("C_Period_ID", null); // reset reverse.set_ValueNoCheck ("C_Period_ID", null); // reset
reverse.setDateAcct(reverse.getDateDoc()); reverse.setDateAcct(reversalDate);
// Reverse indicator // Reverse indicator
StringBuilder msgd = new StringBuilder("(->").append(getDocumentNo()).append(")"); StringBuilder msgd = new StringBuilder("(->").append(getDocumentNo()).append(")");
reverse.addDescription(msgd.toString()); reverse.addDescription(msgd.toString());

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

@ -713,8 +713,12 @@ public class MJournalBatch extends X_GL_JournalBatch implements DocAction
// Reverse it // Reverse it
MJournalBatch reverse = new MJournalBatch (this); MJournalBatch reverse = new MJournalBatch (this);
reverse.setC_Period_ID(0); reverse.setC_Period_ID(0);
reverse.setDateDoc(new Timestamp(System.currentTimeMillis())); Timestamp reversalDate = Env.getContextAsDate(getCtx(), "#Date");
reverse.setDateAcct(reverse.getDateDoc()); if (reversalDate == null) {
reversalDate = new Timestamp(System.currentTimeMillis());
}
reverse.setDateDoc(reversalDate);
reverse.setDateAcct(reversalDate);
// Reverse indicator // Reverse indicator
StringBuilder msgd = new StringBuilder("(->").append(getDocumentNo()).append(")"); StringBuilder msgd = new StringBuilder("(->").append(getDocumentNo()).append(")");
reverse.addDescription(msgd.toString()); reverse.addDescription(msgd.toString());