details: https://code.openbravo.com/erp/devel/pi/rev/05ad78bbb02e changeset: 28872:05ad78bbb02e user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Mar 18 13:00:05 2016 +0100 summary: fixed bug 32507: NPE when executing GenerateComponentTest.testStaticResources
StaticResourcesComponent assumes there is a ServletContext to read templates based on it. As test is executed out of Tomcat there is no ServletContext, causing NPE. Fixed by mocking a ServletContext. Additionally ApplicationComponent assumes there is a session to get format values from causing also NPE when executing as test. Fixed by dealing with this case and returning an empty map. details: https://code.openbravo.com/erp/devel/pi/rev/cdd374f976dc changeset: 28873:cdd374f976dc user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Mar 18 13:01:38 2016 +0100 summary: fixed 32506: GenerateComponentTest.testApplication test case is ignored It failed because of same reasons of #32507. Having this issue fixed we can now enable it again. details: https://code.openbravo.com/erp/devel/pi/rev/457964c40da6 changeset: 28874:457964c40da6 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Mar 21 08:50:35 2016 +0100 summary: [wildfly] read templates as stream instead of as URL Reading templates as a URL resource from classpath is problematic when deploying in wildfly (returs vfs:/// protocol instead of file:///). This is fixed by reading the resource as a stream. details: https://code.openbravo.com/erp/devel/pi/rev/0cd0a5c1b70d changeset: 28875:0cd0a5c1b70d user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Mar 21 09:26:05 2016 +0100 summary: [wildlfly] read BeanManager from jndi if not present in ServletContext Tomcat stores BeanManager in ServletContext whereas wildfly does not, it saves it in as a jdni resource. details: https://code.openbravo.com/erp/devel/pi/rev/a8373217749f changeset: 28876:a8373217749f user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Apr 05 12:26:12 2016 +0200 summary: [wildfly] pi merge details: https://code.openbravo.com/erp/devel/pi/rev/0850e159f37d changeset: 28877:0850e159f37d user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Apr 07 13:21:09 2016 +0200 summary: [wildfly] if not running in Tomcat, do not allow to rebuild/restart system from MMC's UI details: https://code.openbravo.com/erp/devel/pi/rev/02c2c456bc0d changeset: 28878:02c2c456bc0d user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Apr 07 14:42:59 2016 +0200 summary: [wildfly] it's possible to prevent MMC rebuild with a pref details: https://code.openbravo.com/erp/devel/pi/rev/458dd90dea0a changeset: 28879:458dd90dea0a user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Apr 07 15:05:49 2016 +0200 summary: [wildfly] fixed typo details: https://code.openbravo.com/erp/devel/pi/rev/4518de8693f1 changeset: 28880:4518de8693f1 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Apr 13 08:35:27 2016 +0200 summary: [wildfly] fixed typos in log messages details: https://code.openbravo.com/erp/devel/pi/rev/03f806e35c93 changeset: 28881:03f806e35c93 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Apr 13 08:38:40 2016 +0200 summary: fixed issue 32511: support JBoss AS 7.1.1 diffstat: .hgsigs | 1 + .hgtags | 1 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 12 + 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/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java | 17 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java | 11 +- 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/org/openbravo/base/weld/WeldUtils.java | 23 +- 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.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/GenerateComponentTest.java | 29 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ApplicationComponent.java | 11 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseTemplateProcessor.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.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 | 50 ++- 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.client.widgets/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml | 1 - 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.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 1 + 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 +- src-core/src/org/openbravo/base/ConfigParameters.java | 62 ++-- src-db/database/build.xml | 9 +- src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOW.xml | 50 +-- src-db/database/model/functions/C_ORDER_POST1.xml | 4 +- src-db/database/model/functions/M_RESERVE_STOCK_AUTO.xml | 11 +- src-db/database/model/tables/M_PRODUCT_CH_VALUE.xml | 3 + src-db/database/sourcedata/AD_COLUMN.xml | 2 +- src-db/database/sourcedata/AD_MESSAGE.xml | 26 +- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_REF_LIST.xml | 12 + src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 44 +++ src-test/src/org/openbravo/test/AllWebserviceTests.java | 9 +- src-test/src/org/openbravo/test/datasource/FetchDSNoActiveEntityObjects.java | 114 +++++++++ src-test/src/org/openbravo/test/webservice/WSWithNoActiveDalObjects.java | 87 ++++++ src/org/openbravo/base/structure/BaseOBObject.java | 4 +- src/org/openbravo/common/actionhandler/SetNewBPCurrency.java | 5 +- src/org/openbravo/costing/CostingRuleProcess.java | 77 +++++- src/org/openbravo/erpCommon/ad_callouts/SL_ProductPrice_PriceListVersion.java | 68 ++-- src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 46 +++- src/org/openbravo/erpCommon/ad_process/ApplyModules.java | 38 ++- src/org/openbravo/erpCommon/ad_process/ApplyModulesExternal.html | 126 ++++++++++ src/org/openbravo/erpCommon/ad_process/ApplyModulesExternal.xml | 29 ++ src/org/openbravo/erpCommon/ad_process/ConvertQuotationIntoOrder.java | 115 --------- src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.java | 24 +- src/org/openbravo/erpCommon/businessUtility/AccountTree.java | 6 +- src/org/openbravo/erpCommon/businessUtility/PrinterReports.java | 8 +- src/org/openbravo/erpCommon/modules/ModuleTree.java | 13 +- src/org/openbravo/erpCommon/security/Login.html | 12 +- src/org/openbravo/erpCommon/utility/Utility.java | 4 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintOptions.html | 8 +- src/org/openbravo/erpReports/ReportRegisterByVatJR.jrxml | 8 +- src/org/openbravo/financial/ResetAccounting.java | 47 ++- src/org/openbravo/role/inheritance/RoleInheritanceManager.java | 71 +++-- src/org/openbravo/role/inheritance/access/PreferenceAccessInjector.java | 9 +- src/org/openbravo/service/rest/DalWebService.java | 3 +- 92 files changed, 1053 insertions(+), 454 deletions(-) diffs (truncated from 3434 to 300 lines): diff -r a58e284a2ce0 -r 03f806e35c93 .hgsigs --- a/.hgsigs Wed Mar 16 05:33:34 2016 +0100 +++ b/.hgsigs Wed Apr 13 08:38:40 2016 +0200 @@ -188,4 +188,5 @@ 13daf93202e0933841632c91b1d4a887d9521e3c 0 iEYEABECAAYFAlahu2QACgkQCX/oGf+2qkPP3QCdFhiUHKeBfwEFsprfMiofZWZ1/wkAoN0Tjy/Hk2svUSV2vBYUf3uHGz+U 24d2967df096de06913c9991553c1d84b07df9b6 0 iEYEABECAAYFAla9YYIACgkQCX/oGf+2qkNH7wCfV32iOyR/TQKzW/mH1iHTir6f6h4AoIlh4QBWIShpJqbJvx2IhfARpvUZ f016ea545c924ad099e9e402689035f1dd73baa2 0 iEYEABECAAYFAlbTzQoACgkQCX/oGf+2qkP28wCdFpNqpw+ODgF0p3cMJAbTZy1IPfoAoNEuRHkZIM5bNJMjwU0/GhjCtwah +a53670f00eb6c9225829a660075fcfffa1109a1e 0 iEYEABECAAYFAlbqRpEACgkQCX/oGf+2qkN5qQCgsO1APX5AJ4cpb0oJX5vUQnvPMusAoPoDaQxGDihvsB4BSGW60RIxBdGC 38ef1dc10aa3d6fb8210b85beab370f62a4545ca 0 iEYEABECAAYFAlbiTM0ACgkQCX/oGf+2qkNBDwCfXmKXkqNGsAsfiofYOBBdvjA/XgkAoIwLK3DkmHeM71JihwfVOWyB4hmj diff -r a58e284a2ce0 -r 03f806e35c93 .hgtags --- a/.hgtags Wed Mar 16 05:33:34 2016 +0100 +++ b/.hgtags Wed Apr 13 08:38:40 2016 +0200 @@ -199,4 +199,5 @@ b6c50283d4a8ae24f54c0f0955601478ead7134d 3.0PR15Q4.2 9985680adffaf70ffcc1f560860feb10f0ee6b33 3.0PR15Q4.3 70df4e4c5cab6d37f10eceee6b66be039c381556 3.0PR15Q4.4 +21c8ed48293c94cbe5875a8edef08aca0efd2bf4 3.0PR15Q4.5 ee5383e071318afe8eece515b4b264cfb46c1a84 3.0PR16Q1 diff -r a58e284a2ce0 -r 03f806e35c93 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Wed Mar 16 05:33:34 2016 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Wed Apr 13 08:38:40 2016 +0200 @@ -1225,6 +1225,18 @@ <!--BE7AE60244C34C8AB03616F5A70B45D2--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--BE7AE60244C34C8AB03616F5A70B45D2--></AD_MESSAGE> +<!--C05265FE175B42248130883AACF2BD20--><AD_MESSAGE> +<!--C05265FE175B42248130883AACF2BD20--> <AD_MESSAGE_ID><![CDATA[C05265FE175B42248130883AACF2BD20]]></AD_MESSAGE_ID> +<!--C05265FE175B42248130883AACF2BD20--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--C05265FE175B42248130883AACF2BD20--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--C05265FE175B42248130883AACF2BD20--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--C05265FE175B42248130883AACF2BD20--> <VALUE><![CDATA[APRM_AutomaticExecutionProcess]]></VALUE> +<!--C05265FE175B42248130883AACF2BD20--> <MSGTEXT><![CDATA[It is not possible to process a transaction with a payment having an automatic execution process payment method. Please, execute the payment in Payment In/Out window first.]]></MSGTEXT> +<!--C05265FE175B42248130883AACF2BD20--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--C05265FE175B42248130883AACF2BD20--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--C05265FE175B42248130883AACF2BD20--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--C05265FE175B42248130883AACF2BD20--></AD_MESSAGE> + <!--C36865A47B99485980CC8B56AAF59057--><AD_MESSAGE> <!--C36865A47B99485980CC8B56AAF59057--> <AD_MESSAGE_ID><![CDATA[C36865A47B99485980CC8B56AAF59057]]></AD_MESSAGE_ID> <!--C36865A47B99485980CC8B56AAF59057--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r a58e284a2ce0 -r 03f806e35c93 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Mar 16 05:33:34 2016 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Apr 13 08:38:40 2016 +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.28173]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.28838]]></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 a58e284a2ce0 -r 03f806e35c93 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 Wed Mar 16 05:33:34 2016 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Apr 13 08:38:40 2016 +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.28173]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.28838]]></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.28173]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.28838]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r a58e284a2ce0 -r 03f806e35c93 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java Wed Mar 16 05:33:34 2016 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java Wed Apr 13 08:38:40 2016 +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-2015 Openbravo SLU + * All portions are Copyright (C) 2010-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -25,6 +25,7 @@ import java.util.Set; import org.apache.commons.lang.StringUtils; +import org.hibernate.criterion.Restrictions; import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao; import org.openbravo.advpaymentmngt.dao.TransactionsDao; import org.openbravo.advpaymentmngt.exception.NoExecutionProcessFoundException; @@ -34,6 +35,7 @@ import org.openbravo.base.secureApp.VariablesSecureApp; import org.openbravo.client.kernel.RequestContext; import org.openbravo.dal.core.OBContext; +import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; import org.openbravo.database.ConnectionProvider; import org.openbravo.erpCommon.utility.OBError; @@ -194,8 +196,17 @@ if (FIN_Utility.isAutomaticDepositWithdrawn(paymentRunPayment.getPayment()) && paymentRunPayment.getPayment().getAmount().compareTo(BigDecimal.ZERO) != 0 && !StringUtils.equals(internalParameters.get("comingFrom"), "TRANSACTION")) { - FIN_FinaccTransaction transaction = TransactionsDao - .createFinAccTransaction(paymentRunPayment.getPayment()); + OBCriteria<FIN_FinaccTransaction> finAccTransactionCriteria = OBDal + .getInstance().createCriteria(FIN_FinaccTransaction.class); + finAccTransactionCriteria.add(Restrictions.eq( + FIN_FinaccTransaction.PROPERTY_FINPAYMENT, payment)); + finAccTransactionCriteria.setMaxResults(1); + FIN_FinaccTransaction transaction = (FIN_FinaccTransaction) finAccTransactionCriteria + .uniqueResult(); + if (transaction == null) { + transaction = TransactionsDao.createFinAccTransaction(paymentRunPayment + .getPayment()); + } VariablesSecureApp vars = new VariablesSecureApp(RequestContext.get() .getRequest()); OBError processTransactionError = processTransaction(vars, diff -r a58e284a2ce0 -r 03f806e35c93 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java Wed Mar 16 05:33:34 2016 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java Wed Apr 13 08:38:40 2016 +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-2015 Openbravo SLU + * All portions are Copyright (C) 2010-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -24,6 +24,7 @@ import org.apache.commons.lang.StringUtils; import org.hibernate.criterion.Restrictions; import org.openbravo.advpaymentmngt.APRM_FinaccTransactionV; +import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao; import org.openbravo.advpaymentmngt.utility.FIN_Utility; import org.openbravo.base.exception.OBException; import org.openbravo.base.provider.OBProvider; @@ -121,6 +122,14 @@ if (transaction.getBusinessPartner() == null) { transaction.setBusinessPartner(payment.getBusinessPartner()); } + AdvPaymentMngtDao dao = new AdvPaymentMngtDao(); + if (StringUtils.equals(payment.getStatus(), dao.PAYMENT_STATUS_AWAITING_EXECUTION) + && dao.isAutomatedExecutionPayment(financialAccount, payment.getPaymentMethod(), + payment.isReceipt())) { + msg = OBMessageUtils.messageBD("APRM_AutomaticExecutionProcess"); + throw new OBException(msg); + } + payment.setStatus(payment.isReceipt() ? "RDNC" : "PWNC"); transaction.setStatus(payment.isReceipt() ? "RDNC" : "PWNC"); if (transaction.getPaymentAmount().compareTo(BigDecimal.ZERO) > 0) { diff -r a58e284a2ce0 -r 03f806e35c93 modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml Wed Mar 16 05:33:34 2016 +0100 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml Wed Apr 13 08:38:40 2016 +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.28173]]></VERSION> +<!--8A098711BB324335A19833286BDB093D--> <VERSION><![CDATA[1.0.28838]]></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 a58e284a2ce0 -r 03f806e35c93 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 Wed Mar 16 05:33:34 2016 +0100 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Apr 13 08:38:40 2016 +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.28173]]></STARTVERSION> +<!--1467C397BC5F4999A5606F39CD6FF8A4--> <STARTVERSION><![CDATA[2.1.28838]]></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 a58e284a2ce0 -r 03f806e35c93 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 Wed Mar 16 05:33:34 2016 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Wed Apr 13 08:38:40 2016 +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.28173]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.28838]]></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 a58e284a2ce0 -r 03f806e35c93 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 Wed Mar 16 05:33:34 2016 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Apr 13 08:38:40 2016 +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.28173]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.28838]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r a58e284a2ce0 -r 03f806e35c93 modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java --- a/modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java Wed Mar 16 05:33:34 2016 +0100 +++ b/modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java Wed Apr 13 08:38:40 2016 +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-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -26,9 +26,14 @@ import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.util.AnnotationLiteral; import javax.inject.Inject; +import javax.naming.InitialContext; +import javax.naming.NamingException; import org.jboss.weld.environment.servlet.Listener; +import org.openbravo.base.exception.OBException; import org.openbravo.dal.core.DalContextListener; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Provides weld utilities. @@ -39,11 +44,27 @@ public class WeldUtils { private static BeanManager staticBeanManager = null; + private static final Logger log = LoggerFactory.getLogger(WeldUtils.class); public static BeanManager getStaticInstanceBeanManager() { if (staticBeanManager == null) { staticBeanManager = (BeanManager) DalContextListener.getServletContext().getAttribute( Listener.BEAN_MANAGER_ATTRIBUTE_NAME); + + if (staticBeanManager == null) { + // In wildfly, bean manager is not saved in servlet context. + log.debug("BeanManager not present in ServletContext, trying to get it with a jndi lookup"); + + InitialContext ic = null; + try { + ic = new InitialContext(); + String name = "java:comp/" + BeanManager.class.getSimpleName(); + staticBeanManager = (BeanManager) ic.lookup(name); + } catch (NamingException e) { + log.error("Couldn't get beanManager through jndi lookup in InitialContext {}", ic, e); + throw new OBException(e); + } + } } return staticBeanManager; } diff -r a58e284a2ce0 -r 03f806e35c93 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 Wed Mar 16 05:33:34 2016 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Wed Apr 13 08:38:40 2016 +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.28173]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.28838]]></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 a58e284a2ce0 -r 03f806e35c93 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 Wed Mar 16 05:33:34 2016 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Apr 13 08:38:40 2016 +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.28173]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.28838]]></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.28173]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.28838]]></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.28173]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.28838]]></STARTVERSION> <!--824D60CB352E4099B1D8C903CA139DAE--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> ------------------------------------------------------------------------------ Find and fix application performance issues faster with Applications Manager Applications Manager provides deep performance insights into multiple tiers of your business applications. It resolves application problems quickly and reduces your MTTR. Get your free trial! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
