details: https://code.openbravo.com/erp/devel/pi/rev/f7895ff8a467 changeset: 32038:f7895ff8a467 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Apr 24 13:29:33 2017 +0200 summary: [login-static] Prevent request by caching the path of the static JS file
details: https://code.openbravo.com/erp/devel/pi/rev/591b47c5235e changeset: 32039:591b47c5235e user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Apr 25 13:51:26 2017 +0200 summary: [login-static] Keep in cache the script path when not in classic mode details: https://code.openbravo.com/erp/devel/pi/rev/a028e3a279bc changeset: 32040:a028e3a279bc user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Apr 25 14:08:39 2017 +0200 summary: [login-static] Removed optional type tag According to [1] in HTML is better to leave the 'type' tag out. The browser knows what to do. [1] http://javascript.crockford.com/script.html details: https://code.openbravo.com/erp/devel/pi/rev/143121ceb421 changeset: 32041:143121ceb421 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Apr 25 16:28:58 2017 +0200 summary: [login-static] Define staticResourceFilePath variable as final details: https://code.openbravo.com/erp/devel/pi/rev/2ab6810ee955 changeset: 32042:2ab6810ee955 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Apr 25 19:11:35 2017 +0200 summary: [login-static] Cache static files by using a new map in KernelComponentProvider details: https://code.openbravo.com/erp/devel/pi/rev/62af075b78a1 changeset: 32043:62af075b78a1 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Apr 26 10:46:56 2017 +0200 summary: [login-static] Refactor to use a common cache for static resources (js and css) details: https://code.openbravo.com/erp/devel/pi/rev/a01b3b0c39a9 changeset: 32044:a01b3b0c39a9 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Apr 26 13:20:16 2017 +0200 summary: [login-static] The key to cache css resources should depend on some parameters The key used to cache a css resource now depends on: - The application name - The skin parameter - The cssDataUri parameter details: https://code.openbravo.com/erp/devel/pi/rev/0ddc287ff35f changeset: 32045:0ddc287ff35f user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Apr 26 19:13:11 2017 +0200 summary: [login-static] Define StaticResourceProvider as an MBean details: https://code.openbravo.com/erp/devel/pi/rev/a5a3dfd08c12 changeset: 32046:a5a3dfd08c12 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Apr 26 19:37:24 2017 +0200 summary: [login-static] Keep static js file name in cache instead of keeping the path details: https://code.openbravo.com/erp/devel/pi/rev/1279955fbef9 changeset: 32047:1279955fbef9 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Apr 27 08:50:17 2017 +0200 summary: [login-static] Fix warning on javadoc generation details: https://code.openbravo.com/erp/devel/pi/rev/d46f974e4222 changeset: 32048:d46f974e4222 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Apr 27 09:44:44 2017 +0200 summary: [login-static] Do not return directly the generated file name details: https://code.openbravo.com/erp/devel/pi/rev/bd99b38ce89b changeset: 32049:bd99b38ce89b user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Apr 27 10:00:42 2017 +0200 summary: [login-static] Do not need to keep mBeanServer as an instance variable On the first call to ManagementFactory.getPlatformMBeanServer() method, it creates the platform MBeanServer. In subsequent calls, it will simply return the initially created platform MBeanServer. For this reason, we do not need to keep an instance variable for the MBeanServer in OBManagementFactory and we can use an static method to register the MBeans. details: https://code.openbravo.com/erp/devel/pi/rev/455ba6aaf30e changeset: 32050:455ba6aaf30e user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue May 02 17:07:37 2017 +0200 summary: [login-static] Do not set appName just to either classic or OB3 details: https://code.openbravo.com/erp/devel/pi/rev/3907af598c85 changeset: 32051:3907af598c85 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue May 02 17:56:19 2017 +0200 summary: [login-static] Improvements related to JMX management - Return a list with the keys of the cached elements instead of the whole map. - Return a list with the name of the static resource files being cached. - Added a new method to clean all elements in cache. - Added log with info level to show information when JMX actions are executed. - Added class javadoc in StaticResourceProviderMBean interface. details: https://code.openbravo.com/erp/devel/pi/rev/7468f5be9239 changeset: 32052:7468f5be9239 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue May 02 18:02:27 2017 +0200 summary: [login-static] Renamed OBManagementFactory to MBeanRegistry details: https://code.openbravo.com/erp/devel/pi/rev/e3259613475d changeset: 32053:e3259613475d user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue May 02 19:01:35 2017 +0200 summary: [login-static] If js file is removed, prevent app fail to load details: https://code.openbravo.com/erp/devel/pi/rev/e486bc1f35a7 changeset: 32054:e486bc1f35a7 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue May 02 19:22:23 2017 +0200 summary: [login-static] Improved log message details: https://code.openbravo.com/erp/devel/pi/rev/7413c33a0410 changeset: 32055:7413c33a0410 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed May 03 10:19:22 2017 +0200 summary: [login-static] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/c615447cfb3d changeset: 32056:c615447cfb3d user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri May 05 12:56:38 2017 +0200 summary: [login-static] Explain how the MBean name is generated details: https://code.openbravo.com/erp/devel/pi/rev/d6ee196a079d changeset: 32057:d6ee196a079d user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri May 05 13:00:48 2017 +0200 summary: [login-static] Provide more information in getStaticResourceFileNames() details: https://code.openbravo.com/erp/devel/pi/rev/ec16d7a3c378 changeset: 32058:ec16d7a3c378 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri May 05 13:11:02 2017 +0200 summary: [login-static] Keep gen folder location cached details: https://code.openbravo.com/erp/devel/pi/rev/657e93b6a7b5 changeset: 32059:657e93b6a7b5 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri May 05 13:20:22 2017 +0200 summary: [login-static] Use JDK7 nio2 alternative instead of java.io.File details: https://code.openbravo.com/erp/devel/pi/rev/554d8c055ea2 changeset: 32060:554d8c055ea2 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon May 08 08:39:29 2017 +0200 summary: fixes issue 35852: Add a mechanism to cache the static resources diffstat: .hgsigs | 1 + .hgtags | 1 + build.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 2 + modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml | 6 +- modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/JdbcExternalConnectionPool.java | 24 +- modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/WeldBaseTest.java | 4 + modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java | 10 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/user-info.js.ftl | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js | 3 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js | 8 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelApplicationInitializer.java | 16 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java | 19 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceProvider.java | 153 ++ modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceProviderMBean.java | 53 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StyleSheetResourceComponent.java | 98 +- modules/org.openbravo.userinterface.skin.250to300Comp/web/org.openbravo.userinterface.skin.250to300Comp/skins/250to300Comp/loginStyles.css | 33 + referencedata/sampledata/QA_Testing/C_DISCOUNT.xml | 14 + referencedata/sampledata/QA_Testing/C_INVOICE_DISCOUNT.xml | 33 + referencedata/sampledata/QA_Testing/C_ORDER_DISCOUNT.xml | 33 + referencedata/sampledata/QA_Testing/M_PRODUCT.xml | 58 +- referencedata/sampledata/QA_Testing/M_PRODUCT_ACCT.xml | 34 + src-db/database/build-create.xml | 15 +- src-db/database/model/functions/C_INVOICE_POST.xml | 1 + src-db/database/model/functions/MRP_PROCESSPLAN_PLAN.xml | 24 +- src-db/database/model/functions/MRP_RUN_EXPLODE.xml | 13 +- src-db/database/model/tables/AD_USER.xml | 4 +- src-db/database/model/tables/C_BPARTNER.xml | 8 +- src-db/database/model/tables/FACT_ACCT.xml | 1 - src-db/database/model/triggers/C_ORDERLINE2_TRG.xml | 29 +- src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml | 2 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 44 + src-db/database/sourcedata/AD_FIELD.xml | 670 +++++++++- src-test/src/org/openbravo/test/datasource/DataSourceSecurity.java | 3 +- src-test/src/org/openbravo/test/datasource/TestComboDatasource.java | 46 +- src-test/src/org/openbravo/test/taxes/TaxesTest.java | 153 +- src-test/src/org/openbravo/test/taxes/data/ProductDataConstants.java | 4 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData185.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData186.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData187.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData188.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData189.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData190.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData191.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData192.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData193.java | 106 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData194.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData195.java | 106 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData196.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData197.java | 106 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData198.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData199.java | 106 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData200.java | 107 + src/index.jsp | 13 + src/org/openbravo/authentication/basic/DefaultAuthenticationManager.java | 8 +- src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 34 +- src/org/openbravo/base/secureApp/LoginHandler.java | 80 +- src/org/openbravo/base/secureApp/OrgTree.java | 116 +- src/org/openbravo/common/actionhandler/RMInOutPickEditLines.java | 8 +- src/org/openbravo/common/actionhandler/RMShipmentPickEditLines.java | 8 +- src/org/openbravo/common/actionhandler/SRMOPickEditLines.java | 5 + src/org/openbravo/common/datasource/ReturnFromCustomerHQLInserter.java | 2 +- src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java | 4 + src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 28 +- src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql | 10 +- src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 4 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 8 +- src/org/openbravo/erpCommon/ad_process/ApplyModules.java | 6 +- src/org/openbravo/erpCommon/ad_reports/MInOutTraceReports_data.xsql | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.java | 25 +- src/org/openbravo/erpCommon/ad_reports/ReportProductMovement_data.xsql | 6 +- src/org/openbravo/erpCommon/info/BusinessPartner_data.xsql | 6 +- src/org/openbravo/erpCommon/security/Login.java | 44 +- src/org/openbravo/erpCommon/security/SessionLogin_data.xsql | 2 +- src/org/openbravo/erpCommon/security/UsageAudit.java | 136 +- src/org/openbravo/erpCommon/utility/DynamicJS.java | 5 +- src/org/openbravo/jmx/MBeanRegistry.java | 69 + src/org/openbravo/service/db/DalConnectionProvider.java | 3 + 79 files changed, 3470 insertions(+), 506 deletions(-) diffs (truncated from 5844 to 300 lines): diff -r 9c529a8c8b8d -r 554d8c055ea2 .hgsigs --- a/.hgsigs Fri Apr 21 14:28:27 2017 +0200 +++ b/.hgsigs Mon May 08 08:39:29 2017 +0200 @@ -209,4 +209,5 @@ fa51600e25b24b2eb3739898d293168ea94748a7 0 iEYEABECAAYFAlh/u8wACgkQCX/oGf+2qkPTnwCfZ29b107GdizLBcC+tzdP3HlnmUUAoN2kMLXvfTYSRLAQG/ziGm5P6kYA 9753e90ea3e81f850f904feb531120b4e185394a 0 iEYEABECAAYFAliG6A8ACgkQCX/oGf+2qkPeeQCg6D9p++eslvzqEVlYK8RS0uzgZNsAoMELVWkte/AM/ilPxZ4vP37myscv a131c85d1d3d55b852f97622ce068baf80b7fe67 0 iEYEABECAAYFAli+qu8ACgkQCX/oGf+2qkNTOACfTznbhwkwUplXd8QjHIuJ7uBJdK4An3KWtbUrBZleCwS1xH3aa2n9p9bM +ff9ea5ead18501d3c6d2f782e38e172be08f8106 0 iEYEABECAAYFAlkDMfYACgkQCX/oGf+2qkPbaACfXUmwNxLBVRvD7cvYA4LinaJkUzAAoI5N7GpMTNy/NYMXetEOhuwPfSO5 3a7510a5ee0b43ac0a65e4eae9b089f42158bbe0 0 iEYEABECAAYFAljGfFgACgkQCX/oGf+2qkOgoQCgx3u3UhiV8NyyiBZLsFjlwicCp1EAoPAl4mZZ6/wURPq39Ef6Rtbe1BRb diff -r 9c529a8c8b8d -r 554d8c055ea2 .hgtags --- a/.hgtags Fri Apr 21 14:28:27 2017 +0200 +++ b/.hgtags Mon May 08 08:39:29 2017 +0200 @@ -220,4 +220,5 @@ b93f495b2cde680cf6558d93d72051429f4b9031 3.0PR16Q4.1 31c79a32ce3a6b555dadb35c70d63113be6312e7 3.0PR16Q4.2 eaeb76d8cd4ec1caf5bf43bc9b4111424d799a03 3.0PR16Q4.3 +3995bf60960bff841f256fa98746aa6aa0f642f2 3.0PR16Q4.4 273c24deef8f21e870cf563073cc653582a9fe9e 3.0PR17Q1 diff -r 9c529a8c8b8d -r 554d8c055ea2 build.xml --- a/build.xml Fri Apr 21 14:28:27 2017 +0200 +++ b/build.xml Mon May 08 08:39:29 2017 +0200 @@ -12,7 +12,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2001-2015 Openbravo SLU +* All portions are Copyright (C) 2001-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -485,7 +485,7 @@ property="test.md5.wad"/> </target> - <target name="compile.complete.development" depends="init" unless="mode.war"> + <target name="compile.complete.development" depends="init, core.lib, wad.lib, trl.lib" unless="mode.war"> <updatesystemstatus v="RB43"/> <ant dir="${base.src}" target="compile.complete.development" inheritAll="true" inheritRefs="true" /> </target> diff -r 9c529a8c8b8d -r 554d8c055ea2 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Fri Apr 21 14:28:27 2017 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Mon May 08 08:39:29 2017 +0200 @@ -489,6 +489,8 @@ WHERE fin_payment_scheduledetail_id = v_scheduledetailid; v_scheduledetailamount := v_scheduledetailamount - v_differenceamount; + ELSE + v_differenceamount := 0; END IF; IF (v_differenceamount = 0 OR (v_count <> 0 AND NOT v_psdbreakbypartialpayment)) THEN diff -r 9c529a8c8b8d -r 554d8c055ea2 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml Fri Apr 21 14:28:27 2017 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml Mon May 08 08:39:29 2017 +0200 @@ -16,7 +16,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2014 Openbravo SLU +* All portions are Copyright (C) 2014-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -25,6 +25,7 @@ v_referencelist VARCHAR2(32):='575BCB88A4694C27BC013DE9C73E6FE7'; BEGIN + -- Check if the status exists SELECT count(*) INTO v_count FROM DUAL WHERE EXISTS (SELECT 1 FROM ad_ref_list @@ -32,7 +33,8 @@ AND value = status); IF (v_count = 0) THEN - RETURN 'N'; + -- If status is null, return minimum value for invoice paid status (RPR or PPM) + RETURN '40'; END IF; SELECT seqno diff -r 9c529a8c8b8d -r 554d8c055ea2 modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/JdbcExternalConnectionPool.java --- a/modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/JdbcExternalConnectionPool.java Fri Apr 21 14:28:27 2017 +0200 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/JdbcExternalConnectionPool.java Mon May 08 08:39:29 2017 +0200 @@ -18,7 +18,6 @@ */ package org.openbravo.apachejdbcconnectionpool; -import java.lang.management.ManagementFactory; import java.sql.Connection; import java.util.HashMap; import java.util.List; @@ -26,9 +25,6 @@ import java.util.Map.Entry; import java.util.Properties; -import javax.management.InstanceAlreadyExistsException; -import javax.management.MBeanServer; -import javax.management.ObjectName; import javax.naming.Context; import javax.naming.InitialContext; @@ -38,9 +34,9 @@ import org.openbravo.base.exception.OBException; import org.openbravo.base.session.OBPropertiesProvider; import org.openbravo.base.session.SessionFactoryController; -import org.openbravo.dal.core.DalContextListener; import org.openbravo.database.ExternalConnectionPool; import org.openbravo.database.PoolInterceptorProvider; +import org.openbravo.jmx.MBeanRegistry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -163,25 +159,9 @@ DataSource ds = dse.getValue(); try { if (ds.isJmxEnabled()) { - String context = ""; - if (DalContextListener.getServletContext() != null) { - context = "context=" - + DalContextListener.getServletContext().getContextPath().replace("/", "") + ","; - } - // pool needs to be created before it's registered ds.createPool(); - MBeanServer mbs = null; - mbs = ManagementFactory.getPlatformMBeanServer(); - try { - ObjectName name = new ObjectName("Openbravo:" + context + "name=Pool-" + dse.getKey()); - mbs.registerMBean(ds.getPool().getJmxPool(), name); - } catch (InstanceAlreadyExistsException alreadyRegistered) { - log.debug("JMX instance already registred for pool {}, bean name: {}", dse.getKey(), - alreadyRegistered.getMessage()); - } catch (Exception ignored) { - log.error("Could not register {} pool as jmx bean", dse.getKey(), ignored); - } + MBeanRegistry.registerMBean("Pool-" + dse.getKey(), ds.getPool().getJmxPool()); } } catch (Exception e) { log.error("Error creating pool {}", dse.getKey(), e); diff -r 9c529a8c8b8d -r 554d8c055ea2 modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/WeldBaseTest.java --- a/modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/WeldBaseTest.java Fri Apr 21 14:28:27 2017 +0200 +++ b/modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/WeldBaseTest.java Mon May 08 08:39:29 2017 +0200 @@ -94,6 +94,9 @@ private BeanManager beanManager; @Inject + private WeldUtils weldUtils; + + @Inject private KernelInitializer kernelInitializer; /** @@ -110,6 +113,7 @@ if (!initialized) { WeldUtils.setStaticInstanceBeanManager(beanManager); kernelInitializer.setInterceptor(); + weldUtils.setBeanManager(beanManager); initialized = true; } super.setUp(); diff -r 9c529a8c8b8d -r 554d8c055ea2 modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java --- a/modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java Fri Apr 21 14:28:27 2017 +0200 +++ b/modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java Mon May 08 08:39:29 2017 +0200 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2010-2016 Openbravo SLU + * All portions are Copyright (C) 2010-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -139,4 +139,12 @@ } return instances; } + + /** + * Sets bean manager. The purpose of this setter is to be used just in jUnit test cases. When + * working within a container, bean manager should be handled by container. + */ + public void setBeanManager(BeanManager beanManager) { + this.beanManager = beanManager; + } } diff -r 9c529a8c8b8d -r 554d8c055ea2 modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/user-info.js.ftl --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/user-info.js.ftl Fri Apr 21 14:28:27 2017 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/user-info.js.ftl Mon May 08 08:39:29 2017 +0200 @@ -61,7 +61,7 @@ _identifier: '${roleInfo.organizations[organizationId]}' } <#if organizationId_has_next>,</#if> </#list> - ], + ].sortByProperty('_identifier', true), warehouseOrgMap: [ <#list roleInfo.organizationWarehouses?keys as key> { @@ -73,7 +73,7 @@ _identifier: '${warehouse.warehouseName}' } <#if warehouse_has_next>,</#if> </#list> - ] + ].sortByProperty('_identifier', true) } <#if key_has_next>,</#if> </#list> ] diff -r 9c529a8c8b8d -r 554d8c055ea2 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js Fri Apr 21 14:28:27 2017 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js Mon May 08 08:39:29 2017 +0200 @@ -42,7 +42,8 @@ }, changed: function (form, item, value) { - var isParamWindow = form.grid && form.grid.view && form.grid.view.paramWindow; + var view = form.grid ? form.grid.view : form.view, + isParamWindow = form.paramWindow || (view.theForm && view.theForm.paramWindow); if (!isParamWindow && item && item.setValue) { item.setValue(this.getEnteredValue()); } diff -r 9c529a8c8b8d -r 554d8c055ea2 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js Fri Apr 21 14:28:27 2017 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js Mon May 08 08:39:29 2017 +0200 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2011-2015 Openbravo SLU + * All portions are Copyright (C) 2011-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -208,7 +208,7 @@ }, formSaved: function (request, response, data) { var UTCOffsetInMiliseconds; - if (this.getValue() !== data[this.name]) { + if (data && this.getValue() !== data[this.name]) { // it has not been converted to the local time yet, do it now if (data[this.name] && data[this.name].getFullYear() <= 1970) { UTCOffsetInMiliseconds = OB.Utilities.Date.getUTCOffsetInMiliseconds(); diff -r 9c529a8c8b8d -r 554d8c055ea2 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js Fri Apr 21 14:28:27 2017 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js Mon May 08 08:39:29 2017 +0200 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2012-2016 Openbravo SLU + * All portions are Copyright (C) 2012-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -316,7 +316,7 @@ doProcess: function (btnValue) { var i, tmp, view = this, - grid, allProperties, selection, len, allRows, params, tab, actionHandlerCall, clientSideValidationFail, selectedRecords, recordIds; + grid, allProperties, selection, len, allRows, params, tab, actionHandlerCall, clientSideValidationFail, selectedRecords, recordIds, additionalInfo; if (this.button && this.button.multiRecord) { selectedRecords = this.buttonOwnerView.viewGrid.getSelectedRecords(); @@ -363,7 +363,9 @@ clientSideValidationFail = function () { view.setAllButtonEnabled(view.allRequiredParametersSet()); }; - this.clientSideValidation(this, actionHandlerCall, clientSideValidationFail); + additionalInfo = {}; + additionalInfo.buttonValue = allProperties._buttonValue; + this.clientSideValidation(this, actionHandlerCall, clientSideValidationFail, additionalInfo); } else { actionHandlerCall(); } diff -r 9c529a8c8b8d -r 554d8c055ea2 modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelApplicationInitializer.java --- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelApplicationInitializer.java Fri Apr 21 14:28:27 2017 +0200 +++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelApplicationInitializer.java Mon May 08 08:39:29 2017 +0200 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2011-2016 Openbravo SLU + * All portions are Copyright (C) 2011-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -22,16 +22,20 @@ import java.util.Date; import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; import org.apache.log4j.Logger; import org.hibernate.dialect.function.StandardSQLFunction; import org.hibernate.type.StringType; import org.openbravo.dal.service.OBDal; import org.openbravo.erpCommon.utility.DateTimeData; +import org.openbravo.jmx.MBeanRegistry; import org.openbravo.service.db.DalConnectionProvider; /** ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
