details: https://code.openbravo.com/erp/devel/pi/rev/d37ba4a63306 changeset: 16861:d37ba4a63306 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Tue Jun 12 17:25:20 2012 +0200 summary: Fixed bug 20735 Display correctly currency in add payment from transactions
details: https://code.openbravo.com/erp/devel/pi/rev/7d4e36b9162b changeset: 16862:7d4e36b9162b user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Wed Jun 13 10:42:53 2012 +0200 summary: Fixed bug 20738 Add logic to catch NaN in Add payment from transactions Add logic to catch NaN in Add payment from transactions when using multicurrency. details: https://code.openbravo.com/erp/devel/pi/rev/938edd27d05b changeset: 16863:938edd27d05b user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Mon Jun 18 18:50:42 2012 +0200 summary: Related to issue 20738: empty string in js is false details: https://code.openbravo.com/erp/devel/pi/rev/2a58516b70ca changeset: 16864:2a58516b70ca user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Mon Jun 18 19:07:58 2012 +0200 summary: Related to issue 20735: do not force a loadGrid, only apply readonly logic diffstat: modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html | 13 ++++++++- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js | 12 +++++++- 2 files changed, 21 insertions(+), 4 deletions(-) diffs (64 lines): diff -r ba2db048e983 -r 2a58516b70ca modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html Mon Jun 18 16:06:45 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html Mon Jun 18 19:07:58 2012 +0200 @@ -627,12 +627,12 @@ function currencyOnChange() { if( isPaymentMethodMulticurrency() ) { - changeClass('paramCurrencyId','ComboKeyReadOnly ', 'ComboKey dojoValidateValid required ') + changeClass('paramCurrencyId','ComboKeyReadOnly ', 'ComboKey dojoValidateValid required ',true); loadGridList(); return refreshExchangeRate(); } else { // Reset currency - changeClass('paramCurrencyId', 'ComboKey dojoValidateValid required ', 'ComboKeyReadOnly '); + changeClass('paramCurrencyId', 'ComboKey dojoValidateValid required ', 'ComboKeyReadOnly ',true); selectCombo(document.getElementById('paramCurrencyId'), document.getElementById('paramFinancialAccountCurrencyId').value); document.getElementById('paramExchangeRate').value='1'; updateConvertedAmounts(); @@ -641,6 +641,14 @@ } } +function currencyOnChangeOnLoad() { + if( isPaymentMethodMulticurrency() ) { + changeClass('paramCurrencyId','ComboKeyReadOnly ', 'ComboKey dojoValidateValid required ',true); + } else { + changeClass('paramCurrencyId', 'ComboKey dojoValidateValid required ', 'ComboKeyReadOnly ',true); + } +} + function callBackExchangeRate(paramXMLParticular, XMLHttpRequestObj) { if (getReadyStateHandler(XMLHttpRequestObj)) { try { @@ -718,6 +726,7 @@ displayLogicElement('sectionDifference', false); displayLogicElement('sectionDifferenceBox', false); displayLogicForCredit(); + currencyOnChangeOnLoad(); displayMulticurrencyControls(); resizeAreaCreateFrom(); diff -r ba2db048e983 -r 2a58516b70ca modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js --- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js Mon Jun 18 16:06:45 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js Mon Jun 18 19:07:58 2012 +0200 @@ -290,9 +290,17 @@ exchangeRate.value = ''; } } else { - actualConverted.value = formattedNumberOpTemp(actualPayment.value, '*', exchangeRate.value, roundedMask, globalDecSeparator, globalGroupSeparator, globalGroupInterval); + if (exchangeRate.value) { + actualConverted.value = formattedNumberOpTemp(actualPayment.value, '*', exchangeRate.value, roundedMask, globalDecSeparator, globalGroupSeparator, globalGroupInterval); + } else { + actualConverted.value = applyFormat('0'); + } } - expectedConverted.value = formattedNumberOpTemp(expectedPayment.value, '*', exchangeRate.value, roundedMask, globalDecSeparator, globalGroupSeparator, globalGroupInterval); + if (exchangeRate.value && expectedPayment.value) { + expectedConverted.value = formattedNumberOpTemp(expectedPayment.value, '*', exchangeRate.value, roundedMask, globalDecSeparator, globalGroupSeparator, globalGroupInterval); + } else { + expectedConverted.value = applyFormat('0'); + } } } ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
