details: https://code.openbravo.com/erp/devel/main/rev/3d9434730d35 changeset: 30379:3d9434730d35 user: Nono Carballo <nonofce <at> gmail.com> date: Tue Aug 16 14:44:35 2016 -0400 summary: Fixes issue 33714: Zero amount instead of withdrawal amount in Add Payment
When creating a payment out with Add Payment process in Financial Account window (from Transaction tab or Match Statement | Add Transaction process), actual payment will be loaded with withdrawal amount. If transaction withdrawal amount is different than 0, actual payment will be loaded with withdrawal amount but will not be distributed into order/invoices in the grid. If total amount is lower than withdrawal amount, actual payment will not be updated with total amount and we will be able to leave the difference between withdrawal amount and total amount as credit. If total amount is higher than withdrawal amount, actual payment will be updated with total amount and we will be able to pay more amount than withdrawal amount. If transaction withdrawal amount is 0, actual payment will always be updated with total amount and it will not be possible to generate credit in this payment. We have reverted changes done in ob-aprm-addPayment.js for issues 33465 and 31392, and we will retrieve bslamount as deposit amount - withdrawal amount also in Transaction tab, as it is done in Add Transaction process. With this, opening Add Payment from both Transaction tab and Add Transaction process, will have the same behavior as it used to when opening from Add Transaction process in 16Q1 (before fixing issue 31392). details: https://code.openbravo.com/erp/devel/main/rev/57a062ff4bd0 changeset: 30380:57a062ff4bd0 user: Atul Gaware <atul.gaware <at> openbravo.com> date: Tue Aug 30 23:25:40 2016 +0530 summary: Fixes issue 33819: No error shown when voiding an invoice and period is closed Error message shown in this case "An error occurred when processing the payment: The Period does not exist or it is not opened" details: https://code.openbravo.com/erp/devel/main/rev/39f178351aba changeset: 30381:39f178351aba user: Mark <markmm82 <at> gmail.com> date: Thu Sep 01 18:50:35 2016 +0200 summary: Fixes issue 33844: Can void a receipt if role doesn't have Client window access Allow to void a goods receipt even the role does not have access to Client window. The OB Context is configured as Admin mode to avoid access validations when getClientInformationList() method of ADClient class is invoked. details: https://code.openbravo.com/erp/devel/main/rev/e461b45b3cd4 changeset: 30382:e461b45b3cd4 user: Atul Gaware <atul.gaware <at> openbravo.com> date: Mon Sep 05 00:11:51 2016 +0530 summary: Fixes issue 33891: Accounting default values not transferred from child orgs While creating default accounting configuration for business partner, schema configuration is also checked for child organization if no configurartion exists for org or its parent org. Default accounts will be created retrieving first the accounting schema of current organization, then from parent organizations and then from children organizations. For example, in case we have different accounting schemas for F&B International, F&B España and F&B España Norte, when creating a business partner for each of these organizations the order will be the following: F&B International: F&B International - F&B España - F&B España Norte F&B España: F&B España - F&B International - F&B España Norte F&B España Norte: F&B España Norte - F&B España - F&B International details: https://code.openbravo.com/erp/devel/main/rev/c236f2c98d6d changeset: 30383:c236f2c98d6d user: David Miguelez <david.miguelez <at> openbravo.com> date: Fri Aug 05 11:30:23 2016 +0200 summary: Fixes issue 33651: Removes UNION ALL from view and merges it into one sentece details: https://code.openbravo.com/erp/devel/main/rev/bb5f221bc829 changeset: 30384:bb5f221bc829 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Tue Aug 09 11:30:20 2016 +0200 summary: Related to issue 33651: Remove parenthesis details: https://code.openbravo.com/erp/devel/main/rev/ca7ed1e124ed changeset: 30385:ca7ed1e124ed user: Mark <markmm82 <at> gmail.com> date: Mon Sep 12 15:06:46 2016 -0400 summary: Fixes issue 33957: Fixed trx date of inventory in Costing Background Process Used the setTimestamp method instead of the setDate, by this way the details like the hours, minutes and seconds of the transactions are not lost. details: https://code.openbravo.com/erp/devel/main/rev/d71a86791e4a changeset: 30386:d71a86791e4a user: Atul Gaware <atul.gaware <at> openbravo.com> date: Wed Sep 14 15:36:20 2016 +0530 summary: Fixes issue 33863: Wrong Total Gross Amount in orders and invoices Wrong Total Gross Amount in orders and invoices as the changes made in tax tab records do not recalculate it. For Purchase Order and Sales Order, Tax tab is made read only so only record are created, modified and deleted only through order lines. Manual insertion, updation and deletion is not possible. In case of Sales Invoice and Purchase Invoices, records created by invoice line are marked with recalculate flag = Yes. Read Only logic based on this flag does not allow user to modify fields tax, tax amount and taxable amount of invoice tax records. Event handler restricts user to delete invoice tax records with recalculate flag = Yes. To avoid event handlers interference with ReorderCascadingChildDeletionsHandler.java, on Invoice deletetion, before deleting invoice tax records, flag recalculate is set = No details: https://code.openbravo.com/erp/devel/main/rev/fea703d23f84 changeset: 30387:fea703d23f84 user: David Miguelez <david.miguelez <at> openbravo.com> date: Thu Sep 08 16:36:16 2016 +0200 summary: Fixes Issue 33966. Improves performance for Accounting Background Process. Adds Index in FIN_FINACC_TRANSACTION Table. Modifies query in AcctServer_data to properly limit the results returned. Modifies query in AcctServer_data to remove the order clause. Persist information about Accounting Schemas in Java code so it is no longer necessary to access the Database everytime to retrive that information. details: https://code.openbravo.com/erp/devel/main/rev/c5495a086bf8 changeset: 30388:c5495a086bf8 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Tue Sep 13 18:24:02 2016 +0200 summary: Related to issue 33966: Code review improvements - Move AcctSchemaStructureProvider.java to same folder as OrganizationStructureProvider.java. - Rename acctSchemaSP variable to acctSchemaProvider in OBContext.java. - Remove unused data variable in AcctSchema.java. - Add commentary to explain why we send limit manually to xsql query in AcctServer.java. - Do not send numberRegisters parameter to AcctServerData.select as we are already sending the limit. - Undo changes in AcctServerData.periodOpen method and create new AcctServerData.selectPeriodOpen method to avoid a functional API change. details: https://code.openbravo.com/erp/devel/main/rev/aea815e75a2f changeset: 30389:aea815e75a2f user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Wed Sep 14 18:24:33 2016 +0200 summary: Related to issue 33966: Update copyright details: https://code.openbravo.com/erp/devel/main/rev/f3f2391a1346 changeset: 30390:f3f2391a1346 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Wed Sep 14 13:39:12 2016 +0200 summary: Fixed issue 34010. Removed slow query getting Organization Ledger. The method to get the default General Ledget was using a query that filtered and sorted the results using ad_isorgincluded procedure. In case of having a large number of organizations this query was slow. The method is now using the OrganizationStructureProvider to get the parent organization List of the required org to search the default General Ledger. details: https://code.openbravo.com/erp/devel/main/rev/58c8fdd8d3d0 changeset: 30391:58c8fdd8d3d0 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Mon Sep 19 11:14:46 2016 +0200 summary: Related to issue 34010: Code review improvements - Avoid setting admin mode in getOrgLedgerRecursive() and getClientLedger() methods as it is already done in getOrgLedger() method in OBLedgerUtils class. - Retrieve first, general ledger of login organization in LoginUtils class. If no result is retrieved, we will retrieve general ledger of rest of context organizations. details: https://code.openbravo.com/erp/devel/main/rev/726588248717 changeset: 30392:726588248717 user: Mark <markmm82 <at> gmail.com> date: Mon Sep 19 11:33:17 2016 -0400 summary: Fixes issue 34019: Is possible posting a Purchase Invoice with Finance role Modified the OrganizationStructureProvider.getPeriodControlAllowedOrganization() method to execute in Admin mode. details: https://code.openbravo.com/erp/devel/main/rev/40d51d6f302c changeset: 30393:40d51d6f302c user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Tue Sep 20 11:26:27 2016 +0200 summary: Related to 34019: AdminMode in AcctSchemaStructureProvider.getAcctSchemasFromDB details: https://code.openbravo.com/erp/devel/main/rev/4f62913933cd changeset: 30394:4f62913933cd user: Mark <markmm82 <at> gmail.com> date: Tue Sep 27 11:06:10 2016 -0400 summary: Fixes issue 34104: No discounts are applied to product prices in Purchase flows Price adjustments are not executed if is processing a Purchase Order/Invoice using a product with a promotion or discount, because this functionality should be only available for Sales flows. details: https://code.openbravo.com/erp/devel/main/rev/f252db9dde91 changeset: 30395:f252db9dde91 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Oct 04 16:39:50 2016 +0000 summary: Update AD_MODULE version to 3.0PR16Q3.2 details: https://code.openbravo.com/erp/devel/main/rev/b79e30a5b353 changeset: 30396:b79e30a5b353 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Oct 04 16:39:50 2016 +0000 summary: Added tag 3.0PR16Q3.2 for changeset f252db9dde91 details: https://code.openbravo.com/erp/devel/main/rev/1660773d9995 changeset: 30397:1660773d9995 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Oct 04 16:39:50 2016 +0000 summary: Added signature for changeset b79e30a5b353 details: https://code.openbravo.com/erp/devel/main/rev/f984a17d35bf changeset: 30398:f984a17d35bf user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Oct 11 17:19:39 2016 +0000 summary: Merge temporary head for 3.0PR16Q3.2 diffstat: .hgsigs | 6 + .hgtags | 6 + build.xml | 6 +- modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration.class | 0 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 | 38 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml | 12 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml | 2 +- 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-test/org/openbravo/advpaymentmngt/test/draft/AllTests.java | 65 - modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/FinancialAccountTest.java | 103 - modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentMethodTest.java | 105 - modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_01.java | 236 - modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_02.java | 238 - modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_03.java | 236 - modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_04.java | 215 - modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_05.java | 205 - modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_06.java | 247 - modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_07.java | 338 - modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_08.java | 317 - modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_09.java | 349 - modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_10.java | 348 - modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_11.java | 306 - modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java | 567 - modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/Value.java | 38 - modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration.java | 7 +- 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/AddMultiplePaymentsHandler.java | 3 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FindTransactionsToMatchActionHandler.java | 16 +- 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/actionHandler/ModifyPaymentPlanActionHandler.java | 11 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java | 19 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java | 3 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FINPaymentEventHandler.java | 118 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_ReconciliationEventListener.java | 77 + 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/APRM_MatchingUtility.java | 99 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 6 +- 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-addTransaction.js | 2 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-findTransaction.js | 19 +- 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 | 4 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/ConnectionInitializerInterceptor.java | 4 +- 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/sourcedata/AD_COLUMN.xml | 8 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml | 4 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 8 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 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_REF_LIST.xml | 12 + modules/org.openbravo.client.application/src/org/openbravo/client/application/ADAlertDatasourceService.java | 9 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java | 7 + modules/org.openbravo.client.application/src/org/openbravo/client/application/ComputeTranslatedNameActionHandler.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ComputeWindowActionHandler.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java | 5 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/PropertiesComponent.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachImplementationManager.java | 5 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachmentAH.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachmentConfigEventHandler.java | 7 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachmentUtils.java | 11 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/CoreAttachImplementation.java | 7 +- 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/FieldHandler.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ReorderCascadingChildDeletionsHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TreeTablesEventHandler.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/UpdateInvariantCharacteristicsHandler.java | 9 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/example/JSExecuteCalloutExample.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java | 16 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java | 6 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 450 +- 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/OBViewFieldHandler.java | 9 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewParameterHandler.java | 5 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewUtil.java | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js | 3 - modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js | 40 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-onchange-registry.js | 78 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-notes.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 30 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 126 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 129 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-event-handler-registry.js | 71 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 63 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js | 52 +- 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-grid.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-function-registry.js | 113 + modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js | 3 +- 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/KernelUtils.java | 2 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/CharacteristicsUIDefinition.java | 7 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java | 5 +- 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 | 125 +- 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/MyOBUtils.java | 3 +- modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java | 2 +- modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java | 5 +- 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/CheckOptionalFilterCallout.java | 3 +- modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListUtils.java | 3 +- 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/PaymentReport.java | 5 +- 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/ADTreeDatasourceService.java | 3 + modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/AccountTreeDatasourceService.java | 2 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/BaseDataSourceService.java | 5 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ComboTableDatasourceService.java | 11 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServiceProvider.java | 14 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java | 17 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceUtils.java | 50 + modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DefaultDataSourceService.java | 2 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/NoteDataSource.java | 3 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java | 39 +- 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 | 5 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 108 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonConstants.java | 4 + modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java | 8 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java | 15 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java | 6 +- 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/src/org/openbravo/userinterface/smartclient/templates/smartclient_types_js.ftl | 3 +- 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.utility.cleanup.log/src/org/openbravo/utility/cleanup/log/CleanEntity.java | 7 +- modules/org.openbravo.utility.cleanup.log/src/org/openbravo/utility/cleanup/log/LogCleanUpProcess.java | 3 +- 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 | 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/database/ConnectionProviderImpl.java | 2 +- src-core/src/org/openbravo/database/SessionInfo.java | 4 +- 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 | 7 +- src-db/database/model/postscript-Oracle.sql | 11 + src-db/database/model/prescript-PostgreSql.sql | 7 +- 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/C_POC_DOCTYPE_TEMPLATE.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_INVENTORY.xml | 2 +- src-db/database/model/triggers/C_ACCTSCHEMA_TRG.xml | 5 +- src-db/database/model/triggers/C_ACTIVITY_TRG.xml | 3 +- src-db/database/model/triggers/C_BANKSTATEMENTLINE_TRG.xml | 3 +- src-db/database/model/triggers/C_BPARTNER_TRG.xml | 20 +- src-db/database/model/triggers/C_CASHLINE_TRG.xml | 5 +- src-db/database/model/triggers/C_ELEMENTVALUE_TRG.xml | 3 +- src-db/database/model/triggers/C_INVOICELINETAX_TRG.xml | 4 +- src-db/database/model/triggers/C_INVOICELINE_BEFORE_TRG.xml | 3 +- src-db/database/model/triggers/C_INVOICELINE_TRG.xml | 13 - src-db/database/model/triggers/C_INVOICE_REVERSE_TRG.xml | 3 +- src-db/database/model/triggers/C_ORDERLINE_TRG.xml | 1 - src-db/database/model/triggers/C_ORDERTAX_TRG.xml | 2 - src-db/database/model/triggers/C_ORDER_CHK_RESTRINCTIONS_TRG.xml | 8 +- src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml | 11 +- src-db/database/model/triggers/C_PERIOD_TRG2.xml | 3 +- src-db/database/model/triggers/C_POC_DOCTYPE_TEMPLATE_TRG.xml | 44 + src-db/database/model/triggers/C_REMITTANCELINE_TRG.xml | 4 +- src-db/database/model/triggers/C_TAX_REPORT_TRG.xml | 3 +- src-db/database/model/triggers/GL_JL_CHK_RESTRICTIONS_TRG.xml | 3 +- src-db/database/model/triggers/M_ATTRIBUTEVALUE_TRG.xml | 3 +- src-db/database/model/triggers/M_CH_VALUE_TRG.xml | 3 +- src-db/database/model/triggers/M_CH_VALUE_TRG2.xml | 4 +- src-db/database/model/triggers/M_COSTING_TRG.xml | 1 - src-db/database/model/triggers/M_PRODUCT_TRG.xml | 3 - src-db/database/model/triggers/M_RESERVATION_TRG.xml | 1 - src-db/database/model/triggers/M_TRANSACTION_TRG.xml | 1 - src-db/database/model/triggers/M_TRANSACTION_TRG2.xml | 4 +- src-db/database/model/triggers/S_TIMEEXPENSE_TRG.xml | 4 +- src-db/database/model/views/C_INVOICETAX_CASHVAT_V.xml | 2 +- src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml | 2 +- src-db/database/sourcedata/AD_COLUMN.xml | 349 +- src-db/database/sourcedata/AD_ELEMENT.xml | 98 + src-db/database/sourcedata/AD_FIELD.xml | 239 +- src-db/database/sourcedata/AD_MESSAGE.xml | 131 +- src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 12 - src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 10 - src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_REF_LIST.xml | 100 + src-db/database/sourcedata/AD_REF_TREE.xml | 2 +- src-db/database/sourcedata/AD_TAB.xml | 4 +- src-db/database/sourcedata/AD_TABLE.xml | 16 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 55 +- src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 37 + src-test/src/org/openbravo/advpaymentmngt/test/FinancialAccountTest.java | 103 + src-test/src/org/openbravo/advpaymentmngt/test/FundsTransferTest.java | 256 + src-test/src/org/openbravo/advpaymentmngt/test/PaymentMethodTest.java | 105 + src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_01.java | 236 + src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_02.java | 240 + src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_03.java | 236 + src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_04.java | 215 + src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_05.java | 205 + src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_06.java | 247 + src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_07.java | 338 + src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_08.java | 318 + src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_09.java | 349 + src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_10.java | 348 + src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_11.java | 307 + src-test/src/org/openbravo/advpaymentmngt/test/TestUtility.java | 567 + src-test/src/org/openbravo/advpaymentmngt/test/Value.java | 38 + 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/dal/ComputedColumnsTest.java | 7 +- src-test/src/org/openbravo/test/dal/DalPerformanceExampleTest.java | 2 +- src-test/src/org/openbravo/test/datasource/TestAllowUnpagedDatasourcePreference.java | 10 +- src-test/src/org/openbravo/test/modularity/DatasetServiceTest.java | 30 +- src-test/src/org/openbravo/test/role/inheritance/AccessPropagation.java | 5 +- src-test/src/org/openbravo/test/role/inheritance/AccessPropagationNotInherited.java | 5 +- src-test/src/org/openbravo/test/role/inheritance/DeletedAccessPropagation.java | 9 +- src-test/src/org/openbravo/test/role/inheritance/HorizontalInheritance.java | 9 +- src-test/src/org/openbravo/test/role/inheritance/RecalculatePermissions.java | 11 +- src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceRestrictions.java | 41 +- src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceTestUtils.java | 25 +- src-test/src/org/openbravo/test/role/inheritance/VerticalInheritance.java | 7 +- src-test/src/org/openbravo/test/system/SystemServiceTest.java | 4 +- src-test/src/org/openbravo/test/webservice/JSONWebServicesWhereParameter.java | 2 +- src-wad/src/org/openbravo/wad/javasource.javaxml | 9 +- src/org/openbravo/base/secureApp/LoginUtils.java | 29 +- src/org/openbravo/base/secureApp/OrgTree.java | 22 +- 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/AverageCostAdjustment.java | 3 +- src/org/openbravo/costing/CostingAlgorithm.java | 6 +- src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java | 3 +- src/org/openbravo/costing/CostingMigrationProcess.java | 383 +- src/org/openbravo/costing/CostingRuleProcess.java | 14 +- src/org/openbravo/costing/CostingUtils.java | 17 +- src/org/openbravo/costing/InventoryAmountUpdateProcess.java | 5 +- src/org/openbravo/costing/ManualCostAdjustmentProcessHandler.java | 3 +- src/org/openbravo/dal/core/DalSessionFactory.java | 119 +- src/org/openbravo/dal/core/DalUtil.java | 10 +- src/org/openbravo/dal/core/OBContext.java | 25 +- src/org/openbravo/dal/core/OBDynamicPropertyHandler.java | 40 +- src/org/openbravo/dal/core/OBInterceptor.java | 2 +- src/org/openbravo/dal/core/SessionHandler.java | 70 +- src/org/openbravo/dal/security/AcctSchemaStructureProvider.java | 80 + src/org/openbravo/dal/security/EntityAccessChecker.java | 13 +- src/org/openbravo/dal/security/OrganizationStructureProvider.java | 29 +- src/org/openbravo/dal/security/SecurityChecker.java | 13 +- src/org/openbravo/dal/service/OBCriteria.java | 8 +- src/org/openbravo/dal/xml/EntityExcelXMLConverter.java | 2 +- src/org/openbravo/dal/xml/EntityXMLConverter.java | 14 +- src/org/openbravo/dal/xml/PrimitiveReferenceHandler.java | 3 +- src/org/openbravo/erpCommon/ad_actionButton/ActionButtonUtility.java | 3 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice.html | 3 + src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql | 54 +- src/org/openbravo/erpCommon/ad_actionButton/MRPManufacturingPlanProcess.java | 27 +- 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 | 5 +- 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 | 9 +- 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 | 23 +- 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 | 63 +- src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql | 69 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 23 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 21 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice_data.xsql | 11 + src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java | 5 - src/org/openbravo/erpCommon/ad_forms/GenerateShipmentsmanual_data.xsql | 61 +- src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.java | 2 + src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPendingLines_data.xsql | 12 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 5 +- src/org/openbravo/erpCommon/ad_help/HelpWindow.java | 33 +- src/org/openbravo/erpCommon/ad_process/MRPPurchaseCreateReservations.java | 7 +- src/org/openbravo/erpCommon/ad_process/Register.java | 128 - src/org/openbravo/erpCommon/ad_process/assets/AssetLinearDepreciationMethodProcess.java | 5 +- src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.html | 18 +- src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.java | 89 +- src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.xml | 1 + src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.jrxml | 102 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_legacy_data.xsql | 16 +- src/org/openbravo/erpCommon/ad_reports/ReportStandardCostsJR_subreport0.jrxml | 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/businessUtility/AccountTree_data.xsql | 6 +- src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceOrderHook.java | 54 + src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceOrderHookCaller.java | 72 + src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java | 1269 + 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/InitialSetupUtility.java | 16 +- src/org/openbravo/erpCommon/businessUtility/Preferences.java | 81 +- src/org/openbravo/erpCommon/businessUtility/PriceAdjustment.java | 24 +- src/org/openbravo/erpCommon/info/AttributeSetInstance.java | 28 +- src/org/openbravo/erpCommon/info/Locator.java | 16 +- src/org/openbravo/erpCommon/info/SalesOrder_data.xsql | 2 + src/org/openbravo/erpCommon/obps/ActivationKey.java | 3 +- src/org/openbravo/erpCommon/utility/ComboTableData.java | 10 +- src/org/openbravo/erpCommon/utility/ModulesInOB3Distribution.java | 65 + src/org/openbravo/erpCommon/utility/OBLedgerUtils.java | 92 +- src/org/openbravo/erpCommon/utility/OBMessageUtils.java | 20 +- src/org/openbravo/erpCommon/utility/ReferencedLink.java | 7 +- src/org/openbravo/erpCommon/utility/UsedByLink.java | 14 +- src/org/openbravo/erpCommon/utility/UsedByLink_data.xsql | 15 - src/org/openbravo/erpCommon/utility/reporting/Template_data.xsql | 5 +- src/org/openbravo/erpReports/RptC_Bpartner.java | 3 +- src/org/openbravo/event/InvoiceTaxEventHandler.java | 51 + src/org/openbravo/event/OrderLineEventHandler.java | 3 +- src/org/openbravo/event/ProductCharacteristicValueEventHandler.java | 56 +- src/org/openbravo/financial/FinancialUtils.java | 4 +- src/org/openbravo/materialmgmt/InventoryCountProcess.java | 10 +- src/org/openbravo/materialmgmt/ManageVariantsDS.java | 3 +- src/org/openbravo/materialmgmt/ProductCharacteristicsDS.java | 3 +- src/org/openbravo/materialmgmt/ReservationUtils.java | 14 +- src/org/openbravo/materialmgmt/VariantChDescUpdateProcessor.java | 83 + src/org/openbravo/role/inheritance/InheritedAccessEnabledEventHandler.java | 3 +- src/org/openbravo/role/inheritance/RoleInheritanceEventHandler.java | 15 +- src/org/openbravo/role/inheritance/RoleInheritanceManager.java | 26 +- src/org/openbravo/role/inheritance/RoleInheritanceWarningFICExtension.java | 5 +- src/org/openbravo/role/inheritance/access/AccessTypeInjector.java | 13 +- src/org/openbravo/role/inheritance/access/FieldAccessInjector.java | 7 +- src/org/openbravo/role/inheritance/access/PreferenceAccessInjector.java | 33 +- src/org/openbravo/role/inheritance/access/TabAccessInjector.java | 9 +- src/org/openbravo/role/inheritance/access/WindowAccessInjector.java | 3 +- src/org/openbravo/service/db/CallProcess.java | 8 +- src/org/openbravo/service/db/DalConnectionProvider.java | 12 +- src/org/openbravo/service/db/DataImportService.java | 3 +- src/org/openbravo/service/db/QueryTimeOutUtil.java | 6 +- src/org/openbravo/service/importprocess/ImportEntryManager.java | 4 +- src/org/openbravo/service/importprocess/ImportEntryProcessor.java | 9 +- src/org/openbravo/service/system/DatabaseValidator.java | 15 +- src/org/openbravo/service/system/SystemService.java | 3 +- src/org/openbravo/service/web/UserContextCache.java | 3 +- web/js/cancelAndReplace.js | 50 + web/js/productCharacteristicsProcess.js | 16 +- 524 files changed, 127628 insertions(+), 7982 deletions(-) diffs (truncated from 184216 to 300 lines): diff -r d0dee6596f28 -r f984a17d35bf .hgsigs --- a/.hgsigs Wed Aug 31 00:01:54 2016 +0000 +++ b/.hgsigs Tue Oct 11 17:19:39 2016 +0000 @@ -195,3 +195,9 @@ 98bdf9167a3d4ea9cb9b6f5e214a539220a3f3cb 0 iEYEABECAAYFAldD+MEACgkQCX/oGf+2qkPLHwCgngPaeyLsiGk2FhShX4/IzVARWN8AnRSCXIoWp6ruOcbEfIUFQiM9lY7f 008d208ba1f60804fd852570f0cd7e985a4220da 0 iEYEABECAAYFAldQUXwACgkQCX/oGf+2qkOtLQCdEZMKf7VfsSt6iVUl59GzwNdr7C4AoK4B3pbbW23fqYd1qplclO3aGm1B 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 d0dee6596f28 -r f984a17d35bf .hgtags --- a/.hgtags Wed Aug 31 00:01:54 2016 +0000 +++ b/.hgtags Tue Oct 11 17:19:39 2016 +0000 @@ -206,3 +206,9 @@ ec73935a2c83b6164a18cb70996226cb15672038 3.0PR16Q1.2 208b773131650c3806cefa65b4d5df9bf1992821 3.0PR16Q1.3 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 d0dee6596f28 -r f984a17d35bf build.xml --- a/build.xml Wed Aug 31 00:01:54 2016 +0000 +++ b/build.xml Tue Oct 11 17:19:39 2016 +0000 @@ -103,7 +103,8 @@ <property name="checkTranslationConsistency" value="true"/> <property name="buildValidation" value="true"/> <property name="disableCheckReferencedOrganizations" value="false"/> - + <property name="modules" value=""/> + <available file=".hg" property="is.hg" /> <condition property="calculate.core.rev"> @@ -633,9 +634,10 @@ stableDBdir="${stableDBdir}" testDBdir="${basedir}" verbosity="${bbdd.verbosity}" + modules="${modules}" /> </target> - + <target name="export.sample.data.old" depends="code.rev"> <ant dir="${base.src}" target="export.sample.data.old" inheritAll="true" inheritRefs="true" /> </target> diff -r d0dee6596f28 -r f984a17d35bf modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration.class has changed diff -r d0dee6596f28 -r f984a17d35bf 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 d0dee6596f28 -r f984a17d35bf 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 Wed Aug 31 00:01:54 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Tue Oct 11 17:19:39 2016 +0000 @@ -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 d0dee6596f28 -r f984a17d35bf 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 Wed Aug 31 00:01:54 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINACC_TRANSACTION.xml Tue Oct 11 17:19:39 2016 +0000 @@ -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 d0dee6596f28 -r f984a17d35bf 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 Wed Aug 31 00:01:54 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml Tue Oct 11 17:19:39 2016 +0000 @@ -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 d0dee6596f28 -r f984a17d35bf 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 Wed Aug 31 00:01:54 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.xml Tue Oct 11 17:19:39 2016 +0000 @@ -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 d0dee6596f28 -r f984a17d35bf modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Wed Aug 31 00:01:54 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Tue Oct 11 17:19:39 2016 +0000 @@ -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> ------------------------------------------------------------------------------ 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
