From 6adcc98adbb4a8a51e234ff8da7cdaf342be4c54 Mon Sep 17 00:00:00 2001 From: teo_sarca Date: Fri, 27 Jun 2008 14:59:40 +0000 Subject: [PATCH] BF [ 2004203 ] Default conversion type is used always --- base/src/org/compiere/model/MInvoice.java | 2 +- base/src/org/eevolution/process/InvoiceCalculateTax.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/src/org/compiere/model/MInvoice.java b/base/src/org/compiere/model/MInvoice.java index 674a885d84..18b5950964 100644 --- a/base/src/org/compiere/model/MInvoice.java +++ b/base/src/org/compiere/model/MInvoice.java @@ -1792,7 +1792,7 @@ public class MInvoice extends X_C_Invoice implements DocAction MBPartner bp = new MBPartner (getCtx(), getC_BPartner_ID(), get_TrxName()); // Update total revenue and balance / credit limit (reversed on AllocationLine.processIt) 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) { m_processMsg = "Could not convert C_Currency_ID=" + getC_Currency_ID() diff --git a/base/src/org/eevolution/process/InvoiceCalculateTax.java b/base/src/org/eevolution/process/InvoiceCalculateTax.java index 3e6e1631f3..be1cd75276 100644 --- a/base/src/org/eevolution/process/InvoiceCalculateTax.java +++ b/base/src/org/eevolution/process/InvoiceCalculateTax.java @@ -203,7 +203,7 @@ public class InvoiceCalculateTax extends SvrProcess { MBPartner bp = new MBPartner (Env.getCtx(), i.getC_BPartner_ID(), trx_name); // 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 - 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) { return false;