details: https://code.openbravo.com/erp/devel/main/rev/6275822a5e5f changeset: 28219:6275822a5e5f user: Atul Gaware <atul.gaware <at> openbravo.com> date: Thu Feb 18 17:47:53 2016 +0530 summary: Fixes Issue 32220:Payment In & Out Window Lines Tab Order Payment Plan Field navigation fails
Direct Navigation Rule applied to - Window:Payment In, Tab:Lines, Field:Order Payment Plan navigate to Sales Order | Payment Plan Tab - Window:Payment Out, Tab:Lines, Field:Order Payment Plan navigate to Purchase Order | Payment Plan Tab details: https://code.openbravo.com/erp/devel/main/rev/e8c791a96f2f changeset: 28220:e8c791a96f2f user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Mon Feb 22 10:43:16 2016 +0100 summary: Related to issue 32220: fixed db consistency details: https://code.openbravo.com/erp/devel/main/rev/b207c78d4bbc changeset: 28221:b207c78d4bbc user: Atul Gaware <atul.gaware <at> openbravo.com> date: Mon Feb 22 15:33:27 2016 +0530 summary: Fixes Issue 32299: Wrong payment status when unmatching bankstatement line manually matched against an invoice Incase a finTransaction is unmatched which has finPayment,status of finPayment is also updated accordingly as per isReceipt flag details: https://code.openbravo.com/erp/devel/main/rev/0d5aa309a887 changeset: 28222:0d5aa309a887 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Feb 23 16:37:30 2016 +0100 summary: fixed bug 32310: error on update if an observer loaded current object in memory In case an entity observer loaded current object in memory (ie. observing orderLine) doing orderLine.getSalesOrder().getOrderLineList() there were two different instances in memory representing the same DB row. This caused problems when trying to evict it. Causing an exception to be thrown when updating from UI in this case. As solution eviction is no longer performed, object is forced to be fetched from DB by executing a Criteria. details: https://code.openbravo.com/erp/devel/main/rev/f780cc2ec477 changeset: 28223:f780cc2ec477 user: Atul Gaware <atul.gaware <at> openbravo.com> date: Wed Feb 24 18:05:08 2016 +0530 summary: Fixes Issue 32328:"Generate invoice from receipt" button is not working In case tax not included in price list, gross std price and list price was set will null value which is not allowed by db table. now they are initiated to value zero first. details: https://code.openbravo.com/erp/devel/main/rev/6db117b0e95c changeset: 28224:6db117b0e95c user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Thu Feb 25 19:59:45 2016 +0100 summary: Fixed issue 32333. Added method to check if importentry has status 'Error' details: https://code.openbravo.com/erp/devel/main/rev/70df4e4c5cab changeset: 28225:70df4e4c5cab user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Feb 29 04:46:02 2016 +0000 summary: Update AD_MODULE version to 3.0PR15Q4.4 details: https://code.openbravo.com/erp/devel/main/rev/f016ea545c92 changeset: 28226:f016ea545c92 user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Feb 29 04:46:02 2016 +0000 summary: Added tag 3.0PR15Q4.4 for changeset 70df4e4c5cab details: https://code.openbravo.com/erp/devel/main/rev/6ab137079e83 changeset: 28227:6ab137079e83 user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Feb 29 04:46:02 2016 +0000 summary: Added signature for changeset f016ea545c92 details: https://code.openbravo.com/erp/devel/main/rev/4bf7e847501a changeset: 28228:4bf7e847501a user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Feb 29 13:36:17 2016 +0000 summary: Merge temporary head for 3.0PR15Q4.4 diffstat: .hgsigs | 10 + .hgtags | 10 + build.xml | 22 +- legal/Licensing.txt | 4 +- lib/runtime/commons-io-2.0.1.jar | 0 lib/runtime/commons-io-2.4.jar | 0 lib/runtime/postgresql-9.4-1201.jdbc4.jar | 0 lib/runtime/postgresql-9.4.1207.jre6.jar | 0 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MENU.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 36 + 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_REF_LIST.xml | 14 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml | 5 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TREENODE.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java | 3 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentReloadLabelsActionHandler.java | 73 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentMethodMulticurrencyActionHandler.java | 24 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/UnMatchSelectedTransactionsActionHandler.java | 151 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/GLItemSelectorFilterExpression.java | 8 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java | 160 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java | 12 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_FinaccTransactionEventListener.java | 7 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_PaymentEventListener.java | 114 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentDefaultValuesHandler.java | 68 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/ExecutePendingPayments.java | 33 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 3 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java | 18 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 66 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-findTransaction.js | 2 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js | 53 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-utilities.js | 4 +- 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/JdbcExternalConnectionPool.java | 49 +- 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.client.application/src-db/database/model/functions/OBUIAPP_LANGUAGE_CREATE.xml | 22 +- modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PROCESS_ACCESS.xml | 7 + modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PROCESS_TRL.xml | 79 + modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_VIEW_ROLE_ACCESS.xml | 7 + modules/org.openbravo.client.application/src-db/database/model/triggers/OBUIAPP_PROCESS_TRG.xml | 30 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 589 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml | 16 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 628 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 24 + 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-db/database/sourcedata/AD_PREFERENCE.xml | 24 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TAB.xml | 60 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TABLE.xml | 25 + modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java | 1 + modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java | 9 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java | 9 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java | 5 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java | 76 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-param-window-parameter.ftl | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-view-tab.js.ftl | 22 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-form.js.ftl | 37 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 62 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java | 18 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewParameterHandler.java | 18 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java | 17 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewUtil.java | 394 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js | 6 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js | 20 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-calendar.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js | 56 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-combo.js | 20 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 14 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree-filter.js | 21 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-yesno.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 14 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 48 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-messagebar.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 12 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js | 6 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/materialmgmt/ob-reservation.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js | 5 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-form.js | 16 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/test/ob-utilities-number-test.js | 34 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 11 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-history-manager.js | 54 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js | 3 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-toolbar-styles.css | 7 + 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/CharacteristicsUIDefinition.java | 10 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKComboUIDefinition.java | 13 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKTreeUIDefinition.java | 9 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java | 19 +- modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_CLASS_ACCESS.xml | 7 + modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_COLUMN.xml | 39 + modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_FIELD.xml | 29 + modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MESSAGE.xml | 12 + 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/MyOpenbravoActionHandler.java | 2 +- modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java | 21 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-getting-started-widget.js | 4 +- 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.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java | 5 +- 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.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.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 8 +- 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/DataSourceProperty.java | 28 +- 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 | 12 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DataEntityQueryService.java | 8 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java | 4 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 20 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonUtils.java | 8 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/UnpagedRequestCachedPreference.java | 7 +- 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/CustomQuerySelectorDatasource.java | 4 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java | 43 +- 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.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js | 9 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js | 1 + 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 +- referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml | 886 +- referencedata/sampledata/F_B_International_Group/AD_ROLE.xml | 24 + referencedata/sampledata/F_B_International_Group/AD_SEQUENCE.xml | 82 +- referencedata/sampledata/F_B_International_Group/AD_USER.xml | 48 +- referencedata/sampledata/F_B_International_Group/AD_WINDOW_ACCESS.xml | 140 + referencedata/sampledata/F_B_International_Group/A_AMORTIZATION.xml | 66 +- referencedata/sampledata/F_B_International_Group/A_ASSET.xml | 22 +- referencedata/sampledata/F_B_International_Group/A_ASSET_ACCT.xml | 30 + referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml | 114 +- referencedata/sampledata/F_B_International_Group/C_CONVERSION_RATE.xml | 36 + referencedata/sampledata/F_B_International_Group/C_INVOICE.xml | 4198 +- referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml | 8448 + 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 | 2232 + referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml | 9108 + 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/FACT_ACCT.xml | 49700 +++++++- referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENT.xml | 44 + referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENTLINE.xml | 1386 + referencedata/sampledata/F_B_International_Group/FIN_FINACC_TRANSACTION.xml | 1974 + referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml | 8 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml | 2274 + 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 | 64292 +++++---- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml | 1326 +- referencedata/sampledata/F_B_International_Group/FIN_RECONCILIATION.xml | 62 +- referencedata/sampledata/F_B_International_Group/GL_JOURNAL.xml | 108 + referencedata/sampledata/F_B_International_Group/GL_JOURNALBATCH.xml | 84 +- referencedata/sampledata/F_B_International_Group/GL_JOURNALLINE.xml | 1260 + referencedata/sampledata/F_B_International_Group/M_COSTING.xml | 1824 +- 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_INVENTORY.xml | 20 +- 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/M_WAREHOUSE_RULE.xml | 24 +- referencedata/sampledata/F_B_International_Group/OBUIAPP_PROCESS_ACCESS.xml | 140 + referencedata/sampledata/QA_Testing/C_GLITEM_ACCT.xml | 30 + referencedata/sampledata/QA_Testing/M_COSTING.xml | 1320 + referencedata/sampledata/QA_Testing/M_INVENTORY.xml | 8 +- referencedata/sampledata/QA_Testing/M_TRANSACTION.xml | 834 +- referencedata/sampledata/QA_Testing/M_TRANSACTION_COST.xml | 952 + referencedata/sampledata/QA_Testing/M_WAREHOUSE_RULE.xml | 12 +- src-core/.classpath | 2 +- src-core/src/org/openbravo/base/AntExecutor.java | 7 +- src-core/src/org/openbravo/base/ConfigParameters.java | 14 +- src-core/src/org/openbravo/base/ConnectionProviderContextListener.java | 39 +- src-core/src/org/openbravo/base/HttpBaseServlet.java | 46 +- src-core/src/org/openbravo/base/HttpBaseUtils.java | 5 +- src-core/src/org/openbravo/base/MultipartRequest.java | 28 +- src-core/src/org/openbravo/base/VariablesBase.java | 7 +- src-core/src/org/openbravo/base/filter/NumberFilter.java | 3 +- src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java | 6 +- src-core/src/org/openbravo/data/Sqlc.java | 14 +- src-core/src/org/openbravo/data/UtilSql.java | 5 +- src-core/src/org/openbravo/database/ConnectionProviderImpl.java | 28 +- src-core/src/org/openbravo/database/JNDIConnectionProvider.java | 5 +- src-core/src/org/openbravo/database/RDBMSIndependent.java | 3 +- src-core/src/org/openbravo/uiTranslation/FieldLabelsData.java | 30 +- src-core/src/org/openbravo/uiTranslation/TranslationHandler.java | 3 +- src-core/src/org/openbravo/uiTranslation/TranslationUtils.java | 3 - src-core/src/org/openbravo/utils/FormatUtilities.java | 5 +- src-core/src/org/openbravo/utils/Replace.java | 5 +- src-core/src/org/openbravo/xmlEngine/XmlTemplate.java | 27 +- src-core/src/org/openbravo/xmlEngine/XmlVectorValue.java | 67 +- src-db/database/model/functions/C_COMMISSION_PROCESS.xml | 13 +- src-db/database/model/functions/C_GENERATESOFROMPROJECTPHASE.xml | 2 +- src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml | 32 + src-db/database/model/functions/MRP_RUN_EXPLODE.xml | 19 +- src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml | 2 +- src-db/database/model/functions/M_GET_STOCK_PARAM.xml | 5 +- src-db/database/model/functions/M_INOUT_POST.xml | 262 +- src-db/database/model/functions/M_PRICELIST_CREATE.xml | 3 + src-db/database/model/functions/M_PRODUCTION_RUN.xml | 31 + src-db/database/model/functions/M_RESERVATION_POST.xml | 13 +- src-db/database/model/functions/M_UNIQUEATTRIBUTE_RULE.xml | 5 +- src-db/database/model/functions/M_UNIQUEATTRIBUTE_RULE_PARAM.xml | 146 + src-db/database/model/functions/M_UNIQUELOCATOR_RULE.xml | 5 +- src-db/database/model/functions/M_UNIQUELOCATOR_RULE_PARAM.xml | 142 + src-db/database/model/functions/M_WAREHOUSE_DEFAULT_RULE.xml | 5 +- src-db/database/model/functions/M_WAREHOUSE_DEFAULT_RULE_PARAM.xml | 86 + src-db/database/model/tables/AD_ALERTRECIPIENT.xml | 7 + src-db/database/model/tables/AD_FIELD_ACCESS.xml | 7 + src-db/database/model/tables/AD_FORM_ACCESS.xml | 7 + src-db/database/model/tables/AD_PREFERENCE.xml | 7 + src-db/database/model/tables/AD_PROCESS_ACCESS.xml | 7 + src-db/database/model/tables/AD_ROLE.xml | 10 + src-db/database/model/tables/AD_ROLE_INHERITANCE.xml | 73 + src-db/database/model/tables/AD_ROLE_ORGACCESS.xml | 7 + src-db/database/model/tables/AD_TABLE_ACCESS.xml | 7 + src-db/database/model/tables/AD_TAB_ACCESS.xml | 7 + src-db/database/model/tables/AD_WINDOW_ACCESS.xml | 7 + src-db/database/model/tables/C_INVOICETAX_CASHVAT.xml | 5 + src-db/database/model/tables/M_CHARACTERISTIC.xml | 5 + src-db/database/model/tables/M_PRODUCT_CH.xml | 5 + src-db/database/model/tables/M_PRODUCT_CH_CONF.xml | 4 + src-db/database/model/triggers/AD_ALERTRECIPIENT_TRG.xml | 24 +- src-db/database/model/triggers/AD_PREFERENCE_MOD_TRG.xml | 25 +- src-db/database/model/triggers/AD_ROLE_CHECK_TRG.xml | 17 +- src-db/database/model/triggers/C_INVOICELINE_BEFORE_TRG.xml | 2 +- src-db/database/model/triggers/C_INVOICELINE_TRG.xml | 38 +- src-db/database/model/triggers/C_ORDERLINE_TRG.xml | 40 +- src-db/database/model/triggers/C_ORDER_TRG2.xml | 4 +- src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml | 13 +- src-db/database/model/triggers/GL_JOURNAL_CHK_RESTRICT_TRG.xml | 6 +- src-db/database/model/triggers/M_CH_SUBSET_VALUE_TRG.xml | 5 +- src-db/database/model/triggers/M_CH_VALUE_TRG.xml | 5 +- src-db/database/model/triggers/M_INOUTLINE_TRG.xml | 45 +- src-db/database/model/triggers/M_PRODUCT_TRG.xml | 31 +- src-db/database/model/triggers/M_RESERVATION_TRG.xml | 4 +- src-db/database/model/views/C_INVOICETAX_CASHVAT_V.xml | 2 +- src-db/database/model/views/MA_PROCESSPLAN_TOTALIZED.xml | 2 +- src-db/database/model/views/M_PRODCHVIEW_V.xml | 4 + src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 44 + src-db/database/sourcedata/AD_COLUMN.xml | 1636 +- src-db/database/sourcedata/AD_ELEMENT.xml | 119 + src-db/database/sourcedata/AD_FIELD.xml | 1041 +- src-db/database/sourcedata/AD_MESSAGE.xml | 568 +- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_REFERENCE.xml | 24 + src-db/database/sourcedata/AD_REF_LIST.xml | 35 + src-db/database/sourcedata/AD_TAB.xml | 64 +- src-db/database/sourcedata/AD_TABLE.xml | 47 + src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 121 +- src-db/database/sourcedata/AD_VAL_RULE.xml | 12 + src-db/database/sourcedata/AD_WINDOW.xml | 15 + src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 16 +- src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 27 +- src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml | 9 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 21 + src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 183 + src-test/src/org/openbravo/test/AllAntTaskTests.java | 16 +- src-test/src/org/openbravo/test/AllTests.java | 4 +- src-test/src/org/openbravo/test/AntTaskTests.java | 4 + src-test/src/org/openbravo/test/costing/TestCosting.java | 319 +- src-test/src/org/openbravo/test/db/model/functions/SqlCallableStatement.java | 106 + src-test/src/org/openbravo/test/db/model/triggers/M_inoutlinetrgTest.java | 647 + src-test/src/org/openbravo/test/role/inheritance/AccessPropagation.java | 168 + src-test/src/org/openbravo/test/role/inheritance/AccessPropagationNotInherited.java | 159 + src-test/src/org/openbravo/test/role/inheritance/DeletedAccessPropagation.java | 175 + src-test/src/org/openbravo/test/role/inheritance/HorizontalInheritance.java | 207 + src-test/src/org/openbravo/test/role/inheritance/RecalculatePermissions.java | 194 + src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceRestrictions.java | 446 + src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceTestSuite.java | 48 + src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceTestUtils.java | 1414 + src-test/src/org/openbravo/test/role/inheritance/VerticalInheritance.java | 147 + src-test/src/org/openbravo/test/views/ViewGenerationWithDifferentConfigLevelTest.java | 298 + src-util/modulescript/build/classes/org/openbravo/modulescript/PgJdbcDatesIssue.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/PgJdbcDatesIssueData.class | 0 src-util/modulescript/src/org/openbravo/modulescript/PgJdbcDatesIssue.java | 100 - src-util/modulescript/src/org/openbravo/modulescript/PgJdbcDatesIssue_data.xsql | 97 - src/index.jsp | 2 +- src/org/openbravo/base/exception/OBException.java | 34 +- src/org/openbravo/base/model/Entity.java | 25 +- src/org/openbravo/base/model/ModelProvider.java | 5 +- src/org/openbravo/base/model/Property.java | 5 + src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 87 +- src/org/openbravo/base/secureApp/LoginHandler.java | 8 +- src/org/openbravo/base/secureApp/LoginUtils.java | 163 + src/org/openbravo/base/session/SessionFactoryController.java | 12 +- src/org/openbravo/base/structure/InheritedAccessEnabled.java | 34 + src/org/openbravo/common/actionhandler/ManageReservationActionHandler.java | 21 +- src/org/openbravo/common/actionhandler/RMInOutPickEditLines.java | 20 +- src/org/openbravo/common/datasource/ReturnToFromCustomerVendorHQLTransformer.java | 13 +- src/org/openbravo/costing/AverageAlgorithm.java | 15 - src/org/openbravo/costing/CostAdjustmentProcess.java | 38 +- src/org/openbravo/costing/CostAdjustmentUtils.java | 98 +- src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java | 13 +- src/org/openbravo/costing/CostingMigrationProcess.java | 18 +- src/org/openbravo/costing/CostingRuleProcess.java | 5 +- src/org/openbravo/costing/CostingServer.java | 141 +- src/org/openbravo/costing/CostingUtils.java | 74 +- src/org/openbravo/costing/InventoryAmountUpdateProcess.java | 7 +- src/org/openbravo/costing/LCCostMatchFromInvoiceHandler.java | 6 +- src/org/openbravo/costing/StandardAlgorithm.java | 36 +- src/org/openbravo/costing/StandardCostAdjustment.java | 336 +- src/org/openbravo/dal/core/DalUtil.java | 78 +- src/org/openbravo/dal/core/SessionHandler.java | 3 +- src/org/openbravo/dal/core/TriggerHandler.java | 10 +- src/org/openbravo/dal/xml/EntityXMLConverter.java | 33 +- src/org/openbravo/erpCommon/ReportsUtility.java | 12 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql | 4 +- src/org/openbravo/erpCommon/ad_actionButton/InsertAcces.java | 35 +- src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java | 6 +- src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java | 4 + src/org/openbravo/erpCommon/ad_callouts/SE_Payment_BPartner.java | 53 +- src/org/openbravo/erpCommon/ad_callouts/SL_InOut_BPartner.java | 6 +- src/org/openbravo/erpCommon/ad_callouts/SL_InvAmtUpd_ProductRefDate.java | 22 +- src/org/openbravo/erpCommon/ad_callouts/SL_ProductCh_Characteristic.java | 1 + src/org/openbravo/erpCommon/ad_forms/About.html | 5 +- src/org/openbravo/erpCommon/ad_forms/About.java | 3 +- src/org/openbravo/erpCommon/ad_forms/About.xml | 3 +- src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 2 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 2 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 2 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 36 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html | 3 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java | 15 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagement.xml | 3 +- src/org/openbravo/erpCommon/ad_forms/Role.java | 3 +- src/org/openbravo/erpCommon/ad_forms/ShowSessionPreferences.html | 4 +- src/org/openbravo/erpCommon/ad_process/AcctServerProcess.java | 10 +- src/org/openbravo/erpCommon/ad_process/AcctServerProcess_data.xsql | 27 +- src/org/openbravo/erpCommon/ad_process/ConvertQuotationIntoOrder.java | 12 +- src/org/openbravo/erpCommon/ad_reports/CustomerStatement.jrxml | 14 +- src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql | 21 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html | 51 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 128 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.xml | 3 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql | 5 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java | 11 + src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html | 28 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql | 8 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.jrxml | 136 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR_data.xsql | 10 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.jrxml | 113 +- src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesFilterJR.html | 30 +- src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesJR.java | 13 + src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitability_data.xsql | 22 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR.java | 17 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJRFilter.html | 30 +- src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR.java | 12 + src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJRFilter.html | 30 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html | 22 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java | 20 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock_data.xsql | 4 +- src/org/openbravo/erpCommon/ad_reports/productionSubReport.jrxml | 4 +- src/org/openbravo/erpCommon/businessUtility/Preferences.java | 93 +- src/org/openbravo/erpCommon/businessUtility/PrinterReports.java | 33 +- src/org/openbravo/erpCommon/businessUtility/TabAttachments.java | 19 +- src/org/openbravo/erpCommon/info/ImageInfoBLOB.java | 7 +- src/org/openbravo/erpCommon/info/ProductMultiple.java | 1 + src/org/openbravo/erpCommon/obps/ActivationKey.java | 149 +- src/org/openbravo/erpCommon/obps/ModuleLicenseRestrictions.java | 95 + src/org/openbravo/erpCommon/security/Login.html | 12 +- src/org/openbravo/erpCommon/security/Login_F1.html | 4 +- src/org/openbravo/erpCommon/utility/CashVATUtil.java | 59 +- src/org/openbravo/erpCommon/utility/DimensionDisplayUtility.java | 6 +- src/org/openbravo/erpCommon/utility/OBCurrencyUtils.java | 80 + src/org/openbravo/erpCommon/utility/OBDateUtils.java | 19 +- src/org/openbravo/erpCommon/utility/PopupLoading.html | 4 +- src/org/openbravo/erpCommon/utility/Utility.java | 15 +- src/org/openbravo/erpCommon/utility/WindowTree.java | 8 +- src/org/openbravo/erpCommon/utility/reporting/ReportManager.java | 13 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java | 72 +- src/org/openbravo/event/GLJournalLineEventHandler.java | 16 +- src/org/openbravo/event/ProductCharacteristicEventHandler.java | 140 +- src/org/openbravo/event/ProductCharacteristicValueEventHandler.java | 41 +- src/org/openbravo/financial/FinancialUtils.java | 4 - src/org/openbravo/materialmgmt/InventoryCountProcess.java | 21 +- src/org/openbravo/materialmgmt/ProductCharacteristicsDS.java | 269 +- src/org/openbravo/materialmgmt/actionhandler/AddProductsToChValue.java | 94 +- src/org/openbravo/role/inheritance/InheritedAccessEnabledEventHandler.java | 140 + src/org/openbravo/role/inheritance/RecalculatePermissionsHandler.java | 148 + src/org/openbravo/role/inheritance/RoleInheritanceEventHandler.java | 182 + src/org/openbravo/role/inheritance/RoleInheritanceManager.java | 829 + src/org/openbravo/role/inheritance/RoleInheritanceWarningFICExtension.java | 140 + src/org/openbravo/role/inheritance/access/AccessTypeInjector.java | 376 + src/org/openbravo/role/inheritance/access/AlertRecipientAccessInjector.java | 104 + src/org/openbravo/role/inheritance/access/FieldAccessInjector.java | 104 + src/org/openbravo/role/inheritance/access/FormAccessInjector.java | 37 + src/org/openbravo/role/inheritance/access/OrgAccessInjector.java | 37 + src/org/openbravo/role/inheritance/access/PreferenceAccessInjector.java | 165 + src/org/openbravo/role/inheritance/access/ProcessDefinitionAccessInjector.java | 37 + src/org/openbravo/role/inheritance/access/ReportAndProcessAccessInjector.java | 37 + src/org/openbravo/role/inheritance/access/TabAccessInjector.java | 122 + src/org/openbravo/role/inheritance/access/TableAccessInjector.java | 37 + src/org/openbravo/role/inheritance/access/ViewImplementationAccessInjector.java | 37 + src/org/openbravo/role/inheritance/access/WidgetClassAccessInjector.java | 37 + src/org/openbravo/role/inheritance/access/WindowAccessInjector.java | 78 + src/org/openbravo/service/db/DataImportService.java | 14 +- src/org/openbravo/service/db/DbUtility.java | 4 + src/org/openbravo/service/importprocess/ImportEntryManager.java | 22 +- src/org/openbravo/service/importprocess/ImportEntryPostProcessor.java | 33 + src/org/openbravo/service/importprocess/ImportEntryProcessor.java | 13 + src/org/openbravo/service/importprocess/ImportProcessUtils.java | 25 +- src/org/openbravo/service/rest/DalWebService.java | 9 +- src/org/openbravo/service/system/SystemService.java | 38 +- web/js/recalculatePermissionsProcess.js | 83 + web/js/utils.js | 10 +- 445 files changed, 167381 insertions(+), 36777 deletions(-) diffs (truncated from 263411 to 300 lines): diff -r 9985680adffa -r 4bf7e847501a .hgsigs --- a/.hgsigs Fri Feb 12 04:37:22 2016 +0000 +++ b/.hgsigs Mon Feb 29 13:36:17 2016 +0000 @@ -176,5 +176,15 @@ 906c7a47100c5694d720f6a00a8d205538562334 0 iEYEABECAAYFAlW3GiEACgkQCX/oGf+2qkNk4gCfVlZA1GqR2LvJwBPBXoMn6RCRyFYAnA4aPF+fOZXRpAqKMRT55nvswuRI 6dfd2fade034c7225367366dc34dcf402b596555 0 iEYEABECAAYFAlXccLwACgkQCX/oGf+2qkPEMQCeM4MxdgXlCtbu0xqZNcX0IAEuGZgAnAjQlB4gOw0q84Q/gFyRL38jkahJ 9f4a209cc84b3b4e7f3176388f6d6071779ac3e2 0 iEYEABECAAYFAlX5YqQACgkQCX/oGf+2qkOLNwCgr9InQrxWVMHG2e7sabvZBm3KD6gAoPvoMDHktqqkv2Qqtbv3G1mqpTrM +f22b32ad49b1baca7b310bdf68d8d411e897f7bf 0 iEYEABECAAYFAlYtwHYACgkQCX/oGf+2qkOQ1QCgsBVLaaNfILpxAYrZfhBD+GDVVLEAnREcCa1Lvzf4mJ8eD8VWTx1g8kqk 73f7d3c67dc7d6063af1dac6e71db12b9081150a 0 iEYEABECAAYFAlXMHl0ACgkQCX/oGf+2qkNVuACfTfB6/RfeioYrYtsi81kAwADW0lgAoOJdXKScLwl6RHeXIFvMlrzlcT6w f8b98762376a89ec93a0a623c61fdab00975c3a9 0 iEYEABECAAYFAlXtQ4gACgkQCX/oGf+2qkMZUgCePOnen6iguLqaG+86NeCC8Hr0yzAAoKTnw/BIXyBm5Ski5JQT/0mF1zHK +9755d00af209f39887eba34a08922463fbcdac91 0 iEYEABECAAYFAlYt2zgACgkQCX/oGf+2qkN1KgCg6tzAQat0ZJJIWeFyr6yLRVCvh24AnjVyPbFPvbJ3/EOgUHtJWz5lWzeM +d20a396ffa245fd3cdbadc3196df3554018d2e20 0 iEYEABECAAYFAlY4SL4ACgkQCX/oGf+2qkOjJACfS1q37UfrWobml4IVCOKqGeV+CU0An3iRcDJJ+N3aJMuzjkZh8xYe0mRQ +089152094fe394f987fa18606cba401cc20283ec 0 iEYEABECAAYFAlZmVhkACgkQCX/oGf+2qkOFxgCaA0tF7KBDttIBpX4Iezn3GPqSqJQAoIO5TQRfs/Gpwo/lV48IaAIG94vJ +6c3455925759761e11a3e14afee7d4bfa6d44b7b 0 iEYEABECAAYFAlagn5YACgkQCX/oGf+2qkO+bwCg5QR2pBchydWi0CYFTF0W0E3YP5AAoI2VCfXgMzocJ8AAeqsXRtetQ1pR +d2c765a228d83098cc5f253cdd364abdb4a4697e 0 iEYEABECAAYFAlZOorMACgkQCX/oGf+2qkMFfwCgocaX6vsWuoGtE55aoHgBD1/7OKoAoOv4J31+P+8BtkVHJyKLhxGVBoLo +cf00bd72641cd3d41f95c0610058f127dad7b91a 0 iEYEABECAAYFAlZv7k4ACgkQCX/oGf+2qkNDIgCeO9reaQhgk94B44p24tVR/E5NsccAoOoJYRH9w6b6sWOOQkRivfVjQwSv +13daf93202e0933841632c91b1d4a887d9521e3c 0 iEYEABECAAYFAlahu2QACgkQCX/oGf+2qkPP3QCdFhiUHKeBfwEFsprfMiofZWZ1/wkAoN0Tjy/Hk2svUSV2vBYUf3uHGz+U +24d2967df096de06913c9991553c1d84b07df9b6 0 iEYEABECAAYFAla9YYIACgkQCX/oGf+2qkNH7wCfV32iOyR/TQKzW/mH1iHTir6f6h4AoIlh4QBWIShpJqbJvx2IhfARpvUZ +f016ea545c924ad099e9e402689035f1dd73baa2 0 iEYEABECAAYFAlbTzQoACgkQCX/oGf+2qkP28wCdFpNqpw+ODgF0p3cMJAbTZy1IPfoAoNEuRHkZIM5bNJMjwU0/GhjCtwah diff -r 9985680adffa -r 4bf7e847501a .hgtags --- a/.hgtags Fri Feb 12 04:37:22 2016 +0000 +++ b/.hgtags Mon Feb 29 13:36:17 2016 +0000 @@ -187,5 +187,15 @@ 01405101d810eaafec106bab50ce31b41df52569 3.0PR15Q2.3 d26c43a861dec9147a6a60d8aca52359837e9591 3.0PR15Q2.4 f38025d616fa8a50a95d0dd3a3c38bcf6bbce053 3.0PR15Q2.5 +8b094ef73876cad67e35345c1add17266413af46 3.0PR15Q2.6 828faf1939944cd8d55d562494138f68305c5b50 3.0PR15Q3 e5863950c81de2bcf7dce57035094e96d544a9ae 3.0PR15Q3.1 +9320a67a9ef1cafb5076d06bdd6d716abc662c40 3.0PR15Q3.2 +bce57079bd436cec545edb6c12246170862f0416 3.0PR15Q3.3 +8dabadcfecebf5aced31ed98411517afcb10d792 3.0PR15Q3.4 +0c91d0ae09c32dc46fc9e91f516ef36c6cdecda7 3.0PR15Q3.5 +84cd25c33900a44c955c5a899e570281f02e0ccc 3.0PR15Q4 +f698a5f953c867f7f7fefe86d7cca3ff80324181 3.0PR15Q4.1 +b6c50283d4a8ae24f54c0f0955601478ead7134d 3.0PR15Q4.2 +9985680adffaf70ffcc1f560860feb10f0ee6b33 3.0PR15Q4.3 +70df4e4c5cab6d37f10eceee6b66be039c381556 3.0PR15Q4.4 diff -r 9985680adffa -r 4bf7e847501a build.xml --- a/build.xml Fri Feb 12 04:37:22 2016 +0000 +++ b/build.xml Mon Feb 29 13:36:17 2016 +0000 @@ -554,13 +554,29 @@ </target> <target name="generate.java.doc"> - <javadoc sourcepath="${base.src}:${base.src.test}:${build.AD}:${base.src.core}/src:${base.src.gen}:build/javasqlc/src/:build/javasqlc/srcAD" Windowtitle="${title}" access="protected" Header="${header}" Footer="${footer}" destdir="${build.docs}" linksource="no" maxmemory="1024M"> + <javadoc Windowtitle="${title}" access="protected" Header="${header}" Footer="${footer}" destdir="${build.docs}" maxmemory="1024M"> + <sourcepath> + <pathelement path="${base.src}" /> + <pathelement path="${base.src.test}/src" /> + <pathelement path="${build.AD}" /> + <pathelement path="${base.src.core}/src" /> + <pathelement path="${base.src.gen}" /> + <pathelement path="build/javasqlc/src" /> + <pathelement path="build/javasqlc/srcAD" /> + <dirset dir="${base.modules}"> + <include name="*/src" /> + <include name="*/src-test" /> + </dirset> + </sourcepath> <excludepackage name="org.openbravo.erpWindows.*"/> <classpath> <path refid="project.class.path"/> <pathelement path="lib/build/js.jar" /> + <fileset dir="${base.modules}"> + <include name="*/lib/test/*.jar" /> + </fileset> </classpath> - <link href="http://java.sun.com/javase/6/docs/api/"/> + <link href="http://docs.oracle.com/javase/6/docs/api/"/> </javadoc> </target> @@ -1088,7 +1104,7 @@ <pathelement path="${base.lib}/runtime/log4j-1.2.16.jar" /> <pathelement path="${base.lib}/runtime/commons-pool-1.5.6.jar" /> <pathelement path="${base.lib}/runtime/commons-dbcp-1.4.jar" /> - <pathelement path="${base.lib}/runtime/postgresql-9.4.1207.jre6.jar" /> + <pathelement path="${base.lib}/runtime/postgresql-9.4-1201.jdbc4.jar" /> <pathelement path="${base.lib}/runtime/ojdbc6.jar" /> <pathelement path="${base.lib}/runtime/commons-collectionsi-3.2.1.jar" /> <pathelement path="${base.lib}/runtime/ant-1.9.2.jar" /> diff -r 9985680adffa -r 4bf7e847501a legal/Licensing.txt --- a/legal/Licensing.txt Fri Feb 12 04:37:22 2016 +0000 +++ b/legal/Licensing.txt Mon Feb 29 13:36:17 2016 +0000 @@ -107,7 +107,7 @@ # commons-dbcp-1.4.jar # commons-digester-1.8.1.jar # commons-fileupload-1.2.2.jar -# commons-io-2.0.1.jar +# commons-io-2.4.jar # commons-lang-2.6.jar # commons-logging-1.1.1.jar # commons-pool-1.5.6.jar @@ -123,7 +123,7 @@ All files under Apache Software License 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 -# postgresql-9.4.1207.jre6.jar +# postgresql-9.4-1201.jdbc4.jar Under the BSD license, also available at http://jdbc.postgresql.org/license.html # xstream-1.3.1.jar diff -r 9985680adffa -r 4bf7e847501a lib/runtime/commons-io-2.0.1.jar Binary file lib/runtime/commons-io-2.0.1.jar has changed diff -r 9985680adffa -r 4bf7e847501a lib/runtime/commons-io-2.4.jar Binary file lib/runtime/commons-io-2.4.jar has changed diff -r 9985680adffa -r 4bf7e847501a lib/runtime/postgresql-9.4-1201.jdbc4.jar Binary file lib/runtime/postgresql-9.4-1201.jdbc4.jar has changed diff -r 9985680adffa -r 4bf7e847501a lib/runtime/postgresql-9.4.1207.jre6.jar Binary file lib/runtime/postgresql-9.4.1207.jre6.jar has changed diff -r 9985680adffa -r 4bf7e847501a modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml Fri Feb 12 04:37:22 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml Mon Feb 29 13:36:17 2016 +0000 @@ -204,7 +204,8 @@ WHERE ps.fin_payment_schedule_id = psd.fin_payment_schedule_order AND ps.c_order_id = p_record_id AND psd.fin_payment_detail_id = pd.fin_payment_detail_id - AND pd.fin_payment_id = p.fin_payment_id; + AND pd.fin_payment_id = p.fin_payment_id + AND p.status <> 'RPAP'; IF (v_count <> 0) THEN RAISE_APPLICATION_ERROR(-20000, '@APRM_OrderWithPayments@'||v_DocumentNo); END IF; diff -r 9985680adffa -r 4bf7e847501a modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MENU.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MENU.xml Fri Feb 12 04:37:22 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MENU.xml Mon Feb 29 13:36:17 2016 +0000 @@ -207,7 +207,7 @@ <!--E6903C6E20814C82BF1CA9C92847A8A5--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--E6903C6E20814C82BF1CA9C92847A8A5--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--E6903C6E20814C82BF1CA9C92847A8A5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--E6903C6E20814C82BF1CA9C92847A8A5--> <NAME><![CDATA[Process Price Difference Adjustment]]></NAME> +<!--E6903C6E20814C82BF1CA9C92847A8A5--> <NAME><![CDATA[Process Price Difference adjustment]]></NAME> <!--E6903C6E20814C82BF1CA9C92847A8A5--> <ISSUMMARY><![CDATA[N]]></ISSUMMARY> <!--E6903C6E20814C82BF1CA9C92847A8A5--> <ACTION><![CDATA[OBUIAPP_Process]]></ACTION> <!--E6903C6E20814C82BF1CA9C92847A8A5--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> diff -r 9985680adffa -r 4bf7e847501a modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Fri Feb 12 04:37:22 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Mon Feb 29 13:36:17 2016 +0000 @@ -649,6 +649,18 @@ <!--712C841E501642B881A998CCAC13E420--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--712C841E501642B881A998CCAC13E420--></AD_MESSAGE> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--><AD_MESSAGE> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--> <AD_MESSAGE_ID><![CDATA[76D4A0740BAD4274B8718A0AF2A1C9B4]]></AD_MESSAGE_ID> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--> <VALUE><![CDATA[APRM_ErrorOnUnmatchingRecords]]></VALUE> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--> <MSGTEXT><![CDATA[%0 record(s) failed. Reference No.: ]]></MSGTEXT> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--> <MSGTYPE><![CDATA[W]]></MSGTYPE> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--></AD_MESSAGE> + <!--7918E1E75DF84F499AD21A51F53F9A9B--><AD_MESSAGE> <!--7918E1E75DF84F499AD21A51F53F9A9B--> <AD_MESSAGE_ID><![CDATA[7918E1E75DF84F499AD21A51F53F9A9B]]></AD_MESSAGE_ID> <!--7918E1E75DF84F499AD21A51F53F9A9B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -1381,6 +1393,18 @@ <!--DF6BD33E986149C0ADE4D0CC45D7394C--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--DF6BD33E986149C0ADE4D0CC45D7394C--></AD_MESSAGE> +<!--E103F874F07D44269B98F457EFCAF367--><AD_MESSAGE> +<!--E103F874F07D44269B98F457EFCAF367--> <AD_MESSAGE_ID><![CDATA[E103F874F07D44269B98F457EFCAF367]]></AD_MESSAGE_ID> +<!--E103F874F07D44269B98F457EFCAF367--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--E103F874F07D44269B98F457EFCAF367--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--E103F874F07D44269B98F457EFCAF367--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--E103F874F07D44269B98F457EFCAF367--> <VALUE><![CDATA[APRM_UnmatchedRecords]]></VALUE> +<!--E103F874F07D44269B98F457EFCAF367--> <MSGTEXT><![CDATA[%0 record(s) were properly unmatched.]]></MSGTEXT> +<!--E103F874F07D44269B98F457EFCAF367--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--E103F874F07D44269B98F457EFCAF367--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--E103F874F07D44269B98F457EFCAF367--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--E103F874F07D44269B98F457EFCAF367--></AD_MESSAGE> + <!--E217A4F4BDE84DC6A95ACB3F54549FDD--><AD_MESSAGE> <!--E217A4F4BDE84DC6A95ACB3F54549FDD--> <AD_MESSAGE_ID><![CDATA[E217A4F4BDE84DC6A95ACB3F54549FDD]]></AD_MESSAGE_ID> <!--E217A4F4BDE84DC6A95ACB3F54549FDD--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -1405,6 +1429,18 @@ <!--E92C3899BD924A5C991A39B2CDA74D29--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--E92C3899BD924A5C991A39B2CDA74D29--></AD_MESSAGE> +<!--EAA6B599637E4A909131395D843C3C61--><AD_MESSAGE> +<!--EAA6B599637E4A909131395D843C3C61--> <AD_MESSAGE_ID><![CDATA[EAA6B599637E4A909131395D843C3C61]]></AD_MESSAGE_ID> +<!--EAA6B599637E4A909131395D843C3C61--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--EAA6B599637E4A909131395D843C3C61--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--EAA6B599637E4A909131395D843C3C61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--EAA6B599637E4A909131395D843C3C61--> <VALUE><![CDATA[APRM_NoFinancialAccountAvailable]]></VALUE> +<!--EAA6B599637E4A909131395D843C3C61--> <MSGTEXT><![CDATA[It does not exist any Financial Account available for this Payment Method]]></MSGTEXT> +<!--EAA6B599637E4A909131395D843C3C61--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--EAA6B599637E4A909131395D843C3C61--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--EAA6B599637E4A909131395D843C3C61--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--EAA6B599637E4A909131395D843C3C61--></AD_MESSAGE> + <!--EDEA16A966B94F63A7C1E339FC095B08--><AD_MESSAGE> <!--EDEA16A966B94F63A7C1E339FC095B08--> <AD_MESSAGE_ID><![CDATA[EDEA16A966B94F63A7C1E339FC095B08]]></AD_MESSAGE_ID> <!--EDEA16A966B94F63A7C1E339FC095B08--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 9985680adffa -r 4bf7e847501a modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Feb 12 04:37:22 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Feb 29 13:36:17 2016 +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.27688]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.28173]]></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[PR15Q4.3]]></VERSION_LABEL> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED> <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE> diff -r 9985680adffa -r 4bf7e847501a modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Feb 12 04:37:22 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Feb 29 13:36:17 2016 +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.27688]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.28173]]></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.27688]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.28173]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 9985680adffa -r 4bf7e847501a modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml Fri Feb 12 04:37:22 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml Mon Feb 29 13:36:17 2016 +0000 @@ -343,6 +343,18 @@ <!--7AC4F4FF644247B7BD320BBF67C4F066--> <SEQNO><![CDATA[10]]></SEQNO> <!--7AC4F4FF644247B7BD320BBF67C4F066--></AD_REF_LIST> +<!--94334E10107D4F3C868191FF2C9AEAD0--><AD_REF_LIST> +<!--94334E10107D4F3C868191FF2C9AEAD0--> <AD_REF_LIST_ID><![CDATA[94334E10107D4F3C868191FF2C9AEAD0]]></AD_REF_LIST_ID> +<!--94334E10107D4F3C868191FF2C9AEAD0--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--94334E10107D4F3C868191FF2C9AEAD0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--94334E10107D4F3C868191FF2C9AEAD0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--94334E10107D4F3C868191FF2C9AEAD0--> <VALUE><![CDATA[UN]]></VALUE> +<!--94334E10107D4F3C868191FF2C9AEAD0--> <NAME><![CDATA[Unmatch Selected]]></NAME> +<!--94334E10107D4F3C868191FF2C9AEAD0--> <AD_REFERENCE_ID><![CDATA[C20E5E22588E40E5B8CC6D80ED3015C5]]></AD_REFERENCE_ID> +<!--94334E10107D4F3C868191FF2C9AEAD0--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--94334E10107D4F3C868191FF2C9AEAD0--> <SEQNO><![CDATA[30]]></SEQNO> +<!--94334E10107D4F3C868191FF2C9AEAD0--></AD_REF_LIST> + <!--9AE9EBD541F34CC7AC8830B9601C52CB--><AD_REF_LIST> <!--9AE9EBD541F34CC7AC8830B9601C52CB--> <AD_REF_LIST_ID><![CDATA[9AE9EBD541F34CC7AC8830B9601C52CB]]></AD_REF_LIST_ID> <!--9AE9EBD541F34CC7AC8830B9601C52CB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -466,7 +478,7 @@ <!--C69982184F634AC79728338D1F327B76--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C69982184F634AC79728338D1F327B76--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C69982184F634AC79728338D1F327B76--> <VALUE><![CDATA[RE]]></VALUE> -<!--C69982184F634AC79728338D1F327B76--> <NAME><![CDATA[Reconcile]]></NAME> +<!--C69982184F634AC79728338D1F327B76--> <NAME><![CDATA[Reconcile All]]></NAME> <!--C69982184F634AC79728338D1F327B76--> <AD_REFERENCE_ID><![CDATA[C20E5E22588E40E5B8CC6D80ED3015C5]]></AD_REFERENCE_ID> <!--C69982184F634AC79728338D1F327B76--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--C69982184F634AC79728338D1F327B76--> <SEQNO><![CDATA[20]]></SEQNO> diff -r 9985680adffa -r 4bf7e847501a modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Fri Feb 12 04:37:22 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Mon Feb 29 13:36:17 2016 +0000 @@ -916,10 +916,11 @@ <!--ED54A4E24196476596955286D403461E--> <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY> <!--ED54A4E24196476596955286D403461E--> <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE> <!--ED54A4E24196476596955286D403461E--> <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS> +<!--ED54A4E24196476596955286D403461E--> <EM_OBUIAPP_SELECTION><![CDATA[OB.APRM.MatchStatement.selectionChanged]]></EM_OBUIAPP_SELECTION> <!--ED54A4E24196476596955286D403461E--> <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD> <!--ED54A4E24196476596955286D403461E--> <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE> -<!--ED54A4E24196476596955286D403461E--> <EM_OBUIAPP_SHOW_SELECT><![CDATA[N]]></EM_OBUIAPP_SHOW_SELECT> -<!--ED54A4E24196476596955286D403461E--> <EM_OBUIAPP_SELECTION_TYPE><![CDATA[S]]></EM_OBUIAPP_SELECTION_TYPE> +<!--ED54A4E24196476596955286D403461E--> <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT> +<!--ED54A4E24196476596955286D403461E--> <EM_OBUIAPP_SELECTION_TYPE><![CDATA[M]]></EM_OBUIAPP_SELECTION_TYPE> <!--ED54A4E24196476596955286D403461E--></AD_TAB> <!--F6C2283A21314407BBBB23FF14B85ED4--><AD_TAB> diff -r 9985680adffa -r 4bf7e847501a modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TREENODE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TREENODE.xml Fri Feb 12 04:37:22 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TREENODE.xml Mon Feb 29 13:36:17 2016 +0000 @@ -40,8 +40,8 @@ <!--2A811D661ACE49AEB0E93419A4A4C2F3--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--2A811D661ACE49AEB0E93419A4A4C2F3--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--2A811D661ACE49AEB0E93419A4A4C2F3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--2A811D661ACE49AEB0E93419A4A4C2F3--> <PARENT_ID><![CDATA[800256]]></PARENT_ID> -<!--2A811D661ACE49AEB0E93419A4A4C2F3--> <SEQNO><![CDATA[10]]></SEQNO> +<!--2A811D661ACE49AEB0E93419A4A4C2F3--> <PARENT_ID><![CDATA[0]]></PARENT_ID> +<!--2A811D661ACE49AEB0E93419A4A4C2F3--> <SEQNO><![CDATA[999]]></SEQNO> <!--2A811D661ACE49AEB0E93419A4A4C2F3--></AD_TREENODE> <!--3FD746883F8840E1BED768193D141802--><AD_TREENODE> ------------------------------------------------------------------------------ Site24x7 APM Insight: Get Deep Visibility into Application Performance APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month Monitor end-to-end web transactions and take corrective actions now Troubleshoot faster and improve end-user experience. Signup Now! http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140 _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
