details: https://code.openbravo.com/erp/devel/main/rev/f0abbce96c14 changeset: 33688:f0abbce96c14 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Mar 15 09:31:14 2018 +0100 summary: related to issue 38111: instantiate the log with the correct class
details: https://code.openbravo.com/erp/devel/main/rev/853f7336072d changeset: 33689:853f7336072d user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Mar 15 11:03:52 2018 +0100 summary: fixes bug 38096: Allow to disable role access for a widget by deactivating it details: https://code.openbravo.com/erp/devel/main/rev/e8778b5b5622 changeset: 33690:e8778b5b5622 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Mar 15 14:26:11 2018 +0000 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/678132f0a29a changeset: 33691:678132f0a29a user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sun Mar 11 13:10:30 2018 +0100 summary: Fixed 38098. Fix all javadoc -Xdoclint:html warnings Javadoc since java8 enforces stricter correct html use inside javadoc. That was hidden by a local change done in Ubuntu openjdk packages. details: https://code.openbravo.com/erp/devel/main/rev/636948c66791 changeset: 33692:636948c66791 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sun Mar 11 13:10:30 2018 +0100 summary: Related to issue 38098. Fix all javadoc -Xdoclint:html warnings Javadoc since java8 enforces stricter correct html use inside javadoc. That was hidden by a local change done in Ubuntu openjdk packages. details: https://code.openbravo.com/erp/devel/main/rev/72f9f1727bc1 changeset: 33693:72f9f1727bc1 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Thu Mar 15 10:41:23 2018 +0100 summary: Fixed 38137. Use-bind parameters instead of mixing data values in hql-String. details: https://code.openbravo.com/erp/devel/main/rev/c6e6d9b1a8f0 changeset: 33694:c6e6d9b1a8f0 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Thu Mar 15 10:44:22 2018 +0100 summary: Fixed 38135. Use bind-parameters instead of mixing data with the HQL-String. - Modify getOne utility method to receive a Map of parameters to be applied to the query - Change all callers to use named parameters in the HQL string and a map for the param values - Remove the 2 extra copies of getOne now no longer required. - in getOrganizations function - change HQL positional parameter to named one as that is better style and avoid a future hibernate behavior change details: https://code.openbravo.com/erp/devel/main/rev/6033a86144f7 changeset: 33695:6033a86144f7 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Thu Mar 15 16:21:15 2018 +0100 summary: Fixed issue 38141 use bind-variables in FIN_Utility.getDocumentType details: https://code.openbravo.com/erp/devel/main/rev/a171f2d86f3d changeset: 33696:a171f2d86f3d user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Fri Mar 16 09:13:02 2018 +0100 summary: Fixed bug 34668: Cannot tap to Workspace tab after Registration popup appears. By initializing the registration view using initWidget, it creates an invisible view that blocks part of the screen where the Workspace button is. Setting the showItself property to true and implementing the show function to initialize this popup solves the issue. details: https://code.openbravo.com/erp/devel/main/rev/1a95cbaaf724 changeset: 33697:1a95cbaaf724 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Mar 16 09:04:39 2018 +0100 summary: related to bug 38135: auto formatting after last changes details: https://code.openbravo.com/erp/devel/main/rev/305d3e3c2b9a changeset: 33698:305d3e3c2b9a user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Mar 16 09:13:27 2018 +0100 summary: related to bug 38135: minor changes - don't name parameter as clientId if it receives a client object - don't oversize param maps as size is fixed and known details: https://code.openbravo.com/erp/devel/main/rev/1ed089db27e7 changeset: 33699:1ed089db27e7 user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Fri Mar 16 09:22:05 2018 +0100 summary: Fixed bug 38039: Inconsistent organization filtering in process selectors. Pick-and-execute grids does not add their standardProperties in the context info, causing a wrong behavior in selectors not filtering by organization. details: https://code.openbravo.com/erp/devel/main/rev/5323533018b6 changeset: 33700:5323533018b6 user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Mar 16 16:08:57 2018 +0000 summary: CI: update AD_MODULE to version 33699 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/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 17 ++- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- 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-test/org/openbravo/client/application/test/MenuTemplateTest.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java | 6 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ExtraWindowSettingsInjector.java | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 3 +- 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/TemplateResolver.java | 2 +- 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/src/org/openbravo/client/myob/MyOpenbravoComponent.java | 3 +- 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/CheckTreeOperationManager.java | 6 +- 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.service.json/src/org/openbravo/service/json/JsonToDataConverter.java | 6 +- 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.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.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- 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/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 22 ++-- src-core/src/org/openbravo/base/AntExecutor.java | 2 +- src-core/src/org/openbravo/base/ConfigParameters.java | 1 - src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_18.java | 24 +++- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_06.java | 26 +++-- src-test/src/org/openbravo/test/materialMgmt/iscompletelyinvoicedshipment/ICIUtility.java | 6 +- src/org/openbravo/base/provider/OBProvider.java | 2 +- src/org/openbravo/base/util/OBClassLoader.java | 2 +- src/org/openbravo/base/validation/AccessLevelChecker.java | 10 +- src/org/openbravo/costing/CostingAlgorithm.java | 4 +- src/org/openbravo/dal/core/DalRequestFilter.java | 2 +- src/org/openbravo/dal/core/OBContext.java | 48 ++++++--- src/org/openbravo/dal/security/EntityAccessChecker.java | 18 ++- src/org/openbravo/dal/security/OrganizationStructureProvider.java | 2 +- src/org/openbravo/dal/security/SecurityChecker.java | 4 +- src/org/openbravo/dal/service/OBCriteria.java | 2 +- src/org/openbravo/dal/service/OBDal.java | 2 +- src/org/openbravo/dal/xml/EntityResolver.java | 2 +- src/org/openbravo/dal/xml/StaxXMLEntityConverter.java | 6 +- src/org/openbravo/dal/xml/XMLEntityConverter.java | 6 +- src/org/openbravo/erpCommon/ad_callouts/SimpleCallout.java | 3 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 4 +- src/org/openbravo/erpCommon/ad_forms/DocOrder.java | 3 - src/org/openbravo/erpCommon/ad_forms/DocOrderTemplate.java | 3 - src/org/openbravo/erpCommon/ad_forms/Translation.java | 10 -- src/org/openbravo/erpCommon/ad_forms/TranslationManager.java | 2 +- src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java | 12 +- src/org/openbravo/erpCommon/modules/ApplyModule.java | 8 +- src/org/openbravo/erpCommon/modules/ModuleUtiltiy.java | 5 +- src/org/openbravo/erpCommon/utility/AntExecutor.java | 2 +- src/org/openbravo/erpCommon/utility/BasicUtility.java | 2 +- src/org/openbravo/erpCommon/utility/CashVATUtil.java | 4 +- src/org/openbravo/erpCommon/utility/GenericTree.java | 6 +- src/org/openbravo/erpCommon/utility/OBMessageUtils.java | 3 +- src/org/openbravo/erpCommon/utility/Utility.java | 14 +- src/org/openbravo/materialmgmt/refinventory/ReferencedInventoryUtil.java | 6 +- src/org/openbravo/service/db/ClientImportEntityResolver.java | 2 +- src/org/openbravo/service/db/ImportResult.java | 4 +- src/org/openbravo/service/web/BaseWebServiceServlet.java | 2 +- src/org/openbravo/service/web/UserContextCache.java | 2 +- src/org/openbravo/service/web/WebServiceUtil.java | 8 +- 95 files changed, 261 insertions(+), 243 deletions(-) diffs (truncated from 2029 to 300 lines): diff -r c6d53eea0b79 -r 5323533018b6 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Mar 15 08:54:37 2018 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Mar 16 16:08:57 2018 +0000 @@ -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.33683]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.33699]]></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 c6d53eea0b79 -r 5323533018b6 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 Thu Mar 15 08:54:37 2018 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Mar 16 16:08:57 2018 +0000 @@ -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.33683]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.33699]]></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.33683]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.33699]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r c6d53eea0b79 -r 5323533018b6 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Thu Mar 15 08:54:37 2018 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Fri Mar 16 16:08:57 2018 +0000 @@ -292,19 +292,22 @@ OBContext.setAdminMode(false); try { StringBuilder whereOrderByClause = new StringBuilder(); - whereOrderByClause.append(" as dt where dt.organization.id in ("); - whereOrderByClause.append(Utility.getInStrSet(new OrganizationStructureProvider() - .getParentTree(org.getId(), true))); - whereOrderByClause.append(") and dt.client.id = '" + client.getId() - + "' and dt.documentCategory = '" + docCategory + "' order by ad_isorgincluded('" - + org.getId() + "', dt.organization.id, '" + client.getId() - + "') , dt.default desc, dt.id desc"); + whereOrderByClause.append(" as dt where dt.organization.id in ( :orgIdList ) "); + whereOrderByClause + .append(" and dt.client.id = :clientId and dt.documentCategory = :docCategory order by ad_isorgincluded( :orgId, dt.organization.id, :clientId) , dt.default desc, dt.id desc"); OBQuery<DocumentType> dt = OBDal.getInstance().createQuery(DocumentType.class, whereOrderByClause.toString()); dt.setFilterOnReadableClients(false); dt.setFilterOnReadableOrganization(false); dt.setMaxResult(1); + List<Object> orgIdList = new ArrayList<Object>( + new OrganizationStructureProvider().getParentTree(org.getId(), true)); + dt.setNamedParameter("orgIdList", orgIdList); + dt.setNamedParameter("clientId", client.getId()); + dt.setNamedParameter("docCategory", docCategory); + dt.setNamedParameter("orgId", org.getId()); + List<DocumentType> dtList = dt.list(); if (dtList != null && !dtList.isEmpty()) { outDocType = dtList.get(0); diff -r c6d53eea0b79 -r 5323533018b6 modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml Thu Mar 15 08:54:37 2018 +0100 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml Fri Mar 16 16:08:57 2018 +0000 @@ -6,7 +6,7 @@ <!--8A098711BB324335A19833286BDB093D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--8A098711BB324335A19833286BDB093D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8A098711BB324335A19833286BDB093D--> <NAME><![CDATA[Apache External Connection Pool]]></NAME> -<!--8A098711BB324335A19833286BDB093D--> <VERSION><![CDATA[1.0.33683]]></VERSION> +<!--8A098711BB324335A19833286BDB093D--> <VERSION><![CDATA[1.0.33699]]></VERSION> <!--8A098711BB324335A19833286BDB093D--> <DESCRIPTION><![CDATA[Apache External Connection Pool]]></DESCRIPTION> <!--8A098711BB324335A19833286BDB093D--> <HELP><![CDATA[This module implements the Apache JDBC Connection Pool (http://wiki.openbravo.com/wiki/Modules:Apache_JDBC_Connection_Pool).]]></HELP> <!--8A098711BB324335A19833286BDB093D--> <TYPE><![CDATA[M]]></TYPE> diff -r c6d53eea0b79 -r 5323533018b6 modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Mar 15 08:54:37 2018 +0100 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Mar 16 16:08:57 2018 +0000 @@ -7,7 +7,7 @@ <!--1467C397BC5F4999A5606F39CD6FF8A4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <AD_MODULE_ID><![CDATA[8A098711BB324335A19833286BDB093D]]></AD_MODULE_ID> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID> -<!--1467C397BC5F4999A5606F39CD6FF8A4--> <STARTVERSION><![CDATA[2.1.33683]]></STARTVERSION> +<!--1467C397BC5F4999A5606F39CD6FF8A4--> <STARTVERSION><![CDATA[2.1.33699]]></STARTVERSION> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r c6d53eea0b79 -r 5323533018b6 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 Thu Mar 15 08:54:37 2018 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Fri Mar 16 16:08:57 2018 +0000 @@ -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.33683]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.33699]]></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 c6d53eea0b79 -r 5323533018b6 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 Thu Mar 15 08:54:37 2018 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Mar 16 16:08:57 2018 +0000 @@ -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.33683]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.33699]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r c6d53eea0b79 -r 5323533018b6 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 Thu Mar 15 08:54:37 2018 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Fri Mar 16 16:08:57 2018 +0000 @@ -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.33683]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.33699]]></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 c6d53eea0b79 -r 5323533018b6 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 Thu Mar 15 08:54:37 2018 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Mar 16 16:08:57 2018 +0000 @@ -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.33683]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.33699]]></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.33683]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.33699]]></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.33683]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.33699]]></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.33683]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.33699]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r c6d53eea0b79 -r 5323533018b6 modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/MenuTemplateTest.java --- a/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/MenuTemplateTest.java Thu Mar 15 08:54:37 2018 +0100 +++ b/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/MenuTemplateTest.java Fri Mar 16 16:08:57 2018 +0000 @@ -37,7 +37,7 @@ * @author mtaal */ public class MenuTemplateTest extends WeldBaseTest { - private static final Logger log = LoggerFactory.getLogger(MenuTest.class); + private static final Logger log = LoggerFactory.getLogger(MenuTemplateTest.class); @Inject private MainLayoutComponent mainLayoutComponent; diff -r c6d53eea0b79 -r 5323533018b6 modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java Thu Mar 15 08:54:37 2018 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java Fri Mar 16 16:08:57 2018 +0000 @@ -41,7 +41,8 @@ /** * Parses a dynamic expressions and extracts information, e.g. The expression is using a field or an - * auxiliary input, etc. <br/> + * auxiliary input, etc. + * <p> * The transformation of @Expression@ is the following: * <ul> * <li>@ColumnName@ are transformed into property name, e.g. @DocStatus@ into <b>documentStatus</b></li> @@ -250,7 +251,8 @@ /** * Gets a JavaScript expression based on the dynamic expression, e.g @SomeColumn@!'Y' results in - * currentValues.someColumn !== true.<br/> + * currentValues.someColumn !== true. + * <p> * Note: Field comparison with <b>'Y'</b> or <b>'N'</b> are transformed in <b>true</b> or * <b>false</b> * diff -r c6d53eea0b79 -r 5323533018b6 modules/org.openbravo.client.application/src/org/openbravo/client/application/ExtraWindowSettingsInjector.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ExtraWindowSettingsInjector.java Thu Mar 15 08:54:37 2018 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ExtraWindowSettingsInjector.java Fri Mar 16 16:08:57 2018 +0000 @@ -35,7 +35,7 @@ * method. * * Using the WindowSettingsActionHandler.EXTRA_CALLBACK key it is possible to return a - * List<String> with JavaScript functions that are executed on the callback of the + * List<String> with JavaScript functions that are executed on the callback of the * WindowSettingsActionHandler execution. These functions only receive the "data" object as * argument. * diff -r c6d53eea0b79 -r 5323533018b6 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js Thu Mar 15 08:54:37 2018 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js Fri Mar 16 16:08:57 2018 +0000 @@ -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-2017 Openbravo SLU + * All portions are Copyright (C) 2010-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -690,9 +690,8 @@ }(OB, isc)); isc.ClassFactory.defineClass('OBUIAPP_RegistrationView', isc.Layout).addProperties({ - initWidget: function () { + showsItself: true, + show: function () { OB.Layout.ClassicOBCompatibility.Popup.openRegistration(); - - this.Super('initWidget', arguments); } }); \ No newline at end of file diff -r c6d53eea0b79 -r 5323533018b6 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js Thu Mar 15 08:54:37 2018 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js Fri Mar 16 16:08:57 2018 +0000 @@ -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-2017 Openbravo SLU + * All portions are Copyright (C) 2011-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -921,6 +921,7 @@ return; } contextInfo = isc.addProperties({}, this.view.parentWindow.activeView.getContextInfo(false, true, true, true)); + isc.addProperties(contextInfo, this.viewProperties.standardProperties); record = isc.addProperties({}, this.getRecord(rowNum), this.getEditValues(rowNum)); fields = this.viewProperties.fields; len = fields.length; diff -r c6d53eea0b79 -r 5323533018b6 modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Thu Mar 15 08:54:37 2018 +0100 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Fri Mar 16 16:08:57 2018 +0000 @@ -6,7 +6,7 @@ <!--D393BE6F22BB44B7B728259B34FC795A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--D393BE6F22BB44B7B728259B34FC795A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--D393BE6F22BB44B7B728259B34FC795A--> <NAME><![CDATA[HTML Widget]]></NAME> -<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.33683]]></VERSION> +<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.33699]]></VERSION> <!--D393BE6F22BB44B7B728259B34FC795A--> <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION> <!--D393BE6F22BB44B7B728259B34FC795A--> <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP> <!--D393BE6F22BB44B7B728259B34FC795A--> <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL> diff -r c6d53eea0b79 -r 5323533018b6 modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Mar 15 08:54:37 2018 +0100 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Mar 16 16:08:57 2018 +0000 @@ -7,7 +7,7 @@ <!--DCE798FBC5B648F7A3C81A6941720A57--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--DCE798FBC5B648F7A3C81A6941720A57--> <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID> <!--DCE798FBC5B648F7A3C81A6941720A57--> <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID> -<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.33683]]></STARTVERSION> +<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.33699]]></STARTVERSION> <!--DCE798FBC5B648F7A3C81A6941720A57--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--DCE798FBC5B648F7A3C81A6941720A57--> <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME> <!--DCE798FBC5B648F7A3C81A6941720A57--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r c6d53eea0b79 -r 5323533018b6 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml Thu Mar 15 08:54:37 2018 +0100 +++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml Fri Mar 16 16:08:57 2018 +0000 @@ -6,7 +6,7 @@ <!--4B828F4D03264080AA1D2057B13F613C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--4B828F4D03264080AA1D2057B13F613C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--4B828F4D03264080AA1D2057B13F613C--> <NAME><![CDATA[User Interface Client Kernel]]></NAME> -<!--4B828F4D03264080AA1D2057B13F613C--> <VERSION><![CDATA[2.1.33683]]></VERSION> +<!--4B828F4D03264080AA1D2057B13F613C--> <VERSION><![CDATA[2.1.33699]]></VERSION> <!--4B828F4D03264080AA1D2057B13F613C--> <DESCRIPTION><![CDATA[Provides framework functionality for the Openbravo User Interface]]></DESCRIPTION> <!--4B828F4D03264080AA1D2057B13F613C--> <HELP><![CDATA[The user interface client kernel is a generation framework for generating client (browser) components used in Openbravo. Its components are mainly used by other modules to provide customizable and extendable user interfaces.]]></HELP> <!--4B828F4D03264080AA1D2057B13F613C--> <URL><![CDATA[http://forge.openbravo.com/projects/openbravoclientkernel]]></URL> diff -r c6d53eea0b79 -r 5323533018b6 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Mar 15 08:54:37 2018 +0100 +++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Mar 16 16:08:57 2018 +0000 @@ -7,7 +7,7 @@ <!--26B041893E844A53AFA58BC326C4F0D7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--26B041893E844A53AFA58BC326C4F0D7--> <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID> <!--26B041893E844A53AFA58BC326C4F0D7--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> ------------------------------------------------------------------------------ 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
