details: https://code.openbravo.com/erp/devel/pi/rev/8e64b41fc8ab changeset: 30441:8e64b41fc8ab user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Sep 02 10:02:52 2016 +0200 summary: [disable-grid-summaries] Application Dictionary changes for Grid Configuration
details: https://code.openbravo.com/erp/devel/pi/rev/6d71f29b2c91 changeset: 30442:6d71f29b2c91 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Sep 02 13:07:05 2016 +0200 summary: [disable-grid-summaries] Add disable grid summaries feature for ob-view-grid details: https://code.openbravo.com/erp/devel/pi/rev/ff55f8eb3956 changeset: 30443:ff55f8eb3956 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Sep 02 13:09:05 2016 +0200 summary: [disable-grid-summaries] Add disable grid summaries feature for P&E grids details: https://code.openbravo.com/erp/devel/pi/rev/f3d71cc378fb changeset: 30444:f3d71cc378fb user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Sep 02 13:45:30 2016 +0200 summary: [disable-grid-summaries] Improved way of enabling summaries on P&E details: https://code.openbravo.com/erp/devel/pi/rev/47028ee3b72a changeset: 30445:47028ee3b72a user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Sep 05 09:12:15 2016 +0200 summary: [disable-grid-summaries] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/1318010dd46e changeset: 30446:1318010dd46e user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Sep 14 11:12:24 2016 +0200 summary: [disable-grid-summaries] Code review improvements details: https://code.openbravo.com/erp/devel/pi/rev/f273a3a8ea63 changeset: 30447:f273a3a8ea63 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Sep 14 11:14:21 2016 +0200 summary: [disable-grid-summaries] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/4c5a377b4d60 changeset: 30448:4c5a377b4d60 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Sep 22 15:55:51 2016 +0200 summary: [disable-grid-summaries] isConfigurationPropertyEnabled should be private details: https://code.openbravo.com/erp/devel/pi/rev/bbfa7b5fc9dc changeset: 30449:bbfa7b5fc9dc user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Oct 17 09:20:44 2016 +0200 summary: fixes issue 33582: make summary functions deactivable diffstat: .hgsigs | 3 + .hgtags | 3 + WebContent/META-INF/MANIFEST.MF | 3 +- legal/Licensing.txt | 2 +- modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalanceData.class | 0 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 17 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINACC_TRANSACTION.xml | 7 + modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml | 4 + modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml | 253 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml | 168 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 192 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 24 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 28 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml | 12 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml | 11 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 264 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 20 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 16 + modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance_data.xsql | 33 +- modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalanceData.java | 31 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/APRMApplicationProvider.java | 2 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FundsTransferActionHandler.java | 312 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FundsTransferOnChangeDepositToActionHandler.java | 58 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java | 19 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_PaymentEventListener.java | 68 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_ReconciliationEventListener.java | 77 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentReadOnlyLogicsHandler.java | 7 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/TransactionAddPaymentDefaultValues.java | 10 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentOrderInvoicesTransformer.java | 38 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 13 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 2 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js | 22 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-fundsTransfer.js | 38 + modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/lib/runtime/cal10n-api-0.7.4.jar | 0 modules/org.openbravo.base.weld/lib/runtime/cal10n-api-0.7.7.jar | 0 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java | 4 +- modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml | 5 + modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_TAB.xml | 4 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 79 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml | 14 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 56 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 24 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml | 24 + modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java | 3 + modules/org.openbravo.client.application/src/org/openbravo/client/application/HeartBeatPopupActionHandler.java | 6 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java | 10 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/CoreAttachImplementation.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/MetadataOnTab.java | 1 - modules/org.openbravo.client.application/src/org/openbravo/client/application/event/NoteEventHandler.java | 13 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ReorderCascadingChildDeletionsHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/example/JSExecuteCalloutExample.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-grid.js.ftl | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 446 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/GridConfigurationSequenceNumberCallout.java | 1 - modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java | 50 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 21 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 16 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 35 +- 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 | 31 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js | 33 +- 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-pick-and-execute-view.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-recent-utilities.js | 7 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java | 39 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java | 118 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/CheckOptionalFilterCallout.java | 3 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/BaseDataSourceService.java | 6 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java | 2 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DefaultDataSourceService.java | 4 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 32 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java | 4 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 9 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 22 +- referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml | 1192 +- referencedata/sampledata/F_B_International_Group/AD_SEQUENCE.xml | 62 +- referencedata/sampledata/F_B_International_Group/AD_USER.xml | 48 +- referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml | 86 +- referencedata/sampledata/F_B_International_Group/C_CONVERSION_RATE.xml | 36 + referencedata/sampledata/F_B_International_Group/C_INVOICE.xml | 3816 +- referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml | 8376 + referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml | 4104 + referencedata/sampledata/F_B_International_Group/C_INVOICETAX.xml | 1020 + referencedata/sampledata/F_B_International_Group/C_ORDER.xml | 2977 + referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml | 9516 ++ referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml | 3468 + referencedata/sampledata/F_B_International_Group/C_ORDERTAX.xml | 576 + referencedata/sampledata/F_B_International_Group/C_ORDER_DISCOUNT.xml | 180 + referencedata/sampledata/F_B_International_Group/C_POC_DOCTYPE_TEMPLATE.xml | 50 + referencedata/sampledata/F_B_International_Group/FACT_ACCT.xml | 44251 +++++++++- referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENT.xml | 44 + referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENTLINE.xml | 1260 + referencedata/sampledata/F_B_International_Group/FIN_FINACC_TRANSACTION.xml | 1794 + referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml | 8 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml | 2046 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_DETAIL.xml | 960 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml | 174 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml | 630 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml | 2350 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml | 1326 +- referencedata/sampledata/F_B_International_Group/FIN_RECONCILIATION.xml | 58 + referencedata/sampledata/F_B_International_Group/GL_JOURNAL.xml | 108 + referencedata/sampledata/F_B_International_Group/GL_JOURNALBATCH.xml | 82 +- referencedata/sampledata/F_B_International_Group/GL_JOURNALLINE.xml | 1260 + referencedata/sampledata/F_B_International_Group/M_COSTING.xml | 1896 +- referencedata/sampledata/F_B_International_Group/M_INOUT.xml | 1530 + referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml | 4416 + referencedata/sampledata/F_B_International_Group/M_MATCHINV.xml | 1368 + referencedata/sampledata/F_B_International_Group/M_MATCHPO.xml | 2736 + referencedata/sampledata/F_B_International_Group/M_STORAGE_DETAIL.xml | 108 +- referencedata/sampledata/F_B_International_Group/M_STORAGE_PENDING.xml | 54 +- referencedata/sampledata/F_B_International_Group/M_TRANSACTION.xml | 5760 + referencedata/sampledata/F_B_International_Group/M_TRANSACTION_COST.xml | 3264 + referencedata/sampledata/F_B_International_Group/OBUIAPP_PROCESS_ACCESS.xml | 420 + referencedata/sampledata/QA_Testing/AD_PINSTANCE.xml | 17 + referencedata/sampledata/QA_Testing/AD_SEQUENCE.xml | 44 +- referencedata/sampledata/QA_Testing/C_ORDER.xml | 296 +- referencedata/sampledata/QA_Testing/C_ORDERLINE.xml | 189 + referencedata/sampledata/QA_Testing/C_ORDERLINETAX.xml | 136 + referencedata/sampledata/QA_Testing/C_ORDERTAX.xml | 128 + referencedata/sampledata/QA_Testing/FIN_PAYMENT.xml | 45 +- referencedata/sampledata/QA_Testing/FIN_PAYMENT_DETAIL.xml | 32 + referencedata/sampledata/QA_Testing/FIN_PAYMENT_SCHEDULE.xml | 361 +- referencedata/sampledata/QA_Testing/FIN_PAYMENT_SCHEDULEDETAIL.xml | 91 + referencedata/sampledata/QA_Testing/M_INOUT.xml | 78 +- referencedata/sampledata/QA_Testing/M_STORAGE_PENDING.xml | 17 + src-core/src/org/openbravo/base/ConfigParameters.java | 5 +- src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/model/functions/C_ORDER_POST1.xml | 24 +- src-db/database/model/functions/M_INOUT_POST.xml | 9 +- src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml | 57 +- src-db/database/model/functions/M_UPDATE_STOCK_VALUATION.xml | 12 +- src-db/database/model/postscript-Oracle.sql | 11 + src-db/database/model/prescript-PostgreSql.sql | 6 + src-db/database/model/tables/C_BPARTNER_LOCATION.xml | 3 + src-db/database/model/tables/C_ORDER.xml | 28 + src-db/database/model/tables/C_ORDERLINE.xml | 4 + src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml | 3 + src-db/database/model/tables/FIN_PAYMENT_SCHEDULEDETAIL.xml | 3 + src-db/database/model/tables/M_INOUT.xml | 5 + src-db/database/model/triggers/C_ACCTSCHEMA_TRG.xml | 5 +- src-db/database/model/triggers/C_BPARTNER_TRG.xml | 20 +- src-db/database/model/triggers/C_ORDER_CHK_RESTRINCTIONS_TRG.xml | 3 + src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml | 11 +- src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml | 2 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 11 + src-db/database/sourcedata/AD_COLUMN.xml | 351 +- src-db/database/sourcedata/AD_ELEMENT.xml | 112 + src-db/database/sourcedata/AD_FIELD.xml | 237 +- src-db/database/sourcedata/AD_MESSAGE.xml | 143 +- src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 64 +- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_REF_LIST.xml | 111 + src-db/database/sourcedata/AD_TAB.xml | 4 +- src-db/database/sourcedata/AD_TABLE.xml | 15 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 22 + src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 37 + src-test/src/org/openbravo/advpaymentmngt/test/FundsTransferTest.java | 256 + src-test/src/org/openbravo/test/AllAntTaskTests.java | 10 +- src-test/src/org/openbravo/test/AllTests.java | 6 +- src-test/src/org/openbravo/test/cancelandreplace/CancelAndReplaceTest.java | 472 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData.java | 288 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData1.java | 55 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData10.java | 55 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData11.java | 55 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData2.java | 55 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData3.java | 55 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData4.java | 55 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData5.java | 55 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData6.java | 55 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData7.java | 55 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData8.java | 55 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData9.java | 55 + src-test/src/org/openbravo/test/datasource/TestAllowUnpagedDatasourcePreference.java | 3 +- src-test/src/org/openbravo/test/model/ClassLoaderTest.java | 114 +- src-test/src/org/openbravo/test/webservice/JSONWebServicesWhereParameter.java | 2 +- src-wad/src/org/openbravo/wad/Wad.java | 17 +- src-wad/src/org/openbravo/wad/Wad_data.xsql | 17 +- src/build.xml | 14 +- src/org/openbravo/base/secureApp/LoginHandler.java | 3 +- src/org/openbravo/base/secureApp/LoginUtils.java | 31 +- src/org/openbravo/common/actionhandler/CancelAndReplaceGetCancelledOrderLine.java | 46 + src/org/openbravo/common/actionhandler/CancelAndReplaceSalesOrder.java | 116 + src/org/openbravo/common/actionhandler/ConfirmCancelAndReplaceSalesOrder.java | 62 + src/org/openbravo/common/actionhandler/ManagePrereservationActionHandler.java | 3 +- src/org/openbravo/common/actionhandler/ManageReservationActionHandler.java | 1 + src/org/openbravo/common/actionhandler/SetNewBPCurrency.java | 11 +- src/org/openbravo/common/datasource/ReturnFromCustomerHQLInserter.java | 4 +- src/org/openbravo/common/datasource/ReturnToFromCustomerVendorHQLTransformer.java | 34 +- src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java | 4 +- src/org/openbravo/costing/CostingBackground.java | 2 +- src/org/openbravo/costing/CostingMigrationProcess.java | 376 +- src/org/openbravo/costing/CostingRuleProcess.java | 6 +- src/org/openbravo/costing/CostingServer.java | 4 +- src/org/openbravo/costing/CostingUtils.java | 10 + src/org/openbravo/dal/core/OBContext.java | 21 + src/org/openbravo/dal/core/SessionHandler.java | 25 +- src/org/openbravo/dal/security/AcctSchemaStructureProvider.java | 80 + src/org/openbravo/dal/security/OrganizationStructureProvider.java | 24 +- src/org/openbravo/erpCommon/ad_actionButton/ProcessGoods.java | 6 +- src/org/openbravo/erpCommon/ad_callouts/CalloutConstants.java | 38 + src/org/openbravo/erpCommon/ad_callouts/CalloutInformationProvider.java | 71 + src/org/openbravo/erpCommon/ad_callouts/DelegateConnectionProvider.java | 145 + src/org/openbravo/erpCommon/ad_callouts/EmailConfiguration_Port.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/HttpServletCalloutInformationProvider.java | 143 + src/org/openbravo/erpCommon/ad_callouts/JavaPackageChecker.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/Multiphase_dates.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SE_CalculateExchangeRate.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SE_DimensionDocBaseType.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SE_DoubtfulDebt_Method.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SE_ElementValue_AccountSign.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SE_GLItem_Transaction.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SE_InOut_Organization.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SE_InOut_Warehouse.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_AccountingDate.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartnerLocation.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_Organization.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_TaxDate.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SE_Locator_Activate.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartnerLocation.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SE_Order_Organization.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SE_Organization_NotTaxDeductable.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SE_PaymentMethod.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SE_PaymentMethod_FinAccount.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SE_Payment_BPartner.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SE_Payment_FinAccount.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SE_Payment_MultiCurrency.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SE_Payment_Transaction.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SE_Sales_Pricelist.java | 1 - src/org/openbravo/erpCommon/ad_callouts/SE_StatementDate_Transaction.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SE_TaxRate_Withholding.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SE_Trxtype_Transaction.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_AdvPayment_Document.java | 20 +- src/org/openbravo/erpCommon/ad_callouts/SL_BP_Category_Default.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_BPartnerLocation.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SL_Commission_ListDetails.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_CostAdjustment_DocType.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_CostingRule_FixBackdated.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_Costing_Currency.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_Depreciate.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SL_InOut_AccountingDate.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_InvAmtUpd_AmtUnitCost.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_InvAmtUpd_DocType.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_InvAmtUpd_ProductRefDate.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Locator.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Product.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SL_Journal_MultiAcctSchema.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SL_LandedCost_DocType.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_LandedCost_InvoiceLine.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_LandedCost_Receipt.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_Movement_Product.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SL_Order_UpdateLinesDate.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_Preference.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SL_ProductCh_Characteristic.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SL_ProductionPlan_WRPhase_Quantity.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SL_Project_Service.java | 5 +- src/org/openbravo/erpCommon/ad_callouts/SL_RefreshSequenceAndLength.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SL_Reservation.java | 20 +- src/org/openbravo/erpCommon/ad_callouts/SL_SequenceProduct_Product_Attribute.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SL_StatusFieldDefaults.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SL_TableTab.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SL_TaxCategory_Org.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SimpleCallout.java | 294 +- src/org/openbravo/erpCommon/ad_callouts/SimpleCalloutInformationProvider.java | 148 + src/org/openbravo/erpCommon/ad_callouts/SysInfoCustomAllowed.java | 4 +- src/org/openbravo/erpCommon/ad_forms/AcctSchema.java | 15 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 56 +- src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql | 30 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 23 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html | 1 + src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java | 56 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalanceExcel.jrxml | 94 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalancePDF.jrxml | 73 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance_data.xsql | 36 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java | 2 +- src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceOrderHook.java | 54 + src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceOrderHookCaller.java | 72 + src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java | 1270 + src/org/openbravo/erpCommon/businessUtility/CancelLayawayPaymentsHook.java | 42 + src/org/openbravo/erpCommon/businessUtility/CancelLayawayPaymentsHookCaller.java | 65 + src/org/openbravo/erpCommon/businessUtility/EndYearCloseUtility.java | 6 +- src/org/openbravo/erpCommon/businessUtility/EndYearCloseUtility_data.xsql | 9 +- src/org/openbravo/erpCommon/businessUtility/Preferences.java | 35 +- src/org/openbravo/erpCommon/businessUtility/PriceAdjustment.java | 24 +- src/org/openbravo/erpCommon/businessUtility/PrinterReports.java | 6 +- src/org/openbravo/erpCommon/info/SalesOrder_data.xsql | 2 + src/org/openbravo/erpCommon/utility/OBLedgerUtils.java | 92 +- src/org/openbravo/erpCommon/utility/UsedByLink.java | 55 +- src/org/openbravo/erpCommon/utility/UsedByLink_data.xsql | 15 - src/org/openbravo/erpCommon/utility/Utility.java | 6 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java | 2 +- src/org/openbravo/event/InvoiceTaxEventHandler.java | 51 + src/org/openbravo/event/OrderEventHandler.java | 42 +- src/org/openbravo/event/OrderLineEventHandler.java | 3 +- src/org/openbravo/event/ProductCharacteristicValueEventHandler.java | 56 +- src/org/openbravo/materialmgmt/InventoryCountProcess.java | 5 +- src/org/openbravo/materialmgmt/VariantChDescUpdateProcessor.java | 83 + src/org/openbravo/service/db/QueryTimeOutUtil.java | 6 +- src/org/openbravo/service/system/DatabaseValidator.java | 15 +- web/js/cancelAndReplace.js | 50 + 354 files changed, 122365 insertions(+), 3105 deletions(-) diffs (truncated from 170311 to 300 lines): diff -r dd22e2c90eae -r bbfa7b5fc9dc .hgsigs --- a/.hgsigs Mon Aug 29 11:18:05 2016 +0000 +++ b/.hgsigs Mon Oct 17 09:20:44 2016 +0200 @@ -197,4 +197,7 @@ 91b0a6cc5947ea0958b3d677a3e76174fa0a045e 0 iEYEABECAAYFAldajXIACgkQCX/oGf+2qkMRiQCgread+PDPwOVh7Qu/IlmeCLDSPVQAn3cepToICm61fiNkrV+PmFen4bwd ac4b84085793438223d82a0024dd84d2268d0768 0 iEYEABECAAYFAld974YACgkQCX/oGf+2qkPrUgCg05BzCWexFGf76njdN2lBgPJn5uMAoIzGxA0dHD54Km07x2m9J1pgFcoW a98ba1097ffda83047f2824177bfd940fd9268b2 0 iEYEABECAAYFAlfAIacACgkQCX/oGf+2qkMeAwCgsAyLUenvqX0uAZTRjaUrUXZfcL0AoJg0tc+GlPLwfSGk9nCtgF8M3v5f +c9da212632eaa8b5ad282ea755200a6761da6fa9 0 iEYEABECAAYFAlftOagACgkQCX/oGf+2qkMyVgCfXQS09IJiOH63CblJE5zX6Qn3TDQAoPZnadaVKBEfROW6Ma1feqUrUgY/ 159bac1903e52d4f6785d5e53405ae988c273975 0 iEYEABECAAYFAlejLbgACgkQCX/oGf+2qkOIMQCcDP51SEWDiDNBGTaEShgrqwhm7xYAoO/e+AXZ3cBSAhUb8CmIpJ0Rls82 +b91eab932a2640f7395e9c1b7d237c08303d0788 0 iEYEABECAAYFAlfGHnMACgkQCX/oGf+2qkNXHQCgysf6qFN75kW873qTx3i0S9a2qjAAoI0R/AZCW4a6RPrNiFfjaWsOE3+v +b79e30a5b3532f45101cedce0f3bb6b0a86b5780 0 iEYEABECAAYFAlfz21YACgkQCX/oGf+2qkMqZgCgodjBPp4aS6GrpBTpumtr8DsFNAYAmwS3mdHHNYX8g8y4yIwjMDzmQG+o diff -r dd22e2c90eae -r bbfa7b5fc9dc .hgtags --- a/.hgtags Mon Aug 29 11:18:05 2016 +0000 +++ b/.hgtags Mon Oct 17 09:20:44 2016 +0200 @@ -208,4 +208,7 @@ cfff3c184b53528cd71acfe21b15800db17b3436 3.0PR16Q2 7667e8781815f8fa0bf2d3104aeb585cb2ce8681 3.0PR16Q2.1 d40ef4d2ac507a87b46d3118841d03a6a54fec1e 3.0PR16Q2.2 +6db3d7641170254dbd658eb774e36b092c68dd04 3.0PR16Q2.3 ec10d529b9bbe8caa83f2ea72b29b94bd3473cae 3.0PR16Q3 +d0dee6596f281e29afcd159544992498896e93ff 3.0PR16Q3.1 +f252db9dde915c15574e3d5fa505bd1154e39c74 3.0PR16Q3.2 diff -r dd22e2c90eae -r bbfa7b5fc9dc WebContent/META-INF/MANIFEST.MF --- a/WebContent/META-INF/MANIFEST.MF Mon Aug 29 11:18:05 2016 +0000 +++ b/WebContent/META-INF/MANIFEST.MF Mon Oct 17 09:20:44 2016 +0200 @@ -1,2 +1,1 @@ -Manifest-Version: 1.0 -Class-Path: \ No newline at end of file +Manifest-Version: 1.0 \ No newline at end of file diff -r dd22e2c90eae -r bbfa7b5fc9dc legal/Licensing.txt --- a/legal/Licensing.txt Mon Aug 29 11:18:05 2016 +0000 +++ b/legal/Licensing.txt Mon Oct 17 09:20:44 2016 +0200 @@ -216,7 +216,7 @@ # jboss-el-api_2.2_spec-1.0.0.Final.jar Under the LGPL license (included as LGPL-2.1.txt in this folder) -# cal10n-api-0.7.4.jar +# cal10n-api-0.7.7.jar # slf4j-ext-1.6.1.jar Under the MIT license (available at http://www.slf4j.org/license.html) diff -r dd22e2c90eae -r bbfa7b5fc9dc modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalanceData.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalanceData.class has changed diff -r dd22e2c90eae -r bbfa7b5fc9dc 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 Aug 29 11:18:05 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Mon Oct 17 09:20:44 2016 +0200 @@ -226,16 +226,19 @@ fin_payment_scheduledetail.fin_payment_detail_id, fin_payment_scheduledetail.isinvoicepaid AS paid, CASE WHEN fin_payment_scheduledetail.fin_payment_detail_id is not null THEN 0 ELSE 1 END AS priority - FROM c_invoiceline, c_orderline, fin_payment_schedule, + FROM c_invoice, c_doctype, c_invoiceline, c_orderline, fin_payment_schedule, fin_payment_scheduledetail LEFT JOIN fin_payment_detail ON fin_payment_scheduledetail.fin_payment_detail_id = fin_payment_detail.fin_payment_detail_id LEFT JOIN fin_payment ON fin_payment_detail.fin_payment_id = fin_payment.fin_payment_id - WHERE c_invoiceline.c_orderline_id = c_orderline.c_orderline_id + WHERE c_invoice.c_doctype_id = c_doctype.c_doctype_id + AND c_invoice.c_invoice_id = c_invoiceline.c_invoice_id + AND c_invoiceline.c_orderline_id = c_orderline.c_orderline_id AND c_orderline.c_order_id = fin_payment_schedule.c_order_id AND fin_payment_schedule.fin_payment_schedule_id = fin_payment_scheduledetail.fin_payment_schedule_order AND fin_payment_scheduledetail.fin_payment_schedule_invoice is null AND fin_payment_scheduledetail.ISCANCELED <> 'Y' - AND c_invoiceline.c_invoice_id = invoice_id - AND sign(c_invoiceline.qtyinvoiced) = sign(c_orderline.qtyordered) + AND c_invoice.c_invoice_id = invoice_id + AND ((c_doctype.isreversal='N' AND sign(c_invoiceline.qtyinvoiced) = sign(c_orderline.qtyordered)) + OR (c_doctype.isreversal='Y' AND sign(-c_invoiceline.qtyinvoiced) = sign(c_orderline.qtyordered))) ORDER BY CASE WHEN fin_payment_scheduledetail.fin_payment_detail_id is not null THEN 0 ELSE 1 END, c_orderline.c_order_id; order_schdet cur_order_schdet%ROWTYPE; @@ -332,7 +335,7 @@ END IF; v_pendingamount := v_pendingamount - v_paymentamount; v_scheduledamount := C_Currency_Round((v_paymentamount * v_multiplierarc), v_currency_id, NULL); - IF (v_scheduledamount < 0) THEN + IF (v_scheduledamount < 0 OR v_MultiplierARC = -1) THEN v_negativeps := -1; ELSE v_negativeps := 1; @@ -388,7 +391,7 @@ IF (v_IsSOTrx = 'Y') THEN SELECT COALESCE(COUNT(*),0) INTO v_Count FROM c_orderline - WHERE qtyinvoiced<>qtyordered + WHERE qtyordered <> (qtyinvoiced*v_MultiplierARC) AND c_order_id = order_schdet.order_id; ELSE SELECT count(*) INTO v_count @@ -399,7 +402,7 @@ AND mpo.c_invoiceline_id IS NOT NULL WHERE ol.c_order_id = order_schdet.order_id GROUP BY ol.c_orderline_id, ol.qtyordered) a - WHERE a.matchedqty != a.qtyordered; + WHERE a.qtyordered != (a.matchedqty*v_MultiplierARC); END IF; END IF; diff -r dd22e2c90eae -r bbfa7b5fc9dc modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINACC_TRANSACTION.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINACC_TRANSACTION.xml Mon Aug 29 11:18:05 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINACC_TRANSACTION.xml Mon Oct 17 09:20:44 2016 +0200 @@ -13,5 +13,12 @@ <default><![CDATA[P]]></default> <onCreateDefault><![CDATA['R']]></onCreateDefault> </column> + <column name="EM_APRM_FINACC_TRANS_ORIGIN" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <foreign-key foreignTable="FIN_FINACC_TRANSACTION" name="EM_APRM_FINACC_TRANS_ORIGIN_FK"> + <reference local="EM_APRM_FINACC_TRANS_ORIGIN" foreign="FIN_FINACC_TRANSACTION_ID"/> + </foreign-key> </table> </database> diff -r dd22e2c90eae -r bbfa7b5fc9dc modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml Mon Aug 29 11:18:05 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml Mon Oct 17 09:20:44 2016 +0200 @@ -33,5 +33,9 @@ <default><![CDATA[N]]></default> <onCreateDefault/> </column> + <column name="EM_APRM_FUNDS_TRANS" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> </table> </database> diff -r dd22e2c90eae -r bbfa7b5fc9dc modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.xml Mon Aug 29 11:18:05 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.xml Mon Oct 17 09:20:44 2016 +0200 @@ -15,7 +15,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2010-2011 Openbravo SLU +* All portions are Copyright (C) 2010-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. *************************************************************************/ @@ -46,6 +46,7 @@ OR((COALESCE(:OLD.AMOUNT, 0) <> COALESCE(:NEW.AMOUNT, 0) AND COALESCE(:OLD.STATUS, '0') <> TO_CHAR('RPAE')) OR (COALESCE(:OLD.STATUS, '0') = TO_CHAR('RPAE') + AND COALESCE(:NEW.STATUS, '0') <> TO_CHAR('RPVOID') AND (COALESCE(:NEW.AMOUNT, 0) - COALESCE(:OLD.AMOUNT, 0)) <> (COALESCE(:NEW.GENERATED_CREDIT, 0) - COALESCE(:OLD.GENERATED_CREDIT, 0)))) )) THEN RAISE_APPLICATION_ERROR(-20000, '@20501@'); diff -r dd22e2c90eae -r bbfa7b5fc9dc modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Mon Aug 29 11:18:05 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Mon Oct 17 09:20:44 2016 +0200 @@ -111,6 +111,52 @@ <!--038E6E9140CB4924B22060672E2847A2--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> <!--038E6E9140CB4924B22060672E2847A2--></AD_COLUMN> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--><AD_COLUMN> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <AD_COLUMN_ID><![CDATA[03EBACA2EF974E3F9E58A6FE8EF8AECB]]></AD_COLUMN_ID> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <NAME><![CDATA[EM_APRM_FinancialAccount]]></NAME> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <DESCRIPTION><![CDATA[Financial Account in sales invoice details]]></DESCRIPTION> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <HELP><![CDATA[Financial Account in sales invoice details]]></HELP> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <COLUMNNAME><![CDATA[EM_APRM_FinancialAccount]]></COLUMNNAME> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <AD_REFERENCE_VALUE_ID><![CDATA[03D336BF39A7455C8FD64CBCCFB4FC1C]]></AD_REFERENCE_VALUE_ID> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISKEY><![CDATA[N]]></ISKEY> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <SEQNO><![CDATA[290]]></SEQNO> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <AD_ELEMENT_ID><![CDATA[D62D89A819A840B3978E4434C9B66C86]]></AD_ELEMENT_ID> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <SQLLOGIC><![CDATA[(select + case p.amount + when 0 then null + else p.fin_financial_account_id + end + from fin_payment_detail pd + join fin_payment p on p.fin_payment_id=pd.fin_payment_id + where pd.fin_payment_detail_id=fin_payment_detail_id)]]></SQLLOGIC> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--></AD_COLUMN> + <!--046498C716474A6EAAEA0CA26E09C69D--><AD_COLUMN> <!--046498C716474A6EAAEA0CA26E09C69D--> <AD_COLUMN_ID><![CDATA[046498C716474A6EAAEA0CA26E09C69D]]></AD_COLUMN_ID> <!--046498C716474A6EAAEA0CA26E09C69D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -1022,7 +1068,7 @@ <!--2295DC7A28FE4F9DA842F453E2FF2F41--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> <!--2295DC7A28FE4F9DA842F453E2FF2F41--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> <!--2295DC7A28FE4F9DA842F453E2FF2F41--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> -<!--2295DC7A28FE4F9DA842F453E2FF2F41--> <ENTITY_ALIAS><![CDATA[COALESCE(invbp.name, ordbp.name)]]></ENTITY_ALIAS> +<!--2295DC7A28FE4F9DA842F453E2FF2F41--> <ENTITY_ALIAS><![CDATA[bp.name]]></ENTITY_ALIAS> <!--2295DC7A28FE4F9DA842F453E2FF2F41--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> <!--2295DC7A28FE4F9DA842F453E2FF2F41--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> <!--2295DC7A28FE4F9DA842F453E2FF2F41--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> @@ -2645,6 +2691,45 @@ <!--46BDDEB8C59C4ADA9C4C9D837A10CD45--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> <!--46BDDEB8C59C4ADA9C4C9D837A10CD45--></AD_COLUMN> +<!--47DC39551EA14F5E861296054B731B26--><AD_COLUMN> +<!--47DC39551EA14F5E861296054B731B26--> <AD_COLUMN_ID><![CDATA[47DC39551EA14F5E861296054B731B26]]></AD_COLUMN_ID> +<!--47DC39551EA14F5E861296054B731B26--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--47DC39551EA14F5E861296054B731B26--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--47DC39551EA14F5E861296054B731B26--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--47DC39551EA14F5E861296054B731B26--> <NAME><![CDATA[EM_APRM_Displayed_Acc_ID]]></NAME> +<!--47DC39551EA14F5E861296054B731B26--> <DESCRIPTION><![CDATA[Displayed Financial Account field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></DESCRIPTION> +<!--47DC39551EA14F5E861296054B731B26--> <HELP><![CDATA[Displayed Financial Account field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></HELP> +<!--47DC39551EA14F5E861296054B731B26--> <COLUMNNAME><![CDATA[EM_APRM_Displayed_Acc_ID]]></COLUMNNAME> +<!--47DC39551EA14F5E861296054B731B26--> <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID> +<!--47DC39551EA14F5E861296054B731B26--> <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID> +<!--47DC39551EA14F5E861296054B731B26--> <AD_REFERENCE_VALUE_ID><![CDATA[03D336BF39A7455C8FD64CBCCFB4FC1C]]></AD_REFERENCE_VALUE_ID> +<!--47DC39551EA14F5E861296054B731B26--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> +<!--47DC39551EA14F5E861296054B731B26--> <ISKEY><![CDATA[N]]></ISKEY> +<!--47DC39551EA14F5E861296054B731B26--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--47DC39551EA14F5E861296054B731B26--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--47DC39551EA14F5E861296054B731B26--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--47DC39551EA14F5E861296054B731B26--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--47DC39551EA14F5E861296054B731B26--> <SEQNO><![CDATA[470]]></SEQNO> +<!--47DC39551EA14F5E861296054B731B26--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--47DC39551EA14F5E861296054B731B26--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--47DC39551EA14F5E861296054B731B26--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--47DC39551EA14F5E861296054B731B26--> <AD_ELEMENT_ID><![CDATA[124C4AAA06BA4D939D862BEE389AB4DA]]></AD_ELEMENT_ID> +<!--47DC39551EA14F5E861296054B731B26--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--47DC39551EA14F5E861296054B731B26--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--47DC39551EA14F5E861296054B731B26--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--47DC39551EA14F5E861296054B731B26--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--47DC39551EA14F5E861296054B731B26--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--47DC39551EA14F5E861296054B731B26--> <POSITION><![CDATA[41]]></POSITION> +<!--47DC39551EA14F5E861296054B731B26--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--47DC39551EA14F5E861296054B731B26--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--47DC39551EA14F5E861296054B731B26--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--47DC39551EA14F5E861296054B731B26--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--47DC39551EA14F5E861296054B731B26--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--47DC39551EA14F5E861296054B731B26--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--47DC39551EA14F5E861296054B731B26--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> +<!--47DC39551EA14F5E861296054B731B26--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> +<!--47DC39551EA14F5E861296054B731B26--></AD_COLUMN> + <!--49BEE6AEC60D4C61922B2B2DB42D7918--><AD_COLUMN> <!--49BEE6AEC60D4C61922B2B2DB42D7918--> <AD_COLUMN_ID><![CDATA[49BEE6AEC60D4C61922B2B2DB42D7918]]></AD_COLUMN_ID> <!--49BEE6AEC60D4C61922B2B2DB42D7918--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -7315,7 +7400,7 @@ <!--986B657361F64EB59F7991710E6CBD71--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--986B657361F64EB59F7991710E6CBD71--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--986B657361F64EB59F7991710E6CBD71--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--986B657361F64EB59F7991710E6CBD71--> <POSITION><![CDATA[41]]></POSITION> +<!--986B657361F64EB59F7991710E6CBD71--> <POSITION><![CDATA[40]]></POSITION> <!--986B657361F64EB59F7991710E6CBD71--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--986B657361F64EB59F7991710E6CBD71--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--986B657361F64EB59F7991710E6CBD71--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> @@ -9824,6 +9909,45 @@ <!--AEF30836571D49FB96C42D7DD85FDDED--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> <!--AEF30836571D49FB96C42D7DD85FDDED--></AD_COLUMN> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--><AD_COLUMN> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <AD_COLUMN_ID><![CDATA[AFFEB1DBCEFF4A63871F1E214E01071C]]></AD_COLUMN_ID> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <NAME><![CDATA[EM_Aprm_Funds_Trans]]></NAME> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <DESCRIPTION><![CDATA[Transfer funds between Financial Accounts]]></DESCRIPTION> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <HELP><![CDATA[Transfer funds between Financial Accounts]]></HELP> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <COLUMNNAME><![CDATA[EM_Aprm_Funds_Trans]]></COLUMNNAME> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <AD_TABLE_ID><![CDATA[B129E53BC0E747879F7BA17F0AECEC32]]></AD_TABLE_ID> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <ISKEY><![CDATA[N]]></ISKEY> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <SEQNO><![CDATA[510]]></SEQNO> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <AD_ELEMENT_ID><![CDATA[614DA3D0232C447CAB525FB9BFCB8709]]></AD_ELEMENT_ID> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--AFFEB1DBCEFF4A63871F1E214E01071C--> <POSITION><![CDATA[43]]></POSITION> ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, SlashDot.org! http://sdm.link/slashdot _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
