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

IDEMPIERE-2766 Error on total open balance when void POS Order with Cash Payment Rule

This commit is contained in:
Carlos Ruiz 2015-08-19 13:40:48 -05:00
parent 9bb61e344f
commit 6d4e756e12
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
org.adempiere.base/src/org/compiere/model/MInvoice.java
View File

@ -2358,23 +2358,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
MPeriod.testPeriodOpen(getCtx(), reversalDate, getC_DocType_ID(), getAD_Org_ID()); MPeriod.testPeriodOpen(getCtx(), reversalDate, getC_DocType_ID(), getAD_Org_ID());
// //
MAllocationHdr[] allocations = MAllocationHdr.getOfInvoice(getCtx(), reverseAllocations(accrual, getC_Invoice_ID());
getC_Invoice_ID(), get_TrxName());
for (int i = 0; i < allocations.length; i++)
{
if (accrual)
{
allocations[i].setDocAction(DocAction.ACTION_Reverse_Accrual);
allocations[i].reverseAccrualIt();
allocations[i].saveEx(get_TrxName());
}
else
{
allocations[i].setDocAction(DocAction.ACTION_Reverse_Correct);
allocations[i].reverseCorrectIt();
allocations[i].saveEx(get_TrxName());
}
}
// Reverse/Delete Matching // Reverse/Delete Matching
if (!isSOTrx()) if (!isSOTrx())
{ {
@ -2462,6 +2446,9 @@ public class MInvoice extends X_C_Invoice implements DocAction
m_processMsg = "Reversal ERROR: " + reversal.getProcessMsg(); m_processMsg = "Reversal ERROR: " + reversal.getProcessMsg();
return null; return null;
} }
//
reverseAllocations(accrual, reversal.getC_Invoice_ID());
reversal.setC_Payment_ID(0); reversal.setC_Payment_ID(0);
reversal.setIsPaid(true); reversal.setIsPaid(true);
reversal.closeIt(); reversal.closeIt();
@ -2529,6 +2516,19 @@ public class MInvoice extends X_C_Invoice implements DocAction
return reversal; return reversal;
} }
private void reverseAllocations(boolean accrual, int invoiceID) {
for (MAllocationHdr allocation : MAllocationHdr.getOfInvoice(getCtx(), invoiceID, get_TrxName())) {
if (accrual) {
allocation.setDocAction(DocAction.ACTION_Reverse_Accrual);
allocation.reverseAccrualIt();
} else {
allocation.setDocAction(DocAction.ACTION_Reverse_Correct);
allocation.reverseCorrectIt();
}
allocation.saveEx(get_TrxName());
}
}
/** /**
* Reverse Accrual - none * Reverse Accrual - none
* @return false * @return false