details: https://code.openbravo.com/erp/devel/pi/rev/11ccc6531d6b changeset: 34074:11ccc6531d6b user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon May 21 10:14:54 2018 +0200 summary: [trg] using try with resources to handle trigger status statement
details: https://code.openbravo.com/erp/devel/pi/rev/773e35503edb changeset: 34075:773e35503edb user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon May 21 11:16:46 2018 +0200 summary: [trg] soft trigger enabling/disabling implemented with session vars in PG Oracle implementation continues being the same. details: https://code.openbravo.com/erp/devel/pi/rev/5d192155cd33 changeset: 34076:5d192155cd33 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon May 21 12:12:06 2018 +0200 summary: [trg] removed ad_session_status table * In PostgreSQL it is not longer used * In Oracle is now created in prescript details: https://code.openbravo.com/erp/devel/pi/rev/ab3cd3209fbf changeset: 34077:ab3cd3209fbf user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon May 21 12:39:41 2018 +0200 summary: [trg] fixed Oracle pre-script details: https://code.openbravo.com/erp/devel/pi/rev/6bd7b90e76ac changeset: 34078:6bd7b90e76ac user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon May 21 14:25:00 2018 +0200 summary: [trg] pi merge details: https://code.openbravo.com/erp/devel/pi/rev/1f5a3e1bd135 changeset: 34079:1f5a3e1bd135 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue May 22 09:14:11 2018 +0200 summary: [trg] added pl procedures to disable/enable triggers details: https://code.openbravo.com/erp/devel/pi/rev/bba47a97db65 changeset: 34080:bba47a97db65 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed May 23 16:24:15 2018 +0200 summary: [trg] pi merge details: https://code.openbravo.com/erp/devel/pi/rev/8e8afbdc4bf7 changeset: 34081:8e8afbdc4bf7 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed May 23 16:26:02 2018 +0200 summary: [trg] updated java doc details: https://code.openbravo.com/erp/devel/pi/rev/73d59904b4b5 changeset: 34082:73d59904b4b5 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed May 23 16:44:03 2018 +0200 summary: [trg] fixed Oracle prescript details: https://code.openbravo.com/erp/devel/pi/rev/45e3ada3a34e changeset: 34083:45e3ada3a34e user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu May 24 09:45:10 2018 +0200 summary: [trg] fixed PG pre-script details: https://code.openbravo.com/erp/devel/pi/rev/d85758c69a72 changeset: 34084:d85758c69a72 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu May 24 11:48:27 2018 +0200 summary: [trg] fixed Oracle-PG compat issue when invoking trigger handling PL functions To invoke a PL function PG requires to use the PERFORM kwy word whereas Oracle does not support it, the function is directly invoked. This is covered in DBSM for the standard functions defined in database model, but it was not if the function is created in pre-script which is the case of these functions for triggers. Now DBSM takes care of these 2 functions as exceptional cases. details: https://code.openbravo.com/erp/devel/pi/rev/6be442647e08 changeset: 34085:6be442647e08 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu May 24 11:58:13 2018 +0200 summary: [trg] fixed db inconsistency details: https://code.openbravo.com/erp/devel/pi/rev/a75602ecbd5c changeset: 34086:a75602ecbd5c user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu May 24 16:37:16 2018 +0200 summary: [trg] reformat details: https://code.openbravo.com/erp/devel/pi/rev/874eed7c5f1c changeset: 34087:874eed7c5f1c user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri May 25 10:23:49 2018 +0200 summary: [trg] changed error messages to mention functinallity, not implementation details: https://code.openbravo.com/erp/devel/pi/rev/99114944648b changeset: 34088:99114944648b user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon May 28 12:26:48 2018 +0200 summary: fixes 38629: do not use ad_session_status to disable PG triggers * In PostgreSQL triggers are now disabled using session variables. * Oracle implementation remains as it was before diffstat: .hgsigs | 1 + .hgtags | 1 + build.xml | 11 +- 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.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/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 | 28 +- 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/event/ObserverBaseTest.java | 2 + modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderLineTestObserver.java | 7 + modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderTestObserver.java | 7 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js | 21 +- 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.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.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.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.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 22 +- referencedata/sampledata/QA_Testing/M_INOUT.xml | 32 + src-db/database/lib/dbsourcemanager.jar | Bin src-db/database/model/excludeFilter.xml | 5 + src-db/database/model/functions/AD_ISTRIGGERENABLED.xml | 40 - src-db/database/model/functions/C_INVOICETAX_ADJUSTMENT.xml | 18 +- src-db/database/model/functions/C_ORDERTAX_ADJUSTMENT.xml | 18 +- src-db/database/model/functions/C_ORDER_POST1.xml | 32 + src-db/database/model/prescript-Oracle.sql | 105 + src-db/database/model/prescript-PostgreSql.sql | 82 + src-db/database/model/tables/AD_SESSION_STATUS.xml | 49 - src-db/database/model/tables/M_INOUT.xml | 2 +- src-db/database/model/tables/M_PRODUCT.xml | 8 + src-db/database/model/tables/M_PRODUCT_STATUS.xml | 98 + src-db/database/model/tables/M_PRODUCT_STATUS_TRL.xml | 74 + src-db/database/sourcedata/AD_COLUMN.xml | 1653 +++++++-- src-db/database/sourcedata/AD_DATASET_TABLE.xml | 14 + src-db/database/sourcedata/AD_ELEMENT.xml | 150 +- src-db/database/sourcedata/AD_FIELD.xml | 697 ++++ src-db/database/sourcedata/AD_MENU.xml | 14 + src-db/database/sourcedata/AD_MESSAGE.xml | 84 + src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_REFERENCE.xml | 14 + src-db/database/sourcedata/AD_TAB.xml | 59 + src-db/database/sourcedata/AD_TABLE.xml | 74 +- src-db/database/sourcedata/AD_TREENODE.xml | 11 + src-db/database/sourcedata/AD_WINDOW.xml | 16 + src-db/database/sourcedata/M_PRODUCT_STATUS.xml | 93 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 18 + src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 176 + src-test/src/org/openbravo/test/AllAntTaskTests.java | 4 + src-test/src/org/openbravo/test/base/OBBaseTest.java | 22 +- src-test/src/org/openbravo/test/dal/IssuesTest.java | 6 +- src-test/src/org/openbravo/test/productStatus/ProductStatusTest.java | 223 + src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateIsCompletelyInvoicedData.class | Bin src-util/modulescript/src/org/openbravo/modulescript/UpdateIsCompletelyInvoiced_data.xsql | 4 +- src/index.jsp | 6 +- src/org/openbravo/authentication/AuthenticationManager.java | 11 + src/org/openbravo/authentication/basic/AutologonAuthenticationManager.java | 7 +- src/org/openbravo/dal/core/DalLayerInitializer.java | 6 +- src/org/openbravo/dal/core/TriggerHandler.java | 68 +- src/org/openbravo/dal/service/OBDal.java | 2 +- src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java | 2 + 94 files changed, 3577 insertions(+), 672 deletions(-) diffs (truncated from 6529 to 300 lines): diff -r 055351d43c80 -r 99114944648b .hgsigs --- a/.hgsigs Fri May 18 13:37:54 2018 +0200 +++ b/.hgsigs Mon May 28 12:26:48 2018 +0200 @@ -230,3 +230,4 @@ c38ab6f55348fbb5963fd77b770f939a5c0eda23 0 iEYEABECAAYFAlq0lSgACgkQCX/oGf+2qkN3FwCgggZ7hoUQveeRYCuBBuHAi77v84gAn1RBjuscKhHjc7ouPvgiPgIVanBb 9bad88c00b5da708f3e9c1abacd25ea6e6cfd664 0 iEUEABECAAYFAlrXODoACgkQCX/oGf+2qkOblACg0WOwH27TgkH75iKw2Y9tNYxSL8oAl3j0FbjQF6F05ESzZC0l3Uv2Nfg= dc2ef98dc38f7c32c888dcf1f1adb37c6afb4d14 0 iEYEABECAAYFAlrxbisACgkQCX/oGf+2qkMMCwCdFeF47f2MY7Pq3cdsyHon64EYekwAoPYllLnhYETGsUEqtiKSxvj9Mgxb +2121d856284cf0c4f26faef336bd2aa41ada151f 0 iEYEABECAAYFAlr8AykACgkQCX/oGf+2qkPKhQCfeQ+9S16IA3wZMgnoJjRRZRvG8SUAoIgKQPopjsjObnB6Qu1DyNgCByRt diff -r 055351d43c80 -r 99114944648b .hgtags --- a/.hgtags Fri May 18 13:37:54 2018 +0200 +++ b/.hgtags Mon May 28 12:26:48 2018 +0200 @@ -241,3 +241,4 @@ 03f6ac7d17926657b093b25f613a4cd3fb47ef65 3.0PR18Q1.1 650aaadd6b6c5fda4f7ad957701face4fa4c3317 3.0PR18Q1.2 307b23f7635f3e92dd8fc8e7d55d09b7c914384c 3.0PR18Q2 +63c5e173ffdca0828d75476e5a48e2fae42ad9e9 3.0PR18Q1.3 diff -r 055351d43c80 -r 99114944648b build.xml --- a/build.xml Fri May 18 13:37:54 2018 +0200 +++ b/build.xml Mon May 28 12:26:48 2018 +0200 @@ -100,6 +100,15 @@ <equals arg1="${ant.java.version}" arg2="1.7"/> </condition> + <condition property="html.version" value="-html5" else=""> + <not> + <or> + <equals arg1="${ant.java.version}" arg2="1.7"/> + <equals arg1="${ant.java.version}" arg2="1.8"/> + </or> + </not> + </condition> + <condition property="calculate.core.rev"> <istrue value="${calculate.core.revision}"/> </condition> @@ -525,7 +534,7 @@ </target> <target name="generate.java.doc"> - <javadoc Windowtitle="${title}" access="protected" Header="${header}" Footer="${footer}" destdir="${build.docs}" maxmemory="1024M" failonerror="yes" additionalparam="${xdoclint.missing}"> + <javadoc Windowtitle="${title}" access="protected" Header="${header}" Footer="${footer}" destdir="${build.docs}" maxmemory="1024M" failonerror="yes" additionalparam="${xdoclint.missing} ${html.version}"> <sourcepath> <pathelement path="${base.src}" /> <pathelement path="${base.src.test}/src" /> diff -r 055351d43c80 -r 99114944648b modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri May 18 13:37:54 2018 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon May 28 12:26:48 2018 +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.33972]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.34018]]></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 055351d43c80 -r 99114944648b 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 Fri May 18 13:37:54 2018 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon May 28 12:26:48 2018 +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.33972]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.34018]]></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.33972]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.34018]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 055351d43c80 -r 99114944648b modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml Fri May 18 13:37:54 2018 +0200 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml Mon May 28 12:26:48 2018 +0200 @@ -6,7 +6,7 @@ <!--8A098711BB324335A19833286BDB093D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--8A098711BB324335A19833286BDB093D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8A098711BB324335A19833286BDB093D--> <NAME><![CDATA[Apache External Connection Pool]]></NAME> -<!--8A098711BB324335A19833286BDB093D--> <VERSION><![CDATA[1.0.33972]]></VERSION> +<!--8A098711BB324335A19833286BDB093D--> <VERSION><![CDATA[1.0.34018]]></VERSION> <!--8A098711BB324335A19833286BDB093D--> <DESCRIPTION><![CDATA[Apache External Connection Pool]]></DESCRIPTION> <!--8A098711BB324335A19833286BDB093D--> <HELP><![CDATA[This module implements the Apache JDBC Connection Pool (http://wiki.openbravo.com/wiki/Modules:Apache_JDBC_Connection_Pool).]]></HELP> <!--8A098711BB324335A19833286BDB093D--> <TYPE><![CDATA[M]]></TYPE> diff -r 055351d43c80 -r 99114944648b modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri May 18 13:37:54 2018 +0200 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon May 28 12:26:48 2018 +0200 @@ -7,7 +7,7 @@ <!--1467C397BC5F4999A5606F39CD6FF8A4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <AD_MODULE_ID><![CDATA[8A098711BB324335A19833286BDB093D]]></AD_MODULE_ID> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID> -<!--1467C397BC5F4999A5606F39CD6FF8A4--> <STARTVERSION><![CDATA[2.1.33972]]></STARTVERSION> +<!--1467C397BC5F4999A5606F39CD6FF8A4--> <STARTVERSION><![CDATA[2.1.34018]]></STARTVERSION> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 055351d43c80 -r 99114944648b modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Fri May 18 13:37:54 2018 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Mon May 28 12:26:48 2018 +0200 @@ -6,7 +6,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME> -<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.33972]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.34018]]></VERSION> <!--C70732EA90A14EC0916078B85CC33D2D--> <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION> <!--C70732EA90A14EC0916078B85CC33D2D--> <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP> <!--C70732EA90A14EC0916078B85CC33D2D--> <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL> diff -r 055351d43c80 -r 99114944648b modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri May 18 13:37:54 2018 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon May 28 12:26:48 2018 +0200 @@ -7,7 +7,7 @@ <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.33972]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.34018]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 055351d43c80 -r 99114944648b modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/WeldBaseTest.java --- a/modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/WeldBaseTest.java Fri May 18 13:37:54 2018 +0200 +++ b/modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/WeldBaseTest.java Mon May 28 12:26:48 2018 +0200 @@ -11,19 +11,24 @@ * 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-2017 Openbravo SLU + * All portions are Copyright (C) 2010-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ */ package org.openbravo.base.weld.test; +import java.util.HashMap; +import java.util.Map; + import javax.enterprise.inject.Any; +import javax.enterprise.inject.Instance; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.util.AnnotationLiteral; import javax.inject.Inject; +import org.hibernate.dialect.function.SQLFunction; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -38,6 +43,7 @@ import org.openbravo.base.weld.WeldUtils; import org.openbravo.client.kernel.KernelInitializer; import org.openbravo.dal.core.OBInterceptor; +import org.openbravo.dal.core.SQLFunctionRegister; import org.openbravo.test.base.OBBaseTest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -99,6 +105,10 @@ @Inject private KernelInitializer kernelInitializer; + @Inject + @Any + private Instance<SQLFunctionRegister> sqlFunctionRegisters; + /** * Sets static instance bean manager in WeldUtils so it is globally accessible and initializes * kernel. @@ -111,6 +121,7 @@ @Before public void setUp() throws Exception { if (!initialized) { + initializeDalLayer(getSqlFunctions()); WeldUtils.setStaticInstanceBeanManager(beanManager); kernelInitializer.setInterceptor(); weldUtils.setBeanManager(beanManager); @@ -119,6 +130,21 @@ super.setUp(); } + private Map<String, SQLFunction> getSqlFunctions() { + Map<String, SQLFunction> sqlFunctions = new HashMap<>(); + if (sqlFunctionRegisters == null) { + return sqlFunctions; + } + for (SQLFunctionRegister register : sqlFunctionRegisters) { + Map<String, SQLFunction> registeredSqlFunctions = register.getSQLFunctions(); + if (registeredSqlFunctions == null) { + continue; + } + sqlFunctions.putAll(registeredSqlFunctions); + } + return sqlFunctions; + } + /** * Once we are done with the class execution, OBInterceptor needs to be reset other case when * executing a suite it will reuse the container created for the previous classes instead of the diff -r 055351d43c80 -r 99114944648b modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Fri May 18 13:37:54 2018 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Mon May 28 12:26:48 2018 +0200 @@ -6,7 +6,7 @@ <!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface Application]]></NAME> -<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.33972]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.34018]]></VERSION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL> diff -r 055351d43c80 -r 99114944648b modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri May 18 13:37:54 2018 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon May 28 12:26:48 2018 +0200 @@ -7,7 +7,7 @@ <!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID> -<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.33972]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.34018]]></STARTVERSION> <!--15D7CE8D95D043189162DBABA54A1F61--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--60A170212F36499D83B8AD38D01F46B3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID> -<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.33972]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.34018]]></STARTVERSION> <!--60A170212F36499D83B8AD38D01F46B3--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -35,7 +35,7 @@ <!--824D60CB352E4099B1D8C903CA139DAE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.33972]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.34018]]></STARTVERSION> <!--824D60CB352E4099B1D8C903CA139DAE--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -49,7 +49,7 @@ <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID> -<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.33972]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.34018]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 055351d43c80 -r 99114944648b modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/ObserverBaseTest.java --- a/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/ObserverBaseTest.java Fri May 18 13:37:54 2018 +0200 +++ b/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/ObserverBaseTest.java Mon May 28 12:26:48 2018 +0200 @@ -51,6 +51,8 @@ OrderTestObserver.resetExecutionCount(); OrderLineTestObserver.resetExecutionCount(); super.setUp(); + OrderTestObserver.refreshObservedEntities(); + OrderLineTestObserver.refreshObservedEntities(); } protected OrderLine pickARandomOrderLine() { diff -r 055351d43c80 -r 99114944648b modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderLineTestObserver.java --- a/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderLineTestObserver.java Fri May 18 13:37:54 2018 +0200 +++ b/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderLineTestObserver.java Mon May 28 12:26:48 2018 +0200 @@ -151,4 +151,11 @@ public static int getNumberOfClosedTrxs() { return endTrx; } + + public static void refreshObservedEntities() { + Entity currentEntity = ModelProvider.getInstance().getEntity(OrderLine.ENTITY_NAME); + if (entities[0] != currentEntity) { + entities[0] = currentEntity; + } + } } diff -r 055351d43c80 -r 99114944648b modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderTestObserver.java --- a/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderTestObserver.java Fri May 18 13:37:54 2018 +0200 +++ b/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderTestObserver.java Mon May 28 12:26:48 2018 +0200 @@ -83,4 +83,11 @@ final Entity orderEntity = ModelProvider.getInstance().getEntity(Order.ENTITY_NAME); return orderEntity.getProperty(Order.PROPERTY_ORDERLINELIST); } + + public static void refreshObservedEntities() { + Entity currentEntity = ModelProvider.getInstance().getEntity(Order.ENTITY_NAME); + if (entities[0] != currentEntity) { + entities[0] = currentEntity; + } + } } diff -r 055351d43c80 -r 99114944648b modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js Fri May 18 13:37:54 2018 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js Mon May 28 12:26:48 2018 +0200 @@ -11,7 +11,7 @@ ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
