details: https://code.openbravo.com/erp/devel/pi/rev/c2b56d955db8 changeset: 27091:c2b56d955db8 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jun 16 12:55:28 2015 +0200 summary: [cdi-junit] updated arquillian 1.0.0 Alpha4 -> 1.1.8 Final
details: https://code.openbravo.com/erp/devel/pi/rev/a74e6f6207c1 changeset: 27092:a74e6f6207c1 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jun 16 12:59:25 2015 +0200 summary: [cdi-junit] edding to eclipse project and classpath weld resources details: https://code.openbravo.com/erp/devel/pi/rev/ec6aded5397e changeset: 27093:ec6aded5397e user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jun 16 13:05:03 2015 +0200 summary: [cdi-junit] adapt arquillians JavaArchive to newer version details: https://code.openbravo.com/erp/devel/pi/rev/e2c298443dfe changeset: 27094:e2c298443dfe user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jun 16 13:07:27 2015 +0200 summary: [cdi-junit] make bean manager available from WeldUtils details: https://code.openbravo.com/erp/devel/pi/rev/bb9f3baef514 changeset: 27095:bb9f3baef514 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jun 16 13:26:13 2015 +0200 summary: [cdi-junit] log deployed classes as debug details: https://code.openbravo.com/erp/devel/pi/rev/1efeff756e75 changeset: 27096:1efeff756e75 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jun 16 14:13:34 2015 +0200 summary: [cdi-junit] fixed test classpath for ant executions details: https://code.openbravo.com/erp/devel/pi/rev/94e053aae6c4 changeset: 27097:94e053aae6c4 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jun 16 14:23:30 2015 +0200 summary: [cdi-junit] log archive creation details: https://code.openbravo.com/erp/devel/pi/rev/8416ab9ddd13 changeset: 27098:8416ab9ddd13 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jun 16 14:25:18 2015 +0200 summary: [cdi-junit] added EL api This api is present in tomcat libraries so it doesn't need to be included within Eclipse's project's classpath. But it is missing when running cdi tests from ant so the library is required. details: https://code.openbravo.com/erp/devel/pi/rev/5a17bcfd1a08 changeset: 27099:5a17bcfd1a08 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jun 16 14:27:04 2015 +0200 summary: [cdi-test] added convenience run.test ant task It allows to execute with ant any test case (or suite) specified by the "test" parameter. details: https://code.openbravo.com/erp/devel/pi/rev/0794b85fe53e changeset: 27100:0794b85fe53e user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jun 16 14:28:26 2015 +0200 summary: [cdi-junit] pi merge details: https://code.openbravo.com/erp/devel/pi/rev/f6509dc16c9b changeset: 27101:f6509dc16c9b user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jun 16 14:32:03 2015 +0200 summary: [cdi-junit] added test cases to cover basic cdi infrastructure in jUnit details: https://code.openbravo.com/erp/devel/pi/rev/d0689a096233 changeset: 27102:d0689a096233 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jun 16 15:04:45 2015 +0200 summary: [cdi-junit] do not invoke compileSqlc as it tries to compile src-test in core without modules details: https://code.openbravo.com/erp/devel/pi/rev/9602f954e44e changeset: 27103:9602f954e44e user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jun 16 16:58:04 2015 +0200 summary: [cdi-junit] added test case to ant tests details: https://code.openbravo.com/erp/devel/pi/rev/2dbacf2eed98 changeset: 27104:2dbacf2eed98 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Jun 17 09:50:09 2015 +0200 summary: [cdi-junit] added test case to ant all tests details: https://code.openbravo.com/erp/devel/pi/rev/c8040fc61f9b changeset: 27105:c8040fc61f9b user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jul 02 09:47:15 2015 +0200 summary: [cdi-junit] added infrastructure for test case parameterization details: https://code.openbravo.com/erp/devel/pi/rev/7b4443175a72 changeset: 27106:7b4443175a72 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jul 02 09:47:36 2015 +0200 summary: [cdi-junit] code formatting details: https://code.openbravo.com/erp/devel/pi/rev/7597a7352a49 changeset: 27107:7597a7352a49 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jul 02 09:49:09 2015 +0200 summary: [cdi-junit] added test case for parameterization infrastructure details: https://code.openbravo.com/erp/devel/pi/rev/c663dfeb30dc changeset: 27108:c663dfeb30dc user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jul 02 09:51:44 2015 +0200 summary: [cdi-junit] pi merge details: https://code.openbravo.com/erp/devel/pi/rev/efb317935080 changeset: 27109:efb317935080 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jul 02 10:14:55 2015 +0200 summary: [cdi-junit] updated licensing for new libraries details: https://code.openbravo.com/erp/devel/pi/rev/1c01a3c3676f changeset: 27110:1c01a3c3676f user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jul 02 11:00:05 2015 +0200 summary: [cdi-junit] recovered existing cdi unit tests details: https://code.openbravo.com/erp/devel/pi/rev/ce70d9904f4d changeset: 27111:ce70d9904f4d user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jul 02 12:02:12 2015 +0200 summary: [cdi-junit] initialize kernel so persistance observers are available details: https://code.openbravo.com/erp/devel/pi/rev/fa4ce971f42e changeset: 27112:fa4ce971f42e user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jul 02 12:02:40 2015 +0200 summary: [cdi-junit] added test case for dal persistance event details: https://code.openbravo.com/erp/devel/pi/rev/20b9a7ea1d2b changeset: 27113:20b9a7ea1d2b user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jul 02 12:10:06 2015 +0200 summary: [cdi-juni] fixed src-test/.project path details: https://code.openbravo.com/erp/devel/pi/rev/f8b2a9116e3e changeset: 27114:f8b2a9116e3e user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jul 02 14:19:39 2015 +0200 summary: [cdi-junit] fixed test class name details: https://code.openbravo.com/erp/devel/pi/rev/ddbd2320712d changeset: 27115:ddbd2320712d user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Jul 06 12:33:00 2015 +0200 summary: [cdi-junit] paths for eclipse linked sources are relative details: https://code.openbravo.com/erp/devel/pi/rev/e8f895818869 changeset: 27116:e8f895818869 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jul 07 14:11:46 2015 +0200 summary: [cdi-junit] proper initialization of interceptors in WeldBaseTest to allow execution of test suites. details: https://code.openbravo.com/erp/devel/pi/rev/178c927eb94a changeset: 27117:178c927eb94a user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jul 07 14:14:49 2015 +0200 summary: [cdi-junit] DynamicExpressionParserTest needs to extend WeldBaseTest in order to be able to execute it within a suite which already used cdi, if not it tries to use injection resulting in NPE details: https://code.openbravo.com/erp/devel/pi/rev/95cedd0d623c changeset: 27118:95cedd0d623c user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Jul 08 08:13:50 2015 +0200 summary: fixed issue 21765 fixed issue 28955: enabled cdi in jUnit test cases diffstat: .hgsigs | 2 + .hgtags | 2 + build.xml | 4 + legal/Licensing.txt | 34 +- modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrdersData.class | 0 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 28 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml | 9 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml | 49 + modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml | 4 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml | 51 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml | 14 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 289 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 24 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml | 14 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml | 36 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_WINDOW.xml | 17 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 48 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 20 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml | 9 + modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrders_data.xsql | 4 +- modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrdersData.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddMultiplePaymentsHandler.java | 150 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanActionHandler.java | 3 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java | 1 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java | 14 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 20 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentInAddPaymentDisplayLogics.java | 7 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentOutAddPaymentDisplayLogics.java | 7 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseInvoiceAddPaymentDisplayLogics.java | 7 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseOrderAddPaymentDisplayLogics.java | 7 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesInvoiceAddPaymentDisplayLogics.java | 7 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesOrderAddPaymentDisplayLogics.java | 7 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/TransactionAddPaymentDisplayLogics.java | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/CreditToUseTransformer.java | 10 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 16 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java | 3 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js | 6 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-utilities.js | 2 +- modules/org.openbravo.base.weld/lib/test/arquillian-api-1.0.0.Alpha4.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-config-api-1.1.8.Final.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-config-impl-base-1.1.8.Final.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-container-impl-base-1.1.8.Final.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-container-spi-1.1.8.Final.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-container-test-api-1.1.8.Final.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-container-test-impl-base-1.1.8.Final.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-container-test-spi-1.1.8.Final.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-core-api-1.1.8.Final.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-core-impl-base-1.1.8.Final.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-core-spi-1.1.8.Final.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-impl-base-1.0.0.Alpha4.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-junit-1.0.0.Alpha4.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-junit-container-1.1.8.Final.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-junit-core-1.1.8.Final.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-protocol-local-1.0.0.Alpha4.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-spi-1.0.0.Alpha4.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-test-api-1.1.8.Final.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-test-impl-base-1.1.8.Final.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-test-spi-1.1.8.Final.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-testenricher-cdi-1.0.0.Alpha4.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-testenricher-cdi-1.0.2.Final.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-weld-ee-embedded-1.1-1.0.0.Alpha4.jar | 0 modules/org.openbravo.base.weld/lib/test/arquillian-weld-ee-embedded-1.1-1.0.0.CR8.jar | 0 modules/org.openbravo.base.weld/lib/test/jboss-el-api_2.2_spec-1.0.0.Final.jar | 0 modules/org.openbravo.base.weld/lib/test/shrinkwrap-api-1.0.0-alpha-11.jar | 0 modules/org.openbravo.base.weld/lib/test/shrinkwrap-api-1.2.2.jar | 0 modules/org.openbravo.base.weld/lib/test/shrinkwrap-descriptors-api-base-2.0.0-alpha-7.jar | 0 modules/org.openbravo.base.weld/lib/test/shrinkwrap-descriptors-spi-2.0.0-alpha-7.jar | 0 modules/org.openbravo.base.weld/lib/test/shrinkwrap-extension-classloader-1.0.0-alpha-11.jar | 0 modules/org.openbravo.base.weld/lib/test/shrinkwrap-impl-base-1.0.0-alpha-11.jar | 0 modules/org.openbravo.base.weld/lib/test/shrinkwrap-impl-base-1.2.2.jar | 0 modules/org.openbravo.base.weld/lib/test/shrinkwrap-spi-1.0.0-alpha-11.jar | 0 modules/org.openbravo.base.weld/lib/test/shrinkwrap-spi-1.2.2.jar | 0 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/ParameterCdiTest.java | 39 + modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/ParameterCdiTestRule.java | 103 + modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/WeldBaseTest.java | 76 +- modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/ApplicationScopedBean.java | 36 + modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/CdiInfrastructure.java | 80 + modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/DalPersistanceEventTest.java | 65 + modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/ParameterizedCdi.java | 88 + modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/RequestScopedBean.java | 36 + modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/SessionScopedBean.java | 40 + modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_FIELD.xml | 8 + modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml | 10 + modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_TAB.xml | 8 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 220 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml | 28 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 176 +- 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-test/org/openbravo/client/application/test/DynamicExpressionParserTest.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java | 1 + modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java | 17 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ElementValueEventHandler.java | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/LocationSettingsHandler.java | 10 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java | 29 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewUtil.java | 53 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 200 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree-filter.js | 39 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 19 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/materialmgmt/ob-reservation.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js | 18 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 15 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js | 7 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/freemarker/test/FreemarkerTemplateProcessorTest.java | 4 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/freemarker/test/GenerateComponentTest.java | 4 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/freemarker/test/LabelTest.java | 11 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelApplicationInitializer.java | 50 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java | 8 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/freemarker/FreemarkerTemplateProcessor.java | 1 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java | 24 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java | 51 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java | 150 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java | 25 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 255 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonConstants.java | 3 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java | 65 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 11 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 20 +- referencedata/sampledata/F_B_International_Group/AD_CLIENT_ACCTDIMENSION.xml | 12 +- referencedata/sampledata/F_B_International_Group/AD_PINSTANCE.xml | 71274 - referencedata/sampledata/F_B_International_Group/AD_PINSTANCE_PARA.xml | 31200 - referencedata/sampledata/F_B_International_Group/AD_PROCESS_ACCESS.xml | 140 + referencedata/sampledata/F_B_International_Group/AD_SEQUENCE.xml | 62 +- referencedata/sampledata/F_B_International_Group/AD_USER.xml | 48 +- referencedata/sampledata/F_B_International_Group/AD_WINDOW_ACCESS.xml | 294 + referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml | 66 +- referencedata/sampledata/F_B_International_Group/C_INVOICE.xml | 3958 +- referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml | 9687 + referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml | 4698 + referencedata/sampledata/F_B_International_Group/C_INVOICETAX.xml | 1020 + referencedata/sampledata/F_B_International_Group/C_ORDER.xml | 2232 + referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml | 10396 + referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml | 4029 + referencedata/sampledata/F_B_International_Group/C_ORDERTAX.xml | 576 + referencedata/sampledata/F_B_International_Group/C_ORDER_DISCOUNT.xml | 180 + referencedata/sampledata/F_B_International_Group/FACT_ACCT.xml | 415514 +-------- referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENT.xml | 46 +- referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENTLINE.xml | 1008 + referencedata/sampledata/F_B_International_Group/FIN_FINACC_TRANSACTION.xml | 1608 + referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml | 8 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml | 1812 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_DETAIL.xml | 896 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml | 174 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml | 660 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml | 2370 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml | 1332 +- referencedata/sampledata/F_B_International_Group/FIN_RECONCILIATION.xml | 116 + referencedata/sampledata/F_B_International_Group/GL_JOURNAL.xml | 216 + referencedata/sampledata/F_B_International_Group/GL_JOURNALBATCH.xml | 78 + referencedata/sampledata/F_B_International_Group/GL_JOURNALLINE.xml | 1512 + referencedata/sampledata/F_B_International_Group/M_ATTRIBUTESETINSTANCE.xml | 120 + referencedata/sampledata/F_B_International_Group/M_COSTING.xml | 1976 +- referencedata/sampledata/F_B_International_Group/M_INOUT.xml | 1548 + referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml | 5178 + referencedata/sampledata/F_B_International_Group/M_MATCHINV.xml | 1482 + referencedata/sampledata/F_B_International_Group/M_MATCHPO.xml | 2964 + referencedata/sampledata/F_B_International_Group/M_STORAGE_DETAIL.xml | 248 +- referencedata/sampledata/F_B_International_Group/M_STORAGE_PENDING.xml | 88 +- referencedata/sampledata/F_B_International_Group/M_TRANSACTION.xml | 6750 + referencedata/sampledata/F_B_International_Group/M_TRANSACTION_COST.xml | 3825 + referencedata/sampledata/F_B_International_Group/OBUIAPP_PROCESS_ACCESS.xml | 280 + src-core/src/org/openbravo/base/filter/NumberFilter.java | 1 + src-db/database/model/functions/C_COMMISSION_PROCESS.xml | 2 +- src-db/database/model/functions/M_INOUT_CREATE.xml | 13 +- src-db/database/model/functions/M_INOUT_POST.xml | 57 + src-db/database/model/functions/M_RESERVATION_POST.xml | 33 +- src-db/database/model/tables/C_IMPORT_ENTRY.xml | 4 +- src-db/database/model/tables/M_TRANSACTION.xml | 6 + src-db/database/model/triggers/AD_ACCOUNTINGRPT_ELEMENT_TRG.xml | 27 +- src-db/database/model/triggers/AD_PACKAGE_JP_TRG.xml | 5 +- src-db/database/model/triggers/C_ORDERLINE2_TRG.xml | 21 +- src-db/database/model/views/M_CREATEPOLINES_PE_V.xml | 2 +- src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml | 2 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 33 + src-db/database/sourcedata/AD_COLUMN.xml | 34 + src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml | 4 +- src-db/database/sourcedata/AD_FIELD.xml | 32 +- src-db/database/sourcedata/AD_MESSAGE.xml | 53 +- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_REF_LIST.xml | 4 +- src-db/database/sourcedata/AD_TAB.xml | 3 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 22 +- src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 27 +- src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 2 + src-test/.classpath.template | 28 + src-test/.project | 28 + src-test/build.xml | 43 +- src-test/src/org/openbravo/test/AllAntTaskTests.java | 45 +- src-test/src/org/openbravo/test/AllTests.java | 6 +- src-test/src/org/openbravo/test/AntTaskTests.java | 8 +- src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DatabaseDecimalNumberCheck.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DatabaseDecimalNumberCheckData.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DatabaseVersionCheck.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DatabaseVersionCheckData.class | 0 src-util/buildvalidation/src/org/openbravo/buildvalidation/DatabaseDecimalNumberCheck.java | 55 + src-util/buildvalidation/src/org/openbravo/buildvalidation/DatabaseDecimalNumberCheck_data.xsql | 30 + src-util/buildvalidation/src/org/openbravo/buildvalidation/DatabaseVersionCheck.java | 120 + src-util/buildvalidation/src/org/openbravo/buildvalidation/DatabaseVersionCheck_data.xsql | 37 + src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePaymentBPClientDimension.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePaymentBPClientDimensionData.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePaymentPlan.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePaymentPlanData.class | 0 src-util/modulescript/src/org/openbravo/modulescript/UpdatePaymentBPClientDimension.java | 41 + src-util/modulescript/src/org/openbravo/modulescript/UpdatePaymentBPClientDimension_data.xsql | 72 + src-util/modulescript/src/org/openbravo/modulescript/UpdatePaymentPlan.java | 4 +- src-util/modulescript/src/org/openbravo/modulescript/UpdatePaymentPlan_data.xsql | 44 +- src/org/openbravo/base/model/Property.java | 14 +- src/org/openbravo/common/actionhandler/CheckAvailableCreditActionHandler.java | 59 + src/org/openbravo/common/actionhandler/SetNewBPCurrency.java | 239 +- src/org/openbravo/configuration/ConfigurationApp.java | 26 +- src/org/openbravo/costing/AverageCostAdjustment.java | 42 +- src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java | 8 + src/org/openbravo/costing/CostingBackground.java | 5 +- src/org/openbravo/costing/CostingServer.java | 10 +- src/org/openbravo/costing/LCMatchingProcess.java | 40 +- src/org/openbravo/costing/LandedCostDistributionByAmount.java | 30 +- src/org/openbravo/costing/LandedCostProcess.java | 46 +- src/org/openbravo/costing/PriceDifferenceProcess.java | 10 +- src/org/openbravo/costing/StandardCostAdjustment.java | 36 +- src/org/openbravo/dal/core/SessionHandler.java | 8 + src/org/openbravo/erpCommon/ad_forms/AcctSchemaElement.java | 4 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 2 + src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 6 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 3 +- src/org/openbravo/erpCommon/ad_reports/CustomerStatement.jrxml | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.html | 4 +- src/org/openbravo/erpCommon/security/Login.html | 6 +- src/org/openbravo/erpCommon/utility/DateTime_data.xsql | 7 + src/org/openbravo/erpCommon/utility/Utility.java | 1 + src/org/openbravo/event/GLJournalEventHandler.java | 12 +- src/org/openbravo/event/PaidStatusEventHandler.java | 5 +- src/org/openbravo/event/RoleEventHandler.java | 173 + src/org/openbravo/financial/FinancialUtils.java | 29 +- src/org/openbravo/service/importprocess/ImportEntryArchiveManager.java | 7 +- src/org/openbravo/service/importprocess/ImportEntryManager.java | 85 +- src/org/openbravo/service/importprocess/ImportEntryProcessor.java | 126 +- src/org/openbravo/service/importprocess/ImportReprocessErrorEntries.java | 3 +- src/org/openbravo/service/importprocess/ProcessImportEntriesProcessActionHandler.java | 3 +- src/org/openbravo/service/rest/bo.xslt | 30 +- src/org/openbravo/service/web/WebServiceUtil.java | 13 +- web/js/checkAvailableCredit.js | 65 + 284 files changed, 124454 insertions(+), 472553 deletions(-) diffs (truncated from 668125 to 300 lines): diff -r 0e4099b33747 -r 95cedd0d623c .hgsigs --- a/.hgsigs Thu Jun 04 23:31:13 2015 +0000 +++ b/.hgsigs Wed Jul 08 08:13:50 2015 +0200 @@ -169,5 +169,7 @@ 295e0a259f619311101efee9f1d31aede5bdaa95 0 iEYEABECAAYFAlUZK3oACgkQCX/oGf+2qkOrywCdFORG9mDgA9SMY95tQrtMYtUftS0AoK6d8rFNeUz9xDvAP/y0B+2myvoN 4d63b001f63758b1b79b9502621754878acdfdff 0 iEYEABECAAYFAlUwx7cACgkQCX/oGf+2qkOn2gCcCxKfDDCR1P8qYR9bNtxTIs81JY8AniiMcNvRgeOQ6DOF+jHHVksUM4eO ac3537eef819b48dc9888d5ab0d4fec470158bef 0 iEYEABECAAYFAlVbMyIACgkQCX/oGf+2qkPRzwCfYI94AYb2DYsvojxmVtqMVqKjGiQAoIfADynxGuktv9GHEwfJOnnLCxv3 +370bc533058038007007c659c47de628c4bdcfd6 0 iEYEABECAAYFAlWCjH4ACgkQCX/oGf+2qkP10wCgmhrDxV+DCix0YGwG3nzoCyoug9kAoMoxktPF74eqwpkmVy3uyn5RYT5O ac761ac78f576cee64046e115ac42d2a3b227682 0 iEYEABECAAYFAlVItlgACgkQCX/oGf+2qkPgSACeNz58xoUWpTvMywmncbWx7+r7bnUAn1Ba1al80Q9HMY/wiMNu1Vfpd9Jo fdb1e0cd936d09381ae1aa87be98cc4f0f334f31 0 iEYEABECAAYFAlVbM8QACgkQCX/oGf+2qkO+wACfTbKub/UT0e2V2iyIB21716NAn/oAoIHu7PYZ7w/BkTQDZWR0PXDdYkty +bd0e758ae44eb624d8af403fb4764629c1a45b21 0 iEYEABECAAYFAlWChbsACgkQCX/oGf+2qkM6xACfXP4M7zXaih+uqkIpGHMqGPTzxD8An0r58zI1YN3gKOT9t0kZ3IdaNA7c diff -r 0e4099b33747 -r 95cedd0d623c .hgtags --- a/.hgtags Thu Jun 04 23:31:13 2015 +0000 +++ b/.hgtags Wed Jul 08 08:13:50 2015 +0200 @@ -180,5 +180,7 @@ 31dfe7896f8fcd9390b979d7c6972f5aea00d199 3.0PR15Q1.2 ad409516bfa0b1c6f7ab128cab4526dd5058c787 3.0PR15Q1.3 d5ec99ff8e8e301cf4bf673f37b9c04ea1758f98 3.0PR15Q1.4 +d2f1dd0d0b4c2e493c26a4b9cbdb20fdc50c5f13 3.0PR15Q1.5 4239774eb8de8f0740bfbd6e3e36c075ee2a5a91 3.0PR15Q2 e861122b0b1d2aa2ca6e177bfbb9ddf939e33dd7 3.0PR15Q2.1 +a28a880b5aeb9208eaf0ce569fd51b7a5fc2b48e 3.0PR15Q2.2 diff -r 0e4099b33747 -r 95cedd0d623c build.xml --- a/build.xml Thu Jun 04 23:31:13 2015 +0000 +++ b/build.xml Wed Jul 08 08:13:50 2015 +0200 @@ -597,6 +597,10 @@ <ant dir="${base.src.test}" target="run.quick.tests" inheritAll="true" inheritRefs="true" /> </target> + <target name="run.test" depends="init"> + <ant dir="${base.src.test}" target="run.test" inheritAll="true" inheritRefs="true" /> + </target> + <target name="run.api.test.javascript"> <ant dir="${base.src.test}" target="run.api.test.javascript" inheritAll="true" inheritRefs="true" /> </target> diff -r 0e4099b33747 -r 95cedd0d623c legal/Licensing.txt --- a/legal/Licensing.txt Thu Jun 04 23:31:13 2015 +0000 +++ b/legal/Licensing.txt Wed Jul 08 08:13:50 2015 +0200 @@ -212,6 +212,7 @@ # ejb-api-3.0.jar # jboss-interceptor-api-3.1.0-CR3.jar # jboss-ejb3-api-3.1.0.jar +# jboss-el-api_2.2_spec-1.0.0.Final.jar Under the LGPL license (included as LGPL-2.1.txt in this folder) # cal10n-api-0.7.4.jar @@ -227,17 +228,28 @@ # weld-core-1.1.24.Final.jar # weld-servlet-core-1.1.24.Final.jar # weld-spi.jar -# arquillian-api-1.0.0.Alpha4.jar -# arquillian-impl-base-1.0.0.Alpha4.jar -# arquillian-junit-1.0.0.Alpha4.jar -# arquillian-protocol-local-1.0.0.Alpha4.jar -# arquillian-spi-1.0.0.Alpha4.jar -# arquillian-testenricher-cdi-1.0.0.Alpha4.jar -# arquillian-weld-ee-embedded-1.1-1.0.0.Alpha4.jar -# shrinkwrap-api-1.0.0-alpha-11.jar -# shrinkwrap-extension-classloader-1.0.0-alpha-11.jar -# shrinkwrap-impl-base-1.0.0-alpha-11.jar -# shrinkwrap-spi-1.0.0-alpha-11.jar +# arquillian-config-api-1.1.8.Final.jar +# arquillian-config-impl-base-1.1.8.Final.jar +# arquillian-container-impl-base-1.1.8.Final.jar +# arquillian-container-spi-1.1.8.Final.jar +# arquillian-container-test-api-1.1.8.Final.jar +# arquillian-container-test-impl-base-1.1.8.Final.jar +# arquillian-container-test-spi-1.1.8.Final.jar +# arquillian-core-api-1.1.8.Final.jar +# arquillian-core-impl-base-1.1.8.Final.jar +# arquillian-core-spi-1.1.8.Final.jar +# arquillian-junit-container-1.1.8.Final.jar +# arquillian-junit-core-1.1.8.Final.jar +# arquillian-test-api-1.1.8.Final.jar +# arquillian-testenricher-cdi-1.0.2.Final.jar +# arquillian-test-impl-base-1.1.8.Final.jar +# arquillian-test-spi-1.1.8.Final.jar +# arquillian-weld-ee-embedded-1.1-1.0.0.CR8.jar +# shrinkwrap-api-1.2.2.jar +# shrinkwrap-descriptors-api-base-2.0.0-alpha-7.jar +# shrinkwrap-descriptors-spi-2.0.0-alpha-7.jar +# shrinkwrap-impl-base-1.2.2.jar +# shrinkwrap-spi-1.2.2.jar # validation-api-1.0.0.GA.jar # jsmin.0.2.4.jar # httpcore-4.0.1.jar diff -r 0e4099b33747 -r 95cedd0d623c modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrdersData.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrdersData.class has changed diff -r 0e4099b33747 -r 95cedd0d623c modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Thu Jun 04 23:31:13 2015 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Wed Jul 08 08:13:50 2015 +0200 @@ -904,7 +904,7 @@ END IF; END IF; - IF (cur_finaccpaymentmethod.ExecutionType<>'A') THEN + IF (cur_finaccpaymentmethod.ExecutionType<>'A') THEN UPDATE FIN_PAYMENT_SCHEDULE SET PAIDAMT = (SELECT COALESCE(sum(amount + COALESCE(writeoffamt, 0)), 0) FROM fin_payment_scheduledetail @@ -919,13 +919,7 @@ OUTSTANDINGAMT = (SELECT COALESCE(sum(amount), 0) FROM fin_payment_scheduledetail WHERE fin_payment_schedule_order=cur_PaymentScheduleOrder.FIN_PAYMENT_SCHEDULE_ORDER AND - (fin_payment_detail_id is null OR - exists (SELECT 1 - FROM fin_payment, fin_payment_detail - WHERE fin_payment.fin_payment_id = fin_payment_detail.fin_payment_id - and fin_payment.processed='Y' - and fin_payment_scheduledetail.isinvoicepaid='Y' - and fin_payment_detail.fin_payment_detail_id = fin_payment_scheduledetail.fin_payment_detail_id))) + (fin_payment_detail_id is null OR isinvoicepaid='N')) WHERE FIN_PAYMENT_SCHEDULE_ID = cur_PaymentScheduleOrder.FIN_PAYMENT_SCHEDULE_ORDER; END IF; @@ -936,16 +930,15 @@ UPDATE FIN_PAYMENT SET DESCRIPTION = v_finpayment_desc WHERE FIN_PAYMENT_ID = v_FIN_PAYMENT_ID; - FOR cur_invoicepaid IN ( - select isinvoicepaid from fin_payment_scheduledetail fpsd - left join fin_payment_detail fpd on fpsd.fin_payment_detail_id=fpd.fin_payment_detail_id - left join fin_payment fp on fpd.fin_payment_id=fp.fin_payment_id - left join fin_payment_schedule ps ON ps.fin_payment_schedule_id = fpsd.fin_payment_schedule_invoice - WHERE ps.c_invoice_id =p_record_id - ) - LOOP + SELECT count(*) INTO v_count + FROM fin_payment_schedule fps + WHERE exists(select 1 + from fin_payment_scheduledetail fpsd + where fps.fin_payment_schedule_id = fpsd.fin_payment_schedule_invoice + and fpsd.isinvoicepaid='N') + AND FIN_PAYMENT_SCHEDULE_ID = cur_paymentschedule.FIN_PAYMENT_SCHEDULE_ID; - IF ((cur_finaccpaymentmethod.ExecutionType<>'A') AND (cur_invoicepaid.isinvoicepaid='Y')) THEN + IF (cur_finaccpaymentmethod.ExecutionType<>'A' AND v_count = 0) THEN UPDATE FIN_PAYMENT_SCHEDULE SET PAIDAMT = PAIDAMT + COALESCE(cur_paymentschedule.OUTSTANDINGAMT,0), OUTSTANDINGAMT = OUTSTANDINGAMT - COALESCE(cur_paymentschedule.OUTSTANDINGAMT, 0) @@ -994,7 +987,6 @@ SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - v_ConvertedAmount WHERE C_BPARTNER_ID = v_BPartner_ID; END IF; - END LOOP; -- Automatic creation of financial transaction IF(cur_finaccpaymentmethod.CreateFinTransaction = 'Y' AND cur_finaccpaymentmethod.ExecutionType = 'M') THEN v_ResultStr:='Generating FIN_FINACC_TRANSACTION'; diff -r 0e4099b33747 -r 95cedd0d623c modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml Thu Jun 04 23:31:13 2015 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml Wed Jul 08 08:13:50 2015 +0200 @@ -19,7 +19,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-2014 Openbravo SLU +* All portions are Copyright (C) 2011-2015 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -33,6 +33,7 @@ TYPE RECORD IS REF CURSOR; Cur_Dbprefix RECORD; v_invoicepaidstatus VARCHAR2(32); + v_fin_payment_schedule_order VARCHAR(32); v_fin_payment_schedule_invoice VARCHAR(32); v_p_fin_psd_id VARCHAR(32); BEGIN @@ -52,13 +53,13 @@ END IF; IF (v_p_fin_psd_id is not null ) THEN - select isinvoicepaid , fin_payment_schedule_invoice - into v_isinvoicepaid , v_fin_payment_schedule_invoice + select isinvoicepaid, fin_payment_schedule_order, fin_payment_schedule_invoice + into v_isinvoicepaid, v_fin_payment_schedule_order, v_fin_payment_schedule_invoice from fin_payment_scheduledetail where fin_payment_scheduledetail_id=v_p_fin_psd_id; END IF; - IF (v_fin_payment_schedule_invoice is not null)THEN + IF (v_fin_payment_schedule_order is not null OR v_fin_payment_schedule_invoice is not null) THEN IF(v_isinvoicepaid='Y')THEN -- core intermediate statuses v_isPaymentConfirmed := 'Y'; diff -r 0e4099b33747 -r 95cedd0d623c modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml Wed Jul 08 08:13:50 2015 +0200 @@ -0,0 +1,49 @@ +<?xml version="1.0"?> + <database name="FUNCTION APRM_SEQNOINVPAIDSTATUS"> + <function name="APRM_SEQNOINVPAIDSTATUS" type="VARCHAR"> + <parameter name="p_paymentmethod_id" type="VARCHAR" mode="in"> + <default/> + </parameter> + <parameter name="p_financialaccount_id" type="VARCHAR" mode="in"> + <default/> + </parameter> + <parameter name="p_isreceipt" type="CHAR" mode="in"> + <default/> + </parameter> + <body><![CDATA[/************************************************************************* +* 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) 2015 Openbravo SLU +* All Rights Reserved. +* Contributor(s): ______________________________________. +************************************************************************/ + v_invoicepaidstatus fin_finacc_paymentmethod.payin_invoicepaidstatus%TYPE; + +BEGIN + + SELECT CASE p_isReceipt WHEN 'Y' THEN payin_invoicepaidstatus + ELSE payout_invoicepaidstatus END AS invoicepaidstatus + INTO v_invoicepaidstatus + FROM fin_finacc_paymentmethod + WHERE fin_financial_account_id = p_financialaccount_id + and fin_paymentmethod_id = p_paymentmethod_id; + + RETURN aprm_seqnumberpaymentstatus(v_invoicepaidstatus); + +EXCEPTION +WHEN OTHERS THEN + DBMS_OUTPUT.PUT_LINE('aprm_seqnumberinvoicepaidstatus exception'); + RAISE; +END APRM_SEQNOINVPAIDSTATUS +]]></body> + </function> + </database> diff -r 0e4099b33747 -r 95cedd0d623c modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml Thu Jun 04 23:31:13 2015 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml Wed Jul 08 08:13:50 2015 +0200 @@ -29,5 +29,9 @@ <default/> <onCreateDefault/> </column> + <column name="EM_APRM_ADDMULTIPLEPAYMENTS" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"> + <default><![CDATA[N]]></default> + <onCreateDefault/> + </column> </table> </database> diff -r 0e4099b33747 -r 95cedd0d623c modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Thu Jun 04 23:31:13 2015 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Wed Jul 08 08:13:50 2015 +0200 @@ -407,7 +407,7 @@ <!--0F5C7245380C4C96841D3452F3C1FE47--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--0F5C7245380C4C96841D3452F3C1FE47--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--0F5C7245380C4C96841D3452F3C1FE47--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--0F5C7245380C4C96841D3452F3C1FE47--> <POSITION><![CDATA[41]]></POSITION> +<!--0F5C7245380C4C96841D3452F3C1FE47--> <POSITION><![CDATA[40]]></POSITION> <!--0F5C7245380C4C96841D3452F3C1FE47--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--0F5C7245380C4C96841D3452F3C1FE47--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--0F5C7245380C4C96841D3452F3C1FE47--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> @@ -1830,7 +1830,7 @@ <!--394FD1143C904A8C9E6A2AD42085CB9B--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--394FD1143C904A8C9E6A2AD42085CB9B--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--394FD1143C904A8C9E6A2AD42085CB9B--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--394FD1143C904A8C9E6A2AD42085CB9B--> <POSITION><![CDATA[43]]></POSITION> +<!--394FD1143C904A8C9E6A2AD42085CB9B--> <POSITION><![CDATA[41]]></POSITION> <!--394FD1143C904A8C9E6A2AD42085CB9B--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--394FD1143C904A8C9E6A2AD42085CB9B--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--394FD1143C904A8C9E6A2AD42085CB9B--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> @@ -6909,7 +6909,7 @@ <!--9DC8500B414640E09BF61A3D14FE13D1--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--9DC8500B414640E09BF61A3D14FE13D1--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--9DC8500B414640E09BF61A3D14FE13D1--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--9DC8500B414640E09BF61A3D14FE13D1--> <POSITION><![CDATA[40]]></POSITION> +<!--9DC8500B414640E09BF61A3D14FE13D1--> <POSITION><![CDATA[39]]></POSITION> <!--9DC8500B414640E09BF61A3D14FE13D1--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--9DC8500B414640E09BF61A3D14FE13D1--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--9DC8500B414640E09BF61A3D14FE13D1--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> @@ -7082,7 +7082,7 @@ <!--A028C07508878CB9E040007F01007210--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--A028C07508878CB9E040007F01007210--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--A028C07508878CB9E040007F01007210--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--A028C07508878CB9E040007F01007210--> <POSITION><![CDATA[36]]></POSITION> +<!--A028C07508878CB9E040007F01007210--> <POSITION><![CDATA[35]]></POSITION> <!--A028C07508878CB9E040007F01007210--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--A028C07508878CB9E040007F01007210--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--A028C07508878CB9E040007F01007210--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> @@ -7115,7 +7115,7 @@ <!--A04179EAC69DF848E040007F01004523--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--A04179EAC69DF848E040007F01004523--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--A04179EAC69DF848E040007F01004523--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--A04179EAC69DF848E040007F01004523--> <POSITION><![CDATA[37]]></POSITION> +<!--A04179EAC69DF848E040007F01004523--> <POSITION><![CDATA[36]]></POSITION> <!--A04179EAC69DF848E040007F01004523--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--A04179EAC69DF848E040007F01004523--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--A04179EAC69DF848E040007F01004523--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> ------------------------------------------------------------------------------ Don't Limit Your Business. Reach for the Cloud. GigeNET's Cloud Solutions provide you with the tools and support that you need to offload your IT needs and focus on growing your business. Configured For All Businesses. Start Your Cloud Today. https://www.gigenetcloud.com/ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
