IDEMPIERE-5591 Payment allocation AP/AR GL postings not zero in alternative schema for invoice REVERSE/CORRECT (#1921)

org.adempiere.base/src/org/compiere/acct/Doc_AllocationHdr.java

@@ -117,6 +117,14 @@ public class Doc_AllocationHdr extends Doc
 				if (payment.isOverrideCurrencyRate())
 					docLine.setCurrencyRate(payment.getCurrencyRate());
 			}
+			else if (line.getC_Invoice_ID() != 0)
+			{
+				MInvoice invoice = new MInvoice (getCtx(), line.getC_Invoice_ID(), getTrxName());
+				int C_ConversionType_ID = invoice.getC_ConversionType_ID();
+				docLine.setC_ConversionType_ID(C_ConversionType_ID);
+				if (invoice.isOverrideCurrencyRate())
+					docLine.setCurrencyRate(invoice.getCurrencyRate());
+			}
 			//
 			if (log.isLoggable(Level.FINE)) log.fine(docLine.toString());
 			list.add (docLine);

org.idempiere.test/src/org/idempiere/test/model/Allocation2ndAcctSchemaTest.java

@@ -1915,7 +1915,7 @@ public class Allocation2ndAcctSchemaTest extends AbstractTestCase {
 		invoice.setDateAcct(date);
 		invoice.setM_PriceList_ID(M_PriceList_ID);
 		invoice.setC_ConversionType_ID(C_ConversionType_ID);
-		invoice.setC_PaymentTerm_ID(105); // Immediate
+		invoice.setC_PaymentTerm_ID(DictionaryIDs.C_PaymentTerm.IMMEDIATE.id); // Immediate
 		invoice.setDocStatus(DocAction.STATUS_Drafted);
 		invoice.setDocAction(DocAction.ACTION_Complete);
 		invoice.saveEx();
@@ -1929,6 +1929,7 @@ public class Allocation2ndAcctSchemaTest extends AbstractTestCase {
 			invoiceLine.setProduct(product);
 		else
 			invoiceLine.setC_Charge_ID(charge.getC_Charge_ID());
+		invoiceLine.setC_Tax_ID(DictionaryIDs.C_Tax.EXEMPT.id);
 		invoiceLine.setQty(qty);
 		invoiceLine.setPrice(price);
 		invoiceLine.saveEx();

org.idempiere.test/src/org/idempiere/test/model/AllocationTest.java

@@ -485,6 +485,94 @@ public class AllocationTest extends AbstractTestCase {
 		}
 	}
 	
+	@Test
+	@ResourceLock(value = MConversionRate.Table_Name)
+	/**
+	 * https://idempiere.atlassian.net/browse/IDEMPIERE-5591
+	 */
+	public void testInvoiceReversePostingWithDiffCurrency() {
+		MBPartner bpartner = MBPartner.get(Env.getCtx(), DictionaryIDs.C_BPartner.C_AND_W.id); // C&W Construction
+		Timestamp date = Env.getContextAsDate(Env.getCtx(), "#Date");
+		
+		int C_ConversionType_ID = DictionaryIDs.C_ConversionType.COMPANY.id; // Company
+		
+		MCurrency usd = MCurrency.get(DictionaryIDs.C_Currency.USD.id); // USD
+		MCurrency euro = MCurrency.get(DictionaryIDs.C_Currency.EUR.id); // EUR
+		BigDecimal eurToUsd = new BigDecimal(0.000063836578);
+		MConversionRate cr = createConversionRate(usd.getC_Currency_ID(), euro.getC_Currency_ID(), C_ConversionType_ID, date, eurToUsd, false);
+		
+		int M_PriceList_ID = DictionaryIDs.M_PriceList.EXPORT.id; // Export in EUR
+		BigDecimal totalLines = new BigDecimal(33300);
+		
+		try {
+			MInvoice invoice = new MInvoice(Env.getCtx(), 0, getTrxName());
+			invoice.setBPartner(bpartner);
+			invoice.setIsSOTrx(false);
+			invoice.setC_DocTypeTarget_ID();
+			invoice.setDateInvoiced(date);
+			invoice.setDateAcct(date);
+			invoice.setM_PriceList_ID(M_PriceList_ID);
+			invoice.setC_ConversionType_ID(C_ConversionType_ID);
+			invoice.setC_PaymentTerm_ID(DictionaryIDs.C_PaymentTerm.IMMEDIATE.id); // Immediate
+			invoice.setDocStatus(DocAction.STATUS_Drafted);
+			invoice.setDocAction(DocAction.ACTION_Complete);
+			invoice.saveEx();
+			
+			MInvoiceLine invoiceLine = new MInvoiceLine(invoice);
+			invoiceLine.setLine(10);
+			invoiceLine.setC_Charge_ID(DictionaryIDs.C_Charge.FREIGHT.id);
+			invoiceLine.setC_Tax_ID(DictionaryIDs.C_Tax.EXEMPT.id);
+			invoiceLine.setQty(BigDecimal.ONE);
+			invoiceLine.setPrice(totalLines);
+			invoiceLine.saveEx();
+			
+			completeDocument(invoice);
+			postDocument(invoice);
+			
+			reverseAccrualDocument(invoice);
+			MInvoice reversalInvoice = new MInvoice(Env.getCtx(), invoice.getReversal_ID(), getTrxName());
+			postDocument(reversalInvoice);
+			
+			MAllocationHdr[] allocations = MAllocationHdr.getOfInvoice(Env.getCtx(), invoice.getC_Invoice_ID(), getTrxName());
+			assertTrue(allocations.length == 1);
+			
+			MAllocationHdr allocation = allocations[0];
+			postDocument(allocation);
+			
+			MAcctSchema[] ass = MAcctSchema.getClientAcctSchema(Env.getCtx(), Env.getAD_Client_ID(Env.getCtx()));
+			for (MAcctSchema as : ass) {
+				if (as.getC_Currency_ID() != usd.getC_Currency_ID())
+					continue;
+				
+				Doc doc = DocManager.getDocument(as, MAllocationHdr.Table_ID, allocation.get_ID(), getTrxName());
+				doc.setC_BPartner_ID(invoice.getC_BPartner_ID());
+				
+				MAccount acctLiability = doc.getAccount(Doc.ACCTTYPE_V_Liability, as);
+				BigDecimal tradeAmtAcct = new BigDecimal(2.13).setScale(usd.getStdPrecision(), RoundingMode.HALF_UP);;
+				
+				String whereClause = MFactAcct.COLUMNNAME_AD_Table_ID + "=" + MAllocationHdr.Table_ID 
+						+ " AND " + MFactAcct.COLUMNNAME_Record_ID + "=" + allocation.get_ID()
+						+ " AND " + MFactAcct.COLUMNNAME_C_AcctSchema_ID + "=" + as.getC_AcctSchema_ID();
+				int[] ids = MFactAcct.getAllIDs(MFactAcct.Table_Name, whereClause, getTrxName());
+				for (int id : ids) {
+					MFactAcct fa = new MFactAcct(Env.getCtx(), id, getTrxName());
+					if (acctLiability.getAccount_ID() == fa.getAccount_ID()) {
+						if (fa.getAmtAcctDr().signum() > 0)
+							assertTrue(fa.getAmtAcctDr().compareTo(tradeAmtAcct) == 0, fa.getAmtAcctDr().toPlainString() + "!=" + tradeAmtAcct.toPlainString());						
+						else if (fa.getAmtAcctDr().signum() < 0)
+							assertTrue(fa.getAmtAcctDr().compareTo(tradeAmtAcct.negate()) == 0, fa.getAmtAcctDr().toPlainString() + "!=" + tradeAmtAcct.negate().toPlainString());						
+						else if (fa.getAmtAcctCr().signum() > 0)
+							assertTrue(fa.getAmtAcctCr().compareTo(tradeAmtAcct) == 0, fa.getAmtAcctCr().toPlainString() + "!=" + tradeAmtAcct.toPlainString());													
+					}				
+				}
+			}
+			
+		} finally {
+			rollback();
+			deleteConversionRate(cr);		
+		}
+	}
+	
 	@Test
 	@ResourceLock(value = MConversionRate.Table_Name)
 	public void testAllocatePaymentPosting() {