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

Revert revision 2156 

Not Fixed Yet: [ 1691676 ] Duplicate Allocation when you reverse invoice with PR cash
Explanations on tracker
http://sourceforge.net/tracker/index.php?func=detail&aid=1691676&group_id=176962&atid=879332
This commit is contained in:
Carlos Ruiz 2007-04-28 07:01:33 +00:00
parent 9ebb0486aa
commit 52428e8db1
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
base/src/org/compiere/model/MInvoice.java
View File

@ -2011,18 +2011,14 @@ public class MInvoice extends X_C_Invoice implements DocAction
m_processMsg = "@PeriodClosed@"; m_processMsg = "@PeriodClosed@";
return false; return false;
} }
//
if(!getPaymentRule().equals(MInvoice.PAYMENTRULE_Cash)) MAllocationHdr[] allocations = MAllocationHdr.getOfInvoice(getCtx(),
{ getC_Invoice_ID(), get_TrxName());
// for (int i = 0; i < allocations.length; i++)
MAllocationHdr[] allocations = MAllocationHdr.getOfInvoice(getCtx(), {
getC_Invoice_ID(), get_TrxName()); allocations[i].setDocAction(DocAction.ACTION_Reverse_Correct);
for (int i = 0; i < allocations.length; i++) allocations[i].reverseCorrectIt();
{ allocations[i].save(get_TrxName());
allocations[i].setDocAction(DocAction.ACTION_Reverse_Correct);
allocations[i].reverseCorrectIt();
allocations[i].save(get_TrxName());
}
} }
// Reverse/Delete Matching // Reverse/Delete Matching
if (!isSOTrx()) if (!isSOTrx())
@ -2054,7 +2050,6 @@ public class MInvoice extends X_C_Invoice implements DocAction
return false; return false;
} }
reversal.setReversal(true); reversal.setReversal(true);
// Reverse Line Qty // Reverse Line Qty
MInvoiceLine[] rLines = reversal.getLines(false); MInvoiceLine[] rLines = reversal.getLines(false);
@ -2114,8 +2109,6 @@ public class MInvoice extends X_C_Invoice implements DocAction
setC_Payment_ID(0); setC_Payment_ID(0);
setIsPaid(true); setIsPaid(true);
if(!getPaymentRule().equals(MInvoice.PAYMENTRULE_Cash))
{
// Create Allocation // Create Allocation
MAllocationHdr alloc = new MAllocationHdr(getCtx(), false, getDateAcct(), MAllocationHdr alloc = new MAllocationHdr(getCtx(), false, getDateAcct(),
getC_Currency_ID(), getC_Currency_ID(),
@ -2142,7 +2135,6 @@ public class MInvoice extends X_C_Invoice implements DocAction
if (alloc.processIt(DocAction.ACTION_Complete)) if (alloc.processIt(DocAction.ACTION_Complete))
alloc.save(); alloc.save();
} }
}
// After reverseCorrect // After reverseCorrect
m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_REVERSECORRECT); m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_REVERSECORRECT);
if (m_processMsg != null) if (m_processMsg != null)