details: https://code.openbravo.com/erp/devel/pi/rev/e5b0c94de17e changeset: 24230:e5b0c94de17e user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Sun Jul 27 23:00:29 2014 +0200 summary: project junit-upgrade:Refactoring classes src-test.
details: https://code.openbravo.com/erp/devel/pi/rev/e54e5827e9b5 changeset: 24231:e54e5827e9b5 user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Mon Jul 28 13:17:23 2014 +0200 summary: project junit-upgrade:Refactoring some classes: execution order. details: https://code.openbravo.com/erp/devel/pi/rev/1cdd36708614 changeset: 24232:1cdd36708614 user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Tue Jul 29 12:19:10 2014 +0200 summary: project junit-upgrade:Added new hamcrest.jar and junit.jar details: https://code.openbravo.com/erp/devel/pi/rev/6ced7b4eac48 changeset: 24233:6ced7b4eac48 user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Wed Aug 06 12:44:16 2014 +0200 summary: project junit-upgrade:Some changes in classes src-test. details: https://code.openbravo.com/erp/devel/pi/rev/175d5fa16caa changeset: 24234:175d5fa16caa user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Wed Aug 06 13:32:22 2014 +0200 summary: project junit-upgrade: Merge with pi. details: https://code.openbravo.com/erp/devel/pi/rev/080963b7f253 changeset: 24235:080963b7f253 user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Fri Aug 08 10:43:31 2014 +0200 summary: project junit-upgrade: Add some changes in test of modules. details: https://code.openbravo.com/erp/devel/pi/rev/ceaf97c541c3 changeset: 24236:ceaf97c541c3 user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Fri Aug 08 15:49:28 2014 +0200 summary: project junit-upgrade: Add last change in WeldBaseTest. details: https://code.openbravo.com/erp/devel/pi/rev/ab253f1049e6 changeset: 24237:ab253f1049e6 user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Mon Aug 11 12:59:03 2014 +0200 summary: project junit-upgrade: Remove some comments. details: https://code.openbravo.com/erp/devel/pi/rev/8cc58d763eeb changeset: 24238:8cc58d763eeb user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Mon Aug 11 13:02:14 2014 +0200 summary: project junit-upgrade: Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/0276fa6a664f changeset: 24239:0276fa6a664f user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Mon Aug 11 14:39:34 2014 +0200 summary: fixed issue 27290: upgrade junit 4.11. diffstat: .classpath.template | 1 + .hgsigs | 3 + .hgtags | 3 + legal/Licensing.txt | 5 +- lib/build/hamcrest-all-1.3.jar | 0 lib/build/junit.jar | 0 modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_BNKSTM_LINE_CHECK_TRG.xml | 6 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml | 2 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml | 11 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/AllTests.java | 69 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/FinancialAccountTest.java | 22 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentMethodTest.java | 24 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_01.java | 21 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_02.java | 19 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_03.java | 21 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_04.java | 21 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_05.java | 20 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_06.java | 21 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_07.java | 21 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_08.java | 21 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_09.java | 21 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_10.java | 21 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_11.java | 21 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java | 9 +- modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdateReconciliationStatementProcessedValueData.java | 46 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java | 12 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentProposalPickEditLines.java | 3 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java | 8 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/MatchTransactionDao.java | 35 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentDefaultValuesHandler.java | 33 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentInAddPaymentDefaultValues.java | 7 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentOutAddPaymentDefaultValues.java | 7 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseInvoiceAddPaymentDefaultValues.java | 7 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseOrderAddPaymentDefaultValues.java | 7 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesInvoiceAddPaymentDefaultValues.java | 7 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesOrderAddPaymentDefaultValues.java | 7 + modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js | 7 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/WeldBaseTest.java | 16 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 12 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml | 12 - modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/DynamicExpressionParserTest.java | 8 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/MenuTemplateTest.java | 4 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/MenuTest.java | 4 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/StandardWindowTest.java | 3 + modules/org.openbravo.client.application/src/org/openbravo/client/application/event/RoleAccessUniqueHandler.java | 125 ++ modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-window.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-canvas.js | 7 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 37 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 30 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 17 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js | 71 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js | 3 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-test-registry.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js | 3 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js | 3 + modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/freemarker/test/FreemarkerTemplateProcessorTest.java | 12 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/freemarker/test/GenerateComponentTest.java | 2 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/freemarker/test/LabelTest.java | 11 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/test/CompressionTest.java | 11 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/test/KernelUtilTest.java | 23 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/test/TemplateResolverTest.java | 22 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.myob/src-test/org/openbravo/client/myob/test/MyOpenbravoTest.java | 31 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java | 47 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_REF_LIST.xml | 24 + modules/org.openbravo.service.datasource/src-test/org/openbravo/service/datasource/test/DataSourceServiceProviderTest.java | 6 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ComboTableDatasourceService.java | 10 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java | 72 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-test/org/openbravo/service/json/test/DataQueryServiceTest.java | 20 +- modules/org.openbravo.service.json/src-test/org/openbravo/service/json/test/JsonConversionTest.java | 19 +- modules/org.openbravo.service.json/src-test/org/openbravo/service/json/test/JsonReadRestTest.java | 15 +- modules/org.openbravo.service.json/src-test/org/openbravo/service/json/test/JsonRestTest.java | 8 +- modules/org.openbravo.service.json/src-test/org/openbravo/service/json/test/JsonUpdateRestTest.java | 16 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java | 154 ++- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.selector/src-test/org/openbravo/userinterface/selectors/test/ExpressionsTest.java | 28 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 18 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 18 +- referencedata/sampledata/QA_Testing/AD_ORGINFO.xml | 6 + referencedata/sampledata/QA_Testing/AD_PINSTANCE.xml | 68 + referencedata/sampledata/QA_Testing/AD_PINSTANCE_PARA.xml | 34 + referencedata/sampledata/QA_Testing/AD_PROCESS_ACCESS.xml | 210 +++ referencedata/sampledata/QA_Testing/AD_PROCESS_REQUEST.xml | 45 + referencedata/sampledata/QA_Testing/AD_SEQUENCE.xml | 16 +- referencedata/sampledata/QA_Testing/AD_TREE.xml | 16 + referencedata/sampledata/QA_Testing/AD_USER.xml | 8 +- referencedata/sampledata/QA_Testing/AD_WINDOW_ACCESS.xml | 252 ++++ referencedata/sampledata/QA_Testing/C_BPARTNER.xml | 177 ++- referencedata/sampledata/QA_Testing/C_GLITEM.xml | 18 + referencedata/sampledata/QA_Testing/C_INVOICE.xml | 206 +++ referencedata/sampledata/QA_Testing/C_INVOICELINE.xml | 108 + referencedata/sampledata/QA_Testing/C_INVOICELINETAX.xml | 90 + referencedata/sampledata/QA_Testing/C_INVOICETAX.xml | 85 + referencedata/sampledata/QA_Testing/C_ORDER.xml | 83 + referencedata/sampledata/QA_Testing/C_ORDERLINE.xml | 45 + referencedata/sampledata/QA_Testing/C_ORDERLINETAX.xml | 17 + referencedata/sampledata/QA_Testing/C_ORDERTAX.xml | 16 + referencedata/sampledata/QA_Testing/C_TAX.xml | 9 + referencedata/sampledata/QA_Testing/FACT_ACCT.xml | 500 ++++++++ referencedata/sampledata/QA_Testing/FIN_FINACC_PAYMENTMETHOD.xml | 91 +- referencedata/sampledata/QA_Testing/FIN_FINANCIAL_ACCOUNT.xml | 2 + referencedata/sampledata/QA_Testing/FIN_PAYMENT.xml | 260 ++++ referencedata/sampledata/QA_Testing/FIN_PAYMENT_DETAIL.xml | 96 + referencedata/sampledata/QA_Testing/FIN_PAYMENT_SCHEDULE.xml | 88 + referencedata/sampledata/QA_Testing/FIN_PAYMENT_SCHEDULEDETAIL.xml | 194 +++ referencedata/sampledata/QA_Testing/FIN_RECONCILIATION.xml | 21 + referencedata/sampledata/QA_Testing/M_OFFER.xml | 3 + referencedata/sampledata/QA_Testing/M_PRODUCTPRICE.xml | 43 + referencedata/sampledata/QA_Testing/M_STORAGE_PENDING.xml | 17 + referencedata/sampledata/QA_Testing/M_TRANSACTION.xml | 424 +++++++ referencedata/sampledata/QA_Testing/OBUIAPP_PROCESS_ACCESS.xml | 252 ++++ referencedata/sampledata/QA_Testing/OBUIAPP_VIEW_ROLE_ACCESS.xml | 78 + src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/model/functions/AD_TAB_IMPORT.xml | 13 +- src-db/database/model/functions/C_ORDER_POST1.xml | 41 +- src-db/database/model/functions/M_INOUT_CREATE.xml | 8 +- src-db/database/model/functions/M_RESERVATION_POST.xml | 4 +- src-db/database/model/tables/AD_CLIENTINFO.xml | 2 +- src-db/database/model/tables/AD_ORG_WAREHOUSE.xml | 7 + src-db/database/model/tables/AD_TREE.xml | 2 +- src-db/database/model/tables/C_BPARTNER.xml | 1 + src-db/database/model/tables/M_RESERVATION.xml | 3 + src-db/database/model/tables/M_STOCK_PROPOSED.xml | 2 +- src-db/database/model/triggers/C_CONVERSION_RATE_TRG.xml | 23 +- src-db/database/model/triggers/C_ORDERLINETAX_TRG.xml | 4 +- src-db/database/model/triggers/C_ORDERLINE_TRG2.xml | 93 +- src-db/database/model/triggers/M_RESERVATION_TRG.xml | 5 +- src-db/database/sourcedata/AD_COLUMN.xml | 7 +- src-db/database/sourcedata/AD_FIELD.xml | 6 +- src-db/database/sourcedata/AD_MESSAGE.xml | 73 + src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 26 + src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 40 + src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_REFERENCE.xml | 12 + src-db/database/sourcedata/AD_REF_TABLE.xml | 11 + src-db/database/sourcedata/AD_TAB.xml | 6 +- src-db/database/sourcedata/AD_TABLE.xml | 1 + src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 242 ++++ src-db/database/sourcedata/AD_VAL_RULE.xml | 12 + src-test/org/openbravo/erpCommon/info/ClassicSelectorTest.java | 10 +- src-test/org/openbravo/test/AllAntTaskTests.java | 126 +- src-test/org/openbravo/test/AllQuickAntTaskTests.java | 88 +- src-test/org/openbravo/test/AllTests.java | 88 +- src-test/org/openbravo/test/AllWebserviceTests.java | 35 +- src-test/org/openbravo/test/AntTaskTests.java | 116 +- src-test/org/openbravo/test/accounting/RecordID2Test.java | 14 +- src-test/org/openbravo/test/ant/AntTasksTest.java | 10 +- src-test/org/openbravo/test/ant/BaseAntTest.java | 16 +- src-test/org/openbravo/test/ant/CallWadTest.java | 6 +- src-test/org/openbravo/test/ant/RestartTomcatTest.java | 6 +- src-test/org/openbravo/test/base/BaseTest.java | 11 +- src-test/org/openbravo/test/base/HiddenObjectHelper.java | 2 +- src-test/org/openbravo/test/base/OBBaseTest.java | 400 ++++++ src-test/org/openbravo/test/dal/ADCachedMultiThreadTest.java | 17 +- src-test/org/openbravo/test/dal/AdminContextTest.java | 14 +- src-test/org/openbravo/test/dal/ComputedColumnsTest.java | 13 +- src-test/org/openbravo/test/dal/DalComplexQueryRequisitionTest.java | 14 +- src-test/org/openbravo/test/dal/DalComplexQueryTestOrderLine.java | 11 +- src-test/org/openbravo/test/dal/DalConnectionProviderTest.java | 10 +- src-test/org/openbravo/test/dal/DalCopyTest.java | 13 +- src-test/org/openbravo/test/dal/DalFilterTest.java | 13 +- src-test/org/openbravo/test/dal/DalPerformanceCriteriaTest.java | 11 +- src-test/org/openbravo/test/dal/DalPerformanceExampleTest.java | 18 +- src-test/org/openbravo/test/dal/DalPerformanceInventoryLineTest.java | 24 +- src-test/org/openbravo/test/dal/DalPerformanceProductTest.java | 14 +- src-test/org/openbravo/test/dal/DalPerformanceProxyTest.java | 11 +- src-test/org/openbravo/test/dal/DalQueryTest.java | 49 +- src-test/org/openbravo/test/dal/DalStoredProcedureTest.java | 14 +- src-test/org/openbravo/test/dal/DalTest.java | 71 +- src-test/org/openbravo/test/dal/DalUtilTest.java | 14 +- src-test/org/openbravo/test/dal/DoOrgClientAccessCheckTest.java | 13 +- src-test/org/openbravo/test/dal/DynamicEntityTest.java | 28 +- src-test/org/openbravo/test/dal/HiddenUpdateTest.java | 20 +- src-test/org/openbravo/test/dal/IssuesTest.java | 59 +- src-test/org/openbravo/test/dal/MappingGenerationTest.java | 10 +- src-test/org/openbravo/test/dal/OBContextTest.java | 16 +- src-test/org/openbravo/test/dal/PerformanceGenerateInstanceTest.java | 10 +- src-test/org/openbravo/test/dal/ReadByNameTest.java | 31 +- src-test/org/openbravo/test/dal/SimpleDalReadTest.java | 10 +- src-test/org/openbravo/test/dal/ValidationTest.java | 19 +- src-test/org/openbravo/test/dal/ViewTest.java | 13 +- src-test/org/openbravo/test/datasource/BaseDataSourceTestDal.java | 6 +- src-test/org/openbravo/test/datasource/BaseDataSourceTestNoDal.java | 6 +- src-test/org/openbravo/test/datasource/FICTest.java | 61 + src-test/org/openbravo/test/datasource/ProductSelectorDataSourceTest.java | 6 + src-test/org/openbravo/test/datasource/SelectorFieldPropertySelectorDSTest.java | 9 + src-test/org/openbravo/test/datasource/TestCSVEncoding.java | 6 +- src-test/org/openbravo/test/datasource/TestComboDatasource.java | 45 +- src-test/org/openbravo/test/doc/GenerateEntityModelWiki.java | 9 +- src-test/org/openbravo/test/expression/EvaluationTest.java | 12 +- src-test/org/openbravo/test/javascript/CompressionTest.java | 4 +- src-test/org/openbravo/test/javascript/JavaScriptAPITest.java | 16 +- src-test/org/openbravo/test/mimetypes/MimeTypeTest.java | 8 +- src-test/org/openbravo/test/model/ClassLoaderTest.java | 10 +- src-test/org/openbravo/test/model/FieldProviderTest.java | 10 +- src-test/org/openbravo/test/model/IndexesTest.java | 10 +- src-test/org/openbravo/test/model/OneToManyTest.java | 36 +- src-test/org/openbravo/test/model/RuntimeModelTest.java | 37 +- src-test/org/openbravo/test/model/TrlColumnsOraTypeTest.java | 10 +- src-test/org/openbravo/test/model/UniqueConstraintTest.java | 12 +- src-test/org/openbravo/test/model/UtilsTest.java | 15 +- src-test/org/openbravo/test/modularity/DBPrefixTest.java | 47 +- src-test/org/openbravo/test/modularity/DatasetServiceTest.java | 11 +- src-test/org/openbravo/test/modularity/MergePropertiesTest.java | 33 +- src-test/org/openbravo/test/modularity/TableNameTest.java | 30 +- src-test/org/openbravo/test/preference/PreferenceTest.java | 89 +- src-test/org/openbravo/test/security/AccessLevelTest.java | 17 +- src-test/org/openbravo/test/security/AllDataAllowedOrganizationsTest.java | 8 +- src-test/org/openbravo/test/security/AllowedOrganizationsTest.java | 13 +- src-test/org/openbravo/test/security/EntityAccessTest.java | 54 +- src-test/org/openbravo/test/security/WritableReadableOrganizationClientTest.java | 15 +- src-test/org/openbravo/test/system/ErrorTextParserTest.java | 18 +- src-test/org/openbravo/test/system/OBPropertiesProviderTest.java | 10 +- src-test/org/openbravo/test/system/SystemServiceTest.java | 15 +- src-test/org/openbravo/test/system/SystemValidatorTest.java | 10 +- src-test/org/openbravo/test/webservice/BaseWSTest.java | 8 +- src-test/org/openbravo/test/webservice/PerformanceTest.java | 2 + src-test/org/openbravo/test/webservice/WSAddRecordWithComputedColumns.java | 5 + src-test/org/openbravo/test/webservice/WSReadTest.java | 10 +- src-test/org/openbravo/test/webservice/WSUpdateTest.java | 52 +- src-test/org/openbravo/test/xml/ClientExportImportTest.java | 21 +- src-test/org/openbravo/test/xml/DatasetExportTest.java | 28 +- src-test/org/openbravo/test/xml/EntityXMLImportTestBusinessObject.java | 55 +- src-test/org/openbravo/test/xml/EntityXMLImportTestReference.java | 43 +- src-test/org/openbravo/test/xml/EntityXMLImportTestSingle.java | 26 +- src-test/org/openbravo/test/xml/EntityXMLImportTestWarning.java | 15 +- src-test/org/openbravo/test/xml/EntityXMLIssues.java | 13 +- src-test/org/openbravo/test/xml/UniqueConstraintImportTest.java | 16 +- src-test/org/openbravo/test/xml/XMLBaseTest.java | 8 +- src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedOrgWarehouse.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedOrgWarehouseData.class | 0 src-util/buildvalidation/build/javasqlc/src/org/openbravo/buildvalidation/DuplicatedOrgWarehouseData.java | 173 ++ src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedOrgWarehouse.java | 52 + src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedOrgWarehouse_data.xsql | 52 + src-util/diagnostic/config/diagnostics.properties | 8 +- src-util/modulescript/build/classes/org/openbravo/modulescript/DeleteDuplicateMatchInvoice.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/DeleteDuplicateMatchInvoiceData.class | 0 src-util/modulescript/src/org/openbravo/modulescript/DeleteDuplicateMatchInvoice.java | 11 +- src-util/modulescript/src/org/openbravo/modulescript/DeleteDuplicateMatchInvoice_data.xsql | 36 +- src/org/openbravo/base/model/ModelProvider.java | 12 +- src/org/openbravo/base/model/Property.java | 5 + src/org/openbravo/base/secureApp/LoginHandler.java | 10 +- src/org/openbravo/base/structure/IdentifierProvider.java | 25 +- src/org/openbravo/dal/xml/PrimitiveReferenceHandler.java | 10 +- src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder_data.xsql | 1 + src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java | 31 +- src/org/openbravo/erpCommon/ad_forms/AcctSchemaElement.java | 3 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 8 +- src/org/openbravo/erpCommon/ad_forms/DocDoubtfulDebt.java | 5 +- src/org/openbravo/erpCommon/ad_forms/DocFINBankStatement.java | 6 +- src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 4 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 4 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 4 +- src/org/openbravo/erpCommon/ad_forms/DocInventory.java | 3 +- src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java | 36 +- src/org/openbravo/erpCommon/ad_forms/Fact.java | 26 +- src/org/openbravo/erpCommon/ad_reports/Organization_data.xsql | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html | 67 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 76 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.xml | 4 + src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql | 78 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java | 235 ++- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html | 136 ++- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.xml | 5 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql | 84 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.jrxml | 590 ++++++++++ src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html | 40 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR.java | 167 ++- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR_data.xsql | 50 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.jrxml | 355 ++++++ src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html | 9 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java | 90 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.xml | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance_data.xsql | 14 +- src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartnerJR.html | 97 +- src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartnerJR.java | 112 +- src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartnerJR.xml | 11 +- src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartner_data.xsql | 3 +- src/org/openbravo/erpCommon/info/DocTypeMultiple.html | 308 +++++ src/org/openbravo/erpCommon/info/DocTypeMultiple.java | 307 +++++ src/org/openbravo/erpCommon/info/DocTypeMultiple.xml | 34 + src/org/openbravo/erpCommon/info/DocTypeMultiple_data.xsql | 75 + src/org/openbravo/erpCommon/info/LocatorMultiple.html | 379 ++++++ src/org/openbravo/erpCommon/info/LocatorMultiple.java | 423 +++++++ src/org/openbravo/erpCommon/info/LocatorMultiple.xml | 38 + src/org/openbravo/erpCommon/info/LocatorMultiple_data.xsql | 88 + src/org/openbravo/erpCommon/info/SelectorUtility_data.xsql | 31 +- src/org/openbravo/erpCommon/security/Login.java | 35 +- src/org/openbravo/erpCommon/security/SignInProvider.java | 39 + src/org/openbravo/erpCommon/utility/CashVATUtil.java | 142 +- src/org/openbravo/erpCommon/utility/ComboTableData.java | 53 +- src/org/openbravo/erpCommon/utility/DimensionDisplayUtility.java | 2 + src/org/openbravo/materialmgmt/InventoryCountProcess.java | 44 + src/org/openbravo/materialmgmt/hook/InventoryCountCheckHook.java | 8 + src/org/openbravo/materialmgmt/hook/InventoryCountProcessHook.java | 8 + src/org/openbravo/service/db/DataImportService.java | 18 +- src/org/openbravo/service/rest/DalWebService.java | 5 +- web/js/utils.js | 1 + 339 files changed, 11392 insertions(+), 1773 deletions(-) diffs (truncated from 28050 to 300 lines): diff -r c563d84563da -r 0276fa6a664f .classpath.template --- a/.classpath.template Tue Jul 15 11:02:51 2014 +0200 +++ b/.classpath.template Mon Aug 11 14:39:34 2014 +0200 @@ -30,5 +30,6 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="lib/build/junit.jar"/> <classpathentry kind="lib" path="lib/build/js.jar"/> + <classpathentry kind="lib" path="lib/build/hamcrest-all-1.3.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> diff -r c563d84563da -r 0276fa6a664f .hgsigs --- a/.hgsigs Tue Jul 15 11:02:51 2014 +0200 +++ b/.hgsigs Mon Aug 11 14:39:34 2014 +0200 @@ -151,3 +151,6 @@ 7de34ade782eae3f74b2df2471292e0da145eb47 0 iEYEABECAAYFAlN95g4ACgkQCX/oGf+2qkO62ACg74llt2Ngb7UyteX/drSuZ6/U8mIAn2I3sFYMtTZ3jzjR5zGOJ3M8/Ah0 e6d5de2bb5e230b5a9d6d95489292a8e92de1764 0 iEYEABECAAYFAlOhX0gACgkQCX/oGf+2qkOgGACg3wrp9HA+P7exN/j+Znu5acph2psAn1XulrvCL3RJ0r2iNyeVqaY73OtQ 79d26cfa1fe16e6ba26251919588218073d8682f 0 iEYEABECAAYFAlOrwz0ACgkQCX/oGf+2qkOPlQCfV15XdSozD91qAF751lOUOH3VwroAn08TYpciEyWBOxsFXend1IUEPsnA +9607751357e9e3a411c0919759ed81196befcad9 0 iEYEABECAAYFAlPHZVkACgkQCX/oGf+2qkORBQCfZJPiBWcEMNURibADGn9o+u+snwgAoP4ZMSkLCsu4PSf75rZn4gStM4wh +11ed6ecc0a194545a1f8a3af2b2674b0ec319f99 0 iEYEABECAAYFAlPblXoACgkQCX/oGf+2qkOuxACfX5e+wRgLJw88VUyHl32C+QC8PY8AoOoARsJUAOnu8IgYYwNjyw5xMlKC +a9d6608b6cabe9e27fa31cbf2a49a69b2d583e0a 0 iEUEABECAAYFAlPfOfMACgkQCX/oGf+2qkP8GQCY8T/ZXMymIqGubZ6h2LbjE7Uc4gCg5A/numsq2gypnrNri+wMt1HLLWA= diff -r c563d84563da -r 0276fa6a664f .hgtags --- a/.hgtags Tue Jul 15 11:02:51 2014 +0200 +++ b/.hgtags Mon Aug 11 14:39:34 2014 +0200 @@ -162,3 +162,6 @@ 6b79b2cff11381014860b41d7db9c3835c87069b 3.0PR14Q2.1 10a75a864b9d99c5f92d913f6d29255a5b0241cb 3.0PR14Q2.2 623357e87f6cc274e2b75b2eda60d11dd0c593d2 3.0PR14Q2.3 +73f3bc31a2293109ebdc6e5b2f8b3f1870df7528 3.0PR14Q2.4 +abfe5a20ef579b8edaf9866346ee876a00e87eee 3.0PR14Q2.5 +d7d2abe0f424775dcdf9139410ae161881be1fb8 3.0PR14Q3 diff -r c563d84563da -r 0276fa6a664f legal/Licensing.txt --- a/legal/Licensing.txt Tue Jul 15 11:02:51 2014 +0200 +++ b/legal/Licensing.txt Mon Aug 11 14:39:34 2014 +0200 @@ -157,7 +157,10 @@ Under the ANTLR license (available at http://www.antlr.org/license.html) # junit.jar -Under the CPL license (available at http://www.opensource.org/licenses/cpl1.0.php) +Under the Eclipse Public License - v 1.0 (available at https://www.eclipse.org/legal/epl-v10.html) + +# hamcrest-all-1.3.jar +Under the BSD 3-Clause license (avaliable at http://opensource.org/licenses/BSD-3-Clause) # js.jar # ob-rhino-1.6R7.jar diff -r c563d84563da -r 0276fa6a664f lib/build/hamcrest-all-1.3.jar Binary file lib/build/hamcrest-all-1.3.jar has changed diff -r c563d84563da -r 0276fa6a664f lib/build/junit.jar Binary file lib/build/junit.jar has changed diff -r c563d84563da -r 0276fa6a664f modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_BNKSTM_LINE_CHECK_TRG.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_BNKSTM_LINE_CHECK_TRG.xml Tue Jul 15 11:02:51 2014 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_BNKSTM_LINE_CHECK_TRG.xml Mon Aug 11 14:39:34 2014 +0200 @@ -16,7 +16,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2010 Openbravo SLU +* All portions are Copyright (C) 2010-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. *************************************************************************/ @@ -79,7 +79,9 @@ OR(COALESCE(:OLD.DRAMOUNT, 0) <> COALESCE(:NEW.DRAMOUNT, 0)) OR(COALESCE(:OLD.REFERENCENO, '0') <> COALESCE(:NEW.REFERENCENO, '0')) )) THEN - RAISE_APPLICATION_ERROR(-20000, '@APRM_BSTLine_Matched@'); + IF (:NEW.FIN_FINACC_TRANSACTION_ID IS NOT NULL) THEN + RAISE_APPLICATION_ERROR(-20000, '@APRM_BSTLine_Matched@'); + END IF; END IF; END IF; diff -r c563d84563da -r 0276fa6a664f modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Tue Jul 15 11:02:51 2014 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Mon Aug 11 14:39:34 2014 +0200 @@ -349,7 +349,7 @@ <!--04CFE3A53162449380A253DE0B814AEF--> <DISPLAYLOGIC><![CDATA[@Processed@='Y' & (@showAddPayment@='Y' | @showAddPayment@ ='') & (@APRM_OrderIsPaid@='N' | @APRM_OrderIsPaid@ ='')]]></DISPLAYLOGIC> <!--04CFE3A53162449380A253DE0B814AEF--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH> <!--04CFE3A53162449380A253DE0B814AEF--> <ISREADONLY><![CDATA[N]]></ISREADONLY> -<!--04CFE3A53162449380A253DE0B814AEF--> <SEQNO><![CDATA[540]]></SEQNO> +<!--04CFE3A53162449380A253DE0B814AEF--> <SEQNO><![CDATA[335]]></SEQNO> <!--04CFE3A53162449380A253DE0B814AEF--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> <!--04CFE3A53162449380A253DE0B814AEF--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--04CFE3A53162449380A253DE0B814AEF--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> @@ -20496,7 +20496,7 @@ <!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <DISPLAYLOGIC><![CDATA[@Processed@='Y' & (@showAddPayment@='Y' | @showAddPayment@ ='') & (@APRM_OrderIsPaid@='N' | @APRM_OrderIsPaid@ ='')]]></DISPLAYLOGIC> <!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH> <!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <ISREADONLY><![CDATA[N]]></ISREADONLY> -<!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <SEQNO><![CDATA[530]]></SEQNO> +<!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <SEQNO><![CDATA[415]]></SEQNO> <!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> <!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> diff -r c563d84563da -r 0276fa6a664f modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Jul 15 11:02:51 2014 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Aug 11 14:39:34 2014 +0200 @@ -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.23954]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.24224]]></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> diff -r c563d84563da -r 0276fa6a664f 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 Tue Jul 15 11:02:51 2014 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Aug 11 14:39:34 2014 +0200 @@ -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.23954]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.24224]]></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.23954]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.24224]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r c563d84563da -r 0276fa6a664f modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml Tue Jul 15 11:02:51 2014 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml Mon Aug 11 14:39:34 2014 +0200 @@ -203,6 +203,7 @@ <!--8A8E1C0D38F144D797698E48F464F97B--> <SEQNO><![CDATA[10]]></SEQNO> <!--8A8E1C0D38F144D797698E48F464F97B--> <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID> <!--8A8E1C0D38F144D797698E48F464F97B--> <AD_REFERENCE_VALUE_ID><![CDATA[EC75B6F5A9504DB6B3F3356EA85F15EE]]></AD_REFERENCE_VALUE_ID> +<!--8A8E1C0D38F144D797698E48F464F97B--> <AD_VAL_RULE_ID><![CDATA[CA425689672A42D7BE2158EE41E44F94]]></AD_VAL_RULE_ID> <!--8A8E1C0D38F144D797698E48F464F97B--> <COLUMNNAME><![CDATA[action]]></COLUMNNAME> <!--8A8E1C0D38F144D797698E48F464F97B--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> <!--8A8E1C0D38F144D797698E48F464F97B--> <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH> @@ -304,6 +305,7 @@ <!--ADC43AD315004E2D8E2802E00C4F178B--> <SEQNO><![CDATA[10]]></SEQNO> <!--ADC43AD315004E2D8E2802E00C4F178B--> <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID> <!--ADC43AD315004E2D8E2802E00C4F178B--> <AD_REFERENCE_VALUE_ID><![CDATA[EC75B6F5A9504DB6B3F3356EA85F15EE]]></AD_REFERENCE_VALUE_ID> +<!--ADC43AD315004E2D8E2802E00C4F178B--> <AD_VAL_RULE_ID><![CDATA[CA425689672A42D7BE2158EE41E44F94]]></AD_VAL_RULE_ID> <!--ADC43AD315004E2D8E2802E00C4F178B--> <COLUMNNAME><![CDATA[action]]></COLUMNNAME> <!--ADC43AD315004E2D8E2802E00C4F178B--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> <!--ADC43AD315004E2D8E2802E00C4F178B--> <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH> diff -r c563d84563da -r 0276fa6a664f modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml Tue Jul 15 11:02:51 2014 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml Mon Aug 11 14:39:34 2014 +0200 @@ -119,6 +119,17 @@ <!--BE0A211D552A4DE8AC3E6658759B396F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--BE0A211D552A4DE8AC3E6658759B396F--></AD_VAL_RULE> +<!--CA425689672A42D7BE2158EE41E44F94--><AD_VAL_RULE> +<!--CA425689672A42D7BE2158EE41E44F94--> <AD_VAL_RULE_ID><![CDATA[CA425689672A42D7BE2158EE41E44F94]]></AD_VAL_RULE_ID> +<!--CA425689672A42D7BE2158EE41E44F94--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--CA425689672A42D7BE2158EE41E44F94--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--CA425689672A42D7BE2158EE41E44F94--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--CA425689672A42D7BE2158EE41E44F94--> <NAME><![CDATA[Process or Reactivate Imported Bank Statement]]></NAME> +<!--CA425689672A42D7BE2158EE41E44F94--> <TYPE><![CDATA[S]]></TYPE> +<!--CA425689672A42D7BE2158EE41E44F94--> <CODE><![CDATA[((@Processed@ = 'N' AND AD_Ref_List.value='P') OR (@Processed@ = 'Y' AND AD_Ref_List.value='R'))]]></CODE> +<!--CA425689672A42D7BE2158EE41E44F94--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--CA425689672A42D7BE2158EE41E44F94--></AD_VAL_RULE> + <!--D035365830AF466BA81F2AB8ECC6FAE0--><AD_VAL_RULE> <!--D035365830AF466BA81F2AB8ECC6FAE0--> <AD_VAL_RULE_ID><![CDATA[D035365830AF466BA81F2AB8ECC6FAE0]]></AD_VAL_RULE_ID> <!--D035365830AF466BA81F2AB8ECC6FAE0--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r c563d84563da -r 0276fa6a664f modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml Tue Jul 15 11:02:51 2014 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml Mon Aug 11 14:39:34 2014 +0200 @@ -50,7 +50,7 @@ <!--8D0D32CC819E449D9A08E0459B482963--> <UIPATTERN><![CDATA[OBUIAPP_PickAndExecute]]></UIPATTERN> <!--8D0D32CC819E449D9A08E0459B482963--> <ISMULTIRECORD><![CDATA[N]]></ISMULTIRECORD> <!--8D0D32CC819E449D9A08E0459B482963--> <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS> -<!--8D0D32CC819E449D9A08E0459B482963--> <ISGRIDLEGACY><![CDATA[Y]]></ISGRIDLEGACY> +<!--8D0D32CC819E449D9A08E0459B482963--> <ISGRIDLEGACY><![CDATA[N]]></ISGRIDLEGACY> <!--8D0D32CC819E449D9A08E0459B482963--> <ISCANADDRECORDSTOSELECTOR><![CDATA[N]]></ISCANADDRECORDSTOSELECTOR> <!--8D0D32CC819E449D9A08E0459B482963--></OBUIAPP_PROCESS> diff -r c563d84563da -r 0276fa6a664f 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 Tue Jul 15 11:02:51 2014 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/AllTests.java Mon Aug 11 14:39:34 2014 +0200 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2011 Openbravo SLU + * All portions are Copyright (C) 2011-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -19,34 +19,47 @@ package org.openbravo.advpaymentmngt.test.draft; -import junit.framework.Test; -import junit.framework.TestSuite; +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) [email protected]({ + + // 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 { - public static Test suite() { - final TestSuite suite = new TestSuite("Test for org.openbravo.advpaymentmngt"); - // $JUnit-BEGIN$ - - // Master Data Configuration - suite.addTestSuite(FinancialAccountTest.class); - suite.addTestSuite(PaymentMethodTest.class); - - // Payment scenarios - suite.addTestSuite(PaymentTest_01.class); - suite.addTestSuite(PaymentTest_02.class); - suite.addTestSuite(PaymentTest_03.class); - suite.addTestSuite(PaymentTest_04.class); - suite.addTestSuite(PaymentTest_05.class); - suite.addTestSuite(PaymentTest_06.class); - suite.addTestSuite(PaymentTest_07.class); - suite.addTestSuite(PaymentTest_08.class); - suite.addTestSuite(PaymentTest_09.class); - suite.addTestSuite(PaymentTest_10.class); - suite.addTestSuite(PaymentTest_11.class); - - // $JUnit-END$ - return suite; - } - } diff -r c563d84563da -r 0276fa6a664f 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 Tue Jul 15 11:02:51 2014 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/FinancialAccountTest.java Mon Aug 11 14:39:34 2014 +0200 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2010-2011 Openbravo SLU + * All portions are Copyright (C) 2010-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -23,26 +23,32 @@ 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.BaseTest; +import org.openbravo.test.base.OBBaseTest; -public class FinancialAccountTest extends BaseTest { +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"; - @Override ------------------------------------------------------------------------------ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
