details: https://code.openbravo.com/erp/devel/pi/rev/a73f9a4dc4b8 changeset: 13642:a73f9a4dc4b8 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Thu Sep 01 11:07:19 2011 +0200 summary: [OBCLKER]Add Format.xml formats to OB.Format.formats object.
details: https://code.openbravo.com/erp/devel/pi/rev/d9a96d401f20 changeset: 13643:d9a96d401f20 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Thu Sep 01 11:08:07 2011 +0200 summary: Fixed issue 17924.Properly format numbers on FIN_Utilities using euroEdition. diffstat: modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js | 20 ++++++--- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ApplicationComponent.java | 7 +++ modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl | 7 +++- 3 files changed, 26 insertions(+), 8 deletions(-) diffs (104 lines): diff -r 7f5542d9f0b5 -r d9a96d401f20 modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js --- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js Wed Aug 31 13:05:48 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js Thu Sep 01 11:08:07 2011 +0200 @@ -41,10 +41,16 @@ if (!isCreditAllowed) { frm.inpUseCredit.checked = false; } - globalMaskNumeric = getDefaultMaskNumeric(); globalDecSeparator = getGlobalDecSeparator(); globalGroupSeparator = getGlobalGroupSeparator(); globalGroupInterval = getGlobalGroupInterval(); + + globalMaskNumeric = formatNameToMask('euroEdition'); + if (!globalMaskNumeric && OB && OB.Format && OB.Format.formats) { + globalMaskNumeric = OB.Format.formats.euroEdition; + globalMaskNumeric = returnMaskChange(globalMaskNumeric, '.', ',', globalDecSeparator, globalGroupSeparator); + } + globalMaskNumeric = globalMaskNumeric || getDefaultMaskNumeric(); } function processLabels() { @@ -303,8 +309,8 @@ } function updateDifference() { - var expected = (frm.inpExpectedPayment && frm.inpExpectedPayment.value) ? frm.inpExpectedPayment.value : 0, - total = (frm.inpTotal && frm.inpTotal.value) ? frm.inpTotal.value : 0, + var expected = (frm.inpExpectedPayment && frm.inpExpectedPayment.value) ? frm.inpExpectedPayment.value : applyFormat('0'), + total = (frm.inpTotal && frm.inpTotal.value) ? frm.inpTotal.value : applyFormat('0'), amount = total, invoicedAmount = total; @@ -323,7 +329,7 @@ } else if ( compareWithSign(amount, '>', total) ) { frm.inpDifference.value = subtract(amount, total); } else { - frm.inpDifference.value = 0; + frm.inpDifference.value = applyFormat('0'); } document.getElementById('paramDifference').innerHTML = frm.inpDifference.value; displayLogicElement('sectionDifference', ( compare(expected, '!=', total) || compareWithSign(amount, '>', total) ) ); @@ -346,7 +352,7 @@ function updateTotal() { var chk = frm.inpScheduledPaymentDetailId; - var total = 0, i, invalidSpan; + var total = applyFormat('0'), i, invalidSpan; var scheduledPaymentDetailId, pendingAmount, amount, isAnyChecked = false; var selectedBusinessPartners = { numberofitems: 0, @@ -548,9 +554,9 @@ var chk = frm.inpScheduledPaymentDetailId; var recordAmount, i; - frm.inpExpectedPayment.value = '0'; + frm.inpExpectedPayment.value = applyFormat('0'); if (isGLItemEnabled) { - frm.inpExpectedPayment.value = frm.inpGLSumAmount.value || '0'; + frm.inpExpectedPayment.value = frm.inpGLSumAmount.value || applyFormat('0'); } if (!chk) { return; diff -r 7f5542d9f0b5 -r d9a96d401f20 modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ApplicationComponent.java --- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ApplicationComponent.java Wed Aug 31 13:05:48 2011 +0200 +++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ApplicationComponent.java Thu Sep 01 11:08:07 2011 +0200 @@ -19,7 +19,9 @@ package org.openbravo.client.kernel; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Properties; import org.openbravo.base.session.OBPropertiesProvider; @@ -64,6 +66,11 @@ return getFormatDefinition().getDecimalSymbol(); } + @SuppressWarnings("unchecked") + public Map<String, String> getFormats() { + return (HashMap<String, String>) RequestContext.get().getSessionAttribute("#formatMap"); + } + public boolean isTestEnvironment() { final String testEnvironmentStr = OBPropertiesProvider.getInstance().getOpenbravoProperties() .getProperty("test.environment"); diff -r 7f5542d9f0b5 -r d9a96d401f20 modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl --- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl Wed Aug 31 13:05:48 2011 +0200 +++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl Thu Sep 01 11:08:07 2011 +0200 @@ -38,7 +38,12 @@ defaultDecimalSymbol: '${data.defaultDecimalSymbol}', defaultNumericMask: '${data.defaultNumericMask}', date: '${data.dateFormat}', - dateTime: '${data.dateTimeFormat}' + dateTime: '${data.dateTimeFormat}', + formats: { + <#list data.formats?keys as key> + '${key}': '${data.formats[key]}'<#if key_has_next>,</#if> + </#list> + } }, Constants : { ------------------------------------------------------------------------------ Special Offer -- Download ArcSight Logger for FREE! Finally, a world-class log management solution at an even better price-free! And you'll get a free "Love Thy Logs" t-shirt when you download Logger. Secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsisghtdev2dev _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
