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

IDEMPIERE-4200 AR Payment Allocation: Incorrect Currency Balancing Postings

This commit is contained in:
hengsin 2020-03-30 17:21:29 +08:00
parent 41aa4102cd
commit 21cad08cbb
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
org.adempiere.base/src/org/compiere/acct/Doc_AllocationHdr.java
View File

@ -845,7 +845,10 @@ public class Doc_AllocationHdr extends Doc
if (valuesInv != null) { if (valuesInv != null) {
if (invoice.getReversal_ID() == 0 || invoice.get_ID() < invoice.getReversal_ID()) if (invoice.getReversal_ID() == 0 || invoice.get_ID() < invoice.getReversal_ID())
{ {
if ((invoice.isSOTrx() && !invoice.isCreditMemo()) || (!invoice.isSOTrx() && invoice.isCreditMemo())) { if ((invoice.isSOTrx() && invoice.getGrandTotal().signum() >= 0 && !invoice.isCreditMemo())
|| (invoice.isSOTrx() && invoice.getGrandTotal().signum() < 0 && invoice.isCreditMemo())
|| (!invoice.isSOTrx() && invoice.getGrandTotal().signum() >= 0 && invoice.isCreditMemo())
|| (!invoice.isSOTrx() && invoice.getGrandTotal().signum() < 0 && !invoice.isCreditMemo())) {
invoiceSource = (BigDecimal) valuesInv.get(0); // AmtSourceDr invoiceSource = (BigDecimal) valuesInv.get(0); // AmtSourceDr
invoiceAccounted = (BigDecimal) valuesInv.get(1); // AmtAcctDr invoiceAccounted = (BigDecimal) valuesInv.get(1); // AmtAcctDr
} else { } else {
@ -855,7 +858,10 @@ public class Doc_AllocationHdr extends Doc
} }
else else
{ {
if ((invoice.isSOTrx() && !invoice.isCreditMemo()) || (!invoice.isSOTrx() && invoice.isCreditMemo())) { if ((invoice.isSOTrx() && invoice.getGrandTotal().signum() >= 0 && !invoice.isCreditMemo())
|| (invoice.isSOTrx() && invoice.getGrandTotal().signum() < 0 && invoice.isCreditMemo())
|| (!invoice.isSOTrx() && invoice.getGrandTotal().signum() >= 0 && invoice.isCreditMemo())
|| (!invoice.isSOTrx() && invoice.getGrandTotal().signum() < 0 && !invoice.isCreditMemo())) {
invoiceSource = (BigDecimal) valuesInv.get(2); // AmtSourceCr invoiceSource = (BigDecimal) valuesInv.get(2); // AmtSourceCr
invoiceAccounted = (BigDecimal) valuesInv.get(3); // AmtAcctCr invoiceAccounted = (BigDecimal) valuesInv.get(3); // AmtAcctCr
} else { } else {
@ -912,7 +918,10 @@ public class Doc_AllocationHdr extends Doc
MAccount loss = MAccount.get (as.getCtx(), as.getAcctSchemaDefault().getRealizedLoss_Acct()); MAccount loss = MAccount.get (as.getCtx(), as.getAcctSchemaDefault().getRealizedLoss_Acct());
// //
if ((invoice.isSOTrx() && !invoice.isCreditMemo()) || (!invoice.isSOTrx() && invoice.isCreditMemo())) if ((invoice.isSOTrx() && invoice.getGrandTotal().signum() >= 0 && !invoice.isCreditMemo())
|| (invoice.isSOTrx() && invoice.getGrandTotal().signum() < 0 && invoice.isCreditMemo())
|| (!invoice.isSOTrx() && invoice.getGrandTotal().signum() >= 0 && invoice.isCreditMemo())
|| (!invoice.isSOTrx() && invoice.getGrandTotal().signum() < 0 && !invoice.isCreditMemo()))
{ {
FactLine fl = fact.createLine (line, loss, gain, as.getC_Currency_ID(), acctDifference); FactLine fl = fact.createLine (line, loss, gain, as.getC_Currency_ID(), acctDifference);
fl.setDescription(description.toString()); fl.setDescription(description.toString());
@ -1080,7 +1089,10 @@ public class Doc_AllocationHdr extends Doc
BigDecimal invoiceAccounted = null; BigDecimal invoiceAccounted = null;
if (invoice.getReversal_ID() == 0 || invoice.get_ID() < invoice.getReversal_ID()) if (invoice.getReversal_ID() == 0 || invoice.get_ID() < invoice.getReversal_ID())
{ {
if ((invoice.isSOTrx() && !invoice.isCreditMemo()) || (!invoice.isSOTrx() && invoice.isCreditMemo())) { if ((invoice.isSOTrx() && invoice.getGrandTotal().signum() >= 0 && !invoice.isCreditMemo())
|| (invoice.isSOTrx() && invoice.getGrandTotal().signum() < 0 && invoice.isCreditMemo())
|| (!invoice.isSOTrx() && invoice.getGrandTotal().signum() >= 0 && invoice.isCreditMemo())
|| (!invoice.isSOTrx() && invoice.getGrandTotal().signum() < 0 && !invoice.isCreditMemo())) {
invoiceSource = (BigDecimal) valuesInv.get(0); // AmtSourceDr invoiceSource = (BigDecimal) valuesInv.get(0); // AmtSourceDr
invoiceAccounted = (BigDecimal) valuesInv.get(1); // AmtAcctDr invoiceAccounted = (BigDecimal) valuesInv.get(1); // AmtAcctDr
} else { } else {
@ -1090,7 +1102,10 @@ public class Doc_AllocationHdr extends Doc
} }
else else
{ {
if ((invoice.isSOTrx() && !invoice.isCreditMemo()) || (!invoice.isSOTrx() && invoice.isCreditMemo())) { if ((invoice.isSOTrx() && invoice.getGrandTotal().signum() >= 0 && !invoice.isCreditMemo())
|| (invoice.isSOTrx() && invoice.getGrandTotal().signum() < 0 && invoice.isCreditMemo())
|| (!invoice.isSOTrx() && invoice.getGrandTotal().signum() >= 0 && invoice.isCreditMemo())
|| (!invoice.isSOTrx() && invoice.getGrandTotal().signum() < 0 && !invoice.isCreditMemo())) {
invoiceSource = (BigDecimal) valuesInv.get(2); // AmtSourceCr invoiceSource = (BigDecimal) valuesInv.get(2); // AmtSourceCr
invoiceAccounted = (BigDecimal) valuesInv.get(3); // AmtAcctCr invoiceAccounted = (BigDecimal) valuesInv.get(3); // AmtAcctCr
} else { } else {
@ -1199,12 +1214,12 @@ public class Doc_AllocationHdr extends Doc
{ {
if (totalAmtAcctDr.compareTo(totalAmtAcctCr) > 0) if (totalAmtAcctDr.compareTo(totalAmtAcctCr) > 0)
{ {
allocateSource = allocateSource.add(totalAmtSourceDr); allocateSource = allocateSource.add(totalAmtSourceDr).subtract(totalAmtSourceCr);
allocateAccounted = allocateAccounted.add(totalAmtAcctDr).subtract(totalAmtAcctCr); allocateAccounted = allocateAccounted.add(totalAmtAcctDr).subtract(totalAmtAcctCr);
} }
else else
{ {
allocateSource = allocateSource.add(totalAmtSourceCr); allocateSource = allocateSource.add(totalAmtSourceCr).subtract(totalAmtSourceDr);
allocateAccounted = allocateAccounted.add(totalAmtAcctCr).subtract(totalAmtAcctDr); allocateAccounted = allocateAccounted.add(totalAmtAcctCr).subtract(totalAmtAcctDr);
} }
} }
@ -1335,12 +1350,15 @@ public class Doc_AllocationHdr extends Doc
if (acctDifference == null || acctDifference.signum() == 0) if (acctDifference == null || acctDifference.signum() == 0)
{ {
log.fine("No Difference"); log.fine("No Difference");
return null; continue;
} }
// //
Integer C_AllocationLine_ID = htInvAllocLine.get(invoice.getC_Invoice_ID()); Integer C_AllocationLine_ID = htInvAllocLine.get(invoice.getC_Invoice_ID());
if ((invoice.isSOTrx() && !invoice.isCreditMemo()) || (!invoice.isSOTrx() && invoice.isCreditMemo())) if ((invoice.isSOTrx() && invoice.getGrandTotal().signum() >= 0 && !invoice.isCreditMemo())
|| (invoice.isSOTrx() && invoice.getGrandTotal().signum() < 0 && invoice.isCreditMemo())
|| (!invoice.isSOTrx() && invoice.getGrandTotal().signum() >= 0 && invoice.isCreditMemo())
|| (!invoice.isSOTrx() && invoice.getGrandTotal().signum() < 0 && !invoice.isCreditMemo()))
{ {
FactLine fl = fact.createLine (null, acct, as.getC_Currency_ID(), acctDifference); FactLine fl = fact.createLine (null, acct, as.getC_Currency_ID(), acctDifference);
fl.setDescription(description.toString()); fl.setDescription(description.toString());
@ -1525,12 +1543,12 @@ public class Doc_AllocationHdr extends Doc
{ {
if (totalAmtAcctDr.compareTo(totalAmtAcctCr) > 0) if (totalAmtAcctDr.compareTo(totalAmtAcctCr) > 0)
{ {
allocateSource = allocateSource.add(totalAmtSourceDr); allocateSource = allocateSource.add(totalAmtSourceDr).subtract(totalAmtSourceCr);
allocateAccounted = allocateAccounted.add(totalAmtAcctDr).subtract(totalAmtAcctCr); allocateAccounted = allocateAccounted.add(totalAmtAcctDr).subtract(totalAmtAcctCr);
} }
else else
{ {
allocateSource = allocateSource.add(totalAmtSourceCr); allocateSource = allocateSource.add(totalAmtSourceCr).subtract(totalAmtSourceDr);
allocateAccounted = allocateAccounted.add(totalAmtAcctCr).subtract(totalAmtAcctDr); allocateAccounted = allocateAccounted.add(totalAmtAcctCr).subtract(totalAmtAcctDr);
} }
} }
@ -1665,7 +1683,7 @@ public class Doc_AllocationHdr extends Doc
if (acctDifference == null || acctDifference.signum() == 0) if (acctDifference == null || acctDifference.signum() == 0)
{ {
log.fine("No Difference"); log.fine("No Difference");
return null; continue;
} }
// //