details: https://code.openbravo.com/erp/devel/pi/rev/b1183f88c4a6
changeset: 20194:b1183f88c4a6
user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at>
openbravo.com>
date: Tue Apr 23 22:28:03 2013 +0530
summary: Fixes issue 23376: Exchange rate is rounded when adding payment for
a transaction
diffstat:
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
| 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diffs (37 lines):
diff -r 53ca1adce250 -r b1183f88c4a6
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
---
a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
Wed Apr 24 10:27:58 2013 +0200
+++
b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
Tue Apr 23 22:28:03 2013 +0530
@@ -286,11 +286,17 @@
var actualConverted = frm.inpActualConverted;
var expectedPayment = frm.inpExpectedPayment;
var actualPayment = frm.inpActualPayment;
+ var exchangeRateValue = exchangeRate.value;
if (actualConverted && expectedConverted && exchangeRate) {
+ actualConverted.value = formattedNumberOpTemp(actualConverted.value,
'round', precision, roundedMask, globalDecSeparator, globalGroupSeparator,
globalGroupInterval);
if (recalcExchangeRate) {
if (actualConverted.value && actualPayment.value) {
if (compare(actualPayment.value, '!=', 0)) {
+ var actualConvertedValue =
OB.Utilities.Number.OBMaskedToJS(actualConverted.value, globalDecSeparator,
globalGroupSeparator);
+ var actualPaymentValue =
OB.Utilities.Number.OBMaskedToJS(actualPayment.value, globalDecSeparator,
globalGroupSeparator);
+ exchangeRateValue =
(actualConvertedValue/actualPaymentValue).toString();
+ exchangeRateValue = exchangeRateValue.replace('.',
globalDecSeparator);
exchangeRate.value = formattedNumberOpTemp(actualConverted.value,
'/', actualPayment.value, roundedMask, globalDecSeparator,
globalGroupSeparator, globalGroupInterval);
}
} else {
@@ -298,13 +304,13 @@
}
} else {
if (exchangeRate.value) {
- actualConverted.value = formattedNumberOpTemp(actualPayment.value,
'*', exchangeRate.value, roundedMask, globalDecSeparator, globalGroupSeparator,
globalGroupInterval);
+ actualConverted.value = formattedNumberOpTemp(actualPayment.value,
'*', exchangeRateValue, roundedMask, globalDecSeparator, globalGroupSeparator,
globalGroupInterval);
} else {
actualConverted.value = applyFormat('0');
}
}
if (exchangeRate.value && expectedPayment.value) {
- expectedConverted.value = formattedNumberOpTemp(expectedPayment.value,
'*', exchangeRate.value, roundedMask, globalDecSeparator, globalGroupSeparator,
globalGroupInterval);
+ expectedConverted.value = formattedNumberOpTemp(expectedPayment.value,
'*', exchangeRateValue, roundedMask, globalDecSeparator, globalGroupSeparator,
globalGroupInterval);
} else {
expectedConverted.value = applyFormat('0');
}
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
