details: https://code.openbravo.com/erp/devel/pi/rev/587a9175b5b8 changeset: 31797:587a9175b5b8 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Mar 01 08:46:43 2017 +0100 summary: [login-cleanup] Remove code to show 2.50 login page
details: https://code.openbravo.com/erp/devel/pi/rev/b67c6d3fe975 changeset: 31798:b67c6d3fe975 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Mar 01 12:47:56 2017 +0100 summary: [login-cleanup] Updated method name details: https://code.openbravo.com/erp/devel/pi/rev/ece5dd8a5e2d changeset: 31799:ece5dd8a5e2d user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Mar 02 10:32:42 2017 +0100 summary: [login-cleanup] Removed redirect to old mobile login version details: https://code.openbravo.com/erp/devel/pi/rev/e512bb63dfa8 changeset: 31800:e512bb63dfa8 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Mar 02 10:38:15 2017 +0100 summary: [login-cleanup] Removed unused constant details: https://code.openbravo.com/erp/devel/pi/rev/a4482a9a5408 changeset: 31801:a4482a9a5408 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Mar 02 13:04:30 2017 +0100 summary: [login-cleanup] Check command is only for 2.50, removing code that handles it details: https://code.openbravo.com/erp/devel/pi/rev/5ca8d2586634 changeset: 31802:5ca8d2586634 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Mar 02 17:35:39 2017 +0100 summary: [login-cleanup] Clean frames from Login page details: https://code.openbravo.com/erp/devel/pi/rev/4b08a3f9453b changeset: 31803:4b08a3f9453b user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Mar 02 17:35:46 2017 +0100 summary: [login-cleanup] Removed extra request, about:blank shows an empty page details: https://code.openbravo.com/erp/devel/pi/rev/0909879a312a changeset: 31804:0909879a312a user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Mar 03 18:02:53 2017 +0100 summary: [login-cleanup] Prevent showing 2.50 menu When the Startpage preference was defined with an empty value, the 2.50 menu was being shown after login. This has been solved by doing the proper redirect in that case. details: https://code.openbravo.com/erp/devel/pi/rev/c76a217ed72d changeset: 31805:c76a217ed72d user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Mar 03 18:09:30 2017 +0100 summary: [login-cleanup] Updated copyright year details: https://code.openbravo.com/erp/devel/pi/rev/cc52460546ee changeset: 31806:cc52460546ee user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Mar 06 16:40:57 2017 +0100 summary: Removed redirect to Log.html after logout To validate this changeset, it has been checked that the login page continues being shown properly in the followin scenarios: 1) After a logout 2) When the session is expired, and a manual window (old 2.50 style) is opened. 3) When the session is expired, and a button is clicked on a process pop-up (for example, the Order Post process). 4) When the session is expired, and the alert ping is fired. details: https://code.openbravo.com/erp/devel/pi/rev/85721635b712 changeset: 31807:85721635b712 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Mar 06 18:34:45 2017 +0100 summary: [login-cleanup] Removed redirect to /security/Menu.html after login details: https://code.openbravo.com/erp/devel/pi/rev/4fc492199c4c changeset: 31808:4fc492199c4c user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Mar 07 08:42:00 2017 +0100 summary: [login-cleanup] Prevent login failure when entering an empty user name Now after entering an empty user name, the LoginHandler returns an error message which is captured property in the client. details: https://code.openbravo.com/erp/devel/pi/rev/0507cd338fac changeset: 31809:0507cd338fac user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Mar 07 10:49:54 2017 +0100 summary: [login-cleanup] Removed redirection as login result Since now always a JSON object is returned with the login result details: https://code.openbravo.com/erp/devel/pi/rev/b12f91365d29 changeset: 31810:b12f91365d29 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Mar 07 13:10:53 2017 +0100 summary: [login-cleanup] Keep redirect when command is FORCE_NAMED_USER Do the redirect if the command is FORCE_NAMED_USER. This means that we are doing a login with a user that already has an existing session active having a license that prevents multiple sessions for the same user. In this case, we perform a redirect directly as at this point the login response has already been handled in the client. details: https://code.openbravo.com/erp/devel/pi/rev/c9a174dd0e27 changeset: 31811:c9a174dd0e27 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Mar 08 10:59:02 2017 +0100 summary: [login-cleanup] Avoid redirection to /security/Menu.html on login After login the LoginHandler does not redirect to /security/Menu.html anymore. Before this change, the StartPage preference was calculated after that redirection. Now the preference is calculated in the LoginHandler itself. Together with this, the Preferences API has been increased with the ability to provide the default filters (active, readable clients and readable orgs) to look for the desired preference. This was needed because the retrieval of the StartPage preference in the LoginHandler was being done with the system user context. details: https://code.openbravo.com/erp/devel/pi/rev/d4acfd8e7bf4 changeset: 31812:d4acfd8e7bf4 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Mar 08 11:03:37 2017 +0100 summary: [login-cleanup] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/b9ec7f4c801e changeset: 31813:b9ec7f4c801e user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Mar 08 11:09:38 2017 +0100 summary: [login-cleanup] Removed method and variables which are no longer needed details: https://code.openbravo.com/erp/devel/pi/rev/d4fbf7f18566 changeset: 31814:d4fbf7f18566 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Mar 08 12:42:53 2017 +0100 summary: [login-cleanup] Complete javadoc information details: https://code.openbravo.com/erp/devel/pi/rev/f91c6a2c0f3e changeset: 31815:f91c6a2c0f3e user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Mar 08 18:55:19 2017 +0100 summary: [login-cleanup] Moved login styles into a single css file details: https://code.openbravo.com/erp/devel/pi/rev/572ad0c59e88 changeset: 31816:572ad0c59e88 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Mar 08 19:55:18 2017 +0100 summary: [login-cleanup] Moved Javascript code used in login page into a new js file details: https://code.openbravo.com/erp/devel/pi/rev/62422fae45d7 changeset: 31817:62422fae45d7 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Mar 09 09:11:17 2017 +0100 summary: [login-cleanup] Clean js functions no longer needed When the session has expired, now with the redirectWhenInsideMDI function is enough to show the Login page. details: https://code.openbravo.com/erp/devel/pi/rev/b43170fe6b56 changeset: 31818:b43170fe6b56 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Mar 09 09:20:15 2017 +0100 summary: [login-cleanup] Do not need to calculate target As the login page is not shown inside a frame anymore, parent.frameMenu will always return null. Therefore the target will be always '_self' details: https://code.openbravo.com/erp/devel/pi/rev/8066c685f536 changeset: 31819:8066c685f536 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Mar 09 12:39:11 2017 +0100 summary: [login-cleanup] Added required style details: https://code.openbravo.com/erp/devel/pi/rev/7a5aa69ff1fc changeset: 31820:7a5aa69ff1fc user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Mar 09 17:06:21 2017 +0100 summary: [login-cleanup] Moved required code from shortcuts.js to login.js details: https://code.openbravo.com/erp/devel/pi/rev/6ba4b2ef90fd changeset: 31821:6ba4b2ef90fd user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Mar 09 17:21:01 2017 +0100 summary: [login-cleanup] Moved required code from appStatus.js to login.js details: https://code.openbravo.com/erp/devel/pi/rev/d604524b5ecf changeset: 31822:d604524b5ecf user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Mar 09 17:33:29 2017 +0100 summary: [login-cleanup] Moved required code from ajax.js to login.js details: https://code.openbravo.com/erp/devel/pi/rev/4d0be503d896 changeset: 31823:4d0be503d896 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Mar 09 17:37:20 2017 +0100 summary: [login-cleanup] Removed obsolete language tag details: https://code.openbravo.com/erp/devel/pi/rev/ac5fbb31caec changeset: 31824:ac5fbb31caec user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Mar 09 17:51:03 2017 +0100 summary: [login-cleanup] Better organization of functions details: https://code.openbravo.com/erp/devel/pi/rev/848bc9d28ae8 changeset: 31825:848bc9d28ae8 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Mar 10 15:46:53 2017 +0100 summary: [login-cleanup] Added missing style for clean cache screen details: https://code.openbravo.com/erp/devel/pi/rev/c9db12cb1eac changeset: 31826:c9db12cb1eac user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Mar 13 09:30:07 2017 +0100 summary: [login-cleanup] Use JSON.parse instead of eval details: https://code.openbravo.com/erp/devel/pi/rev/7ef76edcb02f changeset: 31827:7ef76edcb02f user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Mar 13 09:38:13 2017 +0100 summary: [login-cleanup] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/7f0a899209b2 changeset: 31828:7f0a899209b2 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Mar 13 13:36:08 2017 +0100 summary: [login-cleanup] Add RTL support in loginStyles css file details: https://code.openbravo.com/erp/devel/pi/rev/a9a3b2545dbd changeset: 31829:a9a3b2545dbd user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Mar 13 19:15:43 2017 +0100 summary: [login-cleanup] Apply correct format details: https://code.openbravo.com/erp/devel/pi/rev/7976d9ad9d5b changeset: 31830:7976d9ad9d5b user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Mar 14 09:51:13 2017 +0100 summary: [login-cleanup] Do not need to set forceLogin during login process details: https://code.openbravo.com/erp/devel/pi/rev/93a4f7a574f9 changeset: 31831:93a4f7a574f9 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Mar 14 10:23:56 2017 +0100 summary: [login-cleanup] Allow automatic record navigation after login details: https://code.openbravo.com/erp/devel/pi/rev/610914164d7b changeset: 31832:610914164d7b user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Mar 23 08:38:59 2017 +0100 summary: [login-cleanup] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/68f595eb703e changeset: 31833:68f595eb703e user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Mar 24 13:14:20 2017 +0100 summary: [login-cleanup] Moved inline code that can be cached details: https://code.openbravo.com/erp/devel/pi/rev/5ca3196e832b changeset: 31834:5ca3196e832b user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Mar 24 13:20:19 2017 +0100 summary: [login-cleanup] Removed xml:lang attribute The xml:lang attribute can be removed, as it is applied within documents that use an XHTML doctype. details: https://code.openbravo.com/erp/devel/pi/rev/5558fcd36457 changeset: 31835:5558fcd36457 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Mar 24 14:44:24 2017 +0100 summary: [login-cleanup] Removed Home servlet The Home servlet was used for initial page in 2.50 right side, it shouldn't be accessible anymore, so it can be deleted together with all related styles, messages and images which are only being used by this servlet. details: https://code.openbravo.com/erp/devel/pi/rev/b6f11dd6ff42 changeset: 31836:b6f11dd6ff42 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Mar 24 15:05:13 2017 +0100 summary: [login-cleanup] Added comment Added a comment to explain that once this handler is executed, a redirection to the base URL is done. After this redirection, the AuthenticationManager takes care of the final actions before logging out definitively details: https://code.openbravo.com/erp/devel/pi/rev/c9c7c1465f36 changeset: 31837:c9c7c1465f36 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Mar 24 15:45:27 2017 +0100 summary: [login-cleanup] Removed unused methods details: https://code.openbravo.com/erp/devel/pi/rev/e2a5b08ea06f changeset: 31838:e2a5b08ea06f user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Mar 27 09:16:54 2017 +0200 summary: [login-cleanup] Obtain user name from OBContext instead of doing a query details: https://code.openbravo.com/erp/devel/pi/rev/3514a6721bcd changeset: 31839:3514a6721bcd user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Mar 27 10:49:33 2017 +0200 summary: [login-cleanup] Vertical Menu cleanup details: https://code.openbravo.com/erp/devel/pi/rev/84013f2a7e67 changeset: 31840:84013f2a7e67 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Mar 27 11:18:37 2017 +0200 summary: [login-cleanup] Vertical Menu cleanup, removed images/styles not longer needed details: https://code.openbravo.com/erp/devel/pi/rev/e31a02fd2d3e changeset: 31841:e31a02fd2d3e user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Mar 27 11:26:54 2017 +0200 summary: [login-cleanup] Vertical Menu cleanup, removing 2.50 Alert part details: https://code.openbravo.com/erp/devel/pi/rev/e016c5fe8a30 changeset: 31842:e016c5fe8a30 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Mar 27 11:32:04 2017 +0200 summary: [login-cleanup] Vertical Menu cleanup, removing 2.50 Alert classes and mapping details: https://code.openbravo.com/erp/devel/pi/rev/42aa1b11b5a2 changeset: 31843:42aa1b11b5a2 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Mar 27 12:31:41 2017 +0200 summary: [login-cleanup] Vertical Menu cleanup, removing 2.50 user part details: https://code.openbravo.com/erp/devel/pi/rev/be81c13f020a changeset: 31844:be81c13f020a user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Mar 27 12:50:26 2017 +0200 summary: [login-cleanup] Added class javadoc and improved method name details: https://code.openbravo.com/erp/devel/pi/rev/830de0105dc9 changeset: 31845:830de0105dc9 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Mar 27 13:00:40 2017 +0200 summary: [login-cleanup] Removed html and xml files no longer needed details: https://code.openbravo.com/erp/devel/pi/rev/9613d87f806b changeset: 31846:9613d87f806b user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Mar 31 13:00:43 2017 +0200 summary: [login-cleanup] Removed text interfaces no longer needed details: https://code.openbravo.com/erp/devel/pi/rev/51271ac697f8 changeset: 31847:51271ac697f8 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Apr 03 11:20:50 2017 +0200 summary: [login-cleanup] Prevent form resubmission after login details: https://code.openbravo.com/erp/devel/pi/rev/e2d740fd4441 changeset: 31848:e2d740fd4441 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Apr 03 11:28:53 2017 +0200 summary: [login-cleanup] MenuData class is not referenced anymore details: https://code.openbravo.com/erp/devel/pi/rev/535732c77892 changeset: 31849:535732c77892 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Apr 03 11:37:40 2017 +0200 summary: [login-cleanup] Minor cleanup in html page details: https://code.openbravo.com/erp/devel/pi/rev/773e31176707 changeset: 31850:773e31176707 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Apr 03 18:42:26 2017 +0200 summary: [login-cleanup] Prevent errors being inside an iframe When rendering the login page with the new changes (without the frames) inside an iframe, the 'Blocked a frame with origin' security message was being thrown. Now this error is preventing by catching it and managing it properly for the case of being inside an iframe. details: https://code.openbravo.com/erp/devel/pi/rev/bfdb3f304f01 changeset: 31851:bfdb3f304f01 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Apr 04 13:00:48 2017 +0200 summary: [login-perf] redirectWhenPopup function is still needed The redirectWhenPopup function is still needed when opening a pop-up from an old 2.50 manual window having the session expired. In this case, this function allows to close the pop-up and redirect to the login page properly. details: https://code.openbravo.com/erp/devel/pi/rev/68a8d2bbfff5 changeset: 31852:68a8d2bbfff5 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Apr 06 16:26:10 2017 +0200 summary: fixes issue 35386: Login page needs some clean up details: https://code.openbravo.com/erp/devel/pi/rev/12e3e5c7273d changeset: 31853:12e3e5c7273d user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Apr 06 16:30:38 2017 +0200 summary: related to issue 35386: updated revision control number diffstat: .hgsigs | 2 + .hgtags | 2 + config/Openbravo.properties.template | 3 +- lib/README | 1 - modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 9 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 2 +- 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-db/database/sourcedata/AD_REFERENCE.xml | 12 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 2 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 15 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java | 147 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 47 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 89 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java | 21 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 7 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addTransaction.js | 15 +- modules/org.openbravo.apachejdbcconnectionpool/lib/runtime/tomcat-jdbc.jar | 0 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/JdbcExternalConnectionPool.java | 43 +- 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-test/org/openbravo/client/application/test/StandardWindowTest.java | 81 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/LogOutActionHandler.java | 1 + modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl | 5 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java | 20 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 6 +- 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/KernelServlet.java | 6 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl | 3 +- 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/ReadOnlyDataSourceService.java | 11 +- 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/AdvancedQueryBuilder.java | 72 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 1 + modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonConstants.java | 3 +- 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/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 6 +- 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.skin.250to300Comp/web/org.openbravo.userinterface.skin.250to300Comp/skins/250to300Comp/loginStyles.css | 603 + 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.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_REQUEST.xml | 1174 +- referencedata/sampledata/F_B_International_Group/AD_SEQUENCE.xml | 62 +- referencedata/sampledata/F_B_International_Group/AD_USER.xml | 48 +- referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml | 74 +- referencedata/sampledata/F_B_International_Group/C_CONVERSION_RATE.xml | 48 +- referencedata/sampledata/F_B_International_Group/C_INVOICE.xml | 3836 +- referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml | 8154 + referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml | 3996 + referencedata/sampledata/F_B_International_Group/C_INVOICETAX.xml | 1020 + referencedata/sampledata/F_B_International_Group/C_ORDER.xml | 2268 + referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml | 9237 ++ referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml | 3366 + referencedata/sampledata/F_B_International_Group/C_ORDERTAX.xml | 576 + referencedata/sampledata/F_B_International_Group/C_ORDER_DISCOUNT.xml | 180 + referencedata/sampledata/F_B_International_Group/FACT_ACCT.xml | 45352 +++++++++- referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENT.xml | 44 + referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENTLINE.xml | 1260 + referencedata/sampledata/F_B_International_Group/FIN_FINACC_TRANSACTION.xml | 1794 + referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml | 8 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml | 2046 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_DETAIL.xml | 928 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml | 174 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml | 600 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml | 2274 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml | 1288 +- 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 | 1566 + referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml | 4284 + 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 | 48 +- referencedata/sampledata/F_B_International_Group/M_STORAGE_PENDING.xml | 48 +- referencedata/sampledata/F_B_International_Group/M_TRANSACTION.xml | 5580 + referencedata/sampledata/F_B_International_Group/M_TRANSACTION_COST.xml | 3162 + referencedata/sampledata/F_B_International_Group/OBUIAPP_PROCESS_ACCESS.xml | 420 + referencedata/sampledata/QA_Testing/C_BPARTNER.xml | 1 + referencedata/sampledata/QA_Testing/C_TAX.xml | 401 +- referencedata/sampledata/QA_Testing/C_TAXCATEGORY.xml | 84 + referencedata/sampledata/QA_Testing/C_TAXCATEGORY_TRL.xml | 90 + referencedata/sampledata/QA_Testing/C_TAX_ACCT.xml | 180 + referencedata/sampledata/QA_Testing/C_TAX_TRL.xml | 180 + src-core/src/org/openbravo/base/ConfigParameters.java | 6 +- src-core/src/org/openbravo/database/SessionInfo.java | 3 +- src-core/src/org/openbravo/uiTranslation/TextInterfacesData.java | 21 +- src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/model/excludeFilter.xml | 1 + src-db/database/model/functions/C_COMMISSION_PROCESS.xml | 6 +- src-db/database/model/functions/C_GET_NET_AMOUNT_FROM_GROSS.xml | 66 + src-db/database/model/functions/C_GET_NET_PRICE_FROM_GROSS.xml | 5 +- src-db/database/model/functions/C_INVOICELINETAX_INSERT.xml | 12 +- src-db/database/model/functions/C_INVOICETAX_ADJUSTMENT.xml | 195 + src-db/database/model/functions/C_INVOICE_CREATE.xml | 118 +- src-db/database/model/functions/C_INVOICE_POST.xml | 65 +- src-db/database/model/functions/C_ORDERLINETAX_INSERT.xml | 14 +- src-db/database/model/functions/C_ORDERTAX_ADJUSTMENT.xml | 189 + src-db/database/model/functions/C_ORDER_POST1.xml | 70 +- src-db/database/model/functions/MRP_PURCHASEORDER.xml | 21 +- src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml | 6 +- src-db/database/model/functions/M_GET_PARETO_ABC.xml | 8 +- src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml | 16 +- src-db/database/model/functions/M_INOUT_POST.xml | 33 +- src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml | 6 +- src-db/database/model/functions/M_REQUISITION_CREATEPO.xml | 6 +- src-db/database/model/prescript-Oracle.sql | 39 +- src-db/database/model/prescript-PostgreSql.sql | 37 + src-db/database/model/tables/C_BPARTNER.xml | 6 + src-db/database/model/tables/C_ORDERLINETAX.xml | 3 + src-db/database/model/tables/C_ORDERTAX.xml | 3 + src-db/database/model/tables/FIN_PAYMENT.xml | 4 + src-db/database/model/tables/M_TRANSACTION_COST.xml | 3 + src-db/database/model/tables/M_VALUED_STOCK_AGG.xml | 7 +- src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml | 4 +- src-db/database/model/triggers/C_INVOICELINETAX_TRG.xml | 98 +- src-db/database/model/triggers/C_INVOICELINE_BEFORE_TRG.xml | 19 +- src-db/database/model/triggers/C_INVOICELINE_TRG2.xml | 133 +- src-db/database/model/triggers/C_ORDERLINETAX_TRG.xml | 82 +- src-db/database/model/triggers/C_ORDERLINE_TRG.xml | 22 +- src-db/database/model/triggers/C_ORDERLINE_TRG2.xml | 82 +- src-db/database/model/triggers/M_PRODUCT_CATEGORY_TRG.xml | 13 +- src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml | 2 +- src-db/database/sourcedata/AD_CALLOUT.xml | 9 + src-db/database/sourcedata/AD_COLUMN.xml | 2 + src-db/database/sourcedata/AD_FIELD.xml | 2 +- src-db/database/sourcedata/AD_MESSAGE.xml | 12 - src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 65 +- src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 70 +- src-db/database/sourcedata/AD_MODEL_OBJECT_PARA.xml | 22 +- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 711 +- src-db/database/sourcedata/AD_WINDOW.xml | 5 +- src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 2 +- src-test/src/org/openbravo/test/AllWebserviceTests.java | 14 +- src-test/src/org/openbravo/test/cancelandreplace/CancelAndReplaceTest.java | 2 +- src-test/src/org/openbravo/test/costing/TestCosting.java | 9 + src-test/src/org/openbravo/test/dal/DalTest.java | 43 + src-test/src/org/openbravo/test/model/IndexesTest.java | 21 +- src-test/src/org/openbravo/test/taxes/TaxesTest.java | 1598 +- src-test/src/org/openbravo/test/taxes/data/ProductDataConstants.java | 8 +- src-test/src/org/openbravo/test/taxes/data/TaxDataConstants.java | 30 +- src-test/src/org/openbravo/test/taxes/data/TaxesLineTestData.java | 98 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData.java | 137 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData1.java | 71 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData10.java | 71 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData100.java | 249 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData101.java | 249 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData102.java | 249 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData103.java | 249 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData104.java | 249 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData105.java | 112 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData106.java | 112 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData107.java | 112 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData108.java | 112 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData109.java | 112 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData11.java | 76 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData110.java | 112 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData111.java | 112 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData112.java | 112 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData113.java | 138 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData114.java | 138 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData115.java | 138 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData116.java | 138 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData117.java | 138 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData118.java | 138 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData119.java | 138 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData12.java | 76 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData120.java | 138 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData121.java | 140 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData122.java | 140 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData123.java | 140 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData124.java | 140 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData125.java | 140 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData126.java | 140 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData127.java | 140 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData128.java | 140 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData129.java | 228 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData13.java | 82 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData130.java | 228 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData131.java | 228 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData132.java | 228 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData133.java | 228 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData134.java | 228 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData135.java | 228 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData136.java | 228 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData137.java | 425 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData138.java | 425 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData139.java | 425 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData14.java | 81 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData140.java | 425 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData141.java | 425 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData142.java | 425 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData143.java | 425 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData144.java | 425 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData145.java | 426 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData146.java | 426 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData147.java | 426 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData148.java | 426 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData149.java | 426 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData15.java | 80 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData150.java | 426 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData151.java | 426 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData152.java | 426 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData153.java | 425 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData154.java | 425 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData155.java | 425 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData156.java | 425 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData157.java | 425 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData158.java | 425 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData159.java | 425 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData16.java | 80 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData160.java | 425 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData161.java | 80 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData162.java | 80 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData163.java | 80 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData164.java | 80 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData165.java | 80 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData166.java | 80 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData167.java | 80 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData168.java | 80 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData169.java | 81 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData17.java | 71 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData170.java | 81 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData171.java | 81 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData172.java | 81 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData173.java | 81 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData174.java | 81 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData175.java | 81 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData176.java | 81 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData177.java | 93 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData178.java | 93 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData179.java | 93 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData18.java | 71 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData180.java | 93 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData181.java | 93 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData182.java | 93 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData183.java | 93 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData184.java | 93 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData19.java | 71 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData2.java | 71 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData20.java | 71 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData21.java | 77 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData22.java | 77 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData23.java | 71 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData24.java | 70 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData25.java | 71 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData26.java | 71 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData27.java | 77 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData28.java | 77 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData29.java | 80 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData3.java | 71 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData30.java | 83 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData31.java | 80 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData32.java | 82 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData33.java | 79 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData34.java | 80 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData35.java | 85 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData36.java | 84 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData37.java | 83 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData38.java | 83 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData39.java | 83 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData4.java | 71 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData40.java | 83 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData41.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData42.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData43.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData44.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData45.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData46.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData47.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData48.java | 107 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData49.java | 110 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData5.java | 76 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData50.java | 109 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData51.java | 109 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData52.java | 110 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData53.java | 110 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData54.java | 109 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData55.java | 109 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData56.java | 110 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData57.java | 110 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData58.java | 106 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData59.java | 110 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData6.java | 76 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData60.java | 110 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData61.java | 110 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData62.java | 106 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData63.java | 110 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData64.java | 110 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData65.java | 110 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData66.java | 110 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData67.java | 110 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData68.java | 110 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData69.java | 110 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData7.java | 71 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData70.java | 110 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData71.java | 110 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData72.java | 110 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData73.java | 108 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData74.java | 108 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData75.java | 108 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData76.java | 108 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData77.java | 108 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData78.java | 108 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData79.java | 108 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData8.java | 71 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData80.java | 108 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData81.java | 108 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData82.java | 108 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData83.java | 108 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData84.java | 108 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData85.java | 108 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData86.java | 108 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData87.java | 108 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData88.java | 108 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData89.java | 188 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData9.java | 70 +- src-test/src/org/openbravo/test/taxes/data/TaxesTestData90.java | 188 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData91.java | 188 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData92.java | 188 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData93.java | 188 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData94.java | 188 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData95.java | 188 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData96.java | 188 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData97.java | 249 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData98.java | 249 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData99.java | 249 + src-test/src/org/openbravo/test/webservice/WSReadableClientsTest.java | 119 + src-trl/src/org/openbravo/translate/RTLSkin.java | 19 +- src/org/openbravo/authentication/AuthenticationManager.java | 31 +- src/org/openbravo/authentication/basic/DefaultAuthenticationManager.java | 21 +- src/org/openbravo/base/SystemStatusListener.java | 7 +- src/org/openbravo/base/secureApp/AllowedCrossDomainsHandler.java | 6 + src/org/openbravo/base/secureApp/ErrorConnection.java | 4 +- src/org/openbravo/base/secureApp/LoginHandler.java | 229 +- src/org/openbravo/base/secureApp/OrgTree.java | 2 +- src/org/openbravo/base/session/SessionFactoryController.java | 19 +- src/org/openbravo/common/actionhandler/AgingBalanceReportActionHandler.java | 2 + src/org/openbravo/common/actionhandler/OrderCreatePOLines.java | 9 +- src/org/openbravo/common/actionhandler/SRMOPickEditLines.java | 7 +- src/org/openbravo/common/actionhandler/SetNewBPCurrency.java | 6 +- src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java | 9 +- src/org/openbravo/dal/core/SessionHandler.java | 6 +- src/org/openbravo/dal/security/EntityAccessChecker.java | 291 +- src/org/openbravo/dal/service/OBQuery.java | 4 +- src/org/openbravo/dal/xml/EntityXMLConverter.java | 121 +- src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java | 5 +- src/org/openbravo/erpCommon/ad_actionButton/CopyFromOrder.java | 9 +- src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder.java | 6 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java | 8 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql | 3 +- src/org/openbravo/erpCommon/ad_actionButton/CreditPaymentGrid.html | 4 +- src/org/openbravo/erpCommon/ad_actionButton/RMInsertOrphanLine.java | 16 +- src/org/openbravo/erpCommon/ad_callouts/SE_Amount_Transaction.java | 45 + src/org/openbravo/erpCommon/ad_callouts/SE_Payment_Transaction.java | 8 +- src/org/openbravo/erpCommon/ad_callouts/SE_Trxtype_Transaction.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Amt.java | 33 +- src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java | 52 +- src/org/openbravo/erpCommon/ad_forms/About.html | 2 +- src/org/openbravo/erpCommon/ad_forms/AlertManagement.html | 373 - src/org/openbravo/erpCommon/ad_forms/AlertManagement.java | 217 - src/org/openbravo/erpCommon/ad_forms/AlertManagement.xml | 51 - src/org/openbravo/erpCommon/ad_forms/DocGLJournal.java | 21 +- src/org/openbravo/erpCommon/ad_forms/DocGLJournal_data.xsql | 4 +- src/org/openbravo/erpCommon/ad_forms/DocInOut.java | 29 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 9 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice_data.xsql | 8 +- src/org/openbravo/erpCommon/ad_forms/DocLineInvoice_data.xsql | 4 +- src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java | 6 +- src/org/openbravo/erpCommon/ad_forms/DocMovement.java | 20 +- src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java | 17 +- src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql | 20 +- src/org/openbravo/erpCommon/ad_forms/Role.html | 647 - src/org/openbravo/erpCommon/ad_forms/Role.java | 307 - src/org/openbravo/erpCommon/ad_forms/Role.xml | 54 - src/org/openbravo/erpCommon/ad_process/ConvertQuotationIntoOrder.java | 43 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesComparativeJR.jrxml | 640 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java | 105 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql | 49 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesMultiComparativeExtendedJR.jrxml | 692 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesMultiComparativeJR.jrxml | 554 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesNoComparativeJR.jrxml | 368 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.jrxml | 430 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalyses_srpt_doctypecount.jrxml | 169 + src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.jrxml | 7 +- src/org/openbravo/erpCommon/ad_reports/ReportParetoProduct.html | 28 +- src/org/openbravo/erpCommon/ad_reports/ReportParetoProduct.java | 72 +- src/org/openbravo/erpCommon/ad_reports/ReportParetoProduct_data.xsql | 205 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderProvided_data.xsql | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java | 2 +- src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java | 5 +- src/org/openbravo/erpCommon/businessUtility/Preferences.java | 54 +- src/org/openbravo/erpCommon/businessUtility/TabAttachments.java | 17 +- src/org/openbravo/erpCommon/info/AttributeSetInstance.html | 26 +- src/org/openbravo/erpCommon/info/AttributeSetInstance.java | 18 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 8 +- src/org/openbravo/erpCommon/security/Login.html | 478 +- src/org/openbravo/erpCommon/security/Login.java | 196 +- src/org/openbravo/erpCommon/security/Login_F0.html | 25 - src/org/openbravo/erpCommon/security/Login_F0.xml | 21 - src/org/openbravo/erpCommon/security/Login_F1.html | 351 - src/org/openbravo/erpCommon/security/Login_F1.xml | 26 - src/org/openbravo/erpCommon/security/Login_FS_RTL.html | 2 +- src/org/openbravo/erpCommon/security/Login_Logo.html | 38 - src/org/openbravo/erpCommon/security/Login_Logo.xml | 24 - src/org/openbravo/erpCommon/security/Login_Options_F1.html | 304 - src/org/openbravo/erpCommon/security/Login_Options_F1.xml | 47 - src/org/openbravo/erpCommon/security/Login_Welcome.html | 82 - src/org/openbravo/erpCommon/security/Login_Welcome.xml | 23 - src/org/openbravo/erpCommon/security/Menu.java | 21 +- src/org/openbravo/erpCommon/security/SessionListener.java | 58 +- src/org/openbravo/erpCommon/utility/Home.html | 169 - src/org/openbravo/erpCommon/utility/Home.java | 132 - src/org/openbravo/erpCommon/utility/Home.xml | 32 - src/org/openbravo/erpCommon/utility/Log.html | 47 - src/org/openbravo/erpCommon/utility/Log.java | 52 - src/org/openbravo/erpCommon/utility/Log.xml | 21 - src/org/openbravo/erpCommon/utility/Menu_data.xsql | 218 - src/org/openbravo/erpCommon/utility/Utility.java | 37 - src/org/openbravo/erpCommon/utility/Utility_data.xsql | 22 +- src/org/openbravo/erpCommon/utility/VerticalMenu.html | 36 - src/org/openbravo/erpCommon/utility/VerticalMenu.java | 493 +- src/org/openbravo/erpCommon/utility/VerticalMenuLoading.html | 34 - src/org/openbravo/erpCommon/utility/VerticalMenu_data.xsql | 66 - src/org/openbravo/financial/FinancialUtils.java | 35 +- src/org/openbravo/materialmgmt/GenerateValuedStockAggregated_data.xsql | 4 +- src/org/openbravo/service/rest/DalWebService.java | 4 +- src/org/openbravo/service/system/SystemService.java | 6 +- web/js/login.js | 621 + web/js/shortcuts.js | 2 +- web/js/utils.js | 135 +- web/skins/Default/Login/communityBrandingBackground.png | 0 web/skins/Default/Login/communityBrandingBottom.png | 0 web/skins/Default/Login/communityBrandingTop.png | 0 web/skins/Default/Menu/ToolBar/iconAlert.disabled.png | 0 web/skins/Default/Menu/ToolBar/iconAlert.png | 0 web/skins/Default/Menu/ToolBar/iconAlertActive.disabled.png | 0 web/skins/Default/Menu/ToolBar/iconAlertActive.png | 0 web/skins/Default/Menu/ToolBar/iconContract.disabled.png | 0 web/skins/Default/Menu/ToolBar/iconContract.png | 0 web/skins/Default/Menu/ToolBar/iconExpand.png | 0 web/skins/Default/Menu/ToolBar/iconLogout.disabled.png | 0 web/skins/Default/Menu/ToolBar/iconLogout.png | 0 web/skins/Default/Menu/ToolBar/iconUser.disabled.png | 0 web/skins/Default/Openbravo_ERP_250.css | 252 +- 487 files changed, 148030 insertions(+), 10500 deletions(-) diffs (truncated from 203733 to 300 lines): diff -r 9c931e5263c1 -r 12e3e5c7273d .hgsigs --- a/.hgsigs Mon Feb 27 13:05:01 2017 -0500 +++ b/.hgsigs Thu Apr 06 16:30:38 2017 +0200 @@ -208,3 +208,5 @@ 555379f85b18b37ee1c36b4137c75eca80da7267 0 iEYEABECAAYFAlhSQ0UACgkQCX/oGf+2qkN2yQCg5zq8YEVnWK3wy859qvLYbrEhBY4AoKsfpep+GEj+oGGlmOiOqESGPxxH fa51600e25b24b2eb3739898d293168ea94748a7 0 iEYEABECAAYFAlh/u8wACgkQCX/oGf+2qkPTnwCfZ29b107GdizLBcC+tzdP3HlnmUUAoN2kMLXvfTYSRLAQG/ziGm5P6kYA 9753e90ea3e81f850f904feb531120b4e185394a 0 iEYEABECAAYFAliG6A8ACgkQCX/oGf+2qkPeeQCg6D9p++eslvzqEVlYK8RS0uzgZNsAoMELVWkte/AM/ilPxZ4vP37myscv +a131c85d1d3d55b852f97622ce068baf80b7fe67 0 iEYEABECAAYFAli+qu8ACgkQCX/oGf+2qkNTOACfTznbhwkwUplXd8QjHIuJ7uBJdK4An3KWtbUrBZleCwS1xH3aa2n9p9bM +3a7510a5ee0b43ac0a65e4eae9b089f42158bbe0 0 iEYEABECAAYFAljGfFgACgkQCX/oGf+2qkOgoQCgx3u3UhiV8NyyiBZLsFjlwicCp1EAoPAl4mZZ6/wURPq39Ef6Rtbe1BRb diff -r 9c931e5263c1 -r 12e3e5c7273d .hgtags --- a/.hgtags Mon Feb 27 13:05:01 2017 -0500 +++ b/.hgtags Thu Apr 06 16:30:38 2017 +0200 @@ -219,3 +219,5 @@ cd98953b932b72cc3c694904fc8f8549463ba84a 3.0PR16Q4 b93f495b2cde680cf6558d93d72051429f4b9031 3.0PR16Q4.1 31c79a32ce3a6b555dadb35c70d63113be6312e7 3.0PR16Q4.2 +eaeb76d8cd4ec1caf5bf43bc9b4111424d799a03 3.0PR16Q4.3 +273c24deef8f21e870cf563073cc653582a9fe9e 3.0PR17Q1 diff -r 9c931e5263c1 -r 12e3e5c7273d config/Openbravo.properties.template --- a/config/Openbravo.properties.template Mon Feb 27 13:05:01 2017 -0500 +++ b/config/Openbravo.properties.template Thu Apr 06 16:30:38 2017 +0200 @@ -10,7 +10,7 @@ # * under the License. # * The Original Code is Openbravo ERP. # * The Initial Developer of the Original Code is Openbravo SLU -# * All portions are Copyright (C) 2007-2015 Openbravo SLU +# * All portions are Copyright (C) 2007-2017 Openbravo SLU # * All Rights Reserved. # * Contributor(s): ______________________________________. # ************************************************************************ @@ -99,6 +99,7 @@ db.pool.testOnReturn=false db.pool.validationQuery=SELECT 1 FROM DUAL db.pool.validationInterval=30000 +db.pool.jmxEnabled=false ################## # Tomcat manager # diff -r 9c931e5263c1 -r 12e3e5c7273d lib/README --- a/lib/README Mon Feb 27 13:05:01 2017 -0500 +++ b/lib/README Thu Apr 06 16:30:38 2017 +0200 @@ -1,4 +1,3 @@ When adding or removing libraries to Openbravo ERP please update this page with your changes: http://wiki.openbravo.com/wiki/Openbravo_Libraries - diff -r 9c931e5263c1 -r 12e3e5c7273d modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Mon Feb 27 13:05:01 2017 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Thu Apr 06 16:30:38 2017 +0200 @@ -16,7 +16,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2010-2016 Openbravo SLU +* All portions are Copyright (C) 2010-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -1155,6 +1155,7 @@ ELSIF (p_docaction = 'RC') THEN DECLARE v_count NUMBER; + v_prepaymentamt NUMBER; BEGIN v_delete_paymentplan := TRUE; SELECT c_invoice_id INTO v_reversalinvoice_id @@ -1180,6 +1181,12 @@ IF (v_count <> 0) THEN v_delete_paymentplan := FALSE; END IF; + SELECT prepaymentamt INTO v_prepaymentamt + FROM c_invoice + WHERE c_invoice_id = p_record_id; + IF (v_prepaymentamt <> 0) THEN + v_delete_paymentplan := FALSE; + END IF; END; END IF; diff -r 9c931e5263c1 -r 12e3e5c7273d modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Mon Feb 27 13:05:01 2017 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Thu Apr 06 16:30:38 2017 +0200 @@ -11335,8 +11335,7 @@ <!--D5B4BD05344C4B44AB7ED2F6CF9C86F6--> <ISKEY><![CDATA[N]]></ISKEY> <!--D5B4BD05344C4B44AB7ED2F6CF9C86F6--> <ISPARENT><![CDATA[N]]></ISPARENT> <!--D5B4BD05344C4B44AB7ED2F6CF9C86F6--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> -<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> -<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6--> <READONLYLOGIC><![CDATA['Y']]></READONLYLOGIC> +<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6--> <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE> <!--D5B4BD05344C4B44AB7ED2F6CF9C86F6--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> <!--D5B4BD05344C4B44AB7ED2F6CF9C86F6--> <SEQNO><![CDATA[410]]></SEQNO> <!--D5B4BD05344C4B44AB7ED2F6CF9C86F6--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> diff -r 9c931e5263c1 -r 12e3e5c7273d modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Mon Feb 27 13:05:01 2017 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Thu Apr 06 16:30:38 2017 +0200 @@ -22505,7 +22505,7 @@ <!--FBEA6835AE0543FE8821B907BD5D0F0B--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> <!--FBEA6835AE0543FE8821B907BD5D0F0B--> <DISPLAYLOGIC><![CDATA[@EM_Aprm_Finacc_Trans_Origin@!'']]></DISPLAYLOGIC> <!--FBEA6835AE0543FE8821B907BD5D0F0B--> <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH> -<!--FBEA6835AE0543FE8821B907BD5D0F0B--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--FBEA6835AE0543FE8821B907BD5D0F0B--> <ISREADONLY><![CDATA[Y]]></ISREADONLY> <!--FBEA6835AE0543FE8821B907BD5D0F0B--> <SEQNO><![CDATA[80]]></SEQNO> <!--FBEA6835AE0543FE8821B907BD5D0F0B--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> <!--FBEA6835AE0543FE8821B907BD5D0F0B--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> diff -r 9c931e5263c1 -r 12e3e5c7273d modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Mon Feb 27 13:05:01 2017 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Thu Apr 06 16:30:38 2017 +0200 @@ -679,7 +679,7 @@ <!--712C841E501642B881A998CCAC13E420--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--712C841E501642B881A998CCAC13E420--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--712C841E501642B881A998CCAC13E420--> <VALUE><![CDATA[APRM_CreditWithNegativeAmt]]></VALUE> -<!--712C841E501642B881A998CCAC13E420--> <MSGTEXT><![CDATA[It is not necessary to use credit for this payment: Actual Payment is greater than Expected Payment.]]></MSGTEXT> +<!--712C841E501642B881A998CCAC13E420--> <MSGTEXT><![CDATA[It is not possible to use credit in negative payments. Please, unselect credit records.]]></MSGTEXT> <!--712C841E501642B881A998CCAC13E420--> <MSGTYPE><![CDATA[E]]></MSGTYPE> <!--712C841E501642B881A998CCAC13E420--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--712C841E501642B881A998CCAC13E420--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> diff -r 9c931e5263c1 -r 12e3e5c7273d modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Feb 27 13:05:01 2017 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Apr 06 16:30:38 2017 +0200 @@ -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.31055]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.31774]]></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 9c931e5263c1 -r 12e3e5c7273d 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 Mon Feb 27 13:05:01 2017 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Apr 06 16:30:38 2017 +0200 @@ -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.31055]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.31774]]></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.31055]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.31774]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 9c931e5263c1 -r 12e3e5c7273d modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml Mon Feb 27 13:05:01 2017 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml Thu Apr 06 16:30:38 2017 +0200 @@ -349,6 +349,18 @@ <!--C20E5E22588E40E5B8CC6D80ED3015C5--> <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED> <!--C20E5E22588E40E5B8CC6D80ED3015C5--></AD_REFERENCE> +<!--C4A74AE591F04D9A9CB859CC67F61340--><AD_REFERENCE> +<!--C4A74AE591F04D9A9CB859CC67F61340--> <AD_REFERENCE_ID><![CDATA[C4A74AE591F04D9A9CB859CC67F61340]]></AD_REFERENCE_ID> +<!--C4A74AE591F04D9A9CB859CC67F61340--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--C4A74AE591F04D9A9CB859CC67F61340--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--C4A74AE591F04D9A9CB859CC67F61340--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--C4A74AE591F04D9A9CB859CC67F61340--> <NAME><![CDATA[Financial Transaction Selector]]></NAME> +<!--C4A74AE591F04D9A9CB859CC67F61340--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--C4A74AE591F04D9A9CB859CC67F61340--> <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE> +<!--C4A74AE591F04D9A9CB859CC67F61340--> <PARENTREFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></PARENTREFERENCE_ID> +<!--C4A74AE591F04D9A9CB859CC67F61340--> <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED> +<!--C4A74AE591F04D9A9CB859CC67F61340--></AD_REFERENCE> + <!--D9B6068A6D3E4B7487470E7D2F033A54--><AD_REFERENCE> <!--D9B6068A6D3E4B7487470E7D2F033A54--> <AD_REFERENCE_ID><![CDATA[D9B6068A6D3E4B7487470E7D2F033A54]]></AD_REFERENCE_ID> <!--D9B6068A6D3E4B7487470E7D2F033A54--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 9c931e5263c1 -r 12e3e5c7273d modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml Mon Feb 27 13:05:01 2017 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml Thu Apr 06 16:30:38 2017 +0200 @@ -1036,6 +1036,7 @@ <!--7B2AE9099ECB4CE9B80C665D7662FA03--> <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE> <!--7B2AE9099ECB4CE9B80C665D7662FA03--> <AD_FIELDGROUP_ID><![CDATA[612BAE7A8D3E4170936F79A760FCF94C]]></AD_FIELDGROUP_ID> <!--7B2AE9099ECB4CE9B80C665D7662FA03--> <READONLYLOGIC><![CDATA[@trxtype@='BPW']]></READONLYLOGIC> +<!--7B2AE9099ECB4CE9B80C665D7662FA03--> <ONCHANGEFUNCTION><![CDATA[OB.APRM.AddTransaction.amtOnChangeFunction]]></ONCHANGEFUNCTION> <!--7B2AE9099ECB4CE9B80C665D7662FA03--> <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS> <!--7B2AE9099ECB4CE9B80C665D7662FA03--> <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE> <!--7B2AE9099ECB4CE9B80C665D7662FA03--> <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION> @@ -1625,6 +1626,7 @@ <!--AC203DDD5CF1459AA36DC7769ED15567--> <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE> <!--AC203DDD5CF1459AA36DC7769ED15567--> <AD_FIELDGROUP_ID><![CDATA[612BAE7A8D3E4170936F79A760FCF94C]]></AD_FIELDGROUP_ID> <!--AC203DDD5CF1459AA36DC7769ED15567--> <READONLYLOGIC><![CDATA[@trxtype@='BPD']]></READONLYLOGIC> +<!--AC203DDD5CF1459AA36DC7769ED15567--> <ONCHANGEFUNCTION><![CDATA[OB.APRM.AddTransaction.amtOnChangeFunction]]></ONCHANGEFUNCTION> <!--AC203DDD5CF1459AA36DC7769ED15567--> <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS> <!--AC203DDD5CF1459AA36DC7769ED15567--> <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE> <!--AC203DDD5CF1459AA36DC7769ED15567--> <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION> diff -r 9c931e5263c1 -r 12e3e5c7273d modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml Mon Feb 27 13:05:01 2017 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml Thu Apr 06 16:30:38 2017 +0200 @@ -99,6 +99,21 @@ <!--7811D4DBBB734D5ABB5DCC0CFDA21B88--> <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY> <!--7811D4DBBB734D5ABB5DCC0CFDA21B88--></OBUISEL_SELECTOR> +<!--80D03C83D251489F984B488FA5B0B75F--><OBUISEL_SELECTOR> +<!--80D03C83D251489F984B488FA5B0B75F--> <OBUISEL_SELECTOR_ID><![CDATA[80D03C83D251489F984B488FA5B0B75F]]></OBUISEL_SELECTOR_ID> +<!--80D03C83D251489F984B488FA5B0B75F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--80D03C83D251489F984B488FA5B0B75F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--80D03C83D251489F984B488FA5B0B75F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--80D03C83D251489F984B488FA5B0B75F--> <NAME><![CDATA[Financial Transaction Selector]]></NAME> +<!--80D03C83D251489F984B488FA5B0B75F--> <AD_REFERENCE_ID><![CDATA[C4A74AE591F04D9A9CB859CC67F61340]]></AD_REFERENCE_ID> +<!--80D03C83D251489F984B488FA5B0B75F--> <AD_TABLE_ID><![CDATA[4D8C3B3C31D1410DA046140C9F024D17]]></AD_TABLE_ID> +<!--80D03C83D251489F984B488FA5B0B75F--> <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID> +<!--80D03C83D251489F984B488FA5B0B75F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--80D03C83D251489F984B488FA5B0B75F--> <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE> +<!--80D03C83D251489F984B488FA5B0B75F--> <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE> +<!--80D03C83D251489F984B488FA5B0B75F--> <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY> +<!--80D03C83D251489F984B488FA5B0B75F--></OBUISEL_SELECTOR> + <!--8E06629A43A84B099387466818B1C54F--><OBUISEL_SELECTOR> <!--8E06629A43A84B099387466818B1C54F--> <OBUISEL_SELECTOR_ID><![CDATA[8E06629A43A84B099387466818B1C54F]]></OBUISEL_SELECTOR_ID> <!--8E06629A43A84B099387466818B1C54F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 9c931e5263c1 -r 12e3e5c7273d modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java Mon Feb 27 13:05:01 2017 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java Thu Apr 06 16:30:38 2017 +0200 @@ -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-2016 Openbravo SLU + * All portions are Copyright (C) 2010-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -52,6 +52,7 @@ import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; import org.openbravo.dal.service.OBDao; +import org.openbravo.dal.service.OBQuery; import org.openbravo.data.FieldProvider; import org.openbravo.erpCommon.ad_actionButton.ActionButtonUtility; import org.openbravo.erpCommon.ad_forms.AcctServer; @@ -254,25 +255,24 @@ } // If Invoice has a awaiting execution payment related, show an Error - List<FIN_PaymentSchedule> psl = invoice.getFINPaymentScheduleList(); - for (FIN_PaymentSchedule ps : psl) { - List<FIN_PaymentScheduleDetail> psdl = ps - .getFINPaymentScheduleDetailInvoicePaymentScheduleList(); - for (FIN_PaymentScheduleDetail psd : psdl) { - FIN_PaymentDetail pd = psd.getPaymentDetails(); - if (pd != null - && (pd.getFinPayment().getStatus().equals("RPAE") || pd.getFinPayment() - .getStatus().equals("RPAP"))) { - msg = new OBError(); - msg.setType("Error"); - msg.setTitle(Utility.messageBD(this, "Error", vars.getLanguage())); - msg.setMessage(OBMessageUtils - .messageBD("APRM_InvoiceAwaitingExcutionPaymentRelated")); - vars.setMessage(strTabId, msg); - printPageClosePopUp(response, vars, Utility.getTabURL(strTabId, "R", true)); - return; - } - } + StringBuilder fpHQLQuery = new StringBuilder(" as fp"); + fpHQLQuery.append(" join fp.fINPaymentDetailList fpd"); + fpHQLQuery.append(" join fpd.fINPaymentScheduleDetailList fpsd"); + fpHQLQuery.append(" join fpsd.invoicePaymentSchedule fps"); + fpHQLQuery.append(" where fps.invoice.id = :invoiceId"); + fpHQLQuery.append(" and fp.status in ('RPAE', 'RPAP')"); + OBQuery<FIN_Payment> paymentQuery = OBDal.getInstance().createQuery(FIN_Payment.class, + fpHQLQuery.toString()); + paymentQuery.setNamedParameter("invoiceId", invoice.getId()); + paymentQuery.setMaxResult(1); + if (paymentQuery.uniqueResult() != null) { + msg = new OBError(); + msg.setType("Error"); + msg.setTitle(Utility.messageBD(this, "Error", vars.getLanguage())); + msg.setMessage(OBMessageUtils.messageBD("APRM_InvoiceAwaitingExcutionPaymentRelated")); + vars.setMessage(strTabId, msg); + printPageClosePopUp(response, vars, Utility.getTabURL(strTabId, "R", true)); + return; } // Reversed invoice's date: voidDate in Purchase Invoice, new Date() in Sales Invoice @@ -340,6 +340,9 @@ } } + boolean voidingPrepaidInvoice = "RC".equals(strdocaction) + && invoice.getPrepaymentamt().compareTo(BigDecimal.ZERO) != 0; + final ProcessInstance pinstance = CallProcess.getInstance().call(process, strC_Invoice_ID, parameters); @@ -358,7 +361,107 @@ revInvoiceCriteria.setMaxResults(1); ReversedInvoice revInvoice = (ReversedInvoice) revInvoiceCriteria.uniqueResult(); - if (revInvoice != null && dummyPayment != null) { + boolean processPayment = false; + + if (voidingPrepaidInvoice) { + processPayment = true; + + StringBuilder orderPaymentHQLQuery = new StringBuilder(" as fp"); ------------------------------------------------------------------------------ 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
