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

BF [ 2004203 ] Default conversion type is used always

This commit is contained in:
teo_sarca 2008-06-27 14:59:40 +00:00
parent 4da24b6233
commit 6adcc98adb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/src/org/compiere/model/MInvoice.java
View File

@ -1792,7 +1792,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
MBPartner bp = new MBPartner (getCtx(), getC_BPartner_ID(), get_TrxName()); MBPartner bp = new MBPartner (getCtx(), getC_BPartner_ID(), get_TrxName());
// Update total revenue and balance / credit limit (reversed on AllocationLine.processIt) // Update total revenue and balance / credit limit (reversed on AllocationLine.processIt)
BigDecimal invAmt = MConversionRate.convertBase(getCtx(), getGrandTotal(true), // CM adjusted BigDecimal invAmt = MConversionRate.convertBase(getCtx(), getGrandTotal(true), // CM adjusted
getC_Currency_ID(), getDateAcct(), 0, getAD_Client_ID(), getAD_Org_ID()); getC_Currency_ID(), getDateAcct(), getC_ConversionType_ID(), getAD_Client_ID(), getAD_Org_ID());
if (invAmt == null) if (invAmt == null)
{ {
m_processMsg = "Could not convert C_Currency_ID=" + getC_Currency_ID() m_processMsg = "Could not convert C_Currency_ID=" + getC_Currency_ID()

2
base/src/org/eevolution/process/InvoiceCalculateTax.java
View File

@ -203,7 +203,7 @@ public class InvoiceCalculateTax extends SvrProcess {
MBPartner bp = new MBPartner (Env.getCtx(), i.getC_BPartner_ID(), trx_name); MBPartner bp = new MBPartner (Env.getCtx(), i.getC_BPartner_ID(), trx_name);
// Update total revenue and balance / credit limit (reversed on AllocationLine.processIt) // Update total revenue and balance / credit limit (reversed on AllocationLine.processIt)
BigDecimal invAmt = MConversionRate.convertBase(Env.getCtx(), i.getGrandTotal(true).multiply(new BigDecimal(factor)), // CM adjusted BigDecimal invAmt = MConversionRate.convertBase(Env.getCtx(), i.getGrandTotal(true).multiply(new BigDecimal(factor)), // CM adjusted
i.getC_Currency_ID(), i.getDateAcct(), 0, getAD_Client_ID(), i.getAD_Org_ID()); i.getC_Currency_ID(), i.getDateAcct(), i.getC_ConversionType_ID(), getAD_Client_ID(), i.getAD_Org_ID());
if (invAmt == null) if (invAmt == null)
{ {
return false; return false;