details: https://code.openbravo.com/erp/devel/pi/rev/f8b3c7b29713 changeset: 33354:f8b3c7b29713 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Wed Dec 20 10:19:21 2017 +0100 summary: [ri] Added data model, windows and sequence management code
details: https://code.openbravo.com/erp/devel/pi/rev/c69f769821ef changeset: 33355:c69f769821ef user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Wed Dec 27 11:01:51 2017 +0100 summary: pi merge details: https://code.openbravo.com/erp/devel/pi/rev/a22d9a28aa45 changeset: 33356:a22d9a28aa45 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Fri Dec 29 13:38:16 2017 +0100 summary: [ri] Box and Unbox processes details: https://code.openbravo.com/erp/devel/pi/rev/9be04f5d1225 changeset: 33357:9be04f5d1225 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Fri Dec 29 14:37:00 2017 +0100 summary: [ri] New selector in StorageDetail.Locator details: https://code.openbravo.com/erp/devel/pi/rev/fb8c3042a73b changeset: 33358:fb8c3042a73b user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Fri Dec 29 14:38:34 2017 +0100 summary: [ri] Added ReferencedInventory to attribute set instance description details: https://code.openbravo.com/erp/devel/pi/rev/04a48cc378ad changeset: 33359:04a48cc378ad user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Fri Dec 29 14:51:20 2017 +0100 summary: [ri] Represent ReferencedInventoy inside [] in attribute desc details: https://code.openbravo.com/erp/devel/pi/rev/2694c0e34faf changeset: 33360:2694c0e34faf user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Fri Dec 29 14:52:37 2017 +0100 summary: pi merge details: https://code.openbravo.com/erp/devel/pi/rev/4d7da6554fa4 changeset: 33361:4d7da6554fa4 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Thu Jan 11 12:54:41 2018 +0100 summary: pi merge details: https://code.openbravo.com/erp/devel/pi/rev/0a880fe270e3 changeset: 33362:0a880fe270e3 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Thu Jan 11 17:55:17 2018 +0100 summary: [ri] Added validation RI in unique bin details: https://code.openbravo.com/erp/devel/pi/rev/7bfcf67078c7 changeset: 33363:7bfcf67078c7 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Thu Jan 11 18:15:48 2018 +0100 summary: [ri] Added validation to avoid child referenced inventories details: https://code.openbravo.com/erp/devel/pi/rev/96333f4e8e3a changeset: 33364:96333f4e8e3a user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Tue Jan 16 10:11:35 2018 +0100 summary: [ri] Referenced Inventory window is a Transactional window details: https://code.openbravo.com/erp/devel/pi/rev/22cb146141ab changeset: 33365:22cb146141ab user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Tue Jan 16 18:06:43 2018 +0100 summary: [ri] Fixed several issues In Box the new storage bin parameter must be mandatory Unbox did wrong verification on previously linked to a referenced inventory details: https://code.openbravo.com/erp/devel/pi/rev/2dc114a8ff74 changeset: 33366:2dc114a8ff74 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Tue Jan 16 18:50:05 2018 +0100 summary: [ri] getReferencedInventory only makes sense in boxing details: https://code.openbravo.com/erp/devel/pi/rev/040a7060b9a1 changeset: 33367:040a7060b9a1 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Wed Jan 17 12:01:15 2018 +0100 summary: [ri] Refactor in Processors to avoid code duplication details: https://code.openbravo.com/erp/devel/pi/rev/f512d8b9528a changeset: 33368:f512d8b9528a user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Wed Jan 17 13:44:16 2018 +0100 summary: [ri] Removed unused method details: https://code.openbravo.com/erp/devel/pi/rev/46b6eb6b6afb changeset: 33369:46b6eb6b6afb user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Wed Jan 17 13:52:41 2018 +0100 summary: [ri] Tests for Box and Unbox referenced inventory details: https://code.openbravo.com/erp/devel/pi/rev/512bf98320ac changeset: 33370:512bf98320ac user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Fri Jan 26 14:46:41 2018 +0100 summary: [ri] Support for reservations JUnit tests in progress details: https://code.openbravo.com/erp/devel/pi/rev/25957a7e0ab8 changeset: 33371:25957a7e0ab8 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Fri Jan 26 14:48:56 2018 +0100 summary: [ri] Added missed class details: https://code.openbravo.com/erp/devel/pi/rev/00e33753127b changeset: 33372:00e33753127b user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Tue Jan 30 17:06:01 2018 +0100 summary: [ri] minor fixes en tests details: https://code.openbravo.com/erp/devel/pi/rev/1439dc527358 changeset: 33373:1439dc527358 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Tue Jan 30 17:57:47 2018 +0100 summary: [ri] fixed getStorageDetails in tests details: https://code.openbravo.com/erp/devel/pi/rev/ef9afe6ac69d changeset: 33374:ef9afe6ac69d user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Tue Jan 30 18:02:40 2018 +0100 summary: [ri] removed useless method in tests and simplified test condition details: https://code.openbravo.com/erp/devel/pi/rev/18cc0ccf32d9 changeset: 33375:18cc0ccf32d9 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Tue Jan 30 19:14:44 2018 +0100 summary: [ri] properly test reservation qty in boxing details: https://code.openbravo.com/erp/devel/pi/rev/112969b9671b changeset: 33376:112969b9671b user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Wed Jan 31 11:12:58 2018 +0100 summary: [ri] Run more tests for all unboxing flows details: https://code.openbravo.com/erp/devel/pi/rev/a36eff7e40c5 changeset: 33377:a36eff7e40c5 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Wed Jan 31 11:31:33 2018 +0100 summary: [ri] More improvements in JUnit tests details: https://code.openbravo.com/erp/devel/pi/rev/0a236612e4b3 changeset: 33378:0a236612e4b3 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Wed Jan 31 12:05:08 2018 +0100 summary: [ri] removed useless null checks details: https://code.openbravo.com/erp/devel/pi/rev/9f6e87f7df94 changeset: 33379:9f6e87f7df94 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Wed Jan 31 12:12:50 2018 +0100 summary: [ri] removed useless throws details: https://code.openbravo.com/erp/devel/pi/rev/728a40ab5c04 changeset: 33380:728a40ab5c04 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Wed Jan 31 12:38:49 2018 +0100 summary: [ri] simplified unbox reservation tests details: https://code.openbravo.com/erp/devel/pi/rev/34fc6fb38acd changeset: 33381:34fc6fb38acd user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Wed Jan 31 12:51:50 2018 +0100 summary: [ri] improved unbox reservation tests details: https://code.openbravo.com/erp/devel/pi/rev/1420100d040e changeset: 33382:1420100d040e user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Wed Jan 31 12:57:59 2018 +0100 summary: [ri] extended allocated flag check details: https://code.openbravo.com/erp/devel/pi/rev/b6194fab841c changeset: 33383:b6194fab841c user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Wed Jan 31 13:35:06 2018 +0100 summary: [ri] Added storage details check after unboxing with reservations details: https://code.openbravo.com/erp/devel/pi/rev/4d914e35d389 changeset: 33384:4d914e35d389 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Thu Feb 01 18:31:20 2018 +0100 summary: [ri] Force Bin or Attribute at reservation header details: https://code.openbravo.com/erp/devel/pi/rev/403e657cc7e0 changeset: 33385:403e657cc7e0 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Thu Feb 01 19:30:18 2018 +0100 summary: pi merge details: https://code.openbravo.com/erp/devel/pi/rev/ea30d1a82a93 changeset: 33386:ea30d1a82a93 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Fri Feb 02 09:38:21 2018 +0100 summary: [ri] fixes issues found in CI details: https://code.openbravo.com/erp/devel/pi/rev/68286a8111ae changeset: 33387:68286a8111ae user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Fri Feb 02 09:57:46 2018 +0100 summary: [ri] Improvements in Box/Unbox grid details: https://code.openbravo.com/erp/devel/pi/rev/c8c0af829243 changeset: 33388:c8c0af829243 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Fri Feb 02 13:11:01 2018 +0100 summary: [ri] Avoid editing Attributes when linked to RI details: https://code.openbravo.com/erp/devel/pi/rev/0e7944b7e2ea changeset: 33389:0e7944b7e2ea user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Fri Feb 02 13:12:05 2018 +0100 summary: pi merge details: https://code.openbravo.com/erp/devel/pi/rev/f0d28fa52258 changeset: 33390:f0d28fa52258 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Fri Feb 02 13:45:29 2018 +0100 summary: [ri] Shared flag is always readonly details: https://code.openbravo.com/erp/devel/pi/rev/a4f5f31cd0db changeset: 33391:a4f5f31cd0db user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Fri Feb 02 14:30:34 2018 +0100 summary: [ri] Fixes exception in Oracle, Add reservation preference if necessary details: https://code.openbravo.com/erp/devel/pi/rev/fceb92c45957 changeset: 33392:fceb92c45957 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Mon Feb 05 10:04:17 2018 +0100 summary: Fixed issue 37827: [ri] Added Referenced Inventory support details: https://code.openbravo.com/erp/devel/pi/rev/e4712f47df43 changeset: 33393:e4712f47df43 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Mon Feb 05 10:16:55 2018 +0100 summary: Fixed issue 37827: [ri] Removed TODO as no need of hooks diffstat: .hgsigs | 3 + .hgtags | 3 + legal/Licensing.txt | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml | 6 - modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml | 6 - modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 17 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js | 9 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/ConnectionInitializerInterceptor.java | 26 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java | 15 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js | 28 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js | 12 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js | 20 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped_data.xsql | 40 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/BaseDataSourceService.java | 8 - modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceJavaScriptCreator.java | 236 - modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java | 4 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java | 17 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js | 54 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 22 +- referencedata/sampledata/QA_Testing/AD_PROCESS_ACCESS.xml | 42 - src-core/src/org/openbravo/base/ConfigParameters.java | 25 +- src-core/src/org/openbravo/database/SessionInfo.java | 110 +- src-db/database/model/functions/AD_SYNCHRONIZE.xml | 6 +- src-db/database/model/functions/A_ASSET_CREATE.xml | 2 - src-db/database/model/functions/A_ASSET_POST.xml | 26 +- src-db/database/model/functions/C_CHANGEPROJECTSTATUS.xml | 2 - src-db/database/model/functions/C_DEBT_PAYMENT_BALANCING_REP.xml | 7 +- src-db/database/model/functions/C_DP_MANAGEMENT_POST.xml | 3 - src-db/database/model/functions/C_INVOICELINE_TAX.xml | 7 +- src-db/database/model/functions/C_INVOICE_CANCEL.xml | 2 - src-db/database/model/functions/C_INVOICE_CREATE.xml | 9 +- src-db/database/model/functions/C_INVOICE_POST.xml | 13 +- src-db/database/model/functions/C_ORDER_POST1.xml | 51 +- src-db/database/model/functions/C_SETTLEMENT_POST.xml | 13 +- src-db/database/model/functions/C_TAXPAYMENT_POST.xml | 5 +- src-db/database/model/functions/C_VALIDCOMBINATION_CLONE.xml | 6 - src-db/database/model/functions/FACT_ACCT_RESET.xml | 12 - src-db/database/model/functions/GL_JOURNAL_POST.xml | 5 +- src-db/database/model/functions/MA_PRODUCTION_COST.xml | 10 +- src-db/database/model/functions/MA_STANDARD_COST_SEQUENCE.xml | 5 +- src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml | 27 +- src-db/database/model/functions/MA_WORKREQUIREMENT_CLOSE.xml | 2 - src-db/database/model/functions/MA_WORKREQUIREMENT_PROCESS.xml | 7 +- src-db/database/model/functions/MA_WRPHASE_CLOSE.xml | 2 - src-db/database/model/functions/M_DISCOUNTSCHEMA_RESEQ.xml | 2 - src-db/database/model/functions/M_FREIGHT_CALCULATE.xml | 4 - src-db/database/model/functions/M_GENERATE_AVERAGE_COSTS.xml | 2 - src-db/database/model/functions/M_GENERATE_STANDARD_COSTS.xml | 2 - src-db/database/model/functions/M_GET_STOCK_PARAM.xml | 2 +- src-db/database/model/functions/M_INOUTEXPLODEBOMNOTSTOCK.xml | 6 +- src-db/database/model/functions/M_INOUT_CREATE.xml | 2 - src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml | 5 +- src-db/database/model/functions/M_INOUT_UPDATEQUANTITYES.xml | 8 - src-db/database/model/functions/M_MOVEMENT_POST.xml | 28 +- src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml | 9 +- src-db/database/model/functions/M_PROMOTION_CALCULATE.xml | 3 +- src-db/database/model/functions/M_REQUISITION_CREATEPO.xml | 3 +- src-db/database/model/functions/M_UNIQUELOCATOR_RULE_PARAM.xml | 2 - src-db/database/model/functions/M_UPDATE_INVENTORY.xml | 17 +- src-db/database/model/tables/AD_CLUSTER_SERVICE.xml | 59 + src-db/database/model/tables/AD_CLUSTER_SERVICE_SETTINGS.xml | 56 + src-db/database/model/tables/C_INVOICELINE.xml | 3 + src-db/database/model/tables/C_ORDERLINE.xml | 1 + src-db/database/model/tables/M_ATTRIBUTESETINSTANCE.xml | 19 + src-db/database/model/tables/M_MOVEMENTLINE.xml | 7 + src-db/database/model/tables/M_REFINVENTORY.xml | 68 + src-db/database/model/tables/M_REFINVENTORY_TYPE.xml | 64 + src-db/database/model/tables/M_STORAGE_DETAIL.xml | 10 + src-db/database/model/triggers/A_ASSET_TRG.xml | 2 - src-db/database/model/triggers/C_ATTACHMENT_METHOD_MOD_TRG.xml | 3 - src-db/database/model/triggers/C_BPARTNER_TRG.xml | 4 - src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml | 2 +- src-db/database/model/triggers/C_INVOICELINETAX_TRG.xml | 14 +- src-db/database/model/triggers/C_INVOICELINE_TRG.xml | 4 - src-db/database/model/triggers/C_INVOICELINE_TRG2.xml | 5 +- src-db/database/model/triggers/C_ORDERLINE2_TRG.xml | 9 +- src-db/database/model/triggers/C_ORDERLINETAX_TRG.xml | 14 +- src-db/database/model/triggers/C_ORDERLINE_TRG.xml | 8 +- src-db/database/model/triggers/C_ORDERLINE_TRG2.xml | 6 +- src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml | 4 +- src-db/database/model/triggers/C_PROJECTLINE_TRG.xml | 7 +- src-db/database/model/triggers/C_PROJECT_TRG3.xml | 7 +- src-db/database/model/triggers/MA_GLOBALUSE_TRG.xml | 4 +- src-db/database/model/triggers/M_COSTADJUSTMENTLINE_CHK_TRG.xml | 3 +- src-db/database/model/triggers/M_INTERNAL_CONSUMPTIONLINE_TRG.xml | 4 +- src-db/database/model/triggers/M_INVENTORYLINE2_TRG.xml | 4 +- src-db/database/model/triggers/M_IOLINE_CHK_RESTRICTIONS_TRG.xml | 4 +- src-db/database/model/triggers/M_MOVEMENTLINE_TRG.xml | 13 +- src-db/database/model/triggers/M_OFFER_TYPE_MOD_TRG.xml | 3 - src-db/database/model/triggers/M_PRODUCTIONLINE_TRG.xml | 4 +- src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml | 4 +- src-db/database/model/triggers/M_RESERVATION_TRG.xml | 4 +- src-db/database/model/triggers/M_STORAGE_DETAIL_TRG.xml | 4 +- src-db/database/model/triggers/M_TRANSACTION_TRG2.xml | 4 +- src-db/database/model/triggers/S_TIMEEXPENSELINE_TRG.xml | 4 +- src-db/database/model/views/M_RM_RECEIPT_PICK_EDIT.xml | 2 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 46 + src-db/database/sourcedata/AD_CALLOUT.xml | 19 + src-db/database/sourcedata/AD_COLUMN.xml | 1947 +- src-db/database/sourcedata/AD_ELEMENT.xml | 179 + src-db/database/sourcedata/AD_EXTENSION_POINTS.xml | 10 + src-db/database/sourcedata/AD_FIELD.xml | 3352 ++- src-db/database/sourcedata/AD_MENU.xml | 96 +- src-db/database/sourcedata/AD_MESSAGE.xml | 115 +- src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 65 +- src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 50 +- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_PROCESS.xml | 51 - src-db/database/sourcedata/AD_REFERENCE.xml | 38 + src-db/database/sourcedata/AD_REF_LIST.xml | 11 + src-db/database/sourcedata/AD_TAB.xml | 292 +- src-db/database/sourcedata/AD_TABLE.xml | 96 +- src-db/database/sourcedata/AD_TABLE_NAVIGATION.xml | 13 + src-db/database/sourcedata/AD_TABLE_TREE.xml | 20 + src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 99 - src-db/database/sourcedata/AD_TREENODE.xml | 79 +- src-db/database/sourcedata/AD_VAL_RULE.xml | 11 + src-db/database/sourcedata/AD_WINDOW.xml | 98 + src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 74 + src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 40 + src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml | 18 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 6 +- src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 112 +- src-test/src/org/openbravo/test/AllAntTaskTests.java | 10 +- src-test/src/org/openbravo/test/AllWebserviceTests.java | 7 +- src-test/src/org/openbravo/test/costing/TestCosting.java | 14312 +--------- src-test/src/org/openbravo/test/costing/TestCostingBase.java | 204 + src-test/src/org/openbravo/test/costing/TestCostingLandedCost.java | 3981 ++ src-test/src/org/openbravo/test/costing/TestCostingNoSourceAdjustments.java | 1753 + src-test/src/org/openbravo/test/costing/TestCostingSourceAdjustments.java | 3056 ++ src-test/src/org/openbravo/test/costing/TestCostingUtils.java | 90 - src-test/src/org/openbravo/test/costing/TestIssue37033.java | 335 + src-test/src/org/openbravo/test/costing/TestIssue37279.java | 372 + src-test/src/org/openbravo/test/costing/assertclass/CostAdjustmentAssert.java | 133 + src-test/src/org/openbravo/test/costing/assertclass/DocumentPostAssert.java | 65 + src-test/src/org/openbravo/test/costing/assertclass/LandedCostCostMatchedAssert.java | 35 + src-test/src/org/openbravo/test/costing/assertclass/LandedCostReceiptLineAmountAssert.java | 52 + src-test/src/org/openbravo/test/costing/assertclass/MatchedInvoicesAssert.java | 43 + src-test/src/org/openbravo/test/costing/assertclass/OrderToReceiptResult.java | 42 + src-test/src/org/openbravo/test/costing/assertclass/PhysicalInventoryAssert.java | 57 + src-test/src/org/openbravo/test/costing/assertclass/ProductCostingAssert.java | 112 + src-test/src/org/openbravo/test/costing/assertclass/ProductTransactionAssert.java | 193 + src-test/src/org/openbravo/test/costing/utils/TestCostingConstants.java | 119 + src-test/src/org/openbravo/test/costing/utils/TestCostingUtils.java | 5399 +++ src-test/src/org/openbravo/test/datasource/LinkToParentTreeDataSourceTest.java | 250 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryBoxForcedReservation.java | 133 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryBoxFullReservationTest.java | 56 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryBoxOverReservationTest.java | 58 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryBoxPartialReservationTest.java | 53 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryBoxSeveralStorageDetailsTest.java | 133 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryBoxTest.java | 286 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryExceptionTest.java | 158 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryFullBoxTest.java | 53 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryFullUnboxFullReservation.java | 57 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryFullUnboxPartialReservation.java | 53 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryFullUnboxTest.java | 59 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryPartialBoxTest.java | 54 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryPartialUnboxFullReservation.java | 58 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryPartialUnboxPartialReservation.java | 64 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryPartialUnboxTest.java | 60 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventorySequenceTest.java | 63 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryTest.java | 80 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryTestSuite.java | 50 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryTestUtils.java | 356 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryUnboxReservationTest.java | 96 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryUnboxTest.java | 155 + src-test/src/org/openbravo/test/xml/EntityXMLImportTestBusinessObject.java | 1 - src-test/src/org/openbravo/test/xml/EntityXMLImportTestSingle.java | 1 - src-test/src/org/openbravo/test/xml/UniqueConstraintImportTest.java | 1 - src-test/src/org/openbravo/test/xml/XMLBaseTest.java | 2 - src/org/openbravo/base/expression/Evaluator.java | 19 +- src/org/openbravo/base/expression/OBScriptEngine.java | 66 + src/org/openbravo/base/secureApp/Attribute_data.xsql | 11 +- src/org/openbravo/base/secureApp/LoginHandler.java | 28 +- src/org/openbravo/base/secureApp/LoginUtils.java | 7 + src/org/openbravo/base/session/SessionFactoryController.java | 36 +- src/org/openbravo/cluster/ClusterService.java | 343 + src/org/openbravo/cluster/ClusterServiceManager.java | 397 + src/org/openbravo/cluster/ClusterService_data.xsql | 61 + src/org/openbravo/cluster/JmxClusterServiceManager.java | 137 + src/org/openbravo/cluster/JmxClusterServiceManagerMBean.java | 72 + src/org/openbravo/common/actionhandler/ReferencedInventoryBoxHandler.java | 109 + src/org/openbravo/common/actionhandler/ReferencedInventoryUnBoxHandler.java | 39 + src/org/openbravo/common/datasource/CostingTransactionsHQLTransformer.java | 94 +- src/org/openbravo/costing/AverageCostAdjustment.java | 55 + src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java | 4 +- src/org/openbravo/dal/core/DalUUIDHexGenerator.java | 57 - src/org/openbravo/dal/core/OBContext.java | 33 +- src/org/openbravo/dal/xml/EntityXMLConverter.java | 43 - src/org/openbravo/dal/xml/ModelXMLConverter.java | 7 - src/org/openbravo/dal/xml/XMLConstants.java | 16 - src/org/openbravo/erpCommon/ad_callouts/SE_Expense_BP_Project.java | 8 +- src/org/openbravo/erpCommon/ad_callouts/SE_InOut_Organization.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java | 10 +- src/org/openbravo/erpCommon/ad_callouts/SE_Order_Organization.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SE_Project_BPartner.java | 8 +- src/org/openbravo/erpCommon/ad_callouts/SE_RefInventory_RefInvType.java | 58 + src/org/openbravo/erpCommon/ad_callouts/SE_Trxtype_Transaction.java | 8 +- src/org/openbravo/erpCommon/ad_callouts/SL_GlobalUse_Product.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java | 21 +- src/org/openbravo/erpCommon/ad_callouts/SL_InOut_BPartner.java | 8 +- src/org/openbravo/erpCommon/ad_callouts/SL_Internal_Consumption_Conversion.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Internal_Consumption_Product.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_InvAmtUpd_ProductRefDate.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Product.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_DocType.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Journal_MultiAcctSchema.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_LandedCost_Cost_Type.java | 35 + src/org/openbravo/erpCommon/ad_callouts/SL_Movement_Product.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Order_DocType.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java | 10 +- src/org/openbravo/erpCommon/ad_callouts/SL_Production_Product.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_RefreshSequenceAndLength.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_RequisitionLine_Product.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_SequenceProduct_Product.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_TableAudit.java | 12 +- src/org/openbravo/erpCommon/ad_forms/About.html | 5 +- src/org/openbravo/erpCommon/ad_forms/About.java | 3 +- src/org/openbravo/erpCommon/ad_forms/About.xml | 3 +- src/org/openbravo/erpCommon/ad_process/ConvertQuotationIntoOrder.java | 491 +- src/org/openbravo/erpCommon/ad_process/UpdateAuditTrail.java | 162 - src/org/openbravo/erpCommon/ad_reports/ReportCashFlow.html | 412 - src/org/openbravo/erpCommon/ad_reports/ReportCashFlow.java | 435 - src/org/openbravo/erpCommon/ad_reports/ReportCashFlow.xml | 58 - src/org/openbravo/erpCommon/ad_reports/ReportCashFlowPopUp.html | 51 - src/org/openbravo/erpCommon/ad_reports/ReportCashFlowPopUp.xml | 40 - src/org/openbravo/erpCommon/ad_reports/ReportCashFlowReload.html | 47 - src/org/openbravo/erpCommon/ad_reports/ReportCashFlowReload.xml | 28 - src/org/openbravo/erpCommon/ad_reports/ReportCashFlow_data.xsql | 279 - src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 42 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql | 27 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.jrxml | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoiceJR.java | 5 +- src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoice_data.xsql | 212 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStockExcel.jrxml | 7 +- src/org/openbravo/erpCommon/businessUtility/PriceAdjustment.java | 3 +- src/org/openbravo/erpCommon/info/AttributeSetInstance.java | 8 +- src/org/openbravo/erpCommon/utility/AttributeSetInstanceValue.java | 9 +- src/org/openbravo/erpCommon/utility/CalculateCoreRevision.java | 61 - src/org/openbravo/erpCommon/utility/OBVersion.java | 10 +- src/org/openbravo/erpCommon/utility/ReferencedLink.java | 4 +- src/org/openbravo/erpCommon/utility/ToolBar.java | 11 +- src/org/openbravo/erpCommon/utility/Utility.java | 80 +- src/org/openbravo/event/ReferenceInventoryEventHandler.java | 85 + src/org/openbravo/jmx/MBeanRegistry.java | 5 +- src/org/openbravo/materialmgmt/ManageVariantsDS.java | 121 +- src/org/openbravo/materialmgmt/refinventory/BoxProcessor.java | 115 + src/org/openbravo/materialmgmt/refinventory/ReferencedInventoryProcessor.java | 250 + src/org/openbravo/materialmgmt/refinventory/ReferencedInventoryUtil.java | 125 + src/org/openbravo/materialmgmt/refinventory/ReservationManager.java | 253 + src/org/openbravo/materialmgmt/refinventory/UnboxProcessor.java | 88 + src/org/openbravo/service/db/DataExportService.java | 2 - src/org/openbravo/service/importprocess/ImportEntryArchiveManager.java | 58 +- src/org/openbravo/service/importprocess/ImportEntryClusterService.java | 50 + src/org/openbravo/service/importprocess/ImportEntryManager.java | 58 +- src/org/openbravo/service/importprocess/ImportEntryProcessor.java | 2 + src/org/openbravo/service/importprocess/ImportProcessContextListener.java | 13 +- src/org/openbravo/service/web/BaseWebServiceServlet.java | 15 +- 306 files changed, 29092 insertions(+), 17820 deletions(-) diffs (truncated from 53864 to 300 lines): diff -r 552c324c464b -r e4712f47df43 .hgsigs --- a/.hgsigs Fri Dec 15 03:23:36 2017 +0530 +++ b/.hgsigs Mon Feb 05 10:16:55 2018 +0100 @@ -221,3 +221,6 @@ 391e9626024899e664de6a55c88ee72e3e2d9710 0 iEYEABECAAYFAln77A4ACgkQCX/oGf+2qkOfGACgyr/EcAt6vsNW/zbB1YQ01t3UVtEAoNJJf5xPqkNN1SbNHwLySptoRaDN ff7be0e0ba8762069ad86523828a57139b396d39 0 iEYEABECAAYFAlm/UPkACgkQCX/oGf+2qkM8UQCdGDxGviT6mh8nKnu2HP1qzZzX0cYAoJaBd9WSUNj2Dlh2yjJT+7zYxKcC 54cdd8284122f787eac4b4ab67b4ab4584ddcccb 0 iEYEABECAAYFAln8YP0ACgkQCX/oGf+2qkNbKACgxFsQqRE0goPX4VewSccTQcGZRVEAnitoyHAuUroUJpFUFLztc6pzkUL2 +bbeae307872835b1e84136c537adec44b7a0b3c1 0 iEYEABECAAYFAlpDLAIACgkQCX/oGf+2qkNiugCgj1TTu2BeYoAqAqD08Gci3lHJvogAnAvmNL987nIAckknQ1CosIUDmA+K +2e43174aba46ec6956a0e703bbb9bee5292c871a 0 iEYEABECAAYFAlpuyUwACgkQCX/oGf+2qkPuJgCePIRg5ennwj6kgpOnyxZCPUV54Y0Ani30NnQNuNkXNkBMyykw2JfW21Vs +43d95f7cb67084eb978752359847ab28b9aa14f6 0 iEYEABECAAYFAlpEpSMACgkQCX/oGf+2qkNdMACdGNGo6rpHht3lNH3FmwtsNcIe65sAn1sM9rBx/Sm3ytwcL2C5irUyD05J diff -r 552c324c464b -r e4712f47df43 .hgtags --- a/.hgtags Fri Dec 15 03:23:36 2017 +0530 +++ b/.hgtags Mon Feb 05 10:16:55 2018 +0100 @@ -232,3 +232,6 @@ 688697b19d3692d75972558eaf9fc5eccd145a61 3.0PR17Q2.4 a8925ad2d61f4625aa62c1ee31babecaa73b787f 3.0PR17Q3 452e6c576f1db52e686cf3138099790e242e7927 3.0PR17Q3.1 +f500d43a59bb69265a7aa704a9fd20bffd68c8a9 3.0PR17Q3.2 +dd65065492e55421c107be4c87894a508bb1244d 3.0PR17Q3.3 +a8b6912d30a34e4a7d0873fc0fe53df228417b49 3.0PR17Q4 diff -r 552c324c464b -r e4712f47df43 legal/Licensing.txt --- a/legal/Licensing.txt Fri Dec 15 03:23:36 2017 +0530 +++ b/legal/Licensing.txt Mon Feb 05 10:16:55 2018 +0100 @@ -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-2017 Openbravo S.L.U. For other detailed notice, +This product is Copyright 2001-2018 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 552c324c464b -r e4712f47df43 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml Fri Dec 15 03:23:36 2017 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml Mon Feb 05 10:16:55 2018 +0100 @@ -21,11 +21,9 @@ * Contributor(s): ______________________________________. ************************************************************************/ -p_message VARCHAR(2000); p_record_id VARCHAR(60); p_docAction VARCHAR(60); p_user VARCHAR(60); -p_result NUMBER; v_ResultStr VARCHAR2(2000):=''; v_GrandTotal NUMBER:=0; @@ -57,10 +55,6 @@ p_record_id := cur_params.p_string; ELSIF (cur_params.parametername LIKE 'User') THEN p_user := cur_params.p_string; - ELSIF (cur_params.parametername LIKE 'Message') THEN - p_message := cur_params.p_text; - ELSIF (cur_params.parametername LIKE 'Result') THEN - p_result := cur_params.p_number; END IF; END LOOP; diff -r 552c324c464b -r e4712f47df43 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml Fri Dec 15 03:23:36 2017 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml Mon Feb 05 10:16:55 2018 +0100 @@ -26,8 +26,6 @@ p_GLItem VARCHAR2(32); p_Amount NUMBER; p_IsReceipt CHAR(1); -p_message VARCHAR(2000); -p_result NUMBER; v_TaxPaymentName VARCHAR2(60); v_FinancialAccountName VARCHAR2(60); @@ -77,10 +75,6 @@ p_amount := cur_params.p_number; ELSIF (cur_params.parametername LIKE 'IsReceipt') THEN p_isReceipt := cur_params.p_string; - ELSIF (cur_params.parametername LIKE 'Message') THEN - p_message := cur_params.p_text; - ELSIF (cur_params.parametername LIKE 'Result') THEN - p_result := cur_params.p_number; END IF; END LOOP; diff -r 552c324c464b -r e4712f47df43 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Dec 15 03:23:36 2017 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Feb 05 10:16:55 2018 +0100 @@ -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.32838]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.33164]]></VERSION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements. If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP> diff -r 552c324c464b -r e4712f47df43 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 Fri Dec 15 03:23:36 2017 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Feb 05 10:16:55 2018 +0100 @@ -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.32838]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.33164]]></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.32838]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.33164]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 552c324c464b -r e4712f47df43 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Fri Dec 15 03:23:36 2017 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Mon Feb 05 10:16:55 2018 +0100 @@ -1050,8 +1050,23 @@ * @return Formatted string. */ public static String formatNumber(BigDecimal number) { + return formatNumber(number, "euro", "Edition"); + } + + /** + * Formats a number using the provided formatId and qualifier (see Format.xml) format. + * + * @param number + * Number to be formatted. + * @param formatId + * euro, price, qty, etc. + * @param qualifier + * Edition, Relation, etc, + * @return Formatted string. + */ + public static String formatNumber(BigDecimal number, String formatId, String qualifier) { final UIDefinitionController.FormatDefinition formatDef = UIDefinitionController.getInstance() - .getFormatDefinition("euro", "Edition"); + .getFormatDefinition(formatId, qualifier); String formatWithDot = formatDef.getFormat(); DecimalFormatSymbols dfs = new DecimalFormatSymbols(); diff -r 552c324c464b -r e4712f47df43 modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js --- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js Fri Dec 15 03:23:36 2017 +0530 +++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js Mon Feb 05 10:16:55 2018 +0100 @@ -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-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -1024,6 +1024,13 @@ thisform = form; thisview = view; params.context = form.paramWindow.getContextInfo(); + // Before sending the context, the grids with the information about orders and invoices, + // gl items and credit used are removed from it. + // This data is not used for calculating the display or read only logic of the rest of the parameters + // and sending the grid can have an impact in the performance of this process. + delete params.context.order_invoice; + delete params.context.credit_to_use; + delete params.context.glitem; if (form.paramWindow.parentWindow && form.paramWindow.parentWindow.windowId) { params.context.inpwindowId = form.paramWindow.parentWindow.windowId; } diff -r 552c324c464b -r e4712f47df43 modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml Fri Dec 15 03:23:36 2017 +0530 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml Mon Feb 05 10:16:55 2018 +0100 @@ -6,7 +6,7 @@ <!--8A098711BB324335A19833286BDB093D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--8A098711BB324335A19833286BDB093D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8A098711BB324335A19833286BDB093D--> <NAME><![CDATA[Apache External Connection Pool]]></NAME> -<!--8A098711BB324335A19833286BDB093D--> <VERSION><![CDATA[1.0.32838]]></VERSION> +<!--8A098711BB324335A19833286BDB093D--> <VERSION><![CDATA[1.0.33164]]></VERSION> <!--8A098711BB324335A19833286BDB093D--> <DESCRIPTION><![CDATA[Apache External Connection Pool]]></DESCRIPTION> <!--8A098711BB324335A19833286BDB093D--> <HELP><![CDATA[This module implements the Apache JDBC Connection Pool (http://wiki.openbravo.com/wiki/Modules:Apache_JDBC_Connection_Pool).]]></HELP> <!--8A098711BB324335A19833286BDB093D--> <TYPE><![CDATA[M]]></TYPE> diff -r 552c324c464b -r e4712f47df43 modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Dec 15 03:23:36 2017 +0530 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Feb 05 10:16:55 2018 +0100 @@ -7,7 +7,7 @@ <!--1467C397BC5F4999A5606F39CD6FF8A4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <AD_MODULE_ID><![CDATA[8A098711BB324335A19833286BDB093D]]></AD_MODULE_ID> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID> -<!--1467C397BC5F4999A5606F39CD6FF8A4--> <STARTVERSION><![CDATA[2.1.32838]]></STARTVERSION> +<!--1467C397BC5F4999A5606F39CD6FF8A4--> <STARTVERSION><![CDATA[2.1.33164]]></STARTVERSION> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 552c324c464b -r e4712f47df43 modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/ConnectionInitializerInterceptor.java --- a/modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/ConnectionInitializerInterceptor.java Fri Dec 15 03:23:36 2017 +0530 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/ConnectionInitializerInterceptor.java Mon Feb 05 10:16:55 2018 +0100 @@ -38,7 +38,8 @@ public class ConnectionInitializerInterceptor extends JdbcInterceptor implements PoolInterceptorProvider { - private static final String INITIALIZED = "OB_INITIALIZED"; + private static final String SESSION_CONFIG_APPLIED = "OB_INITIALIZED"; + private static final String SESSION_INFO_APPLIED = "SESSION_INFO_INITIALIZED"; String rbdms = (String) OBPropertiesProvider.getInstance().getOpenbravoProperties() .get("bbdd.rdbms"); @@ -51,11 +52,8 @@ public void reset(ConnectionPool parent, PooledConnection con) { if (con != null) { HashMap<Object, Object> attributes = con.getAttributes(); - Boolean connectionInitialized = (Boolean) attributes.get(INITIALIZED); - if (connectionInitialized == null || connectionInitialized == false) { - if (!isReadOnlyPool(parent)) { - SessionInfo.initDB(con.getConnection(), rbdms); - } + Boolean sessionInfoApplied = (Boolean) attributes.get(SESSION_CONFIG_APPLIED); + if (sessionInfoApplied == null || !sessionInfoApplied) { PreparedStatement pstmt = null; try { final Properties props = OBPropertiesProvider.getInstance().getOpenbravoProperties(); @@ -73,7 +71,21 @@ throw new OBException(e); } } - attributes.put(INITIALIZED, true); + attributes.put(SESSION_CONFIG_APPLIED, true); + } + + Boolean sessionInfoInitialized = (Boolean) attributes.get(SESSION_INFO_APPLIED); + if (sessionInfoInitialized == null || !sessionInfoInitialized) { + boolean initialized = false; + if (isReadOnlyPool(parent)) { + initialized = true; + } else { + if (SessionInfo.isInitialized()) { + SessionInfo.initDB(con.getConnection(), rbdms); + initialized = true; + } + } + attributes.put(SESSION_INFO_APPLIED, initialized); } } } diff -r 552c324c464b -r e4712f47df43 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Fri Dec 15 03:23:36 2017 +0530 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Mon Feb 05 10:16:55 2018 +0100 @@ -6,7 +6,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME> -<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.32838]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.33164]]></VERSION> <!--C70732EA90A14EC0916078B85CC33D2D--> <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION> <!--C70732EA90A14EC0916078B85CC33D2D--> <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP> <!--C70732EA90A14EC0916078B85CC33D2D--> <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL> diff -r 552c324c464b -r e4712f47df43 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Dec 15 03:23:36 2017 +0530 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Feb 05 10:16:55 2018 +0100 @@ -7,7 +7,7 @@ <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.32838]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.33164]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 552c324c464b -r e4712f47df43 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Fri Dec 15 03:23:36 2017 +0530 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Mon Feb 05 10:16:55 2018 +0100 @@ -6,7 +6,7 @@ <!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface Application]]></NAME> -<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.32838]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.33164]]></VERSION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL> diff -r 552c324c464b -r e4712f47df43 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Dec 15 03:23:36 2017 +0530 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Feb 05 10:16:55 2018 +0100 @@ -7,7 +7,7 @@ <!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID> -<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.32838]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.33164]]></STARTVERSION> <!--15D7CE8D95D043189162DBABA54A1F61--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--60A170212F36499D83B8AD38D01F46B3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID> -<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.32838]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.33164]]></STARTVERSION> <!--60A170212F36499D83B8AD38D01F46B3--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -35,7 +35,7 @@ ------------------------------------------------------------------------------ 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
