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

IDEMPIERE-3206 Extensibility issues with LCO Allocation Accounting

This commit is contained in:
Carlos Ruiz 2016-09-30 18:05:32 +02:00
parent c624d4ec7d
commit 72a5009f03
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,14 @@ public class DocLine_Allocation extends DocLine
m_DiscountAmt = line.getDiscountAmt(); m_DiscountAmt = line.getDiscountAmt();
m_WriteOffAmt = line.getWriteOffAmt(); m_WriteOffAmt = line.getWriteOffAmt();
m_OverUnderAmt = line.getOverUnderAmt(); m_OverUnderAmt = line.getOverUnderAmt();
// Get Payment Conversion Rate
if (line.getC_Payment_ID() != 0)
{
MPayment payment = new MPayment (doc.getCtx(), line.getC_Payment_ID(), doc.getTrxName());
int C_ConversionType_ID = payment.getC_ConversionType_ID();
this.setC_ConversionType_ID(C_ConversionType_ID);
}
} // DocLine_Allocation } // DocLine_Allocation
private int m_C_Invoice_ID; private int m_C_Invoice_ID;

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

@ -100,14 +100,6 @@ public class Doc_AllocationHdr extends Doc
{ {
MAllocationLine line = lines[i]; MAllocationLine line = lines[i];
DocLine_Allocation docLine = new DocLine_Allocation(line, this); DocLine_Allocation docLine = new DocLine_Allocation(line, this);
// Get Payment Conversion Rate
if (line.getC_Payment_ID() != 0)
{
MPayment payment = new MPayment (getCtx(), line.getC_Payment_ID(), getTrxName());
int C_ConversionType_ID = payment.getC_ConversionType_ID();
docLine.setC_ConversionType_ID(C_ConversionType_ID);
}
// //
if (log.isLoggable(Level.FINE)) log.fine(docLine.toString()); if (log.isLoggable(Level.FINE)) log.fine(docLine.toString());
list.add (docLine); list.add (docLine);

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

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