details: https://code.openbravo.com/erp/devel/main/rev/a73f9a4dc4b8 changeset: 13643: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/main/rev/d9a96d401f20 changeset: 13644: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. details: https://code.openbravo.com/erp/devel/main/rev/ddf08e2b22d9 changeset: 13645:ddf08e2b22d9 user: Martin Taal <martin.taal <at> openbravo.com> date: Thu Sep 01 12:00:38 2011 +0200 summary: Related to issue 18227: Closing a tab doesn't release all objects Prevent recompute of fields when datasource is set in form Create/initialize datasources in the init method and not as part of properties (results in too early initialization) Destroy datasources which are not shared when destroying a field Explicitly remove old tab pane when a new tab pane gets set details: https://code.openbravo.com/erp/devel/main/rev/b21bbf743e3f changeset: 13646:b21bbf743e3f user: Martin Taal <martin.taal <at> openbravo.com> date: Thu Sep 01 12:32:58 2011 +0200 summary: Related to issue 18227: Closing a tab doesn't release all objects Destroy of removed tab pane was already implemented in super, making use of its implementation details: https://code.openbravo.com/erp/devel/main/rev/14d243b5df4a changeset: 13647:14d243b5df4a user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Thu Sep 01 13:25:46 2011 +0200 summary: Fixed issue 18340. If an element has an onchange with selectCombo, the selectCombo will be executed on undo. details: https://code.openbravo.com/erp/devel/main/rev/0af160c34527 changeset: 13648:0af160c34527 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Sep 01 14:34:57 2011 +0200 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/db224c38b097 changeset: 13649:db224c38b097 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Thu Sep 01 16:46:56 2011 +0200 summary: Fixes issue 18337: Standard (UI Pattern) process definition does not allow collecting record, id-s of multiple selection (grid view).Now, button are only visible if you have only one record selected. details: https://code.openbravo.com/erp/devel/main/rev/aec4c4f24da5 changeset: 13650:aec4c4f24da5 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Thu Sep 01 16:47:28 2011 +0200 summary: Fixed issue 17176. Removed unnecesary left keyword. details: https://code.openbravo.com/erp/devel/main/rev/367eaab45edd changeset: 13651:367eaab45edd user: Martin Taal <martin.taal <at> openbravo.com> date: Fri Sep 02 10:02:14 2011 +0200 summary: Fixes issue 18227: Closing a tab doesn't release all objects Added method to Layout to make it possible to destroy and remove members, use this method from all applicable locations details: https://code.openbravo.com/erp/devel/main/rev/14ab9bf2c14e changeset: 13652:14ab9bf2c14e user: Martin Taal <martin.taal <at> openbravo.com> date: Fri Sep 02 11:19:10 2011 +0200 summary: Related to issue 18227: Closing a tab doesn't release all objects Solved memory leak in window personalization and with record components details: https://code.openbravo.com/erp/devel/main/rev/536749f809ab changeset: 13653:536749f809ab user: Xabier Merino <xabier.merino <at> openbravo.com> date: Fri Sep 02 10:00:44 2011 +0200 summary: Fixed issue 18420: Attribute set - Serial number control does not appear details: https://code.openbravo.com/erp/devel/main/rev/f1065162150e changeset: 13654:f1065162150e user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Sep 02 20:05:01 2011 +0200 summary: CI: update AD_MODULE to version 13653 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js | 20 ++++-- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-form.js.ftl | 9 ++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 13 ++++ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 9 ++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-help-about-widget.js | 4 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js | 5 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization-treegrid.js | 7 ++ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js | 15 +++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js | 8 ++- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- 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 ++- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-community-branding-widget.js | 2 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js | 14 +++- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-showparameter-widget.js | 2 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js | 1 + modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/templates/datasource.ftl | 1 + modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 ++-- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/templates/selector-as-link.ftl | 8 ++- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/templates/selector.ftl | 8 ++- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 22 ++++--- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js | 28 ++++++++++ modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 ++++---- modules/org.openbravo.v3/src-db/database/configScript.xml | 4 - modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 18 +++--- src-db/database/sourcedata/AD_MODULE.xml | 4 +- web/js/utils.js | 15 +++++ 69 files changed, 267 insertions(+), 134 deletions(-) diffs (truncated from 1538 to 300 lines): diff -r 7f5542d9f0b5 -r f1065162150e modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Aug 31 13:05:48 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Sep 02 20:05:01 2011 +0200 @@ -6,7 +6,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.13627]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.13653]]></VERSION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements. If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP> diff -r 7f5542d9f0b5 -r f1065162150e modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Aug 31 13:05:48 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Sep 02 20:05:01 2011 +0200 @@ -7,7 +7,7 @@ <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID> -<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.13627]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.13653]]></STARTVERSION> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--B97FC854C6DD41E692161585645A900F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--B97FC854C6DD41E692161585645A900F--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.13627]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.13653]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 7f5542d9f0b5 -r f1065162150e 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 Fri Sep 02 20:05:01 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 f1065162150e modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Wed Aug 31 13:05:48 2011 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Fri Sep 02 20:05:01 2011 +0200 @@ -6,7 +6,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME> -<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.13627]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.13653]]></VERSION> <!--C70732EA90A14EC0916078B85CC33D2D--> <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION> <!--C70732EA90A14EC0916078B85CC33D2D--> <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP> <!--C70732EA90A14EC0916078B85CC33D2D--> <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL> diff -r 7f5542d9f0b5 -r f1065162150e modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Aug 31 13:05:48 2011 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Sep 02 20:05:01 2011 +0200 @@ -7,7 +7,7 @@ <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.13627]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.13653]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 7f5542d9f0b5 -r f1065162150e modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Wed Aug 31 13:05:48 2011 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Fri Sep 02 20:05:01 2011 +0200 @@ -6,7 +6,7 @@ <!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface Application]]></NAME> -<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.13627]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.13653]]></VERSION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL> diff -r 7f5542d9f0b5 -r f1065162150e modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Aug 31 13:05:48 2011 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Sep 02 20:05:01 2011 +0200 @@ -7,7 +7,7 @@ <!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID> -<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.13627]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.13653]]></STARTVERSION> <!--15D7CE8D95D043189162DBABA54A1F61--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--60A170212F36499D83B8AD38D01F46B3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID> -<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.13627]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.13653]]></STARTVERSION> <!--60A170212F36499D83B8AD38D01F46B3--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -35,7 +35,7 @@ <!--824D60CB352E4099B1D8C903CA139DAE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.13627]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.13653]]></STARTVERSION> <!--824D60CB352E4099B1D8C903CA139DAE--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -49,7 +49,7 @@ <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID> -<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.13627]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.13653]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 7f5542d9f0b5 -r f1065162150e modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java Wed Aug 31 13:05:48 2011 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java Fri Sep 02 20:05:01 2011 +0200 @@ -277,8 +277,8 @@ @SuppressWarnings("unchecked") private void linkWindows() { // collect the valid tabs/windows - final String tabsHql = "select t from ADTab t left join fetch t.window left join fetch t.table, ADWindowAccess awa " - + "where awa.role.id=:roleId and t.active = true and t.window.active = true and t.window = awa.window and t.tabLevel = 0"; + final String tabsHql = "select t from ADTab t join fetch t.window w join fetch t.table, ADWindowAccess awa " + + "where awa.role.id=:roleId and t.active = true and w.active = true and w = awa.window and t.tabLevel = 0"; final Query tabsQry = OBDal.getInstance().getSession().createQuery(tabsHql); tabsQry.setParameter("roleId", OBContext.getOBContext().getRole().getId()); // force a load diff -r 7f5542d9f0b5 -r f1065162150e modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-form.js.ftl --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-form.js.ftl Wed Aug 31 13:05:48 2011 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-form.js.ftl Fri Sep 02 20:05:01 2011 +0200 @@ -19,7 +19,14 @@ */ --> { - fields: [ + // use theFields instead of fields, when the form + // gets created, initialized, the datasource is + // set (ob-standard-view.js buildStructure) + // causing re-initialization of the fields, + // removing the current ones and recreating new ones + // by using theFields, the form initially does not + // have fields, which prevents this initial destroy step + theFields: [ <#list data.fields as field> <@createField field/><#if field_has_next>,</#if> </#list> diff -r 7f5542d9f0b5 -r f1065162150e modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js Wed Aug 31 13:05:48 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js Fri Sep 02 20:05:01 2011 +0200 @@ -288,13 +288,13 @@ addIcon : function(icon) { // remove any existing icon or spacer - this.leftStatusBar.removeMember(this.leftStatusBar.members[0]); + this.leftStatusBar.destroyAndRemoveMembers(this.leftStatusBar.members[0]); this.leftStatusBar.addMember(icon, 0); }, removeIcon : function() { // remove any existing icon or spacer - this.leftStatusBar.removeMember(this.leftStatusBar.members[0]); + this.leftStatusBar.destroyAndRemoveMembers(this.leftStatusBar.members[0]); this.leftStatusBar.addMember(this.spacer, 0); }, diff -r 7f5542d9f0b5 -r f1065162150e modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js Wed Aug 31 13:05:48 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js Fri Sep 02 20:05:01 2011 +0200 @@ -220,7 +220,7 @@ fillAttachments: function(attachments){ this.savedAttachments = attachments; - this.removeMembers(this.getMembers()); + this.destroyAndRemoveMembers(this.getMembers()); var hLayout = isc.HLayout.create(); if(this.getForm().isNew){ return; diff -r 7f5542d9f0b5 -r f1065162150e modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js Wed Aug 31 13:05:48 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js Fri Sep 02 20:05:01 2011 +0200 @@ -90,7 +90,8 @@ // is used to keep track of the original simple objects // used to create fields - this._originalFields = isc.shallowClone(this.fields); + // note fields can be in fields or theFields + this._originalFields = isc.shallowClone(this.fields || this.theFields); this.Super('initWidget', arguments); @@ -1562,7 +1563,7 @@ // caching reference to all DS of Items for (i = 0; i < len; i++) { item = items[i]; - ds = items && (item.dataSource || item.optionDataSource); + ds = item ? item.dataSource || item.optionDataSource : null; if(ds) { dataSources.push(ds); @@ -1570,7 +1571,6 @@ } this.Super('destroy', arguments); - len = dataSources.length; // Destroying DS not managed by DynamicForm.destroy diff -r 7f5542d9f0b5 -r f1065162150e modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js Wed Aug 31 13:05:48 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js Fri Sep 02 20:05:01 2011 +0200 @@ -331,6 +331,19 @@ this.Super('initWidget', arguments); }, + // http://forums.smartclient.com/showthread.php?p=72177#post72177 + destroy: function() { + var i, components; + this.Super('destroy', arguments); + + components = this.getRecordComponentPool(); + if (components) { + for (i = 0; i < components.length; i++) { + components[i].destroy(); + } + } + }, + clearFilter: function(keepFilterClause, noPerformAction){ var i = 0, fld; if (!keepFilterClause) { diff -r 7f5542d9f0b5 -r f1065162150e modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Wed Aug 31 13:05:48 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Fri Sep 02 20:05:01 2011 +0200 @@ -258,7 +258,14 @@ // setDataSource executes setFields which replaces the current fields // We don't want to destroy the associated DataSource objects this.viewForm.destroyItemObjects = false; - this.viewForm.setDataSource(this.dataSource, this.viewForm.fields); + + // initially the viewForm.fields is not set, the fields are + // in this.viewForm.theFields, this to prevent too early creation of fields + // i.e. they are recreated when setting the datasource, as is done + // here. ------------------------------------------------------------------------------ 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
