[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/b4046817fc0e changeset: 36008:b4046817fc0e user: RM packaging bot openbravo.com> date: Wed Jun 05 23:37:55 2019 + summary: CI: update AD_MODULE to version 36007 details: https://code.openbravo.com/erp/devel/pi/rev/f395c484a710 changeset: 36009:f395c484a710 user: RM packaging bot openbravo.com> date: Wed Jun 05 23:51:37 2019 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/a8037910e3ad changeset: 36006:a8037910e3ad user: RM packaging bot openbravo.com> date: Wed Jun 05 18:40:24 2019 + summary: CI: update AD_MODULE to version 36003 details: https://code.openbravo.com/erp/devel/pi/rev/b99a3f54f70f changeset: 36007:b99a3f54f70f user: RM packaging bot openbravo.com> date: Wed Jun 05 18:54:04 2019 + 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.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 24 - 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/9c31b62de9a2
changeset: 36004:9c31b62de9a2
user: Nono Carballo gmail.com>
date: Thu May 30 11:36:20 2019 -0400
summary: Fixes issue 40964: Fixes getting Filter by Payment Method
Avoids duplicates in list of payment method Id's.
Fixes the way the filter is build when there are more than 1000 payment methods
for filtering
details: https://code.openbravo.com/erp/devel/pi/rev/3365dc61940e
changeset: 36005:3365dc61940e
user: Sandra Huguet openbravo.com>
date: Wed Jun 05 12:44:16 2019 +0200
summary: related to issue 40964 reimplement the way to split the
paymentMethods
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
| 24 -
1 files changed, 10 insertions(+), 14 deletions(-)
diffs (67 lines):
diff -r 1287606da0c8 -r 3365dc61940e
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
Wed Jun 05 16:15:03 2019 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
Wed Jun 05 12:44:16 2019 +0200
@@ -23,6 +23,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -830,7 +831,7 @@
OBContext.getOBContext().getOrganizationStructureProvider().getNaturalTree(strOrgId)));
obc.setFilterOnReadableOrganization(false);
-List payMethods = new ArrayList<>();
+Set payMethods = new HashSet<>();
if (strFinancialAccountId != null && !strFinancialAccountId.isEmpty()) {
for (FinAccPaymentMethod finAccPayMethod :
getObject(FIN_FinancialAccount.class,
strFinancialAccountId).getFinancialMgmtFinAccPaymentMethodList()) {
@@ -846,7 +847,7 @@
if (payMethods.isEmpty()) {
return (new ArrayList());
}
- addPaymentMethodList(obc, payMethods);
+ addPaymentMethodList(obc, new ArrayList(payMethods));
} else {
if (excludePaymentMethodWithoutAccount) {
@@ -862,7 +863,7 @@
if (payMethods.isEmpty()) {
return (new ArrayList());
}
-addPaymentMethodList(obc, payMethods);
+addPaymentMethodList(obc, new ArrayList(payMethods));
}
if (paymentDirection == PaymentDirection.IN) {
obc.add(Restrictions.eq(FIN_PaymentMethod.PROPERTY_PAYINALLOW, true));
@@ -905,22 +906,17 @@
List paymentMethods) {
Criterion compoundExp = null;
int paymentMethodsSize = paymentMethods.size();
-while (paymentMethodsSize > 999) {
- List paymentMethodsToRemove = paymentMethods.subList(0, 999);
+int batchIni = 0;
+int batchSize = 1000;
+while (paymentMethodsSize > batchIni) {
+ List paymentMethodsToRemove = paymentMethods.subList(batchIni,
+ Math.min(batchIni + batchSize, paymentMethodsSize));
if (compoundExp == null) {
compoundExp = Restrictions.in("id", paymentMethodsToRemove);
} else {
compoundExp = Restrictions.or(compoundExp, Restrictions.in("id",
paymentMethodsToRemove));
}
- paymentMethods.removeAll(paymentMethodsToRemove);
- paymentMethodsSize = paymentMethodsSize - 999;
-}
-if (paymentMethodsSize > 0) {
- if (compoundExp == null) {
-compoundExp = Restrictions.in("id", paymentMethods);
- } else {
-compoundExp = Restrictions.or(compoundExp, Restrictions.in("id",
paymentMethods));
- }
+ batchIni += batchSize;
}
if (compoundExp != null) {
obc.add(compoundExp);
___
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/8e20cc58f41d changeset: 36001:8e20cc58f41d user: RM packaging bot openbravo.com> date: Wed Jun 05 11:26:42 2019 + summary: CI: update AD_MODULE to version 35998 details: https://code.openbravo.com/erp/devel/pi/rev/e6f834be7a9d changeset: 36002:e6f834be7a9d user: RM packaging bot openbravo.com> date: Wed Jun 05 11:40:40 2019 + 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.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 1 + modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js | 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/d62e2aa3c767 changeset: 35996:d62e2aa3c767 user: RM packaging bot openbravo.com> date: Tue Jun 04 15:49:36 2019 + summary: CI: update AD_MODULE to version 35993 details: https://code.openbravo.com/erp/devel/pi/rev/1e6839146494 changeset: 35997:1e6839146494 user: RM packaging bot openbravo.com> date: Tue Jun 04 16:04:47 2019 + 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.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js | 9 --- 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 ++--
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/b549799c22b6 changeset: 35992:b549799c22b6 user: RM packaging bot openbravo.com> date: Tue Jun 04 09:50:09 2019 + summary: CI: update AD_MODULE to version 35991 details: https://code.openbravo.com/erp/devel/pi/rev/98b6ff97783d changeset: 35993:98b6ff97783d user: RM packaging bot openbravo.com> date: Tue Jun 04 10:03:45 2019 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/49e954ad3a98 changeset: 35990:49e954ad3a98 user: RM packaging bot openbravo.com> date: Tue Jun 04 02:45:23 2019 + summary: CI: update AD_MODULE to version 35989 details: https://code.openbravo.com/erp/devel/pi/rev/4b03836a057f changeset: 35991:4b03836a057f user: RM packaging bot openbravo.com> date: Tue Jun 04 03:34:12 2019 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/c57a5fccbdca changeset: 35953:c57a5fccbdca user: RM packaging bot openbravo.com> date: Mon Jun 03 14:30:19 2019 + summary: CI: update AD_MODULE to version 35952 details: https://code.openbravo.com/erp/devel/pi/rev/edaa9a95ed33 changeset: 35954:edaa9a95ed33 user: RM packaging bot openbravo.com> date: Mon Jun 03 14:44:03 2019 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/c3ec4a50474e changeset: 35950:c3ec4a50474e user: RM packaging bot openbravo.com> date: Sun Jun 02 05:06:30 2019 + summary: CI: update AD_MODULE to version 35949 details: https://code.openbravo.com/erp/devel/pi/rev/dd4393b7793f changeset: 35951:dd4393b7793f user: RM packaging bot openbravo.com> date: Sun Jun 02 05:20:18 2019 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/1355701c3858 changeset: 35948:1355701c3858 user: RM packaging bot openbravo.com> date: Fri May 31 16:42:10 2019 + summary: CI: update AD_MODULE to version 35938 details: https://code.openbravo.com/erp/devel/pi/rev/59eaaf5c9816 changeset: 35949:59eaaf5c9816 user: RM packaging bot openbravo.com> date: Fri May 31 16:55:48 2019 + 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
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/ffc483281950 changeset: 35937:ffc483281950 user: RM packaging bot openbravo.com> date: Fri May 31 12:18:50 2019 + summary: CI: update AD_MODULE to version 35936 details: https://code.openbravo.com/erp/devel/pi/rev/53465f460967 changeset: 35938:53465f460967 user: RM packaging bot openbravo.com> date: Fri May 31 12:32:25 2019 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/f4daf14ac019 changeset: 35934:f4daf14ac019 user: RM packaging bot openbravo.com> date: Thu May 30 20:32:16 2019 + summary: CI: update AD_MODULE to version 35933 details: https://code.openbravo.com/erp/devel/pi/rev/ba77c69aebd6 changeset: 35935:ba77c69aebd6 user: RM packaging bot openbravo.com> date: Thu May 30 20:45:35 2019 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/b12569076050 changeset: 35932:b12569076050 user: RM packaging bot openbravo.com> date: Thu May 30 16:10:53 2019 + summary: CI: update AD_MODULE to version 35931 details: https://code.openbravo.com/erp/devel/pi/rev/9e1c5ef38e6f changeset: 35933:9e1c5ef38e6f user: RM packaging bot openbravo.com> date: Thu May 30 16:24:32 2019 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/528d21b1731d changeset: 35930:528d21b1731d user: RM packaging bot openbravo.com> date: Thu May 30 08:56:16 2019 + summary: CI: update AD_MODULE to version 35927 details: https://code.openbravo.com/erp/devel/pi/rev/6deecf0bc5fc changeset: 35931:6deecf0bc5fc user: RM packaging bot openbravo.com> date: Thu May 30 09:10:03 2019 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/2785551137d4 changeset: 35926:2785551137d4 user: RM packaging bot openbravo.com> date: Thu May 30 01:47:29 2019 + summary: CI: update AD_MODULE to version 35925 details: https://code.openbravo.com/erp/devel/pi/rev/aad48da6ff1e changeset: 35927:aad48da6ff1e user: RM packaging bot openbravo.com> date: Thu May 30 02:01:07 2019 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/0705db562021 changeset: 35924:0705db562021 user: RM packaging bot openbravo.com> date: Wed May 29 18:34:57 2019 + summary: CI: update AD_MODULE to version 35919 details: https://code.openbravo.com/erp/devel/pi/rev/6605b780396f changeset: 35925:6605b780396f user: RM packaging bot openbravo.com> date: Wed May 29 18:48:43 2019 + 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.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js | 19 +-- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 14 - 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/17e543e7583b changeset: 35914:17e543e7583b user: RM packaging bot openbravo.com> date: Wed May 29 06:47:48 2019 + summary: CI: update AD_MODULE to version 35913 details: https://code.openbravo.com/erp/devel/pi/rev/7df03a7a83e2 changeset: 35915:7df03a7a83e2 user: RM packaging bot openbravo.com> date: Wed May 29 07:01:34 2019 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/a1ae1cd8443c changeset: 35917:a1ae1cd8443c user: RM packaging bot openbravo.com> date: Wed May 29 11:21:47 2019 + summary: CI: update AD_MODULE to version 35915 details: https://code.openbravo.com/erp/devel/pi/rev/924e37a589cb changeset: 35918:924e37a589cb user: RM packaging bot openbravo.com> date: Wed May 29 11:35:29 2019 + 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.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js | 2 +- 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 ++--
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/f61d63883754 changeset: 35912:f61d63883754 user: RM packaging bot openbravo.com> date: Wed May 29 01:06:13 2019 + summary: CI: update AD_MODULE to version 35911 details: https://code.openbravo.com/erp/devel/pi/rev/7e801646f764 changeset: 35913:7e801646f764 user: RM packaging bot openbravo.com> date: Wed May 29 01:19:57 2019 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/d51097bed845 changeset: 35910:d51097bed845 user: RM packaging bot openbravo.com> date: Tue May 28 18:00:47 2019 + summary: CI: update AD_MODULE to version 35908 details: https://code.openbravo.com/erp/devel/pi/rev/9976c5e88f7e changeset: 35911:9976c5e88f7e user: RM packaging bot openbravo.com> date: Tue May 28 18:14:30 2019 + 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.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js | 16 ++--- 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 ++--
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/4cb841e668e7 changeset: 35907:4cb841e668e7 user: RM packaging bot openbravo.com> date: Tue May 28 10:51:49 2019 + summary: CI: update AD_MODULE to version 35905 details: https://code.openbravo.com/erp/devel/pi/rev/b7769c78ea10 changeset: 35908:b7769c78ea10 user: RM packaging bot openbravo.com> date: Tue May 28 11:06:02 2019 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/4873ab16fbaa changeset: 35891:4873ab16fbaa user: RM packaging bot openbravo.com> date: Mon May 27 23:07:16 2019 + summary: CI: update AD_MODULE to version 35890 details: https://code.openbravo.com/erp/devel/pi/rev/9d726e080636 changeset: 35892:9d726e080636 user: RM packaging bot openbravo.com> date: Mon May 27 23:20:33 2019 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/51ab3e41a42a changeset: 35889:51ab3e41a42a user: RM packaging bot openbravo.com> date: Mon May 27 18:47:53 2019 + summary: CI: update AD_MODULE to version 35888 details: https://code.openbravo.com/erp/devel/pi/rev/f071e16516bc changeset: 35890:f071e16516bc user: RM packaging bot openbravo.com> date: Mon May 27 19:01:48 2019 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/bdad8ace6f89 changeset: 35887:bdad8ace6f89 user: RM packaging bot openbravo.com> date: Mon May 27 11:40:00 2019 + summary: CI: update AD_MODULE to version 35885 details: https://code.openbravo.com/erp/devel/pi/rev/15d7afc4c30d changeset: 35888:15d7afc4c30d user: RM packaging bot openbravo.com> date: Mon May 27 11:53:57 2019 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/d4e1008caed8 changeset: 35883:d4e1008caed8 user: Atul Gaware openbravo.com> date: Mon May 20 17:42:49 2019 +0530 summary: Related To Issue 35788:Remove obsolete & disabled APRM components ** Remove inactive tab id reference for Transaction Old 2 of financial account window in CreateAccountingConfiguration ms & DuplidateDocExchangeRate build validation and set reference of active tab Financial Account - Transaction tab in stead. details: https://code.openbravo.com/erp/devel/pi/rev/a1ba443733e7 changeset: 35884:a1ba443733e7 user: Atul Gaware openbravo.com> date: Tue May 21 23:28:26 2019 +0530 summary: Related To Issue 35788: Remove obsolete & disabled APRM components ** Remove Tab APRM Transaction Old 2 Tab & its fields from Financial Account window, prior to it, remove Auxiliar Inputs defined for the tab. ** Remove column for delete and modify button in FIN_FINACC_TRANSACTION table, AD_COLUMN, AD_FIELD & AD_ELEMENT ** Remove columns from APRM_FINACC_TRANSACTION_V view, AD_COLUMN, AD_FIELD and AD_ELEMENT ** Remove DeleteTransaction & FIN_TransactionModify process, its parameters, class and its model object. ** Remove DeleteTransaction & FIN_TransactionModify process access from F International Group & QA Testing client. ** Remove DeleteTransaction process references from AD_Process_Request ** Remove column values in sample data for removed colums modify & delete. ** Remove unused files PaymentGLItemGrid.srpt & PaymentGLItemGrid.xml ** Remove text interfaces associated with PaymentGLItemGrid.srpt diffstat: modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration.class |Bin modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfigurationData.class |Bin modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINACC_TRANSACTION.xml | 8 - modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_FINACC_TRANSACTION_V.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 22 - modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml |159 - modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml | 40 - modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 1104 - modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 24 - modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml | 46 - modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml |210 - modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml | 31 - modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 11 - modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration_data.xsql | 4 +- modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfigurationData.java |108 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/DeleteTransaction.java | 93 - modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/PaymentGLItemGrid.srpt | 49 - modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/PaymentGLItemGrid.xml | 36 - modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java | 56 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionModify.java |261 - referencedata/sampledata/F_B_International_Group/AD_PROCESS_ACCESS.xml
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/9b8f37d9d85e changeset: 35874:9b8f37d9d85e user: RM packaging bot openbravo.com> date: Tue May 21 13:01:15 2019 + summary: CI: update AD_MODULE to version 35873 details: https://code.openbravo.com/erp/devel/pi/rev/befaa9f4d43f changeset: 35875:befaa9f4d43f user: RM packaging bot openbravo.com> date: Tue May 21 13:15:48 2019 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/4e2286a07fca
changeset: 35845:4e2286a07fca
user: Asier Lostalé openbravo.com>
date: Mon May 20 12:28:19 2019 +0200
summary: related to issue 40290: added missing line lost in merge
details: https://code.openbravo.com/erp/devel/pi/rev/a2d3f52ffa7a
changeset: 35846:a2d3f52ffa7a
user: Asier Lostalé openbravo.com>
date: Mon May 20 12:29:20 2019 +0200
summary: related to issue 40290: recovered functionality
diffstat:
src/org/openbravo/base/model/ModelProvider.java | 2 +-
src/org/openbravo/base/model/Property.java | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diffs (23 lines):
diff -r 6360fa79e464 -r a2d3f52ffa7a
src/org/openbravo/base/model/ModelProvider.java
--- a/src/org/openbravo/base/model/ModelProvider.java Mon May 20 12:16:20
2019 +0200
+++ b/src/org/openbravo/base/model/ModelProvider.java Mon May 20 12:29:20
2019 +0200
@@ -837,7 +837,7 @@
*/
public boolean shouldGenerateChildPropertyInParent(Property p,
boolean generateAllChildProperties) {
-return (true || p.isChildPropertyInParent() || generateAllChildProperties)
&& !p.isOneToMany()
+return (p.isChildPropertyInParent() || generateAllChildProperties) &&
!p.isOneToMany()
&& !p.isId() && !p.isAuditInfo() && p.getReferencedProperty() != null
&& (!ENTITIES_WITHOUT_ALL_CHILD_PROPERTIES
.contains(p.getReferencedProperty().getEntity().getClassName()) ||
p.isParent())
diff -r 6360fa79e464 -r a2d3f52ffa7a src/org/openbravo/base/model/Property.java
--- a/src/org/openbravo/base/model/Property.javaMon May 20 12:16:20
2019 +0200
+++ b/src/org/openbravo/base/model/Property.javaMon May 20 12:29:20
2019 +0200
@@ -204,6 +204,7 @@
setModule(fromColumn.getModule());
setAllowedCrossOrgReference(fromColumn.isAllowedCrossOrgReference());
+setChildPropertyInParent(fromColumn.isChildPropertyInParent());
isProxy = false;
}
___
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/19bd63f27cc6 changeset: 35755:19bd63f27cc6 user: Asier Lostalé openbravo.com> date: Mon May 13 12:47:39 2019 +0200 summary: fixed bug 40842: install.source fails with PostgreSQL 12 It was failing on prescript creation as it makes use of two columns that have been removed in PostgreSQL 12 (pg_attrdef.adsrc, pg_constraint.consrc). They have been replaced by pg_get_expr and pg_get_constraintdef functions which are present in all supported PG versions. details: https://code.openbravo.com/erp/devel/pi/rev/cc303c2e2e09 changeset: 35756:cc303c2e2e09 user: Asier Lostalé openbravo.com> date: Mon May 13 12:48:05 2019 +0200 summary: fixed bug 40843: update.database fails with PostgreSQL 12 It failed because we made use of pg_attrdef.adsrc which was deprecated for a long time and has been removed in 12. Replaced its use by pg_get_expr which is present in all PG supported versions. diffstat: src-db/database/lib/dbsourcemanager.jar| Bin src-db/database/model/prescript-PostgreSql.sql |6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diffs (32 lines): diff -r 9c2b642b9342 -r cc303c2e2e09 src-db/database/lib/dbsourcemanager.jar Binary file src-db/database/lib/dbsourcemanager.jar has changed diff -r 9c2b642b9342 -r cc303c2e2e09 src-db/database/model/prescript-PostgreSql.sql --- a/src-db/database/model/prescript-PostgreSql.sqlMon May 13 09:10:41 2019 +0200 +++ b/src-db/database/model/prescript-PostgreSql.sqlMon May 13 12:48:05 2019 +0200 @@ -1070,7 +1070,7 @@ WHEN 'P'::text THEN upper(pg_constraint.conname::text) WHEN 'U'::text THEN upper(pg_constraint.conname::text) ELSE ''::text -END AS index_name, dba_getstandard_search_text(pg_constraint.consrc) AS search_condition, 'ENABLED'::text AS STATUS +END AS index_name, dba_getstandard_search_text(pg_get_constraintdef(pg_constraint.oid)) AS search_condition, 'ENABLED'::text AS STATUS FROM pg_constraint JOIN pg_class ON pg_class.oid = pg_constraint.conrelid LEFT JOIN pg_class fk_table ON fk_table.oid = pg_constraint.confrelid @@ -1171,7 +1171,7 @@ ELSE 0 END AS data_scale, CASE pg_attribute.atthasdef -WHEN true THEN ( SELECT pg_attrdef.adsrc +WHEN true THEN ( SELECT pg_get_expr(adbin, adrelid) FROM pg_attrdef WHERE pg_attrdef.adrelid = pg_class.oid AND pg_attrdef.adnum = pg_attribute.attnum) ELSE NULL::text @@ -1435,7 +1435,7 @@ END),'.')|| (not pg_attribute.attnotnull)::TEXT|| COALESCE( (CASE pg_attribute.atthasdef - WHEN true THEN ( SELECT pg_attrdef.adsrc FROM pg_attrdef WHERE pg_attrdef.adrelid = pg_class.oid AND pg_attrdef.adnum = pg_attribute.attnum) + WHEN true THEN ( SELECT pg_get_expr(adbin, adrelid) FROM pg_attrdef WHERE pg_attrdef.adrelid = pg_class.oid AND pg_attrdef.adnum = pg_attribute.attnum) ELSE NULL::text END),'.')) as cl FROM pg_class, pg_namespace, pg_attribute, pg_type ___ 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/c109b6a0ee8a
changeset: 35748:c109b6a0ee8a
user: Carlos Aristu openbravo.com>
date: Wed May 08 17:04:23 2019 +0200
summary: fixes issue 40813: prevent NPE in web service authentication
details: https://code.openbravo.com/erp/devel/pi/rev/41266f223ad5
changeset: 35749:41266f223ad5
user: Carlos Aristu openbravo.com>
date: Wed May 08 17:08:32 2019 +0200
summary: related to issue 40813: add test case
diffstat:
src-test/src/org/openbravo/test/AllAntTaskTests.java
| 4 +
src-test/src/org/openbravo/test/authentication/AuthenticationManagerTest.java
| 47 ++
src-test/src/org/openbravo/test/base/TestConstants.java
| 4 +
src/org/openbravo/authentication/AuthenticationManager.java
| 2 +-
4 files changed, 56 insertions(+), 1 deletions(-)
diffs (98 lines):
diff -r 7a1c0c6a1456 -r 41266f223ad5
src-test/src/org/openbravo/test/AllAntTaskTests.java
--- a/src-test/src/org/openbravo/test/AllAntTaskTests.java Wed May 08
12:25:18 2019 +
+++ b/src-test/src/org/openbravo/test/AllAntTaskTests.java Wed May 08
17:08:32 2019 +0200
@@ -41,6 +41,7 @@
import org.openbravo.erpCommon.info.ClassicSelectorTest;
import org.openbravo.test.accounting.PostDocumentTest;
import org.openbravo.test.accounting.RecordID2Test;
+import org.openbravo.test.authentication.AuthenticationManagerTest;
import org.openbravo.test.cancelandreplace.CancelAndReplaceTest;
import org.openbravo.test.centralbroker.CentralBrokerTest;
import org.openbravo.test.copyLinesFromOrders.CopyLinesFromOrdersTest;
@@ -150,6 +151,9 @@
@RunWith(Suite.class)
@Suite.SuiteClasses({
+// authentication
+AuthenticationManagerTest.class, //
+
// dal
DalComplexQueryRequisitionTest.class, //
DalComplexQueryTestOrderLine.class, //
diff -r 7a1c0c6a1456 -r 41266f223ad5
src-test/src/org/openbravo/test/authentication/AuthenticationManagerTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++
b/src-test/src/org/openbravo/test/authentication/AuthenticationManagerTest.java
Wed May 08 17:08:32 2019 +0200
@@ -0,0 +1,47 @@
+/*
+ *
+ * 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) 2019 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): __.
+
+ */
+package org.openbravo.test.authentication;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.openbravo.test.base.TestConstants.Users.OPENBRAVO;
+
+import org.junit.Test;
+import org.openbravo.authentication.basic.DefaultAuthenticationManager;
+import org.openbravo.test.base.OBBaseTest;
+
+/**
+ * Test cases to cover the authentication manager mechanism.
+ */
+public class AuthenticationManagerTest extends OBBaseTest {
+
+ private static final String USER_NAME = "Openbravo";
+ private static final String PASSWORD = "Openbravo";
+
+ /**
+ * Test the authentication intended for non standard REST web services (such
as SOAP).
+ */
+ @Test
+ public void webServiceAuthenticate() {
+DefaultAuthenticationManager authManager = new
DefaultAuthenticationManager();
+String userId = authManager.webServiceAuthenticate(USER_NAME, PASSWORD);
+assertThat(userId, equalTo(OPENBRAVO));
+ }
+
+}
diff -r 7a1c0c6a1456 -r 41266f223ad5
src-test/src/org/openbravo/test/base/TestConstants.java
--- a/src-test/src/org/openbravo/test/base/TestConstants.java Wed May 08
12:25:18 2019 +
+++ b/src-test/src/org/openbravo/test/base/TestConstants.java Wed May 08
17:08:32 2019 +0200
@@ -56,6 +56,10 @@
public static final String COUNTRY = "Country";
}
+ public static class Users {
+public static final String OPENBRAVO = "100";
+ }
+
private TestConstants() {
}
}
diff -r 7a1c0c6a1456 -r 41266f223ad5
src/org/openbravo/authentication/AuthenticationManager.java
--- a/src/org/openbravo/authentication/AuthenticationManager.java Wed May
08 12:25:18 2019 +
+++ b/src/org/openbravo/authentication/AuthenticationManager.java Wed May
08 17:08:32 2019
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/e0759ec376b4
changeset: 35719:e0759ec376b4
user: Augusto Mauch openbravo.com>
date: Mon May 06 16:47:56 2019 +0200
summary: Fixes issue 40763: Standard properties are taken from underlying
window in P
When a P window contains a grid and a request to the datasource of the P
window is done, it is
not clear whether the P grid or the underlying grid standard properties
(tabId, tableId, windowId, etc)
should be included in the contextInfo.
Before this changeset [1] was pushed, the standard properties were taken from
the underlying grid. The
changeset modified the behaviour, so that the P grid standard properties were
included instead.
This was necessary because the SelectorConstants.includeOrgFilter method needed
the table ID of the
P grid.
But the change caused another problem: Some OBBindings were relying on the
underlying grid standard
properties being included in the contextInfo.
To fix both problems, now a new property called inpPickAndExecuteTableId is
included when doing a
request from a P grid, and that property is referenced by
SelectorConstants.includeOrgFilter.
The contextInfo now will include the standard properties of the underlying
grid, as it was done
before [1].
[1]
https://code.openbravo.com/erp/devel/pi/rev/1ed089db27e7036cf53026ca873dbcf104d79bb9
details: https://code.openbravo.com/erp/devel/pi/rev/15cdfeb7c6ac
changeset: 35720:15cdfeb7c6ac
user: Augusto Mauch openbravo.com>
date: Tue May 07 09:47:49 2019 +0200
summary: Fixes issue 40472: New filtering logic takes into account lazy
filtering
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
| 11 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js
| 4 ++-
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorConstants.java
| 9 +--
3 files changed, 19 insertions(+), 5 deletions(-)
diffs (74 lines):
diff -r 03190a39ef36 -r 15cdfeb7c6ac
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
Tue May 07 08:37:36 2019 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
Tue May 07 09:47:49 2019 +0200
@@ -175,13 +175,22 @@
},
_original_recordClick: isc.PickListMenu.getPrototype().recordClick,
recordClick: function (viewer, record, recordNum, field, fieldNum,
value, rawValue) {
+ var filterEditor = this.formItem && this.formItem.grid,
+ grid = filterEditor && filterEditor.parentElement;
if (field && field.name === '_checkboxField') {
// when clicking on the checkbox, execute default behaviour
return this._original_recordClick(viewer, record, recordNum,
field, fieldNum, value, rawValue);
} else {
// when clicking a row outside the checkbox, select that specific
row and close the popup
this.formItem.setValue('==' + record._identifier);
-this.formItem.grid.performFilter(true, true);
+if (grid) {
+ if (grid.lazyFiltering) {
+grid.filterHasChanged = true;
+grid.sorter.enable();
+ } else {
+filterEditor.performFilter(true, true);
+ }
+}
this.hide();
}
}
diff -r 03190a39ef36 -r 15cdfeb7c6ac
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js
Tue May 07 08:37:36 2019 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js
Tue May 07 09:47:49 2019 +0200
@@ -925,7 +925,9 @@
return;
}
contextInfo = isc.addProperties({},
this.view.parentWindow.activeView.getContextInfo(false, true, true, true));
-isc.addProperties(contextInfo, this.viewProperties.standardProperties);
+if (this.viewProperties.standardProperties &&
this.viewProperties.standardProperties.inpTableId) {
+ contextInfo.inpPickAndExecuteTableId =
this.viewProperties.standardProperties.inpTableId;
+}
record = isc.addProperties({}, this.getRecord(rowNum),
this.getEditValues(rowNum));
fields = this.viewProperties.fields;
len = fields.length;
diff -r 03190a39ef36 -r 15cdfeb7c6ac
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorConstants.java
---
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/01589a6ee69a
changeset: 35716:01589a6ee69a
user: Asier Lostalé openbravo.com>
date: Fri May 03 07:48:00 2019 +0200
summary: fixes 40747: unnecessary wait in Import Entry Manager
After handling import entries to be processed, ImportEntryManager thread
sleeps
in order to give time those entries to be processed before starting a new
loop.
The time was calculated based on the amount of import entries handled in last
cycle (giving 300ms to each one) with a minimum of 2 secs. In cases with a
high
activity this time can be very high resulting in no new entries being
processed
because the import entry manager thread is sleeping.
When doing this calculation, the number of threads processing import entries
was
not taken into account.
Now this time is divided by this number of threads. Still this is just an
inaccurate
approximation. If this time is very small, the entries took in previous loop
will
be taken again in the next one(s) as they couldn't be processed yet so their
status
didn't change in database, causing unnecessary roundtrips to database. In any
case,
the consecuence of this would be limited to non required work being done as
ImportEntryProcessor.ImportEntryProcessRunnable.addEntry method checks
whether new
import entries retrieved from DB are already being processed before adding
them to
the queue preventing in this way double processing.
details: https://code.openbravo.com/erp/devel/pi/rev/3ad31745f63e
changeset: 35717:3ad31745f63e
user: Asier Lostalé openbravo.com>
date: Fri May 03 14:06:11 2019 +0200
summary: fixes 37853: improved ImportEntryManager logs
- Log partial timing statistics for the last 100 entries processed keeping
also
total statisitcs since last restart
- Include process time for each processed entry
- ImportEntryProcessor.addEntry
* Set key to runnable before adding entry so it gets properly logged
* In all logs include type of data and key to know if problems occur in a
single processor
* Increase from debug to warn log level message when processor's quee is
completelly full. This should really exceptional and worth to make it
visible in log as it might indicate sever problems
diffstat:
src/org/openbravo/service/importprocess/ImportEntryManager.java | 53
++---
src/org/openbravo/service/importprocess/ImportEntryProcessor.java | 18 +-
2 files changed, 47 insertions(+), 24 deletions(-)
diffs (160 lines):
diff -r b638e581f3c3 -r 3ad31745f63e
src/org/openbravo/service/importprocess/ImportEntryManager.java
--- a/src/org/openbravo/service/importprocess/ImportEntryManager.java Mon May
06 15:49:37 2019 +0200
+++ b/src/org/openbravo/service/importprocess/ImportEntryManager.java Fri May
03 14:06:11 2019 +0200
@@ -153,6 +153,8 @@
// default to number of processors plus some additionals for the main threads
private int numberOfThreads = Runtime.getRuntime().availableProcessors() + 3;
+ private int processingCapacityPerSecond;
+
// defines the batch size of reading and processing import entries by the
// main thread, for each type of data the batch size is being read
private int importBatchSize = 5000;
@@ -177,10 +179,21 @@
numberOfThreads, 4);
maxTaskQueueSize = ImportProcessUtils.getCheckIntProperty(log,
"import.max.task.queue.size",
maxTaskQueueSize, 50);
+
managerWaitTime = ImportProcessUtils.getCheckIntProperty(log,
"import.wait.time", 600, 1);
+processingCapacityPerSecond = ImportProcessUtils.getCheckIntProperty(log,
+"import.processing.capacity.per.second", numberOfThreads * 30, 10);
+
// property defined in secs, convert to ms
managerWaitTime = managerWaitTime * 1000;
+
+log.info("Import entry manager settings");
+log.info(" batch size: {}", importBatchSize);
+log.info(" number of threads: {}", numberOfThreads);
+log.info(" task queue size: {}", maxTaskQueueSize);
+log.info(" wait time: {} sec", managerWaitTime);
+log.info(" processing capacity per second: {} entries",
processingCapacityPerSecond);
}
public synchronized void start() {
@@ -613,23 +626,24 @@
if (entryCount > 0) {
// if there was data then just wait some time
// give the threads time to process it all before trying
- // a next batch of entries
+ // a next batch of entries to prevent retrieving from DB the
same records we have just
+ // handled in this cycle
try {
-// wait one second per 30 records, somewhat arbitrary
-// but high enough for most cases, also always wait 300 millis
additional to
-// start up threads etc.
+// wait processingCapacityPerSecond which is the expected
entries number of entries
+// that can be processed per second, it
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/54f5cc848bee
changeset: 35711:54f5cc848bee
user: Nono Carballo gmail.com>
date: Thu May 02 12:00:38 2019 -0400
summary: Fixes issue 40523: Uses bind parameters in query
Instead of using string concatenation to form the query, bind parameters are
used.
details: https://code.openbravo.com/erp/devel/pi/rev/a09be04c90d7
changeset: 35712:a09be04c90d7
user: Víctor Martínez Romanos openbravo.com>
date: Fri May 03 09:54:13 2019 +0200
summary: Related to issue 40523: code review improvements
Centralize localStrLine definition in just one line, when it's used.
Change parameter names to make more difficult to have conflicts with user
defined params.
Remove 'if' for corner case. This creates a very small change in this scenario:
select 'RecordId: ' || @RecordId@ || ', Line: ' || @Line@ from dual
When Line is null then:
Before: NULL
After: RecordId: 3232199ED4824EE3A07BCC1E580ABFE7, Line: NULL
diffstat:
src/org/openbravo/erpCommon/ad_forms/FactLine.java | 50 ++---
1 files changed, 14 insertions(+), 36 deletions(-)
diffs (98 lines):
diff -r 6524aa2ee769 -r a09be04c90d7
src/org/openbravo/erpCommon/ad_forms/FactLine.java
--- a/src/org/openbravo/erpCommon/ad_forms/FactLine.javaThu May 02
16:04:44 2019 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/FactLine.javaFri May 03
09:54:13 2019 +0200
@@ -11,7 +11,7 @@
* Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
* created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved.
* Contributor(s): Openbravo SLU
- * Contributions are Copyright (C) 2001-2017 Openbravo S.L.U.
+ * Contributions are Copyright (C) 2001-2019 Openbravo S.L.U.
**
*/
package org.openbravo.erpCommon.ad_forms;
@@ -19,21 +19,18 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
import javax.servlet.ServletException;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.hibernate.query.NativeQuery;
import org.openbravo.base.secureApp.VariablesSecureApp;
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBDal;
import org.openbravo.database.ConnectionProvider;
import org.openbravo.erpCommon.utility.SequenceIdData;
-import org.openbravo.exception.NoConnectionAvailableException;
import org.openbravo.model.common.currency.ConversionRateDoc;
import org.openbravo.model.common.currency.Currency;
@@ -1127,38 +1124,24 @@
public StringBuffer getDescription(ConnectionProvider connectionProvider,
String strC_Bpartner_ID,
String strC_AcctSchema_ID, String strAD_Table_ID, String strRecord_ID,
String strLine)
throws ServletException {
-String localStrLine = strLine;
StringBuffer description = new StringBuffer();
String strSql = AcctServerData.selectDescription(connectionProvider,
strAD_Table_ID,
strC_AcctSchema_ID);
try {
- if (!strSql.equals("")/* && strLine!=null && !strLine.equals("") */) {
-strSql = strSql.replaceAll("@RecordId@", "'" + strRecord_ID + "'");
-if (localStrLine == null || localStrLine.equals("")) {
- localStrLine = "NULL";
-} else {
- localStrLine = "'" + localStrLine + "'";
+ if (!StringUtils.isBlank(strSql)) {
+strSql = strSql.replaceAll("@RecordId@", ":paramRecordId")
+.replaceAll("@Line@", ":paramLineId");
+
+@SuppressWarnings("rawtypes")
+NativeQuery query =
OBDal.getInstance().getSession().createSQLQuery(strSql);
+if (strSql.contains(":paramRecordId")) {
+ query.setParameter("paramRecordId", strRecord_ID);
}
-strSql = strSql.replaceAll("@Line@", localStrLine);
-Statement st = connectionProvider.getStatement();
-ResultSet result;
-try {
- if (st.execute(strSql)) {
-result = st.getResultSet();
-while (result.next()) {
- description.append(result.getString(1));
-}
-result.close();
- }
-} catch (SQLException e) {
- log4jFactLine.error("SQL error in query: " + strSql + "Exception:" +
e);
- throw new ServletException(Integer.toString(e.getErrorCode()));
-} finally {
- try {
-connectionProvider.releaseStatement(st);
- } catch (Exception ignored) {
- }
+if (strSql.contains(":paramLineId")) {
+ query.setParameter("paramLineId", StringUtils.isBlank(strLine) ?
"NULL" : strLine);
}
+final String result = (String) query.uniqueResult();
+description.append(StringUtils.defaultIfBlank(result,
StringUtils.EMPTY));
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/66c41204bce2
changeset: 35706:66c41204bce2
user: Asier Lostalé openbravo.com>
date: Thu Apr 25 13:50:52 2019 +0200
summary: fixed issue 38950: use bind-parameters in Preferences.java
details: https://code.openbravo.com/erp/devel/pi/rev/cbb150e17b8b
changeset: 35707:cbb150e17b8b
user: Asier Lostalé openbravo.com>
date: Fri Apr 26 10:23:56 2019 +0200
summary: related to issue 40647: escape formulas when exporting csv
- Use tab instead of quoute to escape forumulas as latter is not visible
- Escape also other characters that prefix formulas (+,-,@)
diffstat:
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
| 5 +-
src/org/openbravo/erpCommon/businessUtility/Preferences.java
| 17 +
2 files changed, 13 insertions(+), 9 deletions(-)
diffs (84 lines):
diff -r ca3cd4151b46 -r cbb150e17b8b
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
---
a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
Thu Apr 25 09:54:50 2019 +0200
+++
b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
Fri Apr 26 10:23:56 2019 +0200
@@ -113,6 +113,7 @@
private static String servletPathPart = "org.openbravo.service.datasource";
private static Pattern csrfTokenPattern = Pattern
.compile("\"csrfToken\":\"(?[A-Z0-9]+)\"");
+ private static final String[] CSV_FORMULA_PREFIXES = new String[] { "=",
"+", "-", "@" };
public static String getServletPathPart() {
return servletPathPart;
@@ -678,9 +679,9 @@
String outputValue;
if (keyValue != null && !keyValue.toString().equals("null")) {
outputValue = keyValue.toString().replace("\"", "\"\"");
-if (outputValue.startsWith("=")) {
+if (StringUtils.startsWithAny(outputValue, CSV_FORMULA_PREFIXES)) {
// escape formulas
- outputValue = "'" + outputValue;
+ outputValue = "\t" + outputValue;
}
} else {
outputValue = "";
diff -r ca3cd4151b46 -r cbb150e17b8b
src/org/openbravo/erpCommon/businessUtility/Preferences.java
--- a/src/org/openbravo/erpCommon/businessUtility/Preferences.java Thu Apr
25 09:54:50 2019 +0200
+++ b/src/org/openbravo/erpCommon/businessUtility/Preferences.java Fri Apr
26 10:23:56 2019 +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-2018 Openbravo SLU
+ * All portions are Copyright (C) 2010-2019 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -20,6 +20,7 @@
package org.openbravo.erpCommon.businessUtility;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -34,7 +35,6 @@
import org.openbravo.erpCommon.utility.PropertyConflictException;
import org.openbravo.erpCommon.utility.PropertyException;
import org.openbravo.erpCommon.utility.PropertyNotFoundException;
-import org.openbravo.erpCommon.utility.StringCollectionUtils;
import org.openbravo.erpCommon.utility.Utility;
import org.openbravo.model.ad.access.Role;
import org.openbravo.model.ad.access.User;
@@ -430,16 +430,18 @@
}
hql.append("p.visibleAtRole is null) ");
+ List parentOrgs;
if (org == null) {
-hql.append(" and coalesce(p.visibleAtOrganization, '0')='0'");
+parentOrgs = Arrays.asList("0");
} else {
-List parentTree = OBContext.getOBContext()
+parentOrgs = OBContext.getOBContext()
.getOrganizationStructureProvider(client)
.getParentList(org, true);
-String parentOrgs = "(" +
StringCollectionUtils.commaSeparated(parentTree) + ")";
-hql.append(" and coalesce(p.visibleAtOrganization, '0') in " +
parentOrgs);
}
+ hql.append(" and coalesce(p.visibleAtOrganization.id, '0') in
:parentOrgs");
+ parameters.put("parentOrgs", parentOrgs);
+
if (user != null) {
hql.append(" and (p.userContact.id = :userId or ");
parameters.put("userId", user);
@@ -459,7 +461,8 @@
}
if (property != null) {
- hql.append(" and p.propertyList = '" + (isListProperty ? "Y" : "N") +
"'");
+ hql.append(" and p.propertyList = :isListProperty");
+ parameters.put("isListProperty", isListProperty);
if (isListProperty) {
hql.append(" and p.property = :property ");
} else {
___
Openbravo-commits mailing list
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/d1c1ca14caff
changeset: 35704:d1c1ca14caff
user: David Miguelez openbravo.com>
date: Thu Apr 25 09:53:25 2019 +0200
summary: Related to Issue 40623. Use proper date to filter the max aggregated
period
details: https://code.openbravo.com/erp/devel/pi/rev/ca3cd4151b46
changeset: 35705:ca3cd4151b46
user: David Miguelez openbravo.com>
date: Thu Apr 25 09:54:50 2019 +0200
summary: Fixes Issue 40676. Trunc the movement date in the query filters
as it can have precision greater than days, but the comparison
is always done at day level
diffstat:
src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java | 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportValuationStock_data.xsql | 24
+-
src/org/openbravo/materialmgmt/GenerateValuedStockAggregated_data.xsql | 8 +-
3 files changed, 17 insertions(+), 17 deletions(-)
diffs (120 lines):
diff -r cfc6ddc67eb0 -r ca3cd4151b46
src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java Thu Apr
25 13:12:34 2019 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java Thu Apr
25 09:54:50 2019 +0200
@@ -196,7 +196,7 @@
String strDateNext = DateTimeData.nDaysAfter(readOnlyCP, strDate, "1");
String strMaxAggDate =
ReportValuationStockData.selectMaxAggregatedDate(readOnlyCP,
OBDal.getReadOnlyInstance().get(Organization.class,
strLegalEntity).getClient().getId(),
- strDate, orgIds);
+ strDateNext, orgIds);
if (StringUtils.isEmpty(strMaxAggDate)) {
DateFormat formatter = new SimpleDateFormat("dd-MM-");
Date maxAggDate = formatter.parse("01-01-");
diff -r cfc6ddc67eb0 -r ca3cd4151b46
src/org/openbravo/erpCommon/ad_reports/ReportValuationStock_data.xsql
--- a/src/org/openbravo/erpCommon/ad_reports/ReportValuationStock_data.xsql
Thu Apr 25 13:12:34 2019 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportValuationStock_data.xsql
Thu Apr 25 09:54:50 2019 +0200
@@ -53,8 +53,8 @@
WHERE dateacct < to_date(?)
AND dateacct > to_date(?)
GROUP BY m_transaction_id, c_currency_id) tc
ON trx.m_transaction_id = tc.m_transaction_id
-WHERE trx.MOVEMENTDATE < to_date(?)
-AND trx.MOVEMENTDATE > to_date(?)
+WHERE TRUNC(trx.MOVEMENTDATE) < to_date(?)
+AND TRUNC(trx.MOVEMENTDATE) > to_date(?)
AND trx.TRXPROCESSDATE >= to_timestamp(?, ?)
AND trx.ad_org_id IN ('1')
AND 0=0
@@ -157,8 +157,8 @@
JOIN M_PRODUCT p ON trx.m_product_id = p.m_product_id
JOIN M_TRANSACTION_COST tc ON trx.m_transaction_id =
tc.m_transaction_id AND tc.dateacct < to_date(?)
AND tc.dateacct > to_date(?)
- WHERE trx.MOVEMENTDATE < to_date(?)
-AND trx.MOVEMENTDATE > to_date(?)
+ WHERE TRUNC(trx.MOVEMENTDATE) < to_date(?)
+AND TRUNC(trx.MOVEMENTDATE) > to_date(?)
AND trx.TRXPROCESSDATE >= to_timestamp(?, ?)
AND trx.ad_org_id IN ('1')
AND trx.iscostcalculated = 'Y'
@@ -219,8 +219,8 @@
JOIN m_transaction trx ON trx.m_product_id = p.m_product_id
JOIN m_locator l ON trx.m_locator_id = l.m_locator_id
WHERE trx.iscostcalculated = 'N'
-AND trx.MOVEMENTDATE < to_date(?)
-AND trx.MOVEMENTDATE > to_date(?)
+AND TRUNC(trx.MOVEMENTDATE) < to_date(?)
+AND TRUNC(trx.MOVEMENTDATE) > to_date(?)
AND trx.TRXPROCESSDATE >= to_timestamp(?, ?)
AND trx.ad_org_id IN ('2')
AND 2 = 2
@@ -305,8 +305,8 @@
WHERE dateacct < to_date(?)
AND dateacct > to_date(?)
GROUP BY m_transaction_id, c_currency_id) tc
ON trx.m_transaction_id = tc.m_transaction_id
-WHERE trx.MOVEMENTDATE < to_date(?)
-AND trx.MOVEMENTDATE > to_date(?)
+WHERE TRUNC(trx.MOVEMENTDATE) < to_date(?)
+AND TRUNC(trx.MOVEMENTDATE) > to_date(?)
AND trx.TRXPROCESSDATE >= to_timestamp(?, ?)
AND trx.ad_org_id IN ('1')
AND 0=0
@@ -380,8 +380,8 @@
JOIN M_PRODUCT p ON trx.m_product_id = p.m_product_id
JOIN M_TRANSACTION_COST tc ON trx.m_transaction_id =
tc.m_transaction_id
AND tc.dateacct < to_date(?) AND tc.dateacct > to_date(?)
- WHERE trx.MOVEMENTDATE < to_date(?)
-AND trx.MOVEMENTDATE > to_date(?)
+ WHERE TRUNC(trx.MOVEMENTDATE) < to_date(?)
+AND TRUNC(trx.MOVEMENTDATE) > to_date(?)
AND trx.TRXPROCESSDATE >=
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/a5d02171e10c
changeset: 35702:a5d02171e10c
user: Nono Carballo gmail.com>
date: Thu Apr 25 12:39:23 2019 +0200
summary: Fixes issue 40522: Prevents use of string concatenation in query
Query to get business partners was formed using string concatenation.
This fix replaces the string concatenation by bind parameters in query.
details: https://code.openbravo.com/erp/devel/pi/rev/cfc6ddc67eb0
changeset: 35703:cfc6ddc67eb0
user: Sandra Huguet openbravo.com>
date: Thu Apr 25 13:12:34 2019 +0200
summary: related to issue 40522 code review changes
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
| 12 +++--
1 files changed, 9 insertions(+), 3 deletions(-)
diffs (37 lines):
diff -r 1fbbfb4e42f7 -r cfc6ddc67eb0
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
Wed Apr 24 13:21:07 2019 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
Thu Apr 25 13:12:34 2019 +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-2018 Openbravo SLU
+ * All portions are Copyright (C) 2010-2019 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
*
@@ -409,9 +409,14 @@
whereClause.append("select b.id as id, b.name as name from ");
whereClause.append(" BusinessPartner b ");
whereClause.append(" where (");
+ HashMap tokenPrams = new HashMap<>();
+ int tokenIndex = 0;
for (String token : list) {
-whereClause.append(
-" lower(b." + BusinessPartner.PROPERTY_NAME + ") like lower('%" +
token + "%') or ");
+String tokenParamName = String.format("token_%d", tokenIndex);
+tokenPrams.put(tokenParamName, "%" + token + "%");
+whereClause.append(" lower(b." + BusinessPartner.PROPERTY_NAME + ")
like lower(:"
++ tokenParamName + " ) or ");
+tokenIndex++;
}
whereClause.delete(whereClause.length() - 3,
whereClause.length()).append(")");
whereClause.append(" and b." + BusinessPartner.PROPERTY_ORGANIZATION +
".id in (");
@@ -420,6 +425,7 @@
final Query bl = OBDal.getInstance()
.getSession()
.createQuery(whereClause.toString(), Object[].class);
+ bl.setProperties(tokenPrams);
businessPartnersScroll = bl.scroll(ScrollMode.SCROLL_SENSITIVE);
if (!businessPartnersScroll.next()) {
___
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/0435d6d78784
changeset: 35700:0435d6d78784
user: Sandra Huguet openbravo.com>
date: Wed Apr 24 13:20:11 2019 +0200
summary: Fixed issue 40670 Fix query to compare organization with
corresponding id.
Fix query to compare organization with corresponding id instead of the
business object.
Fix wrong filter date, period.getEndingDate() is used and the correct
one is period.getStartingDate().
details: https://code.openbravo.com/erp/devel/pi/rev/1fbbfb4e42f7
changeset: 35701:1fbbfb4e42f7
user: Nono Carballo gmail.com>
date: Wed Apr 24 13:21:07 2019 +0200
summary: Fixes issue 40623: Considers date in filter
When retrieving the date for aggregate report, date set in filter is also
considered.
diffstat:
src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java | 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportValuationStock_data.xsql | 2 +
src/org/openbravo/materialmgmt/ResetValuedStockAggregated.java| 14
+-
3 files changed, 10 insertions(+), 8 deletions(-)
diffs (85 lines):
diff -r 0bd36b5d697b -r 1fbbfb4e42f7
src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java Wed Apr
24 10:21:28 2019 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java Wed Apr
24 13:21:07 2019 +0200
@@ -196,7 +196,7 @@
String strDateNext = DateTimeData.nDaysAfter(readOnlyCP, strDate, "1");
String strMaxAggDate =
ReportValuationStockData.selectMaxAggregatedDate(readOnlyCP,
OBDal.getReadOnlyInstance().get(Organization.class,
strLegalEntity).getClient().getId(),
- orgIds);
+ strDate, orgIds);
if (StringUtils.isEmpty(strMaxAggDate)) {
DateFormat formatter = new SimpleDateFormat("dd-MM-");
Date maxAggDate = formatter.parse("01-01-");
diff -r 0bd36b5d697b -r 1fbbfb4e42f7
src/org/openbravo/erpCommon/ad_reports/ReportValuationStock_data.xsql
--- a/src/org/openbravo/erpCommon/ad_reports/ReportValuationStock_data.xsql
Wed Apr 24 10:21:28 2019 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportValuationStock_data.xsql
Wed Apr 24 13:21:07 2019 +0200
@@ -506,10 +506,12 @@
SELECT MAX(dateto)
FROM m_valued_stock_agg agg
WHERE ad_client_id = ?
+ AND dateto < to_date(?)
AND ad_org_id IN ('1')
]]>
+
diff -r 0bd36b5d697b -r 1fbbfb4e42f7
src/org/openbravo/materialmgmt/ResetValuedStockAggregated.java
--- a/src/org/openbravo/materialmgmt/ResetValuedStockAggregated.javaWed Apr
24 10:21:28 2019 +0200
+++ b/src/org/openbravo/materialmgmt/ResetValuedStockAggregated.javaWed Apr
24 13:21:07 2019 +0200
@@ -220,7 +220,7 @@
OBQuery query = OBDal.getInstance()
.createQuery(CostingRule.class, where.toString());
-query.setNamedParameter("org", legalEntity);
+query.setNamedParameter("org", legalEntity.getId());
query.setNamedParameter("startingDate", startingDate);
query.setNamedParameter("endingDate", endingDate);
@@ -238,9 +238,9 @@
OBQuery query = OBDal.getInstance()
.createQuery(CostingRule.class, where.toString());
-query.setNamedParameter("org", legalEntity);
+query.setNamedParameter("org", legalEntity.getId());
query.setNamedParameter("endingDate", period.getEndingDate());
-query.setNamedParameter("startingDate", period.getEndingDate());
+query.setNamedParameter("startingDate", period.getStartingDate());
return !query.list().isEmpty();
}
@@ -261,7 +261,7 @@
StringBuffer where = new StringBuffer();
where.append(" as p");
-where.append(" where p.organization in (:org)");
+where.append(" where p.organization.id in (:org)");
where.append(" and p.periodType = 'S'");
where.append(" and p.endingDate <= :endDate");
where.append(" and p.endingDate <= :firstNotClosedPeriodStartingDate");
@@ -269,7 +269,7 @@
where.append(" order by p.endingDate asc");
OBQuery query = OBDal.getInstance().createQuery(Period.class,
where.toString());
-query.setNamedParameter("org", legalEntity);
+query.setNamedParameter("org", legalEntity.getId());
query.setNamedParameter("endDate", endDate);
query.setNamedParameter("firstNotClosedPeriodStartingDate",
firstNotClosedPeriodStartingDate);
query.setNamedParameter("lastAggregatedPeriodDateTo",
lastAggregatedPeriodDateTo);
@@ -336,12 +336,12 @@
select.append(" from FinancialMgmtPeriodControl pc");
select.append(" where pc.period = p)");
select.append(" )");
-select.append(" and p.organization in (:org)");
+select.append(" and p.organization.id in (:org)");
Query trxQry = OBDal.getInstance()
.getSession()
.createQuery(select.toString(), Date.class);
-trxQry.setParameter("org", legalEntity);
+
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/08db5ae97ad2
changeset: 35693:08db5ae97ad2
user: Asier Lostalé openbravo.com>
date: Thu Apr 18 13:39:18 2019 +0200
summary: fixed issue 40642: XMLUtils centralizes creation of objects to deal
with XML
details: https://code.openbravo.com/erp/devel/pi/rev/298602067263
changeset: 35694:298602067263
user: Asier Lostalé openbravo.com>
date: Thu Apr 18 15:42:05 2019 +0200
summary: fixed bug 40647: escape formulas when exporting csv
When exporting to csv:
- If value starts with equals, escape it so that it is not treated as a
formula
- Use JDK's String.replace instead of OB's
diffstat:
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
| 14 +-
src-test/src/org/openbravo/test/dal/IssuesTest.java
| 5 +-
src-test/src/org/openbravo/test/webservice/BaseWSTest.java
| 6 +-
src/org/openbravo/base/provider/OBProviderConfigReader.java
| 7 +-
src/org/openbravo/base/secureApp/LoginUtils.java
| 7 +-
src/org/openbravo/base/session/OBPropertiesProvider.java
| 7 +-
src/org/openbravo/dal/xml/EntityExcelXMLConverter.java
| 6 +-
src/org/openbravo/dal/xml/EntityXMLConverter.java
| 9 +-
src/org/openbravo/dal/xml/XMLUtil.java
| 53 +-
src/org/openbravo/erpCommon/ad_forms/TranslationManager.java
| 49
src/org/openbravo/erpCommon/modules/ImportModule.java
| 12 +-
src/org/openbravo/erpCommon/utility/ISOCurrencyPrecision.java
| 7 +-
src/org/openbravo/service/rest/DalWebService.java
| 7 +-
src/org/openbravo/service/web/WebServiceUtil.java
| 5 +-
14 files changed, 123 insertions(+), 71 deletions(-)
diffs (truncated from 619 to 300 lines):
diff -r 624df4ecc1c6 -r 298602067263
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
---
a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
Thu Apr 18 09:20:58 2019 +0200
+++
b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
Thu Apr 18 15:42:05 2019 +0200
@@ -675,15 +675,21 @@
keyValue = (Boolean) keyValue ? getTranslatedLabelYes() :
getTranslatedLabelNo();
}
+ String outputValue;
if (keyValue != null && !keyValue.toString().equals("null")) {
-keyValue = Replace.replace(keyValue.toString(), "\"", "\"\"");
+outputValue = keyValue.toString().replace("\"", "\"\"");
+if (outputValue.startsWith("=")) {
+ // escape formulas
+ outputValue = "'" + outputValue;
+}
} else {
-keyValue = "";
+outputValue = "";
}
+
if (!numericCols.contains(key)) {
-keyValue = "\"" + keyValue + "\"";
+outputValue = "\"" + outputValue + "\"";
}
- writer.append(keyValue.toString());
+ writer.append(outputValue);
}
} catch (Exception e) {
throw new OBException("Error while exporting CSV information", e);
diff -r 624df4ecc1c6 -r 298602067263
src-test/src/org/openbravo/test/dal/IssuesTest.java
--- a/src-test/src/org/openbravo/test/dal/IssuesTest.java Thu Apr 18
09:20:58 2019 +0200
+++ b/src-test/src/org/openbravo/test/dal/IssuesTest.java Thu Apr 18
15:42:05 2019 +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-2018 Openbravo SLU
+ * All portions are Copyright (C) 2009-2019 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -75,6 +75,7 @@
import org.openbravo.dal.service.OBDal;
import org.openbravo.dal.service.OBQuery;
import org.openbravo.dal.xml.XMLEntityConverter;
+import org.openbravo.dal.xml.XMLUtil;
import org.openbravo.data.UtilSql;
import org.openbravo.model.ad.access.Role;
import org.openbravo.model.ad.access.User;
@@ -563,7 +564,7 @@
// for a webservice referenced entities should not be created at all!
xec.getEntityResolver().setOptionCreateReferencedIfNotFound(false);
-final SAXReader
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/e4ecb0f34be7
changeset: 35690:e4ecb0f34be7
user: Nono Carballo gmail.com>
date: Wed Apr 17 11:42:09 2019 +0200
summary: Fixes issue 40539: Sets warehouse organization in physical
inventories
When creating Physical Inventories (init/close) at processing Physical Inventory
Amount Update, organization is set to the warehouse organization, instead of
the document organization.
details: https://code.openbravo.com/erp/devel/pi/rev/0436f5f5c68c
changeset: 35691:0436f5f5c68c
user: Sandra Huguet openbravo.com>
date: Wed Apr 17 12:39:05 2019 +0200
summary: related to issue 40539 code review changes
Create a new variable for client and warehouse to use in all ocurrences
diffstat:
src/org/openbravo/costing/InventoryAmountUpdateProcess.java | 28 ++--
1 files changed, 15 insertions(+), 13 deletions(-)
diffs (55 lines):
diff -r 5e010ec9da31 -r 0436f5f5c68c
src/org/openbravo/costing/InventoryAmountUpdateProcess.java
--- a/src/org/openbravo/costing/InventoryAmountUpdateProcess.java Wed Apr
17 11:25:20 2019 +
+++ b/src/org/openbravo/costing/InventoryAmountUpdateProcess.java Wed Apr
17 12:39:05 2019 +0200
@@ -340,36 +340,38 @@
if (localDate == null) {
localDate = new Date();
}
-String clientId = invLine.getClient().getId();
+Client client = (Client) OBDal.getInstance()
+.getProxy(Client.ENTITY_NAME, invLine.getClient().getId());
String orgId = invLine.getOrganization().getId();
+Warehouse warehouse = (Warehouse) OBDal.getInstance()
+.getProxy(Warehouse.ENTITY_NAME, warehouseId);
InvAmtUpdLnInventories inv =
OBProvider.getInstance().get(InvAmtUpdLnInventories.class);
-inv.setClient((Client) OBDal.getInstance().getProxy(Client.ENTITY_NAME,
clientId));
+inv.setClient(client);
inv.setOrganization(
(Organization) OBDal.getInstance().getProxy(Organization.ENTITY_NAME,
orgId));
-inv.setWarehouse((Warehouse)
OBDal.getInstance().getProxy(Warehouse.ENTITY_NAME, warehouseId));
+inv.setWarehouse(warehouse);
+
inv.setCaInventoryamtline(invLine);
List invList =
invLine.getInventoryAmountUpdateLineInventoriesList();
invList.add(inv);
invLine.setInventoryAmountUpdateLineInventoriesList(invList);
InventoryCount closeInv =
OBProvider.getInstance().get(InventoryCount.class);
-closeInv.setClient((Client)
OBDal.getInstance().getProxy(Client.ENTITY_NAME, clientId));
-closeInv.setOrganization(
-(Organization) OBDal.getInstance().getProxy(Organization.ENTITY_NAME,
orgId));
+closeInv.setClient(client);
closeInv.setName(OBMessageUtils.messageBD("InvAmtUpdCloseInventory"));
-closeInv
-.setWarehouse((Warehouse)
OBDal.getInstance().getProxy(Warehouse.ENTITY_NAME, warehouseId));
+
+closeInv.setWarehouse(warehouse);
+closeInv.setOrganization(warehouse.getOrganization());
+
closeInv.setMovementDate(localDate);
closeInv.setInventoryType("C");
inv.setCloseInventory(closeInv);
InventoryCount initInv =
OBProvider.getInstance().get(InventoryCount.class);
-initInv.setClient((Client)
OBDal.getInstance().getProxy(Client.ENTITY_NAME, clientId));
-initInv.setOrganization(
-(Organization) OBDal.getInstance().getProxy(Organization.ENTITY_NAME,
orgId));
+initInv.setClient(client);
initInv.setName(OBMessageUtils.messageBD("InvAmtUpdInitInventory"));
-initInv
-.setWarehouse((Warehouse)
OBDal.getInstance().getProxy(Warehouse.ENTITY_NAME, warehouseId));
+initInv.setWarehouse(warehouse);
+initInv.setOrganization(warehouse.getOrganization());
initInv.setMovementDate(localDate);
initInv.setInventoryType("O");
inv.setInitInventory(initInv);
___
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/77247a463666
changeset: 35677:77247a463666
user: Asier Lostalé openbravo.com>
date: Wed Apr 17 12:57:28 2019 +0200
summary: fixed bug 40633: Discounts and Promotions window fails under some
circumstances
When Discount and Promotions view was requested having previously initialized
ADCS with that window via FIC a LazyInitializationException was thrown.
The problem is this window has a tree reference field which was partially
initialized
in ADCS.
details: https://code.openbravo.com/erp/devel/pi/rev/70984e92751f
changeset: 35678:70984e92751f
user: Asier Lostalé openbravo.com>
date: Wed Apr 17 12:59:00 2019 +0200
summary: related to bug 40633: added test case
diffstat:
modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/ADCSTest.java
| 65 ++
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java
| 4 +-
src-test/src/org/openbravo/test/AllAntTaskTests.java
| 2 +
src-test/src/org/openbravo/test/base/TestConstants.java
| 1 +
4 files changed, 71 insertions(+), 1 deletions(-)
diffs (120 lines):
diff -r a85380315784 -r 70984e92751f
modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/ADCSTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++
b/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/ADCSTest.java
Wed Apr 17 12:59:00 2019 +0200
@@ -0,0 +1,65 @@
+/*
+ *
+ * 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) 2019 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): __.
+
+ */
+
+package org.openbravo.client.application.test;
+
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assume.assumeTrue;
+import static
org.openbravo.test.base.TestConstants.Windows.DISCOUNTS_AND_PROMOTIONS;
+
+import javax.inject.Inject;
+
+import org.junit.Test;
+import org.openbravo.base.weld.test.WeldBaseTest;
+import
org.openbravo.client.application.window.ApplicationDictionaryCachedStructures;
+import org.openbravo.client.application.window.StandardWindowComponent;
+import org.openbravo.client.kernel.ComponentGenerator;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.model.ad.ui.Window;
+
+/** Additional test cases for {@link ApplicationDictionaryCachedStructures} */
+public class ADCSTest extends WeldBaseTest {
+ @Inject
+ private ApplicationDictionaryCachedStructures adcs;
+
+ @Inject
+ private StandardWindowComponent component;
+
+ /** See issue #40633 */
+ @Test
+ public void
tabWithProductCharacteristicsIsGeneratedAfterADCSInitialization() {
+assumeTrue("Cache can be used (no modules in development)",
adcs.useCache());
+setSystemAdministratorContext();
+
+// given ADCS initialized with only Discounts and Promotions window
+adcs.init();
+Window w = adcs.getWindow(DISCOUNTS_AND_PROMOTIONS);
+
+// when Discounts and Promotions view is requested in a different DAL
session
+OBDal.getInstance().commitAndClose();
+component.setWindow(w);
+String generatedView =
ComponentGenerator.getInstance().generate(component);
+
+// then the view gets generated without throwing exceptions
+assertThat(generatedView, not(isEmptyString()));
+ }
+
+}
diff -r a85380315784 -r 70984e92751f
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java
Wed Mar 27 12:39:27 2019 +0100
+++
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/c11d43f00ade
changeset: 35672:c11d43f00ade
user: Nono Carballo gmail.com>
date: Mon Apr 15 12:37:16 2019 +0200
summary: Fixes issue 40519: Prevents post CostAdjustment with closed periods
For CostAdjustments, the accounting date is a property of CostAdjustmentLines,
the date considered to get the period is the reference date of the document,
causing a CostAdjustment with reference date in an open period can be posted
even when there are lines with accounting date in a closed period.
This fix prevents a CostAdjustment to be posted if there is at least one line
with accounting date in a closed period.
details: https://code.openbravo.com/erp/devel/pi/rev/68baacc03b4a
changeset: 35673:68baacc03b4a
user: Sandra Huguet openbravo.com>
date: Mon Apr 15 17:58:20 2019 +0200
summary: related to issue 40519 code review changes
diffstat:
src/org/openbravo/erpCommon/ad_forms/DocCostAdjustment.java | 38 -
1 files changed, 37 insertions(+), 1 deletions(-)
diffs (67 lines):
diff -r d91acd577d96 -r 68baacc03b4a
src/org/openbravo/erpCommon/ad_forms/DocCostAdjustment.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocCostAdjustment.java Wed Apr
17 09:51:44 2019 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocCostAdjustment.java Mon Apr
15 17:58:20 2019 +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) 2014-2018 Openbravo SLU
+ * All portions are Copyright (C) 2014-2019 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
*
@@ -27,11 +27,16 @@
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.openbravo.advpaymentmngt.utility.FIN_Utility;
import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.dal.service.OBQuery;
import org.openbravo.data.FieldProvider;
import org.openbravo.database.ConnectionProvider;
+import org.openbravo.erpCommon.utility.OBDateUtils;
import org.openbravo.erpCommon.utility.OBMessageUtils;
import org.openbravo.erpCommon.utility.SequenceIdData;
+import org.openbravo.model.materialmgmt.cost.CostAdjustmentLine;
public class DocCostAdjustment extends AcctServer {
@@ -511,6 +516,37 @@
}
+ /**
+ * Set the period for the Cost Adjustment considering if all the periods
matching accounting dates
+ * in Cost Adjustment Lines are opened
+ */
+ @Override
+ public void setC_Period_ID() {
+if (C_Period_ID != null) {
+ return;
+}
+if (areAllPeriodsOpened(Record_ID, DocumentType)) {
+ super.setC_Period_ID();
+} else {
+ C_Period_ID = "";
+}
+ }
+
+ private boolean areAllPeriodsOpened(final String record_ID, final String
documentType) {
+String whereClause = "costAdjustment.id = :record_ID";
+OBQuery costAdjLineQry = OBDal.getInstance()
+.createQuery(CostAdjustmentLine.class, whereClause);
+costAdjLineQry.setNamedParameter("record_ID", record_ID);
+for (CostAdjustmentLine costAdjustmentLine : costAdjLineQry.list()) {
+ if (!FIN_Utility.isPeriodOpen(costAdjustmentLine.getClient().getId(),
documentType,
+ costAdjustmentLine.getOrganization().getId(),
+ OBDateUtils.formatDate(costAdjustmentLine.getAccountingDate( {
+return false;
+ }
+}
+return true;
+ }
+
@Override
public String getServletInfo() {
return "Servlet for the accounting";
___
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/435585a9485d
changeset: 35649:435585a9485d
user: Stefan Hühner openbravo.com
date: Fri Apr 12 08:02:03 2019 +0200
summary: fixes 40598: do not use generics with Object, use instead knwon type
details: https://code.openbravo.com/erp/devel/pi/rev/44c6e6baec01
changeset: 35650:44c6e6baec01
user: Asier Lostalé openbravo.com>
date: Fri Apr 12 08:45:20 2019 +0200
summary: related to issue 40598: do not use Vector at all, use ArrayList
instead
diffstat:
src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java |
75 -
1 files changed, 34 insertions(+), 41 deletions(-)
diffs (198 lines):
diff -r c51687516a3d -r 44c6e6baec01
src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java
---
a/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java
Thu Apr 11 11:32:25 2019 +0200
+++
b/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java
Fri Apr 12 08:45:20 2019 +0200
@@ -8,7 +8,7 @@
* 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) 2008-2018 Openbravo SLU All Rights Reserved.
+ * portions are Copyright (C) 2008-2019 Openbravo SLU All Rights Reserved.
* Contributor(s): __.
*/
package org.openbravo.erpCommon.utility.reporting.printing;
@@ -29,7 +29,6 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Vector;
import java.util.regex.Matcher;
import javax.servlet.ServletConfig;
@@ -343,10 +342,11 @@
} else if (vars.commandIn("DEL")) {
final String documentToDelete =
vars.getStringParameter("idToDelete");
- final Vector vector = (Vector)
request.getSession().getAttribute("files");
- request.getSession().setAttribute("files", vector);
+ final List attachments = (List)
request.getSession()
+ .getAttribute("files");
+ request.getSession().setAttribute("files", attachments);
- seekAndDestroy(vector, documentToDelete);
+ seekAndDestroy(attachments, documentToDelete);
createEmailOptionsPage(request, response, vars, documentType,
getComaSeparatedString(documentIds), reports, checks,
fullDocumentIdentifier);
@@ -414,7 +414,7 @@
}
final String senderAddress =
vars.getStringParameter("fromEmail");
sendDocumentEmail(report, vars,
- (Vector) request.getSession().getAttribute("files"),
documentData,
+ (List)
request.getSession().getAttribute("files"), documentData,
senderAddress, checks, documentType);
nrOfEmailsSend++;
}
@@ -660,16 +660,11 @@
}
}
- /**
- *
- * @param vector
- * @param documentToDelete
- */
- private void seekAndDestroy(Vector vector, String documentToDelete) {
-for (int i = 0; i < vector.size(); i++) {
- final AttachContent content = (AttachContent) vector.get(i);
+ private void seekAndDestroy(List attachments, String
documentToDelete) {
+for (int i = 0; i < attachments.size(); i++) {
+ final AttachContent content = attachments.get(i);
if (content.id.equals(documentToDelete)) {
-vector.remove(i);
+attachments.remove(i);
break;
}
}
@@ -697,9 +692,10 @@
return null;
}
- void sendDocumentEmail(Report report, VariablesSecureApp vars,
Vector object,
- PocData documentData, String senderAddress, HashMap
checks,
- DocumentType documentType) throws IOException, ServletException {
+ void sendDocumentEmail(Report report, VariablesSecureApp vars,
+ List attachedContent, PocData documentData, String
senderAddress,
+ HashMap checks, DocumentType documentType)
+ throws IOException, ServletException {
final String attachmentFileLocation = report.getTargetLocation();
String emailSubject = null, emailBody = null;
final String ourReference = report.getOurReference();
@@ -795,10 +791,8 @@
List attachments = new ArrayList<>();
attachments.add(new File(attachmentFileLocation));
-if (object != null) {
- final Vector vector = object;
- for (int i = 0; i < vector.size(); i++) {
-final AttachContent objContent = (AttachContent) vector.get(i);
+if (attachedContent != null) {
+ for (AttachContent objContent : attachedContent) {
final File file = prepareFile(objContent, ourReference);
attachments.add(file);
}
@@ -826,7 +820,7 @@
try {
EmailManager.sendEmail(mailConfig, email);
} catch (Exception exception) {
- log4j.error(exception);
+ log4j.error("error sending mail",
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/22f3e0fdb2c7 changeset: 35606:22f3e0fdb2c7 user: RM packaging bot openbravo.com> date: Fri Mar 29 14:04:59 2019 + summary: CI: update AD_MODULE to version 35603 details: https://code.openbravo.com/erp/devel/pi/rev/e39343ce3826 changeset: 35607:e39343ce3826 user: RM packaging bot openbravo.com> date: Fri Mar 29 14:19:19 2019 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/0c1fd9800f2c changeset: 35601:0c1fd9800f2c user: RM packaging bot openbravo.com> date: Fri Mar 29 05:56:25 2019 + summary: CI: update AD_MODULE to version 35600 details: https://code.openbravo.com/erp/devel/pi/rev/c06031aa0cab changeset: 35602:c06031aa0cab user: RM packaging bot openbravo.com> date: Fri Mar 29 06:10:36 2019 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/faf4157296e1 changeset: 35597:faf4157296e1 user: RM packaging bot openbravo.com> date: Thu Mar 28 18:11:00 2019 + summary: CI: update AD_MODULE to version 35596 details: https://code.openbravo.com/erp/devel/pi/rev/395298c39250 changeset: 35598:395298c39250 user: RM packaging bot openbravo.com> date: Thu Mar 28 18:25:19 2019 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/b2fbc1588df4 changeset: 35594:b2fbc1588df4 user: RM packaging bot openbravo.com> date: Thu Mar 28 13:33:26 2019 + summary: CI: update AD_MODULE to version 35593 details: https://code.openbravo.com/erp/devel/pi/rev/8ce0c2f34c73 changeset: 35595:8ce0c2f34c73 user: RM packaging bot openbravo.com> date: Thu Mar 28 13:50:38 2019 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/685b7fc35b49
changeset: 35563:685b7fc35b49
user: Atul Gaware openbravo.com>
date: Tue Mar 26 09:56:06 2019 +0530
summary: Fixes Issue 40324: Bill Of Materials Production should take
the stock from same warehouse than the storage bin defined
in the Production Plan tab
** New optional flag is provided in order to force use of warehouse
of selected storage bin in production plan to be used as priority
warehouse for all the production line for picking stock of prodcuts
to be consumed and produced ones.
details: https://code.openbravo.com/erp/devel/pi/rev/4aa73ae52644
changeset: 35564:4aa73ae52644
user: David Miguelez openbravo.com>
date: Wed Mar 27 11:34:47 2019 +0100
summary: Related to issue 40450. Give a default value to the new parameter
in case it is not sent to the PL.
diffstat:
src-db/database/model/functions/M_PRODUCTION_RUN.xml | 12 ++--
src-db/database/sourcedata/AD_ELEMENT.xml| 14 ++
src-db/database/sourcedata/AD_PROCESS_PARA.xml | 20
3 files changed, 44 insertions(+), 2 deletions(-)
diffs (97 lines):
diff -r 0f7bd818ce07 -r 4aa73ae52644
src-db/database/model/functions/M_PRODUCTION_RUN.xml
--- a/src-db/database/model/functions/M_PRODUCTION_RUN.xml Wed Mar 27
11:11:53 2019 +0100
+++ b/src-db/database/model/functions/M_PRODUCTION_RUN.xml Wed Mar 27
11:34:47 2019 +0100
@@ -19,7 +19,7 @@
* parts created by ComPiere are Copyright (C) ComPiere, Inc.;
* All Rights Reserved.
* Contributor(s): Openbravo SLU
- * Contributions are Copyright (C) 2001-2017 Openbravo, S.L.U.
+ * Contributions are Copyright (C) 2001-2019 Openbravo, S.L.U.
*
* Specifically, this derivative work is based upon the following Compiere
* file and version.
@@ -52,6 +52,7 @@
CUR_PL_Post RECORD;
-- Parameter Variables
MustBeStocked CHAR(1) ;
+ forceUseOfWHOfSelectedLocator CHAR(1):= 'N' ;
v_IsCreated CHAR(1) ;
v_Processed VARCHAR2(60) ;
v_Client_ID VARCHAR2(32);
@@ -102,6 +103,9 @@
IF (Cur_Parameter.ParameterName = 'MustBeStocked') THEN
MustBeStocked:=Cur_Parameter.P_String;
DBMS_OUTPUT.PUT_LINE(' MustBeStocked=' || MustBeStocked) ;
+ELSIF (Cur_Parameter.ParameterName = 'ForceUseOfWHOfSelectedLocator') THEN
+ forceUseOfWHOfSelectedLocator := Cur_Parameter.P_String;
+ DBMS_OUTPUT.PUT_LINE(' forceUseOfWHOfSelectedLocator=' ||
forceUseOfWHOfSelectedLocator) ;
ELSE
DBMS_OUTPUT.PUT_LINE('*** Unknown Parameter=' ||
Cur_Parameter.ParameterName) ;
END IF;
@@ -254,7 +258,11 @@
v_pinstance_msg AD_PInstance.errormsg%TYPE;
BEGIN
v_pinstance_id := get_uuid();
- M_GET_STOCK_PARAM(v_pinstance_id, v_record_id, null,
v_Product_old, null, null, v_Warehouse_old, cur_bom.org_id, null, p_user,
v_client_id, null, v_UOM_old, null, null, null, 10, '137', null, 'N',
v_pinstance_result, v_pinstance_msg, 'Y', null, null);
+ IF (forceUseOfWHOfSelectedLocator = 'Y') THEN
+M_GET_STOCK_PARAM(v_pinstance_id, v_record_id, null,
v_Product_old, null, v_Warehouse_old, null, cur_bom.org_id, null, p_user,
v_client_id, null, v_UOM_old, null, null, null, 10, '137', null, 'N',
v_pinstance_result, v_pinstance_msg, 'Y', null, null);
+ ELSE
+M_GET_STOCK_PARAM(v_pinstance_id, v_record_id, null,
v_Product_old, null, null, v_Warehouse_old, cur_bom.org_id, null, p_user,
v_client_id, null, v_UOM_old, null, null, null, 10, '137', null, 'N',
v_pinstance_result, v_pinstance_msg, 'Y', null, null);
+ END IF;
-- Check result
IF (v_pinstance_result = 0) THEN
-- Error on m_get_stock
diff -r 0f7bd818ce07 -r 4aa73ae52644 src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Wed Mar 27 11:11:53 2019 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Wed Mar 27 11:34:47 2019 +0100
@@ -31611,6 +31611,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 0f7bd818ce07 -r 4aa73ae52644
src-db/database/sourcedata/AD_PROCESS_PARA.xml
--- a/src-db/database/sourcedata/AD_PROCESS_PARA.xmlWed Mar 27 11:11:53
2019 +0100
+++ b/src-db/database/sourcedata/AD_PROCESS_PARA.xmlWed Mar 27 11:34:47
2019 +0100
@@ -4123,6 +4123,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
___
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/dd59d9671933 changeset: 35554:dd59d9671933 user: Atul Gaware openbravo.com> date: Mon Mar 18 20:47:35 2019 +0530 summary: Related To Issue 0040360:Sample data (F International Group Client) for 3.0PR19Q2 Commit changes when running update database prior to inserting transactions for 3.0PR19Q2 details: https://code.openbravo.com/erp/devel/pi/rev/1b79f74e4837 changeset: 3:1b79f74e4837 user: Atul Gaware openbravo.com> date: Tue Mar 19 10:29:25 2019 +0530 summary: Fixes Issue 0040360: Sample data (F International Group Client) for 3.0PR19Q2 Sample data (F International Group Client) for 3.0PR19Q2 for the month of Jan, Feb and Mar 2019. Following the "How to evolve F" document instructions transactions created for 3.0PR19Q2 release. diffstat: referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml |1338 +- referencedata/sampledata/F_B_International_Group/AD_SEQUENCE.xml | 62 +- referencedata/sampledata/F_B_International_Group/AD_USER.xml | 48 +- referencedata/sampledata/F_B_International_Group/AD_WINDOW_ACCESS.xml | 420 + referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml | 99 +- referencedata/sampledata/F_B_International_Group/C_CONVERSION_RATE.xml | 36 + referencedata/sampledata/F_B_International_Group/C_INVOICE.xml |4476 +- referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml |8923 + referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml |4302 + referencedata/sampledata/F_B_International_Group/C_INVOICETAX.xml |1020 + referencedata/sampledata/F_B_International_Group/C_ORDER.xml |2286 + referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml | 11807 +- referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml |3655 + referencedata/sampledata/F_B_International_Group/C_ORDERTAX.xml | 576 + referencedata/sampledata/F_B_International_Group/C_ORDER_DISCOUNT.xml | 180 + referencedata/sampledata/F_B_International_Group/C_PERIOD.xml | 432 + referencedata/sampledata/F_B_International_Group/C_PERIODCONTROL.xml | 16128 + referencedata/sampledata/F_B_International_Group/C_PERIODCONTROL_LOG.xml | 456 + referencedata/sampledata/F_B_International_Group/C_YEAR.xml | 34 + referencedata/sampledata/F_B_International_Group/FACT_ACCT.xml | 48146 +++- referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENT.xml | 44 + referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENTLINE.xml |1260 + referencedata/sampledata/F_B_International_Group/FIN_FINACC_TRANSACTION.xml |1794 + referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml | 8 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml |2046 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_DETAIL.xml | 864 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml | 203 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml | 540 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml | 130228 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml |1284 +- referencedata/sampledata/F_B_International_Group/FIN_RECONCILIATION.xml | 58 + referencedata/sampledata/F_B_International_Group/GL_JOURNAL.xml | 108 + referencedata/sampledata/F_B_International_Group/GL_JOURNALBATCH.xml | 82 +- referencedata/sampledata/F_B_International_Group/GL_JOURNALLINE.xml |1260 + referencedata/sampledata/F_B_International_Group/M_ATTRIBUTESETINSTANCE.xml | 90 + referencedata/sampledata/F_B_International_Group/M_COSTING.xml |2110 +- referencedata/sampledata/F_B_International_Group/M_INOUT.xml |1584 + referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml |4670 + referencedata/sampledata/F_B_International_Group/M_MATCHINV.xml |1482 + referencedata/sampledata/F_B_International_Group/M_MATCHPO.xml |2964 + referencedata/sampledata/F_B_International_Group/M_PRODUCT.xml | 120 + referencedata/sampledata/F_B_International_Group/M_STORAGE_DETAIL.xml | 296 +- referencedata/sampledata/F_B_International_Group/M_STORAGE_PENDING.xml | 52 +- referencedata/sampledata/F_B_International_Group/M_TRANSACTION.xml |6120
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/a810b4994a69
changeset: 35550:a810b4994a69
user: Asier Lostalé openbravo.com>
date: Fri Mar 22 10:56:16 2019 +0100
summary: fixed bug 40381: incorrect warn logged by ReadOnlyDataSourceService
for P
RODSS increases page size up to a limit in case last record is selected in
order to retrieve all selected records. The logic to detect whether this
increase is necessary was not considering the case of all records being
selected because the filter is restrictive enough.
This is now fixed by increasing it only in case the amount of selected records
is bigger than the actual page size.
details: https://code.openbravo.com/erp/devel/pi/rev/38f6527079ac
changeset: 35551:38f6527079ac
user: Asier Lostalé openbravo.com>
date: Fri Mar 22 11:01:34 2019 +0100
summary: related to bug 40381: add some context info to the log
diffstat:
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java
| 23 ++---
1 files changed, 14 insertions(+), 9 deletions(-)
diffs (52 lines):
diff -r 56fd14677f8f -r 38f6527079ac
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
Fri Mar 22 09:36:17 2019 +0100
+++
b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java
Fri Mar 22 11:01:34 2019 +0100
@@ -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-2017 Openbravo SLU
+ * All portions are Copyright (C) 2010-2019 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -163,18 +163,23 @@
data = getData(parameters, startRow, selectedRecords);
parameters.put(NEW_END_ROW, Integer.toString(selectedRecords));
} else {
- data = getData(parameters, startRow, endRow);
- while (isLastRecordSelected(data) && pageSizeIncreaseCount <
MAX_PAGE_SIZE_INCREASE) {
+ int currentEndRow = endRow;
+ data = getData(parameters, startRow, currentEndRow);
+ while (data.size() > currentEndRow - startRow &&
isLastRecordSelected(data)
+ && pageSizeIncreaseCount < MAX_PAGE_SIZE_INCREASE) {
pageSizeIncreaseCount++;
log.debug(
-"The amount of selected records is higher than the page size,
increasing page size x{}",
-pageSizeIncreaseCount + 1);
-data = getData(parameters, startRow, endRow * (pageSizeIncreaseCount +
1));
+"The amount of selected records is higher than the page size,
increasing page size x{}. Tab: {}.",
+pageSizeIncreaseCount + 1,
parameters.get(JsonConstants.TAB_PARAMETER));
+currentEndRow = endRow * (pageSizeIncreaseCount + 1);
+data = getData(parameters, startRow, currentEndRow);
}
if (pageSizeIncreaseCount >= 1) {
-parameters.put(NEW_END_ROW, Integer.toString(endRow *
(pageSizeIncreaseCount + 1)));
+parameters.put(NEW_END_ROW, Integer.toString(currentEndRow));
if (pageSizeIncreaseCount == MAX_PAGE_SIZE_INCREASE) {
- log.warn("The amount of selected records is higher than the maximum
page size allowed.");
+ log.warn(
+ "The amount of selected records is higher than the maximum page
size allowed. Tab: {}.",
+ parameters.get(JsonConstants.TAB_PARAMETER));
}
}
}
@@ -182,7 +187,7 @@
}
private boolean isLastRecordSelected(List> data) {
-if (data.size() == 0) {
+if (data.isEmpty()) {
return false;
}
Boolean isLastRecordSelected = Boolean.FALSE;
___
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/073b1b33016c changeset: 35546:073b1b33016c user: Mark Molina doceleguas.com> date: Tue Mar 19 14:08:33 2019 -0300 summary: Fixes issue 40186: Pending Goods receipts with movement quantity=0 The fieldTotalQty and fieldQtyordered fields were incorrect defined to use "euroEdition" instead of "qtyEdition". Columns for Ordered Quantity and Movement Quantity of the lines of Purchase Order and Goods Receipt windows are defined with a "Quantity" reference and it is implemented internally to format the values using the "qtyEdition" setting. To do more homogeneous the way the quantities are shown in the process and in the different windows, all of them will be formatted by the same way: using settings of qtyEdition property. details: https://code.openbravo.com/erp/devel/pi/rev/edd10a6633c6 changeset: 35547:edd10a6633c6 user: David Miguelez openbravo.com> date: Thu Mar 21 17:15:46 2019 +0100 summary: Related to Issue 40186: Replaced euroEdition with qtyEdition for two more quantity fields. diffstat: src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.xml | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diffs (40 lines): diff -r 58db95f4c316 -r edd10a6633c6 src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.xml --- a/src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.xml Thu Mar 21 09:52:12 2019 +0100 +++ b/src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.xml Thu Mar 21 17:15:46 2019 +0100 @@ -12,7 +12,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) 2001-2016 Openbravo SLU + * All portions are Copyright (C) 2001-2019 Openbravo SLU * All Rights Reserved. * Contributor(s): __. @@ -74,8 +74,8 @@ partnerName productName description -totalQty -qtyordered +totalQty +qtyordered id isactive id @@ -98,14 +98,14 @@ -aumqty +aumqty id id mProductId id cUomId id -qtyordered +qtyordered id ___ 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/329f6e7d18a9
changeset: 35521:329f6e7d18a9
user: Asier Martirena openbravo.com>
date: Fri Mar 08 10:14:41 2019 +0100
summary: Fixed issue 40339: The getNextCancelDocNo method is public now
details: https://code.openbravo.com/erp/devel/pi/rev/05cecb4beb70
changeset: 35522:05cecb4beb70
user: Asier Martirena openbravo.com>
date: Fri Mar 08 10:33:14 2019 +0100
summary: Related to issue 40209: The PLM Status is shown for not stocked
products
diffstat:
src-db/database/sourcedata/AD_FIELD.xml| 1 -
src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
diffs (23 lines):
diff -r db677cb3304b -r 05cecb4beb70 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Fri Mar 08 13:59:19 2019 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml Fri Mar 08 10:33:14 2019 +0100
@@ -191263,7 +191263,6 @@
-
diff -r db677cb3304b -r 05cecb4beb70
src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java
--- a/src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java
Fri Mar 08 13:59:19 2019 +0100
+++ b/src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java
Fri Mar 08 10:33:14 2019 +0100
@@ -1536,7 +1536,7 @@
* Document number of the cancelled order.
* @return The new document number for the order which cancels the old order.
*/
- private static String getNextCancelDocNo(String documentNo) {
+ public static String getNextCancelDocNo(String documentNo) {
String newDocNo = "";
String[] splittedDocNo = documentNo.split(HYPHEN);
if (splittedDocNo.length > 1) {
___
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/9feac3af1d2f
changeset: 35444:9feac3af1d2f
user: Mark gmail.com>
date: Thu Feb 07 00:36:12 2019 -0300
summary: Fixes issue 36932: ReportWorkRequirementDailyEnv removed as isn't
referenced
The ReportWorkRequirementDailyEnv was not referenced at all in AD so it was
removed
details: https://code.openbravo.com/erp/devel/pi/rev/3358f7883c08
changeset: 35445:3358f7883c08
user: Sandra Huguet openbravo.com>
date: Mon Feb 11 18:07:30 2019 +0100
summary: related to issue 36932 remove related AD_TEXTINTERFACES
diffstat:
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
| 22 -
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEnv.html
| 384 --
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEnv.java
| 208 -
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEnv.xml
| 53 -
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEnvEdit.html
| 67 -
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEnvEdit.xml
| 35 -
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEnv_data.xsql
| 54 -
7 files changed, 0 insertions(+), 823 deletions(-)
diffs (truncated from 857 to 300 lines):
diff -r f4bdb985e356 -r 3358f7883c08
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Wed Feb 13 16:38:42
2019 +0100
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Mon Feb 11 18:07:30
2019 +0100
@@ -2357,28 +2357,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -r f4bdb985e356 -r 3358f7883c08
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEnv.html
--- a/src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEnv.html
Wed Feb 13 16:38:42 2019 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +
@@ -1,384 +0,0 @@
-
-http://www.w3.org/tr/xhtml1/Dtd/xhtml1-transitional.dtd;>
-
-http://www.w3.org/1999/xhtml;>
-
-
-Report Work Requirement Daily
-
-
-
-
- var baseDirectory = "../../../../../web/";
-
-
-
-var defaultLang = "en_US";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
-
-
-function validate()
-{
- var frm = document.frmMain;
- if (frm.inpDateFrom.value == null || frm.inpDateFrom.value == "") {
- setWindowElementFocus(frm.inpDateFrom);
- showJSMessage(7);
- return false;
- } else if (frm.inpDateTo.value == null || frm.inpDateTo.value == ""){
- setWindowElementFocus(frm.inpDateTo);
- showJSMessage(7);
- return false;
- }
- return true;
-}
-
-
- function onLoadDo(){
- this.windowTables = new Array(
- new windowTableId('client', 'buttonHTML')
- );
- setWindowTableParentElement();
- this.tabsTables = new Array(
- new tabTableId('tdtopTabs')
- );
- setTabTableParentElement();
- enableShortcuts('edition');
- setBrowserAutoComplete(false);
-
- xx();
- resizeArea();
- updateMenuIcon('buttonMenu');
-
- setWindowElementFocus('firstElement');
- }
-
- function onResizeDo(){
- resizeArea();
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/674d467c1b3b
changeset: 35355:674d467c1b3b
user: Asier Lostalé openbravo.com>
date: Wed Jan 23 13:40:27 2019 +0100
summary: fixed bug 36421: can't filter compound identifiers using "-" in
filter
When filterin a compound identifier or any property being part of a compound
identifier using an expression including "-" character, everything after it
got
removed.
This is no longer necessary as it was includeded at the very beginning when
AQB
didn't include proper joins to the identifiers, now they are included so it is
not necessary to remove anything from the filter expression.
details: https://code.openbravo.com/erp/devel/pi/rev/31cca65027c8
changeset: 35356:31cca65027c8
user: Asier Lostalé openbravo.com>
date: Wed Jan 23 13:48:18 2019 +0100
summary: related to bug 36421: minor code cleanup
diffstat:
modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
| 54 ++---
1 files changed, 11 insertions(+), 43 deletions(-)
diffs (91 lines):
diff -r f1f5013df638 -r 31cca65027c8
modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
---
a/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
Wed Jan 23 13:20:20 2019 +0100
+++
b/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
Wed Jan 23 13:48:18 2019 +0100
@@ -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-2018 Openbravo SLU
+ * All portions are Copyright (C) 2009-2019 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -29,6 +29,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -794,61 +795,28 @@
private String buildValueClause(Property property, String operator, Object
value)
throws JSONException {
-Object localValue = value;
-
-// Related to issue 20643: Because multi-identifiers are a concatenation of
-// values separated by ' - '
-// With this fix hyphens are supported in the filter when
-// property is not part of the identifier. Also hyphen is accepted if
-// the property is the unique property of the identifier
-if (property.isIdentifier()) {
- // TODO: this can be improved the left clause computation
- // correctly uses a || concatenation, so the value clause
- // can also be made more advanced.
- // Also filtering by date and number values can be a problem
- // maybe use a pragmatic approach there
- if (property.getEntity().getIdentifierProperties().size() > 1) {
-// if the value consists of multiple parts then filtering won't work
-// only search on the first part then, is pragmatic but very workable
-if (localValue != null &&
localValue.toString().contains(IdentifierProvider.SEPARATOR)) {
- final int separatorIndex =
localValue.toString().indexOf(IdentifierProvider.SEPARATOR);
- localValue = localValue.toString().substring(0, separatorIndex);
-}
- }
-}
-
String alias = getTypedParameterAlias();
if (ignoreCase(property, operator)) {
alias = "upper(" + alias + ")";
}
-String clause;
+
+String clause = alias;
if (isLike(operator)) {
- clause = alias + " escape '" + ESCAPE_CHAR + "' ";
-} else {
- clause = alias;
+ clause += " escape '" + ESCAPE_CHAR + "' ";
}
-localValue = unEscapeOperator(localValue);
-
-if (!property.isPrimitive()) {
- // an in parameter use it...
- if
(localValue.toString().contains(JsonConstants.IN_PARAMETER_SEPARATOR)) {
-final List values = new ArrayList();
-final String[] separatedValues = localValue.toString()
-.split(JsonConstants.IN_PARAMETER_SEPARATOR);
-for (String separatedValue : separatedValues) {
- values.add(separatedValue);
-}
-clause = "(" + clause + ")";
-localValue = values;
- }
+Object localValue = unEscapeOperator(value);
+if (!property.isPrimitive() && localValue != null
+&&
localValue.toString().contains(JsonConstants.IN_PARAMETER_SEPARATOR)) {
+ clause = "(" + clause + ")";
+ localValue =
Arrays.asList(localValue.toString().split(JsonConstants.IN_PARAMETER_SEPARATOR));
}
try {
localValue = getTypeSafeValue(operator, property, localValue);
} catch (IllegalArgumentException e) {
throw new
OBException(OBMessageUtils.getI18NMessage("OBJSON_InvalidFilterValue",
- new String[] { value !=
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/704742f41677
changeset: 35353:704742f41677
user: Asier Lostalé openbravo.com>
date: Wed Jan 23 13:19:31 2019 +0100
summary: related to issue 40010: small javadoc fixes
details: https://code.openbravo.com/erp/devel/pi/rev/f1f5013df638
changeset: 35354:f1f5013df638
user: Asier Lostalé openbravo.com>
date: Wed Jan 23 13:20:20 2019 +0100
summary: fixed issue 40010: add javadoc warnings to default preferences
diffstat:
config/eclipse/Openbravo-eclipse-prefs.epf
| 4 +++-
src-test/src/org/openbravo/test/materialMgmt/invoiceFromShipment/TestUtils.java
| 8 ++--
src/org/openbravo/erpCommon/businessUtility/InitialOrgSetup.java
| 4 +---
3 files changed, 6 insertions(+), 10 deletions(-)
diffs (71 lines):
diff -r 4590a05d86f8 -r f1f5013df638 config/eclipse/Openbravo-eclipse-prefs.epf
--- a/config/eclipse/Openbravo-eclipse-prefs.epfWed Jan 23 10:44:43
2019 +0100
+++ b/config/eclipse/Openbravo-eclipse-prefs.epfWed Jan 23 13:20:20
2019 +0100
@@ -1,4 +1,4 @@
-#Wed Jan 23 09:49:57 CET 2019
+#Wed Jan 23 12:49:27 CET 2019
\!/=
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.argumentPrefixes=
@@ -19,6 +19,8 @@
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.nullReference=warning
/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
diff -r 4590a05d86f8 -r f1f5013df638
src-test/src/org/openbravo/test/materialMgmt/invoiceFromShipment/TestUtils.java
---
a/src-test/src/org/openbravo/test/materialMgmt/invoiceFromShipment/TestUtils.java
Wed Jan 23 10:44:43 2019 +0100
+++
b/src-test/src/org/openbravo/test/materialMgmt/invoiceFromShipment/TestUtils.java
Wed Jan 23 13:20:20 2019 +0100
@@ -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) 2018 Openbravo SLU
+ * All portions are Copyright (C) 2018-2019 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -100,10 +100,6 @@
* Returns a new Order Line based on the given one. It is a clone of the
first one but without
* being invoiced or delivered
*
- * @param orderLine
- * Order Line to be cloned
- * @param newOrder
- * new Order (a clone of the original one)
* @return A new Order Line clone based on the original one
*/
public static Order cloneOrder(final String orderId, final String docNo) {
@@ -149,7 +145,7 @@
* Returns a new Order Line based on the given one. It is a clone of the
first one but without
* being invoiced or delivered
*
- * @param orderLine
+ * @param oldLine
* Order Line to be cloned
* @param newOrder
* new Order (a clone of the original one)
diff -r 4590a05d86f8 -r f1f5013df638
src/org/openbravo/erpCommon/businessUtility/InitialOrgSetup.java
--- a/src/org/openbravo/erpCommon/businessUtility/InitialOrgSetup.java Wed Jan
23 10:44:43 2019 +0100
+++ b/src/org/openbravo/erpCommon/businessUtility/InitialOrgSetup.java Wed Jan
23 13:20:20 2019 +0100
@@ -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-2018 Openbravo SLU
+ * All portions are Copyright (C) 2010-2019 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -121,8 +121,6 @@
* @param bSalesRegion
* If true, the Sales Region accounting dimension will be added to
the new accounting
* schema
- * @param strSourcePath
- * Path of the instance. Needed to build the path to the reference
data (dataset) files
*/
public OBError createOrganization(String strOrgName, String strOrgUser,
String strOrgType,
String strParentOrg, String strcLocationId, String strPassword, String
strModules,
___
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/66f246023571 changeset: 35332:66f246023571 user: Carlos Aristu openbravo.com> date: Mon Jan 21 10:01:56 2019 +0100 summary: fixes issue 38516: Add ability to disable the transactional filters details: https://code.openbravo.com/erp/devel/pi/rev/9865035f0712 changeset: 35333:9865035f0712 user: Carlos Aristu openbravo.com> date: Mon Jan 21 10:03:30 2019 +0100 summary: related to issue 38516: Add test cases - Add new ViewGenerationTest base test that can be extended when testing view generation features - The existing ViewGeneration test now extends ViewGenerationTest - Add new ConfigurableTransactionalFilters test class diffstat: modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml |5 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 43 +++- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml | 14 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 28 ++ modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java | 15 +- src-test/src/org/openbravo/test/AllAntTaskTests.java |4 +- src-test/src/org/openbravo/test/base/TestConstants.java |6 +- src-test/src/org/openbravo/test/views/ConfigurableTransactionalFilters.java | 135 ++ src-test/src/org/openbravo/test/views/ViewGeneration.java | 35 +- src-test/src/org/openbravo/test/views/ViewGenerationTest.java | 66 src-test/src/org/openbravo/test/views/ViewGenerationWithDifferentConfigLevelTest.java | 49 +++- 11 files changed, 366 insertions(+), 34 deletions(-) diffs (truncated from 612 to 300 lines): diff -r cf58c9985234 -r 9865035f0712 modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml --- a/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml Fri Jan 18 13:35:08 2019 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml Mon Jan 21 10:03:30 2019 +0100 @@ -77,6 +77,10 @@ + + + + @@ -89,6 +93,7 @@ + diff -r cf58c9985234 -r 9865035f0712 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml Fri Jan 18 13:35:08 2019 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml Mon Jan 21 10:03:30 2019 +0100 @@ -1691,7 +1691,7 @@ - + @@ -5711,6 +5711,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10411,7 +10450,7 @@ - + diff -r cf58c9985234 -r 9865035f0712 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml Fri Jan 18 13:35:08 2019 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml Mon Jan 21 10:03:30 2019 +0100 @@ -554,6 +554,20 @@ + + + + + + + + + + + + + + diff -r cf58c9985234 -r 9865035f0712 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml Fri Jan 18 13:35:08 2019 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml Mon Jan 21 10:03:30 2019 +0100 @@ -5735,6 +5735,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r cf58c9985234 -r 9865035f0712 modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java Fri Jan 18 13:35:08 2019 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java Mon Jan 21 10:03:30 2019 +0100 @@ -370,12 +370,23 @@ viewGridComponent.setParameters(getParameters()); viewGridComponent.setTab(tab); viewGridComponent.setViewTab(this); -
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/017b7152d4b2 changeset: 35302:017b7152d4b2 user: RM packaging bot openbravo.com> date: Fri Dec 28 15:50:59 2018 + summary: CI: update AD_MODULE to version 35301 details: https://code.openbravo.com/erp/devel/pi/rev/749ec31a054e changeset: 35303:749ec31a054e user: RM packaging bot openbravo.com> date: Fri Dec 28 16:04:57 2018 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/80dfa107feb9 changeset: 35300:80dfa107feb9 user: Atul Gaware openbravo.com> date: Thu Dec 20 22:19:18 2018 +0530 summary: Fixes Issue 39772:Price includes Tax flag can lead to errors (verified return) Price Includes Tax flag in pricelist cannot be updated once price list is being used in order or invoice in any status, of any type. details: https://code.openbravo.com/erp/devel/pi/rev/713212c6b67f changeset: 35301:713212c6b67f user: Atul Gaware openbravo.com> date: Thu Dec 20 23:39:02 2018 +0530 summary: Related to Issue 39772:Price Includes Tax flag should not be changed once pricelist is already used in transactional documents. ** Add Requisition and Requisition Line check for price list before updating price includes tax flag. diffstat: src-db/database/model/triggers/M_PRICELIST_TRG.xml | 46 ++ src-db/database/sourcedata/AD_MESSAGE.xml | 12 + 2 files changed, 58 insertions(+), 0 deletions(-) diffs (72 lines): diff -r 7137b6d67f75 -r 713212c6b67f src-db/database/model/triggers/M_PRICELIST_TRG.xml --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/src-db/database/model/triggers/M_PRICELIST_TRG.xmlThu Dec 20 23:39:02 2018 +0530 @@ -0,0 +1,46 @@ + + + + + + diff -r 7137b6d67f75 -r 713212c6b67f src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml Thu Dec 27 20:31:58 2018 + +++ b/src-db/database/sourcedata/AD_MESSAGE.xml Thu Dec 20 23:39:02 2018 +0530 @@ -22164,6 +22164,18 @@ + + + + + + + + + + + + ___ 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/45fbe14cead8 changeset: 35298:45fbe14cead8 user: RM packaging bot openbravo.com> date: Thu Dec 27 20:18:02 2018 + summary: CI: update AD_MODULE to version 35297 details: https://code.openbravo.com/erp/devel/pi/rev/7137b6d67f75 changeset: 35299:7137b6d67f75 user: RM packaging bot openbravo.com> date: Thu Dec 27 20:31:58 2018 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/669070b8a1eb changeset: 35274:669070b8a1eb user: RM packaging bot openbravo.com> date: Wed Dec 26 18:04:58 2018 + summary: CI: update AD_MODULE to version 35272 details: https://code.openbravo.com/erp/devel/pi/rev/c76a963eadf5 changeset: 35275:c76a963eadf5 user: RM packaging bot openbravo.com> date: Wed Dec 26 18:18:54 2018 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/c4811c4d5204 changeset: 35270:c4811c4d5204 user: RM packaging bot openbravo.com> date: Wed Dec 26 13:20:16 2018 + summary: CI: update AD_MODULE to version 35269 details: https://code.openbravo.com/erp/devel/pi/rev/06b93494d17e changeset: 35271:06b93494d17e user: RM packaging bot openbravo.com> date: Wed Dec 26 13:35:26 2018 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/4e6acd05a518 changeset: 35268:4e6acd05a518 user: Atul Gaware openbravo.com> date: Fri Dec 21 09:04:36 2018 +0530 summary: Related to Issue 0039845:Sample data (F International Group Client) for 3.0PR19Q1 Committed changes prior to creating transactions for sample data for 3.0PR19Q1 details: https://code.openbravo.com/erp/devel/pi/rev/45b3451904c4 changeset: 35269:45b3451904c4 user: Atul Gaware openbravo.com> date: Fri Dec 21 15:14:30 2018 +0530 summary: Fixes Issue 0039845: Sample data (F International Group Client) for 3.0PR19Q1 Sample data (F International Group Client) for 3.0PR19Q1 for the month of Oct, Nov and Dec 2018. Following the "How to evolve F" document instructions transactions created for 3.0PR19Q1 release. diffstat: referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml |1284 +- referencedata/sampledata/F_B_International_Group/AD_SEQUENCE.xml | 62 +- referencedata/sampledata/F_B_International_Group/AD_USER.xml | 48 +- referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml | 74 +- referencedata/sampledata/F_B_International_Group/C_INVOICE.xml | 192636 + referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml |8952 + referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml |4320 + referencedata/sampledata/F_B_International_Group/C_INVOICETAX.xml |1020 + referencedata/sampledata/F_B_International_Group/C_ORDER.xml |2286 + referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml | 11744 +- referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml |3672 + referencedata/sampledata/F_B_International_Group/C_ORDERTAX.xml | 576 + referencedata/sampledata/F_B_International_Group/C_ORDER_DISCOUNT.xml | 180 + referencedata/sampledata/F_B_International_Group/FACT_ACCT.xml | 48593 ++- referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENT.xml | 44 + referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENTLINE.xml |1386 + referencedata/sampledata/F_B_International_Group/FIN_FINACC_TRANSACTION.xml |1974 + referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml | 8 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml |2274 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_DETAIL.xml |1056 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml | 174 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml | 720 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml | 32886 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml |1332 +- referencedata/sampledata/F_B_International_Group/FIN_RECONCILIATION.xml | 58 + referencedata/sampledata/F_B_International_Group/GL_JOURNAL.xml | 112 +- referencedata/sampledata/F_B_International_Group/GL_JOURNALBATCH.xml | 82 +- referencedata/sampledata/F_B_International_Group/GL_JOURNALLINE.xml |1260 + referencedata/sampledata/F_B_International_Group/M_ATTRIBUTESETINSTANCE.xml | 90 + referencedata/sampledata/F_B_International_Group/M_COSTING.xml |2110 +- referencedata/sampledata/F_B_International_Group/M_INOUT.xml |1620 + referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml |4692 + referencedata/sampledata/F_B_International_Group/M_MATCHINV.xml |1482 + referencedata/sampledata/F_B_International_Group/M_MATCHPO.xml |2964 + referencedata/sampledata/F_B_International_Group/M_STORAGE_DETAIL.xml | 268 +- referencedata/sampledata/F_B_International_Group/M_STORAGE_PENDING.xml | 52 +- referencedata/sampledata/F_B_International_Group/M_TRANSACTION.xml |6120 + referencedata/sampledata/F_B_International_Group/M_TRANSACTION_COST.xml |3468 + referencedata/sampledata/F_B_International_Group/OBUIAPP_PROCESS_ACCESS.xml | 140 + 39 files changed, 229870 insertions(+), 111949 deletions(-) diffs (truncated from 383953 to 300 lines): diff -r 9b4fdc89b8dd -r 45b3451904c4 referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml --- a/referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml Mon Dec 24 15:54:14 2018 + +++ b/referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml Fri Dec 21 15:14:30 2018 +0530 @@ -289,6 +289,24 @@ + + +
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/12c13a9f4963 changeset: 35266:12c13a9f4963 user: RM packaging bot openbravo.com> date: Mon Dec 24 15:40:14 2018 + summary: CI: update AD_MODULE to version 35265 details: https://code.openbravo.com/erp/devel/pi/rev/9b4fdc89b8dd changeset: 35267:9b4fdc89b8dd user: RM packaging bot openbravo.com> date: Mon Dec 24 15:54:14 2018 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/c99770195951 changeset: 35263:c99770195951 user: RM packaging bot openbravo.com> date: Fri Dec 21 12:05:35 2018 + summary: CI: update AD_MODULE to version 35262 details: https://code.openbravo.com/erp/devel/pi/rev/7968656ae8be changeset: 35264:7968656ae8be user: RM packaging bot openbravo.com> date: Fri Dec 21 12:19:49 2018 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/32784e66f6df changeset: 35260:32784e66f6df user: RM packaging bot openbravo.com> date: Thu Dec 20 20:14:12 2018 + summary: CI: update AD_MODULE to version 35259 details: https://code.openbravo.com/erp/devel/pi/rev/151603a4e223 changeset: 35261:151603a4e223 user: RM packaging bot openbravo.com> date: Thu Dec 20 20:28:07 2018 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/3349fdedc036 changeset: 35256:3349fdedc036 user: RM packaging bot openbravo.com> date: Wed Dec 19 21:14:45 2018 + summary: CI: update AD_MODULE to version 35255 details: https://code.openbravo.com/erp/devel/pi/rev/be466cd14475 changeset: 35257:be466cd14475 user: RM packaging bot openbravo.com> date: Wed Dec 19 21:28:42 2018 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/79c941a6a880 changeset: 35253:79c941a6a880 user: RM packaging bot openbravo.com> date: Mon Dec 17 19:23:48 2018 + summary: CI: update AD_MODULE to version 35252 details: https://code.openbravo.com/erp/devel/pi/rev/2726651ad7b9 changeset: 35254:2726651ad7b9 user: RM packaging bot openbravo.com> date: Mon Dec 17 19:37:47 2018 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/7aada5d51e10
changeset: 35251:7aada5d51e10
user: Asier Lostalé openbravo.com>
date: Mon Dec 17 13:59:23 2018 +0100
summary: related with issue 39755: give some time to complete the thread
details: https://code.openbravo.com/erp/devel/pi/rev/b8fc66a7be6e
changeset: 35252:b8fc66a7be6e
user: Asier Lostalé openbravo.com>
date: Mon Dec 17 14:38:00 2018 +0100
summary: fixed bug 39821: StackOverflowError in P having 100+ records
selected
Do not decrease page fetch size as it can have been increased by previous
call.
diffstat:
modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
| 3 ++-
src-test/src/org/openbravo/test/dal/DalLockingTest.java
| 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diffs (25 lines):
diff -r ed422035576d -r b8fc66a7be6e
modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
---
a/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
Mon Dec 17 12:46:08 2018 +
+++
b/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
Mon Dec 17 14:38:00 2018 +0100
@@ -422,7 +422,8 @@
int startRow = Integer.parseInt(startRowStr);
int endRow = Integer.parseInt(endRowStr);
int selectedRecords =
DataSourceUtils.getNumberOfSelectedRecords(parameters);
-if (startRow == 0 && endRow != -1 && selectedRecords >
JsonConstants.PAE_DATA_PAGE_SIZE) {
+if (startRow == 0 && endRow != -1 && selectedRecords >
JsonConstants.PAE_DATA_PAGE_SIZE
+&& selectedRecords > endRow) {
return Integer.toString(selectedRecords);
}
return endRowStr;
diff -r ed422035576d -r b8fc66a7be6e
src-test/src/org/openbravo/test/dal/DalLockingTest.java
--- a/src-test/src/org/openbravo/test/dal/DalLockingTest.java Mon Dec 17
12:46:08 2018 +
+++ b/src-test/src/org/openbravo/test/dal/DalLockingTest.java Mon Dec 17
14:38:00 2018 +0100
@@ -146,7 +146,7 @@
gotRule.countDown();
waitUnitl(ruleModified);
lockedName.append(OBDal.getInstance().getObjectLockForNoKeyUpdate(ar).getName());
-}, "T1", 0), //
+}, "T1", 50), //
doWithDAL(() -> {
getTestingAlertRule().setName("Modified");
OBDal.getInstance().commitAndClose();
___
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/5420c0828280 changeset: 35249:5420c0828280 user: RM packaging bot openbravo.com> date: Mon Dec 17 12:31:48 2018 + summary: CI: update AD_MODULE to version 35246 details: https://code.openbravo.com/erp/devel/pi/rev/ed422035576d changeset: 35250:ed422035576d user: RM packaging bot openbravo.com> date: Mon Dec 17 12:46:08 2018 + 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.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java |2 +- 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 | 49 ++-- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java |4 + modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 101 +- 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/d4b3ed34e1c8 changeset: 35244:d4b3ed34e1c8 user: RM packaging bot openbravo.com> date: Fri Dec 14 14:48:40 2018 + summary: CI: update AD_MODULE to version 35241 details: https://code.openbravo.com/erp/devel/pi/rev/16c92a53d9b9 changeset: 35245:16c92a53d9b9 user: RM packaging bot openbravo.com> date: Fri Dec 14 15:02:42 2018 + 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.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java | 2 +- 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/cc7720ccbe48 changeset: 35239:cc7720ccbe48 user: RM packaging bot openbravo.com> date: Thu Dec 13 14:15:24 2018 + summary: CI: update AD_MODULE to version 35234 details: https://code.openbravo.com/erp/devel/pi/rev/ad2f7d3fc905 changeset: 35240:ad2f7d3fc905 user: RM packaging bot openbravo.com> date: Thu Dec 13 14:29:16 2018 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/063d7f2b1821
changeset: 35237:063d7f2b1821
user: Pablo Lujan openbravo.com
date: Thu Dec 13 13:47:08 2018 +0100
summary: Fixes issue 39797 Updates the list of supported and recommended
browsers
details: https://code.openbravo.com/erp/devel/pi/rev/ababa3873792
changeset: 35238:ababa3873792
user: Pablo Lujan openbravo.com
date: Thu Dec 13 13:48:34 2018 +0100
summary: Merge from branch
diffstat:
src-test/src/org/openbravo/test/dal/DalLockingTest.java | 76
src/org/openbravo/costing/LandedCostProcessHandler.java | 48 --
src/org/openbravo/costing/ReactivateLandedCost.java | 28 +-
src/org/openbravo/erpCommon/security/Login.html | 12 +-
4 files changed, 107 insertions(+), 57 deletions(-)
diffs (truncated from 341 to 300 lines):
diff -r 4c022943ed23 -r ababa3873792
src-test/src/org/openbravo/test/dal/DalLockingTest.java
--- a/src-test/src/org/openbravo/test/dal/DalLockingTest.java Wed Dec 12
23:20:31 2018 +
+++ b/src-test/src/org/openbravo/test/dal/DalLockingTest.java Thu Dec 13
13:48:34 2018 +0100
@@ -29,11 +29,13 @@
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -67,7 +69,7 @@
@BeforeClass
public static void createTestEnvironment() {
-OBContext.setAdminMode();
+OBContext.setAdminMode(true);
try {
AlertRule newAlertRule = OBProvider.getInstance().get(AlertRule.class);
newAlertRule.setName(DalLockingTest.class.getName() + " - Testing Alert
Rule");
@@ -101,10 +103,10 @@
@Test
public void objectShouldBeLockedInDB() throws InterruptedException,
ExecutionException {
-List> threads = Arrays.asList(
-//
-getDalCallable(this::acquireLock, "T1", 0, 200),
-getDalCallable(this::acquireLock, "T2", 100, 0));
+CountDownLatch latch = new CountDownLatch(1);
+List> threads = Arrays.asList( //
+doWithDAL(() -> acquireLock(latch), "T1", 200), //
+doWithDAL(this::acquireLock, "T2", latch));
executeAndGetResults(threads);
assertThat(
@@ -115,14 +117,15 @@
@Test
public void lockedObjectShouldAllowChildrenCreation() throws
InterruptedException,
ExecutionException {
+CountDownLatch latch = new CountDownLatch(1);
List> threads = Arrays.asList( //
-getDalCallable(this::acquireLock, "T1", 0, 200), //
-getDalCallable(() -> {
+doWithDAL(() -> acquireLock(latch), "T1", 200), //
+doWithDAL(() -> {
AlertRecipient recipient =
OBProvider.getInstance().get(AlertRecipient.class);
recipient.setRole(OBContext.getOBContext().getRole());
recipient.setAlertRule(getTestingAlertRule());
OBDal.getInstance().save(recipient);
-}, "T2", 100, 0));
+}, "T2", latch));
executeAndGetResults(threads);
assertThat(
@@ -134,21 +137,21 @@
public void lockedInstanceGetsRefreshedFromDB() throws InterruptedException,
ExecutionException {
StringBuilder originalName = new StringBuilder();
StringBuilder lockedName = new StringBuilder();
+CountDownLatch gotRule = new CountDownLatch(1);
+CountDownLatch ruleModified = new CountDownLatch(1);
List> threads = Arrays.asList( //
-getDalCallable(() -> {
+doWithDAL(() -> {
AlertRule ar = getTestingAlertRule();
originalName.append(ar.getName());
-
- try {
-TimeUnit.MILLISECONDS.sleep(200);
- } catch (InterruptedException e) {
- }
-
+ gotRule.countDown();
+ waitUnitl(ruleModified);
lockedName.append(OBDal.getInstance().getObjectLockForNoKeyUpdate(ar).getName());
-}, "T1", 0, 0), //
-getDalCallable(() -> {
+}, "T1", 0), //
+doWithDAL(() -> {
getTestingAlertRule().setName("Modified");
-}, "T2", 100, 0));
+ OBDal.getInstance().commitAndClose();
+ ruleModified.countDown();
+}, "T2", gotRule));
executeAndGetResults(threads);
@@ -176,12 +179,20 @@
}
}
- private Callable getDalCallable(Runnable r, String name, long
waitBefore, long waitAfter) {
+ private Callable doWithDAL(Runnable r, String name, CountDownLatch
waitFor) {
+return doWithDAL(r, name, waitFor, 0);
+ }
+
+ private Callable doWithDAL(Runnable r, String name, long waitAfter) {
+return doWithDAL(r, name, null, waitAfter);
+ }
+
+ private Callable doWithDAL(Runnable r, String name, CountDownLatch
waitEvent, long waitAfter) {
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/a40cfd3585b5 changeset: 35232:a40cfd3585b5 user: RM packaging bot openbravo.com> date: Wed Dec 12 23:06:27 2018 + summary: CI: update AD_MODULE to version 35231 details: https://code.openbravo.com/erp/devel/pi/rev/4c022943ed23 changeset: 35233:4c022943ed23 user: RM packaging bot openbravo.com> date: Wed Dec 12 23:20:31 2018 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/f1a781af6612 changeset: 35223:f1a781af6612 user: RM packaging bot openbravo.com> date: Wed Dec 12 12:43:29 2018 + summary: CI: update AD_MODULE to version 35221 details: https://code.openbravo.com/erp/devel/pi/rev/b1f8bed66944 changeset: 35224:b1f8bed66944 user: RM packaging bot openbravo.com> date: Wed Dec 12 12:57:22 2018 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/470e3cd384c5 changeset: 35219:470e3cd384c5 user: RM packaging bot openbravo.com> date: Tue Dec 11 19:04:38 2018 + summary: CI: update AD_MODULE to version 35217 details: https://code.openbravo.com/erp/devel/pi/rev/c2915cbd83ab changeset: 35220:c2915cbd83ab user: RM packaging bot openbravo.com> date: Tue Dec 11 19:19:27 2018 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/ebd6611474d3
changeset: 35216:ebd6611474d3
user: Asier Lostalé openbravo.com>
date: Tue Dec 11 15:27:05 2018 +0100
summary: related to issue 39672: improved javadoc
details: https://code.openbravo.com/erp/devel/pi/rev/7e4c318ad6a3
changeset: 35217:7e4c318ad6a3
user: Asier Lostalé openbravo.com>
date: Tue Dec 11 15:37:30 2018 +0100
summary: related to issue 39672: added test cases
diffstat:
src-test/src/org/openbravo/test/AllAntTaskTests.java|4 +-
src-test/src/org/openbravo/test/dal/DalLockingTest.java | 223
src/org/openbravo/dal/service/OBDal.java| 31 +-
3 files changed, 248 insertions(+), 10 deletions(-)
diffs (truncated from 313 to 300 lines):
diff -r 4c4039a9c917 -r 7e4c318ad6a3
src-test/src/org/openbravo/test/AllAntTaskTests.java
--- a/src-test/src/org/openbravo/test/AllAntTaskTests.java Tue Dec 11
12:26:44 2018 +
+++ b/src-test/src/org/openbravo/test/AllAntTaskTests.java Tue Dec 11
15:37:30 2018 +0100
@@ -50,6 +50,7 @@
import org.openbravo.test.dal.DalComplexQueryRequisitionTest;
import org.openbravo.test.dal.DalComplexQueryTestOrderLine;
import org.openbravo.test.dal.DalConnectionProviderTest;
+import org.openbravo.test.dal.DalLockingTest;
import org.openbravo.test.dal.DalPerformanceInventoryLineTest;
import org.openbravo.test.dal.DalPerformanceProductTest;
import org.openbravo.test.dal.DalPerformanceProxyTest;
@@ -151,6 +152,7 @@
DalPerformanceProxyTest.class, //
DalQueryTest.class, //
DalTest.class, //
+DalLockingTest.class, //
CentralBrokerTest.class, //
DalUtilTest.class, //
IssuesTest.class, //
@@ -317,7 +319,7 @@
// AD_Org Persist Information
ADOrgPersistInfoTestSuite.class,
-
+
// Automatic Invoice from Goods Shipment
InvoiceFromShipmentTest.class
diff -r 4c4039a9c917 -r 7e4c318ad6a3
src-test/src/org/openbravo/test/dal/DalLockingTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/src-test/src/org/openbravo/test/dal/DalLockingTest.java Tue Dec 11
15:37:30 2018 +0100
@@ -0,0 +1,223 @@
+/*
+ *
+ * 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) 2018 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): __.
+
+ */
+
+package org.openbravo.test.dal;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.hibernate.LazyInitializationException;
+import org.hibernate.LockMode;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.openbravo.base.exception.OBException;
+import org.openbravo.base.provider.OBProvider;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.model.ad.alert.AlertRecipient;
+import org.openbravo.model.ad.alert.AlertRule;
+import org.openbravo.test.base.OBBaseTest;
+
+/**
+ * Test cases covering
+ * {@link
OBDal#getObjectLockForNoKeyUpdate(org.openbravo.base.structure.BaseOBObject)}
+ */
+public class DalLockingTest extends OBBaseTest {
+ private static final Logger log = LogManager.getLogger();
+ private static String testingRuleId;
+
+ private List executionOrder;
+
+ @Rule
+ public ExpectedException thrown = ExpectedException.none();
+
+ @BeforeClass
+ public static void createTestEnvironment() {
+OBContext.setAdminMode();
+try {
+ AlertRule newAlertRule =
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/e893c16b5687
changeset: 35189:e893c16b5687
user: Sandra Huguet openbravo.com>
date: Mon Dec 10 16:26:15 2018 +0100
summary: fixed issue 39755 change lockForNoKeyUpdate to return the instance
with the lock
*Retrieves an object from the database getting a lock "for no key update" for
the indicated
object. Change method name, parameters and return.
*Improve and modify the javadoc with the required changes.
details: https://code.openbravo.com/erp/devel/pi/rev/05948dd8851c
changeset: 35190:05948dd8851c
user: Sandra Huguet openbravo.com>
date: Mon Dec 10 16:29:15 2018 +0100
summary: fixed issue 39672 use the new method getObjectLockForNoKeyUpdate
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java
| 24 +-
src/org/openbravo/dal/service/OBDal.java
| 33 ++---
2 files changed, 27 insertions(+), 30 deletions(-)
diffs (112 lines):
diff -r 616f94939565 -r 05948dd8851c
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 Dec 05 17:47:18 2018 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java
Mon Dec 10 16:29:15 2018 +0100
@@ -24,10 +24,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.hibernate.LockOptions;
-import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
-import org.hibernate.query.Query;
import org.openbravo.advpaymentmngt.APRM_FinaccTransactionV;
import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao;
import org.openbravo.advpaymentmngt.utility.FIN_Utility;
@@ -172,7 +169,10 @@
&& getConversionRateDocument(transaction).size() == 0) {
insertConversionRateDocument(transaction);
}
-final FIN_FinancialAccount financialAccount =
lockFinAccount(transaction.getAccount());
+
+FIN_FinancialAccount financialAccount =
OBDal.getInstance().getObjectLockForNoKeyUpdate(
+transaction.getAccount());
+
financialAccount.setCurrentBalance(financialAccount.getCurrentBalance().add(
transaction.getDepositAmount().subtract(transaction.getPaymentAmount(;
transaction.setAprmProcessed("R");
@@ -242,7 +242,8 @@
transaction.setStatus(transaction.getDepositAmount().compareTo(
transaction.getPaymentAmount()) > 0 ? "RPR" : "PPM");
}
-final FIN_FinancialAccount financialAccount =
lockFinAccount(transaction.getAccount());
+FIN_FinancialAccount financialAccount =
OBDal.getInstance().getObjectLockForNoKeyUpdate(
+transaction.getAccount());
financialAccount.setCurrentBalance(financialAccount.getCurrentBalance()
.subtract(transaction.getDepositAmount()).add(transaction.getPaymentAmount()));
transaction.setAprmProcessed("P");
@@ -366,17 +367,4 @@
}
return confirmation;
}
-
- private static FIN_FinancialAccount lockFinAccount(FIN_FinancialAccount
account) {
-StringBuilder queryStr = new StringBuilder(
-"select a from FIN_Financial_Account a where id = :id");
-final Session session = OBDal.getInstance().getSession();
-final Query query =
session.createQuery(queryStr.toString(),
-FIN_FinancialAccount.class);
-query.setParameter("id", account.getId());
-query.setMaxResults(1);
-query.setLockOptions(LockOptions.UPGRADE);
-OBDal.getInstance().getSession().evict(account);
-return query.uniqueResult();
- }
}
diff -r 616f94939565 -r 05948dd8851c src/org/openbravo/dal/service/OBDal.java
--- a/src/org/openbravo/dal/service/OBDal.java Wed Dec 05 17:47:18 2018 +0100
+++ b/src/org/openbravo/dal/service/OBDal.java Mon Dec 10 16:29:15 2018 +0100
@@ -43,6 +43,7 @@
import org.openbravo.base.structure.BaseOBObject;
import org.openbravo.base.structure.ClientEnabled;
import org.openbravo.base.structure.OrganizationEnabled;
+import org.openbravo.base.util.Check;
import org.openbravo.dal.core.DalUtil;
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.core.SessionHandler;
@@ -729,25 +730,33 @@
}
/**
- * Creates a lock for no key update
+ * Retrieves an object from the database getting a lock "for no key update"
for the indicated
+ * object. Note that the object entering in the method is evicted and a new
object is created.
+ * Before calling this method, is a must check if changes have been made to
the object previously.
+ * In this case a flush must be done.
*
- * @param entity
+ * @param object
* the type to create the query for
- * @param id
- *
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/c40f567a73a9
changeset: 35187:c40f567a73a9
user: Sandra Huguet openbravo.com>
date: Wed Dec 05 17:46:39 2018 +0100
summary: Backed out changeset 58849d9510ba
details: https://code.openbravo.com/erp/devel/pi/rev/616f94939565
changeset: 35188:616f94939565
user: Sandra Huguet openbravo.com>
date: Wed Dec 05 17:47:18 2018 +0100
summary: Backed out changeset 26214ce6e789
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java
| 24 +++--
1 files changed, 18 insertions(+), 6 deletions(-)
diffs (54 lines):
diff -r 58849d9510ba -r 616f94939565
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 Dec 05 17:23:37 2018 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java
Wed Dec 05 17:47:18 2018 +0100
@@ -24,7 +24,10 @@
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.hibernate.LockOptions;
+import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
+import org.hibernate.query.Query;
import org.openbravo.advpaymentmngt.APRM_FinaccTransactionV;
import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao;
import org.openbravo.advpaymentmngt.utility.FIN_Utility;
@@ -169,9 +172,7 @@
&& getConversionRateDocument(transaction).size() == 0) {
insertConversionRateDocument(transaction);
}
-FIN_FinancialAccount financialAccount = transaction.getAccount();
-
OBDal.getInstance().lockForNoKeyUpdate(transaction.getAccount().getEntity(),
-financialAccount.getId());
+final FIN_FinancialAccount financialAccount =
lockFinAccount(transaction.getAccount());
financialAccount.setCurrentBalance(financialAccount.getCurrentBalance().add(
transaction.getDepositAmount().subtract(transaction.getPaymentAmount(;
transaction.setAprmProcessed("R");
@@ -241,9 +242,7 @@
transaction.setStatus(transaction.getDepositAmount().compareTo(
transaction.getPaymentAmount()) > 0 ? "RPR" : "PPM");
}
-FIN_FinancialAccount financialAccount = transaction.getAccount();
-
OBDal.getInstance().lockForNoKeyUpdate(transaction.getAccount().getEntity(),
-financialAccount.getId());
+final FIN_FinancialAccount financialAccount =
lockFinAccount(transaction.getAccount());
financialAccount.setCurrentBalance(financialAccount.getCurrentBalance()
.subtract(transaction.getDepositAmount()).add(transaction.getPaymentAmount()));
transaction.setAprmProcessed("P");
@@ -367,4 +366,17 @@
}
return confirmation;
}
+
+ private static FIN_FinancialAccount lockFinAccount(FIN_FinancialAccount
account) {
+StringBuilder queryStr = new StringBuilder(
+"select a from FIN_Financial_Account a where id = :id");
+final Session session = OBDal.getInstance().getSession();
+final Query query =
session.createQuery(queryStr.toString(),
+FIN_FinancialAccount.class);
+query.setParameter("id", account.getId());
+query.setMaxResults(1);
+query.setLockOptions(LockOptions.UPGRADE);
+OBDal.getInstance().getSession().evict(account);
+return query.uniqueResult();
+ }
}
___
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/1c1d34a46d47
changeset: 35185:1c1d34a46d47
user: Sandra Huguet openbravo.com>
date: Wed Dec 05 17:17:46 2018 +0100
summary: related to issue 39755 code review changes
Not necessary to return the id. Only creates the lock.
Use createNativeQuery and improve code.
details: https://code.openbravo.com/erp/devel/pi/rev/58849d9510ba
changeset: 35186:58849d9510ba
user: Sandra Huguet openbravo.com>
date: Wed Dec 05 17:23:37 2018 +0100
summary: related to issue 39672 lockForNoKeyUpdate not returns the id
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java
| 17 +--
src/org/openbravo/dal/service/OBDal.java
| 47 ++---
2 files changed, 18 insertions(+), 46 deletions(-)
diffs (100 lines):
diff -r 26214ce6e789 -r 58849d9510ba
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
Tue Dec 04 15:47:59 2018 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java
Wed Dec 05 17:23:37 2018 +0100
@@ -169,12 +169,9 @@
&& getConversionRateDocument(transaction).size() == 0) {
insertConversionRateDocument(transaction);
}
-
-String financialAccountId = OBDal.getInstance().lockForNoKeyUpdate(
-transaction.getAccount().getEntity(),
transaction.getAccount().getId());
-FIN_FinancialAccount financialAccount =
OBDal.getInstance().get(FIN_FinancialAccount.class,
-financialAccountId);
-
+FIN_FinancialAccount financialAccount = transaction.getAccount();
+
OBDal.getInstance().lockForNoKeyUpdate(transaction.getAccount().getEntity(),
+financialAccount.getId());
financialAccount.setCurrentBalance(financialAccount.getCurrentBalance().add(
transaction.getDepositAmount().subtract(transaction.getPaymentAmount(;
transaction.setAprmProcessed("R");
@@ -244,11 +241,9 @@
transaction.setStatus(transaction.getDepositAmount().compareTo(
transaction.getPaymentAmount()) > 0 ? "RPR" : "PPM");
}
-String financialAccountId = OBDal.getInstance().lockForNoKeyUpdate(
-transaction.getAccount().getEntity(),
transaction.getAccount().getId());
-FIN_FinancialAccount financialAccount =
OBDal.getInstance().get(FIN_FinancialAccount.class,
-financialAccountId);
-
+FIN_FinancialAccount financialAccount = transaction.getAccount();
+
OBDal.getInstance().lockForNoKeyUpdate(transaction.getAccount().getEntity(),
+financialAccount.getId());
financialAccount.setCurrentBalance(financialAccount.getCurrentBalance()
.subtract(transaction.getDepositAmount()).add(transaction.getPaymentAmount()));
transaction.setAprmProcessed("P");
diff -r 26214ce6e789 -r 58849d9510ba src/org/openbravo/dal/service/OBDal.java
--- a/src/org/openbravo/dal/service/OBDal.java Tue Dec 04 15:47:59 2018 +0100
+++ b/src/org/openbravo/dal/service/OBDal.java Wed Dec 05 17:23:37 2018 +0100
@@ -21,8 +21,6 @@
import java.io.Serializable;
import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -737,40 +735,19 @@
* the type to create the query for
* @param id
* identifier of the record
- * @return id
*/
- public String lockForNoKeyUpdate(Entity entity, String id) {
-final String RDBMS = new DalConnectionProvider(false).getRDBMS();
-String strSQL;
-if ("ORACLE".equals(RDBMS)) {
- strSQL = "SELECT * FROM " + entity.getTableName() + " WHERE " +
entity.getTableName()
- + "_id =? FOR UPDATE";
-} else {
- strSQL = "SELECT * FROM " + entity.getTableName() + " WHERE " +
entity.getTableName()
- + "_id =? FOR NO KEY UPDATE";
+ public void lockForNoKeyUpdate(Entity entity, String id) {
+if (entity.getIdProperties().size() != 1) {
+ throw new IllegalArgumentException("Expected entity with a single ID. "
+ entity + " has "
+ + entity.getIdProperties().size());
}
-PreparedStatement sqlQuery = null;
-ResultSet rs = null;
-try {
- sqlQuery = new DalConnectionProvider(false).getPreparedStatement(strSQL);
- sqlQuery.setString(1, id);
- sqlQuery.execute();
- sqlQuery.setMaxRows(1);
- rs = sqlQuery.getResultSet();
- while (rs.next()) {
-return rs.getString(1);
- }
-} catch (Exception e) {
- log.error("Error when executing query", e);
-} finally {
- try {
-if (sqlQuery != null) {
- sqlQuery.close();
-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/1a4041af1fa1
changeset: 35159:1a4041af1fa1
user: Armaignac gmail.com>
date: Tue Nov 27 09:17:11 2018 +0100
summary: Fixes issue 36556: Organization filter in Orders Awaiting Invoice
Report does not
work properly for summary level organizations
Organization filter in Orders Awaiting Invoice Report does not work properly for
summary level organizations, When parent organization is selected as a filter,
records for its child organization are not shown in the report.
The Organization child tree is now set as a filter for the report query.
details: https://code.openbravo.com/erp/devel/pi/rev/ebcc9e8ba08a
changeset: 35160:ebcc9e8ba08a
user: Sandra Huguet openbravo.com>
date: Tue Nov 27 10:00:23 2018 +0100
summary: related to issue 36556 code review changes in strTreeOrgId
diffstat:
src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoiceJR.java| 14
+++--
src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoice_data.xsql | 2 +-
2 files changed, 12 insertions(+), 4 deletions(-)
diffs (53 lines):
diff -r bd0a3cf6b7fd -r ebcc9e8ba08a
src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoiceJR.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoiceJR.java
Tue Nov 27 14:01:39 2018 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoiceJR.java
Tue Nov 27 10:00:23 2018 +0100
@@ -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) 2001-2017 Openbravo SLU
+ * All portions are Copyright (C) 2001-2018 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -29,6 +29,7 @@
import org.apache.commons.lang.StringUtils;
import org.openbravo.base.secureApp.HttpSecureAppServlet;
import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.dal.core.OBContext;
import org.openbravo.database.ConnectionProvider;
import org.openbravo.erpCommon.businessUtility.WindowTabs;
import org.openbravo.erpCommon.utility.ComboTableData;
@@ -202,11 +203,18 @@
ReportOrderNotInvoiceData[] data = null;
String strConvRateErrorMsg = "";
OBError myMessage = new OBError();
+String strTreeOrgId = "";
+if (!StringUtils.isEmpty(strCOrgId)) {
+ strTreeOrgId = "("
+ +
Utility.getInStrSet(OBContext.getOBContext().getOrganizationStructureProvider()
+ .getChildTree(strCOrgId, true)) + ")";
+}
ConnectionProvider readOnlyCP =
DalConnectionProvider.getReadOnlyConnectionProvider();
try {
- data = ReportOrderNotInvoiceData.select(readOnlyCP, strCurrencyId,
Utility.getContext(readOnlyCP, vars, "#User_Client", "ReportOrderNotInvoiceJR"),
+ data = ReportOrderNotInvoiceData.select(readOnlyCP, strCurrencyId,
+ Utility.getContext(readOnlyCP, vars, "#User_Client",
"ReportOrderNotInvoiceJR"),
Utility.getContext(readOnlyCP, vars, "#AccessibleOrgTree",
"ReportOrderNotInvoiceJR"),
- strcBpartnetId, strCOrgId, strInvoiceRule, strdateFrom,
+ strcBpartnetId, strTreeOrgId, strInvoiceRule, strdateFrom,
DateTimeData.nDaysAfter(readOnlyCP, strdateTo, "1"),
vars.getLanguage());
} catch (ServletException ex) {
myMessage = Utility.translateError(readOnlyCP, vars, vars.getLanguage(),
ex.getMessage());
diff -r bd0a3cf6b7fd -r ebcc9e8ba08a
src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoice_data.xsql
--- a/src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoice_data.xsql
Tue Nov 27 14:01:39 2018 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoice_data.xsql
Tue Nov 27 10:00:23 2018 +0100
@@ -121,7 +121,7 @@
AND
C.C_BPARTNER_ID = ?
- AND C.AD_ORG_ID =
?
+
AND
C.INVOICERULE = ?
___
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/5f9ad951760c changeset: 35118:5f9ad951760c user: Atul Gaware openbravo.com> date: Tue Nov 20 18:22:31 2018 +0530 summary: Fixes Issue 39595: Purchase Invoice Line can be edited after the associated landed cost has been processed ** Before editing invoice line check whether it is linked with landed cost - cost tab record. ** Description, Line No, List Price editing is possible. ** Check is done only for Purchase Invoice Lines. ** Earlier check of m_inoutline link is also applicable for Purchase Invoice line hence it is included in the condition Issotrx = 'N'. details: https://code.openbravo.com/erp/devel/pi/rev/641c5b66d580 changeset: 35119:641c5b66d580 user: Sandra Huguet openbravo.com> date: Fri Nov 23 11:45:53 2018 +0100 summary: related to issue 39595 code review changes diffstat: src-db/database/model/triggers/C_INVOICELINE_TRG.xml | 47 +-- src-db/database/sourcedata/AD_MESSAGE.xml| 12 + 2 files changed, 43 insertions(+), 16 deletions(-) diffs (94 lines): diff -r e0749d9a2b25 -r 641c5b66d580 src-db/database/model/triggers/C_INVOICELINE_TRG.xml --- a/src-db/database/model/triggers/C_INVOICELINE_TRG.xml Fri Nov 23 13:21:32 2018 +0100 +++ b/src-db/database/model/triggers/C_INVOICELINE_TRG.xml Fri Nov 23 11:45:53 2018 +0100 @@ -14,7 +14,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) 2001-2016 Openbravo SLU +* All portions are Copyright (C) 2001-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): __. / @@ -25,29 +25,44 @@ v_UOM_ID varchar2(32); v_AttrSetValueType M_Product.AttrSetValueType%TYPE; v_count NUMBER; + v_Issotrx C_Invoice.Issotrx%TYPE; BEGIN IF AD_isTriggerEnabled()='N' THEN RETURN; END IF; - IF (UPDATING) THEN - IF NOT(COALESCE(:old.QtyInvoiced,0) <> COALESCE(:NEW.QtyInvoiced,0) - OR COALESCE(:old.LineNetAmt,0) <> COALESCE(:NEW.LineNetAmt,0) - OR COALESCE(:old.ChargeAmt,0) <> COALESCE(:NEW.ChargeAmt,0) - OR COALESCE(:old.M_Product_ID,'0') <> COALESCE(:NEW.M_Product_ID,'0') - OR COALESCE(:old.C_Tax_ID,'0') <> COALESCE(:NEW.C_Tax_ID,'0') - OR COALESCE(:old.C_Uom_ID,'0') <> COALESCE(:NEW.C_Uom_ID,'0')) - THEN - RETURN; - END IF; - SELECT COUNT(1) INTO v_Count - FROM M_MATCHINV WHERE C_INVOICELINE_ID=:OLD.C_InvoiceLine_ID; - IF (:OLD.M_INOUTLINE_ID IS NOT NULL AND v_Count<>0 AND :OLD.QTYINVOICED <> :NEW.QTYINVOICED) THEN -RAISE_APPLICATION_ERROR(-2, '@QtyChangedForInvoiceLineLinked@'); + IF NOT(COALESCE(:old.QtyInvoiced,0) <> COALESCE(:NEW.QtyInvoiced,0) +OR COALESCE(:old.LineNetAmt,0) <> COALESCE(:NEW.LineNetAmt,0) +OR COALESCE(:old.ChargeAmt,0) <> COALESCE(:NEW.ChargeAmt,0) +OR COALESCE(:old.M_Product_ID,'0') <> COALESCE(:NEW.M_Product_ID,'0') +OR COALESCE(:old.C_Tax_ID,'0') <> COALESCE(:NEW.C_Tax_ID,'0') +OR COALESCE(:old.C_Uom_ID,'0') <> COALESCE(:NEW.C_Uom_ID,'0')) + THEN +RETURN; END IF; - END IF; + + SELECT Issotrx + INTO v_Issotrx + FROM C_INVOICE + WHERE C_INVOICE_ID=:OLD.C_INVOICE_ID; + + IF(v_Issotrx = 'N') THEN +SELECT COUNT(1) INTO v_Count +FROM M_MATCHINV WHERE C_INVOICELINE_ID=:OLD.C_InvoiceLine_ID; +IF (:OLD.M_INOUTLINE_ID IS NOT NULL AND v_Count<>0 AND :OLD.QTYINVOICED <> :NEW.QTYINVOICED) THEN + RAISE_APPLICATION_ERROR(-2, '@QtyChangedForInvoiceLineLinked@'); +END IF; +SELECT COUNT(1) +INTO v_Count +FROM M_LC_COST +WHERE C_INVOICELINE_ID = :OLD.C_InvoiceLine_ID; +IF (v_Count <> 0) THEN + RAISE_APPLICATION_ERROR(-2, '@LandedCostLinkedInvoiceLineChanged@'); +END IF; + END IF; +END IF; -- Difference, ID IF (UPDATING OR INSERTING) THEN IF (:NEW.M_PRODUCT_ID IS NOT NULL) THEN diff -r e0749d9a2b25 -r 641c5b66d580 src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml Fri Nov 23 13:21:32 2018 +0100 +++ b/src-db/database/sourcedata/AD_MESSAGE.xml Fri Nov 23 11:45:53 2018 +0100 @@ -28081,6 +28081,18 @@ + + + + + + + + + + + + ___ 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/920bfe823a1a
changeset: 35046:920bfe823a1a
user: Atul Gaware openbravo.com>
date: Fri Nov 16 15:01:39 2018 +0530
summary: Fixes Issue 39619:ReportMaterialTransactionEditionJR consumes a lot
of
memory and produces a system crash
For avoiding system crash, data is fetched with limit of preference
ReportLimit. If data count is more than ReportLimit, warning message
is shown to use apply more selective filters.
details: https://code.openbravo.com/erp/devel/pi/rev/cde51d307460
changeset: 35047:cde51d307460
user: Sandra Huguet openbravo.com>
date: Tue Nov 20 15:46:26 2018 +0100
summary: related to issue 39619 use advisePopUp from HttpSecureAppServlet
diffstat:
src/org/openbravo/erpCommon/ad_reports/InoutEdition_data.xsql
| 6 +-
src/org/openbravo/erpCommon/ad_reports/ReportMaterialTransactionEditionJR.java
| 36 +++--
2 files changed, 33 insertions(+), 9 deletions(-)
diffs (126 lines):
diff -r 79cf23e89b27 -r cde51d307460
src/org/openbravo/erpCommon/ad_reports/InoutEdition_data.xsql
--- a/src/org/openbravo/erpCommon/ad_reports/InoutEdition_data.xsql Tue Nov
20 13:36:52 2018 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/InoutEdition_data.xsql Tue Nov
20 15:46:26 2018 +0100
@@ -12,7 +12,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) 2001-2016 Openbravo SLU
+ * All portions are Copyright (C) 2001-2018 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -28,6 +28,7 @@
@@ -61,6 +63,8 @@
+
+
diff -r 79cf23e89b27 -r cde51d307460
src/org/openbravo/erpCommon/ad_reports/ReportMaterialTransactionEditionJR.java
---
a/src/org/openbravo/erpCommon/ad_reports/ReportMaterialTransactionEditionJR.java
Tue Nov 20 13:36:52 2018 +0100
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportMaterialTransactionEditionJR.java
Tue Nov 20 15:46:26 2018 +0100
@@ -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) 2001-2017 Openbravo SLU
+ * All portions are Copyright (C) 2001-2018 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -27,6 +27,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.lang.StringUtils;
import org.openbravo.base.secureApp.HttpSecureAppServlet;
import org.openbravo.base.secureApp.VariablesSecureApp;
import org.openbravo.database.ConnectionProvider;
@@ -58,7 +59,7 @@
String strmWarehouseId = vars.getStringParameter("inpmWarehouseId");
String strcProjectId = vars.getStringParameter("inpcProjectId");
printPageHtml(response, vars, strdateFrom, strdateTo, strcBpartnetId,
strmWarehouseId,
- strcProjectId, "html");
+ strcProjectId, "html", request);
} else if (vars.commandIn("EDIT_PDF")) {
if (log4j.isDebugEnabled()) {
log4j.debug("WE EDIT THE PDF");
@@ -69,7 +70,7 @@
String strmWarehouseId = vars.getStringParameter("inpmWarehouseId");
String strcProjectId = vars.getStringParameter("inpcProjectId");
printPageHtml(response, vars, strdateFrom, strdateTo, strcBpartnetId,
strmWarehouseId,
- strcProjectId, "pdf");
+ strcProjectId, "pdf", request);
} else {
pageErrorPopUp(response);
}
@@ -152,26 +153,45 @@
private void printPageHtml(HttpServletResponse response, VariablesSecureApp
vars,
String strdateFrom, String strdateTo, String strcBpartnetId, String
strmWarehouseId,
- String strcProjectId, String strOutput) throws IOException,
ServletException {
+ String strcProjectId, String strOutput, HttpServletRequest request)
throws IOException,
+ ServletException {
+
+InoutEditionData[] data = null;
+int limit = Integer.parseInt(Utility.getPreference(vars, "ReportsLimit",
""));
+ConnectionProvider readOnlyCP =
DalConnectionProvider.getReadOnlyConnectionProvider();
+
if (log4j.isDebugEnabled()) {
log4j.debug("Output: dataSheet");
}
-InoutEditionData[] data = null;
+String pgLimit = null, oraLimit = null;
+if (StringUtils.equalsIgnoreCase(readOnlyCP.getRDBMS(), "ORACLE")) {
+ oraLimit = String.valueOf(limit + 1);
+} else {
+ pgLimit = String.valueOf(limit + 1);
+}
String discard[] = { "discard" };
-ConnectionProvider readOnlyCP =
DalConnectionProvider.getReadOnlyConnectionProvider();
data = InoutEditionData.select(readOnlyCP,
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/33e6dbcffbaf
changeset: 35043:33e6dbcffbaf
user: Pablo Lujan openbravo.com
date: Tue Nov 20 12:48:30 2018 +0100
summary: Update Period from 2011 to 2019 - small extra fix
details: https://code.openbravo.com/erp/devel/pi/rev/83bf83902902
changeset: 35044:83bf83902902
user: Pablo Lujan openbravo.com
date: Tue Nov 20 12:49:16 2018 +0100
summary: merge with pi branch
diffstat:
referencedata/sampledata/QA_Testing/C_PERIOD.xml | 48 +++---
src/org/openbravo/base/exception/OBException.java | 4 +-
2 files changed, 26 insertions(+), 26 deletions(-)
diffs (156 lines):
diff -r 1296bc77e008 -r 83bf83902902
referencedata/sampledata/QA_Testing/C_PERIOD.xml
--- a/referencedata/sampledata/QA_Testing/C_PERIOD.xml Tue Nov 20 11:53:34
2018 +0100
+++ b/referencedata/sampledata/QA_Testing/C_PERIOD.xml Tue Nov 20 12:49:16
2018 +0100
@@ -66,8 +66,8 @@
-
-
+
+
@@ -138,8 +138,8 @@
-
-
+
+
@@ -156,8 +156,8 @@
-
-
+
+
@@ -390,8 +390,8 @@
-
-
+
+
@@ -606,8 +606,8 @@
-
-
+
+
@@ -912,8 +912,8 @@
-
-
+
+
@@ -1002,8 +1002,8 @@
-
-
+
+
@@ -1164,8 +1164,8 @@
-
-
+
+
@@ -1686,8 +1686,8 @@
-
-
+
+
@@ -1722,8 +1722,8 @@
-
-
+
+
@@ -1758,8 +1758,8 @@
-
-
+
+
@@ -1848,8 +1848,8 @@
-
-
+
+
diff -r 1296bc77e008 -r 83bf83902902
src/org/openbravo/base/exception/OBException.java
--- a/src/org/openbravo/base/exception/OBException.java Tue Nov 20 11:53:34
2018 +0100
+++ b/src/org/openbravo/base/exception/OBException.java Tue Nov 20 12:49:16
2018 +0100
@@ -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) 2008-2017 Openbravo SLU
+ * All portions are Copyright (C) 2008-2018 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -100,7 +100,7 @@
* @return the class-specific Logger
*/
protected Logger getLogger() {
-return LogManager.getLogger();
+return LogManager.getLogger(this.getClass());
}
/**
___
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/381ee761e739 changeset: 35036:381ee761e739 user: Nono Carballo gmail.com> date: Fri Nov 16 12:39:03 2018 +0100 summary: Fixes issue 35702: Performance improvements in Purchase Order Report PDF format 1. Last "Group By" was removed 2. Unnecessary coalesces in mandatory columns were removed 3. Remove duplicated columns dateordered and transdate 4. Line net amount and price actual currency conversion are run in outer query 5. Names of business partner, product and uom retrieved via joins 6. The alternativeUom is calculated with a left join details: https://code.openbravo.com/erp/devel/pi/rev/2e096148d8cb changeset: 35037:2e096148d8cb user: Sandra Huguet openbravo.com> date: Mon Nov 19 11:03:46 2018 +0100 summary: Related to issue 35702 Remove duplicated columns transdate diffstat: src/org/openbravo/erpCommon/ad_reports/ReportPurchaseOrder.jrxml | 84 + 1 files changed, 47 insertions(+), 37 deletions(-) diffs (99 lines): diff -r b08cf6ab13a4 -r 2e096148d8cb src/org/openbravo/erpCommon/ad_reports/ReportPurchaseOrder.jrxml --- a/src/org/openbravo/erpCommon/ad_reports/ReportPurchaseOrder.jrxml Mon Nov 19 12:28:51 2018 +0100 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportPurchaseOrder.jrxml Mon Nov 19 11:03:46 2018 +0100 @@ -102,48 +102,58 @@ - +INNER JOIN C_BPARTNER ON ZZ.BPARTNER_ID = C_BPARTNER.C_BPARTNER_ID +INNER JOIN M_PRODUCT ON ZZ.PRODUCT_ID = M_PRODUCT.M_PRODUCT_ID +INNER JOIN C_UOM ON ZZ.OLUOMID = C_UOM.C_UOM_ID +LEFT JOIN C_UOM CUOM ON ZZ.C_AUM = CUOM.C_UOM_ID +ORDER BY CLIENT_NAME, DATEORDERED, DOCUMENTNO, PRODUCT_NAME]]> ___ 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/0c740ea71313
changeset: 35034:0c740ea71313
user: Atul Gaware openbravo.com>
date: Wed Jul 22 10:25:06 2015 +0530
summary: Fixes Issue 29314:Clicking select all and after that unselect all
records in
Credit to Use grid in AddPayment window has performance issues
The problem was that on every selection/deselection of record in creditUseGrid
it was triggering the execution of these three methods:
* OB.APRM.AddPayment.updateCreditTotal(view.theForm);
* OB.APRM.AddPayment.updateActualExpected(view.theForm);
* OB.APRM.AddPayment.distributeAmount(view, view.theForm, true);
Actually it is not necessary to execute these functions on every record, because
in the end they are updating total values, so just executing them after the
iteration of the last record selected/deselected it would be enough.
To implement this, 'userSelectAllRecords' and 'deselectAllRecords' ListGrid
methods have been overriden, to set a flag to true, in order to know when a
record is changed while clicking selected/deselect all records, and in this
case the three methods will be executed in the last record of the grid.
The 'OB.APRM.AddPayment.userSelectAllRecords' is executed only when clicking
in select all records checkbox, but 'OB.APRM.AddPayment.deselectAllRecords' is
executed while unchecking the previous checkbox and when fetching data in the
grid using 'invalidateCache()' method. In this last case these functions will
not be executed on every deselection neither in the last record, because they
are already invoked directly in 'invalidateCache()', so in this case they will
be avoided.
While executing invalidateCache() function to reload CreditUse grid it
internally calls to 'OB.APRM.AddPayment.deselectAllRecords' overriden method
that sets obaprmAllRecordsSelectedByUser property to true. This property is
only needed when manually the select/unselect all checkbox is clicked.In order
to avoid this in creditOnLoadGrid function, if the property
'obaprmAllRecordsSelectedByUser' exists, it will be deleted.
details: https://code.openbravo.com/erp/devel/pi/rev/b08cf6ab13a4
changeset: 35035:b08cf6ab13a4
user: Sandra Huguet openbravo.com>
date: Mon Nov 19 12:28:51 2018 +0100
summary: related to issue 29314 code review: apply formatting
diffstat:
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
| 15 +++--
1 files changed, 11 insertions(+), 4 deletions(-)
diffs (39 lines):
diff -r 2f2207a2ba72 -r b08cf6ab13a4
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
---
a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
Mon Nov 19 12:23:31 2018 +0100
+++
b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
Mon Nov 19 12:28:51 2018 +0100
@@ -128,6 +128,8 @@
orderInvoiceGrid.dataProperties.transformData =
OB.APRM.AddPayment.ordInvTransformData;
glitemGrid.removeRecordClick = OB.APRM.AddPayment.removeRecordClick;
creditUseGrid.selectionChanged = OB.APRM.AddPayment.selectionChangedCredit;
+ creditUseGrid.userSelectAllRecords = OB.APRM.AddPayment.userSelectAllRecords;
+ creditUseGrid.deselectAllRecords = OB.APRM.AddPayment.deselectAllRecords;
orderInvoiceGrid.dataArrived = OB.APRM.AddPayment.ordInvDataArrived;
form.isCreditAllowed = form.getItem('received_from').getValue() !==
undefined && form.getItem('received_from').getValue() !== null;
@@ -336,6 +338,9 @@
OB.APRM.AddPayment.creditOnLoadGrid = function (grid) {
grid.isReady = true;
+ if (grid.obaprmAllRecordsSelectedByUser) {
+delete grid.obaprmAllRecordsSelectedByUser;
+ }
OB.APRM.AddPayment.updateCreditTotal(this.view.theForm);
OB.APRM.AddPayment.tryToUpdateActualExpected(this.view.theForm);
};
@@ -843,10 +848,12 @@
} else {
grid.setEditValue(grid.getRecordIndex(record), amountField, '0');
}
- OB.APRM.AddPayment.updateCreditTotal(view.theForm);
- OB.APRM.AddPayment.updateActualExpected(view.theForm);
- if (issotrx) {
-OB.APRM.AddPayment.distributeAmount(view, view.theForm, true);
+ if (!grid.obaprmAllRecordsSelectedByUser ||
(grid.obaprmAllRecordsSelectedByUser && (grid.getRecordIndex(record) ===
grid.getTotalRows() - 1))) {
+OB.APRM.AddPayment.updateCreditTotal(view.theForm);
+OB.APRM.AddPayment.updateActualExpected(view.theForm);
+if (issotrx) {
+ OB.APRM.AddPayment.distributeAmount(view, view.theForm, 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/649b56723e39
changeset: 34952:649b56723e39
user: Atul Gaware openbravo.com>
date: Wed Nov 07 07:45:34 2018 +0530
summary: Fixes Issue 39415:Payment Plan should not be removed
from a invoice of 0 that includes a prepaid order
** When invoice has grandtotal zero and has prepayment
linked with its associated order then consider this
criteria for creating schedule & its details for
such invoices.
** Handle divide by zero in FIN_AddPayment.java
details: https://code.openbravo.com/erp/devel/pi/rev/03d8fd2a8cca
changeset: 34953:03d8fd2a8cca
user: Sandra Huguet openbravo.com>
date: Mon Nov 12 13:00:12 2018 +0100
summary: related to issue 39415 prepaymentamt is wrong calculated
prepayment amout is wrong calculated when two order lines
are added in to the invoice.
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
| 17 +++--
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
| 14 ---
src-db/database/model/functions/C_INVOICE_POST.xml
| 4 +-
3 files changed, 22 insertions(+), 13 deletions(-)
diffs (97 lines):
diff -r efff403fd474 -r 03d8fd2a8cca
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
Mon Nov 12 13:59:37 2018 +0530
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
Mon Nov 12 13:00:12 2018 +0100
@@ -83,6 +83,8 @@
v_PricePr NUMBER;
v_isinvoicepaid CHAR(1):= 'N';
v_IsCashVAT C_Invoice.IsCashVAT%TYPE;
+v_prepaymentamt NUMBER;
+v_hasPrepaymentToReturn BOOLEAN := false;
TYPE RECORD IS REF CURSOR;
Cur_Params RECORD;
@@ -126,13 +128,13 @@
C_BPartner_ID, DateInvoiced, totallines, fin_paymentmethod_id,
fin_payment_priority_id, documentNo, poreference,
c_project_id, c_campaign_id, c_activity_id, user1_id, user2_id,
c_costcenter_id,
- IsCashVAT
+ IsCashVAT, prepaymentamt
INTO v_Client_ID, v_Org_ID, v_DocTypeTarget_ID, v_IsSOTrx,
v_GrandTotal, v_PaymentTerm, v_PaymentRule, v_Currency_ID,
v_BPartner_ID, v_DateInvoiced, v_totallines, v_PaymentMethod,
v_PaymentPriority, v_documentno, v_poreference,
v_project_id, v_campaign_id, v_activity_id, v_user1, v_user2,
v_costcenter,
- v_IsCashVAT
+ v_IsCashVAT, v_prepaymentamt
FROM c_invoice
WHERE c_invoice_id=p_record_id;
@@ -265,11 +267,18 @@
INTO v_ConsumedGranTotal
FROM fin_payment_schedule ps
WHERE ps.c_invoice_id = p_record_id;
+
+ --When the Total Amount of the Invoice is 0 and nothing has been
consumed yet for the Invoice
+ --but there is already a prepayment made for a related Order
+ --Related to Issue https://issues.openbravo.com/view.php?id=39415
+ IF (v_GrandTotal = 0 AND v_ConsumedGranTotal = 0 AND v_prepaymentamt <>
0) THEN
+v_hasPrepaymentToReturn := true;
+ END IF;
--Insert Payment Schedules for Invoices
v_pendingAmount := v_GrandTotal - coalesce(v_ConsumedGranTotal, 0);
- IF (v_pendingAmount <> 0) THEN
+ IF (v_pendingAmount <> 0 OR v_hasPrepaymentToReturn) THEN
--get number of payment schedules expected for the invoice
SELECT count(*) INTO v_paymentcount
@@ -1168,8 +1177,6 @@
END;
ELSIF (p_docaction = 'RC') THEN
-DECLARE
- v_prepaymentamt NUMBER;
BEGIN
v_delete_paymentplan := TRUE;
SELECT c_invoice_id INTO v_reversalinvoice_id
diff -r efff403fd474 -r 03d8fd2a8cca
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
Mon Nov 12 13:59:37 2018 +0530
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
Mon Nov 12 13:00:12 2018 +0100
@@ -1389,14 +1389,16 @@
firstDueDate = paymentSchedule.getDueDate();
}
-BigDecimal overdueAmount = calculateOverdueAmount(invoicePaymentSchedule);
-invoice.setPercentageOverdue(overdueAmount.multiply(new BigDecimal("100"))
-.divide(invoice.getGrandTotalAmount(), 2,
RoundingMode.HALF_UP).longValue());
-
-if (firstDueDate != null)
+if (invoice.getGrandTotalAmount().compareTo(BigDecimal.ZERO) != 0) {
+ BigDecimal overdueAmount =
calculateOverdueAmount(invoicePaymentSchedule);
+ invoice.setPercentageOverdue(overdueAmount.multiply(new
BigDecimal("100"))
+ .divide(invoice.getGrandTotalAmount(), 2,
RoundingMode.HALF_UP).longValue());
+}
+if (firstDueDate != null) {
invoice.setDaysTillDue(FIN_Utility.getDaysToDue(firstDueDate));
-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/31f161352319
changeset: 34840:31f161352319
user: Antonio Moreno openbravo.com>
date: Thu Oct 11 18:18:19 2018 +0200
summary: Fixed issue 38361. The terminal does not go to offline mode if the
database is colapsed but the tomcat works
When there is an exception in the critical part of the HttpSecureAppServlet
which tries to detect if the client is authenticated, we should not necessarily
force a logout and reply with '401- Not authenticated' response. Instead, the
appropriate action is to just return a '500-Internal Server Error' response.
Logging out in this case may kill a valid request when the server is
temporarily overloaded, and makes no sense, and the 401 response may confuse
the client, thinking that it needs to do login again when in reality, the
problem is just that the server is either overloaded, or affected by some
serious problem which prevents even basic authentication checking to work.
details: https://code.openbravo.com/erp/devel/pi/rev/618fcb380761
changeset: 34841:618fcb380761
user: Antonio Moreno openbravo.com>
date: Mon Oct 15 10:41:39 2018 +0200
summary: Related to issue 38361. Improved comment and log.
diffstat:
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 7 ---
1 files changed, 4 insertions(+), 3 deletions(-)
diffs (17 lines):
diff -r 44a01083360d -r 618fcb380761
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java
--- a/src/org/openbravo/base/secureApp/HttpSecureAppServlet.javaThu Oct
11 10:01:13 2018 +0200
+++ b/src/org/openbravo/base/secureApp/HttpSecureAppServlet.javaMon Oct
15 10:41:39 2018 +0200
@@ -355,9 +355,10 @@
invalidateSession(request);
return;
} catch (final Exception e) {
- // Re-login
- log4j.error("HTTPSecureAppServlet.service() - exception caught: ", e);
- logout(request, response);
+ // There was an unknown problem when verifying that session is valid, or
that access is
+ // correct. Session will not be invalidated, Internal Server Error will
be returned instead
+ log4j.error("Exception caught when verifying session", e);
+ response.setStatus(500);
return;
} finally {
final boolean sessionCreated = !sessionExists && null !=
request.getSession(false);
___
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/faf7ea329834
changeset: 34838:faf7ea329834
user: Asier Lostalé openbravo.com>
date: Thu Oct 11 09:26:50 2018 +0200
summary: fixed issue 39141: removed ant tomcat.reload task
This task is unused for years now.
details: https://code.openbravo.com/erp/devel/pi/rev/44a01083360d
changeset: 34839:44a01083360d
user: Asier Lostalé openbravo.com>
date: Thu Oct 11 10:01:13 2018 +0200
summary: fixed issue 39140: removed restart option from smartbuild
diffstat:
build.xml | 32 +
src/org/openbravo/service/system/ReloadContext.java | 78 -
2 files changed, 2 insertions(+), 108 deletions(-)
diffs (152 lines):
diff -r cd8309678ebc -r 44a01083360d build.xml
--- a/build.xml Thu Oct 11 08:57:47 2018 +0200
+++ b/build.xml Thu Oct 11 10:01:13 2018 +0200
@@ -426,11 +426,6 @@
-
-
-
-
-
@@ -459,10 +454,6 @@
-
-
-
-
@@ -807,7 +798,7 @@
This task is called from the Openbravo ui, it spawns a java
call which again
calls the restart.tomcat.do task as a spawned task.
-->
-
+
@@ -818,7 +809,7 @@
-
+
@@ -844,25 +835,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -r cd8309678ebc -r 44a01083360d
src/org/openbravo/service/system/ReloadContext.java
--- a/src/org/openbravo/service/system/ReloadContext.java Thu Oct 11
08:57:47 2018 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +
@@ -1,78 +0,0 @@
-/*
- *
- * 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) 2008-2010 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s): __.
-
- */
-
-package org.openbravo.service.system;
-
-import java.io.File;
-
-import org.apache.log4j.Logger;
-import org.openbravo.base.exception.OBException;
-import org.openbravo.base.session.OBPropertiesProvider;
-
-/**
- * Reloads the tomcat using the tomcat reload ant task.
- *
- * @author mtaal
- */
-public class ReloadContext {
- private static final Logger log = Logger.getLogger(ReloadContext.class);
-
- /**
- * Method is called from the tomcat.reload tasks, this method again starts
the tomcat.reload.do
- * task.Note: this method should always use the AntExecutor in
org.openbravo.erpCommon.utility, to
- * prevent problems when upgrading Core to a newer version
- *
- * @param args
- * arg[0] contains the source path
- * @throws Exception
- */
- @SuppressWarnings("deprecation")
- public static void main(String[] args) throws Exception {
-final String srcPath = args[0];
-final File srcDir = new File(srcPath);
-final File baseDir = srcDir.getParentFile();
-try {
- log.debug("Reloading context with basedir " + baseDir);
- final org.openbravo.erpCommon.utility.AntExecutor antExecutor = new
org.openbravo.erpCommon.utility.AntExecutor(
- baseDir.getAbsolutePath());
- antExecutor.runTask("tomcat.reload.do");
-} catch (final Exception e) {
- throw new OBException(e);
-}
- }
-
- /**
- * Restarts the tomcat server. Assumes the the Openbravo.properties are
available through the
- * {@link OBPropertiesProvider}.Note: this method should always use the
AntExecutor in
- * org.openbravo.erpCommon.utility, to prevent problems when upgrading Core
to a newer version
- */
- @SuppressWarnings("deprecation")
- public static void reload() {
-final String baseDirPath =
OBPropertiesProvider.getInstance().getOpenbravoProperties()
-.getProperty("source.path");
-try {
- log.debug("Reloading context with basedir " + baseDirPath);
- final org.openbravo.erpCommon.utility.AntExecutor antExecutor = new
org.openbravo.erpCommon.utility.AntExecutor(
- baseDirPath);
- antExecutor.runTask("tomcat.reload");
-} catch (final Exception e) {
- throw new OBException(e);
-}
- }
-}
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/d8c618c02470
changeset: 34832:d8c618c02470
user: Asier Lostalé openbravo.com>
date: Fri Sep 28 08:03:08 2018 +0200
summary: fixed issue 39362: can't create tickets if one failed due to pool
without conns
After a ticket failed to be imported due to the pool is out of connections, no
new tickets can be created from that terminal until all import entries are set
again in Initial status.
Now in this case instead of setting the import entry as Error preventing new
tickets from the same terminal to be processed, it's kept in Initial status,
in this way it will be tried to be processed in next cycle, not exposing the
problem to users.
details: https://code.openbravo.com/erp/devel/pi/rev/ba9ef09516cf
changeset: 34833:ba9ef09516cf
user: Asier Lostalé openbravo.com>
date: Tue Oct 02 09:43:11 2018 +0200
summary: related to issue 39362: added test cases covering no DB conns
detection
diffstat:
modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/JdbcExternalConnectionPool.java
| 12 +-
src-core/src/org/openbravo/database/ExternalConnectionPool.java
| 29 +++
src-test/src/org/openbravo/test/AllAntTaskTests.java
| 2 +
src-test/src/org/openbravo/test/db/pool/PoolHasNoConnectionsDetection.java
| 73 ++
src/org/openbravo/service/importprocess/ImportEntryProcessor.java
| 18 +-
5 files changed, 128 insertions(+), 6 deletions(-)
diffs (228 lines):
diff -r 6ce7922086d7 -r ba9ef09516cf
modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/JdbcExternalConnectionPool.java
---
a/modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/JdbcExternalConnectionPool.java
Wed Oct 03 17:18:12 2018 +0200
+++
b/modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/JdbcExternalConnectionPool.java
Tue Oct 02 09:43:11 2018 +0200
@@ -19,6 +19,7 @@
package org.openbravo.apachejdbcconnectionpool;
import java.sql.Connection;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -30,6 +31,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.tomcat.jdbc.pool.DataSource;
+import org.apache.tomcat.jdbc.pool.PoolExhaustedException;
import org.apache.tomcat.jdbc.pool.PoolProperties;
import org.openbravo.base.exception.OBException;
import org.openbravo.base.session.OBPropertiesProvider;
@@ -47,12 +49,14 @@
* connection from a pool, close the different pools and other actions.
*/
public class JdbcExternalConnectionPool extends ExternalConnectionPool {
-
final static private Logger log =
LoggerFactory.getLogger(JdbcExternalConnectionPool.class);
private Map availableDataSources = null;
private DataSource defaultDataSource = null;
+ private static final List> EXHAUSTED_EXCEPTION =
Arrays
+ .asList(PoolExhaustedException.class);
+
/**
* This method loads all the interceptors of Apache JDBC Connection Pool
injected with weld.
*/
@@ -349,4 +353,10 @@
}
super.closePool();
}
+
+ @Override
+ protected List> getExhaustedExceptions() {
+return EXHAUSTED_EXCEPTION;
+ }
+
}
diff -r 6ce7922086d7 -r ba9ef09516cf
src-core/src/org/openbravo/database/ExternalConnectionPool.java
--- a/src-core/src/org/openbravo/database/ExternalConnectionPool.java Wed Oct
03 17:18:12 2018 +0200
+++ b/src-core/src/org/openbravo/database/ExternalConnectionPool.java Tue Oct
02 09:43:11 2018 +0200
@@ -18,6 +18,8 @@
package org.openbravo.database;
import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Collections;
import java.util.List;
import org.apache.log4j.Logger;
@@ -34,6 +36,9 @@
private static ExternalConnectionPool instance;
+ private static final String PG_TOO_MANY_CONNECTIONS = "53300";
+ private static final String ORA_CONNECTION_REFUSED = "66000";
+
/**
*
* @param externalConnectionPoolClassName
@@ -93,4 +98,28 @@
return getConnection();
}
+ /** {@code Exception}s thrown when trying to create a new connection and
pool is exhausted. */
+ protected List> getExhaustedExceptions() {
+return Collections.emptyList();
+ }
+
+ /** Checks if {@code Throwable} was caused by pool not having more
connections. */
+ public boolean hasNoConnections(Throwable t) {
+if (t == null) {
+ return false;
+}
+
+boolean isOutOfPhysicalConns;
+if (t instanceof SQLException) {
+ String state = ((SQLException) t).getSQLState();
+ isOutOfPhysicalConns = PG_TOO_MANY_CONNECTIONS.equals(state)
+ || ORA_CONNECTION_REFUSED.equals(state);
+} else {
+
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/c83c34c74ee4 changeset: 34826:c83c34c74ee4 user: RM packaging bot openbravo.com> date: Mon Oct 01 09:21:24 2018 + summary: CI: update AD_MODULE to version 34825 details: https://code.openbravo.com/erp/devel/pi/rev/5abfa42b2a58 changeset: 34827:5abfa42b2a58 user: RM packaging bot openbravo.com> date: Mon Oct 01 09:35:38 2018 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/d8242c6b0bfe changeset: 34822:d8242c6b0bfe user: RM packaging bot openbravo.com> date: Thu Sep 27 14:12:32 2018 + summary: CI: update AD_MODULE to version 34821 details: https://code.openbravo.com/erp/devel/pi/rev/58e108f901e1 changeset: 34823:58e108f901e1 user: RM packaging bot openbravo.com> date: Thu Sep 27 14:26:32 2018 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/95141753a1f0 changeset: 34810:95141753a1f0 user: RM packaging bot openbravo.com> date: Wed Sep 26 17:33:36 2018 + summary: CI: update AD_MODULE to version 34808 details: https://code.openbravo.com/erp/devel/pi/rev/2790bbfd0b6a changeset: 34811:2790bbfd0b6a user: RM packaging bot openbravo.com> date: Wed Sep 26 17:47:36 2018 + 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.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 6 ++- 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/b69e30e117b8 changeset: 34805:b69e30e117b8 user: RM packaging bot openbravo.com> date: Tue Sep 25 18:43:09 2018 + summary: CI: update AD_MODULE to version 34804 details: https://code.openbravo.com/erp/devel/pi/rev/fabe6e99f181 changeset: 34806:fabe6e99f181 user: RM packaging bot openbravo.com> date: Tue Sep 25 18:57:02 2018 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/acd8c31a80d0 changeset: 34803:acd8c31a80d0 user: Mark gmail.com> date: Fri Sep 21 11:09:12 2018 -0400 summary: Fixes issue 39293: Improved Performance in Accounting Transaction Details Query Updated the FACT_ACCT_DATEACCT index to be a multi-column index on DATEACCT and FACT_ACCT_ID columns, and changed the order by clause of the tab to use it. details: https://code.openbravo.com/erp/devel/pi/rev/646304f60e8f changeset: 34804:646304f60e8f user: Sandra Huguet openbravo.com> date: Tue Sep 25 16:47:57 2018 +0200 summary: related to issue 39293 code review changes modify the hql where clause to correctly apply the id of the table + DESC order diffstat: src-db/database/model/tables/FACT_ACCT.xml | 1 + src-db/database/sourcedata/AD_TAB.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diffs (23 lines): diff -r 287f17e68880 -r 646304f60e8f src-db/database/model/tables/FACT_ACCT.xml --- a/src-db/database/model/tables/FACT_ACCT.xmlTue Sep 25 12:16:03 2018 + +++ b/src-db/database/model/tables/FACT_ACCT.xmlTue Sep 25 16:47:57 2018 +0200 @@ -301,6 +301,7 @@ + diff -r 287f17e68880 -r 646304f60e8f src-db/database/sourcedata/AD_TAB.xml --- a/src-db/database/sourcedata/AD_TAB.xml Tue Sep 25 12:16:03 2018 + +++ b/src-db/database/sourcedata/AD_TAB.xml Tue Sep 25 16:47:57 2018 +0200 @@ -3022,7 +3022,7 @@ - + ___ 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/462eab118a3b
changeset: 34795:462eab118a3b
user: Asier Lostalé openbravo.com>
date: Fri Sep 21 11:26:50 2018 +0200
summary: fixed bug 39332: PG 11: ad_db_modified function fails
AD_DB_MODIFIED was failing in PG 11 because it was using pg_proc.proisagg
column which does no longer exist starting from 11.
Using that column was unneeded in any case because it was in query to get
paramaters and it was filtering out functions using them, as those functions
where already obtained in outer query, it is not needed to filter them again.
details: https://code.openbravo.com/erp/devel/pi/rev/45a672248561
changeset: 34796:45a672248561
user: Asier Lostalé openbravo.com>
date: Fri Sep 21 11:34:01 2018 +0200
summary: related to bug 39332: PG 11: ad_db_modified function fails
Added test cases covering ad_db_modified
diffstat:
src-db/database/model/prescript-PostgreSql.sql| 3 +-
src-test/src/org/openbravo/test/AllAntTaskTests.java | 4 +-
src-test/src/org/openbravo/test/model/DBModifiedTest.java | 97 +++
3 files changed, 101 insertions(+), 3 deletions(-)
diffs (142 lines):
diff -r 8a73e458127f -r 45a672248561
src-db/database/model/prescript-PostgreSql.sql
--- a/src-db/database/model/prescript-PostgreSql.sqlTue Sep 25 09:59:27
2018 +0200
+++ b/src-db/database/model/prescript-PostgreSql.sqlFri Sep 21 11:34:01
2018 +0200
@@ -1289,7 +1289,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 Openbravo SLU
+* All portions are Copyright (C) 2009-2018 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
/
@@ -1338,7 +1338,6 @@
WHERE pg_proc.prorettype <> 'pg_catalog.cstring'::pg_catalog.regtype
AND (pg_proc.proargtypes[0] IS NULL
OR pg_proc.proargtypes[0] <>
'pg_catalog.cstring'::pg_catalog.regtype)
-AND NOT pg_proc.proisagg
AND pg_catalog.pg_function_is_visible(pg_proc.oid)
AND pg_proc.proname = i.realname
and pg_proc.pronargs = i.pronargs
diff -r 8a73e458127f -r 45a672248561
src-test/src/org/openbravo/test/AllAntTaskTests.java
--- a/src-test/src/org/openbravo/test/AllAntTaskTests.java Tue Sep 25
09:59:27 2018 +0200
+++ b/src-test/src/org/openbravo/test/AllAntTaskTests.java Fri Sep 21
11:34:01 2018 +0200
@@ -74,6 +74,7 @@
import org.openbravo.test.inventoryStatus.InventoryStatusTest;
import
org.openbravo.test.materialMgmt.iscompletelyinvoicedshipment.IsCompletelyInvoicedShipment;
import org.openbravo.test.model.ClassLoaderTest;
+import org.openbravo.test.model.DBModifiedTest;
import org.openbravo.test.model.IndexesTest;
import org.openbravo.test.model.OneToManyTest;
import org.openbravo.test.model.RuntimeModelTest;
@@ -175,7 +176,8 @@
ClassLoaderTest.class, //
IndexesTest.class, //
TrlColumnsOraTypeTest.class, //
-ADCSInitialization.class,
+ADCSInitialization.class, //
+DBModifiedTest.class,
// modularity
DatasetServiceTest.class, //
diff -r 8a73e458127f -r 45a672248561
src-test/src/org/openbravo/test/model/DBModifiedTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/src-test/src/org/openbravo/test/model/DBModifiedTest.java Fri Sep 21
11:34:01 2018 +0200
@@ -0,0 +1,97 @@
+/*
+ *
+ * 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) 2018 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): __.
+
+ */
+
+package org.openbravo.test.model;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.test.base.OBBaseTest;
+
+/** Test cases covering detection of DB model changes */
+public class DBModifiedTest extends OBBaseTest {
+
+ @Test
+ public void noChangesTest() {
+assertFalse("DB changes
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/7b08015f2457 changeset: 34790:7b08015f2457 user: RM packaging bot openbravo.com> date: Fri Sep 21 10:49:35 2018 + summary: CI: update AD_MODULE to version 34785 details: https://code.openbravo.com/erp/devel/pi/rev/59a0e798d44c changeset: 34791:59a0e798d44c user: RM packaging bot openbravo.com> date: Fri Sep 21 11:05:53 2018 + 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.application/web/org.openbravo.client.application/js/main/ob-standard-view-datasource.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 4 +- 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/cf547a60259c changeset: 34788:cf547a60259c user: Atul Gaware openbravo.com> date: Wed Sep 19 19:33:01 2018 +0530 summary: Related to Issue 0039296:Sample data (F International Group Client) for 3.0PR18Q4 Committed changes prior to creating transactions for sample data for 3.0PR18Q4 details: https://code.openbravo.com/erp/devel/pi/rev/17a5d4818c4f changeset: 34789:17a5d4818c4f user: Atul Gaware openbravo.com> date: Thu Sep 20 01:28:22 2018 +0530 summary: Fixes Issue 39296:Sample data (F International Group Client) for 3.0PR18Q4 Sample data (F International Group Client) for 3.0PR18Q4 for the month of July, August and Sept 2018. Following the "How to evolve F" document instructions transactions created for 3.0PR18Q4 release. diffstat: referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml | 1410 +- referencedata/sampledata/F_B_International_Group/AD_SEQUENCE.xml | 62 +- referencedata/sampledata/F_B_International_Group/AD_USER.xml | 48 +- referencedata/sampledata/F_B_International_Group/AD_WINDOW_ACCESS.xml |280 + referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml | 74 +- referencedata/sampledata/F_B_International_Group/C_INVOICE.xml | 7507 +- referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml | 8952 + referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml | 4320 + referencedata/sampledata/F_B_International_Group/C_INVOICETAX.xml | 1020 + referencedata/sampledata/F_B_International_Group/C_ORDER.xml | 2286 + referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml | 10116 ++ referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml | 3672 + referencedata/sampledata/F_B_International_Group/C_ORDERTAX.xml |576 + referencedata/sampledata/F_B_International_Group/C_ORDER_DISCOUNT.xml |180 + referencedata/sampledata/F_B_International_Group/FACT_ACCT.xml | 47740 +- referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENT.xml | 44 + referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENTLINE.xml | 1260 + referencedata/sampledata/F_B_International_Group/FIN_FINACC_TRANSACTION.xml | 1794 + referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml | 8 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml | 2046 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_DETAIL.xml |928 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml |174 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml |600 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml | 20178 ++- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml | 1312 +- referencedata/sampledata/F_B_International_Group/FIN_RECONCILIATION.xml | 58 + referencedata/sampledata/F_B_International_Group/GL_JOURNAL.xml |108 + referencedata/sampledata/F_B_International_Group/GL_JOURNALBATCH.xml | 82 +- referencedata/sampledata/F_B_International_Group/GL_JOURNALLINE.xml | 1260 + referencedata/sampledata/F_B_International_Group/M_ATTRIBUTESETINSTANCE.xml | 90 + referencedata/sampledata/F_B_International_Group/M_COSTING.xml | 2110 +- referencedata/sampledata/F_B_International_Group/M_INOUT.xml | 1602 + referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml | 4692 + referencedata/sampledata/F_B_International_Group/M_MATCHINV.xml | 1482 + referencedata/sampledata/F_B_International_Group/M_MATCHPO.xml | 2964 + referencedata/sampledata/F_B_International_Group/M_STORAGE_DETAIL.xml |322 +- referencedata/sampledata/F_B_International_Group/M_STORAGE_PENDING.xml | 52 +- referencedata/sampledata/F_B_International_Group/M_TRANSACTION.xml | 6120 + referencedata/sampledata/F_B_International_Group/M_TRANSACTION_COST.xml | 3468 + referencedata/sampledata/F_B_International_Group/OBUIAPP_PROCESS_ACCESS.xml |280 + 40 files changed, 130534 insertions(+), 10743 deletions(-) diffs (truncated from 191238 to 300 lines): diff -r 7ebcdd2bf2c5 -r 17a5d4818c4f referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml --- a/referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml Fri Sep 21 09:28:48 2018 +0200 +++ b/referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml Thu Sep 20
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/ca4fbc83aa05 changeset: 34783:ca4fbc83aa05 user: RM packaging bot openbravo.com> date: Thu Sep 20 23:59:36 2018 + summary: CI: update AD_MODULE to version 34782 details: https://code.openbravo.com/erp/devel/pi/rev/ef2e1f127dad changeset: 34784:ef2e1f127dad user: RM packaging bot openbravo.com> date: Fri Sep 21 00:17:29 2018 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/56bd6ede090b changeset: 34778:56bd6ede090b user: RM packaging bot openbravo.com> date: Mon Sep 17 10:54:31 2018 + summary: CI: update AD_MODULE to version 34777 details: https://code.openbravo.com/erp/devel/pi/rev/85f5194946aa changeset: 34779:85f5194946aa user: RM packaging bot openbravo.com> date: Mon Sep 17 11:08:27 2018 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/85df3905e703 changeset: 34775:85df3905e703 user: RM packaging bot openbravo.com> date: Thu Sep 13 14:10:26 2018 + summary: CI: update AD_MODULE to version 34774 details: https://code.openbravo.com/erp/devel/pi/rev/ed90d71de2b0 changeset: 34776:ed90d71de2b0 user: RM packaging bot openbravo.com> date: Thu Sep 13 14:24:22 2018 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/ad75d3cb1744 changeset: 34772:ad75d3cb1744 user: RM packaging bot openbravo.com> date: Wed Sep 12 19:19:30 2018 + summary: CI: update AD_MODULE to version 34771 details: https://code.openbravo.com/erp/devel/pi/rev/956f70249104 changeset: 34773:956f70249104 user: RM packaging bot openbravo.com> date: Wed Sep 12 19:33:31 2018 + 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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/6bac4a0d2846
changeset: 34770:6bac4a0d2846
user: Sandra Huguet openbravo.com>
date: Tue Sep 04 15:23:34 2018 +0200
summary: Fixes issue 39171 improve reset accounting process performance
Improve performance of getTables and getDocbasetypes queries
details: https://code.openbravo.com/erp/devel/pi/rev/7671c9b22d7e
changeset: 34771:7671c9b22d7e
user: Sandra Huguet openbravo.com>
date: Tue Sep 11 15:58:39 2018 -0400
summary: Related to 39171: Use ad_periodcontrolallowed_org_id column instead
of calling
ad_org_getperiodcontrolallow() function to improve performance.
The ad_org_getperiodcontrolallow column of each organization stores it period
control allowed organization. Using it is more efficient than invoke the
ad_org_getperiodcontrolallow()
function as this one is recursive and implies extra queries that are
unnecesaries
as the information is in the requested organizations.
diffstat:
src-db/database/model/tables/FACT_ACCT.xml | 3 +++
src/org/openbravo/financial/ResetAccounting.java | 12 +---
2 files changed, 12 insertions(+), 3 deletions(-)
diffs (52 lines):
diff -r bfd9f58405fa -r 7671c9b22d7e src-db/database/model/tables/FACT_ACCT.xml
--- a/src-db/database/model/tables/FACT_ACCT.xmlWed Sep 12 15:02:46
2018 +0200
+++ b/src-db/database/model/tables/FACT_ACCT.xmlTue Sep 11 15:58:39
2018 -0400
@@ -305,6 +305,9 @@
+
+
+
diff -r bfd9f58405fa -r 7671c9b22d7e
src/org/openbravo/financial/ResetAccounting.java
--- a/src/org/openbravo/financial/ResetAccounting.java Wed Sep 12 15:02:46
2018 +0200
+++ b/src/org/openbravo/financial/ResetAccounting.java Tue Sep 11 15:58:39
2018 -0400
@@ -110,7 +110,7 @@
// period control associated
Map organizationPeriodControl = new HashMap<>();
-String myQuery1 = "select ad_org_id,
ad_org_getperiodcontrolallow(ad_org_id) from ad_org where ad_org_id in
(:orgIds)";
+String myQuery1 = "select ad_org_id,
ad_periodcontrolallowed_org_id from ad_org where ad_org_id in (:orgIds)";
@SuppressWarnings("rawtypes")
Query query1 =
OBDal.getInstance().getSession().createNativeQuery(myQuery1);
@@ -418,7 +418,9 @@
accountingTables.add(myTable.getId());
return accountingTables;
}
- String myQuery = "select distinct e.table.id from
FinancialMgmtAccountingFact e where e.table.id <> '145'";
+
+ String myQuery = "select distinct t.id from ADTable t where t.id <>
'145' "
+ + " and exists (select 1 from FinancialMgmtAccountingFact e where
e.table.id=t.id) ";
accountingTables =
OBDal.getInstance().getSession().createQuery(myQuery).list();
return accountingTables;
} finally {
@@ -440,10 +442,14 @@
}
private static List getDocbasetypes(String clientId, String tableId,
String recordId) {
-String myQuery = "select distinct e.documentCategory from
FinancialMgmtAccountingFact e where e.client.id = :clientId and e.table.id =
:tableId ";
+
+String myQuery = "select distinct d.documentCategory from DocumentType d
where d.client.id = :clientId and d.table.id = :tableId"
++ " and exists (select 1 from FinancialMgmtAccountingFact e where
e.documentCategory=d.documentCategory ";
+
if (!"".equals(recordId)) {
myQuery = myQuery + "and e.recordID=:recordId";
}
+myQuery = myQuery + ")";
Query query =
OBDal.getInstance().getSession().createQuery(myQuery, String.class);
query.setParameter("clientId", clientId);
query.setParameter("tableId", tableId);
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
