diff --git a/org.adempiere.base/src/org/compiere/acct/DocLine_Allocation.java b/org.adempiere.base/src/org/compiere/acct/DocLine_Allocation.java index e511d6fc0e..d61a4b5082 100644 --- a/org.adempiere.base/src/org/compiere/acct/DocLine_Allocation.java +++ b/org.adempiere.base/src/org/compiere/acct/DocLine_Allocation.java @@ -17,8 +17,10 @@ package org.compiere.acct; import java.math.BigDecimal; +import java.sql.Timestamp; import org.compiere.model.MAllocationLine; +import org.compiere.model.MPayment; import org.compiere.util.DB; /** @@ -154,4 +156,16 @@ public class DocLine_Allocation extends DocLine { return m_C_Charge_ID; } + + @Override + public Timestamp getDateConv() + { + if (getC_Payment_ID() > 0) + { + MPayment payment = new MPayment(p_po.getCtx(), getC_Payment_ID(), p_po.get_TrxName()); + return payment.getDateAcct(); // use payment date + } + return super.getDateConv(); + } + } // DocLine_Allocation diff --git a/org.adempiere.base/src/org/compiere/acct/FactLine.java b/org.adempiere.base/src/org/compiere/acct/FactLine.java index 5163dc93a7..7b20991cac 100644 --- a/org.adempiere.base/src/org/compiere/acct/FactLine.java +++ b/org.adempiere.base/src/org/compiere/acct/FactLine.java @@ -709,7 +709,7 @@ public final class FactLine extends X_Fact_Acct Timestamp convDate = getDateAcct(); - if ( m_doc instanceof Doc_BankStatement ) + if ( m_doc instanceof Doc_BankStatement || m_doc instanceof Doc_AllocationHdr ) convDate = m_docLine.getDateConv();