details: https://code.openbravo.com/erp/devel/main/rev/6688edca1b60 changeset: 31788:6688edca1b60 user: Mark <markmm82 <at> gmail.com> date: Mon Mar 20 13:14:16 2017 -0400 summary: Fixes issue 35575: "Adjustment Period" not used when posting a GL Journal
In case Adjustment Period was defined for a calendar and user tries to post gl journal document in that period it was not properly done. It was fixed re-structuring the affected queries using the C_PERIOD_ID column of GL_JOURNAL and C_PERIOD tables, always retrieving this value as C_PERIOD_ID instead of "period" alias details: https://code.openbravo.com/erp/devel/main/rev/cb0c63b0096e changeset: 31789:cb0c63b0096e user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Mar 21 09:38:12 2017 +0100 summary: fixed bug 35579: Traceability Report does not work It failed when trying to execute manual callouts. As callouts in standard windows are executed by FIC together in a single request, they don't require to be servlets. Therefore they are no longer included in web.xml. In this case, it is still required to be manually executed as a servlet. Callouts should only be used in generated windows, for manual old 2.50 ones, as this case, the mapping is not generated by defining it as a manual map. details: https://code.openbravo.com/erp/devel/main/rev/583afb72b124 changeset: 31790:583afb72b124 user: Mark <markmm82 <at> gmail.com> date: Tue Mar 28 09:26:09 2017 -0400 summary: Fixes issue 35626: Avoid Financial Account transactions with both amounts != 0 Following changes have been done in Financial Account Transaction tab and in Add Transaction process definition: When changing to Bank Fee transaction type, amounts will not be updated to zero. When changing Deposit Amount in case Bank Fee transaction type, Withdrawal Amount will be updated to zero. When changing Withdrawal Amount in case Bank Fee transaction type, Deposit Amount will be updated to zero. details: https://code.openbravo.com/erp/devel/main/rev/83fdc86f6bff changeset: 31791:83fdc86f6bff user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Thu Mar 30 10:25:21 2017 +0200 summary: Related to issue 35575: Code review improvements Backout fixes of issues 35575 & 28973 and fix issue 28973 properly: DocGLJournal.isperiodOpen method was not correctly checking if DocGLJournalData.periodOpen retrieves no period. details: https://code.openbravo.com/erp/devel/main/rev/e414a438a5bf changeset: 31792:e414a438a5bf user: Armaignac <collazoandy4 <at> gmail.com> date: Fri Mar 31 13:58:32 2017 -0400 summary: Fixes issue 35693: Operative quantity should be updated when document is closed When a Purchase Order/Return From Customer/Return to Vendor document is closed, the Operative Quantity field is updated to the corresponding value, according to the Product, Quantity and Aum of the line. details: https://code.openbravo.com/erp/devel/main/rev/f5b269a1418a changeset: 31793:f5b269a1418a user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Fri Apr 07 12:01:36 2017 +0200 summary: Fixed issue 35688: It is not possible to delete a record in tree view The problem was related with Pre Delete Client Side Event Handler. The problem was that a isc.clone method didn't work as expected. isc.clone method create a deep clone of an object that can be edited without affecting the original but does not handle looping references (will infinite loop). For this reason, in case of clone currentGrid.getSelection() object in tree view an error was thrown. In order to fix this problem, isc.shallowClone is used instead of isc.clone. This method handle looping references properly. details: https://code.openbravo.com/erp/devel/main/rev/220237c27512 changeset: 31794:220237c27512 user: Atul Gaware <atul.gaware <at> openbravo.com> date: Fri Apr 07 00:50:19 2017 +0530 summary: Fixes Issue 35716:Wrong total gross amount when reactivating an order or a invoice which includes a basic discount of 100% In PostgreSQL instance to achieve trigger execution in order to update c_invoicetax, c_ordertax properly before deleting discount invoice and order lines, c_invoicelinetax and c_orderlinetax lines are deleted. details: https://code.openbravo.com/erp/devel/main/rev/35fe280e4dfc changeset: 31795:35fe280e4dfc user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Fri Apr 21 13:30:38 2017 +0200 summary: Fixed issue 35806: Fields redraw instantly in grid under some circumstances The problem was that numeric fields redraws instantly in grid view when a numeric field was referenced by a read only logic. This reported problem was caused by the partial fix of #32202 regression. The fix of #32202 was partial because the added condition did not taken into account the grid view properly. This problem has been resolved by take into account form and grid view. Besides another problem was found and resolved with this fix. Since this regression was introduced, the #23136 issue was broken too. This problem has been resolved too with this solution. details: https://code.openbravo.com/erp/devel/main/rev/3ccd9e684343 changeset: 31796:3ccd9e684343 user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Mon Apr 24 12:01:09 2017 +0200 summary: Related with issue 35806: Codereview take into account all the cases Now it is take into account when a parameter window with grid is opened from the menu. Rest of the cases sucha as grid, form and parameter window from a button is working as expected too. details: https://code.openbravo.com/erp/devel/main/rev/46c32862b234 changeset: 31797:46c32862b234 user: Mark <markmm82 <at> gmail.com> date: Wed Apr 12 12:53:42 2017 -0400 summary: Fixes issue 35784: Orders with Invoice Terms different from Customer Schedule After Delivery cannot be invoiced if the bp has an invoice schedule Sales Orders with Invoice Terms different from Customer Schedule After Delivery (Immediate, After Delivery, After Order Delivered) cannot be invoiced if the business partner has an invoice schedule defined and the order does not fill its requirement The problem is that the order is not returned by the C_INVOICE_CANDIDATE_V view. To avoid it was fixed the condition that takes into account the invoice rule of the order and the sales invoice frequency. details: https://code.openbravo.com/erp/devel/main/rev/96d5a6df7326 changeset: 31798:96d5a6df7326 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Tue Apr 25 18:26:55 2017 +0200 summary: Related to issue 35784: Fix dbcons failure details: https://code.openbravo.com/erp/devel/main/rev/ec4055262760 changeset: 31799:ec4055262760 user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Fri Apr 28 13:06:56 2017 +0200 summary: Fixed issue 35876: On change functions not executed for numeric parameters The problem was that on change functions was not executed for numeric parameters. This problem was caused by the partial fix of #35658 regression. The fix of #35658 was partial because the added condition did not taken into account numeric fields in P&E windows which are out of a parameter grid. This problem has been resolved by take into account this case. details: https://code.openbravo.com/erp/devel/main/rev/1f2d83b1b381 changeset: 31800:1f2d83b1b381 user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Tue May 09 10:06:09 2017 +0200 summary: Fixed issue 35954: Fetching data when it is sorting by a null FK is not working Fetching data when it was sorting by a null foreign key was not retrieving any record when should had been retrieved data. When AdvancedQueryBuilder class is created order by clause and it is working in resolve joins a canUseInnerJoin method is invoked. This method is used to check if the left join can be safely replaced with inner join when it is building order by clause. This method is not take into account all the posibilities. The problem has been resolved by take into account when any property of the list is not mandatory and is not primitive. In this case left join can not be replaced with inner join. The rest of the cases can be safely replaced it. details: https://code.openbravo.com/erp/devel/main/rev/10c0ffee4e6c changeset: 31801:10c0ffee4e6c user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri May 12 07:07:52 2017 +0000 summary: Update AD_MODULE version to 3.0PR17Q1.1 details: https://code.openbravo.com/erp/devel/main/rev/835355e0fdbd changeset: 31802:835355e0fdbd user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri May 12 07:07:53 2017 +0000 summary: Added tag 3.0PR17Q1.1 for changeset 10c0ffee4e6c details: https://code.openbravo.com/erp/devel/main/rev/91b115ca0c95 changeset: 31803:91b115ca0c95 user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri May 12 07:07:53 2017 +0000 summary: Added signature for changeset 835355e0fdbd details: https://code.openbravo.com/erp/devel/main/rev/36766fd9b2cc changeset: 31804:36766fd9b2cc user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri May 12 12:51:47 2017 +0000 summary: Merge temporary head for 3.0PR17Q1.1 diffstat: .hgsigs | 8 + .hgtags | 8 + 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 | 4 +- 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/executionprocess/LeaveAsCredit.java | 35 + 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/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/ConnectionInitializerInterceptor.java | 19 +- modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/JdbcExternalConnectionPool.java | 356 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/WeldBaseTest.java | 6 +- modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/DalPersistanceEventTest.java | 40 +- modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PARAMETER.xml | 3 + modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PARAMETER_VALUE.xml | 1 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_DATASET_TABLE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml | 10 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 8 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/ADCSInitialization.java | 200 + modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/StandardWindowTest.java | 81 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/DatasourceEventObserver.java | 90 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/ObserverBaseTest.java | 77 + modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderLineTestObserver.java | 83 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderTestObserver.java | 86 + modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/PersistanceObserver.java | 152 + modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler_data.xsql | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationUtils.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/StorePropertyActionHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java | 7 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowsInClassicModeTask.java | 6 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachImplementationManager.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/process/ResponseActionsBuilder.java | 335 + modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java | 44 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java | 180 +- 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/ApplicationDictionaryCachedStructures.java | 185 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 43 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java | 43 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java | 19 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 24 +- 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/process/ob-parameter-window-view.js | 30 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 11 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js | 27 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-onchange-functions.js | 16 + modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/BinaryUIDefinition.java | 7 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java | 12 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java | 4 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ImageUIDefinition.java | 7 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/LinkUIDefinition.java | 6 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/PasswordUIDefinition.java | 6 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/StringUIDefinition.java | 6 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java | 45 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl | 3 +- modules/org.openbravo.client.myob/src-db/database/model/modifiedTables/OBUIAPP_PARAMETER.xml | 1 + modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.myob/src/org/openbravo/client/myob/widgetinform/WidgetInFormUIDefinition.java | 7 +- modules/org.openbravo.client.querylist/src-db/database/model/tables/OBCQL_WIDGET_QUERY.xml | 1 + modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml | 1 + modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 26 + modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ComboTableDatasourceService.java | 40 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java | 14 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java | 72 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 29 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonConstants.java | 3 +- modules/org.openbravo.userinterface.selector/src-db/database/model/tables/OBUISEL_SELECTOR_TRL.xml | 1 + modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java | 6 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/SelectorUIReference.java | 21 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-multi-selector-item.js | 16 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-filter-select-item.js | 12 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 10 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js | 12 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 22 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_MERGE.xml | 20 + 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/VariablesBase.java | 9 +- src-core/src/org/openbravo/data/Sql.java | 3 +- src-core/src/org/openbravo/data/Sqlc.java | 25 +- src-core/src/org/openbravo/database/ConnectionProviderImpl.java | 10 +- src-core/src/org/openbravo/database/ExternalConnectionPool.java | 26 +- src-core/src/org/openbravo/database/JNDIConnectionProvider.java | 4 +- src-core/src/org/openbravo/database/RDBMSIndependent.java | 9 +- src-core/src/org/openbravo/database/SessionInfo.java | 77 +- src-core/src/org/openbravo/uiTranslation/TextInterfacesData.java | 21 +- src-db/database/build.xml | 8 +- src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/model/excludeFilter.xml | 20 + src-db/database/model/functions/C_COMMISSION_PROCESS.xml | 6 +- src-db/database/model/functions/C_CONVERT_DOC_CURRENCY.xml | 82 + 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_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 | 65 +- src-db/database/model/functions/FIN_AGING_GETDOCNO.xml | 52 + src-db/database/model/functions/FIN_AGING_INVOICECURRENCY_RATE.xml | 70 + src-db/database/model/functions/FIN_AGING_ISDOUBTFULTDEBT.xml | 53 + src-db/database/model/functions/FIN_AGING_PAYMENTCURRENCY_RATE.xml | 70 + src-db/database/model/functions/MA_STANDARD_COST.xml | 49 +- 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 | 15 +- src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml | 6 +- src-db/database/model/functions/M_REQUISITION_CREATEPO.xml | 6 +- src-db/database/model/functions/M_UPDATE_INVENTORY.xml | 3 +- src-db/database/model/postscript-Oracle.sql | 24 +- src-db/database/model/postscript-PostgreSql.sql | 32 +- src-db/database/model/prescript-Oracle.sql | 39 +- src-db/database/model/prescript-PostgreSql.sql | 42 + src-db/database/model/tables/AD_COLUMN.xml | 1 + src-db/database/model/tables/AD_MODEL_OBJECT.xml | 4 + src-db/database/model/tables/AD_PROCESS_RUN.xml | 1 + src-db/database/model/tables/AD_TAB.xml | 1 + src-db/database/model/tables/AD_USER.xml | 1 + src-db/database/model/tables/A_AMORTIZATIONLINE.xml | 1 + src-db/database/model/tables/A_ASSET.xml | 1 + src-db/database/model/tables/C_ACCTSCHEMA_PROCESS.xml | 1 + src-db/database/model/tables/C_BPARTNER.xml | 1 + src-db/database/model/tables/C_CITY.xml | 1 + src-db/database/model/tables/C_CONVERSION_RATE_DOCUMENT.xml | 5 + src-db/database/model/tables/C_INVOICE.xml | 1 + src-db/database/model/tables/C_INVOICELINE.xml | 2 + src-db/database/model/tables/C_ORDER.xml | 1 + src-db/database/model/tables/C_ORDERLINE.xml | 2 + src-db/database/model/tables/C_ORDERLINETAX.xml | 3 + src-db/database/model/tables/C_ORDERTAX.xml | 3 + src-db/database/model/tables/C_POC_DOCTYPE_TEMPLATE.xml | 1 + src-db/database/model/tables/C_POC_EMAILDEFINITION.xml | 1 + src-db/database/model/tables/C_TAXREGISTER.xml | 1 + src-db/database/model/tables/C_TAXREGISTERLINE.xml | 1 + src-db/database/model/tables/C_TAXREGISTER_TYPE_LINES.xml | 1 + src-db/database/model/tables/FACT_ACCT.xml | 4 + src-db/database/model/tables/FIN_DOUBTFUL_DEBT.xml | 4 + src-db/database/model/tables/FIN_ORIG_PAYMENT_SCHEDULE.xml | 1 + src-db/database/model/tables/FIN_ORIG_PAYM_SCHEDDETAIL.xml | 1 + src-db/database/model/tables/FIN_PAYMENT.xml | 8 + src-db/database/model/tables/FIN_PAYMENT_SCHEDULE.xml | 2 + src-db/database/model/tables/FIN_PAYMENT_SCHEDULEDETAIL.xml | 1 + src-db/database/model/tables/GL_JOURNAL.xml | 1 + src-db/database/model/tables/MA_MAINTENANCE.xml | 2 + src-db/database/model/tables/MA_MEASURE_GROUP.xml | 1 + src-db/database/model/tables/MA_PROCESS.xml | 1 + src-db/database/model/tables/MA_WEINCIDENCE.xml | 1 + src-db/database/model/tables/MRP_RUN_PRODUCTIONLINE.xml | 1 + src-db/database/model/tables/M_COSTADJUSTMENTLINE.xml | 2 + src-db/database/model/tables/M_COSTING.xml | 1 + src-db/database/model/tables/M_INOUT.xml | 1 + src-db/database/model/tables/M_LANDEDCOST.xml | 1 + src-db/database/model/tables/M_LC_COST.xml | 4 + src-db/database/model/tables/M_LC_MATCHED.xml | 2 + src-db/database/model/tables/M_LC_RECEIPT.xml | 1 + src-db/database/model/tables/M_LC_RECEIPTLINE_AMT.xml | 1 + src-db/database/model/tables/M_LOCATOR.xml | 1 + src-db/database/model/tables/M_MATCHPO.xml | 2 + src-db/database/model/tables/M_PRODUCT.xml | 4 + src-db/database/model/tables/M_RAPPEL_BPARTNER.xml | 2 + src-db/database/model/tables/M_RAPPEL_INVOICE.xml | 1 + src-db/database/model/tables/M_RAPPEL_PRODUCT.xml | 1 + src-db/database/model/tables/M_RAPPEL_PRODUCTCATEGORY.xml | 1 + src-db/database/model/tables/M_RAPPEL_SCALE.xml | 1 + src-db/database/model/tables/M_RESERVATION.xml | 2 + src-db/database/model/tables/M_RESERVATION_STOCK.xml | 2 + src-db/database/model/tables/M_STOCK_AUX.xml | 1 + src-db/database/model/tables/M_STOCK_VALUATION.xml | 1 + src-db/database/model/tables/M_TRANSACTION.xml | 4 + src-db/database/model/tables/M_TRANSACTION_COST.xml | 4 + src-db/database/model/tables/M_VALUED_STOCK_AGG.xml | 7 +- src-db/database/model/tables/M_WAREHOUSE_SHIPPER.xml | 2 + src-db/database/model/tables/S_TIMEEXPENSELINE.xml | 1 + 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 | 106 +- 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_INVOICETAX_CASHVAT_V.xml | 2 +- src-db/database/sourcedata/AD_CALLOUT.xml | 9 + src-db/database/sourcedata/AD_COLUMN.xml | 125 +- src-db/database/sourcedata/AD_ELEMENT.xml | 284 +- src-db/database/sourcedata/AD_FIELD.xml | 29 +- src-db/database/sourcedata/AD_MENU.xml | 42 + src-db/database/sourcedata/AD_MESSAGE.xml | 74 +- src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 17 +- src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 10 + src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_REFERENCE.xml | 12 + src-db/database/sourcedata/AD_REF_LIST.xml | 23 + src-db/database/sourcedata/AD_TAB.xml | 70 - src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 1657 +- src-db/database/sourcedata/AD_TREENODE.xml | 53 +- src-db/database/sourcedata/AD_VAL_RULE.xml | 2 +- src-db/database/sourcedata/AD_WINDOW.xml | 5 +- src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 662 + src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 56 + src-db/database/sourcedata/OBUIAPP_REPORT.xml | 41 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 15 + src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 65 + src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_01.java | 4 +- src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_02.java | 4 +- src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_03.java | 4 +- src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_04.java | 4 +- src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_05.java | 6 +- src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_06.java | 4 +- src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_07.java | 4 +- src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_08.java | 4 +- src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_09.java | 4 +- src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_10.java | 4 +- src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_11.java | 4 +- src-test/src/org/openbravo/test/AllAntTaskTests.java | 12 +- src-test/src/org/openbravo/test/AllWebserviceTests.java | 14 +- src-test/src/org/openbravo/test/base/OBBaseTest.java | 90 +- src-test/src/org/openbravo/test/cancelandreplace/CancelAndReplaceTest.java | 2 +- src-test/src/org/openbravo/test/costing/TestCosting.java | 314 +- src-test/src/org/openbravo/test/dal/DalPerformanceCriteriaTest.java | 29 +- src-test/src/org/openbravo/test/dal/DalQueryTest.java | 2 +- src-test/src/org/openbravo/test/dal/DalTest.java | 205 +- src-test/src/org/openbravo/test/dal/ValidationTest.java | 4 +- src-test/src/org/openbravo/test/model/IndexesTest.java | 27 +- src-test/src/org/openbravo/test/security/CrossOrganizationReference.java | 7 +- src-test/src/org/openbravo/test/security/EntityAccessTest.java | 6 +- src-test/src/org/openbravo/test/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/views/SortingFilteringGridConfiguration.java | 31 +- src-test/src/org/openbravo/test/webservice/JSONWebServicesWhereParameter.java | 10 +- src-test/src/org/openbravo/test/webservice/WSReadableClientsTest.java | 119 + src-test/src/org/openbravo/test/xml/UniqueConstraintImportTest.java | 15 +- src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/MergeDependenciesCheck$1.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/MergeDependenciesCheck$MergedModule.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/MergeDependenciesCheck.class | 0 src-util/buildvalidation/src/org/openbravo/buildvalidation/MergeDependenciesCheck.java | 277 + src-wad/src/org/openbravo/wad/ComboReloads.javaxml | 103 - src-wad/src/org/openbravo/wad/ComboReloads.xml | 44 - src-wad/src/org/openbravo/wad/ConfigurationSortTab_Relation.xml | 34 - src-wad/src/org/openbravo/wad/ConfigurationSortTab_Relation.xmlxml | 64 - src-wad/src/org/openbravo/wad/Configuration_Edition.xml | 29 - src-wad/src/org/openbravo/wad/Configuration_Edition.xmlxml | 72 - src-wad/src/org/openbravo/wad/Configuration_Relation.xml | 31 - src-wad/src/org/openbravo/wad/Configuration_Relation.xmlxml | 56 - src-wad/src/org/openbravo/wad/EditionFields_data.xsql | 243 +- src-wad/src/org/openbravo/wad/Fields_data.xsql | 320 +- src-wad/src/org/openbravo/wad/TableLink_data.xsql | 73 - src-wad/src/org/openbravo/wad/TableRelation_data.xsql | 19 +- src-wad/src/org/openbravo/wad/Tabs_data.xsql | 26 +- src-wad/src/org/openbravo/wad/TemplateSortTab_Relation.html | 344 - src-wad/src/org/openbravo/wad/TemplateSortTab_Relation.xml | 39 - src-wad/src/org/openbravo/wad/Template_Edition.html | 261 - src-wad/src/org/openbravo/wad/Template_Edition.xml | 41 - src-wad/src/org/openbravo/wad/Template_Relation.html | 315 - src-wad/src/org/openbravo/wad/Template_Relation.xml | 44 - src-wad/src/org/openbravo/wad/Wad.java | 3147 +- src-wad/src/org/openbravo/wad/WadActionButton.java | 139 +- src-wad/src/org/openbravo/wad/WadUtility.java | 340 +- src-wad/src/org/openbravo/wad/Wad_data.xsql | 10 - src-wad/src/org/openbravo/wad/controls/WADGrid.java | 201 - src-wad/src/org/openbravo/wad/datasource.xml | 76 +- src-wad/src/org/openbravo/wad/datasource.xsqlxml | 244 +- src-wad/src/org/openbravo/wad/datasourceSortTab.xml | 52 - src-wad/src/org/openbravo/wad/datasourceSortTab.xsqlxml | 150 - src-wad/src/org/openbravo/wad/javasource.javaxml | 1019 +- src-wad/src/org/openbravo/wad/javasource.xml | 206 +- src-wad/src/org/openbravo/wad/javasourceSortTab.javaxml | 385 - src-wad/src/org/openbravo/wad/javasourceSortTab.xml | 66 - src/org/openbravo/authentication/AuthenticationManager.java | 28 +- src/org/openbravo/authentication/basic/DefaultAuthenticationManager.java | 53 +- src/org/openbravo/base/SystemStatusListener.java | 7 +- src/org/openbravo/base/secureApp/AllowedCrossDomainsHandler.java | 6 + src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 38 +- src/org/openbravo/base/secureApp/LoginHandler.java | 3 +- src/org/openbravo/base/secureApp/OrgTree.java | 2 +- src/org/openbravo/base/secureApp/UserLock.java | 63 +- src/org/openbravo/base/secureApp/VariablesSecureApp.java | 107 +- src/org/openbravo/base/session/SessionFactoryController.java | 19 +- src/org/openbravo/common/actionhandler/AgingBalanceReportActionHandler.java | 497 + src/org/openbravo/common/actionhandler/CashflowForecastReportActionHandler.java | 197 + src/org/openbravo/common/actionhandler/CashflowForecast_data.xsql | 182 + src/org/openbravo/common/actionhandler/KillProcess.java | 39 +- src/org/openbravo/common/actionhandler/OrderCreatePOLines.java | 9 +- src/org/openbravo/common/actionhandler/RFCServiceReturnableActionHandler.java | 4 +- src/org/openbravo/common/actionhandler/SRMOPickEditLines.java | 14 +- src/org/openbravo/common/actionhandler/SetNewBPCurrency.java | 6 +- src/org/openbravo/costing/CostAdjustmentUtils.java | 7 +- src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java | 9 +- src/org/openbravo/costing/CostingServer.java | 28 +- src/org/openbravo/costing/CostingUtils.java | 6 +- src/org/openbravo/dal/core/DalRequestFilter.java | 26 +- src/org/openbravo/dal/core/DalSessionFactory.java | 41 +- src/org/openbravo/dal/core/DalThreadHandler.java | 55 +- src/org/openbravo/dal/core/OBContext.java | 6 +- src/org/openbravo/dal/core/OBInterceptor.java | 11 +- src/org/openbravo/dal/core/SessionHandler.java | 548 +- src/org/openbravo/dal/service/OBCriteria.java | 41 +- src/org/openbravo/dal/service/OBDal.java | 123 +- src/org/openbravo/dal/service/OBQuery.java | 74 +- src/org/openbravo/dal/xml/EntityXMLConverter.java | 95 + 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_Shipment_data.xsql | 10 +- src/org/openbravo/erpCommon/ad_actionButton/CreditPaymentGrid.html | 4 +- src/org/openbravo/erpCommon/ad_actionButton/RMInsertOrphanLine.java | 20 +- 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_AlertRule_SQL.java | 24 +- 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/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/DocLineCostAdjustment_data.xsql | 4 +- 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 | 18 +- src/org/openbravo/erpCommon/ad_process/ApplyModules.html | 33 +- src/org/openbravo/erpCommon/ad_process/ConvertQuotationIntoOrder.java | 43 +- src/org/openbravo/erpCommon/ad_process/JasperProcess.java | 4 +- src/org/openbravo/erpCommon/ad_reports/AgingDao.java | 405 + src/org/openbravo/erpCommon/ad_reports/AgingDao_data.xsql | 234 + src/org/openbravo/erpCommon/ad_reports/AgingData.java | 232 + src/org/openbravo/erpCommon/ad_reports/AgingScheduleDetailHTML.jrxml | 1089 + src/org/openbravo/erpCommon/ad_reports/AgingScheduleDetailPDF.jrxml | 785 + src/org/openbravo/erpCommon/ad_reports/AgingScheduleDetailPDFDoubtfulDebt.jrxml | 913 + src/org/openbravo/erpCommon/ad_reports/AgingScheduleDetailXLS.jrxml | 568 + src/org/openbravo/erpCommon/ad_reports/AgingScheduleDetailXLSDoubtfulDebt.jrxml | 621 + src/org/openbravo/erpCommon/ad_reports/AgingScheduleHTML.jrxml | 935 + src/org/openbravo/erpCommon/ad_reports/AgingSchedulePDF.jrxml | 770 + src/org/openbravo/erpCommon/ad_reports/AgingSchedulePDFDoubtfulDebt.jrxml | 862 + src/org/openbravo/erpCommon/ad_reports/AgingScheduleXLS.jrxml | 758 + src/org/openbravo/erpCommon/ad_reports/CashflowForecast.jrxml | 228 + src/org/openbravo/erpCommon/ad_reports/CashflowForecastExcel.jrxml | 363 + src/org/openbravo/erpCommon/ad_reports/CashflowForecastLines.jrxml | 464 + src/org/openbravo/erpCommon/ad_reports/CashflowForecastLinesByDate.jrxml | 490 + src/org/openbravo/erpCommon/ad_reports/CashflowForecastSummary.jrxml | 154 + src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 477 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql | 34 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesComparativeJR.jrxml | 640 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java | 105 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html | 2 +- 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/ReportInvoiceVendorDimensionalAnalysesFilterJR.html | 2 +- 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/ReportPurchaseDimensionalAnalysesJR.java | 21 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR.java | 17 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderProvided_data.xsql | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJRFilter.html | 8 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java | 56 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock_data.xsql | 22 +- src/org/openbravo/erpCommon/ad_reports/ReportWarehouseControl.java | 28 +- src/org/openbravo/erpCommon/ad_reports/ReportWarehouseControl_data.xsql | 7 +- src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartnerJR.html | 4 +- src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java | 5 +- 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 | 8 +- src/org/openbravo/erpCommon/security/SessionListener.java | 67 +- src/org/openbravo/erpCommon/security/SessionLogin.java | 4 +- src/org/openbravo/erpCommon/security/SessionLogin_data.xsql | 4 +- src/org/openbravo/erpCommon/utility/CashVATUtil.java | 19 +- src/org/openbravo/erpCommon/utility/ComboTableData.java | 421 +- src/org/openbravo/erpCommon/utility/DownloadReport.java | 18 +- src/org/openbravo/erpCommon/utility/QueryFieldStructure.java | 11 +- src/org/openbravo/erpCommon/utility/Utility.java | 42 +- src/org/openbravo/erpCommon/utility/reporting/Report.java | 10 +- src/org/openbravo/erpCommon/utility/reporting/ReportManager.java | 15 +- src/org/openbravo/erpCommon/utility/reporting/TemplateInfo.java | 13 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java | 18 +- src/org/openbravo/financial/FinancialUtils.java | 35 +- src/org/openbravo/materialmgmt/ProductPriceUtils.java | 81 + src/org/openbravo/materialmgmt/ServicePriceUtils.java | 55 +- src/org/openbravo/portal/GrantPortalAccessProcess.java | 45 +- src/org/openbravo/reference/ui/UITable.java | 17 +- src/org/openbravo/reference/ui/UITableDir.java | 17 +- src/org/openbravo/scheduling/DefaultJob.java | 3 +- src/org/openbravo/scheduling/ProcessRequest_data.xsql | 14 +- src/org/openbravo/scheduling/ProcessRun_data.xsql | 8 +- src/org/openbravo/service/db/DalConnectionProvider.java | 38 +- src/org/openbravo/service/importprocess/ImportEntryProcessor.java | 3 +- src/org/openbravo/service/system/SystemService.java | 6 +- 687 files changed, 164994 insertions(+), 14762 deletions(-) diffs (truncated from 232785 to 300 lines): diff -r 273c24deef8f -r 36766fd9b2cc .hgsigs --- a/.hgsigs Mon Mar 13 11:02:48 2017 +0000 +++ b/.hgsigs Fri May 12 12:51:47 2017 +0000 @@ -203,4 +203,12 @@ b91eab932a2640f7395e9c1b7d237c08303d0788 0 iEYEABECAAYFAlfGHnMACgkQCX/oGf+2qkNXHQCgysf6qFN75kW873qTx3i0S9a2qjAAoI0R/AZCW4a6RPrNiFfjaWsOE3+v b79e30a5b3532f45101cedce0f3bb6b0a86b5780 0 iEYEABECAAYFAlfz21YACgkQCX/oGf+2qkMqZgCgodjBPp4aS6GrpBTpumtr8DsFNAYAmwS3mdHHNYX8g8y4yIwjMDzmQG+o 892fdbc643c7c5c52298aae76502ab2283a32433 0 iEYEABECAAYFAlg0JDIACgkQCX/oGf+2qkM+5gCeMkJ6j6tr/FN8cPHlBLGdnf/6F08AoNBmFRFQ/osVwBtifI+b3ZzXEx+X +e03ab293da7be8c989b20cb7b1ecf4bbf3c7c990 0 iEYEABECAAYFAlh959EACgkQCX/oGf+2qkOFNwCgi/qs8UguivvKA1tlKRKQoIsQqDIAoOGm7DqYBaR6v3aZtvaLmdvffaUh +81d470b918d385d47e958fe4c2d679cde07c9989 0 iEYEABECAAYFAliHS1kACgkQCX/oGf+2qkN/qgCeOAsukTY2FG0bVzdhXHw/K58kqlEAnAjixxvtQPM4PVmDYqzQDkGdqqtT 555379f85b18b37ee1c36b4137c75eca80da7267 0 iEYEABECAAYFAlhSQ0UACgkQCX/oGf+2qkN2yQCg5zq8YEVnWK3wy859qvLYbrEhBY4AoKsfpep+GEj+oGGlmOiOqESGPxxH +fa51600e25b24b2eb3739898d293168ea94748a7 0 iEYEABECAAYFAlh/u8wACgkQCX/oGf+2qkPTnwCfZ29b107GdizLBcC+tzdP3HlnmUUAoN2kMLXvfTYSRLAQG/ziGm5P6kYA +9753e90ea3e81f850f904feb531120b4e185394a 0 iEYEABECAAYFAliG6A8ACgkQCX/oGf+2qkPeeQCg6D9p++eslvzqEVlYK8RS0uzgZNsAoMELVWkte/AM/ilPxZ4vP37myscv +a131c85d1d3d55b852f97622ce068baf80b7fe67 0 iEYEABECAAYFAli+qu8ACgkQCX/oGf+2qkNTOACfTznbhwkwUplXd8QjHIuJ7uBJdK4An3KWtbUrBZleCwS1xH3aa2n9p9bM +ff9ea5ead18501d3c6d2f782e38e172be08f8106 0 iEYEABECAAYFAlkDMfYACgkQCX/oGf+2qkPbaACfXUmwNxLBVRvD7cvYA4LinaJkUzAAoI5N7GpMTNy/NYMXetEOhuwPfSO5 +3a7510a5ee0b43ac0a65e4eae9b089f42158bbe0 0 iEYEABECAAYFAljGfFgACgkQCX/oGf+2qkOgoQCgx3u3UhiV8NyyiBZLsFjlwicCp1EAoPAl4mZZ6/wURPq39Ef6Rtbe1BRb +835355e0fdbd35df49b4b559a4ce984192350fd2 0 iEYEABECAAYFAlkVX0kACgkQCX/oGf+2qkMVEQCfasQyxkrJdtvkEP03xKFyiwAi2f0AnRRguCtQ0qKkra8Kg55F7/9oKS7p diff -r 273c24deef8f -r 36766fd9b2cc .hgtags --- a/.hgtags Mon Mar 13 11:02:48 2017 +0000 +++ b/.hgtags Fri May 12 12:51:47 2017 +0000 @@ -214,4 +214,12 @@ d0dee6596f281e29afcd159544992498896e93ff 3.0PR16Q3.1 f252db9dde915c15574e3d5fa505bd1154e39c74 3.0PR16Q3.2 0c8c781e34c94d084b495d00a541d8d57a3903ea 3.0PR16Q3.3 +ed52b01e833ecc6407392f97ffd7d6531bd9bf2f 3.0PR16Q3.4 +ad0be95cec9715cc07fd82615c0de55f7c4a95b4 3.0PR16Q3.5 cd98953b932b72cc3c694904fc8f8549463ba84a 3.0PR16Q4 +b93f495b2cde680cf6558d93d72051429f4b9031 3.0PR16Q4.1 +31c79a32ce3a6b555dadb35c70d63113be6312e7 3.0PR16Q4.2 +eaeb76d8cd4ec1caf5bf43bc9b4111424d799a03 3.0PR16Q4.3 +3995bf60960bff841f256fa98746aa6aa0f642f2 3.0PR16Q4.4 +273c24deef8f21e870cf563073cc653582a9fe9e 3.0PR17Q1 +10c0ffee4e6ccca6771d151dd27f706e50cf4b96 3.0PR17Q1.1 diff -r 273c24deef8f -r 36766fd9b2cc config/Openbravo.properties.template --- a/config/Openbravo.properties.template Mon Mar 13 11:02:48 2017 +0000 +++ b/config/Openbravo.properties.template Fri May 12 12:51:47 2017 +0000 @@ -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 273c24deef8f -r 36766fd9b2cc lib/README --- a/lib/README Mon Mar 13 11:02:48 2017 +0000 +++ b/lib/README Fri May 12 12:51:47 2017 +0000 @@ -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 273c24deef8f -r 36766fd9b2cc 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 Mar 13 11:02:48 2017 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Fri May 12 12:51:47 2017 +0000 @@ -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 273c24deef8f -r 36766fd9b2cc modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Mon Mar 13 11:02:48 2017 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Fri May 12 12:51:47 2017 +0000 @@ -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 273c24deef8f -r 36766fd9b2cc modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Mon Mar 13 11:02:48 2017 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Fri May 12 12:51:47 2017 +0000 @@ -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 273c24deef8f -r 36766fd9b2cc modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Mon Mar 13 11:02:48 2017 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Fri May 12 12:51:47 2017 +0000 @@ -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 273c24deef8f -r 36766fd9b2cc modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Mar 13 11:02:48 2017 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri May 12 12:51:47 2017 +0000 @@ -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.31087]]></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> @@ -25,7 +25,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <UPDATEINFO><![CDATA[Fixed issue with document sequence numbers reset in case of applying dataset second time. Fixed issue 15305.]]></UPDATEINFO> <!--A918E3331C404B889D69AA9BFAFB23AC--> <REFERENCEDATAINFO><![CDATA[Document types and default algorithm for bank statement auto matching]]></REFERENCEDATAINFO> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED> <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE> diff -r 273c24deef8f -r 36766fd9b2cc 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 Mar 13 11:02:48 2017 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri May 12 12:51:47 2017 +0000 @@ -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.31087]]></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.31087]]></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 273c24deef8f -r 36766fd9b2cc modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml Mon Mar 13 11:02:48 2017 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml Fri May 12 12:51:47 2017 +0000 @@ -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 273c24deef8f -r 36766fd9b2cc modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml Mon Mar 13 11:02:48 2017 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml Fri May 12 12:51:47 2017 +0000 @@ -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 273c24deef8f -r 36766fd9b2cc modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml Mon Mar 13 11:02:48 2017 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml Fri May 12 12:51:47 2017 +0000 @@ -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 273c24deef8f -r 36766fd9b2cc 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 Mar 13 11:02:48 2017 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java Fri May 12 12:51:47 2017 +0000 @@ -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; } ------------------------------------------------------------------------------ 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 [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
