details: https://code.openbravo.com/erp/devel/pi/rev/c0340d7b7817 changeset: 31319:c0340d7b7817 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 06 13:05:14 2016 +0100 summary: [audit] don't preserve ad_context_info between different transactions
details: https://code.openbravo.com/erp/devel/pi/rev/5b4ccad2ced6 changeset: 31320:5b4ccad2ced6 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 06 13:07:02 2016 +0100 summary: [audit] DAL save context info only when needed When working with DAL, context information will be saved to Database only if it is required: a flush is going to be performed and there are changes to be commited. details: https://code.openbravo.com/erp/devel/pi/rev/9568898c7c25 changeset: 31321:9568898c7c25 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 06 13:11:27 2016 +0100 summary: [audit] DAL, preserve context info till transaction is commited details: https://code.openbravo.com/erp/devel/pi/rev/67d47c94e4fa changeset: 31322:67d47c94e4fa user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 06 13:12:36 2016 +0100 summary: [audit] DAL don't use deprecated methods anymore details: https://code.openbravo.com/erp/devel/pi/rev/37e85c2d50c2 changeset: 31323:37e85c2d50c2 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 06 14:58:08 2016 +0100 summary: [audit] removed more deprecated methods details: https://code.openbravo.com/erp/devel/pi/rev/e89d6fce2435 changeset: 31324:e89d6fce2435 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 06 15:06:48 2016 +0100 summary: [audit] removed some duplication details: https://code.openbravo.com/erp/devel/pi/rev/de575ea68fb1 changeset: 31325:de575ea68fb1 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 06 15:08:07 2016 +0100 summary: [audit] sqlc statemets set audit only when needed details: https://code.openbravo.com/erp/devel/pi/rev/a66443cc44d8 changeset: 31326:a66443cc44d8 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 06 15:10:30 2016 +0100 summary: [audit] reverted previous change c0340d7b7817 Context info needs to preserve values among transactions because SQLC sets atocommit(true) by default, which is in practice multiple mini-transactions. details: https://code.openbravo.com/erp/devel/pi/rev/2647f3eb292a changeset: 31327:2647f3eb292a user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 06 15:31:13 2016 +0100 summary: [audit] Sqlc can optionally mark methods not to save context info details: https://code.openbravo.com/erp/devel/pi/rev/4a6633cbb300 changeset: 31328:4a6633cbb300 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 06 15:32:00 2016 +0100 summary: [audit] don't set context info for session ping not usage audit details: https://code.openbravo.com/erp/devel/pi/rev/e84cdbc94ba4 changeset: 31329:e84cdbc94ba4 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 06 16:10:59 2016 +0100 summary: [audit] prevent setting same info in same thread for same connection details: https://code.openbravo.com/erp/devel/pi/rev/d48bc1f83384 changeset: 31330:d48bc1f83384 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 06 16:13:43 2016 +0100 summary: [audit] fixed condition details: https://code.openbravo.com/erp/devel/pi/rev/3860e09d5807 changeset: 31331:3860e09d5807 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 06 16:37:37 2016 +0100 summary: [audit] don't audit process request creation/update details: https://code.openbravo.com/erp/devel/pi/rev/e3eb1784470f changeset: 31332:e3eb1784470f user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 06 16:39:36 2016 +0100 summary: [audit] API to allow to programatically skip insertions in context info details: https://code.openbravo.com/erp/devel/pi/rev/b03beccc8938 changeset: 31333:b03beccc8938 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 06 16:40:11 2016 +0100 summary: [audit] don't audit user preferences modifications details: https://code.openbravo.com/erp/devel/pi/rev/acfbd9c589c5 changeset: 31334:acfbd9c589c5 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 06 16:54:42 2016 +0100 summary: [audit] PL invokation from sqlc sets audit info details: https://code.openbravo.com/erp/devel/pi/rev/41388760b719 changeset: 31335:41388760b719 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Dec 14 12:27:00 2016 +0100 summary: [audit] pi merge details: https://code.openbravo.com/erp/devel/pi/rev/231c4a7e3763 changeset: 31336:231c4a7e3763 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Dec 15 09:21:39 2016 +0100 summary: [audit] pi merge details: https://code.openbravo.com/erp/devel/pi/rev/a3b8d4105c83 changeset: 31337:a3b8d4105c83 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Dec 15 13:22:33 2016 +0100 summary: [audit] sqlc import SessionInfo if needed details: https://code.openbravo.com/erp/devel/pi/rev/8da6dce65f62 changeset: 31338:8da6dce65f62 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Dec 19 12:31:28 2016 +0100 summary: [audit] pi merge details: https://code.openbravo.com/erp/devel/pi/rev/0321855f3cfe changeset: 31339:0321855f3cfe user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Dec 21 11:28:43 2016 +0100 summary: [audit] pi merge details: https://code.openbravo.com/erp/devel/pi/rev/cd17f845b2ac changeset: 31340:cd17f845b2ac user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Dec 21 11:50:06 2016 +0100 summary: [audit] removed unused variable details: https://code.openbravo.com/erp/devel/pi/rev/a26165b33cb7 changeset: 31341:a26165b33cb7 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Dec 21 11:50:34 2016 +0100 summary: [audit] prevent double import for SessionInfo details: https://code.openbravo.com/erp/devel/pi/rev/28877d56c68d changeset: 31342:28877d56c68d user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Dec 21 11:51:49 2016 +0100 summary: [audit] ensure context info is set for process definition and bg processes details: https://code.openbravo.com/erp/devel/pi/rev/15f5de36349f changeset: 31343:15f5de36349f user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Dec 21 11:52:18 2016 +0100 summary: [audit] don't audit session login details: https://code.openbravo.com/erp/devel/pi/rev/d59adc7ce507 changeset: 31344:d59adc7ce507 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Dec 21 12:02:55 2016 +0100 summary: [audit] not need to force save to db audit context, it will be done later on flush if needed details: https://code.openbravo.com/erp/devel/pi/rev/f69efc8dcae8 changeset: 31345:f69efc8dcae8 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jan 19 08:15:19 2017 +0100 summary: [audit] pi merge details: https://code.openbravo.com/erp/devel/pi/rev/0abe105b6b76 changeset: 31346:0abe105b6b76 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jan 19 09:14:26 2017 +0100 summary: [audit] merge with multi pool project As both projects affect the same components, make audit dependent on multi pool details: https://code.openbravo.com/erp/devel/pi/rev/c4dbe39bcea7 changeset: 31347:c4dbe39bcea7 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jan 19 09:17:31 2017 +0100 summary: [audit] fixes merge details: https://code.openbravo.com/erp/devel/pi/rev/d8a122287abc changeset: 31348:d8a122287abc user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jan 19 09:27:47 2017 +0100 summary: [audit] split condition for readability details: https://code.openbravo.com/erp/devel/pi/rev/01bd00c8f6cd changeset: 31349:01bd00c8f6cd user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jan 19 09:33:27 2017 +0100 summary: [audit] better explain why SessionInfo.setDBSessionInfo is deprecated details: https://code.openbravo.com/erp/devel/pi/rev/36ff2f3cecdd changeset: 31350:36ff2f3cecdd user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jan 19 12:44:00 2017 +0100 summary: [audit] Added missing statement lost in the merge details: https://code.openbravo.com/erp/devel/pi/rev/fc0d4a18afdc changeset: 31351:fc0d4a18afdc user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 20 12:33:33 2017 +0100 summary: [audit] merge with multi pool details: https://code.openbravo.com/erp/devel/pi/rev/278f349c8a29 changeset: 31352:278f349c8a29 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 20 13:24:10 2017 +0100 summary: [audit] updated (c) year details: https://code.openbravo.com/erp/devel/pi/rev/5bdcadc82f04 changeset: 31353:5bdcadc82f04 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Jan 23 15:21:20 2017 +0100 summary: [audit] pi merge details: https://code.openbravo.com/erp/devel/pi/rev/388ed074b881 changeset: 31354:388ed074b881 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Jan 23 18:16:05 2017 +0100 summary: [audit] corrected javadoc text details: https://code.openbravo.com/erp/devel/pi/rev/bfc0a34b4aa0 changeset: 31355:bfc0a34b4aa0 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Jan 23 18:33:20 2017 +0100 summary: [audit] process definition reports shouldn't audit details: https://code.openbravo.com/erp/devel/pi/rev/9e6fb3c9cb3e changeset: 31356:9e6fb3c9cb3e user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jan 24 09:46:54 2017 +0100 summary: [audit] be failsafe when resetting SessionInfo on thread finalization details: https://code.openbravo.com/erp/devel/pi/rev/795d90ef2a7f changeset: 31357:795d90ef2a7f user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jan 24 09:51:32 2017 +0100 summary: [audit] comment when context is saved to db details: https://code.openbravo.com/erp/devel/pi/rev/3bf53ba1020a changeset: 31358:3bf53ba1020a user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jan 24 09:52:03 2017 +0100 summary: [audit] reset changed info only for local thread's connection details: https://code.openbravo.com/erp/devel/pi/rev/1a183d0ada83 changeset: 31359:1a183d0ada83 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jan 24 14:53:09 2017 +0100 summary: [audit] don't initialize already initialized connection details: https://code.openbravo.com/erp/devel/pi/rev/7c81fe78c4a4 changeset: 31360:7c81fe78c4a4 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jan 24 14:53:31 2017 +0100 summary: [audit] typo details: https://code.openbravo.com/erp/devel/pi/rev/e300a7493c5b changeset: 31361:e300a7493c5b user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jan 24 15:12:46 2017 +0100 summary: [audit] prevent NPE details: https://code.openbravo.com/erp/devel/pi/rev/871b37993730 changeset: 31362:871b37993730 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 27 13:01:28 2017 +0100 summary: [audit] pi merge details: https://code.openbravo.com/erp/devel/pi/rev/5813f419f9dc changeset: 31363:5813f419f9dc user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 27 13:08:46 2017 +0100 summary: [audit] don't trigger dal observers twice on flush details: https://code.openbravo.com/erp/devel/pi/rev/72cf9d166978 changeset: 31364:72cf9d166978 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Jan 30 10:28:40 2017 +0100 summary: fixed issue 35007: reduced overhead in audit trail infrastructure diffstat: .hgsigs | 7 + .hgtags | 7 + legal/Licensing.txt | 2 +- modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.class | 0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UniquePaymentForTransaction.class | 0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.class | 0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.class | 0 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 12 + 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-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.java | 8 + modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UniquePaymentForTransaction.java | 10 +- modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.java | 10 +- modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.java | 16 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentOnProcessActionHandler.java | 21 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/DoubtFulDebtPickEditLines.java | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java | 22 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/TransactionAddPaymentDefaultValues.java | 10 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 20 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js | 4 + modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/ConnectionInitializerInterceptor.java | 19 +- modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/JdbcExternalConnectionPool.java | 318 +- 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.base.weld/src-test/org/openbravo/base/weld/test/WeldBaseTest.java | 6 +- modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/DalPersistanceEventTest.java | 38 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/ADCSInitialization.java | 200 + modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/DatasourceEventObserver.java | 39 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/ObserverBaseTest.java | 76 + modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderLineTestObserver.java | 75 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/PersistanceObserver.java | 152 + modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler_data.xsql | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/StorePropertyActionHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java | 6 + modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java | 52 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java | 57 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java | 185 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java | 30 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 3 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 6 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 38 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js | 30 +- 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/toolbar/ob-action-button.js | 2 +- 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/reference/UIDefinition.java | 41 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinitionController.java | 8 +- 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.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/ComboTableDatasourceService.java | 40 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java | 40 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 20 +- 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/reference/SelectorUIReference.java | 21 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js | 12 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js | 2 +- 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/F_B_International_Group/AD_PROCESS_ACCESS.xml | 140 + referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml | 2002 +- referencedata/sampledata/F_B_International_Group/AD_ROLE.xml | 48 - referencedata/sampledata/F_B_International_Group/AD_SEQUENCE.xml | 84 +- referencedata/sampledata/F_B_International_Group/AD_USER.xml | 48 +- referencedata/sampledata/F_B_International_Group/A_AMORTIZATION.xml | 18 +- referencedata/sampledata/F_B_International_Group/A_ASSET.xml | 16 +- referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml | 86 +- referencedata/sampledata/F_B_International_Group/C_CONVERSION_RATE.xml | 72 + referencedata/sampledata/F_B_International_Group/C_INVOICE.xml | 3860 +- referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml | 8339 + referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml | 4086 + referencedata/sampledata/F_B_International_Group/C_INVOICETAX.xml | 1020 + referencedata/sampledata/F_B_International_Group/C_ORDER.xml | 2994 +- referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml | 9469 + referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml | 3451 + 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 | 864 + referencedata/sampledata/F_B_International_Group/C_PERIODCONTROL.xml | 32256 ++++ referencedata/sampledata/F_B_International_Group/C_PERIODCONTROL_LOG.xml | 912 + referencedata/sampledata/F_B_International_Group/C_YEAR.xml | 68 + referencedata/sampledata/F_B_International_Group/FACT_ACCT.xml | 44435 +++++- referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENT.xml | 44 + referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENTLINE.xml | 1512 + referencedata/sampledata/F_B_International_Group/FIN_FINACC_TRANSACTION.xml | 2154 + referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml | 8 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml | 2516 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_DETAIL.xml | 1056 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml | 174 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml | 510 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml | 77280 +++++---- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml | 1330 +- 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_COSTING.xml | 1896 +- referencedata/sampledata/F_B_International_Group/M_INOUT.xml | 2356 + referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml | 4394 + referencedata/sampledata/F_B_International_Group/M_MATCHINV.xml | 1368 + referencedata/sampledata/F_B_International_Group/M_MATCHPO.xml | 2736 + referencedata/sampledata/F_B_International_Group/M_STORAGE_DETAIL.xml | 108 +- referencedata/sampledata/F_B_International_Group/M_STORAGE_PENDING.xml | 54 +- referencedata/sampledata/F_B_International_Group/M_TRANSACTION.xml | 5730 + referencedata/sampledata/F_B_International_Group/M_TRANSACTION_COST.xml | 3247 + referencedata/sampledata/F_B_International_Group/OBKMO_WIDGET_CLASS_ACCESS.xml | 130 + referencedata/sampledata/F_B_International_Group/OBUIAPP_PROCESS_ACCESS.xml | 140 + src-core/src/org/openbravo/data/Sql.java | 3 +- src-core/src/org/openbravo/data/Sqlc.java | 25 +- src-core/src/org/openbravo/database/ConnectionProviderImpl.java | 10 +- src-core/src/org/openbravo/database/ExternalConnectionPool.java | 26 +- src-core/src/org/openbravo/database/JNDIConnectionProvider.java | 4 +- src-core/src/org/openbravo/database/RDBMSIndependent.java | 9 +- src-core/src/org/openbravo/database/SessionInfo.java | 78 +- src-core/src/org/openbravo/uiTranslation/InterfaceInfo.java | 4 +- src-core/src/org/openbravo/uiTranslation/WindowLabel.java | 8 +- src-db/database/build.xml | 8 +- src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/model/excludeFilter.xml | 21 + src-db/database/model/postscript-DB2.sql | 324 - src-db/database/model/postscript-Oracle.sql | 3 +- src-db/database/model/postscript-PostgreSql.sql | 3 +- src-db/database/model/prescript-DB2.sql | 85 - src-db/database/model/prescript-PostgreSql.sql | 5 + src-db/database/model/tables/FIN_PAYMENT.xml | 4 + src-db/database/model/tables/M_PRODUCT_AUM.xml | 1 + src-db/database/model/triggers/M_PRODUCT_AUM_TRG.xml | 39 +- src-db/database/model/views/AD_AUDIT_TRAIL_V.xml | 2 +- src-db/database/sourcedata/AD_COLUMN.xml | 4 +- src-db/database/sourcedata/AD_ELEMENT.xml | 8 +- src-db/database/sourcedata/AD_FIELD.xml | 22 +- src-db/database/sourcedata/AD_MESSAGE.xml | 40 +- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_PREFERENCE.xml | 13 + src-db/database/sourcedata/AD_REF_LIST.xml | 13 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 92 +- src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 24 +- src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 2 +- src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_01.java | 4 +- src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_02.java | 4 +- src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_03.java | 4 +- src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_04.java | 4 +- src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_05.java | 6 +- src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_06.java | 4 +- src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_07.java | 4 +- src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_08.java | 4 +- src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_09.java | 4 +- src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_10.java | 4 +- src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_11.java | 4 +- src-test/src/org/openbravo/test/AllAntTaskTests.java | 12 +- src-test/src/org/openbravo/test/authorisations.txt | 2216 - src-test/src/org/openbravo/test/base/OBBaseTest.java | 32 +- src-test/src/org/openbravo/test/costing/TestCosting.java | 291 +- src-test/src/org/openbravo/test/dal/DalPerformanceCriteriaTest.java | 29 +- src-test/src/org/openbravo/test/dal/DalQueryTest.java | 2 +- src-test/src/org/openbravo/test/dal/DalTest.java | 197 +- src-test/src/org/openbravo/test/dal/ValidationTest.java | 4 +- src-test/src/org/openbravo/test/datasource/DataSourceSecurity.java | 28 +- src-test/src/org/openbravo/test/model/IndexesTest.java | 6 +- src-test/src/org/openbravo/test/scheduling/ProcessSchedulingTest.java | 46 +- src-test/src/org/openbravo/test/security/CrossOrganizationReference.java | 7 +- src-test/src/org/openbravo/test/security/EntityAccessTest.java | 6 +- src-test/src/org/openbravo/test/views/ViewGenerationWithDifferentConfigLevelTest.java | 31 +- src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/AccountingTabs.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CheckUpdateConnectionPoolMerge.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DatabaseDecimalNumberCheck.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DatabaseVersionCheck.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicateDocExchangeRate.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedJavaPackage.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedOrgWarehouse.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedPriceListVersion.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/GLJournalAccountingCheck.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/JdkVersionCheck.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/PaymentGLItemCheck.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/PreferenceConflict.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/RemoveCostingRuleProcessExecutions.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/User1Ready.class | 0 src-util/buildvalidation/src/org/openbravo/buildvalidation/AccountingTabs.java | 104 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/CheckUpdateConnectionPoolMerge.java | 34 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/DatabaseDecimalNumberCheck.java | 15 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/DatabaseVersionCheck.java | 6 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicateDocExchangeRate.java | 132 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedJavaPackage.java | 9 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedOrgWarehouse.java | 37 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedPriceListVersion.java | 27 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/GLJournalAccountingCheck.java | 60 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/JdkVersionCheck.java | 8 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/PaymentGLItemCheck.java | 8 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/PreferenceConflict.java | 9 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/RemoveCostingRuleProcessExecutions.java | 11 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/User1Ready.java | 35 +- src/org/openbravo/base/secureApp/AllowedCrossDomainsHandler.java | 32 +- src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 8 +- src/org/openbravo/base/secureApp/LoginHandler.java | 3 +- src/org/openbravo/base/secureApp/UserLock.java | 63 +- src/org/openbravo/common/actionhandler/ManagePrereservationActionHandler.java | 3 +- src/org/openbravo/common/actionhandler/ManageReservationActionHandler.java | 3 +- src/org/openbravo/common/actionhandler/OrderCreatePOLines.java | 3 +- src/org/openbravo/common/actionhandler/RFCServiceReturnableActionHandler.java | 4 +- src/org/openbravo/common/actionhandler/RMInOutPickEditLines.java | 3 +- src/org/openbravo/common/actionhandler/RMShipmentPickEditLines.java | 3 +- src/org/openbravo/common/actionhandler/ReservedGoodMovementActionHandler.java | 5 +- src/org/openbravo/common/actionhandler/SRMOPickEditLines.java | 4 +- src/org/openbravo/common/datasource/ReturnFromCustomerHQLInserter.java | 4 +- src/org/openbravo/costing/AverageAlgorithm.java | 8 +- src/org/openbravo/costing/CostAdjustmentUtils.java | 7 +- src/org/openbravo/dal/core/DalRequestFilter.java | 26 +- src/org/openbravo/dal/core/DalSessionFactory.java | 41 +- src/org/openbravo/dal/core/DalThreadHandler.java | 55 +- src/org/openbravo/dal/core/OBContext.java | 69 +- src/org/openbravo/dal/core/OBInterceptor.java | 11 +- src/org/openbravo/dal/core/SessionHandler.java | 542 +- src/org/openbravo/dal/security/EntityAccessChecker.java | 17 + src/org/openbravo/dal/security/SecurityChecker.java | 9 +- src/org/openbravo/dal/service/OBCriteria.java | 26 +- src/org/openbravo/dal/service/OBDal.java | 117 +- src/org/openbravo/dal/service/OBQuery.java | 72 +- src/org/openbravo/erpCommon/ad_actionButton/RMInsertOrphanLine.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_AlertRule_SQL.java | 24 +- src/org/openbravo/erpCommon/ad_forms/About.html | 4 +- src/org/openbravo/erpCommon/ad_forms/DocLineCostAdjustment_data.xsql | 4 +- src/org/openbravo/erpCommon/ad_forms/Fact.java | 42 +- src/org/openbravo/erpCommon/ad_forms/FactLine.java | 35 +- src/org/openbravo/erpCommon/ad_forms/FactLine_data.xsql | 6 +- src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.java | 26 +- src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending_data.xsql | 7 +- src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java | 19 +- src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.html | 83 +- src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.java | 102 +- src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql | 10 + src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 3 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoicesEditJR.jrxml | 37 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoicesJR.java | 5 +- src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesJR.java | 21 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR.java | 17 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderInvoicedJasper.java | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderInvoicedJasper.jrxml | 21 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderProvidedJR.java | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderProvidedJR.jrxml | 28 +- src/org/openbravo/erpCommon/ad_reports/ReportShipmentEdition.jrxml | 8 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.html | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java | 15 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock2.html | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStockExcel.jrxml | 45 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock_data.xsql | 7 +- src/org/openbravo/erpCommon/ad_reports/ReportWarehouseControl.java | 28 +- src/org/openbravo/erpCommon/ad_reports/ReportWarehouseControl_data.xsql | 7 +- src/org/openbravo/erpCommon/businessUtility/AuditTrailPopup.java | 50 +- src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java | 8 +- src/org/openbravo/erpCommon/businessUtility/CloneOrderHook.java | 40 + src/org/openbravo/erpCommon/businessUtility/CloneOrderHookCaller.java | 60 + src/org/openbravo/erpCommon/businessUtility/Preferences.java | 7 +- src/org/openbravo/erpCommon/security/Login.html | 4 +- src/org/openbravo/erpCommon/security/Login_F1.html | 4 +- src/org/openbravo/erpCommon/security/SessionLogin.java | 4 +- src/org/openbravo/erpCommon/security/SessionLogin_data.xsql | 4 +- src/org/openbravo/erpCommon/utility/ComboTableData.java | 440 +- src/org/openbravo/erpCommon/utility/QueryFieldStructure.java | 11 +- src/org/openbravo/erpCommon/utility/Utility.java | 69 +- src/org/openbravo/erpCommon/utility/reporting/Report.java | 10 +- src/org/openbravo/erpCommon/utility/reporting/ReportManager.java | 15 +- src/org/openbravo/erpCommon/utility/reporting/TemplateInfo.java | 13 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java | 18 +- src/org/openbravo/event/ConversionRateEventHandler.java | 6 +- src/org/openbravo/materialmgmt/ProductPriceUtils.java | 81 + src/org/openbravo/materialmgmt/ServicePriceUtils.java | 55 +- src/org/openbravo/materialmgmt/UOMUtil.java | 43 +- src/org/openbravo/materialmgmt/actionhandler/ManageVariants.java | 3 +- src/org/openbravo/reference/ui/UITable.java | 17 +- src/org/openbravo/reference/ui/UITableDir.java | 17 +- src/org/openbravo/scheduling/DefaultJob.java | 3 +- src/org/openbravo/scheduling/OBScheduler.java | 15 +- src/org/openbravo/scheduling/ProcessMonitor.java | 8 +- src/org/openbravo/scheduling/ProcessRequest_data.xsql | 14 +- src/org/openbravo/scheduling/ProcessRun_data.xsql | 8 +- src/org/openbravo/service/db/DalConnectionProvider.java | 22 +- src/org/openbravo/service/importprocess/ImportEntryProcessor.java | 22 +- src/org/openbravo/service/web/BaseWebServiceServlet.java | 16 +- src/org/openbravo/service/web/WebServiceServlet.java | 13 +- 317 files changed, 190656 insertions(+), 43689 deletions(-) diffs (truncated from 293110 to 300 lines): diff -r 0ec7b1128718 -r 72cf9d166978 .hgsigs --- a/.hgsigs Sat Dec 03 12:40:54 2016 +0100 +++ b/.hgsigs Mon Jan 30 10:28:40 2017 +0100 @@ -197,7 +197,14 @@ 91b0a6cc5947ea0958b3d677a3e76174fa0a045e 0 iEYEABECAAYFAldajXIACgkQCX/oGf+2qkMRiQCgread+PDPwOVh7Qu/IlmeCLDSPVQAn3cepToICm61fiNkrV+PmFen4bwd ac4b84085793438223d82a0024dd84d2268d0768 0 iEYEABECAAYFAld974YACgkQCX/oGf+2qkPrUgCg05BzCWexFGf76njdN2lBgPJn5uMAoIzGxA0dHD54Km07x2m9J1pgFcoW a98ba1097ffda83047f2824177bfd940fd9268b2 0 iEYEABECAAYFAlfAIacACgkQCX/oGf+2qkMeAwCgsAyLUenvqX0uAZTRjaUrUXZfcL0AoJg0tc+GlPLwfSGk9nCtgF8M3v5f +b12145ac735ade9806288818f80bc7048f644b1e 0 iEYEABECAAYFAlgq31UACgkQCX/oGf+2qkNW8ACeMKZHj7v345vjRhUr6sJnORyzuc8An17g7zd8xd/eE3cUa7Gl86DAtGRQ c9da212632eaa8b5ad282ea755200a6761da6fa9 0 iEYEABECAAYFAlftOagACgkQCX/oGf+2qkMyVgCfXQS09IJiOH63CblJE5zX6Qn3TDQAoPZnadaVKBEfROW6Ma1feqUrUgY/ 159bac1903e52d4f6785d5e53405ae988c273975 0 iEYEABECAAYFAlejLbgACgkQCX/oGf+2qkOIMQCcDP51SEWDiDNBGTaEShgrqwhm7xYAoO/e+AXZ3cBSAhUb8CmIpJ0Rls82 b91eab932a2640f7395e9c1b7d237c08303d0788 0 iEYEABECAAYFAlfGHnMACgkQCX/oGf+2qkNXHQCgysf6qFN75kW873qTx3i0S9a2qjAAoI0R/AZCW4a6RPrNiFfjaWsOE3+v b79e30a5b3532f45101cedce0f3bb6b0a86b5780 0 iEYEABECAAYFAlfz21YACgkQCX/oGf+2qkMqZgCgodjBPp4aS6GrpBTpumtr8DsFNAYAmwS3mdHHNYX8g8y4yIwjMDzmQG+o +892fdbc643c7c5c52298aae76502ab2283a32433 0 iEYEABECAAYFAlg0JDIACgkQCX/oGf+2qkM+5gCeMkJ6j6tr/FN8cPHlBLGdnf/6F08AoNBmFRFQ/osVwBtifI+b3ZzXEx+X +e03ab293da7be8c989b20cb7b1ecf4bbf3c7c990 0 iEYEABECAAYFAlh959EACgkQCX/oGf+2qkOFNwCgi/qs8UguivvKA1tlKRKQoIsQqDIAoOGm7DqYBaR6v3aZtvaLmdvffaUh +81d470b918d385d47e958fe4c2d679cde07c9989 0 iEYEABECAAYFAliHS1kACgkQCX/oGf+2qkN/qgCeOAsukTY2FG0bVzdhXHw/K58kqlEAnAjixxvtQPM4PVmDYqzQDkGdqqtT +555379f85b18b37ee1c36b4137c75eca80da7267 0 iEYEABECAAYFAlhSQ0UACgkQCX/oGf+2qkN2yQCg5zq8YEVnWK3wy859qvLYbrEhBY4AoKsfpep+GEj+oGGlmOiOqESGPxxH +fa51600e25b24b2eb3739898d293168ea94748a7 0 iEYEABECAAYFAlh/u8wACgkQCX/oGf+2qkPTnwCfZ29b107GdizLBcC+tzdP3HlnmUUAoN2kMLXvfTYSRLAQG/ziGm5P6kYA +9753e90ea3e81f850f904feb531120b4e185394a 0 iEYEABECAAYFAliG6A8ACgkQCX/oGf+2qkPeeQCg6D9p++eslvzqEVlYK8RS0uzgZNsAoMELVWkte/AM/ilPxZ4vP37myscv diff -r 0ec7b1128718 -r 72cf9d166978 .hgtags --- a/.hgtags Sat Dec 03 12:40:54 2016 +0100 +++ b/.hgtags Mon Jan 30 10:28:40 2017 +0100 @@ -208,7 +208,14 @@ cfff3c184b53528cd71acfe21b15800db17b3436 3.0PR16Q2 7667e8781815f8fa0bf2d3104aeb585cb2ce8681 3.0PR16Q2.1 d40ef4d2ac507a87b46d3118841d03a6a54fec1e 3.0PR16Q2.2 +5c1e158fa994240cc6bd410405b4ed86a33c7261 3.0PR16Q2.4 6db3d7641170254dbd658eb774e36b092c68dd04 3.0PR16Q2.3 ec10d529b9bbe8caa83f2ea72b29b94bd3473cae 3.0PR16Q3 d0dee6596f281e29afcd159544992498896e93ff 3.0PR16Q3.1 f252db9dde915c15574e3d5fa505bd1154e39c74 3.0PR16Q3.2 +0c8c781e34c94d084b495d00a541d8d57a3903ea 3.0PR16Q3.3 +ed52b01e833ecc6407392f97ffd7d6531bd9bf2f 3.0PR16Q3.4 +ad0be95cec9715cc07fd82615c0de55f7c4a95b4 3.0PR16Q3.5 +cd98953b932b72cc3c694904fc8f8549463ba84a 3.0PR16Q4 +b93f495b2cde680cf6558d93d72051429f4b9031 3.0PR16Q4.1 +31c79a32ce3a6b555dadb35c70d63113be6312e7 3.0PR16Q4.2 diff -r 0ec7b1128718 -r 72cf9d166978 legal/Licensing.txt --- a/legal/Licensing.txt Sat Dec 03 12:40:54 2016 +0100 +++ b/legal/Licensing.txt Mon Jan 30 10:28:40 2017 +0100 @@ -116,6 +116,7 @@ # jettison-1.3.jar # log4j-1.2.16.jar # quartz-1.6.2.jar +# servlet-api.jar # tika-core-0.9.jar # wstx-asl-3.0.2.jar # xercesImpl.jar @@ -200,7 +201,6 @@ # jaxrpc.jar # mail-1.4.4.jar -# servlet-api.jar All files under the corresponding Sun Binary Code License. This is not free software, but provided under license from Sun Microsystems. diff -r 0ec7b1128718 -r 72cf9d166978 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.class has changed diff -r 0ec7b1128718 -r 72cf9d166978 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UniquePaymentForTransaction.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UniquePaymentForTransaction.class has changed diff -r 0ec7b1128718 -r 72cf9d166978 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.class has changed diff -r 0ec7b1128718 -r 72cf9d166978 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.class has changed diff -r 0ec7b1128718 -r 72cf9d166978 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Sat Dec 03 12:40:54 2016 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Mon Jan 30 10:28:40 2017 +0100 @@ -300,6 +300,18 @@ <!--2EE9E3A8A29044C5B6A1BCB77EB37B87--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--2EE9E3A8A29044C5B6A1BCB77EB37B87--></AD_MESSAGE> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--><AD_MESSAGE> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <AD_MESSAGE_ID><![CDATA[2FCA4882990D431BB1E0AB7CA7505E6B]]></AD_MESSAGE_ID> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <VALUE><![CDATA[APRM_InvoiceAwaitingExcutionPaymentRelated]]></VALUE> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <MSGTEXT><![CDATA[Invoice can not be voided as there is an awaiting execution payment related. Please either execute that payment or cancel it]]></MSGTEXT> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--></AD_MESSAGE> + <!--2FD618C9D5064C75BFF13B57B767C912--><AD_MESSAGE> <!--2FD618C9D5064C75BFF13B57B767C912--> <AD_MESSAGE_ID><![CDATA[2FD618C9D5064C75BFF13B57B767C912]]></AD_MESSAGE_ID> <!--2FD618C9D5064C75BFF13B57B767C912--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 0ec7b1128718 -r 72cf9d166978 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Sat Dec 03 12:40:54 2016 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Jan 30 10:28:40 2017 +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.30402]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.31055]]></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 0ec7b1128718 -r 72cf9d166978 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 Sat Dec 03 12:40:54 2016 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Jan 30 10:28:40 2017 +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.30402]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.31055]]></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.30402]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.31055]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 0ec7b1128718 -r 72cf9d166978 modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.java --- a/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.java Sat Dec 03 12:40:54 2016 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.java Mon Jan 30 10:28:40 2017 +0100 @@ -21,8 +21,10 @@ import java.util.ArrayList; import java.util.List; +import org.openbravo.base.ExecutionLimits; import org.openbravo.buildvalidation.BuildValidation; import org.openbravo.database.ConnectionProvider; +import org.openbravo.modulescript.OpenbravoVersion; public class TransactionsWithMissingData extends BuildValidation { @@ -51,4 +53,10 @@ } return errors; } + + @Override + protected ExecutionLimits getBuildValidationLimits() { + return new ExecutionLimits("A918E3331C404B889D69AA9BFAFB23AC", null, new OpenbravoVersion(3, 0, + 24742)); + } } diff -r 0ec7b1128718 -r 72cf9d166978 modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UniquePaymentForTransaction.java --- a/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UniquePaymentForTransaction.java Sat Dec 03 12:40:54 2016 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UniquePaymentForTransaction.java Mon Jan 30 10:28:40 2017 +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) 2011 Openbravo SLU + * All portions are Copyright (C) 2011-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -21,8 +21,10 @@ import java.util.ArrayList; import java.util.List; +import org.openbravo.base.ExecutionLimits; import org.openbravo.buildvalidation.BuildValidation; import org.openbravo.database.ConnectionProvider; +import org.openbravo.modulescript.OpenbravoVersion; public class UniquePaymentForTransaction extends BuildValidation { @@ -112,4 +114,10 @@ } + @Override + protected ExecutionLimits getBuildValidationLimits() { + return new ExecutionLimits("A918E3331C404B889D69AA9BFAFB23AC", null, new OpenbravoVersion(3, 0, + 11282)); + } + } diff -r 0ec7b1128718 -r 72cf9d166978 modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.java --- a/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.java Sat Dec 03 12:40:54 2016 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.java Mon Jan 30 10:28:40 2017 +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) 2010-2011 Openbravo SLU + * All portions are Copyright (C) 2010-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -21,8 +21,10 @@ import java.util.ArrayList; import java.util.List; +import org.openbravo.base.ExecutionLimits; import org.openbravo.buildvalidation.BuildValidation; import org.openbravo.database.ConnectionProvider; +import org.openbravo.modulescript.OpenbravoVersion; public class UnpostRefundPayments extends BuildValidation { @@ -88,4 +90,10 @@ } } + @Override + protected ExecutionLimits getBuildValidationLimits() { + return new ExecutionLimits("A918E3331C404B889D69AA9BFAFB23AC", null, new OpenbravoVersion(3, 0, + 13005)); + } + } diff -r 0ec7b1128718 -r 72cf9d166978 modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.java --- a/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.java Sat Dec 03 12:40:54 2016 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.java Mon Jan 30 10:28:40 2017 +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) 2011 Openbravo SLU + * All portions are Copyright (C) 2011-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -21,8 +21,10 @@ import java.util.ArrayList; import java.util.List; +import org.openbravo.base.ExecutionLimits; import org.openbravo.buildvalidation.BuildValidation; import org.openbravo.database.ConnectionProvider; +import org.openbravo.modulescript.OpenbravoVersion; public class WrongPaymentScheduleDetailsCheck extends BuildValidation { @@ -31,9 +33,8 @@ ConnectionProvider cp = getConnectionProvider(); ArrayList<String> errors = new ArrayList<String>(); try { - //Verify if it is necessary execute the buildvalidation - if (WrongPaymentScheduleDetailsCheckData.before30MP3(cp)) - { + // Verify if it is necessary execute the buildvalidation + if (WrongPaymentScheduleDetailsCheckData.before30MP3(cp)) { // Prevent error when upgrading from a pure 2.50 (MP0) if (WrongPaymentScheduleDetailsCheckData.existAPRMbasetables(cp)) { if (WrongPaymentScheduleDetailsCheckData.existWrongPaymentSchedules(cp)) { @@ -90,4 +91,11 @@ } } + + @Override + protected ExecutionLimits getBuildValidationLimits() { + return new ExecutionLimits("A918E3331C404B889D69AA9BFAFB23AC", null, new OpenbravoVersion(3, 0, + 22964)); + } } + diff -r 0ec7b1128718 -r 72cf9d166978 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentOnProcessActionHandler.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentOnProcessActionHandler.java Sat Dec 03 12:40:54 2016 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentOnProcessActionHandler.java Mon Jan 30 10:28:40 2017 +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 Openbravo SLU + * All portions are Copyright (C) 2014-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -21,6 +21,7 @@ import java.util.Map; +import org.apache.commons.lang.StringUtils; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONObject; import org.openbravo.advpaymentmngt.utility.FIN_Utility; @@ -49,7 +50,9 @@ FIN_FinancialAccount finFinancialAccount = OBDal.getInstance().get( FIN_FinancialAccount.class, strFinFinancialAccountId); String strBusinessPartnerId = null; + if (jsonData.get("receivedFrom") != JSONObject.NULL) { + strBusinessPartnerId = jsonData.getString("receivedFrom"); BusinessPartner businessPartner = OBDal.getInstance().get(BusinessPartner.class, strBusinessPartnerId); @@ -64,6 +67,22 @@ result.put("message", errorMessage); return result; } + + // If the payment uses or generates credit, payment currency should map bp currency + String currencyId = jsonData.getString("currencyId"); + boolean usesCredit = jsonData.getBoolean("usesCredit"); + boolean generatesCredit = jsonData.getBoolean("generatesCredit"); + if ((usesCredit || generatesCredit) + && !StringUtils.equals(currencyId, businessPartner.getCurrency().getId())) { + String message = String.format(OBMessageUtils.messageBD("APRM_CreditCurrency"), ------------------------------------------------------------------------------ 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
