details: https://code.openbravo.com/erp/devel/pi/rev/c2064d05dcab changeset: 30456:c2064d05dcab user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Sep 12 15:31:14 2016 +0200 summary: [pi-accessibility-improvements] New preference created.
The AllowFullScreenReader preference has been created. details: https://code.openbravo.com/erp/devel/pi/rev/2fefc2b48be0 changeset: 30457:2fefc2b48be0 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Tue Sep 13 11:39:45 2016 +0200 summary: [pi-accessibility-improvements] The name of the preference has been modifyied. details: https://code.openbravo.com/erp/devel/pi/rev/212f2c5ff70a changeset: 30458:212f2c5ff70a user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Tue Sep 13 15:15:33 2016 +0200 summary: [pi-accessibility-improvements] The code which enables the screenReader has been created The layout.js.ftl class has been modifyied, now, if the EnableFullReader preference exists and if it is set to true, the screenReader will be activated. details: https://code.openbravo.com/erp/devel/pi/rev/84da61a3db3f changeset: 30459:84da61a3db3f user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Wed Sep 14 11:45:14 2016 +0200 summary: [pi-accessibility-improvements] The copyright year of layout.js.ftl has been updated details: https://code.openbravo.com/erp/devel/pi/rev/57847557cb6c changeset: 30460:57847557cb6c user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Wed Sep 14 12:38:19 2016 +0200 summary: [pi-accessibility-improvements] The filter fields now give more info Now, when a filter field is selected, it gives more info. Before, only the name of the column was given, now the value given is more informative, it says "Filtered by"+ the name of the column. details: https://code.openbravo.com/erp/devel/pi/rev/0045797f7c65 changeset: 30461:0045797f7c65 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Wed Sep 14 15:50:47 2016 +0200 summary: [pi-accessibility-improvements] The filter fields now give more info in alert window Now, when a filter field is selected, it gives more info. Before, only the name of the column was given, now the value given is more informative, it says "Filtered by"+ the name of the column. details: https://code.openbravo.com/erp/devel/pi/rev/7432c72c4baf changeset: 30462:7432c72c4baf user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Wed Sep 14 17:55:47 2016 +0200 summary: [pi-accessibility-improvements] A space left after the word "by" details: https://code.openbravo.com/erp/devel/pi/rev/d1d5abeffd5e changeset: 30463:d1d5abeffd5e user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Thu Sep 15 10:07:08 2016 +0200 summary: [pi-accessibility-improvements] The "Filter by" message saved in ad_message A new record has been created in ad_message. This is the one used in the filters to give more information saying "Filter by". details: https://code.openbravo.com/erp/devel/pi/rev/767e1503d0f1 changeset: 30464:767e1503d0f1 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Thu Sep 15 16:08:24 2016 +0200 summary: [pi-accessibility-improvements] LeftColumn layout of the workspace are now accessible Before there was not possible to access the left side members of the workspace; recent views, Recent Documents and Manage Workspace; using the keyboard. It was only possible to access them using the mouse. Now, if the "Enable full screen reader" preference is enabled, it is possible to access them using the keyboard. details: https://code.openbravo.com/erp/devel/pi/rev/7fcdd3c8f96f changeset: 30465:7fcdd3c8f96f user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Thu Sep 15 16:23:04 2016 +0200 summary: [pi-accessibility-improvements] Fixed a condition in ob-alert-grid.js details: https://code.openbravo.com/erp/devel/pi/rev/568e87532008 changeset: 30466:568e87532008 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Fri Sep 16 15:20:20 2016 +0200 summary: [pi-accessibility-improvements] The left memebers' accessibility has been improved Now it is possible to press the enter button having the focus on any left side members and get the same behavior than clicking with the mouse. details: https://code.openbravo.com/erp/devel/pi/rev/4389ee8779f4 changeset: 30467:4389ee8779f4 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Sep 19 09:21:06 2016 +0200 summary: [pi-accessibility-improvements] Merge with latest pi details: https://code.openbravo.com/erp/devel/pi/rev/4baa9a869319 changeset: 30468:4baa9a869319 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Sep 19 12:20:35 2016 +0200 summary: [pi-accessibility-improvements] The code of ob-myopenbravo has been refactored details: https://code.openbravo.com/erp/devel/pi/rev/a83b39105a67 changeset: 30469:a83b39105a67 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Sep 19 13:23:23 2016 +0200 summary: [pi-accessibility-improvements] Merge with latest pi details: https://code.openbravo.com/erp/devel/pi/rev/025216fc7a00 changeset: 30470:025216fc7a00 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Sep 19 16:18:54 2016 +0200 summary: [pi-accessibility-improvements] Problems with the toolbar item names fixed There were some problems with some item names in the toolbar. Some of them where saying "Dot" at the beginning of the name of the button and the attachments and the saved views buttons were totally wrong. To fix the first issue, the title: '.' of the class ob-toolbar.js has been changed for title:''. Now the word "dot" is no longer said. To fix the second issue, the title for the attachments button and the save views button has been set. details: https://code.openbravo.com/erp/devel/pi/rev/84d652430c43 changeset: 30471:84d652430c43 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Tue Sep 20 17:05:11 2016 +0200 summary: [pi-accessibility-improvements] Fixed the aria label of attachments Before it was set a title for the attachments toolbar button. But it was a static name, it was not correct because the name needs to change if there are attachments or if not. So, the method setAriaState(state, stateValue) is invoked to change the aria-label property in the different situations. details: https://code.openbravo.com/erp/devel/pi/rev/0985106e00c1 changeset: 30472:0985106e00c1 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Fri Sep 23 09:20:13 2016 +0200 summary: [pi-accessibility-improvements] Merge with latest pi. details: https://code.openbravo.com/erp/devel/pi/rev/1508e8a191c3 changeset: 30473:1508e8a191c3 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Fri Sep 23 10:10:34 2016 +0200 summary: [pi-accessibility-improvements] The preference renamed and all its references The preference has been renamed from EnableFullScreenReader to EnableScreenReader. All its references have been changed and some methods which were checking if the preference is enabled have been renamed. details: https://code.openbravo.com/erp/devel/pi/rev/5afcf5d06443 changeset: 30474:5afcf5d06443 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Fri Sep 23 10:52:00 2016 +0200 summary: [pi-accessibility-improvements] The way of accessing the preference has been changed. Before, the preference was accessed using OB.Properties instead OB.PropertyStore.get. details: https://code.openbravo.com/erp/devel/pi/rev/01c39f029b01 changeset: 30475:01c39f029b01 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Fri Sep 23 12:34:50 2016 +0200 summary: [pi-accessibility-improvements] A placeholder added to the filter message A placeholder has been added to the message of the filter boxes to allow better transactions. details: https://code.openbravo.com/erp/devel/pi/rev/e6926d2cecb9 changeset: 30476:e6926d2cecb9 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Sep 26 13:13:31 2016 +0200 summary: [pi-accessibility-improvements] The left menu is now focusable The left menu is focusable and the focus is visible. Before, even it was focusable, there was not a visual focus on the focused element. Now it appears orange. details: https://code.openbravo.com/erp/devel/pi/rev/361f4e59dbe4 changeset: 30477:361f4e59dbe4 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Sep 26 15:40:01 2016 +0200 summary: [pi-accessibility-improvements] Copyright year updated details: https://code.openbravo.com/erp/devel/pi/rev/c0e82b662dca changeset: 30478:c0e82b662dca user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Tue Sep 27 09:09:00 2016 +0200 summary: [pi-accessibility-improvements] The beautifier has been passed details: https://code.openbravo.com/erp/devel/pi/rev/8e19825c101f changeset: 30479:8e19825c101f user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Tue Sep 27 14:20:44 2016 +0200 summary: [pi-accessibility-improvements] Code review The indentation of the css files has been corrected and uneeded js code has been deleted. details: https://code.openbravo.com/erp/devel/pi/rev/4c3896d57ac7 changeset: 30480:4c3896d57ac7 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Tue Sep 27 15:23:26 2016 +0200 summary: [pi-accessibility-improvements] The space key is used to access the workspace The left column members where only accessed by the enter key and that was not correct, they must also be accessible by pressing the space key. details: https://code.openbravo.com/erp/devel/pi/rev/812bfd065c39 changeset: 30481:812bfd065c39 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Wed Sep 28 09:14:20 2016 +0200 summary: [pi-accessibility-improvements] Merge with latest pi details: https://code.openbravo.com/erp/devel/pi/rev/aea5fc61bdd5 changeset: 30482:aea5fc61bdd5 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Oct 03 08:53:05 2016 +0200 summary: [pi-accessibility-improvements] A comment of the layout.js.ftl removed It was a comment which only was explaining the following two lines of code and it was not neccessary to understand the code. details: https://code.openbravo.com/erp/devel/pi/rev/df1b95da863f changeset: 30483:df1b95da863f user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Oct 17 12:08:47 2016 +0200 summary: Fixed issue 33952: The accessibility to the erp has been fixed The accessibility to the ERP needed to be improved. This project has been introduced to improve it adding the following capabilities: A new property called "EnableScreenReader" has been created. Using a Screen Reader and enabling the property makes it easier to use the application for the visual impaired peolple because the screen reader dictates every element to the users. diffstat: .hgsigs | 2 + .hgtags | 2 + WebContent/META-INF/MANIFEST.MF | 3 +- legal/Licensing.txt | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 28 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_PaymentEventListener.java | 68 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_ReconciliationEventListener.java | 77 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentReadOnlyLogicsHandler.java | 7 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java | 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.base.weld/lib/runtime/cal10n-api-0.7.4.jar | 0 modules/org.openbravo.base.weld/lib/runtime/cal10n-api-0.7.7.jar | 0 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/org/openbravo/base/weld/WeldUtils.java | 4 +- modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml | 5 + modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_TAB.xml | 4 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 79 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml | 14 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 56 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 12 + 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-db/database/sourcedata/AD_REF_LIST.xml | 12 + modules/org.openbravo.client.application/src/org/openbravo/client/application/HeartBeatPopupActionHandler.java | 6 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java | 10 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/CoreAttachImplementation.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/NoteEventHandler.java | 13 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ReorderCascadingChildDeletionsHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl | 7 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-grid.js.ftl | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java | 50 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js | 12 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 12 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 4 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 28 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 7 +- 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.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.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js | 51 +- modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.myob/ob-myopenbravo-styles.css | 24 +- 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/model/views/OBWCL_STOCK_BY_WAREHOUSE_V.xml | 4 + modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_COLUMN.xml | 719 + modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_ELEMENT.xml | 72 + modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DBPREFIX.xml | 12 + modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_PACKAGE.xml | 13 + modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_TABLE.xml | 25 + modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml | 108 + modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml | 15 + modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml | 17 + modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 93 + 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/BaseDataSourceService.java | 6 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java | 2 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DefaultDataSourceService.java | 4 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.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/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java | 4 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 9 +- 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.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 | 1192 +- 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 | 86 +- referencedata/sampledata/F_B_International_Group/C_CONVERSION_RATE.xml | 36 + referencedata/sampledata/F_B_International_Group/C_INVOICE.xml | 3816 +- referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml | 8376 + referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml | 4104 + referencedata/sampledata/F_B_International_Group/C_INVOICETAX.xml | 1020 + referencedata/sampledata/F_B_International_Group/C_ORDER.xml | 2977 + referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml | 9516 ++ referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml | 3468 + 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_POC_DOCTYPE_TEMPLATE.xml | 50 + referencedata/sampledata/F_B_International_Group/FACT_ACCT.xml | 44251 +++++++++- 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 | 960 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml | 174 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml | 630 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml | 2350 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml | 1326 +- 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 | 1530 + referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml | 4416 + 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 | 5760 + referencedata/sampledata/F_B_International_Group/M_TRANSACTION_COST.xml | 3264 + referencedata/sampledata/F_B_International_Group/OBUIAPP_PROCESS_ACCESS.xml | 420 + src-core/src/org/openbravo/base/ConfigParameters.java | 5 +- src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/model/functions/C_ORDER_POST1.xml | 1 + src-db/database/model/functions/M_INOUT_POST.xml | 7 +- src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml | 57 +- src-db/database/model/functions/M_UPDATE_STOCK_VALUATION.xml | 12 +- src-db/database/model/postscript-Oracle.sql | 11 + src-db/database/model/prescript-PostgreSql.sql | 6 + src-db/database/model/tables/C_BPARTNER_LOCATION.xml | 3 + src-db/database/model/tables/C_ORDER.xml | 3 + src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml | 3 + src-db/database/model/tables/M_INOUT.xml | 5 + src-db/database/model/triggers/C_ACCTSCHEMA_TRG.xml | 5 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 11 + src-db/database/sourcedata/AD_COLUMN.xml | 50 +- src-db/database/sourcedata/AD_ELEMENT.xml | 14 + src-db/database/sourcedata/AD_FIELD.xml | 33 +- src-db/database/sourcedata/AD_MESSAGE.xml | 35 +- src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 64 +- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_REF_LIST.xml | 67 + src-db/database/sourcedata/AD_TAB.xml | 4 +- src-db/database/sourcedata/AD_TABLE.xml | 15 +- src-test/src/org/openbravo/test/datasource/TestAllowUnpagedDatasourcePreference.java | 3 +- src-test/src/org/openbravo/test/model/ClassLoaderTest.java | 114 +- src-wad/src/org/openbravo/wad/Wad.java | 17 +- src-wad/src/org/openbravo/wad/Wad_data.xsql | 17 +- src/build.xml | 14 +- src/org/openbravo/base/secureApp/LoginHandler.java | 3 +- src/org/openbravo/base/secureApp/LoginUtils.java | 31 +- src/org/openbravo/common/actionhandler/ManagePrereservationActionHandler.java | 3 +- src/org/openbravo/common/actionhandler/ManageReservationActionHandler.java | 1 + src/org/openbravo/common/actionhandler/SetNewBPCurrency.java | 11 +- src/org/openbravo/common/datasource/ReturnFromCustomerHQLInserter.java | 4 +- src/org/openbravo/common/datasource/ReturnToFromCustomerVendorHQLTransformer.java | 34 +- src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java | 4 +- src/org/openbravo/costing/CostingBackground.java | 2 +- src/org/openbravo/costing/CostingMigrationProcess.java | 376 +- src/org/openbravo/costing/CostingServer.java | 4 +- src/org/openbravo/dal/core/OBContext.java | 21 + src/org/openbravo/dal/security/AcctSchemaStructureProvider.java | 80 + src/org/openbravo/dal/security/OrganizationStructureProvider.java | 24 +- src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java | 6 +- src/org/openbravo/erpCommon/ad_callouts/SimpleCallout.java | 147 +- src/org/openbravo/erpCommon/ad_callouts/SimpleCalloutInformationProvider.java | 12 +- src/org/openbravo/erpCommon/ad_forms/AcctSchema.java | 15 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 46 +- src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql | 30 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 23 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java | 2 +- src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java | 2 + src/org/openbravo/erpCommon/businessUtility/EndYearCloseUtility.java | 6 +- src/org/openbravo/erpCommon/businessUtility/EndYearCloseUtility_data.xsql | 9 +- src/org/openbravo/erpCommon/businessUtility/Preferences.java | 2 + src/org/openbravo/erpCommon/businessUtility/PriceAdjustment.java | 24 +- src/org/openbravo/erpCommon/businessUtility/PrinterReports.java | 6 +- src/org/openbravo/erpCommon/utility/OBLedgerUtils.java | 92 +- src/org/openbravo/erpCommon/utility/UsedByLink.java | 41 +- src/org/openbravo/erpCommon/utility/Utility.java | 6 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java | 2 +- src/org/openbravo/event/FINPaymentEventHandler.java | 91 - src/org/openbravo/event/InvoiceTaxEventHandler.java | 51 + src/org/openbravo/event/OrderEventHandler.java | 42 +- src/org/openbravo/service/db/QueryTimeOutUtil.java | 6 +- 206 files changed, 115040 insertions(+), 2122 deletions(-) diffs (truncated from 158189 to 300 lines): diff -r df28f074cc4a -r df1b95da863f .hgsigs --- a/.hgsigs Thu Sep 15 16:56:55 2016 +0200 +++ b/.hgsigs Mon Oct 17 12:08:47 2016 +0200 @@ -197,5 +197,7 @@ 91b0a6cc5947ea0958b3d677a3e76174fa0a045e 0 iEYEABECAAYFAldajXIACgkQCX/oGf+2qkMRiQCgread+PDPwOVh7Qu/IlmeCLDSPVQAn3cepToICm61fiNkrV+PmFen4bwd ac4b84085793438223d82a0024dd84d2268d0768 0 iEYEABECAAYFAld974YACgkQCX/oGf+2qkPrUgCg05BzCWexFGf76njdN2lBgPJn5uMAoIzGxA0dHD54Km07x2m9J1pgFcoW a98ba1097ffda83047f2824177bfd940fd9268b2 0 iEYEABECAAYFAlfAIacACgkQCX/oGf+2qkMeAwCgsAyLUenvqX0uAZTRjaUrUXZfcL0AoJg0tc+GlPLwfSGk9nCtgF8M3v5f +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 diff -r df28f074cc4a -r df1b95da863f .hgtags --- a/.hgtags Thu Sep 15 16:56:55 2016 +0200 +++ b/.hgtags Mon Oct 17 12:08:47 2016 +0200 @@ -208,5 +208,7 @@ cfff3c184b53528cd71acfe21b15800db17b3436 3.0PR16Q2 7667e8781815f8fa0bf2d3104aeb585cb2ce8681 3.0PR16Q2.1 d40ef4d2ac507a87b46d3118841d03a6a54fec1e 3.0PR16Q2.2 +6db3d7641170254dbd658eb774e36b092c68dd04 3.0PR16Q2.3 ec10d529b9bbe8caa83f2ea72b29b94bd3473cae 3.0PR16Q3 d0dee6596f281e29afcd159544992498896e93ff 3.0PR16Q3.1 +f252db9dde915c15574e3d5fa505bd1154e39c74 3.0PR16Q3.2 diff -r df28f074cc4a -r df1b95da863f WebContent/META-INF/MANIFEST.MF --- a/WebContent/META-INF/MANIFEST.MF Thu Sep 15 16:56:55 2016 +0200 +++ b/WebContent/META-INF/MANIFEST.MF Mon Oct 17 12:08:47 2016 +0200 @@ -1,2 +1,1 @@ -Manifest-Version: 1.0 -Class-Path: \ No newline at end of file +Manifest-Version: 1.0 \ No newline at end of file diff -r df28f074cc4a -r df1b95da863f legal/Licensing.txt --- a/legal/Licensing.txt Thu Sep 15 16:56:55 2016 +0200 +++ b/legal/Licensing.txt Mon Oct 17 12:08:47 2016 +0200 @@ -216,7 +216,7 @@ # jboss-el-api_2.2_spec-1.0.0.Final.jar Under the LGPL license (included as LGPL-2.1.txt in this folder) -# cal10n-api-0.7.4.jar +# cal10n-api-0.7.7.jar # slf4j-ext-1.6.1.jar Under the MIT license (available at http://www.slf4j.org/license.html) diff -r df28f074cc4a -r df1b95da863f modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.xml Thu Sep 15 16:56:55 2016 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.xml Mon Oct 17 12:08:47 2016 +0200 @@ -15,7 +15,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): ______________________________________. *************************************************************************/ @@ -46,6 +46,7 @@ OR((COALESCE(:OLD.AMOUNT, 0) <> COALESCE(:NEW.AMOUNT, 0) AND COALESCE(:OLD.STATUS, '0') <> TO_CHAR('RPAE')) OR (COALESCE(:OLD.STATUS, '0') = TO_CHAR('RPAE') + AND COALESCE(:NEW.STATUS, '0') <> TO_CHAR('RPVOID') AND (COALESCE(:NEW.AMOUNT, 0) - COALESCE(:OLD.AMOUNT, 0)) <> (COALESCE(:NEW.GENERATED_CREDIT, 0) - COALESCE(:OLD.GENERATED_CREDIT, 0)))) )) THEN RAISE_APPLICATION_ERROR(-20000, '@20501@'); diff -r df28f074cc4a -r df1b95da863f modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Thu Sep 15 16:56:55 2016 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Mon Oct 17 12:08:47 2016 +0200 @@ -57,7 +57,7 @@ <!--560040FB16CB46A0ABDED8047D25D4CD--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_BankStatementProcess]]></CLASSNAME> <!--560040FB16CB46A0ABDED8047D25D4CD--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--560040FB16CB46A0ABDED8047D25D4CD--> <AD_PROCESS_ID><![CDATA[2DDE7D3618034C38A4462B7F3456C28D]]></AD_PROCESS_ID> -<!--560040FB16CB46A0ABDED8047D25D4CD--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--560040FB16CB46A0ABDED8047D25D4CD--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--560040FB16CB46A0ABDED8047D25D4CD--></AD_MODEL_OBJECT> <!--62CA7E15A1D94659808D715D1A6D65F9--><AD_MODEL_OBJECT> @@ -81,7 +81,7 @@ <!--640FC5F514AA4798B36A15D1E70335EC--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_ReconciliationProcess]]></CLASSNAME> <!--640FC5F514AA4798B36A15D1E70335EC--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--640FC5F514AA4798B36A15D1E70335EC--> <AD_PROCESS_ID><![CDATA[6BF16EFC772843AC9A17552AE0B26AB7]]></AD_PROCESS_ID> -<!--640FC5F514AA4798B36A15D1E70335EC--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--640FC5F514AA4798B36A15D1E70335EC--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--640FC5F514AA4798B36A15D1E70335EC--></AD_MODEL_OBJECT> <!--668D8470721B430687DFE2F97A75751F--><AD_MODEL_OBJECT> @@ -93,7 +93,7 @@ <!--668D8470721B430687DFE2F97A75751F--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_DoubtfulDebtProcess]]></CLASSNAME> <!--668D8470721B430687DFE2F97A75751F--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--668D8470721B430687DFE2F97A75751F--> <AD_PROCESS_ID><![CDATA[0BDC2164ED3E48539FCEF4D306F29EFD]]></AD_PROCESS_ID> -<!--668D8470721B430687DFE2F97A75751F--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--668D8470721B430687DFE2F97A75751F--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--668D8470721B430687DFE2F97A75751F--></AD_MODEL_OBJECT> <!--733555DE925D4789BF94835D50EEEE14--><AD_MODEL_OBJECT> @@ -105,7 +105,7 @@ <!--733555DE925D4789BF94835D50EEEE14--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_AddPaymentFromJournal]]></CLASSNAME> <!--733555DE925D4789BF94835D50EEEE14--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--733555DE925D4789BF94835D50EEEE14--> <AD_PROCESS_ID><![CDATA[5BE14AA10165490A9ADEFB7532F7FA94]]></AD_PROCESS_ID> -<!--733555DE925D4789BF94835D50EEEE14--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--733555DE925D4789BF94835D50EEEE14--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--733555DE925D4789BF94835D50EEEE14--></AD_MODEL_OBJECT> <!--89313103AC3C4CC0BF080175CE85AEE9--><AD_MODEL_OBJECT> @@ -153,7 +153,7 @@ <!--95620B3F5CA04222A12CD446B0581DF3--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_BankStatementProcess]]></CLASSNAME> <!--95620B3F5CA04222A12CD446B0581DF3--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--95620B3F5CA04222A12CD446B0581DF3--> <AD_PROCESS_ID><![CDATA[58A9261BACEF45DDA526F29D8557272D]]></AD_PROCESS_ID> -<!--95620B3F5CA04222A12CD446B0581DF3--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--95620B3F5CA04222A12CD446B0581DF3--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--95620B3F5CA04222A12CD446B0581DF3--></AD_MODEL_OBJECT> <!--A7A562CD91CB42D9977E12B098CBC9EC--><AD_MODEL_OBJECT> @@ -177,7 +177,7 @@ <!--AA1C0D6D318943808A75A24F5781AEBF--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_TransactionModify]]></CLASSNAME> <!--AA1C0D6D318943808A75A24F5781AEBF--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--AA1C0D6D318943808A75A24F5781AEBF--> <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID> -<!--AA1C0D6D318943808A75A24F5781AEBF--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--AA1C0D6D318943808A75A24F5781AEBF--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--AA1C0D6D318943808A75A24F5781AEBF--></AD_MODEL_OBJECT> <!--ACF0CCE03B9648CDB143478B8DD9A8F3--><AD_MODEL_OBJECT> @@ -189,7 +189,7 @@ <!--ACF0CCE03B9648CDB143478B8DD9A8F3--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_DoubtfulDebtRunProcess]]></CLASSNAME> <!--ACF0CCE03B9648CDB143478B8DD9A8F3--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--ACF0CCE03B9648CDB143478B8DD9A8F3--> <AD_PROCESS_ID><![CDATA[017312F51139438A9665775E3B5392A1]]></AD_PROCESS_ID> -<!--ACF0CCE03B9648CDB143478B8DD9A8F3--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--ACF0CCE03B9648CDB143478B8DD9A8F3--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--ACF0CCE03B9648CDB143478B8DD9A8F3--></AD_MODEL_OBJECT> <!--B18447439CAB419395BDA44287722832--><AD_MODEL_OBJECT> @@ -201,7 +201,7 @@ <!--B18447439CAB419395BDA44287722832--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_PaymentProcess]]></CLASSNAME> <!--B18447439CAB419395BDA44287722832--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--B18447439CAB419395BDA44287722832--> <AD_PROCESS_ID><![CDATA[6255BE488882480599C81284B70CD9B3]]></AD_PROCESS_ID> -<!--B18447439CAB419395BDA44287722832--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--B18447439CAB419395BDA44287722832--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--B18447439CAB419395BDA44287722832--></AD_MODEL_OBJECT> <!--C200D584303B4C9BA59CD232F16610D7--><AD_MODEL_OBJECT> @@ -225,7 +225,7 @@ <!--D4B8EDB86914439A9E10B5D4D8372C6C--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_TransactionProcess]]></CLASSNAME> <!--D4B8EDB86914439A9E10B5D4D8372C6C--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--D4B8EDB86914439A9E10B5D4D8372C6C--> <AD_PROCESS_ID><![CDATA[F68F2890E96D4D85A1DEF0274D105BCE]]></AD_PROCESS_ID> -<!--D4B8EDB86914439A9E10B5D4D8372C6C--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--D4B8EDB86914439A9E10B5D4D8372C6C--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--D4B8EDB86914439A9E10B5D4D8372C6C--></AD_MODEL_OBJECT> <!--DC6F77826AD54AEF865E47C8FC356143--><AD_MODEL_OBJECT> @@ -249,7 +249,7 @@ <!--DF09705B3D7F4756A1E741FB3E73B825--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_PaymentProcess]]></CLASSNAME> <!--DF09705B3D7F4756A1E741FB3E73B825--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--DF09705B3D7F4756A1E741FB3E73B825--> <AD_PROCESS_ID><![CDATA[29D17F515727436DBCE32BC6CA28382B]]></AD_PROCESS_ID> -<!--DF09705B3D7F4756A1E741FB3E73B825--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--DF09705B3D7F4756A1E741FB3E73B825--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--DF09705B3D7F4756A1E741FB3E73B825--></AD_MODEL_OBJECT> <!--E711C538D5414BC6AABC2281BEA2F738--><AD_MODEL_OBJECT> @@ -261,7 +261,7 @@ <!--E711C538D5414BC6AABC2281BEA2F738--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_AddPaymentFromJournalLine]]></CLASSNAME> <!--E711C538D5414BC6AABC2281BEA2F738--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--E711C538D5414BC6AABC2281BEA2F738--> <AD_PROCESS_ID><![CDATA[DE1B382FDD2540199D223586F6E216D0]]></AD_PROCESS_ID> -<!--E711C538D5414BC6AABC2281BEA2F738--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--E711C538D5414BC6AABC2281BEA2F738--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--E711C538D5414BC6AABC2281BEA2F738--></AD_MODEL_OBJECT> <!--E7D054B44F5848B6B6FC5923EBA4E1DE--><AD_MODEL_OBJECT> @@ -297,7 +297,7 @@ <!--F621B518B6264CDF9285A590995013E4--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_PaymentProposalProcess]]></CLASSNAME> <!--F621B518B6264CDF9285A590995013E4--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--F621B518B6264CDF9285A590995013E4--> <AD_PROCESS_ID><![CDATA[D16966FBF9604A3D91A50DC83C6EA8E3]]></AD_PROCESS_ID> -<!--F621B518B6264CDF9285A590995013E4--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--F621B518B6264CDF9285A590995013E4--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--F621B518B6264CDF9285A590995013E4--></AD_MODEL_OBJECT> <!--F9CAF92FC3A84BAD8644B0006EF483FB--><AD_MODEL_OBJECT> @@ -345,7 +345,7 @@ <!--FF8080812E437710012E43BE26A3000E--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_ReconciliationProcess]]></CLASSNAME> <!--FF8080812E437710012E43BE26A3000E--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--FF8080812E437710012E43BE26A3000E--> <AD_PROCESS_ID><![CDATA[FF8080812E2F8EAE012E2F94CF470014]]></AD_PROCESS_ID> -<!--FF8080812E437710012E43BE26A3000E--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--FF8080812E437710012E43BE26A3000E--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--FF8080812E437710012E43BE26A3000E--></AD_MODEL_OBJECT> <!--FF8080812F348A97012F349E7610000A--><AD_MODEL_OBJECT> @@ -357,7 +357,7 @@ <!--FF8080812F348A97012F349E7610000A--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.ad_actionbutton.DeleteTransaction]]></CLASSNAME> <!--FF8080812F348A97012F349E7610000A--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--FF8080812F348A97012F349E7610000A--> <AD_PROCESS_ID><![CDATA[FF8080812F348A97012F349DC24F0007]]></AD_PROCESS_ID> -<!--FF8080812F348A97012F349E7610000A--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--FF8080812F348A97012F349E7610000A--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--FF8080812F348A97012F349E7610000A--></AD_MODEL_OBJECT> </data> diff -r df28f074cc4a -r df1b95da863f modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 15 16:56:55 2016 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Oct 17 12:08:47 2016 +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.30071]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.30402]]></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 df28f074cc4a -r df1b95da863f modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Sep 15 16:56:55 2016 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Oct 17 12:08:47 2016 +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.30071]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.30402]]></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.30071]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.30402]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r df28f074cc4a -r df1b95da863f modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_PaymentEventListener.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_PaymentEventListener.java Thu Sep 15 16:56:55 2016 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_PaymentEventListener.java Mon Oct 17 12:08:47 2016 +0200 @@ -11,13 +11,14 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2012-2015 Openbravo SLU + * All portions are Copyright (C) 2012-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* */ package org.openbravo.advpaymentmngt.event; +import java.math.BigDecimal; import java.util.List; import javax.enterprise.event.Observes; @@ -30,11 +31,14 @@ import org.openbravo.base.model.ModelProvider; import org.openbravo.base.model.Property; import org.openbravo.client.kernel.event.EntityDeleteEvent; +import org.openbravo.client.kernel.event.EntityNewEvent; +import org.openbravo.client.kernel.event.EntityPersistenceEvent; import org.openbravo.client.kernel.event.EntityPersistenceEventObserver; import org.openbravo.client.kernel.event.EntityUpdateEvent; import org.openbravo.dal.core.OBContext; import org.openbravo.dal.service.OBDal; import org.openbravo.database.ConnectionProvider; +import org.openbravo.erpCommon.businessUtility.CancelAndReplaceUtils; import org.openbravo.erpCommon.utility.Utility; import org.openbravo.model.financialmgmt.payment.FIN_Payment; import org.openbravo.model.financialmgmt.payment.FIN_PaymentDetail; @@ -50,12 +54,53 @@ return entities; } + public void onSave(@Observes EntityNewEvent event) { + if (!isValidEvent(event)) { + return; + } + FIN_Payment payment = (FIN_Payment) event.getTargetInstance(); + if (payment.getAmount().compareTo(BigDecimal.ZERO) == 0) { + String newDocumentNo = payment.getDocumentNo(); + if (newDocumentNo.startsWith("<") && newDocumentNo.endsWith(">") && !payment.isProcessed()) { + // Remove "<" and ">" characters from documentNo if payment is not processed + newDocumentNo = newDocumentNo.substring(1, newDocumentNo.length() - 1); + } + newDocumentNo = newDocumentNo + CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX; + setDocumentNoToPayment(event, newDocumentNo); + } + } + public void onUpdate(@Observes EntityUpdateEvent event) { if (!isValidEvent(event)) { return; } - manageAPRMPendingPaymentFromInvoiceRecord(event); + final FIN_Payment payment = (FIN_Payment) event.getTargetInstance(); + final Entity paymentEntity = ModelProvider.getInstance().getEntity(FIN_Payment.ENTITY_NAME); + final Property paymentAmountProperty = paymentEntity.getProperty(FIN_Payment.PROPERTY_AMOUNT); + BigDecimal oldPaymentAmount = (BigDecimal) event.getPreviousState(paymentAmountProperty); + final Property paymentStatusProperty = paymentEntity.getProperty(FIN_Payment.PROPERTY_STATUS); + final String currentPaymentStatus = (String) event.getCurrentState(paymentStatusProperty); + final String oldPaymentStatus = (String) event.getPreviousState(paymentStatusProperty); + + String documentNo = payment.getDocumentNo(); + int documentNoLength = payment.getDocumentNo().length(); + if (payment.getAmount().compareTo(BigDecimal.ZERO) == 0) { + // Payment has no already an *Z* at the end of the document number + if (!CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX.equals(documentNo + .substring(documentNoLength - 3))) { + String newDocumentNo = documentNo + CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX; ------------------------------------------------------------------------------ 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
