details: https://code.openbravo.com/erp/devel/main/rev/5c7a45d3dd1f changeset: 32384:5c7a45d3dd1f user: Mark <markmm82 <at> gmail.com> date: Thu Jun 08 21:26:48 2017 -0400 summary: Fixes issue 36194: Cannot select an order line in Create Lines From of Receipt window if it uses secondary UOM
Cannot select an order line in Create Lines From of Goods Receipt window if it uses secondary UOM. It was caused because of use of the secondary unit of measure ID instead of the M_PRODUCT_UOM_ID when creating the field provider for the field of secondary UOM. To fix it, was used the M_PRODUCT_UOM_ID of the record when the secondary unit is defined for the selected product, instead of the ID of it unit. details: https://code.openbravo.com/erp/devel/main/rev/3c6b29670b0f changeset: 32385:3c6b29670b0f user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Tue Jun 13 10:24:14 2017 +0200 summary: Fixed issue 36229:servlet callout SL_CreateLines_Conversion_UOM is not working The reported problem is the same that it had been fixed in this issue #35540 . In this case, SL_CreateLines_Conversion_UOM callout is still required to be manually executed as a servlet. Callouts should only be used in generated windows, for manual old 2.50 ones, as this case, the mapping is not generated by defining it as a manual map. details: https://code.openbravo.com/erp/devel/main/rev/fc8d674b25c5 changeset: 32386:fc8d674b25c5 user: Armaignac <collazoandy4 <at> gmail.com> date: Wed Jun 14 11:47:03 2017 -0400 summary: Fixes issue 36251: Security problem in Create Budget Reports in Excel report SQL injection security problem in Create Budget Reports in Excel report. A UUID filter was added to check the params cAccountId and inpcAcctSchemaId. details: https://code.openbravo.com/erp/devel/main/rev/a71e9f9e791a changeset: 32387:a71e9f9e791a user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jun 15 11:18:01 2017 +0200 summary: fixes issue 36103: dataset fails if it has properties not in target system Trying to apply a dataset with information for properties not present in target instance failed. Now in this case the property is just ignored and the process continues. details: https://code.openbravo.com/erp/devel/main/rev/c2d6e38b0ed4 changeset: 32388:c2d6e38b0ed4 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jun 15 11:21:21 2017 +0200 summary: fixed bug 36095: Failed to apply roles dataset Roles dataset still made reference to removed client and organization lists. These references have been removed. details: https://code.openbravo.com/erp/devel/main/rev/977e2c53bf1e changeset: 32389:977e2c53bf1e user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jun 15 11:24:17 2017 +0200 summary: fixed bug 36079: inconsistent ad_process generates invalid web.xml Some invalid defintions of ad_process generated invalid web.xml because mapping was included referencing to a class that was filtered out, causing Tomcat to refuse to start. It has been fixed by adding to the query that retrieves mappings the same restrictions already added to the query looking for classes, so mappings will be obtained only if class is present. details: https://code.openbravo.com/erp/devel/main/rev/f71735cbbfb0 changeset: 32390:f71735cbbfb0 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Jun 21 11:08:10 2017 +0200 summary: fixes issue 36295: Some fields marked to be shown on picklist show empty values With the fix for issue #33015 just the required selector properties are sent, in order to prevent unneeded joins. With this change the properties of the fields to be displayed on the pick list and the extra properties are handled separately by the datasource. The poblem here is that the datasource was not handling properly the properties to be shown in the picklist which are derived, i.e., those properties that are resolved through property navigation. To solve this issue, this kind of derived properties are sent as part of the extra properties. details: https://code.openbravo.com/erp/devel/main/rev/a4ec1334a4cb changeset: 32391:a4ec1334a4cb user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Jun 26 08:13:59 2017 +0200 summary: fixes bug 36322: Create Lines P&E grid gets freezed under some circumstances When moving to a record in a P&E leaving the current record without filling all the mandatory fields, the P&E got freezed due to an infinite loop. This was caused due to the changes introduced with the fix for the issue #34824, which prevents to leave the current record if not all the mandatory fields are filled. Being in a P&E grid which does not allow inserts, that change causes an infinite loop in Smartclient. Thi is because the hideInlineEditor flow is never completed, which makes the cellEditMethod being called continuolsy. As the change for issue #34824 was intended for P&E grids in which records can be added, this change ensures that the default action executed in hideInlineEditor are cancelled just for that kind of grids. This allows to keep the behavior fixed on issue #34824 and fixes the problem for the rest of the P&E grids. details: https://code.openbravo.com/erp/devel/main/rev/c37991aee215 changeset: 32392:c37991aee215 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Jun 27 09:26:20 2017 +0000 summary: Update AD_MODULE version to 3.0PR17Q2.1 details: https://code.openbravo.com/erp/devel/main/rev/0e959ce9b986 changeset: 32393:0e959ce9b986 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Jun 27 09:26:20 2017 +0000 summary: Added tag 3.0PR17Q2.1 for changeset c37991aee215 details: https://code.openbravo.com/erp/devel/main/rev/e0c23c04aeab changeset: 32394:e0c23c04aeab user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Jun 27 09:26:20 2017 +0000 summary: Added signature for changeset 0e959ce9b986 details: https://code.openbravo.com/erp/devel/main/rev/60cfd9ca8856 changeset: 32395:60cfd9ca8856 user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Jul 03 11:29:02 2017 +0000 summary: Merge temporary head for 3.0PR17Q2.1 diffstat: .hgsigs | 5 + .hgtags | 5 + build.xml | 4 +- legal/Licensing.txt | 2 +- lib/README | 1 + modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 2 + modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml | 6 +- modules/org.openbravo.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-db/database/sourcedata/AD_PREFERENCE.xml | 55 - modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 1 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 3 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-findTransaction.js | 16 +- modules/org.openbravo.apachejdbcconnectionpool/lib/runtime/tomcat-jdbc.jar | 0 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 | 33 +- 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 | 4 + modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java | 10 +- modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_NAVBAR_COMPONENT.xml | 5 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 39 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml | 14 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 30 +- 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/OBCLKER_TEMPLATE.xml | 141 +- modules/org.openbravo.client.application/src-db/database/sourcedata/OBSERDS_DATASOURCE.xml | 28 - modules/org.openbravo.client.application/src-db/database/sourcedata/OBSERDS_DATASOURCE_FIELD.xml | 69 - modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_NAVBAR_COMPONENT.xml | 16 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/ADCSInitialization.java | 11 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/StandardWindowTest.java | 11 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java | 46 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationConstants.java | 6 +- 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 | 158 + modules/org.openbravo.client.application/src/org/openbravo/client/application/HeartBeatPopupActionHandler.java | 138 - modules/org.openbravo.client.application/src/org/openbravo/client/application/LogOutActionHandler.java | 1 + modules/org.openbravo.client.application/src/org/openbravo/client/application/MainLayoutComponent.java | 158 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java | 188 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/NavigationBarComponent.java | 47 + modules/org.openbravo.client.application/src/org/openbravo/client/application/NavigationBarComponentGenerator.java | 158 + modules/org.openbravo.client.application/src/org/openbravo/client/application/PropertiesComponent.java | 34 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java | 9 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/ApplicationMenuComponent.java | 19 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickCreateComponent.java | 76 - modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickCreateDataSource.java | 128 - modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickLaunchComponent.java | 75 - modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickLaunchDataSource.java | 171 - modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/RoleInfo.java | 154 + modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoComponent.java | 127 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java | 209 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/application-menu.js.ftl | 44 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/help-about.js.ftl | 20 - modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/quick-launch.js.ftl | 43 - modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/user-info.js.ftl | 68 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl | 185 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/navigation-bar.js.ftl | 23 + modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-heartbeat-registration.js.ftl | 22 + modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 61 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/WindowDefinitionComponent.java | 76 - modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-manager.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js | 43 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-layout.js | 206 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-notes-datasource.js | 78 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 4 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-application-menu.js | 3 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-help-about-widget.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js | 112 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js | 22 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-form.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/test/ob-navbar-test.js | 46 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js | 38 +- 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/org/openbravo/client/kernel/ApplicationComponent.java | 61 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ApplicationDynamicComponent.java | 169 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelApplicationInitializer.java | 16 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelComponentProvider.java | 15 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelConstants.java | 4 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelServlet.java | 6 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/SessionDynamicResourceComponent.java | 82 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/SessionDynamicTemplateComponent.java | 43 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java | 369 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceProvider.java | 153 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceProviderMBean.java | 53 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StyleSheetResourceComponent.java | 98 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-dynamic-js.ftl | 15 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl | 9 +- 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 | 163 +- modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java | 12 +- modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java | 285 +- modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponentProvider.java | 9 +- modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetClassInfo.java | 74 + modules/org.openbravo.client.myob/src/org/openbravo/client/myob/templates/my_ob_js.ftl | 8 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-community-branding-widget.js | 8 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js | 30 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/test/ob-myopenbravo-test.js | 87 +- 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/web/org.openbravo.client.querylist/js/ob-querylist-widget.js | 8 +- 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-db/database/sourcedata/AD_PREFERENCE.xml | 11 - modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 12 +- 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.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_PREFERENCE.xml | 11 - 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/TreeDatasourceService.java | 2 +- 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/DefaultJsonDataService.java | 25 +- 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 | 28 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorConstants.java | 29 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/SelectorUIReference.java | 10 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 23 +- 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.skin.250to300Comp/web/org.openbravo.userinterface.skin.250to300Comp/skins/250to300Comp/loginStyles.css | 636 + 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.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/referencedata/standard/V3_Roles.xml | 1009 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_DATASET.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_DATASET_TABLE.xml | 14 + 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_TREE.xml | 219 + referencedata/sampledata/F_B_International_Group/AD_PROCESS_ACCESS.xml | 168 - referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml | 1480 +- 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/AD_WINDOW_ACCESS.xml | 98 + referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml | 74 +- referencedata/sampledata/F_B_International_Group/C_INVOICE.xml | 3760 +- referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml | 9130 + referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml | 4464 + 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 | 10125 ++ referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml | 3672 + 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 | 47922 +++++++++- 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 | 992 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml | 174 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml | 660 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml | 2298 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml | 1304 +- referencedata/sampledata/F_B_International_Group/FIN_RECONCILIATION.xml | 58 + referencedata/sampledata/F_B_International_Group/GL_JOURNAL.xml | 108 + referencedata/sampledata/F_B_International_Group/GL_JOURNALBATCH.xml | 86 +- 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 | 2054 +- referencedata/sampledata/F_B_International_Group/M_INOUT.xml | 1566 + referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml | 4876 + referencedata/sampledata/F_B_International_Group/M_LOCATOR.xml | 48 + 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_STORAGE_DETAIL.xml | 427 +- referencedata/sampledata/F_B_International_Group/M_STORAGE_PENDING.xml | 52 +- referencedata/sampledata/F_B_International_Group/M_TRANSACTION.xml | 6360 + referencedata/sampledata/F_B_International_Group/M_TRANSACTION_COST.xml | 3604 + referencedata/sampledata/F_B_International_Group/OBUIAPP_PROCESS_ACCESS.xml | 308 + referencedata/sampledata/QA_Testing/AD_ORG_TREE.xml | 75 + referencedata/sampledata/QA_Testing/AD_PROCESS_ACCESS.xml | 42 - referencedata/sampledata/QA_Testing/C_DISCOUNT.xml | 14 + referencedata/sampledata/QA_Testing/C_INVOICE_DISCOUNT.xml | 33 + referencedata/sampledata/QA_Testing/C_ORDER_DISCOUNT.xml | 33 + referencedata/sampledata/QA_Testing/M_PRODUCT.xml | 58 +- referencedata/sampledata/QA_Testing/M_PRODUCT_ACCT.xml | 34 + referencedata/sampledata/QA_Testing/M_RESERVATION.xml | 23 + referencedata/sampledata/QA_Testing/M_RESERVATION_STOCK.xml | 20 + referencedata/sampledata/QA_Testing/OBUIAPP_PROCESS_ACCESS.xml | 42 + referencedata/standard/Unit_of_Measure.xml | 1097 +- src-core/src/org/openbravo/base/ConfigParameters.java | 6 +- src-core/src/org/openbravo/base/VariablesBase.java | 29 +- src-db/database/build-create.xml | 15 +- src-db/database/build.xml | 4 +- src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/model/functions/AD_ISORGINCLUDED.xml | 53 +- src-db/database/model/functions/AD_ISORGINCLUDED_TREENODE.xml | 65 + src-db/database/model/functions/AD_ORG_CHK_CALENDAR.xml | 4 +- src-db/database/model/functions/AD_ORG_READY.xml | 49 +- src-db/database/model/functions/C_COMMISSION_COPY.xml | 6 +- src-db/database/model/functions/C_COMMISSION_PROCESS.xml | 2 + src-db/database/model/functions/C_INVOICE_CREATE.xml | 118 +- src-db/database/model/functions/C_INVOICE_POST.xml | 11 +- src-db/database/model/functions/C_ORDER_POST1.xml | 16 +- src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml | 46 +- src-db/database/model/functions/MA_PRODUCTION_COST.xml | 12 +- src-db/database/model/functions/MRP_PROCESSPLAN_PLAN.xml | 24 +- src-db/database/model/functions/MRP_RUN_EXPLODE.xml | 13 +- src-db/database/model/functions/MRP_RUN_INITIALIZE.xml | 4 +- src-db/database/model/functions/M_CHECK_STOCK.xml | 38 +- src-db/database/model/functions/M_GET_STOCK.xml | 16 +- src-db/database/model/functions/M_GET_STOCK_PARAM.xml | 69 +- src-db/database/model/functions/M_INOUT_CREATE.xml | 59 +- src-db/database/model/functions/M_INOUT_POST.xml | 20 + src-db/database/model/functions/M_MOVEMENT_POST.xml | 19 +- src-db/database/model/functions/M_PRODUCTION_RUN.xml | 65 +- src-db/database/model/functions/M_RAPPEL_INVOICE_CREATE.xml | 7 +- src-db/database/model/functions/M_RESERVATION_REALLOCATE.xml | 4 +- src-db/database/model/functions/M_RESERVE_STOCK_AUTO.xml | 4 +- src-db/database/model/functions/M_UNIQUEATTRIBUTE_RULE_PARAM.xml | 11 +- src-db/database/model/functions/M_UNIQUELOCATOR_RULE_PARAM.xml | 11 +- src-db/database/model/functions/M_WAREHOUSE_DEFAULT_RULE_PARAM.xml | 11 +- src-db/database/model/tables/AD_ORGMODULE.xml | 6 + src-db/database/model/tables/AD_ORG_TREE.xml | 62 + src-db/database/model/tables/AD_USER.xml | 4 +- src-db/database/model/tables/C_BPARTNER.xml | 14 +- src-db/database/model/tables/FACT_ACCT.xml | 1 - src-db/database/model/tables/FIN_PAYMENT.xml | 3 + src-db/database/model/tables/M_INVENTORYSTATUS.xml | 87 + src-db/database/model/tables/M_INVENTORYSTATUS_TRL.xml | 74 + src-db/database/model/tables/M_LOCATOR.xml | 58 +- src-db/database/model/triggers/AD_PROCESS_REQUEST_TRG.xml | 38 +- src-db/database/model/triggers/C_INVOICELINE_BEFORE_TRG.xml | 4 +- src-db/database/model/triggers/C_ORDERLINE2_TRG.xml | 29 +- src-db/database/model/triggers/M_INVENTORYSTATUS_TRG.xml | 68 + src-db/database/model/views/M_RM_RECEIPT_PICK_EDIT.xml | 2 +- src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml | 2 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 66 + src-db/database/sourcedata/AD_COLUMN.xml | 1692 +- src-db/database/sourcedata/AD_DATASET.xml | 2 +- src-db/database/sourcedata/AD_DATASET_TABLE.xml | 98 + src-db/database/sourcedata/AD_ELEMENT.xml | 142 +- src-db/database/sourcedata/AD_FIELD.xml | 1342 +- src-db/database/sourcedata/AD_MENU.xml | 18 +- src-db/database/sourcedata/AD_MESSAGE.xml | 156 +- src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 53 +- src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 60 +- src-db/database/sourcedata/AD_MODEL_OBJECT_PARA.xml | 22 +- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_PREFERENCE.xml | 1716 - src-db/database/sourcedata/AD_PROCESS.xml | 25 - src-db/database/sourcedata/AD_PROCESS_PARA.xml | 137 - src-db/database/sourcedata/AD_REFERENCE.xml | 52 + src-db/database/sourcedata/AD_REF_LIST.xml | 37 + src-db/database/sourcedata/AD_TAB.xml | 72 +- src-db/database/sourcedata/AD_TABLE.xml | 77 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 612 +- src-db/database/sourcedata/AD_TREENODE.xml | 65 +- src-db/database/sourcedata/AD_WINDOW.xml | 17 + src-db/database/sourcedata/M_INVENTORYSTATUS.xml | 124 + src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 234 + src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 40 + src-db/database/sourcedata/OBUIAPP_REPORT.xml | 12 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 53 +- src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 82 + src-test/src/org/openbravo/test/AllAntTaskTests.java | 16 +- src-test/src/org/openbravo/test/base/mock/HttpServletRequestMock.java | 418 + src-test/src/org/openbravo/test/base/mock/VariablesSecureAppMock.java | 66 + src-test/src/org/openbravo/test/costing/TestCosting.java | 163 +- src-test/src/org/openbravo/test/datasource/DataSourceSecurity.java | 14 +- src-test/src/org/openbravo/test/datasource/DataSourceWhereParameter.java | 18 +- src-test/src/org/openbravo/test/datasource/TestComboDatasource.java | 46 +- src-test/src/org/openbravo/test/db/model/functions/ADOrgTreeTest.java | 439 + src-test/src/org/openbravo/test/db/model/functions/Ad_isorgincludedTest.java | 67 +- src-test/src/org/openbravo/test/inventoryStatus/InventoryStatusTest.java | 1000 + src-test/src/org/openbravo/test/security/CrossOrganizationReference.java | 22 + src-test/src/org/openbravo/test/security/CrossOrganizationUI.java | 194 + src-test/src/org/openbravo/test/security/CrossOrganizationUICDI.java | 118 + src-test/src/org/openbravo/test/security/ExplicitCrossOrganizationReference.java | 47 +- src-test/src/org/openbravo/test/taxes/TaxesTest.java | 153 +- src-test/src/org/openbravo/test/taxes/data/ProductDataConstants.java | 4 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData185.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData186.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData187.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData188.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData189.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData190.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData191.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData192.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData193.java | 106 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData194.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData195.java | 106 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData196.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData197.java | 106 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData198.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData199.java | 106 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData200.java | 107 + src-trl/src/org/openbravo/translate/RTLSkin.java | 50 +- src-trl/src/org/openbravo/translate/Translate.java | 6 +- src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedOrgModuleDatasets.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedOrgModuleDatasetsData.class | 0 src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedOrgModuleDatasets.java | 59 + src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedOrgModuleDatasets_data.xsql | 32 + src-util/modulescript/build/classes/org/openbravo/modulescript/GrantAccessToProcessDefinition.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/GrantAccessToProcessDefinitionData.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeInventoryStatus.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeInventoryStatusData.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/PopulateADOrgTree.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/PopulateADOrgTreeData.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateFinTransactionAmount.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateFinTransactionAmountData.class | 0 src-util/modulescript/src/org/openbravo/modulescript/GrantAccessToProcessDefinition.java | 107 + src-util/modulescript/src/org/openbravo/modulescript/GrantAccessToProcessDefinition_data.xsql | 172 + src-util/modulescript/src/org/openbravo/modulescript/InitializeInventoryStatus.java | 51 + src-util/modulescript/src/org/openbravo/modulescript/InitializeInventoryStatus_data.xsql | 52 + src-util/modulescript/src/org/openbravo/modulescript/PopulateADOrgTree.java | 49 + src-util/modulescript/src/org/openbravo/modulescript/PopulateADOrgTree_data.xsql | 79 + src-util/modulescript/src/org/openbravo/modulescript/UpdateFinTransactionAmount.java | 49 + src-util/modulescript/src/org/openbravo/modulescript/UpdateFinTransactionAmount_data.xsql | 37 + src-wad/src/org/openbravo/wad/Wad_data.xsql | 8 +- src-wad/src/org/openbravo/wad/javasource.javaxml | 1 + src/index.jsp | 49 +- src/org/openbravo/authentication/AuthenticationManager.java | 29 +- src/org/openbravo/authentication/basic/DefaultAuthenticationManager.java | 12 +- src/org/openbravo/base/gen/GenerateEntitiesTask.java | 21 +- src/org/openbravo/base/gen/entityComputedColumns.ftl | 4 +- src/org/openbravo/base/secureApp/ErrorConnection.java | 4 +- src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 55 +- src/org/openbravo/base/secureApp/LoginHandler.java | 313 +- src/org/openbravo/base/secureApp/OrgTree.java | 135 +- src/org/openbravo/common/actionhandler/AgingBalanceReportActionHandler.java | 53 +- src/org/openbravo/common/actionhandler/ChangeInventoryStatusActionHandler.java | 60 + src/org/openbravo/common/actionhandler/RMInOutPickEditLines.java | 35 +- src/org/openbravo/common/actionhandler/RMShipmentPickEditLines.java | 8 +- src/org/openbravo/common/actionhandler/SRMOPickEditLines.java | 5 + src/org/openbravo/common/datasource/ReturnFromCustomerHQLInserter.java | 2 +- src/org/openbravo/common/datasource/StockReservationPickAndEditDataSource.java | 159 +- src/org/openbravo/common/hooks/InventoryStatusHookManager.java | 48 + src/org/openbravo/common/hooks/InventoryStatusValidationHook.java | 56 + src/org/openbravo/common/hooks/InventoryStatusValidationHookReservations.java | 44 + src/org/openbravo/common/hooks/InventoryStatusValidatorHookNegativeStock.java | 49 + src/org/openbravo/costing/CostAdjustmentProcess.java | 16 +- src/org/openbravo/costing/CostingAlgorithm.java | 31 +- src/org/openbravo/costing/CostingMigrationProcess.java | 69 +- src/org/openbravo/costing/CostingRuleProcess.java | 12 +- src/org/openbravo/costing/CostingUtils.java | 44 +- src/org/openbravo/costing/CostingUtils_data.xsql | 64 +- src/org/openbravo/costing/FixBackdatedTransactionsProcess.java | 7 +- src/org/openbravo/costing/PriceDifferenceProcess.java | 9 +- src/org/openbravo/dal/core/DalMappingGenerator.java | 27 +- src/org/openbravo/dal/security/EntityAccessChecker.java | 291 +- src/org/openbravo/dal/xml/XMLEntityConverter.java | 9 +- src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java | 4 + src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql | 3 +- src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct.java | 16 +- src/org/openbravo/erpCommon/ad_actionButton/DocAction.html | 3 +- src/org/openbravo/erpCommon/ad_actionButton/ProcessGoods.java | 7 +- src/org/openbravo/erpCommon/ad_callouts/DelegateConnectionProvider.java | 13 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 37 +- src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql | 10 +- src/org/openbravo/erpCommon/ad_forms/AlertManagement.html | 373 - src/org/openbravo/erpCommon/ad_forms/AlertManagement.java | 217 - src/org/openbravo/erpCommon/ad_forms/AlertManagement.xml | 51 - src/org/openbravo/erpCommon/ad_forms/AlertManagement_data.xsql | 142 - src/org/openbravo/erpCommon/ad_forms/Client_data.xsql | 35 - src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 14 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 18 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 14 +- src/org/openbravo/erpCommon/ad_forms/Organization_data.xsql | 38 - src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java | 20 +- src/org/openbravo/erpCommon/ad_forms/Role.html | 647 - src/org/openbravo/erpCommon/ad_forms/Role.java | 307 - src/org/openbravo/erpCommon/ad_forms/Role.xml | 54 - src/org/openbravo/erpCommon/ad_forms/RoleCombo_data.xsql | 54 - src/org/openbravo/erpCommon/ad_forms/Role_data.xsql | 83 - src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData.java | 40 +- src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData_data.xsql | 4 +- src/org/openbravo/erpCommon/ad_forms/Warehouse_data.xsql | 44 - src/org/openbravo/erpCommon/ad_process/ApplyModules.java | 6 +- src/org/openbravo/erpCommon/ad_process/DeleteClient.java | 5 +- src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java | 48 +- src/org/openbravo/erpCommon/ad_process/UpdateActuals.java | 18 +- src/org/openbravo/erpCommon/ad_reports/AgingDao.java | 33 +- src/org/openbravo/erpCommon/ad_reports/AgingDao_data.xsql | 14 +- src/org/openbravo/erpCommon/ad_reports/AgingScheduleDetailHTML.jrxml | 18 + src/org/openbravo/erpCommon/ad_reports/AgingScheduleHTML.jrxml | 20 +- src/org/openbravo/erpCommon/ad_reports/MInOutTraceReports.html | 3 +- src/org/openbravo/erpCommon/ad_reports/MInOutTraceReports.java | 92 +- src/org/openbravo/erpCommon/ad_reports/MInOutTraceReports.xml | 3 +- src/org/openbravo/erpCommon/ad_reports/MInOutTraceReports_data.xsql | 8 +- src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcel.java | 24 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_data.xsql | 14 +- src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.java | 25 +- src/org/openbravo/erpCommon/ad_reports/ReportProductMovement_data.xsql | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportPurchaseOrder.jrxml | 145 +- src/org/openbravo/erpCommon/ad_reports/ReportPurchaseOrderXLS.jrxml | 526 + src/org/openbravo/erpCommon/ad_reports/ReportValuationStock_data.xsql | 16 +- src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartner_data.xsql | 6 +- src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java | 49 +- src/org/openbravo/erpCommon/businessUtility/DataTypeCombo_data.xsql | 39 - src/org/openbravo/erpCommon/businessUtility/EndYearCloseUtility.java | 11 +- src/org/openbravo/erpCommon/businessUtility/Preferences.java | 54 +- src/org/openbravo/erpCommon/businessUtility/TabAttachments.java | 17 +- src/org/openbravo/erpCommon/info/BusinessPartner_data.xsql | 6 +- src/org/openbravo/erpCommon/info/ProductMultiple.java | 23 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 14 +- src/org/openbravo/erpCommon/security/Login.html | 470 +- src/org/openbravo/erpCommon/security/Login.java | 212 +- src/org/openbravo/erpCommon/security/Login_F0.html | 25 - src/org/openbravo/erpCommon/security/Login_F0.xml | 21 - src/org/openbravo/erpCommon/security/Login_F1.html | 351 - src/org/openbravo/erpCommon/security/Login_F1.xml | 26 - src/org/openbravo/erpCommon/security/Login_FS_RTL.html | 2 +- src/org/openbravo/erpCommon/security/Login_Logo.html | 38 - src/org/openbravo/erpCommon/security/Login_Logo.xml | 24 - src/org/openbravo/erpCommon/security/Login_Options_F1.html | 304 - src/org/openbravo/erpCommon/security/Login_Options_F1.xml | 47 - src/org/openbravo/erpCommon/security/Login_Welcome.html | 82 - src/org/openbravo/erpCommon/security/Login_Welcome.xml | 23 - src/org/openbravo/erpCommon/security/Menu.java | 21 +- src/org/openbravo/erpCommon/security/SessionListener.java | 18 +- src/org/openbravo/erpCommon/security/SessionLogin.java | 12 +- src/org/openbravo/erpCommon/security/SessionLogin_data.xsql | 2 +- src/org/openbravo/erpCommon/security/UsageAudit.java | 136 +- src/org/openbravo/erpCommon/utility/ComboTableData.java | 25 +- src/org/openbravo/erpCommon/utility/DynamicJS.java | 5 +- src/org/openbravo/erpCommon/utility/ErrorTextParserPOSTGRE.java | 11 +- src/org/openbravo/erpCommon/utility/Home.html | 169 - src/org/openbravo/erpCommon/utility/Home.java | 132 - src/org/openbravo/erpCommon/utility/Home.xml | 32 - src/org/openbravo/erpCommon/utility/InventoryStatusUtils.java | 129 + src/org/openbravo/erpCommon/utility/Log.html | 47 - src/org/openbravo/erpCommon/utility/Log.java | 52 - src/org/openbravo/erpCommon/utility/Log.xml | 21 - src/org/openbravo/erpCommon/utility/Menu_data.xsql | 218 - src/org/openbravo/erpCommon/utility/Utility.java | 39 +- src/org/openbravo/erpCommon/utility/Utility_data.xsql | 22 +- src/org/openbravo/erpCommon/utility/VerticalMenu.html | 36 - src/org/openbravo/erpCommon/utility/VerticalMenu.java | 503 +- src/org/openbravo/erpCommon/utility/VerticalMenuLoading.html | 34 - src/org/openbravo/erpCommon/utility/VerticalMenu_data.xsql | 66 - src/org/openbravo/jmx/MBeanRegistry.java | 69 + src/org/openbravo/materialmgmt/InventoryCountProcess.java | 13 +- src/org/openbravo/materialmgmt/ReservationUtils.java | 62 +- src/org/openbravo/materialmgmt/StockUtils.java | 23 +- src/org/openbravo/materialmgmt/StockUtils_data.xsql | 8 +- src/org/openbravo/materialmgmt/UOMUtil.java | 4 +- src/org/openbravo/reference/ui/UITable.java | 10 +- src/org/openbravo/reference/ui/UITableDir.java | 10 +- src/org/openbravo/service/db/DalConnectionProvider.java | 3 + src/org/openbravo/service/importprocess/ImportEntryPostProcessor.java | 2 +- src/org/openbravo/service/importprocess/ImportEntryProcessor.java | 13 - src/org/openbravo/service/system/SystemService.java | 76 +- src/org/openbravo/service/web/BaseWebServiceServlet.java | 51 +- web/js/login.js | 621 + web/js/shortcuts.js | 2 +- web/js/utils.js | 135 +- web/skins/Default/Login/communityBrandingBackground.png | 0 web/skins/Default/Login/communityBrandingBottom.png | 0 web/skins/Default/Login/communityBrandingTop.png | 0 web/skins/Default/Menu/ToolBar/iconAlert.disabled.png | 0 web/skins/Default/Menu/ToolBar/iconAlert.png | 0 web/skins/Default/Menu/ToolBar/iconAlertActive.disabled.png | 0 web/skins/Default/Menu/ToolBar/iconAlertActive.png | 0 web/skins/Default/Menu/ToolBar/iconContract.disabled.png | 0 web/skins/Default/Menu/ToolBar/iconContract.png | 0 web/skins/Default/Menu/ToolBar/iconExpand.png | 0 web/skins/Default/Menu/ToolBar/iconLogout.disabled.png | 0 web/skins/Default/Menu/ToolBar/iconLogout.png | 0 web/skins/Default/Menu/ToolBar/iconUser.disabled.png | 0 web/skins/Default/Openbravo_ERP_250.css | 252 +- 486 files changed, 139750 insertions(+), 13894 deletions(-) diffs (truncated from 199756 to 300 lines): diff -r 7fd66b51c666 -r 60cfd9ca8856 .hgsigs --- a/.hgsigs Thu May 18 07:56:34 2017 +0000 +++ b/.hgsigs Mon Jul 03 11:29:02 2017 +0000 @@ -209,4 +209,9 @@ fa51600e25b24b2eb3739898d293168ea94748a7 0 iEYEABECAAYFAlh/u8wACgkQCX/oGf+2qkPTnwCfZ29b107GdizLBcC+tzdP3HlnmUUAoN2kMLXvfTYSRLAQG/ziGm5P6kYA 9753e90ea3e81f850f904feb531120b4e185394a 0 iEYEABECAAYFAliG6A8ACgkQCX/oGf+2qkPeeQCg6D9p++eslvzqEVlYK8RS0uzgZNsAoMELVWkte/AM/ilPxZ4vP37myscv a131c85d1d3d55b852f97622ce068baf80b7fe67 0 iEYEABECAAYFAli+qu8ACgkQCX/oGf+2qkNTOACfTznbhwkwUplXd8QjHIuJ7uBJdK4An3KWtbUrBZleCwS1xH3aa2n9p9bM +ff9ea5ead18501d3c6d2f782e38e172be08f8106 0 iEYEABECAAYFAlkDMfYACgkQCX/oGf+2qkPbaACfXUmwNxLBVRvD7cvYA4LinaJkUzAAoI5N7GpMTNy/NYMXetEOhuwPfSO5 3a7510a5ee0b43ac0a65e4eae9b089f42158bbe0 0 iEYEABECAAYFAljGfFgACgkQCX/oGf+2qkOgoQCgx3u3UhiV8NyyiBZLsFjlwicCp1EAoPAl4mZZ6/wURPq39Ef6Rtbe1BRb +835355e0fdbd35df49b4b559a4ce984192350fd2 0 iEYEABECAAYFAlkVX0kACgkQCX/oGf+2qkMVEQCfasQyxkrJdtvkEP03xKFyiwAi2f0AnRRguCtQ0qKkra8Kg55F7/9oKS7p +1ec47090dc22cda681ebf04a2ea7491b971bb24d 0 iEYEABECAAYFAllLmP4ACgkQCX/oGf+2qkMZvgCggmmfbWJEY/hgJWXzwmfsSEHcEzkAoMGb1VsoDMaU/TIjFRvnCRXoj7Eh +74c2ec78cab6580e2c5fd67e4c7913924339df58 0 iEYEABECAAYFAlkdU7MACgkQCX/oGf+2qkMs3wCguelDCm09norUvWOnB7m/+X66yyMAoKr/DzyFXmSZTrlta3cfBpn5BY6v +0e959ce9b986f2770ac4ac02296a59adaafdc919 0 iEYEABECAAYFAllSJLwACgkQCX/oGf+2qkOkKACfWiWW37hMTW9d4fneU+4JJsG//LYAoLkOPDVyEZCTY/IpOEuXT0hHKE9e diff -r 7fd66b51c666 -r 60cfd9ca8856 .hgtags --- a/.hgtags Thu May 18 07:56:34 2017 +0000 +++ b/.hgtags Mon Jul 03 11:29:02 2017 +0000 @@ -220,4 +220,9 @@ b93f495b2cde680cf6558d93d72051429f4b9031 3.0PR16Q4.1 31c79a32ce3a6b555dadb35c70d63113be6312e7 3.0PR16Q4.2 eaeb76d8cd4ec1caf5bf43bc9b4111424d799a03 3.0PR16Q4.3 +3995bf60960bff841f256fa98746aa6aa0f642f2 3.0PR16Q4.4 273c24deef8f21e870cf563073cc653582a9fe9e 3.0PR17Q1 +10c0ffee4e6ccca6771d151dd27f706e50cf4b96 3.0PR17Q1.1 +a2e2a8540b6e64102d4e019efc36ad05c7f43b24 3.0PR17Q1.2 +7fd66b51c666e341168a7e5a036f7ac25a86eec9 3.0PR17Q2 +c37991aee21566d0ed397369377abdaeaf1a6f52 3.0PR17Q2.1 diff -r 7fd66b51c666 -r 60cfd9ca8856 build.xml --- a/build.xml Thu May 18 07:56:34 2017 +0000 +++ b/build.xml Mon Jul 03 11:29:02 2017 +0000 @@ -12,7 +12,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2001-2015 Openbravo SLU +* All portions are Copyright (C) 2001-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -485,7 +485,7 @@ property="test.md5.wad"/> </target> - <target name="compile.complete.development" depends="init" unless="mode.war"> + <target name="compile.complete.development" depends="init, core.lib, wad.lib, trl.lib" unless="mode.war"> <updatesystemstatus v="RB43"/> <ant dir="${base.src}" target="compile.complete.development" inheritAll="true" inheritRefs="true" /> </target> diff -r 7fd66b51c666 -r 60cfd9ca8856 legal/Licensing.txt --- a/legal/Licensing.txt Thu May 18 07:56:34 2017 +0000 +++ b/legal/Licensing.txt Mon Jul 03 11:29:02 2017 +0000 @@ -3,7 +3,7 @@ This license file applies to the Openbravo ERP software (the "Openbravo Software"), except as described below. -This product is Copyright 2001-2016 Openbravo S.L.U. For other detailed notice, +This product is Copyright 2001-2017 Openbravo S.L.U. For other detailed notice, see the "NOTICE" file with this distribution. This product is free software; you can redistribute it and/or modify diff -r 7fd66b51c666 -r 60cfd9ca8856 lib/README --- a/lib/README Thu May 18 07:56:34 2017 +0000 +++ b/lib/README Mon Jul 03 11:29:02 2017 +0000 @@ -1,3 +1,4 @@ When adding or removing libraries to Openbravo ERP please update this page with your changes: http://wiki.openbravo.com/wiki/Openbravo_Libraries + diff -r 7fd66b51c666 -r 60cfd9ca8856 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Thu May 18 07:56:34 2017 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Mon Jul 03 11:29:02 2017 +0000 @@ -489,6 +489,8 @@ WHERE fin_payment_scheduledetail_id = v_scheduledetailid; v_scheduledetailamount := v_scheduledetailamount - v_differenceamount; + ELSE + v_differenceamount := 0; END IF; IF (v_differenceamount = 0 OR (v_count <> 0 AND NOT v_psdbreakbypartialpayment)) THEN diff -r 7fd66b51c666 -r 60cfd9ca8856 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml Thu May 18 07:56:34 2017 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml Mon Jul 03 11:29:02 2017 +0000 @@ -16,7 +16,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2014 Openbravo SLU +* All portions are Copyright (C) 2014-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -25,6 +25,7 @@ v_referencelist VARCHAR2(32):='575BCB88A4694C27BC013DE9C73E6FE7'; BEGIN + -- Check if the status exists SELECT count(*) INTO v_count FROM DUAL WHERE EXISTS (SELECT 1 FROM ad_ref_list @@ -32,7 +33,8 @@ AND value = status); IF (v_count = 0) THEN - RETURN 'N'; + -- If status is null, return minimum value for invoice paid status (RPR or PPM) + RETURN '40'; END IF; SELECT seqno diff -r 7fd66b51c666 -r 60cfd9ca8856 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu May 18 07:56:34 2017 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Jul 03 11:29:02 2017 +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.31787]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.32382]]></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> @@ -25,7 +25,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <UPDATEINFO><![CDATA[Fixed issue with document sequence numbers reset in case of applying dataset second time. Fixed issue 15305.]]></UPDATEINFO> <!--A918E3331C404B889D69AA9BFAFB23AC--> <REFERENCEDATAINFO><![CDATA[Document types and default algorithm for bank statement auto matching]]></REFERENCEDATAINFO> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION_LABEL><![CDATA[PR17Q2]]></VERSION_LABEL> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED> <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE> diff -r 7fd66b51c666 -r 60cfd9ca8856 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 May 18 07:56:34 2017 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Jul 03 11:29:02 2017 +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.31787]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.32382]]></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.31787]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.32382]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 7fd66b51c666 -r 60cfd9ca8856 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PREFERENCE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PREFERENCE.xml Thu May 18 07:56:34 2017 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PREFERENCE.xml Mon Jul 03 11:29:02 2017 +0000 @@ -55,61 +55,6 @@ <!--9B4A5EB695FEA841E040A8C0E1077381--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--9B4A5EB695FEA841E040A8C0E1077381--></AD_PREFERENCE> -<!--9B4A5EB69751A841E040A8C0E1077381--><AD_PREFERENCE> -<!--9B4A5EB69751A841E040A8C0E1077381--> <AD_PREFERENCE_ID><![CDATA[9B4A5EB69751A841E040A8C0E1077381]]></AD_PREFERENCE_ID> -<!--9B4A5EB69751A841E040A8C0E1077381--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--9B4A5EB69751A841E040A8C0E1077381--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--9B4A5EB69751A841E040A8C0E1077381--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--9B4A5EB69751A841E040A8C0E1077381--> <ATTRIBUTE><![CDATA[ModalProcess3C4A5FB206B74C3CA9FE20116FCA0464]]></ATTRIBUTE> -<!--9B4A5EB69751A841E040A8C0E1077381--> <VALUE><![CDATA[N]]></VALUE> -<!--9B4A5EB69751A841E040A8C0E1077381--> <ISPROPERTYLIST><![CDATA[N]]></ISPROPERTYLIST> -<!--9B4A5EB69751A841E040A8C0E1077381--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--9B4A5EB69751A841E040A8C0E1077381--></AD_PREFERENCE> - -<!--9B4A5EB69752A841E040A8C0E1077381--><AD_PREFERENCE> -<!--9B4A5EB69752A841E040A8C0E1077381--> <AD_PREFERENCE_ID><![CDATA[9B4A5EB69752A841E040A8C0E1077381]]></AD_PREFERENCE_ID> -<!--9B4A5EB69752A841E040A8C0E1077381--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--9B4A5EB69752A841E040A8C0E1077381--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--9B4A5EB69752A841E040A8C0E1077381--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--9B4A5EB69752A841E040A8C0E1077381--> <ATTRIBUTE><![CDATA[ModalProcess4A059E4F79294640AD37B1B718C56E5D]]></ATTRIBUTE> -<!--9B4A5EB69752A841E040A8C0E1077381--> <VALUE><![CDATA[N]]></VALUE> -<!--9B4A5EB69752A841E040A8C0E1077381--> <ISPROPERTYLIST><![CDATA[N]]></ISPROPERTYLIST> -<!--9B4A5EB69752A841E040A8C0E1077381--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--9B4A5EB69752A841E040A8C0E1077381--></AD_PREFERENCE> - -<!--9B4A5EB69756A841E040A8C0E1077381--><AD_PREFERENCE> -<!--9B4A5EB69756A841E040A8C0E1077381--> <AD_PREFERENCE_ID><![CDATA[9B4A5EB69756A841E040A8C0E1077381]]></AD_PREFERENCE_ID> -<!--9B4A5EB69756A841E040A8C0E1077381--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--9B4A5EB69756A841E040A8C0E1077381--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--9B4A5EB69756A841E040A8C0E1077381--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--9B4A5EB69756A841E040A8C0E1077381--> <ATTRIBUTE><![CDATA[ModalProcessBBA11D1A061346459AF6148920FE6629]]></ATTRIBUTE> -<!--9B4A5EB69756A841E040A8C0E1077381--> <VALUE><![CDATA[N]]></VALUE> -<!--9B4A5EB69756A841E040A8C0E1077381--> <ISPROPERTYLIST><![CDATA[N]]></ISPROPERTYLIST> -<!--9B4A5EB69756A841E040A8C0E1077381--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--9B4A5EB69756A841E040A8C0E1077381--></AD_PREFERENCE> - -<!--9B4A5EB69758A841E040A8C0E1077381--><AD_PREFERENCE> -<!--9B4A5EB69758A841E040A8C0E1077381--> <AD_PREFERENCE_ID><![CDATA[9B4A5EB69758A841E040A8C0E1077381]]></AD_PREFERENCE_ID> -<!--9B4A5EB69758A841E040A8C0E1077381--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--9B4A5EB69758A841E040A8C0E1077381--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--9B4A5EB69758A841E040A8C0E1077381--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--9B4A5EB69758A841E040A8C0E1077381--> <ATTRIBUTE><![CDATA[ModalProcessD5B90B539C254B959045EDCA1DC99BDF]]></ATTRIBUTE> -<!--9B4A5EB69758A841E040A8C0E1077381--> <VALUE><![CDATA[N]]></VALUE> -<!--9B4A5EB69758A841E040A8C0E1077381--> <ISPROPERTYLIST><![CDATA[N]]></ISPROPERTYLIST> -<!--9B4A5EB69758A841E040A8C0E1077381--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--9B4A5EB69758A841E040A8C0E1077381--></AD_PREFERENCE> - -<!--9B4A5EB6975CA841E040A8C0E1077381--><AD_PREFERENCE> -<!--9B4A5EB6975CA841E040A8C0E1077381--> <AD_PREFERENCE_ID><![CDATA[9B4A5EB6975CA841E040A8C0E1077381]]></AD_PREFERENCE_ID> -<!--9B4A5EB6975CA841E040A8C0E1077381--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--9B4A5EB6975CA841E040A8C0E1077381--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--9B4A5EB6975CA841E040A8C0E1077381--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--9B4A5EB6975CA841E040A8C0E1077381--> <ATTRIBUTE><![CDATA[ModalProcessE54287EE357C493EB127DC3BA1758751]]></ATTRIBUTE> -<!--9B4A5EB6975CA841E040A8C0E1077381--> <VALUE><![CDATA[N]]></VALUE> -<!--9B4A5EB6975CA841E040A8C0E1077381--> <ISPROPERTYLIST><![CDATA[N]]></ISPROPERTYLIST> -<!--9B4A5EB6975CA841E040A8C0E1077381--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--9B4A5EB6975CA841E040A8C0E1077381--></AD_PREFERENCE> - <!--C2250516BAB0443AA56D758F10186E09--><AD_PREFERENCE> <!--C2250516BAB0443AA56D758F10186E09--> <AD_PREFERENCE_ID><![CDATA[C2250516BAB0443AA56D758F10186E09]]></AD_PREFERENCE_ID> <!--C2250516BAB0443AA56D758F10186E09--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 7fd66b51c666 -r 60cfd9ca8856 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Thu May 18 07:56:34 2017 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Mon Jul 03 11:29:02 2017 +0000 @@ -90,7 +90,7 @@ <!--2700A962BC484D4C9B3E30B1C3C66BFB--> <ISSORTTAB><![CDATA[N]]></ISSORTTAB> <!--2700A962BC484D4C9B3E30B1C3C66BFB--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--2700A962BC484D4C9B3E30B1C3C66BFB--> <UIPATTERN><![CDATA[RO]]></UIPATTERN> -<!--2700A962BC484D4C9B3E30B1C3C66BFB--> <HQLWHERECLAUSE><![CDATA[e.status in ('RPR', 'PPM') and e.amount <>0 and exists ( select 1 from FinancialMgmtFinAccPaymentMethod as fapm join fapm.account as fa where fapm.paymentMethod = e.paymentMethod and fa.id = @FIN_Financial_Account.id@ and (case when e.receipt = true then fapm.payinAllow else fapm.payoutAllow end) = true and fa.currency = e.account.currency) and not exists (select 1 from FIN_Finacc_Transaction as ft where e = ft.finPayment) and AD_ISORGINCLUDED(e.organization.id, @FIN_Financial_Account.organization@, e.client.id)<>-1]]></HQLWHERECLAUSE> +<!--2700A962BC484D4C9B3E30B1C3C66BFB--> <HQLWHERECLAUSE><![CDATA[e.status in ('RPR', 'PPM') and e.amount <> 0 and exists (select 1 from FinancialMgmtFinAccPaymentMethod as fapm join fapm.account as fa where fapm.paymentMethod = e.paymentMethod and fa.id = @FIN_Financial_Account.id@ and (case when e.receipt = true then fapm.payinAllow else fapm.payoutAllow end) = true and fa.currency = e.account.currency) and not exists (select 1 from FIN_Finacc_Transaction as ft where e = ft.finPayment) and exists (select 1 from OrganizationTree as ot where ot.organization.id = e.organization.id and ot.parentOrganization.id = @FIN_Financial_Account.organization@ and ot.client.id = e.client.id)]]></HQLWHERECLAUSE> <!--2700A962BC484D4C9B3E30B1C3C66BFB--> <HQLORDERBYCLAUSE><![CDATA[paymentDate, documentNo]]></HQLORDERBYCLAUSE> <!--2700A962BC484D4C9B3E30B1C3C66BFB--> <HQLFILTERCLAUSE><![CDATA[e.account.id = @FIN_Financial_Account.id@]]></HQLFILTERCLAUSE> <!--2700A962BC484D4C9B3E30B1C3C66BFB--> <FILTERNAME><![CDATA[Payments are filtered by the selected Financial Account]]></FILTERNAME> diff -r 7fd66b51c666 -r 60cfd9ca8856 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml Thu May 18 07:56:34 2017 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml Mon Jul 03 11:29:02 2017 +0000 @@ -1841,6 +1841,7 @@ <!--BF4F039785D24BA6B93A2494B89F0C47--> <OBUIAPP_PROCESS_ID><![CDATA[CC73C4845CDC487395804946EACB225F]]></OBUIAPP_PROCESS_ID> <!--BF4F039785D24BA6B93A2494B89F0C47--> <STARTINNEWLINE><![CDATA[Y]]></STARTINNEWLINE> <!--BF4F039785D24BA6B93A2494B89F0C47--> <DISPLAYLOGIC><![CDATA[(@c_currency_to_id@ ! @c_currency_from_id@) & @c_currency_to_id@!undefined]]></DISPLAYLOGIC> +<!--BF4F039785D24BA6B93A2494B89F0C47--> <READONLYLOGIC><![CDATA[OB.PropertyStore.get('NotAllowChangeExchange')='Y']]></READONLYLOGIC> <!--BF4F039785D24BA6B93A2494B89F0C47--> <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS> <!--BF4F039785D24BA6B93A2494B89F0C47--> <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE> <!--BF4F039785D24BA6B93A2494B89F0C47--> <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION> diff -r 7fd66b51c666 -r 60cfd9ca8856 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java Thu May 18 07:56:34 2017 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java Mon Jul 03 11:29:02 2017 +0000 @@ -1152,6 +1152,7 @@ * Payment amount */ private void updateCustomerCredit(BusinessPartner businessPartner, BigDecimal amount, boolean add) { + OBDal.getInstance().refresh(businessPartner); BigDecimal creditUsed = businessPartner.getCreditUsed(); if (add) { creditUsed = creditUsed.add(amount); @@ -1160,7 +1161,7 @@ } businessPartner.setCreditUsed(creditUsed); OBDal.getInstance().save(businessPartner); - // OBDal.getInstance().flush(); + OBDal.getInstance().flush(); } private void increaseCustomerCredit(BusinessPartner businessPartner, BigDecimal amount) { diff -r 7fd66b51c666 -r 60cfd9ca8856 modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-findTransaction.js --- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-findTransaction.js Thu May 18 07:56:34 2017 +0000 +++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-findTransaction.js Mon Jul 03 11:29:02 2017 +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) 2014-2016 Openbravo SLU + * All portions are Copyright (C) 2014-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -34,16 +34,16 @@ var i, trxSelection = view.getContextInfo().findtransactiontomatch._selection; if (trxSelection && trxSelection[0]) { - var totalTrxAmt = 0, - blineAmt = view.callerField.record.amount, + var totalTrxAmt = BigDecimal.prototype.ZERO, + blineAmt = new BigDecimal(String(view.callerField.record.amount)), hideSplitConfirmation = OB.PropertyStore.get('APRM_MATCHSTATEMENT_HIDE_PARTIALMATCH_POPUP', view.windowId); for (i = 0; i < trxSelection.length; i++) { - var trxDepositAmt = trxSelection[i].depositAmount, - trxPaymentAmt = trxSelection[i].paymentAmount, - trxAmt = trxDepositAmt - trxPaymentAmt; - totalTrxAmt = totalTrxAmt + trxAmt; + var trxDepositAmt = new BigDecimal(String(trxSelection[i].depositAmount)), + trxPaymentAmt = new BigDecimal(String(trxSelection[i].paymentAmount)), + trxAmt = trxDepositAmt.subtract(trxPaymentAmt); + totalTrxAmt = totalTrxAmt.add(trxAmt); } - if (totalTrxAmt !== blineAmt) { + if (totalTrxAmt.compareTo(blineAmt) !== 0) { // Split required if (hideSplitConfirmation === 'Y') { // Continue with the match diff -r 7fd66b51c666 -r 60cfd9ca8856 modules/org.openbravo.apachejdbcconnectionpool/lib/runtime/tomcat-jdbc.jar Binary file modules/org.openbravo.apachejdbcconnectionpool/lib/runtime/tomcat-jdbc.jar has changed diff -r 7fd66b51c666 -r 60cfd9ca8856 modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml Thu May 18 07:56:34 2017 +0000 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml Mon Jul 03 11:29:02 2017 +0000 ------------------------------------------------------------------------------ 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
