details: https://code.openbravo.com/erp/devel/main/rev/0d7824425cde changeset: 29955:0d7824425cde user: Mark <markmm82 <at> gmail.com> date: Thu Aug 04 09:52:25 2016 -0400 summary: Fixes issue 33560: Error voiding an invoice if bp doesn't have default account
Method used to get the default financial account (getFinancialAccountPaymentMethod) was not taking into account the natural tree of the organization of document being processed, always was ordering by "default" account and when the query returns more than one results, if the first record's account does not belong to the natural tree of the entity's organization (in this case invoice's organization) validation was failing and an error message was shown. To avoid it, was overwritten the getFinancialAccountPaymentMethod method of the FIN_Utility class to also filtering by financial accounts belonging to the natural tree of the entity's organization. Was necessary to adapt other classes using this method to work correctly. details: https://code.openbravo.com/erp/devel/main/rev/a77938d67f97 changeset: 29956:a77938d67f97 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Thu Aug 04 16:07:56 2016 +0200 summary: Related to issue 33560: Code review improvements Remove unused OrganizationStructureProvider. Remove duplicated method. Remove orgId1 parameter as it can be calculated inside the query. details: https://code.openbravo.com/erp/devel/main/rev/6a7b09398e47 changeset: 29957:6a7b09398e47 user: Rafael Queralta Pozo <rqueralta <at> nauta.cu> date: Tue Aug 16 12:42:05 2016 +0200 summary: Fixes issue 33716: Error when posting a financial account transaction Avoid laizy initialization error by reloading transaction object from database after clearing the session. Session clearing will not be done in first iteration but starting from iteration number 100. This doesn't solve clear session problem but will raise it only when we iterate at least 100 times. details: https://code.openbravo.com/erp/devel/main/rev/5af04a4df445 changeset: 29958:5af04a4df445 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Thu Aug 25 15:14:16 2016 +0200 summary: Fixed issue 33809. Avoid double query with .count() + .list(). Add limit 1 to query Query did .count() + then retrieve 1 record after adding extra order by. This change removes the count as it only adds extra overhead and directly does the real .list() query. As the code only uses single row of result add extra limit 1 to reduce number of result rows loaded into memory if many match the filter. Simply code to use .uniqueResult() instead of .list().get(0) details: https://code.openbravo.com/erp/devel/main/rev/2e42526dc0b5 changeset: 29959:2e42526dc0b5 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Thu Aug 25 15:16:24 2016 +0200 summary: Fixed 33811. Avoid double query with .count() + .list(). Add limit 1 to query Query did .count() + then retrieve 1 record after adding extra order by. This change removes the count as it only adds extra overhead and directly does the real .list() query. As the code only uses single row of result add extra limit 1 to reduce number of result rows loaded into memory if many match the filter. Simply code to use .uniqueResult() instead of .list().get(0) details: https://code.openbravo.com/erp/devel/main/rev/35b4c1c83bab changeset: 29960:35b4c1c83bab user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Aug 25 16:15:48 2016 +0200 summary: fixes issue 33815: backed out initialization prevention changes details: https://code.openbravo.com/erp/devel/main/rev/d0dee6596f28 changeset: 29961:d0dee6596f28 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Aug 31 00:01:54 2016 +0000 summary: Update AD_MODULE version to 3.0PR16Q3.1 details: https://code.openbravo.com/erp/devel/main/rev/b91eab932a26 changeset: 29962:b91eab932a26 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Aug 31 00:01:54 2016 +0000 summary: Added tag 3.0PR16Q3.1 for changeset d0dee6596f28 details: https://code.openbravo.com/erp/devel/main/rev/d6784a791e00 changeset: 29963:d6784a791e00 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Aug 31 00:01:55 2016 +0000 summary: Added signature for changeset b91eab932a26 details: https://code.openbravo.com/erp/devel/main/rev/e82cc7cf80f2 changeset: 29964:e82cc7cf80f2 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Sep 01 05:05:51 2016 +0000 summary: Merge temporary head for 3.0PR16Q3.1 diffstat: .hgsigs | 4 + .hgtags | 4 + build.xml | 6 +- modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration.class | 0 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 14 +- 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_TAB.xml | 2 +- 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/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/ModifyPaymentPlanActionHandler.java | 11 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java | 18 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java | 3 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentDefaultValuesHandler.java | 37 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/TransactionAddPaymentDefaultValues.java | 10 +- 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 | 42 +- 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.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_MODULE.xml | 4 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- 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 | 4 + 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/event/FieldHandler.java | 2 +- 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/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 | 4 +- 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 | 21 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 110 +- 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 | 125 +- 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 | 51 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js | 26 +- 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/UIDefinition.java | 7 + 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/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 +- 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/prescript-PostgreSql.sql | 1 - src-db/database/model/tables/C_POC_DOCTYPE_TEMPLATE.xml | 4 + src-db/database/model/tables/M_INVENTORY.xml | 2 +- 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_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 | 5 - 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/sourcedata/AD_COLUMN.xml | 41 +- src-db/database/sourcedata/AD_FIELD.xml | 31 +- 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_TREE.xml | 2 +- src-db/database/sourcedata/AD_TABLE.xml | 2 + src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 33 +- src-test/src/org/openbravo/advpaymentmngt/test/FinancialAccountTest.java | 103 + 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/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/OrgTree.java | 22 +- 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 | 15 +- src/org/openbravo/costing/CostingRuleProcess.java | 8 +- src/org/openbravo/costing/CostingUtils.java | 7 +- 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 | 4 +- src/org/openbravo/dal/core/OBDynamicPropertyHandler.java | 40 +- src/org/openbravo/dal/core/OBInterceptor.java | 2 +- src/org/openbravo/dal/core/SessionHandler.java | 53 +- src/org/openbravo/dal/security/EntityAccessChecker.java | 13 +- src/org/openbravo/dal/security/OrganizationStructureProvider.java | 5 +- src/org/openbravo/dal/security/SecurityChecker.java | 13 +- src/org/openbravo/dal/service/OBCriteria.java | 13 +- 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_callouts/SE_Invoice_BPartner.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SE_Payment_FinAccount.java | 5 +- src/org/openbravo/erpCommon/ad_callouts/SL_Reservation.java | 3 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 7 +- src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql | 39 +- src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 5 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 4 +- 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/businessUtility/AccountTree_data.xsql | 6 +- src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java | 16 +- src/org/openbravo/erpCommon/businessUtility/Preferences.java | 48 +- src/org/openbravo/erpCommon/info/AttributeSetInstance.java | 28 +- src/org/openbravo/erpCommon/info/Locator.java | 16 +- src/org/openbravo/erpCommon/info/PriceListVersionFilterExpression.java | 27 +- src/org/openbravo/erpCommon/info/PriceListVersionFilterExpressionName.java | 10 +- 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/OBMessageUtils.java | 20 +- src/org/openbravo/erpCommon/utility/ReferencedLink.java | 7 +- src/org/openbravo/erpCommon/utility/reporting/Template_data.xsql | 5 +- src/org/openbravo/erpReports/RptC_Bpartner.java | 3 +- src/org/openbravo/financial/FinancialUtils.java | 4 +- src/org/openbravo/materialmgmt/InventoryCountProcess.java | 5 +- src/org/openbravo/materialmgmt/ManageVariantsDS.java | 3 +- src/org/openbravo/materialmgmt/ProductCharacteristicsDS.java | 3 +- src/org/openbravo/materialmgmt/ReservationUtils.java | 14 +- 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/importprocess/ImportEntryManager.java | 4 +- src/org/openbravo/service/importprocess/ImportEntryProcessor.java | 9 +- src/org/openbravo/service/system/SystemService.java | 3 +- src/org/openbravo/service/web/UserContextCache.java | 3 +- web/js/productCharacteristicsProcess.js | 16 +- 306 files changed, 6084 insertions(+), 5324 deletions(-) diffs (truncated from 17801 to 300 lines): diff -r ec10d529b9bb -r e82cc7cf80f2 .hgsigs --- a/.hgsigs Thu Aug 04 11:57:44 2016 +0000 +++ b/.hgsigs Thu Sep 01 05:05:51 2016 +0000 @@ -195,3 +195,7 @@ 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 +159bac1903e52d4f6785d5e53405ae988c273975 0 iEYEABECAAYFAlejLbgACgkQCX/oGf+2qkOIMQCcDP51SEWDiDNBGTaEShgrqwhm7xYAoO/e+AXZ3cBSAhUb8CmIpJ0Rls82 +b91eab932a2640f7395e9c1b7d237c08303d0788 0 iEYEABECAAYFAlfGHnMACgkQCX/oGf+2qkNXHQCgysf6qFN75kW873qTx3i0S9a2qjAAoI0R/AZCW4a6RPrNiFfjaWsOE3+v diff -r ec10d529b9bb -r e82cc7cf80f2 .hgtags --- a/.hgtags Thu Aug 04 11:57:44 2016 +0000 +++ b/.hgtags Thu Sep 01 05:05:51 2016 +0000 @@ -206,3 +206,7 @@ ec73935a2c83b6164a18cb70996226cb15672038 3.0PR16Q1.2 208b773131650c3806cefa65b4d5df9bf1992821 3.0PR16Q1.3 cfff3c184b53528cd71acfe21b15800db17b3436 3.0PR16Q2 +7667e8781815f8fa0bf2d3104aeb585cb2ce8681 3.0PR16Q2.1 +d40ef4d2ac507a87b46d3118841d03a6a54fec1e 3.0PR16Q2.2 +ec10d529b9bbe8caa83f2ea72b29b94bd3473cae 3.0PR16Q3 +d0dee6596f281e29afcd159544992498896e93ff 3.0PR16Q3.1 diff -r ec10d529b9bb -r e82cc7cf80f2 build.xml --- a/build.xml Thu Aug 04 11:57:44 2016 +0000 +++ b/build.xml Thu Sep 01 05:05:51 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 ec10d529b9bb -r e82cc7cf80f2 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 ec10d529b9bb -r e82cc7cf80f2 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Thu Aug 04 11:57:44 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Thu Sep 01 05:05:51 2016 +0000 @@ -96,6 +96,18 @@ <!--12A17D39C7664BDE8B1A0F079D44591E--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--12A17D39C7664BDE8B1A0F079D44591E--></AD_MESSAGE> +<!--12FBA6D054F04E6BA11C7CB00A0B70BA--><AD_MESSAGE> +<!--12FBA6D054F04E6BA11C7CB00A0B70BA--> <AD_MESSAGE_ID><![CDATA[12FBA6D054F04E6BA11C7CB00A0B70BA]]></AD_MESSAGE_ID> +<!--12FBA6D054F04E6BA11C7CB00A0B70BA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--12FBA6D054F04E6BA11C7CB00A0B70BA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--12FBA6D054F04E6BA11C7CB00A0B70BA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--12FBA6D054F04E6BA11C7CB00A0B70BA--> <VALUE><![CDATA[APRM_remline_finpayschdet]]></VALUE> +<!--12FBA6D054F04E6BA11C7CB00A0B70BA--> <MSGTEXT><![CDATA[The invoice is already included in a Remittance.]]></MSGTEXT> +<!--12FBA6D054F04E6BA11C7CB00A0B70BA--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--12FBA6D054F04E6BA11C7CB00A0B70BA--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--12FBA6D054F04E6BA11C7CB00A0B70BA--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--12FBA6D054F04E6BA11C7CB00A0B70BA--></AD_MESSAGE> + <!--1405C086998B431D80615A4FB8EC783B--><AD_MESSAGE> <!--1405C086998B431D80615A4FB8EC783B--> <AD_MESSAGE_ID><![CDATA[1405C086998B431D80615A4FB8EC783B]]></AD_MESSAGE_ID> <!--1405C086998B431D80615A4FB8EC783B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -1483,7 +1495,7 @@ <!--EF56DCF572A94E6CAFE4F13948268050--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--EF56DCF572A94E6CAFE4F13948268050--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--EF56DCF572A94E6CAFE4F13948268050--> <VALUE><![CDATA[APRM_SplitBankStatementLineConfirm]]></VALUE> -<!--EF56DCF572A94E6CAFE4F13948268050--> <MSGTEXT><![CDATA[Bank statement line and transaction amount does not match. Do you want to perform a partial match?]]></MSGTEXT> +<!--EF56DCF572A94E6CAFE4F13948268050--> <MSGTEXT><![CDATA[Bank statement line amount [%0] and transaction amount [%1] does not match. Do you want to perform a partial match?]]></MSGTEXT> <!--EF56DCF572A94E6CAFE4F13948268050--> <MSGTYPE><![CDATA[I]]></MSGTYPE> <!--EF56DCF572A94E6CAFE4F13948268050--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--EF56DCF572A94E6CAFE4F13948268050--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> diff -r ec10d529b9bb -r e82cc7cf80f2 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Aug 04 11:57:44 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 01 05:05:51 2016 +0000 @@ -6,7 +6,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.29727]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.29953]]></VERSION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements. If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP> @@ -25,7 +25,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <UPDATEINFO><![CDATA[Fixed issue with document sequence numbers reset in case of applying dataset second time. Fixed issue 15305.]]></UPDATEINFO> <!--A918E3331C404B889D69AA9BFAFB23AC--> <REFERENCEDATAINFO><![CDATA[Document types and default algorithm for bank statement auto matching]]></REFERENCEDATAINFO> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION_LABEL><![CDATA[PR16Q3]]></VERSION_LABEL> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED> <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE> diff -r ec10d529b9bb -r e82cc7cf80f2 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Aug 04 11:57:44 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Sep 01 05:05:51 2016 +0000 @@ -7,7 +7,7 @@ <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID> -<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.29727]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.29953]]></STARTVERSION> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--B97FC854C6DD41E692161585645A900F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--B97FC854C6DD41E692161585645A900F--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.29727]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.29953]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r ec10d529b9bb -r e82cc7cf80f2 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Thu Aug 04 11:57:44 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Thu Sep 01 05:05:51 2016 +0000 @@ -609,7 +609,7 @@ <!--B6049E97C1254A1092C883EA59172013--> <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD> <!--B6049E97C1254A1092C883EA59172013--> <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE> <!--B6049E97C1254A1092C883EA59172013--> <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT> -<!--B6049E97C1254A1092C883EA59172013--> <EM_OBUIAPP_SELECTION_TYPE><![CDATA[S]]></EM_OBUIAPP_SELECTION_TYPE> +<!--B6049E97C1254A1092C883EA59172013--> <EM_OBUIAPP_SELECTION_TYPE><![CDATA[M]]></EM_OBUIAPP_SELECTION_TYPE> <!--B6049E97C1254A1092C883EA59172013--></AD_TAB> <!--B82C02920AA84E8DB57D553185BD2F06--><AD_TAB> diff -r ec10d529b9bb -r e82cc7cf80f2 modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/AllTests.java --- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/AllTests.java Thu Aug 04 11:57:44 2016 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ -/* - ************************************************************************* - * The contents of this file are subject to the Openbravo Public License - * Version 1.1 (the "License"), being the Mozilla Public License - * Version 1.1 with a permitted attribution clause; you may not use this - * file except in compliance with the License. You may obtain a copy of - * the License at http://www.openbravo.com/legal/license.html - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - * License for the specific language governing rights and limitations - * under the License. - * The Original Code is Openbravo ERP. - * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2011-2014 Openbravo SLU - * All Rights Reserved. - * Contributor(s): ______________________________________. - ************************************************************************ - */ - -package org.openbravo.advpaymentmngt.test.draft; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.openbravo.advpaymentmngt.test.draft.FinancialAccountTest; -import org.openbravo.advpaymentmngt.test.draft.PaymentMethodTest; -import org.openbravo.advpaymentmngt.test.draft.PaymentTest_01; -import org.openbravo.advpaymentmngt.test.draft.PaymentTest_02; -import org.openbravo.advpaymentmngt.test.draft.PaymentTest_03; -import org.openbravo.advpaymentmngt.test.draft.PaymentTest_04; -import org.openbravo.advpaymentmngt.test.draft.PaymentTest_05; -import org.openbravo.advpaymentmngt.test.draft.PaymentTest_06; -import org.openbravo.advpaymentmngt.test.draft.PaymentTest_07; -import org.openbravo.advpaymentmngt.test.draft.PaymentTest_08; -import org.openbravo.advpaymentmngt.test.draft.PaymentTest_09; -import org.openbravo.advpaymentmngt.test.draft.PaymentTest_10; -import org.openbravo.advpaymentmngt.test.draft.PaymentTest_11; - -/** - * - * Test for org.openbravo.advpaymentmngt - * - */ - -@RunWith(Suite.class) -@Suite.SuiteClasses({ - - // Master Data Configuration - FinancialAccountTest.class, // - PaymentMethodTest.class, - - // Payment scenarios - PaymentTest_01.class, // - PaymentTest_02.class, // - PaymentTest_03.class, // - PaymentTest_04.class, // - PaymentTest_05.class, // - PaymentTest_06.class, // - PaymentTest_07.class, // - PaymentTest_08.class, // - PaymentTest_09.class, // - PaymentTest_10.class, // - PaymentTest_11.class }) -public class AllTests { - -} diff -r ec10d529b9bb -r e82cc7cf80f2 modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/FinancialAccountTest.java --- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/FinancialAccountTest.java Thu Aug 04 11:57:44 2016 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,103 +0,0 @@ -/* - ************************************************************************* - * The contents of this file are subject to the Openbravo Public License - * Version 1.0 (the "License"), being the Mozilla Public License - * Version 1.1 with a permitted attribution clause; you may not use this - * file except in compliance with the License. You may obtain a copy of - * the License at http://www.openbravo.com/legal/license.html - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - * License for the specific language governing rights and limitations - * 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-2014 Openbravo SLU - * All Rights Reserved. - * Contributor(s): ______________________________________. - ************************************************************************* - */ - -package org.openbravo.advpaymentmngt.test.draft; - -import java.math.BigDecimal; -import java.util.List; - -import org.hibernate.criterion.Restrictions; -import org.junit.Before; -import org.junit.Test; -import org.openbravo.dal.service.OBCriteria; -import org.openbravo.dal.service.OBDal; -import org.openbravo.model.common.businesspartner.BusinessPartner; -import org.openbravo.model.common.currency.Currency; -import org.openbravo.model.common.geography.Location; -import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount; -import org.openbravo.test.base.OBBaseTest; - -public class FinancialAccountTest extends OBBaseTest { - - private static final String BANK = "B"; - private static final String CASH = "C"; - private static final String STANDARD_DESCRIPTION = "JUnit Test"; - - /** - * This before method is named setUpF() to avoid overwriting the super - * setUp method that is invoke automatically before this one. - */ - @Before - public void setUpF() throws Exception { - TestUtility.setTestContext(); - } - - @Test - public void testAddFinancialAccountValid1() { - TestUtility.insertFinancialAccount("APRM_FINANCIAL_ACCOUNT_1", STANDARD_DESCRIPTION, - getOneInstance(Currency.class), CASH, false, getOneInstance(Location.class), - getOneInstance(BusinessPartner.class), null, null, null, null, null, null, null, null, - null, BigDecimal.ZERO, BigDecimal.ZERO, null, true, false); - } - - // Pre-requisite: at least one Matching Algorithm created - @Test - public void testAddFinancialAccountValid2() { - TestUtility.insertFinancialAccount("APRM_FINANCIAL_ACCOUNT_2", STANDARD_DESCRIPTION, - getOneInstance(Currency.class), BANK, false, getOneInstance(Location.class), - getOneInstance(BusinessPartner.class), "2054", "4321", "1", null, null, null, "123456789", - null, null, BigDecimal.ZERO, BigDecimal.ZERO, - null/* getOneInstance(MatchingAlgorithm.class) */, true, false); - } - - @Test - public void testAddFinancialAccountValid3() { - TestUtility.insertFinancialAccount("APRM_FINANCIAL_ACCOUNT_3", STANDARD_DESCRIPTION, - getOneInstance(Currency.class), BANK, false, getOneInstance(Location.class), - getOneInstance(BusinessPartner.class), "2054", null, null, null, null, null, null, null, - null, BigDecimal.ZERO, BigDecimal.ZERO, null, true, false); - } - - /** - * Currency is mandatory - */ - @Test - public void testAddFinancialAccountNotValid1() { - TestUtility.insertFinancialAccount("APRM_FINANCIAL_ACCOUNT_4", STANDARD_DESCRIPTION, null, - BANK, false, getOneInstance(Location.class), getOneInstance(BusinessPartner.class), "2054", - null, null, null, null, null, null, null, null, BigDecimal.ZERO, BigDecimal.ZERO, null, - false, false); - } - - /** - * Deletes all the Payment Methods created for testing - */ - @Test - public void testDeleteFinancialAccounts() { - final OBCriteria<FIN_FinancialAccount> obCriteria = OBDal.getInstance().createCriteria( ------------------------------------------------------------------------------ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
