[OpenbravoERP-commits] devel/pi: related to issue 33789: updated copyright year
details: https://code.openbravo.com/erp/devel/pi/rev/137deeaaeb7b changeset: 29919:137deeaaeb7b user: Carlos Aristu openbravo.com> date: Fri Aug 26 08:26:43 2016 +0200 summary: related to issue 33789: updated copyright year diffstat: src/org/openbravo/service/db/CallProcess.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 6914648cfa1d -r 137deeaaeb7b src/org/openbravo/service/db/CallProcess.java --- a/src/org/openbravo/service/db/CallProcess.java Fri Aug 26 08:24:54 2016 +0200 +++ b/src/org/openbravo/service/db/CallProcess.java Fri Aug 26 08:26:43 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) 2009-2012 Openbravo SLU + * All portions are Copyright (C) 2009-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): __. * Modification july 2010 (c) openbravo SLU, based on contribution made by iferca -- ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: related to issue 33794: updated copyright year
details: https://code.openbravo.com/erp/devel/pi/rev/6914648cfa1d changeset: 29918:6914648cfa1d user: Carlos Aristu openbravo.com> date: Fri Aug 26 08:24:54 2016 +0200 summary: related to issue 33794: updated copyright year diffstat: modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServiceProvider.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3a75b98096ef -r 6914648cfa1d modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServiceProvider.java --- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServiceProvider.java Fri Aug 26 08:22:55 2016 +0200 +++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServiceProvider.java Fri Aug 26 08:24:54 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) 2009-2014 Openbravo SLU + * All portions are Copyright (C) 2009-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): __. -- ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: related to issue 33707: updated copyright year
details: https://code.openbravo.com/erp/devel/pi/rev/3a75b98096ef changeset: 29917:3a75b98096ef user: Carlos Aristu openbravo.com> date: Fri Aug 26 08:22:55 2016 +0200 summary: related to issue 33707: updated copyright year diffstat: src/org/openbravo/erpCommon/utility/OBMessageUtils.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8a644dd31f01 -r 3a75b98096ef src/org/openbravo/erpCommon/utility/OBMessageUtils.java --- a/src/org/openbravo/erpCommon/utility/OBMessageUtils.java Thu Aug 25 20:52:30 2016 + +++ b/src/org/openbravo/erpCommon/utility/OBMessageUtils.java Fri Aug 26 08:22:55 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) 2012-2015 Openbravo SLU + * All portions are Copyright (C) 2012-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): __. -- ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/5e50832c9b35 changeset: 29915:5e50832c9b35 user: RM packaging bot openbravo.com> date: Thu Aug 25 20:38:42 2016 + summary: CI: update AD_MODULE to version 29914 details: https://code.openbravo.com/erp/devel/pi/rev/8a644dd31f01 changeset: 29916:8a644dd31f01 user: RM packaging bot openbravo.com> date: Thu Aug 25 20:52:30 2016 + summary: CI: merge back from main diffstat: 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.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.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/
[OpenbravoERP-commits] devel/main: 7 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/51c44fe5c057 changeset: 29909:51c44fe5c057 user: Carlos Aristu openbravo.com> date: Thu Aug 25 11:01:24 2016 +0200 summary: related to issue 33707: code review improvements details: https://code.openbravo.com/erp/devel/main/rev/70d44c2f8c70 changeset: 29910:70d44c2f8c70 user: Carlos Aristu openbravo.com> date: Thu Aug 25 11:22:44 2016 +0200 summary: related to issue 33707: reverting limit removal details: https://code.openbravo.com/erp/devel/main/rev/d0494723d940 changeset: 29911:d0494723d940 user: RM packaging bot openbravo.com> date: Thu Aug 25 13:06:59 2016 + summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/6075199d9aed changeset: 29912:6075199d9aed user: Alvaro Ferraz openbravo.com> date: Thu Aug 25 15:08:40 2016 +0200 summary: Related to issue 33705: Update copyright details: https://code.openbravo.com/erp/devel/main/rev/d058534c944a changeset: 29913:d058534c944a user: Alvaro Ferraz openbravo.com> date: Thu Aug 25 15:08:57 2016 +0200 summary: Related to issue 33790: Update copyright details: https://code.openbravo.com/erp/devel/main/rev/e309320cd579 changeset: 29914:e309320cd579 user: Carlos Aristu openbravo.com> date: Thu Aug 25 16:06:43 2016 +0200 summary: fixes issue 33814: backed out initialization prevention changes details: https://code.openbravo.com/erp/devel/main/rev/5e50832c9b35 changeset: 29915:5e50832c9b35 user: RM packaging bot openbravo.com> date: Thu Aug 25 20:38:42 2016 + summary: CI: update AD_MODULE to version 29914 diffstat: 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.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.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/o
[OpenbravoERP-commits] devel/pi: fixes issue 33814: backed out initialization preventio...
details: https://code.openbravo.com/erp/devel/pi/rev/e309320cd579
changeset: 29914:e309320cd579
user: Carlos Aristu openbravo.com>
date: Thu Aug 25 16:06:43 2016 +0200
summary: fixes issue 33814: backed out initialization prevention changes
diffstat:
src/org/openbravo/dal/service/OBCriteria.java | 5 -
1 files changed, 0 insertions(+), 5 deletions(-)
diffs (29 lines):
diff -r d058534c944a -r e309320cd579
src/org/openbravo/dal/service/OBCriteria.java
--- a/src/org/openbravo/dal/service/OBCriteria.java Thu Aug 25 15:08:57
2016 +0200
+++ b/src/org/openbravo/dal/service/OBCriteria.java Thu Aug 25 16:06:43
2016 +0200
@@ -68,7 +68,6 @@
private boolean filterOnReadableOrganization = true;
private boolean filterOnActive = true;
private List orderBys = new ArrayList();
- private boolean initialized = false;
// package visible
@@ -137,9 +136,6 @@
}
void initialize() {
-if (initialized) {
- return;
-}
final OBContext obContext = OBContext.getOBContext();
final Entity e = getEntity();
@@ -184,7 +180,6 @@
if (SessionInfo.getQueryProfile() != null) {
QueryTimeOutUtil.getInstance().setQueryTimeOut(this,
SessionInfo.getQueryProfile());
}
-initialized = true;
}
/**
--
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/6075199d9aed changeset: 29912:6075199d9aed user: Alvaro Ferraz openbravo.com> date: Thu Aug 25 15:08:40 2016 +0200 summary: Related to issue 33705: Update copyright details: https://code.openbravo.com/erp/devel/pi/rev/d058534c944a changeset: 29913:d058534c944a user: Alvaro Ferraz openbravo.com> date: Thu Aug 25 15:08:57 2016 +0200 summary: Related to issue 33790: Update copyright diffstat: src/org/openbravo/erpCommon/info/PriceListVersionFilterExpression.java | 19 ++ src/org/openbravo/erpCommon/info/PriceListVersionFilterExpressionName.java | 2 +- 2 files changed, 20 insertions(+), 1 deletions(-) diffs (38 lines): diff -r d0494723d940 -r d058534c944a src/org/openbravo/erpCommon/info/PriceListVersionFilterExpression.java --- a/src/org/openbravo/erpCommon/info/PriceListVersionFilterExpression.java Thu Aug 25 13:06:59 2016 + +++ b/src/org/openbravo/erpCommon/info/PriceListVersionFilterExpression.java Thu Aug 25 15:08:57 2016 +0200 @@ -1,3 +1,22 @@ +/* + * + * The contents of this file are subject to the Openbravo Public License + * Version 1.1 (the "License"), being the Mozilla Public License + * Version 1.1 with a permitted attribution clause; you may not use this + * file except in compliance with the License. You may obtain a copy of + * the License at http://www.openbravo.com/legal/license.html + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + * The Original Code is Openbravo ERP. + * The Initial Developer of the Original Code is Openbravo SLU + * All portions are Copyright (C) 2011-2016 Openbravo SLU + * All Rights Reserved. + * Contributor(s): __. + + */ + package org.openbravo.erpCommon.info; import java.text.SimpleDateFormat; diff -r d0494723d940 -r d058534c944a src/org/openbravo/erpCommon/info/PriceListVersionFilterExpressionName.java --- a/src/org/openbravo/erpCommon/info/PriceListVersionFilterExpressionName.java Thu Aug 25 13:06:59 2016 + +++ b/src/org/openbravo/erpCommon/info/PriceListVersionFilterExpressionName.java Thu Aug 25 15:08:57 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) 2012 Openbravo SLU + * All portions are Copyright (C) 2012-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): __. -- ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/main: 3 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/d7261e0b3656 changeset: 29906:d7261e0b3656 user: RM packaging bot openbravo.com> date: Thu Aug 25 03:04:09 2016 + summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/70c67cc6cf8b changeset: 29907:70c67cc6cf8b user: Carlos Aristu openbravo.com> date: Thu Aug 25 10:23:29 2016 +0200 summary: fixes issue 33622: Selection lost on table/view based P&E having >100 records Selection could be lost on P&E windows based on a table or a view, having more than 100 records selected. This problem was solved on issue 31989 for those P&E windows based on HQL query tables (this kind of P&E windows make use of a ReadOnlyDataSourceService). P&E windows based on a table or a view make use of the DefaultDataSourceService which uses DefaultJsonDataService to retrieve data. So, in order to solve the problem, a similar mechanism to the existing one on ReadOnlyDataSourceService has been implemented within DefaultJsonDataService. Thus, those P&E which use DefaultDataSourceService to retrieve data, now increase the page size dynamically in order to get all selected records in the same request. details: https://code.openbravo.com/erp/devel/main/rev/e502a641a2e5 changeset: 29908:e502a641a2e5 user: RM packaging bot openbravo.com> date: Thu Aug 25 12:53:06 2016 + summary: CI: update AD_MODULE to version 29907 diffstat: 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.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.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/DataSourceUtils.java | 50 ++ modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java | 39 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 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.ope
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/e502a641a2e5 changeset: 29910:e502a641a2e5 user: RM packaging bot openbravo.com> date: Thu Aug 25 12:53:06 2016 + summary: CI: update AD_MODULE to version 29907 details: https://code.openbravo.com/erp/devel/pi/rev/d0494723d940 changeset: 29911:d0494723d940 user: RM packaging bot openbravo.com> date: Thu Aug 25 13:06:59 2016 + summary: CI: merge back from main diffstat: 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.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.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/
[OpenbravoERP-commits] devel/pi: related to issue 33707: reverting limit removal
details: https://code.openbravo.com/erp/devel/pi/rev/70d44c2f8c70
changeset: 29909:70d44c2f8c70
user: Carlos Aristu openbravo.com>
date: Thu Aug 25 11:22:44 2016 +0200
summary: related to issue 33707: reverting limit removal
diffstat:
src/org/openbravo/erpCommon/utility/OBMessageUtils.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 51c44fe5c057 -r 70d44c2f8c70
src/org/openbravo/erpCommon/utility/OBMessageUtils.java
--- a/src/org/openbravo/erpCommon/utility/OBMessageUtils.java Thu Aug 25
11:01:24 2016 +0200
+++ b/src/org/openbravo/erpCommon/utility/OBMessageUtils.java Thu Aug 25
11:22:44 2016 +0200
@@ -82,7 +82,7 @@
} else {
obcMessage.add(Restrictions.eq(Message.PROPERTY_SEARCHKEY, strCode));
}
- // ad_message.value has unique constraint
+ obcMessage.setMaxResults(1);
Message msg = (Message) obcMessage.uniqueResult();
if (msg != null) {
strMessage = msg.getMessageText();
--
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: related to issue 33707: code review improvements
details: https://code.openbravo.com/erp/devel/pi/rev/51c44fe5c057
changeset: 29908:51c44fe5c057
user: Carlos Aristu openbravo.com>
date: Thu Aug 25 11:01:24 2016 +0200
summary: related to issue 33707: code review improvements
diffstat:
src/org/openbravo/erpCommon/utility/OBMessageUtils.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diffs (20 lines):
diff -r 70c67cc6cf8b -r 51c44fe5c057
src/org/openbravo/erpCommon/utility/OBMessageUtils.java
--- a/src/org/openbravo/erpCommon/utility/OBMessageUtils.java Thu Aug 25
10:23:29 2016 +0200
+++ b/src/org/openbravo/erpCommon/utility/OBMessageUtils.java Thu Aug 25
11:01:24 2016 +0200
@@ -82,7 +82,7 @@
} else {
obcMessage.add(Restrictions.eq(Message.PROPERTY_SEARCHKEY, strCode));
}
- obcMessage.setMaxResults(1);
+ // ad_message.value has unique constraint
Message msg = (Message) obcMessage.uniqueResult();
if (msg != null) {
strMessage = msg.getMessageText();
@@ -515,6 +515,7 @@
Message.PROPERTY_SEARCHKEY + "=:key");
messages.setNamedParameter("key", key);
+ // ad_message.value has unique constraint
final Message message = messages.uniqueResult();
if (message == null) {
return null;
--
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: fixes issue 33622: Selection lost on table/view based ...
details: https://code.openbravo.com/erp/devel/pi/rev/70c67cc6cf8b
changeset: 29907:70c67cc6cf8b
user: Carlos Aristu openbravo.com>
date: Thu Aug 25 10:23:29 2016 +0200
summary: fixes issue 33622: Selection lost on table/view based P&E having
>100 records
Selection could be lost on P&E windows based on a table or a view, having more
than 100 records selected. This problem was solved on issue 31989 for those P&E
windows based on HQL query tables (this kind of P&E windows make use of a
ReadOnlyDataSourceService).
P&E windows based on a table or a view make use of the DefaultDataSourceService
which uses DefaultJsonDataService to retrieve data. So, in order to solve the
problem, a similar mechanism to the existing one on ReadOnlyDataSourceService
has been implemented within DefaultJsonDataService.
Thus, those P&E which use DefaultDataSourceService to retrieve data, now
increase the page size dynamically in order to get all selected records in the
same request.
diffstat:
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceUtils.java
| 50 ++
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java
| 39 +-
modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
| 72 +-
modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonConstants.java
| 4 +
4 files changed, 128 insertions(+), 37 deletions(-)
diffs (277 lines):
diff -r d7261e0b3656 -r 70c67cc6cf8b
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceUtils.java
---
a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceUtils.java
Thu Aug 25 03:04:09 2016 +
+++
b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceUtils.java
Thu Aug 25 10:23:29 2016 +0200
@@ -18,16 +18,28 @@
*/
package org.openbravo.service.datasource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.apache.commons.lang.StringUtils;
+import org.codehaus.jettison.json.JSONArray;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
import org.openbravo.dal.core.OBContext;
+import org.openbravo.service.json.JsonUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class contains utility methods for dataSource related classes
*
*/
public class DataSourceUtils {
+
+ private static final Logger log =
LoggerFactory.getLogger(DataSourceUtils.class);
+
/**
* Returns a comma separated list of organization ids to filter the HQL. If
an organization id is
* provided its natural tree is returned. If no organization is provided or
the given value is
@@ -62,4 +74,42 @@
}
return orgPart.toString();
}
+
+ /**
+ * Extracts the criteria from a request parameter map and returns the number
of selected records
+ * according to that criteria.
+ */
+ public static int getNumberOfSelectedRecords(Map parameters)
{
+List selectedRecords = new ArrayList();
+boolean hasCriteria = parameters.containsKey("criteria");
+if (hasCriteria) {
+ try {
+selectedRecords =
getSelectedRecordsFromCriteria(JsonUtils.buildCriteria(parameters));
+ } catch (JSONException jsonex) {
+log.error("Error retrieving number of selected records", jsonex);
+ }
+}
+return selectedRecords.size();
+ }
+
+ /**
+ * Returns a list of selected record IDs from a criteria included in the
JSONObject received as
+ * parameter.
+ */
+ public static List getSelectedRecordsFromCriteria(JSONObject
buildCriteria)
+ throws JSONException {
+List selectedRecords = new ArrayList();
+JSONArray criteriaArray = buildCriteria.getJSONArray("criteria");
+for (int i = 0; i < criteriaArray.length(); i++) {
+ JSONObject criteria = criteriaArray.getJSONObject(i);
+ if (criteria.has("fieldName") &&
criteria.getString("fieldName").equals("id")
+ && criteria.has("value")) {
+String value = criteria.getString("value");
+for (String recordId : value.split(",")) {
+ selectedRecords.add(recordId.trim());
+}
+ }
+}
+return selectedRecords;
+ }
}
diff -r d7261e0b3656 -r 70c67cc6cf8b
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java
---
a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java
Thu Aug 25 03:04:09 2016 +
+++
b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java
Thu Aug 25 10:23:29 2016 +0200
@@ -18,7 +18,6 @@
*/
package org.openbravo.service.datasource;
-import java.util.ArrayList;
i
