details: https://code.openbravo.com/erp/devel/main/rev/6f7049882ed1 changeset: 35615:6f7049882ed1 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Mar 18 14:13:03 2019 +0100 summary: fixed bug 40406: logs from callouts don't include callout class name
details: https://code.openbravo.com/erp/devel/main/rev/b2200ff8f174 changeset: 35616:b2200ff8f174 user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Fri Apr 12 14:54:40 2019 +0200 summary: Fixed issue 40605: NPE if email timeout is not set Adding another null check to verify not only in the case that the email config does not exist, but also that the timeout value is empty. In both cases the default timeout should be used. details: https://code.openbravo.com/erp/devel/main/rev/35616a3d9406 changeset: 35617:35616a3d9406 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Apr 17 12:57:28 2019 +0200 summary: fixed bug 40655: Discounts and Promotions window fails under some circumstances When Discount and Promotions view was requested having previously initialized ADCS with that window via FIC a LazyInitializationException was thrown. The problem is this window has a tree reference field which was partially initialized in ADCS. details: https://code.openbravo.com/erp/devel/main/rev/310543258ee7 changeset: 35618:310543258ee7 user: Nono Carballo <nonofce <at> gmail.com> date: Tue Apr 23 11:11:37 2019 +0200 summary: Fixes issue 40639 fix match business partner by token Fix match business partner by token in import bank statement process Do properly the get in businessPartnersScroll details: https://code.openbravo.com/erp/devel/main/rev/7bd38943f1ba changeset: 35619:7bd38943f1ba user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Wed Apr 24 13:20:11 2019 +0200 summary: Fixed issue 40672 Fix query to compare organization with corresponding id. Fix query to compare organization with corresponding id instead of the business object. Fix wrong filter date, period.getEndingDate() is used and the correct one is period.getStartingDate(). details: https://code.openbravo.com/erp/devel/main/rev/04e077fb1d4c changeset: 35620:04e077fb1d4c user: Nono Carballo <nonofce <at> gmail.com> date: Thu Apr 25 12:39:23 2019 +0200 summary: Fixes issue 40682: Prevents use of string concatenation in query Query to get business partners was formed using string concatenation. This fix replaces the string concatenation by bind parameters in query. details: https://code.openbravo.com/erp/devel/main/rev/bbf97c4e9834 changeset: 35621:bbf97c4e9834 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Thu Apr 25 13:12:34 2019 +0200 summary: related to issue 40682 code review changes details: https://code.openbravo.com/erp/devel/main/rev/416f9ae5960c changeset: 35622:416f9ae5960c user: Nono Carballo <nonofce <at> gmail.com> date: Tue Apr 30 13:04:51 2019 +0200 summary: Fixes issue 40703: Escapes values printed to servlet response Escapes values before printing them to Servlet response. details: https://code.openbravo.com/erp/devel/main/rev/f6572fcebdf7 changeset: 35623:f6572fcebdf7 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Apr 11 08:32:00 2019 +0200 summary: fixed issue 40713: HelpWindow.generateWindow is not using bind-variables details: https://code.openbravo.com/erp/devel/main/rev/a22198c21e23 changeset: 35624:a22198c21e23 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu May 02 16:41:04 2019 +0200 summary: fixes bug 40644: centralize in XMLUtils creation of objects to deal with XML details: https://code.openbravo.com/erp/devel/main/rev/4f276eb2112c changeset: 35625:4f276eb2112c user: Nono Carballo <nonofce <at> gmail.com> date: Thu May 02 12:00:38 2019 -0400 summary: Fixes issue 40700: Uses bind parameters in query Instead of using string concatenation to form the query, bind parameters are used. details: https://code.openbravo.com/erp/devel/main/rev/240b635f238d changeset: 35626:240b635f238d user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Fri May 03 09:54:13 2019 +0200 summary: Related to issue 40700: code review improvements Centralize localStrLine definition in just one line, when it's used. Change parameter names to make more difficult to have conflicts with user defined params. Remove 'if' for corner case. This creates a very small change in this scenario: select 'RecordId: ' || @RecordId@ || ', Line: ' || @Line@ from dual When Line is null then: Before: NULL After: RecordId: 3232199ED4824EE3A07BCC1E580ABFE7, Line: NULL details: https://code.openbravo.com/erp/devel/main/rev/2a604c499abc changeset: 35627:2a604c499abc user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon May 06 11:49:42 2019 +0200 summary: fixes issue 40743: wrong export to CSV having the grid filtered by a date time After the following changeset[1], exporting the grid to CSV was not working properly having the grid filtered by a date time column. Although the fix is correct, it caused the criteria sent to the datasource in this type of requests to stop being handled properly. To avoid this problem, when exporting to CSV a grid filtered by a date time column we send in the criteria the plain date (in the same way as it is being done for the standard grid DS requests) and the datasource will take care of building the date filter properly through the AdvancedQueryBuilder. [1] https://code.openbravo.com/erp/devel/pi/rev/90ee5c965823996a7b4c0ae17d3a3ca71e3fc703 details: https://code.openbravo.com/erp/devel/main/rev/0ec858b516d0 changeset: 35628:0ec858b516d0 user: Jorge Garcia <jorge.garcia <at> openbravo.com> date: Mon May 06 16:46:57 2019 +0200 summary: Fixed issue 40791: Roles require back-office access to log in to mobile apps MobileLoginHandler does a back-office login to later select mobile default role, it expects back-office to fail and keep session in case of restricted role login attempt. Back-office login handler was changed to fail and remove session in case there is no back-office role in current user's list. This made not possible to log in to mobile apps. Now if logging in to a mobile application session is kept after failure as it was before. details: https://code.openbravo.com/erp/devel/main/rev/aa8cc9d96cad changeset: 35629:aa8cc9d96cad user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon May 06 16:47:56 2019 +0200 summary: Fixes issue 40782: Standard properties are taken from underlying window in P&E When a P&E window contains a grid and a request to the datasource of the P&E window is done, it is not clear whether the P&E grid or the underlying grid standard properties (tabId, tableId, windowId, etc) should be included in the contextInfo. Before this changeset [1] was pushed, the standard properties were taken from the underlying grid. The changeset modified the behaviour, so that the P&E grid standard properties were included instead. This was necessary because the SelectorConstants.includeOrgFilter method needed the table ID of the P&E grid. But the change caused another problem: Some OBBindings were relying on the underlying grid standard properties being included in the contextInfo. To fix both problems, now a new property called inpPickAndExecuteTableId is included when doing a request from a P&E grid, and that property is referenced by SelectorConstants.includeOrgFilter. The contextInfo now will include the standard properties of the underlying grid, as it was done before [1]. [1] https://code.openbravo.com/erp/devel/pi/rev/1ed089db27e7036cf53026ca873dbcf104d79bb9 details: https://code.openbravo.com/erp/devel/main/rev/5a9355cfa0e6 changeset: 35630:5a9355cfa0e6 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue May 07 10:47:21 2019 +0000 summary: Update AD_MODULE version to 3.0PR19Q1.1 details: https://code.openbravo.com/erp/devel/main/rev/10080fe6bda1 changeset: 35631:10080fe6bda1 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue May 07 10:47:21 2019 +0000 summary: Added tag 3.0PR19Q1.1 for changeset 5a9355cfa0e6 details: https://code.openbravo.com/erp/devel/main/rev/2650aefaceb3 changeset: 35632:2650aefaceb3 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue May 07 10:47:22 2019 +0000 summary: Added signature for changeset 10080fe6bda1 details: https://code.openbravo.com/erp/devel/main/rev/af7b28db9ff6 changeset: 35633:af7b28db9ff6 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed May 08 11:49:29 2019 +0000 summary: Merge temporary head for 3.0PR19Q1.1 diffstat: .classpath.template | 5 +- .hgsigs | 5 + .hgtags | 5 + .settings/org.eclipse.wst.common.component.template | 4 - build.xml | 5 +- config/userconfig.xml.template | 58 - legal/Licensing.txt | 20 +- lib/README | 1 + lib/runtime/avalon-framework-4.1.5.jar | Bin lib/runtime/barcode4j-fop-ext-complete.jar | Bin lib/runtime/batik-anim.jar | Bin lib/runtime/batik-awt-util.jar | Bin lib/runtime/batik-bridge.jar | Bin lib/runtime/batik-css.jar | Bin lib/runtime/batik-dom.jar | Bin lib/runtime/batik-ext.jar | Bin lib/runtime/batik-gvt.jar | Bin lib/runtime/batik-parser.jar | Bin lib/runtime/batik-script.jar | Bin lib/runtime/batik-svg-dom.jar | Bin lib/runtime/batik-svggen.jar | Bin lib/runtime/batik-util.jar | Bin lib/runtime/batik-xml.jar | Bin lib/runtime/commons-collections-3.2.1.jar | Bin lib/runtime/commons-collections-3.2.2.jar | Bin lib/runtime/fop-1.1.jar | Bin lib/runtime/xmlgraphics-commons-1.5.jar | Bin modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.xml | 14 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 12 + 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/ad_forms/Transactions.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 9 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_FinaccTransactionEventListener.java | 6 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_PaymentEventListener.java | 10 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_ReconciliationEventListener.java | 6 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js | 38 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js | 11 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js | 14 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-utilities.js | 21 +- 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.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/ParameterCdiTest.java | 2 +- modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/ParameterCdiTestRule.java | 12 +- modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/WeldBaseTest.java | 10 +- modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/DalPersistanceEventTest.java | 4 +- modules/org.openbravo.client.application/lib/runtime/guice-2.0.jar | Bin modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml | 5 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 43 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml | 28 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 28 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 288 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 26 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 23 + 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-test/org/openbravo/client/application/test/ADCSInitialization.java | 15 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/DisplayLogicAtServerLevelTest.java | 4 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/DynamicExpressionParserTest.java | 6 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/GenerateTypesJSTest.java | 10 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/MenuTemplateTest.java | 4 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/MenuTest.java | 4 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/StandardWindowTest.java | 4 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/StaticResourceTest.java | 6 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/DatasourceEventObserver.java | 6 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/ObserverBaseTest.java | 4 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderLineTestObserver.java | 82 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderTestObserver.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java | 10 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java | 16 + modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachmentConfigEventHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachmentMetadataEventHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/DefaultsUploadDataActionHandler.java | 52 + modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/ImportBPSet.java | 138 + modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/ImportProductInDiscount.java | 119 + modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/ProcessUploadedFile.java | 262 + modules/org.openbravo.client.application/src/org/openbravo/client/application/event/AcctSchemaEventHandler.java | 34 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/BusinessPartnerBankAccountHandler.java | 6 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/DataPoolSelectionEventHandler.java | 7 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ElementValueEventHandler.java | 24 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/FieldHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/GeneralLedgerOrganizationHandler.java | 11 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/LocationSettingsHandler.java | 14 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/MenuCacheHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ModuleHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/NoteEventHandler.java | 9 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/RemoveImagesEventHandler.java | 42 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ReorderCascadingChildDeletionsHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/RoleAccessUniqueHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/SetDocumentNoHandler.java | 14 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TableEventHandler.java | 155 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TableTreeEventHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TreeTablesEventHandler.java | 10 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/UsageAuditHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/WindowPersonalizationEventHandler.java | 6 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java | 2 + modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java | 83 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/example/grid-example.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-manager.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-calendar.js | 38 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-multicalendar.js | 24 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js | 12 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js | 16 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search-attribute.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js | 16 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree-filter.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-onchange-registry.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-notes.js | 3 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 50 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 61 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-event-handler-registry.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view-datasource.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 28 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js | 19 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/materialmgmt/ob-reservation.js | 3 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/materialmgmt/ob-reservedGoodMovement.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-application-menu.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-logout-widget.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quickrun-widget.js | 3 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-popups.js | 3 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization-treegrid.js | 11 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js | 16 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-attachment-window-view.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-base-parameter-window-view.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js | 18 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 18 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/test/ob-utilities-valid-url-test.js | 29 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/upload/ob-upload-bp-select-button.js | 49 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/upload/ob-upload-bp-select-popup.js | 57 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/upload/ob-upload-popup.js | 344 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/upload/ob-upload-product-button.js | 31 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-history-manager.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-keyboard-manager.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-property-store.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-recent-utilities.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-remote-call-manager.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-test-registry.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-date.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js | 13 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js | 19 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/toolbar/iconButton-import.png | Bin modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-upload-styles.css | 35 + 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/FreemarkerTemplateProcessorTest.java | 6 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/freemarker/test/GenerateComponentTest.java | 6 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/freemarker/test/LabelTest.java | 10 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/test/CompressionTest.java | 2 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/test/KernelUtilTest.java | 8 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/test/TemplateResolverTest.java | 20 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/test/test-compression.js | 40 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/event/EntityPersistenceEventObserver.java | 5 +- 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/WidgetProvider.java | 65 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-about-popup.js | 6 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-community-branding-widget.js | 10 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js | 14 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js | 5 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/test/ob-myopenbravo-test.js | 10 +- 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/CheckOptionalFilterCallout.java | 144 +- modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js | 10 +- 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.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-test/org/openbravo/service/datasource/test/DataSourceJavaScriptTest.java | 6 +- modules/org.openbravo.service.datasource/src-test/org/openbravo/service/datasource/test/DataSourceServiceProviderTest.java | 6 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java | 39 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/HQLDataSourceService.java | 5 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java | 34 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java | 16 +- 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-test/org/openbravo/service/json/test/DataQueryServiceTest.java | 23 +- modules/org.openbravo.service.json/src-test/org/openbravo/service/json/test/JsonConversionTest.java | 5 +- modules/org.openbravo.service.json/src-test/org/openbravo/service/json/test/JsonReadRestTest.java | 36 +- modules/org.openbravo.service.json/src-test/org/openbravo/service/json/test/JsonRestTest.java | 5 +- modules/org.openbravo.service.json/src-test/org/openbravo/service/json/test/JsonUpdateRestTest.java | 28 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java | 64 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DataEntityQueryService.java | 13 +- 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-test/org/openbravo/userinterface/selectors/test/ExpressionsTest.java | 13 +- modules/org.openbravo.userinterface.selector/src-wad/org/openbravo/userinterface/selector/wad/WADSelector.java | 26 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorFieldHandler.java | 4 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/classic-skin-variable.js | 3 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 16 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-link-widget.js | 3 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js | 18 +- 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.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 | 48 - 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_PROCESS_ACCESS.xml | 672 - referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml | 1338 +- 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 | 420 + referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml | 99 +- referencedata/sampledata/F_B_International_Group/C_CONVERSION_RATE.xml | 36 + referencedata/sampledata/F_B_International_Group/C_INVOICE.xml | 4476 +- referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml | 8923 + referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml | 4302 + 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 | 11807 +- referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml | 3655 + 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/C_PERIOD.xml | 432 + referencedata/sampledata/F_B_International_Group/C_PERIODCONTROL.xml | 16128 + referencedata/sampledata/F_B_International_Group/C_PERIODCONTROL_LOG.xml | 456 + referencedata/sampledata/F_B_International_Group/C_YEAR.xml | 34 + referencedata/sampledata/F_B_International_Group/FACT_ACCT.xml | 48146 +++- referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENT.xml | 44 + referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENTLINE.xml | 1260 + referencedata/sampledata/F_B_International_Group/FIN_FINACC_TRANSACTION.xml | 1794 + referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml | 8 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml | 2046 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_DETAIL.xml | 864 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml | 203 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml | 540 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml | 130228 +++++---- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml | 1284 +- 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 | 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 | 2110 +- referencedata/sampledata/F_B_International_Group/M_INOUT.xml | 2932 +- referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml | 4670 + 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_PRODUCT.xml | 120 + referencedata/sampledata/F_B_International_Group/M_STORAGE_DETAIL.xml | 296 +- referencedata/sampledata/F_B_International_Group/M_STORAGE_PENDING.xml | 52 +- referencedata/sampledata/F_B_International_Group/M_TRANSACTION.xml | 6120 + referencedata/sampledata/F_B_International_Group/M_TRANSACTION_COST.xml | 3468 + referencedata/sampledata/F_B_International_Group/OBUIAPP_PROCESS_ACCESS.xml | 280 + referencedata/sampledata/QA_Testing/AD_PROCESS_ACCESS.xml | 238 - referencedata/sampledata/QA_Testing/M_INOUT.xml | 32 - referencedata/sampledata/QA_Testing/M_PRODUCT.xml | 148 + referencedata/sampledata/QA_Testing/M_PRODUCTPRICE.xml | 108 + referencedata/sampledata/QA_Testing/M_PRODUCT_ACCT.xml | 68 + referencedata/sampledata/QA_Testing/M_PRODUCT_SERVICE.xml | 156 + referencedata/sampledata/QA_Testing/M_PRODUCT_SERVICELINKED.xml | 31 + src-core/.classpath | 8 +- src-core/src/org/openbravo/base/ConfigParameters.java | 12 +- src-core/src/org/openbravo/base/HttpBaseServlet.java | 124 +- src-core/src/org/openbravo/base/VariablesBase.java | 15 +- src-core/src/org/openbravo/xmlEngine/ErrorManagement.java | 17 +- src-core/src/org/openbravo/xmlEngine/Report.java | 46 - src-core/src/org/openbravo/xmlEngine/XmlEngine.java | 450 +- src-db/database/build.xml | 54 +- src-db/database/lib/dbsourcemanager.jar | Bin src-db/database/model/functions/C_GETINVOICESTATUSFROMSHIPMENT.xml | 6 +- src-db/database/model/functions/C_GETTAX.xml | 13 +- src-db/database/model/functions/C_INVOICE_POST.xml | 8 + src-db/database/model/functions/C_ORDER_POST1.xml | 23 +- src-db/database/model/functions/M_INOUT_CREATE.xml | 14 +- src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml | 4 +- src-db/database/model/functions/M_INOUT_POST.xml | 28 +- src-db/database/model/functions/M_PRODUCTION_RUN.xml | 12 +- src-db/database/model/functions/M_RESERVATION_CONSUMPTION.xml | 27 +- src-db/database/model/prescript-PostgreSql.sql | 16 +- src-db/database/model/tables/C_BPARTNER.xml | 5 + src-db/database/model/tables/C_BP_SET.xml | 52 + src-db/database/model/tables/C_BP_SET_LINE.xml | 73 + src-db/database/model/tables/C_ORDER.xml | 8 + src-db/database/model/tables/M_COSTADJUSTMENTLINE.xml | 2 +- src-db/database/model/tables/M_INOUT.xml | 5 - src-db/database/model/tables/M_OFFER.xml | 4 + src-db/database/model/tables/M_OFFER_BP_SET.xml | 65 + src-db/database/model/tables/M_PRODUCT.xml | 14 +- src-db/database/model/tables/M_PRODUCT_SERVICELINKED.xml | 72 + src-db/database/model/triggers/C_ORDERLINE_SERVICEREL_TRG.xml | 131 + src-db/database/model/triggers/GL_JL_CHK_RESTRICTIONS_TRG.xml | 5 +- src-db/database/sourcedata/AD_COLUMN.xml | 2099 +- src-db/database/sourcedata/AD_DATASET_TABLE.xml | 56 + src-db/database/sourcedata/AD_ELEMENT.xml | 202 +- src-db/database/sourcedata/AD_FIELD.xml | 1256 +- src-db/database/sourcedata/AD_MENU.xml | 42 +- src-db/database/sourcedata/AD_MESSAGE.xml | 24 + src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 84 - src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 150 - src-db/database/sourcedata/AD_MODEL_OBJECT_PARA.xml | 44 - src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_PROCESS.xml | 118 - src-db/database/sourcedata/AD_PROCESS_PARA.xml | 20 + src-db/database/sourcedata/AD_REFERENCE.xml | 36 + src-db/database/sourcedata/AD_REF_LIST.xml | 69 + src-db/database/sourcedata/AD_TAB.xml | 189 +- src-db/database/sourcedata/AD_TABLE.xml | 128 + src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 913 +- src-db/database/sourcedata/AD_TREENODE.xml | 55 +- src-db/database/sourcedata/AD_WINDOW.xml | 47 + src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 52 + src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 40 + src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml | 18 + src-db/database/sourcedata/referencedData/AD_LANGUAGE.xml | 15 + src-test/.classpath.template | 4 +- src-test/src/org/openbravo/test/AllAntTaskTests.java | 10 +- src-test/src/org/openbravo/test/AllWebserviceTests.java | 6 +- src-test/src/org/openbravo/test/base/TestConstants.java | 6 +- src-test/src/org/openbravo/test/centralbroker/CentralBrokerTest.java | 242 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/JSONUtils.java | 118 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/OrderData.java | 290 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/OrderLineData.java | 368 +- src-test/src/org/openbravo/test/copyLinesFromOrders/data/UOMManagementUtil.java | 262 +- src-test/src/org/openbravo/test/costing/TestCosting.java | 6 +- src-test/src/org/openbravo/test/costing/TestIssue39616.java | 121 + src-test/src/org/openbravo/test/costing/TestIssue39888.java | 383 + src-test/src/org/openbravo/test/costing/assertclass/ProductTransactionAssert.java | 13 +- src-test/src/org/openbravo/test/costing/utils/TestCostingConstants.java | 3 + src-test/src/org/openbravo/test/costing/utils/TestCostingUtils.java | 309 +- src-test/src/org/openbravo/test/createlinesfrom/data/InvoiceLineData.java | 144 +- src-test/src/org/openbravo/test/createlinesfrom/data/OrderLineData.java | 146 +- src-test/src/org/openbravo/test/createlinesfrom/data/ShipmentInOutLineData.java | 126 +- src-test/src/org/openbravo/test/datasource/OpenRecordAfterLogin.java | 100 + src-test/src/org/openbravo/test/datasource/OrganizationWindowRoleFilterTest.java | 104 + src-test/src/org/openbravo/test/security/StandardCrossOrganizationReference.java | 26 +- src-test/src/org/openbravo/test/system/ImportEntryBuilderTest.java | 231 + src-test/src/org/openbravo/test/system/Issue29934Test.java | 6 +- src-test/src/org/openbravo/test/taxes/ModifyTaxesTest.java | 277 + src-test/src/org/openbravo/test/taxes/data/OrderLineRelTestData.java | 39 + src-test/src/org/openbravo/test/taxes/data/OrderLineTestData.java | 91 + src-test/src/org/openbravo/test/taxes/data/OrderTestData.java | 94 + src-test/src/org/openbravo/test/views/ConfigurableTransactionalFilters.java | 135 + src-test/src/org/openbravo/test/views/ViewGeneration.java | 35 +- src-test/src/org/openbravo/test/views/ViewGenerationTest.java | 66 + src-test/src/org/openbravo/test/webservice/WSAddRecordWithComputedColumns.java | 2 - src-trl/src/org/openbravo/translate/FlipImage.java | 2 +- src-trl/src/org/openbravo/translate/LocalEntityResolver.java | 4 +- src-trl/src/org/openbravo/translate/RTLSkin.java | 3 +- src-trl/src/org/openbravo/translate/Translate.java | 29 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/CopyLog4jConfigurationFromTemplates.java | 3 +- src-wad/.classpath | 1 - src-wad/src/org/openbravo/wad/Wad.java | 9 +- src-wad/src/org/openbravo/wad/web.xml | 3 +- src/org/openbravo/authentication/AuthenticationManager.java | 4 +- src/org/openbravo/authentication/basic/DefaultAuthenticationManager.java | 12 +- src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 46 +- src/org/openbravo/common/actionhandler/AgingBalanceReportActionHandler.java | 1096 +- src/org/openbravo/common/actionhandler/RelateProductCatTaxToServiceProduct.java | 118 + src/org/openbravo/common/actionhandler/ServicesModifyTaxCopyConfiguration.java | 122 + src/org/openbravo/common/actionhandler/SetNewBPCurrency.java | 794 +- src/org/openbravo/common/actionhandler/createlinesfromprocess/InOutLineData.java | 186 +- src/org/openbravo/common/datasource/InOutLinePEHQLTransformer.java | 9 +- src/org/openbravo/common/datasource/ServiceModifyTaxProductCategoryTransformer.java | 49 + src/org/openbravo/configuration/ConfigurationApp.java | 4 +- src/org/openbravo/costing/AverageCostAdjustment.java | 59 +- src/org/openbravo/costing/CancelCostAdjustment.java | 3 +- src/org/openbravo/costing/CostAdjustmentLineParameters.java | 270 + src/org/openbravo/costing/CostAdjustmentUtils.java | 91 +- src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java | 61 +- src/org/openbravo/costing/CostingServer.java | 16 +- src/org/openbravo/costing/FixBackdatedTransactionsProcess.java | 10 +- src/org/openbravo/costing/LCMatchingProcess.java | 13 +- src/org/openbravo/costing/LandedCostProcess.java | 15 +- src/org/openbravo/costing/ManualCostAdjustmentProcessHandler.java | 10 +- src/org/openbravo/costing/PriceDifferenceProcess.java | 9 +- src/org/openbravo/costing/StandardCostAdjustment.java | 6 +- src/org/openbravo/dal/core/OBInterceptor.java | 14 +- src/org/openbravo/dal/xml/StaxXMLEntityConverter.java | 16 +- src/org/openbravo/email/EmailUtils.java | 170 +- src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java | 42 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple.java | 409 - src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_FS.html | 32 - src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_FS.xml | 22 - src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_Receipt.html | 845 - src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_Receipt.xml | 46 - src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_Receipt_data.xsql | 109 - src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_Shipment.html | 705 - src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_Shipment.xml | 60 - src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_Shipment_data.xsql | 94 - src/org/openbravo/erpCommon/ad_callouts/AUM_ConversionRate.java | 170 +- src/org/openbravo/erpCommon/ad_callouts/DelegateConnectionProvider.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/GtinFormat.java | 84 +- src/org/openbravo/erpCommon/ad_callouts/SE_Payment_BPartner.java | 6 +- src/org/openbravo/erpCommon/ad_callouts/SL_CreateFromMultiple_Conversion.java | 138 - src/org/openbravo/erpCommon/ad_callouts/SL_CreateFromMultiple_Product.java | 189 - src/org/openbravo/erpCommon/ad_callouts/SL_CreateFromMultiple_Warehouse.java | 105 - src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java | 7 +- src/org/openbravo/erpCommon/ad_callouts/SysInfoCustomAllowed.java | 9 +- src/org/openbravo/erpCommon/ad_forms/About.html | 8 +- src/org/openbravo/erpCommon/ad_forms/About.java | 9 +- src/org/openbravo/erpCommon/ad_forms/About.xml | 4 +- src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.java | 7 +- src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.xml | 10 +- src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending_data.xsql | 7 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 66 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagementDetails.html | 6 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagementDetails.xml | 3 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 12 +- src/org/openbravo/erpCommon/ad_reports/ReportPricelist.fo | 115 - src/org/openbravo/erpCommon/ad_reports/ReportPricelist.html | 486 - src/org/openbravo/erpCommon/ad_reports/ReportPricelist.java | 212 - src/org/openbravo/erpCommon/ad_reports/ReportPricelist.xml | 66 - src/org/openbravo/erpCommon/ad_reports/ReportPricelist_Pdf.xml | 34 - src/org/openbravo/erpCommon/ad_reports/ReportPricelist_data.xsql | 80 - src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalyses.fo | 767 - src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalyses.java | 650 - src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalysesEdition.html | 511 - src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalysesEdition.xml | 286 - src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalysesEditionPDF.xml | 289 - src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalysesFilter.html | 882 - src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalysesFilter.xml | 107 - src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalysesPDF.java | 397 - src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalyses_data.xsql | 333 - src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html | 5 +- src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEnv.html | 384 - src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEnv.java | 208 - src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEnv.xml | 53 - src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEnvEdit.html | 67 - src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEnvEdit.xml | 35 - src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEnv_data.xsql | 54 - src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java | 2 +- src/org/openbravo/erpCommon/businessUtility/CloneOrderHook.java | 80 +- src/org/openbravo/erpCommon/businessUtility/CloneOrderHookCaller.java | 120 +- src/org/openbravo/erpCommon/info/AttributeSetInstance.html | 20 +- src/org/openbravo/erpCommon/modules/ModuleBox.srpt | 6 +- src/org/openbravo/erpCommon/modules/ModuleBox.xml | 4 +- src/org/openbravo/erpCommon/obps/ActiveInstanceProcess.java | 15 +- src/org/openbravo/erpCommon/security/Login.html | 2 +- src/org/openbravo/erpCommon/utility/CashVATUtil.java | 117 +- src/org/openbravo/erpCommon/utility/ImageUtils.java | 378 +- src/org/openbravo/erpCommon/utility/ToolBar.java | 912 +- src/org/openbravo/erpCommon/utility/ToolBar_Link.java | 75 - src/org/openbravo/erpReports/RptMA_CCP_Group.fo | 270 - src/org/openbravo/erpReports/RptMA_CCP_Group.java | 96 - src/org/openbravo/erpReports/RptMA_CCP_Group.xml | 30 - src/org/openbravo/erpReports/RptMA_CCP_Group_data.xsql | 46 - src/org/openbravo/erpReports/RptMA_CCP_Measures.fo | 183 - src/org/openbravo/erpReports/RptMA_CCP_Measures.java | 99 - src/org/openbravo/erpReports/RptMA_CCP_Measures.xml | 35 - src/org/openbravo/erpReports/RptMA_CCP_Measures_Hours.fo | 31 - src/org/openbravo/erpReports/RptMA_CCP_Measures_Hours.xml | 27 - src/org/openbravo/erpReports/RptMA_CCP_Measures_Hours_data.xsql | 46 - src/org/openbravo/erpReports/RptMA_CCP_Measures_Values.fo | 31 - src/org/openbravo/erpReports/RptMA_CCP_Measures_Values.xml | 30 - src/org/openbravo/erpReports/RptMA_CCP_Measures_Values_data.xsql | 58 - src/org/openbravo/erpReports/RptMA_CCP_Measures_data.xsql | 47 - src/org/openbravo/event/ADTableEventHandler.java | 186 +- src/org/openbravo/event/ADTableNavigationEventHandler.java | 8 +- src/org/openbravo/event/BusinessPartnerEventHandler.java | 7 +- src/org/openbravo/event/CharacteristicValueEventHandler.java | 12 +- src/org/openbravo/event/ConversionRateEventHandler.java | 8 +- src/org/openbravo/event/DocTypeEventHandler.java | 7 +- src/org/openbravo/event/FaccAcctModifyEventHandler.java | 7 +- src/org/openbravo/event/GLItemAccountsEventHandler.java | 136 +- src/org/openbravo/event/GLJournalEventHandler.java | 7 +- src/org/openbravo/event/GLJournalLineEventHandler.java | 6 +- src/org/openbravo/event/InvoiceEventHandler.java | 7 +- src/org/openbravo/event/InvoiceLineEventHandler.java | 22 +- src/org/openbravo/event/InvoiceTaxEventHandler.java | 7 +- src/org/openbravo/event/MInOutLineEventHandler.java | 7 +- src/org/openbravo/event/OrderDiscountEventHandler.java | 7 +- src/org/openbravo/event/OrderEventHandler.java | 617 +- src/org/openbravo/event/OrderLineEventHandler.java | 9 +- src/org/openbravo/event/PaidStatusEventHandler.java | 26 +- src/org/openbravo/event/PeriodEventHandler.java | 12 +- src/org/openbravo/event/ProcessRequestEventHandler.java | 285 +- src/org/openbravo/event/ProductAumEventHandler.java | 256 +- src/org/openbravo/event/ProductCharacteristicEventHandler.java | 31 +- src/org/openbravo/event/ProductCharacteristicValueEventHandler.java | 11 +- src/org/openbravo/event/ProductEventHandler.java | 11 +- src/org/openbravo/event/ProductPriceObserver.java | 7 +- src/org/openbravo/event/ProductServiceConfigurationObserver.java | 6 +- src/org/openbravo/event/ProductionLineEventHandler.java | 201 +- src/org/openbravo/event/ReferenceInventoryEventHandler.java | 4 +- src/org/openbravo/event/RoleEventHandler.java | 8 +- src/org/openbravo/event/ServiceOrderLineEventHandler.java | 21 +- src/org/openbravo/event/ServicePriceRuleRangeEventHandler.java | 14 +- src/org/openbravo/event/ServiceRelationEventHandler.java | 7 +- src/org/openbravo/event/SimpleGLJournalEventHandler.java | 10 +- src/org/openbravo/event/SubsetValueEventHandler.java | 10 +- src/org/openbravo/event/UOMConversionEventHandler.java | 25 +- src/org/openbravo/materialmgmt/InventoryCountProcess.java | 79 +- src/org/openbravo/materialmgmt/InvoiceGeneratorFromGoodsShipment.java | 18 +- src/org/openbravo/materialmgmt/ServiceDeliverUtility.java | 162 + src/org/openbravo/materialmgmt/UOMUtil.java | 814 +- src/org/openbravo/materialmgmt/VariantAutomaticGenerationProcess.java | 12 +- src/org/openbravo/materialmgmt/VariantChDescUpdateProcess.java | 12 +- src/org/openbravo/role/inheritance/InheritedAccessEnabledEventHandler.java | 23 +- src/org/openbravo/role/inheritance/RoleInheritanceEventHandler.java | 8 +- src/org/openbravo/service/importprocess/ImportEntryAlreadyExistsException.java | 45 + src/org/openbravo/service/importprocess/ImportEntryBuilder.java | 249 + src/org/openbravo/service/importprocess/ImportEntryManager.java | 113 +- src/org/openbravo/service/importprocess/ImportEntryProcessor.java | 8 +- src/org/openbravo/service/system/DatabaseValidator.java | 32 +- src/org/openbravo/service/system/SystemValidationResult.java | 5 +- src/org/openbravo/services/webservice/Module.java | 242 +- src/org/openbravo/services/webservice/Module1.java | 1164 +- src/org/openbravo/services/webservice/Module2.java | 234 +- src/org/openbravo/services/webservice/ModuleDependency.java | 442 +- src/org/openbravo/services/webservice/ModuleInstallDetail.java | 416 +- src/org/openbravo/services/webservice/SimpleModule.java | 230 +- src/org/openbravo/services/webservice/SimpleModule1.java | 873 +- src/org/openbravo/services/webservice/SimpleModule2.java | 222 +- src/org/openbravo/services/webservice/WebService3Impl.java | 38 +- src/org/openbravo/services/webservice/WebService3ImplService.java | 10 +- src/org/openbravo/services/webservice/WebService3ImplServiceLocator.java | 235 +- src/org/openbravo/services/webservice/WebService3SoapBindingImpl.java | 88 +- src/org/openbravo/services/webservice/WebService3SoapBindingStub.java | 1260 +- web/js/login.js | 56 +- web/js/productCharacteristicsProcess.js | 6 +- web/js/utils.js | 2 +- web/skins/Default/Openbravo_ERP_250.css | 16 +- 553 files changed, 218863 insertions(+), 90542 deletions(-) diffs (truncated from 383397 to 300 lines): diff -r 66655fa79949 -r af7b28db9ff6 .classpath.template --- a/.classpath.template Wed Mar 27 12:05:20 2019 +0000 +++ b/.classpath.template Wed May 08 11:49:29 2019 +0000 @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0"/> + <classpathentry combineaccessrules="false" exported="true" kind="src" path="/OpenbravoCore"/> <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> - <classpathentry combineaccessrules="false" exported="true" kind="src" path="/OpenbravoTrl"/> - <classpathentry combineaccessrules="false" exported="true" kind="src" path="/OpenbravoWAD"/> <classpathentry including="**/*.ext|**/*.ftl|**/*.java|**/*.oaw|**/*.properties|**/*.xml|**/*.xpt|**/*.xslt" kind="src" path="src"/> <classpathentry kind="src" path="modules/org.openbravo.apachejdbcconnectionpool/src"/> <classpathentry kind="src" path="modules/org.openbravo.client.widgets/src"/> @@ -27,6 +25,7 @@ <classpathentry including="**/*.java" kind="src" path="build/javasqlc/srcAD"/> <classpathentry including="**/*.java" kind="src" path="build/javasqlc/src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="lib" path="lib/build/servlet-api.jar"/> <classpathentry kind="lib" path="lib/build/js.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> diff -r 66655fa79949 -r af7b28db9ff6 .hgsigs --- a/.hgsigs Wed Mar 27 12:05:20 2019 +0000 +++ b/.hgsigs Wed May 08 11:49:29 2019 +0000 @@ -239,5 +239,10 @@ 6a52d785570ecc2a63ba164aa50efa0b463917bd 0 iEYEABECAAYFAlvXCzAACgkQCX/oGf+2qkP3xQCgqKlwdDqMVRAsTFoEwi8gK16UtRIAnRVH6VaLpC/Yh7OgsjpO+rzj9AKp 858933b8d4f0bd4ee7e278e2530a1b476a8e4fa9 0 iEYEABECAAYFAlv74bwACgkQCX/oGf+2qkNQCwCgl168atYYGOuVSkFeqvY6bAXC3m8An1eBFNK0jTdGC1TSahJ2gyQu/GOe 6f6d0aa1ad00e1429e8c9c3322a4f2548ba485c4 0 iEYEABECAAYFAlwjGDMACgkQCX/oGf+2qkNG7ACg378s5KJSDSn+XVb/oX2psQa/UAEAoKTvf3TWRu6zu26eDxZCDIXPJCvp +8b5dcae632a712dcd008a7b443275feabb96124d 0 iEYEABECAAYFAlxzd1cACgkQCX/oGf+2qkP4QwCbBrJsc3EKBLwCor/dKKpvZTeei6IAni7w8nCPCBT2wVoJpQct5hy4mBVZ 75b4bc3d1f6f172a24506f5f72ce3137fa23aa7b 0 iF0EABECAB0WIQQwlWrRXxlUdnEi7O8Jf+gZ/7aqQwUCXA380QAKCRAJf+gZ/7aqQz70AKCz/O6ZFoJ9ewfn1JayCUThy5+mrQCeMkwewiAYcsfmFxp16XA497wv158= e608a90d459c54db28903268ce5930e230af8e6f 0 iF0EABECAB0WIQQwlWrRXxlUdnEi7O8Jf+gZ/7aqQwUCXCMjxQAKCRAJf+gZ/7aqQzC/AJ9XbUfKrdRJWO2jbnBYCFGSeUQsDwCgiOfjBtc3k+hWxB6NWUPukzcduoo= +c508fdfd08e0165b19ce0b036057fb477ec53b2d 0 iF0EABECAB0WIQQwlWrRXxlUdnEi7O8Jf+gZ/7aqQwUCXHaDaQAKCRAJf+gZ/7aqQ+WQAKC9aZKEZiAzmHtHS2DU/BebakLrDwCgmPGmEdALKCn+hWjKUkLY6Yc5FbI= +ab23c5504c6082c745fd74bdbd8790040217373e 0 iF0EABECAB0WIQQwlWrRXxlUdnEi7O8Jf+gZ/7aqQwUCXLV8WwAKCRAJf+gZ/7aqQyGHAKCi6W3sN7+WShE66VENLwKlvrlWDQCeP0Fu2ITFgmftDOoad6iIaEogDCA= +6154268d4b94fc3e4eee2a6e42cc1bd2cb7c3988 0 iF0EABECAB0WIQQwlWrRXxlUdnEi7O8Jf+gZ/7aqQwUCXJtnAAAKCRAJf+gZ/7aqQxgWAKDD39xe/9/GPyV2/8flksKGQs+RlgCeM5lTApT6W4dcmB+5aN3yCDmDdlI= +10080fe6bda147693cc393a808d1c3b08717dff3 0 iF0EABECAB0WIQQwlWrRXxlUdnEi7O8Jf+gZ/7aqQwUCXNFiOQAKCRAJf+gZ/7aqQy9/AJ4uFDZAAKj7w4tDqWvjCgiwisMgLACfVhQYjql8qv4znV+JqTvNwQsa9Y0= diff -r 66655fa79949 -r af7b28db9ff6 .hgtags --- a/.hgtags Wed Mar 27 12:05:20 2019 +0000 +++ b/.hgtags Wed May 08 11:49:29 2019 +0000 @@ -250,5 +250,10 @@ b8cd708f773317970a8024f2e5b6c0ea4417e4b5 3.0PR18Q3.2 5a97b89aa2f1202519525757dcfb699ec267e794 3.0PR18Q3.3 9ea275f262ba099f339fa9f06a87836b605d6123 3.0PR18Q3.4 +a68402a5ca6f812dcf5a6b0b7505cbafc64384b6 3.0PR18Q3.5 9a7acd649cfcb6ea234c52263051d7e33e4ce333 3.0PR18Q4 a67abc7a3690347038295600eeb97f92460cc742 3.0PR18Q4.1 +c23ab3fedd95c122ea2e49cb4a9d6744f75dd975 3.0PR18Q4.2 +e735af032865638eb4f37c83926e20eae145819c 3.0PR18Q4.3 +66655fa7994900d014804a4d6cc7a88579c8fb9e 3.0PR19Q1 +5a9355cfa0e6a56f4eeba25c54650ab5c139121e 3.0PR19Q1.1 diff -r 66655fa79949 -r af7b28db9ff6 .settings/org.eclipse.wst.common.component.template --- a/.settings/org.eclipse.wst.common.component.template Wed Mar 27 12:05:20 2019 +0000 +++ b/.settings/org.eclipse.wst.common.component.template Wed May 08 11:49:29 2019 +0000 @@ -7,10 +7,6 @@ <wb-resource deploy-path="/WEB-INF/classes" source-path="/build/javasqlc/srcAD"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/build/javasqlc/src"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src-gen"/> -<wb-resource deploy-path="/WEB-INF/classes" source-path="/src-test"/> -<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/OpenbravoCore/OpenbravoCore"> -<dependency-type>uses</dependency-type> -</dependent-module> <property name="java-output-path" value="build/classes"/> <property name="context-root" value="openbravo"/> </wb-module> diff -r 66655fa79949 -r af7b28db9ff6 build.xml --- a/build.xml Wed Mar 27 12:05:20 2019 +0000 +++ b/build.xml Wed May 08 11:49:29 2019 +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-2018 Openbravo SLU +* All portions are Copyright (C) 2001-2019 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -536,7 +536,7 @@ </target> <target name="generate.java.doc"> - <javadoc Windowtitle="${title}" access="protected" Header="${header}" Footer="${footer}" destdir="${build.docs}" maxmemory="1024M" failonerror="yes" additionalparam="${xdoclint.missing} ${html.version}"> + <javadoc Windowtitle="${title}" access="protected" Header="${header}" Footer="${footer}" destdir="${build.docs}" maxmemory="1024M" failonerror="yes" additionalparam="${xdoclint.missing} ${html.version}" source="8"> <sourcepath> <pathelement path="${base.src}" /> <pathelement path="${base.src.test}/src" /> @@ -1004,7 +1004,6 @@ <pathelement path="${base.lib}/runtime/commons-dbcp-1.4.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" /> <pathelement path="${base.lib}/runtime/ant-launcher-1.9.2.jar" /> <pathelement path="${base.lib}/runtime/ant-apache-log4j-1.9.2.jar" /> diff -r 66655fa79949 -r af7b28db9ff6 config/userconfig.xml.template --- a/config/userconfig.xml.template Wed Mar 27 12:05:20 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!-- - ************************************************************************* - * The contents of this file are subject to the Openbravo Public License - * Version 1.1 (the "License"), being the Mozilla Public License - * version 1.1 with a permitted attribution clause ; you may not use - * this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.openbravo.com/legal/license.txt - * Software distributed under the License is distributed on an - * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing rights - * and limitations under the License. - * The Original Code is Openbravo ERP. - * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2005-2007 Openbravo SLU - * All Rights Reserved. - * Contributor(s): Openbravo S.L.U. - ************************************************************************ ---> - -<!--<!DOCTYPE configuration SYSTEM "config.dtd">--> -<!-- - this file contains templates which allow an user easy - configuration of Fop. Actually normally you don't need this configuration - file, but if you need to change configuration, you should - always use this file and *not* config.xml. - Usage: java org.apache.fop.apps.Fop -c userconfig.xml -fo fo-file -pdf pdf-file ---> - - -<configuration> - -<!-- -baseDir: normally the base directory is the directory where the fo file is - located. if you want to specify your own, uncomment this entry. - This value can also be a URL. Actually, the value is converted to - a URL. ---> -<!-- - <entry> - <key>baseDir</key> - <value></value> - </entry> ---> - -<!-- -fontBaseDir: Similar to baseDir, except that this value is used for fonts. If - it isn't specified, the value from baseDir is used. ---> -<!-- - <entry> - <key>fontBaseDir</key> - <value>/tmp</value> - </entry> ---> - -</configuration> diff -r 66655fa79949 -r af7b28db9ff6 legal/Licensing.txt --- a/legal/Licensing.txt Wed Mar 27 12:05:20 2019 +0000 +++ b/legal/Licensing.txt Wed May 08 11:49:29 2019 +0000 @@ -91,28 +91,13 @@ # ant-1.9.2.jar # ant-launcher-1.9.2.jar # ant-nodeps.jar -# avalon-framework-4.1.5.jar # axis-ant.jar # axis.jar -# barcode4j-fop-ext-complete.jar -# batik-anim.jar -# batik-awt-util.jar -# batik-bridge.jar -# batik-css.jar -# batik-dom.jar -# batik-ext.jar -# batik-gvt.jar -# batik-parser.jar -# batik-script.jar -# batik-svg-dom.jar -# batik-svggen.jar -# batik-util.jar -# batik-xml.jar # catalina-ant.jar # commons-beanutils-1.8.3.jar # commons-betwixt-0.8.jar # commons-codec-1.11.jar -# commons-collections-3.2.1.jar +# commons-collections-3.2.2.jar # commons-dbcp-1.4.jar # commons-digester-1.8.1.jar # commons-fileupload-1.2.2.jar @@ -120,7 +105,6 @@ # commons-lang-2.6.jar # commons-logging-1.2.jar # commons-pool-1.5.6.jar -# fop-1.1.jar # jakarta-oro-2.0.8.jar # jettison-1.3-patched.jar # log4j-api-2.11.1.jar @@ -133,7 +117,6 @@ # tika-core-0.9.jar # wstx-asl-3.0.2.jar # xercesImpl.jar -# xmlgraphics-commons-1.5.jar All files under Apache Software License 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 @@ -261,7 +244,6 @@ # httpcore-4.4.9.jar # httpclient-4.5.5.jar # httpmime-4.5.5.jar -# guice-2.0.jar # tomcat-juli.jar # tomcat-jdbc.jar # classmate-1.3.4.jar diff -r 66655fa79949 -r af7b28db9ff6 lib/README --- a/lib/README Wed Mar 27 12:05:20 2019 +0000 +++ b/lib/README Wed May 08 11:49:29 2019 +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 66655fa79949 -r af7b28db9ff6 lib/runtime/avalon-framework-4.1.5.jar Binary file lib/runtime/avalon-framework-4.1.5.jar has changed diff -r 66655fa79949 -r af7b28db9ff6 lib/runtime/barcode4j-fop-ext-complete.jar Binary file lib/runtime/barcode4j-fop-ext-complete.jar has changed diff -r 66655fa79949 -r af7b28db9ff6 lib/runtime/batik-anim.jar Binary file lib/runtime/batik-anim.jar has changed diff -r 66655fa79949 -r af7b28db9ff6 lib/runtime/batik-awt-util.jar Binary file lib/runtime/batik-awt-util.jar has changed diff -r 66655fa79949 -r af7b28db9ff6 lib/runtime/batik-bridge.jar Binary file lib/runtime/batik-bridge.jar has changed diff -r 66655fa79949 -r af7b28db9ff6 lib/runtime/batik-css.jar Binary file lib/runtime/batik-css.jar has changed diff -r 66655fa79949 -r af7b28db9ff6 lib/runtime/batik-dom.jar Binary file lib/runtime/batik-dom.jar has changed diff -r 66655fa79949 -r af7b28db9ff6 lib/runtime/batik-ext.jar Binary file lib/runtime/batik-ext.jar has changed diff -r 66655fa79949 -r af7b28db9ff6 lib/runtime/batik-gvt.jar Binary file lib/runtime/batik-gvt.jar has changed diff -r 66655fa79949 -r af7b28db9ff6 lib/runtime/batik-parser.jar Binary file lib/runtime/batik-parser.jar has changed diff -r 66655fa79949 -r af7b28db9ff6 lib/runtime/batik-script.jar Binary file lib/runtime/batik-script.jar has changed diff -r 66655fa79949 -r af7b28db9ff6 lib/runtime/batik-svg-dom.jar Binary file lib/runtime/batik-svg-dom.jar has changed diff -r 66655fa79949 -r af7b28db9ff6 lib/runtime/batik-svggen.jar Binary file lib/runtime/batik-svggen.jar has changed diff -r 66655fa79949 -r af7b28db9ff6 lib/runtime/batik-util.jar Binary file lib/runtime/batik-util.jar has changed diff -r 66655fa79949 -r af7b28db9ff6 lib/runtime/batik-xml.jar Binary file lib/runtime/batik-xml.jar has changed diff -r 66655fa79949 -r af7b28db9ff6 lib/runtime/commons-collections-3.2.1.jar Binary file lib/runtime/commons-collections-3.2.1.jar has changed diff -r 66655fa79949 -r af7b28db9ff6 lib/runtime/commons-collections-3.2.2.jar Binary file lib/runtime/commons-collections-3.2.2.jar has changed diff -r 66655fa79949 -r af7b28db9ff6 lib/runtime/fop-1.1.jar Binary file lib/runtime/fop-1.1.jar has changed diff -r 66655fa79949 -r af7b28db9ff6 lib/runtime/xmlgraphics-commons-1.5.jar Binary file lib/runtime/xmlgraphics-commons-1.5.jar has changed diff -r 66655fa79949 -r af7b28db9ff6 modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.xml Wed Mar 27 12:05:20 2019 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.xml Wed May 08 11:49:29 2019 +0000 @@ -15,12 +15,13 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2010-2016 Openbravo SLU +* All portions are Copyright (C) 2010-2019 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. *************************************************************************/ v_DateNull DATE := TO_DATE('01-01-1900','DD-MM-YYYY'); +v_Count NUMBER:=0; BEGIN @@ -51,6 +52,17 @@ )) THEN RAISE_APPLICATION_ERROR(-20000, '@20501@'); END IF; + IF(:OLD.PROCESSED='Y' AND :NEW.PROCESSED='N') THEN + SELECT COUNT(*) + INTO v_Count + FROM GL_JOURNALLINE + JOIN GL_JOURNAL ON GL_JOURNALLINE.GL_JOURNAL_ID = GL_JOURNAL.GL_JOURNAL_ID + WHERE GL_JOURNALLINE.FIN_PAYMENT_ID = :OLD.FIN_PAYMENT_ID + AND GL_JOURNAL.PROCESSED = 'Y'; + IF(v_Count > 0) THEN + RAISE_APPLICATION_ERROR(-20000,'@APRM_ReactivatePaymentInGLJournalLine@'); + END IF; + END IF; END IF; IF(INSERTING) THEN IF(:NEW.PROCESSED='Y') THEN diff -r 66655fa79949 -r af7b28db9ff6 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Wed Mar 27 12:05:20 2019 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Wed May 08 11:49:29 2019 +0000 @@ -1321,6 +1321,18 @@ <!--C6F7E24F731242D49A73C8C1A835A252--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--C6F7E24F731242D49A73C8C1A835A252--></AD_MESSAGE> _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
