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

IDEMPIERE-1944 Reverse Issue with GL Journal and GL Journal Batch

This commit is contained in:
Elaine Tan 2014-05-09 16:46:54 +08:00
parent 06ce3aae94
commit 8cbea90a1b
2 changed files with 88 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -760,15 +760,29 @@ public class MJournal extends X_GL_Journal implements DocAction
reverse.setReversal_ID(getGL_Journal_ID()); reverse.setReversal_ID(getGL_Journal_ID());
if (!reverse.save()) if (!reverse.save())
return null; return null;
msgd = new StringBuilder("(").append(reverse.getDocumentNo()).append("<-)");
addDescription(msgd.toString());
// Lines // Lines
reverse.copyLinesFrom(this, null, 'C'); reverse.copyLinesFrom(this, null, 'C');
//
if (!reverse.processIt(DocAction.ACTION_Complete))
{
m_processMsg = "Reversal ERROR: " + reverse.getProcessMsg();
return null;
}
reverse.closeIt();
reverse.setProcessing(false);
reverse.setDocStatus(DOCSTATUS_Reversed);
reverse.setDocAction(DOCACTION_None);
reverse.saveEx(get_TrxName());
//
msgd = new StringBuilder("(").append(reverse.getDocumentNo()).append("<-)");
addDescription(msgd.toString());
// //
setProcessed(true); setProcessed(true);
//FR [ 1948157 ] //FR [ 1948157 ]
setReversal_ID(reverse.getGL_Journal_ID()); setReversal_ID(reverse.getGL_Journal_ID());
setDocStatus(DOCSTATUS_Reversed);
setDocAction(DOCACTION_None); setDocAction(DOCACTION_None);
return reverse; return reverse;
} // reverseCorrectionIt } // reverseCorrectionIt
@ -814,19 +828,31 @@ public class MJournal extends X_GL_Journal implements DocAction
reverse.set_ValueNoCheck ("C_Period_ID", null); // reset reverse.set_ValueNoCheck ("C_Period_ID", null); // reset
reverse.setDateAcct(reverse.getDateDoc()); reverse.setDateAcct(reverse.getDateDoc());
// Reverse indicator // Reverse indicator
StringBuilder description; StringBuilder msgd = new StringBuilder("(->").append(getDocumentNo()).append(")");
if (reverse.getDescription() == null) reverse.addDescription(msgd.toString());
description = new StringBuilder("** ").append(getDocumentNo()).append(" **"); reverse.setReversal_ID(getGL_Journal_ID());
else
description = new StringBuilder(reverse.getDescription()).append(" ** ").append(getDocumentNo()).append(" **");
reverse.setDescription(description.toString());
if (!reverse.save()) if (!reverse.save())
return null; return null;
// Lines // Lines
reverse.copyLinesFrom(this, reverse.getDateAcct(), 'R'); reverse.copyLinesFrom(this, reverse.getDateAcct(), 'R');
// //
if (!reverse.processIt(DocAction.ACTION_Complete))
{
m_processMsg = "Reversal ERROR: " + reverse.getProcessMsg();
return null;
}
reverse.closeIt();
reverse.setProcessing(false);
reverse.setDocStatus(DOCSTATUS_Reversed);
reverse.setDocAction(DOCACTION_None);
reverse.saveEx(get_TrxName());
//
msgd = new StringBuilder("(").append(reverse.getDocumentNo()).append("<-)");
addDescription(msgd.toString());
setProcessed(true); setProcessed(true);
setReversal_ID(reverse.getGL_Journal_ID());
setDocStatus(DOCSTATUS_Reversed);
setDocAction(DOCACTION_None); setDocAction(DOCACTION_None);
return reverse; return reverse;
} // reverseAccrualIt } // reverseAccrualIt

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

@ -628,16 +628,11 @@ public class MJournalBatch extends X_GL_JournalBatch implements DocAction
reverse.setC_Period_ID(getC_Period_ID()); reverse.setC_Period_ID(getC_Period_ID());
reverse.setDateAcct(getDateAcct()); reverse.setDateAcct(getDateAcct());
// Reverse indicator // Reverse indicator
StringBuilder description; StringBuilder msgd = new StringBuilder("(->").append(getDocumentNo()).append(")");
if (reverse.getDescription() == null) reverse.addDescription(msgd.toString());
description = new StringBuilder("** ").append(getDocumentNo()).append(" **");
else
description = new StringBuilder(reverse.getDescription()).append(" ** ").append(getDocumentNo()).append(" **");
reverse.setDescription(description.toString());
//[ 1948157 ] //[ 1948157 ]
reverse.setReversal_ID(getGL_JournalBatch_ID()); reverse.setReversal_ID(getGL_JournalBatch_ID());
reverse.saveEx(); reverse.saveEx();
//
// Reverse Journals // Reverse Journals
for (int i = 0; i < journals.length; i++) for (int i = 0; i < journals.length; i++)
@ -652,9 +647,26 @@ public class MJournalBatch extends X_GL_JournalBatch implements DocAction
} }
journal.saveEx(); journal.saveEx();
} }
//
if (!reverse.processIt(DocAction.ACTION_Complete))
{
m_processMsg = "Reversal ERROR: " + reverse.getProcessMsg();
return false;
}
reverse.closeIt();
reverse.setProcessing(false);
reverse.setDocStatus(DOCSTATUS_Reversed);
reverse.setDocAction(DOCACTION_None);
reverse.saveEx(get_TrxName());
//
msgd = new StringBuilder("(").append(reverse.getDocumentNo()).append("<-)");
addDescription(msgd.toString());
setProcessed(true);
//[ 1948157 ] //[ 1948157 ]
setReversal_ID(reverse.getGL_JournalBatch_ID()); setReversal_ID(reverse.getGL_JournalBatch_ID());
setDocStatus(DOCSTATUS_Reversed);
setDocAction(DOCACTION_None);
saveEx(); saveEx();
// After reverseCorrect // After reverseCorrect
m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_REVERSECORRECT); m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_REVERSECORRECT);
@ -699,12 +711,9 @@ public class MJournalBatch extends X_GL_JournalBatch implements DocAction
reverse.setDateDoc(new Timestamp(System.currentTimeMillis())); reverse.setDateDoc(new Timestamp(System.currentTimeMillis()));
reverse.setDateAcct(reverse.getDateDoc()); reverse.setDateAcct(reverse.getDateDoc());
// Reverse indicator // Reverse indicator
StringBuilder description; StringBuilder msgd = new StringBuilder("(->").append(getDocumentNo()).append(")");
if (reverse.getDescription() == null) reverse.addDescription(msgd.toString());
description = new StringBuilder("** ").append(getDocumentNo()).append(" **"); reverse.setReversal_ID(getGL_JournalBatch_ID());
else
description = new StringBuilder(reverse.getDescription()).append(" ** ").append(getDocumentNo()).append(" **");
reverse.setDescription(description.toString());
reverse.saveEx(); reverse.saveEx();
// Reverse Journals // Reverse Journals
@ -720,6 +729,26 @@ public class MJournalBatch extends X_GL_JournalBatch implements DocAction
} }
journal.saveEx(); journal.saveEx();
} }
//
if (!reverse.processIt(DocAction.ACTION_Complete))
{
m_processMsg = "Reversal ERROR: " + reverse.getProcessMsg();
return false;
}
reverse.closeIt();
reverse.setProcessing(false);
reverse.setDocStatus(DOCSTATUS_Reversed);
reverse.setDocAction(DOCACTION_None);
reverse.saveEx(get_TrxName());
//
msgd = new StringBuilder("(").append(reverse.getDocumentNo()).append("<-)");
addDescription(msgd.toString());
setProcessed(true);
setReversal_ID(reverse.getGL_JournalBatch_ID());
setDocStatus(DOCSTATUS_Reversed);
setDocAction(DOCACTION_None);
saveEx();
// After reverseAccrual // After reverseAccrual
m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_REVERSEACCRUAL); m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_REVERSEACCRUAL);
if (m_processMsg != null) if (m_processMsg != null)
@ -872,4 +901,14 @@ public class MJournalBatch extends X_GL_JournalBatch implements DocAction
return getTotalDr(); return getTotalDr();
} // getApprovalAmt } // getApprovalAmt
public void addDescription (String description)
{
String desc = getDescription();
if (desc == null)
setDescription(description);
else{
StringBuilder msgd = new StringBuilder(desc).append(" | ").append(description);
setDescription(msgd.toString());
}
}
} // MJournalBatch } // MJournalBatch