details: https://code.openbravo.com/erp/devel/main/rev/2987697461e4 changeset: 34517:2987697461e4 user: Atul Gaware <atul.gaware <at> openbravo.com> date: Thu Jun 28 15:29:50 2018 +0530 summary: Fixes Issue 38882:Copy from Order it does not copy line description
Order Line description was wrongly set from Order description, it will be set from Order Line from which the new Order Line is created. details: https://code.openbravo.com/erp/devel/main/rev/83bd5ce0808f changeset: 34518:83bd5ce0808f user: Atul Gaware <atul.gaware <at> openbravo.com> date: Mon Jul 02 22:37:49 2018 +0530 summary: Related to Issue 38882:Copy from Order it does not copy line description Modify the copy line from order related tests to check copied line description with the original line description instead of checking with header description details: https://code.openbravo.com/erp/devel/main/rev/43d0d9426f7a changeset: 34519:43d0d9426f7a user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Wed Jul 04 17:45:38 2018 +0200 summary: related to issue 38882 update Copyright details: https://code.openbravo.com/erp/devel/main/rev/e2cc115e5456 changeset: 34520:e2cc115e5456 user: Atul Gaware <atul.gaware <at> openbravo.com> date: Fri Jul 13 11:57:27 2018 +0530 summary: Fixes Issue 38959:More quantity reserved than available after booking a reopened sales order with more ordered quantity ** When ordered qty is greater than already reserved quantity then v_pendingtounreserve needs to be considered as ZERO instead of negative value as it exceeds the reserved qty than the available qty. details: https://code.openbravo.com/erp/devel/main/rev/50cdb7ce18be changeset: 34521:50cdb7ce18be user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jul 20 08:30:59 2018 +0200 summary: fixed bug 39007: BaseComponentProvider is not thread safe Static appDependencies has been changed from HashMap to ConcurrentHashMap, this field can potentially be concurrently initialized from several classes being HashMap not thread safe can lead to inconsistent results. details: https://code.openbravo.com/erp/devel/main/rev/733a90ef96e2 changeset: 34522:733a90ef96e2 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Jul 31 19:16:40 2018 +0200 summary: fixes issue 38829: Some trigger error messages not shown nicely in PG10 Using capturing groups to retrieve just the DB message (it is surrounded by @) with the regular expression matcher. details: https://code.openbravo.com/erp/devel/main/rev/b268ab48035d changeset: 34523:b268ab48035d user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Aug 02 13:03:20 2018 +0200 summary: related to bug 38829: Some trigger error messages not shown nicely in PG10 The fix[1] was not taking into accout the possibility of having multiple translatable elements (text surrounded by @) in the same error message. Therefore, it has been restored the previous regular expression, and we are now directly stripping the part that contains the technical information of a trigger failure from the DB message returned by PostgreSQL. [1] https://code.openbravo.com/erp/backports/3.0PR18Q2.2/rev/733a90ef96e2a09a4e41fbc343a7ec15f502f8a6 details: https://code.openbravo.com/erp/devel/main/rev/72cf5779eb21 changeset: 34524:72cf5779eb21 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Aug 16 08:05:18 2018 +0000 summary: Update AD_MODULE version to 3.0PR18Q2.2 details: https://code.openbravo.com/erp/devel/main/rev/69fa32276452 changeset: 34525:69fa32276452 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Aug 16 08:05:18 2018 +0000 summary: Added tag 3.0PR18Q2.2 for changeset 72cf5779eb21 details: https://code.openbravo.com/erp/devel/main/rev/9df1ced4be5d changeset: 34526:9df1ced4be5d user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Aug 16 08:05:18 2018 +0000 summary: Added signature for changeset 69fa32276452 details: https://code.openbravo.com/erp/devel/main/rev/db9d4129da8b changeset: 34527:db9d4129da8b user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Aug 22 07:33:41 2018 +0000 summary: Merge temporary head for 3.0PR18Q2.2 diffstat: .hgsigs | 6 + .hgtags | 6 + .project | 6 - .settings/org.eclipse.jdt.core.prefs | 7 +- build.xml | 30 +- config/Openbravo.properties.template | 9 +- config/eclipse/Openbravo-eclipse-prefs.epf | 6 +- legal/ASM_BSD_license.txt | 29 + legal/Licensing.txt | 36 +- legal/Sun_license_agreement.txt | 367 - legal/jta/COPYRIGHT | 51 - legal/jta/DistributionREADME | 23 - legal/jta/JavaTransactionAPI_Entitlement(20070303).txt | 35 - lib/runtime/byte-buddy-1.8.12.jar | Bin lib/runtime/classmate-1.3.4.jar | Bin lib/runtime/hibernate-commons-annotations-5.0.4.Final.jar | Bin lib/runtime/hibernate-core-5.3.2.Final.jar | Bin lib/runtime/hibernate-jpa-2.0-api-1.0.0.Final.jar | Bin lib/runtime/hibernate3-patched.jar | Bin lib/runtime/jandex-2.0.5.Final.jar | Bin lib/runtime/javassist-3.20.0-GA.jar | Bin lib/runtime/javassist-3.22.0-GA.jar | Bin lib/runtime/javax.mail-1.6.1.jar | Bin lib/runtime/javax.persistence-api-2.2.jar | Bin lib/runtime/jboss-logging-3.3.2.Final.jar | Bin lib/runtime/jboss-transaction-api_1.2_spec-1.1.1.Final.jar | Bin lib/runtime/jta.jar | Bin lib/runtime/mail-1.4.4.jar | Bin lib/runtime/postgresql-42.2.2.jre7.jar | Bin lib/runtime/postgresql-9.4.1207.jre6.jar | Bin modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 12 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml | 5 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ModifyPaymentPlanHook.java | 44 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddMultiplePaymentsHandler.java | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanActionHandler.java | 49 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanHookCaller.java | 45 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/Transactions.java | 22 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java | 27 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 95 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/MatchTransactionDao.java | 89 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java | 68 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_PaymentEventListener.java | 12 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_ReconciliationEventListener.java | 14 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddOrderOrInvoiceFilterExpressionHandler.java | 8 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/FundsTransferGLItemDefaultValueExpression.java | 7 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentOrderInvoicesTransformer.java | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java | 11 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournalLine.java | 8 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java | 33 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 11 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java | 9 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/RecordID2Filling.java | 105 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/APRMApplicationInitializer.java | 88 - modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/APRMSQLFunctionRegister.java | 99 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java | 26 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 25 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js | 4 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/JdbcExternalConnectionPool.java | 6 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/WeldBaseTest.java | 28 +- modules/org.openbravo.base.weld/src/META-INF/beans.xml | 4 +- modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_DATA_POOL_SEL.xml | 55 + modules/org.openbravo.client.application/src-db/database/model/views/OBUIAPP_POOL_REPORT_V.xml | 4 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 773 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml | 42 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 168 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MENU.xml | 16 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 28 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 33 - modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml | 13 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REFERENCE.xml | 28 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml | 12 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TAB.xml | 31 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TABLE.xml | 49 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TREENODE.xml | 23 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml | 17 + modules/org.openbravo.client.application/src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 19 + modules/org.openbravo.client.application/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 47 + modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/ADCSInitialization.java | 14 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/ObserverBaseTest.java | 2 + modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderLineTestObserver.java | 7 + modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderTestObserver.java | 7 + modules/org.openbravo.client.application/src/org/openbravo/client/application/ADAlertDatasourceService.java | 13 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java | 192 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java | 7 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ComputeWindowActionHandler.java | 10 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/GlobalMenu.java | 7 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/HeartBeatPopUpComponent.java | 6 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java | 32 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java | 12 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java | 17 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachImplementationManager.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachmentAH.java | 5 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachmentUtils.java | 15 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java | 215 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/DataPoolSelectionEventHandler.java | 98 + modules/org.openbravo.client.application/src/org/openbravo/client/application/example/GridExampleActionHandler.java | 9 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/RoleInfo.java | 19 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoComponent.java | 46 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java | 54 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationActionHandler.java | 16 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java | 42 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java | 25 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/report/CompiledReportManager.java | 157 + modules/org.openbravo.client.application/src/org/openbravo/client/application/report/JmxReportCache.java | 59 + modules/org.openbravo.client.application/src/org/openbravo/client/application/report/JmxReportCacheMBean.java | 50 + modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportCompiler.java | 168 + modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportFiller.java | 134 + modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java | 395 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java | 61 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 30 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/hooks/DataPoolSelectionWindowInjector.java | 79 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/callback/ob-extra-window-settings-actions.js | 33 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js | 16 - modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js | 22 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-encrypted.js | 3 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js | 48 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js | 44 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js | 27 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 4 + modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 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 | 4 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/freemarker/test/GenerateComponentTest.java | 15 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponent.java | 29 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponentProvider.java | 15 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelApplicationInitializer.java | 56 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelSQLFunctionRegister.java | 55 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java | 26 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java | 10 +- modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java | 10 +- modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java | 27 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 13 - modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java | 122 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 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 | 4 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 114 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 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 | 4 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java | 21 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceProperty.java | 32 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java | 37 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/HQLDataSourceService.java | 82 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java | 46 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java | 10 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 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 | 4 +- 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 | 4 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DataEntityQueryService.java | 4 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java | 15 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 7 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 23 - modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java | 55 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java | 10 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/model/domaintype/SelectorDomainType.java | 33 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 37 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 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 | 4 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js | 11 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js | 18 + modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 22 +- referencedata/sampledata/F_B_International_Group/AD_ORG.xml | 24 + referencedata/sampledata/F_B_International_Group/AD_PROCESS_ACCESS.xml | 560 - referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml | 1410 +- referencedata/sampledata/F_B_International_Group/AD_SEQUENCE.xml | 62 +- referencedata/sampledata/F_B_International_Group/AD_USER.xml | 48 +- referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml | 74 +- referencedata/sampledata/F_B_International_Group/C_CONVERSION_RATE.xml | 216 + referencedata/sampledata/F_B_International_Group/C_INVOICE.xml | 3872 +- referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml | 8864 + referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml | 4338 + referencedata/sampledata/F_B_International_Group/C_INVOICETAX.xml | 1020 + referencedata/sampledata/F_B_International_Group/C_ORDER.xml | 2286 + referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml | 10170 ++ referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml | 3689 + referencedata/sampledata/F_B_International_Group/C_ORDERTAX.xml | 576 + referencedata/sampledata/F_B_International_Group/C_ORDER_DISCOUNT.xml | 180 + referencedata/sampledata/F_B_International_Group/FACT_ACCT.xml | 48052 +++++++++- referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENT.xml | 44 + referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENTLINE.xml | 1302 + referencedata/sampledata/F_B_International_Group/FIN_FINACC_TRANSACTION.xml | 1854 + referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml | 8 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml | 2122 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_DETAIL.xml | 928 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml | 174 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml | 600 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml | 2302 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml | 1300 +- referencedata/sampledata/F_B_International_Group/FIN_RECONCILIATION.xml | 62 +- referencedata/sampledata/F_B_International_Group/GL_JOURNAL.xml | 108 + referencedata/sampledata/F_B_International_Group/GL_JOURNALBATCH.xml | 82 +- referencedata/sampledata/F_B_International_Group/GL_JOURNALLINE.xml | 1260 + referencedata/sampledata/F_B_International_Group/M_ATTRIBUTESETINSTANCE.xml | 90 + referencedata/sampledata/F_B_International_Group/M_COSTING.xml | 2479 +- referencedata/sampledata/F_B_International_Group/M_INOUT.xml | 1602 + referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml | 4715 + referencedata/sampledata/F_B_International_Group/M_MATCHINV.xml | 1482 + referencedata/sampledata/F_B_International_Group/M_MATCHPO.xml | 2964 + referencedata/sampledata/F_B_International_Group/M_MOVEMENT.xml | 6 +- referencedata/sampledata/F_B_International_Group/M_STORAGE_DETAIL.xml | 362 +- referencedata/sampledata/F_B_International_Group/M_STORAGE_PENDING.xml | 54 +- referencedata/sampledata/F_B_International_Group/M_TRANSACTION.xml | 6228 +- referencedata/sampledata/F_B_International_Group/M_TRANSACTION_COST.xml | 3825 + referencedata/sampledata/QA_Testing/AD_ORG.xml | 8 + referencedata/sampledata/QA_Testing/AD_PROCESS_ACCESS.xml | 168 - referencedata/sampledata/QA_Testing/AD_SEQUENCE.xml | 20 + referencedata/sampledata/QA_Testing/AD_USER.xml | 4 +- referencedata/sampledata/QA_Testing/AD_WINDOW_ACCESS.xml | 168 + referencedata/sampledata/QA_Testing/C_BPARTNER.xml | 74 +- referencedata/sampledata/QA_Testing/FIN_FINANCIAL_ACCOUNT.xml | 7 + referencedata/sampledata/QA_Testing/M_PRODUCT.xml | 52 + referencedata/sampledata/QA_Testing/M_PRODUCTPRICE.xml | 36 + referencedata/sampledata/QA_Testing/M_PRODUCT_ACCT.xml | 34 + referencedata/sampledata/QA_Testing/OBUIAPP_PROCESS_ACCESS.xml | 84 + src-db/database/build-create.xml | 8 +- src-db/database/build.xml | 10 +- src-db/database/lib/dbsourcemanager.jar | Bin src-db/database/model/excludeFilter.xml | 5 + src-db/database/model/functions/AD_GET_ORG_LE_BU.xml | 100 +- src-db/database/model/functions/AD_GET_ORG_LE_BU_TREENODE.xml | 101 + src-db/database/model/functions/AD_ISTRIGGERENABLED.xml | 40 - src-db/database/model/functions/AD_ORG_GETCALENDAROWNER.xml | 60 +- src-db/database/model/functions/AD_ORG_GETCALENDAROWNERTN.xml | 77 + src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOW.xml | 42 +- src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOWTN.xml | 65 + src-db/database/model/functions/AD_ORG_READY.xml | 94 +- src-db/database/model/functions/A_ASSET_CREATE.xml | 35 +- src-db/database/model/functions/C_BP_SOCREDITUSED_REFRESH.xml | 6 +- src-db/database/model/functions/C_CASH_POST.xml | 78 +- src-db/database/model/functions/C_CONVERT_DOC_CURRENCY.xml | 10 +- src-db/database/model/functions/C_CREATE_PINVOICE_FROM_OUTS.xml | 7 +- src-db/database/model/functions/C_CURRENCY_CONVERT.xml | 3 +- src-db/database/model/functions/C_CURRENCY_CONVERT_PRECISION.xml | 3 +- src-db/database/model/functions/C_CURRENCY_CONVERT_RATE.xml | 3 +- src-db/database/model/functions/C_CURRENCY_RATE.xml | 3 +- src-db/database/model/functions/C_GETWITHHOLDING.xml | 15 +- src-db/database/model/functions/C_GET_CURRENCY_PRECISION.xml | 3 +- src-db/database/model/functions/C_GET_DEFAULT_PERIOD.xml | 11 +- src-db/database/model/functions/C_GET_NET_AMOUNT_FROM_GROSS.xml | 3 +- src-db/database/model/functions/C_GET_NET_PRICE_FROM_GROSS.xml | 3 +- src-db/database/model/functions/C_GET_TAX_AMT_FROM_NET.xml | 3 +- src-db/database/model/functions/C_INVOICETAX_ADJUSTMENT.xml | 18 +- src-db/database/model/functions/C_INVOICE_CREATE.xml | 11 +- src-db/database/model/functions/C_INVOICE_CREATE0.xml | 3 +- src-db/database/model/functions/C_INVOICE_CREATERECEIPT.xml | 3 +- src-db/database/model/functions/C_INVOICE_POST.xml | 41 +- src-db/database/model/functions/C_ORDERTAX_ADJUSTMENT.xml | 18 +- src-db/database/model/functions/C_ORDER_POST1.xml | 45 +- src-db/database/model/functions/C_PROJECT_WON.xml | 8 +- src-db/database/model/functions/C_TAXPAYMENT_POST.xml | 8 +- src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml | 3 +- src-db/database/model/functions/MA_PRODUCTION_COST.xml | 28 + src-db/database/model/functions/MRP_PURCHASEPLAN.xml | 5 +- src-db/database/model/functions/MRP_RUN_EXPLODE.xml | 5 +- src-db/database/model/functions/MRP_RUN_INITIALIZE.xml | 8 +- src-db/database/model/functions/M_GETJSONDESCRIPTION.xml | 71 +- src-db/database/model/functions/M_GET_STOCK_PARAM.xml | 3 +- src-db/database/model/functions/M_INITIALIZE_STOCK_VALUATION.xml | 3 +- src-db/database/model/functions/M_INOUT_CREATE.xml | 6 +- src-db/database/model/functions/M_INOUT_CREATE0.xml | 3 +- src-db/database/model/functions/M_INOUT_POST.xml | 1 - src-db/database/model/functions/M_MOVEMENT_POST.xml | 1 + src-db/database/model/functions/M_RESERVATION_POST.xml | 4 +- src-db/database/model/functions/M_RESERVATION_REALLOCATE.xml | 3 +- src-db/database/model/functions/M_RESERVE_STOCK_AUTO.xml | 3 +- src-db/database/model/functions/M_WAREHOUSE_DEFAULT_RULE_PARAM.xml | 3 +- src-db/database/model/prescript-Oracle.sql | 105 + src-db/database/model/prescript-PostgreSql.sql | 82 + src-db/database/model/tables/AD_HEARTBEAT_LOG.xml | 4 - src-db/database/model/tables/AD_MODULE.xml | 8 - src-db/database/model/tables/AD_MODULE_INSTALL.xml | 8 - src-db/database/model/tables/AD_ORG.xml | 35 + src-db/database/model/tables/AD_PROCESS_REQUEST.xml | 4 + src-db/database/model/tables/AD_ROLE.xml | 4 +- src-db/database/model/tables/AD_SESSION_STATUS.xml | 49 - src-db/database/model/tables/AD_SYSTEM_INFO.xml | 12 - src-db/database/model/tables/C_INVOICELINE.xml | 1 + src-db/database/model/tables/C_POC_CONFIGURATION.xml | 4 + src-db/database/model/tables/FACT_ACCT.xml | 3 + src-db/database/model/tables/M_MOVEMENTLINE.xml | 1 + src-db/database/model/tables/M_PRODUCT.xml | 8 + src-db/database/model/tables/M_PRODUCT_STATUS.xml | 98 + src-db/database/model/tables/M_PRODUCT_STATUS_TRL.xml | 74 + src-db/database/model/tables/M_WAREHOUSE.xml | 6 +- src-db/database/model/triggers/AD_CALLOUT_TRG.xml | 21 +- src-db/database/model/triggers/AD_MODULE_TRG.xml | 81 +- src-db/database/model/triggers/AD_MODULE_TRG2.xml | 4 +- src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml | 14 +- src-db/database/model/triggers/AD_ROLE_CHECK_TRG.xml | 6 + src-db/database/model/triggers/AD_ROLE_TRG.xml | 5 +- src-db/database/model/triggers/C_CONVERSION_RATE_DOCUMENT_TRG.xml | 7 +- src-db/database/model/triggers/C_ORDERLINE_TRG2.xml | 15 +- src-db/database/model/triggers/C_PERIOD_TRG.xml | 9 +- src-db/database/model/triggers/M_RESERVATION_TRG.xml | 3 +- src-db/database/model/triggers/M_TRANSACTION_TRG.xml | 127 +- src-db/database/model/triggers/M_TRANSACTION_TRG2.xml | 24 +- src-db/database/model/views/FACT_ACCT_END_YEAR_V.xml | 4 - src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 49 + src-db/database/sourcedata/AD_CALLOUT.xml | 20 - src-db/database/sourcedata/AD_COLUMN.xml | 3387 +- src-db/database/sourcedata/AD_DATASET_COLUMN.xml | 11 - src-db/database/sourcedata/AD_DATASET_TABLE.xml | 14 + src-db/database/sourcedata/AD_ELEMENT.xml | 290 +- src-db/database/sourcedata/AD_EXTENSION_POINTS.xml | 10 + src-db/database/sourcedata/AD_FIELD.xml | 1146 +- src-db/database/sourcedata/AD_FIELDGROUP.xml | 10 + src-db/database/sourcedata/AD_MENU.xml | 14 + src-db/database/sourcedata/AD_MESSAGE.xml | 248 +- src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 48 - src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 1700 - src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_PROCESS.xml | 93 - src-db/database/sourcedata/AD_REFERENCE.xml | 41 +- src-db/database/sourcedata/AD_REF_LIST.xml | 48 +- src-db/database/sourcedata/AD_TAB.xml | 67 +- src-db/database/sourcedata/AD_TABLE.xml | 158 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 477 - src-db/database/sourcedata/AD_TREENODE.xml | 113 +- src-db/database/sourcedata/AD_VAL_RULE.xml | 4 +- src-db/database/sourcedata/AD_WINDOW.xml | 16 + src-db/database/sourcedata/M_PRODUCT_STATUS.xml | 93 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 37 +- src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 176 + src-db/database/sourcedata/referencedData/C_COUNTRY.xml | 20 + src-test/src/org/openbravo/advpaymentmngt/test/TestUtility.java | 6 +- src-test/src/org/openbravo/test/AllAntTaskTests.java | 20 +- src-test/src/org/openbravo/test/AllQuickAntTaskTests.java | 8 +- src-test/src/org/openbravo/test/AllTests.java | 6 +- src-test/src/org/openbravo/test/AllWebserviceTests.java | 6 +- src-test/src/org/openbravo/test/AntTaskTests.java | 8 +- src-test/src/org/openbravo/test/base/BaseTest.java | 8 +- src-test/src/org/openbravo/test/base/OBBaseTest.java | 95 +- src-test/src/org/openbravo/test/base/TestConstants.java | 44 + src-test/src/org/openbravo/test/copyLinesFromOrders/CopyLinesFromOrdersTest.java | 15 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestConstants.java | 5 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_13.java | 7 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_14.java | 11 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_15.java | 7 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_16.java | 8 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_17.java | 8 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_18.java | 19 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_19.java | 7 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_20.java | 7 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_01.java | 7 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_02.java | 11 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_03.java | 9 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_04.java | 8 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_05.java | 8 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_06.java | 19 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_07.java | 7 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_08.java | 7 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_AUM_21.java | 7 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_AUM_22.java | 7 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/CopyLinesFromOrdersTestData.java | 5 +- src-test/src/org/openbravo/test/costing/TestCostingLandedCost.java | 308 +- src-test/src/org/openbravo/test/costing/TestCostingNoSourceAdjustments.java | 147 +- src-test/src/org/openbravo/test/costing/utils/TestCostingUtils.java | 358 +- src-test/src/org/openbravo/test/dal/ADCachedMultiThreadTest.java | 7 +- src-test/src/org/openbravo/test/dal/ComputedColumnsTest.java | 11 +- src-test/src/org/openbravo/test/dal/DalComplexQueryRequisitionTest.java | 67 +- src-test/src/org/openbravo/test/dal/DalComplexQueryTestOrderLine.java | 33 +- src-test/src/org/openbravo/test/dal/DalPerformanceExampleTest.java | 22 +- src-test/src/org/openbravo/test/dal/DalPerformanceProxyTest.java | 6 +- src-test/src/org/openbravo/test/dal/DalQueryTest.java | 15 +- src-test/src/org/openbravo/test/dal/DalTest.java | 154 +- src-test/src/org/openbravo/test/dal/HiddenUpdateTest.java | 78 +- src-test/src/org/openbravo/test/dal/IssuesTest.java | 55 +- src-test/src/org/openbravo/test/dal/OBContextTest.java | 48 + src-test/src/org/openbravo/test/datasource/DatasourceTestUtil.java | 2 +- src-test/src/org/openbravo/test/datasource/FICTest.java | 35 +- src-test/src/org/openbravo/test/datasource/SummaryFieldRequestTest.java | 101 + src-test/src/org/openbravo/test/db/model/functions/ADOrgTreeTest.java | 10 +- src-test/src/org/openbravo/test/db/model/triggers/M_inoutlinetrgTest.java | 14 +- src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoConstants.java | 57 + src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoCornerCaseOrgTest.java | 59 + src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoSetReadyTest.java | 109 + src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoTestSuite.java | 28 + src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoUtility.java | 294 + src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistOrgInfoComplexOrgTreeTest.java | 142 + src-test/src/org/openbravo/test/inventoryStatus/InventoryStatusTest.java | 9 +- src-test/src/org/openbravo/test/model/ClassLoaderTest.java | 4 +- src-test/src/org/openbravo/test/model/RuntimeModelTest.java | 16 +- src-test/src/org/openbravo/test/modularity/DBPrefixTest.java | 15 +- src-test/src/org/openbravo/test/modularity/TableNameTest.java | 18 +- src-test/src/org/openbravo/test/productStatus/ProductStatusTest.java | 223 + src-test/src/org/openbravo/test/reporting/AllJrxmlCompilation.java | 60 +- src-test/src/org/openbravo/test/reporting/CompiledReportsCacheTest.java | 92 + src-test/src/org/openbravo/test/security/AccessLevelTest.java | 33 +- src-test/src/org/openbravo/test/security/AllowedOrganizationsTest.java | 17 +- src-test/src/org/openbravo/test/security/PasswordStrengthCheckerTest.java | 78 + src-test/src/org/openbravo/test/security/UserInfoSessionDataTest.java | 10 +- src-test/src/org/openbravo/test/security/WritableReadableOrganizationClientTest.java | 53 +- src-test/src/org/openbravo/test/selector/TestSelectorDefaultFilterActionHandler.java | 66 + src-test/src/org/openbravo/test/system/ErrorTextParserIntegrationTest.java | 199 + src-test/src/org/openbravo/test/system/ErrorTextParserTest.java | 183 +- src-test/src/org/openbravo/test/system/SystemValidatorTest.java | 5 +- src-test/src/org/openbravo/test/taxes/TaxesTest.java | 5 +- src-test/src/org/openbravo/test/views/ETagGeneration.java | 6 +- src-test/src/org/openbravo/test/views/GCSequenceNumberTests.java | 17 +- src-test/src/org/openbravo/test/views/GridConfigurationTest.java | 57 + src-test/src/org/openbravo/test/views/SortingFilteringGridConfiguration.java | 23 +- src-test/src/org/openbravo/test/views/ViewGenerationWithDifferentConfigLevelTest.java | 24 +- src-test/src/org/openbravo/test/xml/EntityXMLImportTestReference.java | 39 +- src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CheckUpdateConnectionPoolMerge.class | Bin src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CheckUpdateConnectionPoolMergeData.class | Bin src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedClientWarehouseValue.class | Bin src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedClientWarehouseValueData.class | Bin src-util/buildvalidation/src/org/openbravo/buildvalidation/CheckUpdateConnectionPoolMerge.java | 245 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/CheckUpdateConnectionPoolMerge_data.xsql | 32 - src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedClientWarehouseValue.java | 62 + src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedClientWarehouseValue_data.xsql | 49 + src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePersistOrgInfo.class | Bin src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePersistOrgInfoData.class | Bin src-util/modulescript/src/org/openbravo/modulescript/UpdatePersistOrgInfo.java | 61 + src-util/modulescript/src/org/openbravo/modulescript/UpdatePersistOrgInfo_data.xsql | 123 + src/build.xml | 50 +- src/index.jsp | 9 +- src/org/openbravo/authentication/ChangePasswordException.java | 41 + src/org/openbravo/base/ServerVersionChecker.java | 30 +- src/org/openbravo/base/model/ModelProvider.java | 91 +- src/org/openbravo/base/model/Property.java | 9 +- src/org/openbravo/base/model/domaintype/TreeDomainType.java | 41 +- src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 33 +- src/org/openbravo/base/secureApp/LoginHandler.java | 85 +- src/org/openbravo/base/secureApp/LoginUtils.java | 13 +- src/org/openbravo/base/secureApp/OrgTree_data.xsql | 32 - src/org/openbravo/base/secureApp/UserLock.java | 84 +- src/org/openbravo/base/session/DalUUIDGenerator.java | 7 +- src/org/openbravo/base/session/SessionFactoryController.java | 131 +- src/org/openbravo/base/structure/BaseOBObject.java | 57 +- src/org/openbravo/cluster/ClusterServiceManager.java | 25 +- src/org/openbravo/common/actionhandler/CashflowForecastReportActionHandler.java | 11 +- src/org/openbravo/common/actionhandler/copyfromorderprocess/UpdateOrderLineInformation.java | 4 +- src/org/openbravo/common/datasource/CostingTransactionsHQLTransformer.java | 6 +- src/org/openbravo/common/datasource/StockReservationPickAndEditDataSource.java | 43 +- src/org/openbravo/common/hooks/ConvertQuotationIntoOrderHook.java | 40 + src/org/openbravo/common/hooks/ConvertQuotationIntoOrderHookManager.java | 78 + src/org/openbravo/costing/AverageAlgorithm.java | 5 +- src/org/openbravo/costing/AverageCostAdjustment.java | 257 +- src/org/openbravo/costing/CostAdjustmentProcess.java | 60 +- src/org/openbravo/costing/CostAdjustmentUtils.java | 136 +- src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java | 45 +- src/org/openbravo/costing/CostingBackground.java | 13 +- src/org/openbravo/costing/CostingMigrationProcess.java | 52 +- src/org/openbravo/costing/CostingRuleProcess.java | 23 +- src/org/openbravo/costing/CostingUtils.java | 58 +- src/org/openbravo/costing/FixBackdatedTransactionsProcess.java | 11 +- src/org/openbravo/costing/InventoryAmountUpdateProcess.java | 16 +- src/org/openbravo/costing/LCMatchingProcess.java | 7 +- src/org/openbravo/costing/LandedCostDistributionByAmount.java | 7 +- src/org/openbravo/costing/LandedCostProcess.java | 8 +- src/org/openbravo/costing/PriceDifferenceByDateProcess.java | 3 +- src/org/openbravo/costing/PriceDifferenceUtil.java | 7 +- src/org/openbravo/costing/ResetStockValuation.java | 3 +- src/org/openbravo/costing/StandardCostAdjustment.java | 15 +- src/org/openbravo/dal/core/DalInitializingTask.java | 17 +- src/org/openbravo/dal/core/DalLayerInitializer.java | 65 +- src/org/openbravo/dal/core/DalMappingGenerator.java | 72 +- src/org/openbravo/dal/core/DalPropertyAccess.java | 183 + src/org/openbravo/dal/core/DalPropertyAccessStrategy.java | 36 + src/org/openbravo/dal/core/DalSessionFactory.java | 208 +- src/org/openbravo/dal/core/DalSessionFactoryController.java | 77 +- src/org/openbravo/dal/core/OBContext.java | 83 +- src/org/openbravo/dal/core/OBDynamicPropertyHandler.java | 133 - src/org/openbravo/dal/core/OBDynamicTuplizer.java | 131 - src/org/openbravo/dal/core/OBInterceptor.java | 13 +- src/org/openbravo/dal/core/OBTuplizer.java | 145 - src/org/openbravo/dal/core/SQLFunctionRegister.java | 39 + src/org/openbravo/dal/core/SessionHandler.java | 30 +- src/org/openbravo/dal/core/TriggerHandler.java | 64 +- src/org/openbravo/dal/security/AcctSchemaStructureProvider.java | 12 +- src/org/openbravo/dal/security/EntityAccessChecker.java | 48 +- src/org/openbravo/dal/security/OrganizationStructureProvider.java | 5 +- src/org/openbravo/dal/service/DataPoolChecker.java | 143 + src/org/openbravo/dal/service/OBCriteria.java | 13 +- src/org/openbravo/dal/service/OBDal.java | 133 +- src/org/openbravo/dal/service/OBQuery.java | 180 +- src/org/openbravo/dal/xml/EntityResolver.java | 13 +- src/org/openbravo/email/EmailEventManager.java | 32 +- src/org/openbravo/erpCommon/ad_actionButton/CreateWorkEffort.java | 10 +- src/org/openbravo/erpCommon/ad_actionButton/MRPManufacturingPlanProcess.java | 7 +- src/org/openbravo/erpCommon/ad_actionButton/ProcessGoods.java | 8 +- src/org/openbravo/erpCommon/ad_actionButton/RMInsertOrphanLine.java | 41 +- src/org/openbravo/erpCommon/ad_actionButton/SequenceProductCreate.java | 8 +- src/org/openbravo/erpCommon/ad_callouts/SE_Calendar_For_Org.java | 99 - src/org/openbravo/erpCommon/ad_callouts/SE_Locator_Activate.java | 27 +- src/org/openbravo/erpCommon/ad_callouts/SE_Years_For_Calendar.java | 100 - src/org/openbravo/erpCommon/ad_callouts/SL_BPartnerLocation.java | 29 +- src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Locator.java | 94 - src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Locator_data.xsql | 65 - src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java | 36 +- src/org/openbravo/erpCommon/ad_callouts/SL_InvAmtUpd_ProductRefDate.java | 6 +- src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Tax.java | 96 - src/org/openbravo/erpCommon/ad_callouts/SL_LandedCost_InvoiceLine.java | 6 +- src/org/openbravo/erpCommon/ad_callouts/SL_MovementAll_Locator.java | 97 - src/org/openbravo/erpCommon/ad_callouts/SL_Payment_Amounts.java | 214 - src/org/openbravo/erpCommon/ad_callouts/SL_Payment_Amounts_data.xsql | 53 - src/org/openbravo/erpCommon/ad_callouts/SL_Payment_DocType.java | 93 - src/org/openbravo/erpCommon/ad_callouts/SL_Payment_DocType_data.xsql | 49 - src/org/openbravo/erpCommon/ad_callouts/SL_Payment_No_Verify.java | 105 - src/org/openbravo/erpCommon/ad_callouts/SL_ProductPrice_PriceListVersion.java | 7 +- src/org/openbravo/erpCommon/ad_callouts/SL_RequisitionLine_Product.java | 5 +- src/org/openbravo/erpCommon/ad_callouts/SL_WorkRequirement_Sequence.java | 88 - src/org/openbravo/erpCommon/ad_callouts/SL_WorkRequirement_Sequence.xsql | 37 - src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 3 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 3 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 24 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 8 +- src/org/openbravo/erpCommon/ad_forms/DocLineCashVATReady_PaymentTransactionReconciliation.java | 6 +- src/org/openbravo/erpCommon/ad_forms/Heartbeat.html | 5 +- src/org/openbravo/erpCommon/ad_forms/Heartbeat.java | 28 +- src/org/openbravo/erpCommon/ad_forms/Heartbeat_data.xsql | 38 - src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html | 4 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java | 267 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagement.xml | 4 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateOnline.xml | 4 +- src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java | 18 +- src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java | 12 +- src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql | 38 +- src/org/openbravo/erpCommon/ad_forms/SQLExecutor_Query.java | 7 +- src/org/openbravo/erpCommon/ad_process/AlertProcess.java | 52 +- src/org/openbravo/erpCommon/ad_process/ConvertQuotationIntoOrder.java | 12 + src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java | 65 +- src/org/openbravo/erpCommon/ad_process/SystemInfo_data.xsql | 9 +- src/org/openbravo/erpCommon/ad_process/UpdateActuals.java | 26 +- src/org/openbravo/erpCommon/ad_process/assets/AssetLinearDepreciationMethodProcess.java | 51 +- src/org/openbravo/erpCommon/ad_reports/AgingDao_data.xsql | 27 + src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.java | 24 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 21 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesComparativeJR.jrxml | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java | 22 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql | 28 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesMultiComparativeExtendedJR.jrxml | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesMultiComparativeJR.jrxml | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesNoComparativeJR.jrxml | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.jrxml | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportNotPosted.java | 9 +- src/org/openbravo/erpCommon/ad_reports/ReportNotPosted_data.xsql | 36 +- src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitabilityJR.java | 48 +- src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceJR.java | 17 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalanceDetail_data.xsql | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java | 10 +- src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily.java | 12 +- src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java | 41 +- src/org/openbravo/erpCommon/businessUtility/Heartbeat_data.xsql | 33 - src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java | 20 +- src/org/openbravo/erpCommon/businessUtility/Preferences.java | 52 +- src/org/openbravo/erpCommon/businessUtility/PriceAdjustment.java | 10 +- src/org/openbravo/erpCommon/businessUtility/Tree.java | 8 +- src/org/openbravo/erpCommon/businessUtility/Tree_data.xsql | 13 +- src/org/openbravo/erpCommon/info/AttributeSetInstance.java | 38 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 418 +- src/org/openbravo/erpCommon/obps/ActiveInstanceProcess.java | 32 +- src/org/openbravo/erpCommon/security/Error.html | 1 + src/org/openbravo/erpCommon/security/Login.html | 6 +- src/org/openbravo/erpCommon/security/Login.java | 75 +- src/org/openbravo/erpCommon/utility/CashVATUtil.java | 14 +- src/org/openbravo/erpCommon/utility/DimensionDisplayUtility.java | 94 +- src/org/openbravo/erpCommon/utility/ErrorTextParserPOSTGRE.java | 32 +- src/org/openbravo/erpCommon/utility/OBLedgerUtils.java | 7 +- src/org/openbravo/erpCommon/utility/PrintJR.java | 10 +- src/org/openbravo/erpCommon/utility/ReferencedLink.java | 9 +- src/org/openbravo/erpCommon/utility/SystemInfo.java | 37 +- src/org/openbravo/erpCommon/utility/SystemInfo_data.xsql | 26 +- src/org/openbravo/erpCommon/utility/TreeUtility.java | 41 +- src/org/openbravo/erpCommon/utility/Utility.java | 15 +- src/org/openbravo/erpCommon/utility/poc/EmailInfo.java | 179 + src/org/openbravo/erpCommon/utility/poc/EmailManager.java | 56 +- src/org/openbravo/erpCommon/utility/reporting/ReportManager.java | 2 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java | 77 +- src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR.jrxml | 2 +- src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR_new.jrxml | 2 +- src/org/openbravo/erpReports/RptC_Remittance.java | 11 +- src/org/openbravo/erpReports/RptC_Settlement.fo | 39 - src/org/openbravo/erpReports/RptC_Settlement.java | 96 - src/org/openbravo/erpReports/RptC_Settlement.xml | 29 - src/org/openbravo/erpReports/RptC_SettlementHeader.fo | 81 - src/org/openbravo/erpReports/RptC_SettlementHeader.xml | 33 - src/org/openbravo/erpReports/RptC_SettlementLines.fo | 91 - src/org/openbravo/erpReports/RptC_SettlementLines.xml | 33 - src/org/openbravo/erpReports/RptC_Settlement_Header_data.xsql | 48 - src/org/openbravo/erpReports/RptC_Settlement_Lines_data.xsql | 47 - src/org/openbravo/erpReports/RptC_Settlement_data.xsql | 49 - src/org/openbravo/erpReports/RptM_Inout.fo | 42 - src/org/openbravo/erpReports/RptM_Inout.java | 97 - src/org/openbravo/erpReports/RptM_Inout.xml | 29 - src/org/openbravo/erpReports/RptM_InoutHeader.fo | 130 - src/org/openbravo/erpReports/RptM_InoutHeader.xml | 38 - src/org/openbravo/erpReports/RptM_InoutLines.fo | 141 - src/org/openbravo/erpReports/RptM_InoutLines.xml | 32 - src/org/openbravo/erpReports/RptM_Inout_Header_data.xsql | 47 - src/org/openbravo/erpReports/RptM_Inout_Lines_data.xsql | 47 - src/org/openbravo/erpReports/RptM_Inout_data.xsql | 62 - src/org/openbravo/erpReports/RptM_Movement.fo | 31 - src/org/openbravo/erpReports/RptM_Movement.java | 81 - src/org/openbravo/erpReports/RptM_Movement.xml | 28 - src/org/openbravo/erpReports/RptM_MovementLines.fo | 261 - src/org/openbravo/erpReports/RptM_MovementLines.xml | 43 - src/org/openbravo/erpReports/RptM_Movement_data.xsql | 79 - src/org/openbravo/erpReports/RptM_Requisition.java | 24 +- src/org/openbravo/erpReports/RptM_Requisition.jrxml | 3 +- src/org/openbravo/erpReports/RptPromissoryNote.fo | 66 - src/org/openbravo/erpReports/RptPromissoryNote.java | 218 - src/org/openbravo/erpReports/RptPromissoryNote.xml | 38 - src/org/openbravo/erpReports/RptPromissoryNoteAfter.fo | 61 - src/org/openbravo/erpReports/RptPromissoryNoteAfter.xml | 74 - src/org/openbravo/erpReports/RptPromissoryNoteAfter_data.xsql | 110 - src/org/openbravo/erpReports/RptPromissoryNoteError.fo | 23 - src/org/openbravo/erpReports/RptPromissoryNoteError.xml | 32 - src/org/openbravo/erpReports/RptPromissoryNoteError_data.xsql | 31 - src/org/openbravo/erpReports/RptPromissoryNoteHeader.fo | 86 - src/org/openbravo/erpReports/RptPromissoryNoteHeader.xml | 39 - src/org/openbravo/erpReports/RptPromissoryNoteHeader_data.xsql | 89 - src/org/openbravo/erpReports/RptPromissoryNoteTree_data.xsql | 37 - src/org/openbravo/erpReports/RptPromissoryNote_data.xsql | 56 - src/org/openbravo/event/CharacteristicValueEventHandler.java | 9 +- src/org/openbravo/event/ConversionRateEventHandler.java | 13 +- src/org/openbravo/event/InvoiceEventHandler.java | 8 +- src/org/openbravo/event/OrderEventHandler.java | 3 +- src/org/openbravo/event/OrderLineEventHandler.java | 9 +- src/org/openbravo/event/ProductCharacteristicEventHandler.java | 14 +- src/org/openbravo/event/ProductCharacteristicValueEventHandler.java | 4 +- src/org/openbravo/event/UOMConversionEventHandler.java | 13 +- src/org/openbravo/financial/FinancialUtils.java | 7 +- src/org/openbravo/financial/ResetAccounting.java | 382 +- src/org/openbravo/materialmgmt/InventoryCountProcess.java | 259 +- src/org/openbravo/materialmgmt/ManageVariantsDS.java | 18 +- src/org/openbravo/materialmgmt/ProductCharacteristicsDS.java | 21 +- src/org/openbravo/materialmgmt/ReservationUtils.java | 13 +- src/org/openbravo/materialmgmt/ResetValuedStockAggregated.java | 13 +- src/org/openbravo/materialmgmt/ServicePriceUtils.java | 17 +- src/org/openbravo/materialmgmt/VariantAutomaticGenerationProcess.java | 32 +- src/org/openbravo/materialmgmt/refinventory/ReferencedInventoryUtil.java | 4 +- src/org/openbravo/scheduling/OBScheduler.java | 10 +- src/org/openbravo/scheduling/ProcessMonitor.java | 19 +- src/org/openbravo/scheduling/ProcessRequest_data.xsql | 18 +- src/org/openbravo/scheduling/ProcessRunner.java | 4 +- src/org/openbravo/service/dataset/DataSetService.java | 4 +- src/org/openbravo/service/db/DataImportService.java | 17 +- src/org/openbravo/service/db/DbUtility.java | 7 +- src/org/openbravo/service/db/QueryTimeOutUtil.java | 10 +- src/org/openbravo/service/importprocess/ImportEntryManager.java | 23 +- src/org/openbravo/service/importprocess/ImportReprocessErrorEntries.java | 5 +- src/org/openbravo/service/password/PasswordStrengthChecker.java | 117 + src/org/openbravo/service/system/DatabaseValidator.java | 3 +- src/org/openbravo/test/system/ErrorTextParserTest_data.xsql | 16 +- web/js/productCharacteristicsProcess.js | 2 +- 686 files changed, 136226 insertions(+), 17756 deletions(-) diffs (truncated from 213379 to 300 lines): diff -r 3f281a901fbb -r db9d4129da8b .hgsigs --- a/.hgsigs Fri Jul 06 13:28:36 2018 +0000 +++ b/.hgsigs Wed Aug 22 07:33:41 2018 +0000 @@ -228,3 +228,9 @@ f06ec509f2bf413f13d422e937ec12531fe1821a 0 iEYEABECAAYFAlqzgcwACgkQCX/oGf+2qkP/EACeJH+QthNIdldCdTvfnllHXTXDo24AnRVV1DveMhhNbgb50zu8ETDZ1WVT b90f619fc9f3f9ca6439969e99f742f9a9403f82 0 iEYEABECAAYFAlqMGfIACgkQCX/oGf+2qkPjiQCgyYNqJlbSOSoax5ydjqpJKun85RIAoM9s2iEyLfJ8CJyfUXFmz6FtvmqC c38ab6f55348fbb5963fd77b770f939a5c0eda23 0 iEYEABECAAYFAlq0lSgACgkQCX/oGf+2qkN3FwCgggZ7hoUQveeRYCuBBuHAi77v84gAn1RBjuscKhHjc7ouPvgiPgIVanBb +9bad88c00b5da708f3e9c1abacd25ea6e6cfd664 0 iEUEABECAAYFAlrXODoACgkQCX/oGf+2qkOblACg0WOwH27TgkH75iKw2Y9tNYxSL8oAl3j0FbjQF6F05ESzZC0l3Uv2Nfg= +dc2ef98dc38f7c32c888dcf1f1adb37c6afb4d14 0 iEYEABECAAYFAlrxbisACgkQCX/oGf+2qkMMCwCdFeF47f2MY7Pq3cdsyHon64EYekwAoPYllLnhYETGsUEqtiKSxvj9Mgxb +2121d856284cf0c4f26faef336bd2aa41ada151f 0 iEYEABECAAYFAlr8AykACgkQCX/oGf+2qkPKhQCfeQ+9S16IA3wZMgnoJjRRZRvG8SUAoIgKQPopjsjObnB6Qu1DyNgCByRt +faeac12b1aad3dc7fb53f8ffda3ada9e3b7deaeb 0 iEYEABECAAYFAls/boQACgkQCX/oGf+2qkNdfACfaNh5oqLf0LzgGAYLmRWa97kbFj4AoL3KPdVDG0Mf6qKcxejAl7Kl12cd +69fa322764529bb77cd3ef3b7b5dd33f6667e560 0 iEYEABECAAYFAlt1MD4ACgkQCX/oGf+2qkPU4wCgnCdQrG3eWxbDWbitjSsm6XvbQ6IAni9v1H03pkrhgPmaS97Ft9MOHVhO +bbb6e342b4af3c81bd1a49418a01e63fcb09e3c5 0 iEYEABECAAYFAltpYMEACgkQCX/oGf+2qkMblgCffRsYLqTbeixIj19Lm3dm6iMqkv0AoM3iSQaEFeV7ff9nYRd3vz227Ir6 diff -r 3f281a901fbb -r db9d4129da8b .hgtags --- a/.hgtags Fri Jul 06 13:28:36 2018 +0000 +++ b/.hgtags Wed Aug 22 07:33:41 2018 +0000 @@ -239,3 +239,9 @@ 7b0d4c95c2b308cd1b12dcfbe2a36c7f77fb49a4 3.0PR17Q4.2 46184d2680e43a9b29d3058a75dea7d15d47b4b4 3.0PR18Q1 03f6ac7d17926657b093b25f613a4cd3fb47ef65 3.0PR18Q1.1 +650aaadd6b6c5fda4f7ad957701face4fa4c3317 3.0PR18Q1.2 +307b23f7635f3e92dd8fc8e7d55d09b7c914384c 3.0PR18Q2 +63c5e173ffdca0828d75476e5a48e2fae42ad9e9 3.0PR18Q1.3 +3f281a901fbbde5103faebca4df0c22b94ac5535 3.0PR18Q2.1 +72cf5779eb218bb25914b1aadade7fde01c67842 3.0PR18Q2.2 +5cbef591aff09f80e8a73a92202d438b792ad40f 3.0PR18Q3 diff -r 3f281a901fbb -r db9d4129da8b .project --- a/.project Fri Jul 06 13:28:36 2018 +0000 +++ b/.project Wed Aug 22 07:33:41 2018 +0000 @@ -11,11 +11,6 @@ </arguments> </buildCommand> <buildCommand> - <name>org.openarchitectureware.base.oawBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> <name>org.sonarlint.eclipse.core.sonarlintBuilder</name> <arguments> </arguments> @@ -26,6 +21,5 @@ <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> - <nature>org.openarchitectureware.base.oawNature</nature> </natures> </projectDescription> diff -r 3f281a901fbb -r db9d4129da8b .settings/org.eclipse.jdt.core.prefs --- a/.settings/org.eclipse.jdt.core.prefs Fri Jul 06 13:28:36 2018 +0000 +++ b/.settings/org.eclipse.jdt.core.prefs Wed Aug 22 07:33:41 2018 +0000 @@ -1,12 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff -r 3f281a901fbb -r db9d4129da8b build.xml --- a/build.xml Fri Jul 06 13:28:36 2018 +0000 +++ b/build.xml Wed Aug 22 07:33:41 2018 +0000 @@ -96,8 +96,6 @@ <property name="buildValidation" value="true"/> <property name="modules" value=""/> - <available file=".hg" property="is.hg" /> - <condition property="xdoclint.missing" value="" else="-Xdoclint:-missing"> <equals arg1="${ant.java.version}" arg2="1.7"/> </condition> @@ -356,12 +354,15 @@ <taskdef resource="axis-tasks.properties" classpathref="project.class.path" /> - <target name="init" depends="code.rev"> + <target name="init"> <fail if="root.user" message="Don't run ant tasks with the root user" /> <fail if="no.java.home" message="The environment variable JAVA_HOME is not set." /> - <fail message="Unsupported Java version ${ant.java.version}. Minimum required is 7 (1.7)."> + <fail message="Unsupported Java version ${ant.java.version}. Minimum required is 8 (1.8)."> <condition> - <equals arg1="${ant.java.version}" arg2="1.6"/> + <or> + <equals arg1="${ant.java.version}" arg2="1.6"/> + <equals arg1="${ant.java.version}" arg2="1.7"/> + </or> </condition> </fail> <antversion property="min.ant.version" atleast="1.9.2" /> @@ -375,19 +376,6 @@ </fail> </target> - <target name="code.rev" depends="set.code.rev"> - <condition property="code.revision" value="${hg.id}" else="0"> - <isset property="hg.id" /> - </condition> - </target> - - <target name="set.code.rev" if="is.hg"> - <exec executable="hg" outputproperty="hg.id" failifexecutionfails="false"> - <arg value="id"/> - <arg value="-i"/> - </exec> - </target> - <target name="compile.complete" depends="init, core.lib, wad.lib, trl.lib"> <ant dir="${base.src}" target="compile.complete" inheritAll="true" inheritRefs="true" /> </target> @@ -571,7 +559,7 @@ <include name="*/lib/test/*.jar" /> </fileset> </classpath> - <link href="http://docs.oracle.com/javase/7/docs/api/"/> + <link href="https://docs.oracle.com/javase/8/docs/api/"/> </javadoc> </target> @@ -973,8 +961,6 @@ replace="\1${core.rev}\3" byline="true"/> - <echo message="${hg.id}" file="${tmpdir}/config/instance.revision"/> - <delete includeEmptyDirs="true"> <fileset dir="${tmpdir}/modules" includes="**/*" defaultexcludes="no"/> </delete> @@ -1034,7 +1020,7 @@ <pathelement path="${base.lib}/runtime/log4j-1.2.16.jar" /> <pathelement path="${base.lib}/runtime/commons-pool-1.5.6.jar" /> <pathelement path="${base.lib}/runtime/commons-dbcp-1.4.jar" /> - <pathelement path="${base.lib}/runtime/postgresql-9.4.1207.jre6.jar" /> + <pathelement path="${base.lib}/runtime/postgresql-42.2.2.jre7.jar" /> <pathelement path="${base.lib}/runtime/ojdbc6.jar" /> <pathelement path="${base.lib}/runtime/commons-collectionsi-3.2.1.jar" /> <pathelement path="${base.lib}/runtime/ant-1.9.2.jar" /> diff -r 3f281a901fbb -r db9d4129da8b config/Openbravo.properties.template --- a/config/Openbravo.properties.template Fri Jul 06 13:28:36 2018 +0000 +++ b/config/Openbravo.properties.template Wed Aug 22 07:33:41 2018 +0000 @@ -10,7 +10,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) 2007-2017 Openbravo SLU +# * All portions are Copyright (C) 2007-2018 Openbravo SLU # * All Rights Reserved. # * Contributor(s): ______________________________________. # ************************************************************************ @@ -197,13 +197,10 @@ # If these properties are set, after a failed login the response time # will be delayed, and the user account can be blocked. -login.trial.delay.increment=0 -login.trial.delay.max=0 +login.trial.delay.increment=0.2 +login.trial.delay.max=3 login.trial.user.lock=0 -# Prevents concurrent sessions for same user. -login.limit.user.session=false - ########## # Others # ########## diff -r 3f281a901fbb -r db9d4129da8b config/eclipse/Openbravo-eclipse-prefs.epf --- a/config/eclipse/Openbravo-eclipse-prefs.epf Fri Jul 06 13:28:36 2018 +0000 +++ b/config/eclipse/Openbravo-eclipse-prefs.epf Wed Aug 22 07:33:41 2018 +0000 @@ -16,7 +16,7 @@ /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.compliance=1.7 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.compliance=1.8 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 @org.eclipse.mylyn.monitor.ui=3.6.0.v20110608-1400 @org.eclipse.jst.j2ee.webservice.ui=1.1.500.v201105122000 @@ -130,7 +130,7 @@ /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.enumIdentifier=error @org.eclipse.team.cvs.ui=3.3.400.I20110510-0800 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.source=1.7 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.source=1.8 /instance/org.eclipse.wst.validation/USER_PREFERENCE=saveAutomaticallyfalseprojectsCanOverridetruedisableAllValidationfalseversion1.1.101.v200706071630 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 @@ -418,7 +418,7 @@ /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 /instance/org.eclipse.mylyn.tasks.ui/org.eclipse.mylyn.tasks.ui.backup.last=1233309627073 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert diff -r 3f281a901fbb -r db9d4129da8b legal/ASM_BSD_license.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/legal/ASM_BSD_license.txt Wed Aug 22 07:33:41 2018 +0000 @@ -0,0 +1,29 @@ +ASM is released under the following 3-Clause BSD License: + +ASM: a very small and fast Java bytecode manipulation framework +Copyright (c) 2000-2011 INRIA, France Telecom +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGE. diff -r 3f281a901fbb -r db9d4129da8b legal/Licensing.txt --- a/legal/Licensing.txt Fri Jul 06 13:28:36 2018 +0000 +++ b/legal/Licensing.txt Wed Aug 22 07:33:41 2018 +0000 @@ -67,7 +67,13 @@ # Eclipse icons # wsdl4j-1.5.1.jar Icons and files under the Eclipse Public License (license available at -http://www.eclipse.org/legal/epl-v10.html +http://www.eclipse.org/legal/epl-v10.html) + +# javax.persistence-api-2.2.jar +Under the terms of the Eclipse Public License v 1.0 (license available at +http://www.eclipse.org/legal/epl-v10.html) +and Eclipse Distribution License v 1.0 (license available at +http://www.eclipse.org/org/documents/edl-v10.php) # nekohtml.jar (CyberNeko HTML Parser) Under the CyberNeko Software License, Version 1.0 (license available at @@ -129,7 +135,7 @@ All files under Apache Software License 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 -# postgresql-9.4.1207.jre6.jar +# postgresql-42.2.2.jre7.jar Under the BSD license, also available at http://jdbc.postgresql.org/license.html # xstream-1.3.1.jar @@ -165,7 +171,8 @@ # poi-3.10.1.jar Under the Apache 2.0 license (included as Apache_poi_license.txt in this folder) -# hibernate3-patched.jar +# hibernate-core-5.3.2.Final.jar +# hibernate-commons-annotations-5.0.4.Final.jar All files under the LGPL 2.1 (available at www.gnu.org/licenses/lgpl.html) # dom4j-1.6.1.jar @@ -185,7 +192,7 @@ Under MPL/GPL License (available at https://developer.mozilla.org/en/Rhino_License) ob-rhino-1.6R7.jar is the same code as js.jar repackaged to be available under org.openbravo -# javassist-3.20.0-GA.jar +# javassist-3.22.0-GA.jar Under MPL License (included as MPL-1.1.txt in this folder) # slf4j-api-1.6.1.jar @@ -199,21 +206,11 @@ - ojdbc6.jar under the OTN Development and Distribution License Agreement (in /legal folder and available at http://www.oracle.com/technology/software/popup-license/distribution-license.html) -- hibernate-jpa-2.0-api-1.0.0.Final.jar - License Agreement available at: - http://fisheye.jboss.org/browse/Hibernate/jpa-api/tags/hibernate-jpa-2.0-api-1.0.0.Final/license.txt?r=16109&r=16109 -# jaxrpc.jar -# mail-1.4.4.jar +# jaxrpc.jar All files under the corresponding Sun Binary Code License. This is not free software, but provided under license from Sun Microsystems. -# jta.jar. This software is subject to the Sun License Agreement and terms - set out in /legal/jta/ directory and also available at - https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewLicense-Start?LicenseUUID=aanACUFBI3YAAAEY1Z45AXiO&ProductUUID=gp_ACUFBpawAAAEYhHY5AXub ------------------------------------------------------------------------------ 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
