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

Ticket #1003187: IDEMPIERE-1306 Incorrect conversion rate on allocation header

This commit is contained in:
Elaine Tan 2013-09-27 10:41:53 +08:00
parent 0b546eaed7
commit 2f7e416dc1
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.adempiere.base/src/org/compiere/acct/DocLine_Allocation.java
View File

@ -17,8 +17,10 @@
package org.compiere.acct; package org.compiere.acct;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.sql.Timestamp;
import org.compiere.model.MAllocationLine; import org.compiere.model.MAllocationLine;
import org.compiere.model.MPayment;
import org.compiere.util.DB; import org.compiere.util.DB;
/** /**
@ -154,4 +156,16 @@ public class DocLine_Allocation extends DocLine
{ {
return m_C_Charge_ID; 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 } // DocLine_Allocation

2
org.adempiere.base/src/org/compiere/acct/FactLine.java
View File

@ -709,7 +709,7 @@ public final class FactLine extends X_Fact_Acct
Timestamp convDate = getDateAcct(); Timestamp convDate = getDateAcct();
if ( m_doc instanceof Doc_BankStatement ) if ( m_doc instanceof Doc_BankStatement || m_doc instanceof Doc_AllocationHdr )
convDate = m_docLine.getDateConv(); convDate = m_docLine.getDateConv();