[OpenbravoERP-commits] devel/pi: related to issue 41033: change assertion
details: https://code.openbravo.com/erp/devel/pi/rev/4239ab3ce79e
changeset: 36018:4239ab3ce79e
user: Carlos Aristu openbravo.com>
date: Thu Jun 06 13:22:12 2019 +0200
summary: related to issue 41033: change assertion
The test compilation was still failing in CI, changing the assertion to avoid
the problem
diffstat:
modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/CdiInfrastructure.java
| 8 +---
1 files changed, 5 insertions(+), 3 deletions(-)
diffs (24 lines):
diff -r 06711d4d7d57 -r 4239ab3ce79e
modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/CdiInfrastructure.java
---
a/modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/CdiInfrastructure.java
Thu Jun 06 12:41:37 2019 +0200
+++
b/modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/CdiInfrastructure.java
Thu Jun 06 13:22:12 2019 +0200
@@ -24,7 +24,6 @@
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.hasSize;
import static org.junit.Assert.assertThat;
import java.util.List;
@@ -110,7 +109,10 @@
List names =
beans.map(ExtensionBean::getName).collect(Collectors.toList());
-assertThat("Retrieved the expected beans", names,
allOf(hasSize(numberOfExtensionBeans),
-hasItem("qualifiedBean"), hasItem("unqualifiedBean")));
+assertThat("Retrieved the expected number of beans", names.size(),
+equalTo(numberOfExtensionBeans));
+
+assertThat("Retrieved the expected beans", names,
+allOf(hasItem("qualifiedBean"), hasItem("unqualifiedBean")));
}
}
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: related to issue 41033: use CoreMatchers.allOf instead...
details: https://code.openbravo.com/erp/devel/pi/rev/06711d4d7d57 changeset: 36017:06711d4d7d57 user: Carlos Aristu openbravo.com> date: Thu Jun 06 12:41:37 2019 +0200 summary: related to issue 41033: use CoreMatchers.allOf instead of Matchers.allOf Test was not compiling in JDK10+ due to some problem related with generics and "Matchers.allOf". Using "CoreMatchers.allOf" instead. diffstat: modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/CdiInfrastructure.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 41c47dd2afae -r 06711d4d7d57 modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/CdiInfrastructure.java --- a/modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/CdiInfrastructure.java Thu Jun 06 11:42:41 2019 +0200 +++ b/modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/CdiInfrastructure.java Thu Jun 06 12:41:37 2019 +0200 @@ -19,10 +19,10 @@ package org.openbravo.base.weld.test.testinfrastructure; +import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.hasSize; import static org.junit.Assert.assertThat; ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: related to issue 41033: change assertion to fix error ...
details: https://code.openbravo.com/erp/devel/pi/rev/41c47dd2afae
changeset: 36016:41c47dd2afae
user: Carlos Aristu openbravo.com>
date: Thu Jun 06 11:42:41 2019 +0200
summary: related to issue 41033: change assertion to fix error in CI
diffstat:
modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/CdiInfrastructure.java
| 7 +++
1 files changed, 3 insertions(+), 4 deletions(-)
diffs (27 lines):
diff -r e7f7f338f322 -r 41c47dd2afae
modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/CdiInfrastructure.java
---
a/modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/CdiInfrastructure.java
Thu Jun 06 11:24:08 2019 +0200
+++
b/modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/CdiInfrastructure.java
Thu Jun 06 11:42:41 2019 +0200
@@ -23,8 +23,8 @@
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.hasSize;
-import static
org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
import static org.junit.Assert.assertThat;
import java.util.List;
@@ -107,11 +107,10 @@
private void assertExtensionBeansInjection(Stream beans) {
int numberOfExtensionBeans = 2;
-String[] expectedNames = { "qualifiedBean", "unqualifiedBean" };
List names =
beans.map(ExtensionBean::getName).collect(Collectors.toList());
-assertThat("Retrieved the expected beans", names,
-allOf(hasSize(numberOfExtensionBeans),
containsInAnyOrder(expectedNames)));
+assertThat("Retrieved the expected beans", names,
allOf(hasSize(numberOfExtensionBeans),
+hasItem("qualifiedBean"), hasItem("unqualifiedBean")));
}
}
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: related to issue 41033: avoid API change
details: https://code.openbravo.com/erp/devel/pi/rev/e7f7f338f322
changeset: 36015:e7f7f338f322
user: Carlos Aristu openbravo.com>
date: Thu Jun 06 11:24:08 2019 +0200
summary: related to issue 41033: avoid API change
diffstat:
modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java |
9 ++---
1 files changed, 6 insertions(+), 3 deletions(-)
diffs (47 lines):
diff -r 2db86bead3d4 -r e7f7f338f322
modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java
---
a/modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java
Thu Jun 06 11:03:21 2019 +0200
+++
b/modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java
Thu Jun 06 11:24:08 2019 +0200
@@ -26,6 +26,7 @@
import javax.enterprise.inject.Any;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Inject;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -74,6 +75,8 @@
staticBeanManager = theBeanManager;
}
+ public static final AnnotationLiteral ANY_LITERAL =
Any.Literal.INSTANCE;
+
/**
* Method which uses the static instance of the bean manager cached in this
class. This method
* should only be used by objects which are not created by Weld. Objects
created by Weld should
@@ -84,7 +87,7 @@
@SuppressWarnings("unchecked")
public static T getInstanceFromStaticBeanManager(Class type) {
final BeanManager theBeanManager = getStaticInstanceBeanManager();
-final Set> beans = theBeanManager.getBeans(type,
Any.Literal.INSTANCE);
+final Set> beans = theBeanManager.getBeans(type, ANY_LITERAL);
for (Bean bean : beans) {
if (bean.getBeanClass() == type) {
return (T) theBeanManager.getReference(bean, type,
@@ -109,7 +112,7 @@
*/
@SuppressWarnings("unchecked")
public T getInstance(Class type) {
-final Set> beans = beanManager.getBeans(type,
Any.Literal.INSTANCE);
+final Set> beans = beanManager.getBeans(type, ANY_LITERAL);
for (Bean bean : beans) {
if (bean.getBeanClass() == type) {
return (T) beanManager.getReference(bean, type,
beanManager.createCreationalContext(bean));
@@ -124,7 +127,7 @@
@SuppressWarnings("unchecked")
public static List getInstances(Class type) {
final BeanManager beanManager = WeldUtils.getStaticInstanceBeanManager();
-final Set> beans = beanManager.getBeans(type,
Any.Literal.INSTANCE);
+final Set> beans = beanManager.getBeans(type, ANY_LITERAL);
final List instances = new ArrayList<>();
for (Bean bean : beans) {
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: related to issue 41033: fix javadoc wrong text
details: https://code.openbravo.com/erp/devel/pi/rev/2db86bead3d4
changeset: 36014:2db86bead3d4
user: Carlos Aristu openbravo.com>
date: Thu Jun 06 11:03:21 2019 +0200
summary: related to issue 41033: fix javadoc wrong text
diffstat:
modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/UnqualifiedBean.java
| 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 6061bd189bd1 -r 2db86bead3d4
modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/UnqualifiedBean.java
---
a/modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/UnqualifiedBean.java
Thu Jun 06 11:01:58 2019 +0200
+++
b/modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/UnqualifiedBean.java
Thu Jun 06 11:03:21 2019 +0200
@@ -19,7 +19,7 @@
package org.openbravo.base.weld.test.testinfrastructure;
-/** Simple qualified bean without a qualifier */
+/** Simple bean without a qualifier */
public class UnqualifiedBean extends ExtensionBean {
@Override
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: related to issue 41033: add missing test classes
details: https://code.openbravo.com/erp/devel/pi/rev/6061bd189bd1
changeset: 36013:6061bd189bd1
user: Carlos Aristu openbravo.com>
date: Thu Jun 06 11:01:58 2019 +0200
summary: related to issue 41033: add missing test classes
diffstat:
modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/ExtensionBean.java
| 27
modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/QualifiedBean.java
| 33 ++
modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/UnqualifiedBean.java
| 30 +
3 files changed, 90 insertions(+), 0 deletions(-)
diffs (102 lines):
diff -r 7148f9e42956 -r 6061bd189bd1
modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/ExtensionBean.java
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++
b/modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/ExtensionBean.java
Thu Jun 06 11:01:58 2019 +0200
@@ -0,0 +1,27 @@
+/*
+ *
+ * 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.base.weld.test.testinfrastructure;
+
+/** Simple abstract bean */
+public abstract class ExtensionBean {
+
+ public abstract String getName();
+
+}
diff -r 7148f9e42956 -r 6061bd189bd1
modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/QualifiedBean.java
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++
b/modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/QualifiedBean.java
Thu Jun 06 11:01:58 2019 +0200
@@ -0,0 +1,33 @@
+/*
+ *
+ * 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.base.weld.test.testinfrastructure;
+
+import org.openbravo.client.kernel.ComponentProvider.Qualifier;
+
+/** Simple qualified bean */
+@Qualifier("")
+public class QualifiedBean extends ExtensionBean {
+
+ @Override
+ public String getName() {
+return "qualifiedBean";
+ }
+
+}
diff -r 7148f9e42956 -r 6061bd189bd1
modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/UnqualifiedBean.java
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++
b/modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/UnqualifiedBean.java
Thu Jun 06 11:01:58 2019 +0200
@@ -0,0 +1,30 @@
+/*
+ *
+ * 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
[OpenbravoERP-commits] devel/pi: 3 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/aebfddd2027d
changeset: 36010:aebfddd2027d
user: Carlos Aristu openbravo.com>
date: Thu Jun 06 10:34:38 2019 +0200
summary: fixes bug 41033: ImportEntryPreProcessors with qualifiers are not
executed
As part of the refactor to provide the ImportEntryBuilder[1], the injection
of the import entry preprocessors was changed. As the instances of that class
are created outside of the Weld scope, the preprocessors are injected using
"WeldUtils.getInstances()" method instead of using @Inject.
The problem here is that "WeldUtils.getInstances()" looked for all beans of
an specific type that does not have a qualifier. For this reason, import entry
preprocessors with qualifiers were not being found and, therefore, not executed
by the ImportEntryBuilder before creating the import entry.
To fix this problem now "WeldUtils.getInstances()" has been changed in order
to look for any bean of a particular type (regardless of whether it is
qualified or not). This is done by specifying the @Any qualifier to the
"BeanManager.getBeans()" method.
Thus, now WeldUtils.getInstances() behaves exactly in the same way as when
using @Inject together with @Any when we are inside the scope of Weld.
[1]
https://code.openbravo.com/erp/devel/pi/rev/90c48060859cc70935add00e77e8065dedb197cc
details: https://code.openbravo.com/erp/devel/pi/rev/3f43ae2410c8
changeset: 36011:3f43ae2410c8
user: Carlos Aristu openbravo.com>
date: Thu Jun 06 10:58:49 2019 +0200
summary: related to issue 41033: code improvements
- Use Any AnnotationLiteral (available since CDI 2.0)
- Use diamond operator
- Remove unused injection of ImportEntryPreProcessor in the
ImportEntryManager (they are used in the ImportEntryBuilder)
details: https://code.openbravo.com/erp/devel/pi/rev/7148f9e42956
changeset: 36012:7148f9e42956
user: Carlos Aristu openbravo.com>
date: Thu Jun 06 10:59:01 2019 +0200
summary: related to issue 41033: add test cases
diffstat:
modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/CdiInfrastructure.java
| 39 +-
modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java
| 15 +--
src/org/openbravo/service/importprocess/ImportEntryManager.java
| 4 -
3 files changed, 43 insertions(+), 15 deletions(-)
diffs (155 lines):
diff -r f395c484a710 -r 7148f9e42956
modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/CdiInfrastructure.java
---
a/modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/CdiInfrastructure.java
Wed Jun 05 23:51:37 2019 +
+++
b/modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/testinfrastructure/CdiInfrastructure.java
Thu Jun 06 10:59:01 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) 2015 Openbravo SLU
+ * All portions are Copyright (C) 2015-2019 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -22,12 +22,22 @@
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.hasSize;
+import static
org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
import static org.junit.Assert.assertThat;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
import javax.inject.Inject;
import org.jboss.arquillian.junit.InSequence;
import org.junit.Test;
+import org.openbravo.base.weld.WeldUtils;
import org.openbravo.base.weld.test.WeldBaseTest;
/**
@@ -48,12 +58,17 @@
@Inject
private RequestScopedBean requestBean;
+ @Inject
+ @Any
+ private Instance extensionBeans;
+
/** beans are correctly injected */
@Test
public void beansAreInjected() {
assertThat("application bean is injected", applicationBean,
notNullValue());
assertThat("session bean is injected", sessionBean, notNullValue());
assertThat("request bean is injected", requestBean, notNullValue());
+assertThat("beans are injected with @Any", extensionBeans.isUnsatisfied(),
equalTo(false));
}
/** starts application and session scopes */
@@ -77,4 +92,26 @@
assertThat(sessionBean.getValue(), equalTo("session"));
assertThat(requestBean.getValue(), nullValue());
}
+
+ /** get any instance of a particular bean type */
+ @Test
+ public void
[OpenbravoERP-commits] devel/main: 4 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/9c31b62de9a2 changeset: 36005: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/main/rev/3365dc61940e changeset: 36006: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 details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/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 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 +-
[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/main: 5 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/b03c10e80c92 changeset: 36000:b03c10e80c92 user: Nono Carballo gmail.com> date: Mon Jun 03 16:53:26 2019 -0400 summary: Fixes issue 40975: Updates conversion rates on payment date changes A new function was defined for onChange event in Payment Date parameter, to update conversion rates when payment date changes. details: https://code.openbravo.com/erp/devel/main/rev/014ef9ca9806 changeset: 36001:014ef9ca9806 user: Nono Carballo gmail.com> date: Wed May 01 22:53:24 2019 -0400 summary: Fixes issue 40574: Uses bind parameter. Instead of string concatenation, bind parameter is used to build the query. details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/rev/1287606da0c8 changeset: 36003:1287606da0c8 user: Asier Lostalé openbravo.com> date: Wed Jun 05 16:15:03 2019 +0200 summary: fixed issue 41032: ad_session.updated is not updated after inactivating session details: https://code.openbravo.com/erp/devel/main/rev/a8037910e3ad changeset: 36004:a8037910e3ad user: RM packaging bot openbravo.com> date: Wed Jun 05 18:40:24 2019 + summary: CI: update AD_MODULE to version 36003 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 +-
[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: fixed issue 41032: ad_session.updated is not updated a...
details: https://code.openbravo.com/erp/devel/pi/rev/1287606da0c8 changeset: 36003:1287606da0c8 user: Asier Lostalé openbravo.com> date: Wed Jun 05 16:15:03 2019 +0200 summary: fixed issue 41032: ad_session.updated is not updated after inactivating session diffstat: src/org/openbravo/erpCommon/security/SessionLogin_data.xsql | 8 +--- 1 files changed, 5 insertions(+), 3 deletions(-) diffs (32 lines): diff -r e6f834be7a9d -r 1287606da0c8 src/org/openbravo/erpCommon/security/SessionLogin_data.xsql --- a/src/org/openbravo/erpCommon/security/SessionLogin_data.xsql Wed Jun 05 11:40:40 2019 + +++ b/src/org/openbravo/erpCommon/security/SessionLogin_data.xsql Wed Jun 05 16:15:03 2019 +0200 @@ -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-2017 Openbravo SLU + * All portions are Copyright (C) 2001-2019 Openbravo SLU * All Rights Reserved. * Contributor(s): __. @@ -30,7 +30,8 @@ @@ -39,7 +40,8 @@
[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/main: 5 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/1fddb0a46a5b changeset: 35995:1fddb0a46a5b user: Nono Carballo gmail.com> date: Thu May 09 14:52:16 2019 -0400 summary: Fixes issue 40646: Escapes properly HTML characters. Instead of escape HTML characters manually, a function to do so is used. details: https://code.openbravo.com/erp/devel/main/rev/49221a5152f2 changeset: 35996:49221a5152f2 user: Carlos Aristu openbravo.com> date: Tue Jun 04 17:06:14 2019 +0200 summary: fixes bug 41007: Don't open pickers of date range filter when pressing enter In the standard form view there is no shortcut to open the calendar picker. The date fields of the date range filter pop-up should behave in the same way. details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/rev/8ca50f74a19d changeset: 35998:8ca50f74a19d user: Nono Carballo gmail.com> date: Fri May 31 14:49:20 2019 -0400 summary: Fixes issue 40965: Update audit info when creating reversal payment The reversal payment is generated as a copy of the original payment. After the creation of the reversal payment, audit information is updated. details: https://code.openbravo.com/erp/devel/main/rev/8e20cc58f41d changeset: 35999:8e20cc58f41d user: RM packaging bot openbravo.com> date: Wed Jun 05 11:26:42 2019 + summary: CI: update AD_MODULE to version 35998 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 | 20 +++- 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
[OpenbravoERP-commits] devel/pi: Fixes issue 40574: Uses bind parameter.
details: https://code.openbravo.com/erp/devel/pi/rev/014ef9ca9806
changeset: 36000:014ef9ca9806
user: Nono Carballo gmail.com>
date: Wed May 01 22:53:24 2019 -0400
summary: Fixes issue 40574: Uses bind parameter.
Instead of string concatenation, bind parameter is used to build the query.
diffstat:
src/org/openbravo/erpCommon/ad_actionButton/SequenceProductCreate.java | 6
+++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (24 lines):
diff -r b03c10e80c92 -r 014ef9ca9806
src/org/openbravo/erpCommon/ad_actionButton/SequenceProductCreate.java
--- a/src/org/openbravo/erpCommon/ad_actionButton/SequenceProductCreate.java
Mon Jun 03 16:53:26 2019 -0400
+++ b/src/org/openbravo/erpCommon/ad_actionButton/SequenceProductCreate.java
Wed May 01 22:53:24 2019 -0400
@@ -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) 2011-2018 Openbravo SLU
+ * All portions are Copyright (C) 2011-2019 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -194,9 +194,9 @@
}
private static Long getLineNum(String SequenceId) throws Exception {
-String hql = " SELECT COALESCE(MAX(l.lineNo),0)+10 AS DefaultValue FROM
ManufacturingOperationProduct l WHERE l.mASequence.id= '"
-+ SequenceId + "'";
+String hql = " SELECT COALESCE(MAX(l.lineNo),0)+10 AS DefaultValue FROM
ManufacturingOperationProduct l WHERE l.mASequence.id= :sequenceId";
Query q = OBDal.getInstance().getSession().createQuery(hql,
Long.class);
+q.setParameter("sequenceId", SequenceId);
try {
Long result = q.uniqueResult();
return result == null ? 0L : result;
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes issue 40975: Updates conversion rates on payment...
details: https://code.openbravo.com/erp/devel/pi/rev/b03c10e80c92
changeset: 35999:b03c10e80c92
user: Nono Carballo gmail.com>
date: Mon Jun 03 16:53:26 2019 -0400
summary: Fixes issue 40975: Updates conversion rates on payment date changes
A new function was defined for onChange event in Payment Date parameter, to
update conversion rates when payment date changes.
diffstat:
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
2 files changed, 5 insertions(+), 0 deletions(-)
diffs (25 lines):
diff -r 8ca50f74a19d -r b03c10e80c92
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
Fri May 31 14:49:20 2019 -0400
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
Mon Jun 03 16:53:26 2019 -0400
@@ -2193,6 +2193,7 @@
+
diff -r 8ca50f74a19d -r b03c10e80c92
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
Fri May 31 14:49:20 2019 -0400
+++
b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
Mon Jun 03 16:53:26 2019 -0400
@@ -226,6 +226,10 @@
OB.APRM.AddPayment.recalcDisplayLogicOrReadOnlyLogic(form, view,
affectedParams);
};
+OB.APRM.AddPayment.paymentDateOnChange = function (item, view, form, grid) {
+ OB.APRM.AddPayment.paymentMethodMulticurrency(view, form, true);
+};
+
OB.APRM.AddPayment.paymentMethodOnChange = function (item, view, form, grid) {
var ordinvgrid = form.getItem('order_invoice').canvas.viewGrid,
defaultFilter = ordinvgrid.filterEditor.getEditForm().getValues(),
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes issue 40965: Update audit info when creating rev...
details: https://code.openbravo.com/erp/devel/pi/rev/8ca50f74a19d
changeset: 35998:8ca50f74a19d
user: Nono Carballo gmail.com>
date: Fri May 31 14:49:20 2019 -0400
summary: Fixes issue 40965: Update audit info when creating reversal payment
The reversal payment is generated as a copy of the original payment. After
the creation of the reversal payment, audit information is updated.
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
| 20 +-
1 files changed, 19 insertions(+), 1 deletions(-)
diffs (100 lines):
diff -r 1e6839146494 -r 8ca50f74a19d
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
Tue Jun 04 16:04:47 2019 +
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
Fri May 31 14:49:20 2019 -0400
@@ -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): __.
*
@@ -21,6 +21,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@@ -39,6 +40,7 @@
import org.openbravo.advpaymentmngt.utility.FIN_Utility;
import org.openbravo.base.exception.OBException;
import org.openbravo.base.provider.OBProvider;
+import org.openbravo.base.structure.BaseOBObject;
import org.openbravo.base.weld.WeldUtils;
import org.openbravo.client.kernel.RequestContext;
import org.openbravo.dal.core.DalUtil;
@@ -73,6 +75,9 @@
public BigDecimal ZERO = BigDecimal.ZERO;
static Logger log4j = LogManager.getLogger();
+ private static final String CREATED_BY_PROPERTY = "createdBy";
+ private static final String CREATION_DATE_PROPERTY = "creationDate";
+
@Override
public void execute(ProcessBundle bundle) throws Exception {
@@ -514,6 +519,9 @@
// ***
} else if (strAction.equals("RV")) {
FIN_Payment reversedPayment = (FIN_Payment) DalUtil.copy(payment,
false);
+final Calendar calendar = Calendar.getInstance();
+final Date now = calendar.getTime();
+updateAuditInformation(reversedPayment, now);
OBContext.setAdminMode();
try {
if (BigDecimal.ZERO.compareTo(payment.getGeneratedCredit()) != 0
@@ -550,6 +558,7 @@
for (FIN_PaymentDetail pd : payment.getFINPaymentDetailList()) {
FIN_PaymentDetail reversedPaymentDetail = (FIN_PaymentDetail)
DalUtil.copy(pd, false);
+updateAuditInformation(reversedPaymentDetail, now);
reversedPaymentDetail.setFinPayment(reversedPayment);
reversedPaymentDetail.setAmount(pd.getAmount().negate());
reversedPaymentDetail.setWriteoffAmount(pd.getWriteoffAmount().negate());
@@ -605,6 +614,7 @@
// If invoice is fully paid create a new schedule detail.
FIN_PaymentScheduleDetail openPSD =
(FIN_PaymentScheduleDetail) DalUtil.copy(psd,
false);
+ updateAuditInformation(openPSD, now);
openPSD.setPaymentDetails(null);
// Amounts
openPSD.setWriteoffAmount(BigDecimal.ZERO);
@@ -617,6 +627,7 @@
FIN_PaymentScheduleDetail reversedPaymentSchedDetail =
(FIN_PaymentScheduleDetail) DalUtil
.copy(psd, false);
+ updateAuditInformation(reversedPaymentSchedDetail, now);
reversedPaymentSchedDetail.setPaymentDetails(reversedPaymentDetail);
// Amounts
reversedPaymentSchedDetail.setWriteoffAmount(psd.getWriteoffAmount().negate());
@@ -647,6 +658,7 @@
List reversedCredits = new
ArrayList();
for (FIN_Payment_Credit pc : credits) {
FIN_Payment_Credit reversedPaymentCredit = (FIN_Payment_Credit)
DalUtil.copy(pc, false);
+updateAuditInformation(reversedPaymentCredit, now);
reversedPaymentCredit.setAmount(pc.getAmount().negate());
reversedPaymentCredit.setCreditPaymentUsed(pc.getCreditPaymentUsed());
pc.getCreditPaymentUsed()
@@ -664,6 +676,7 @@
List conversions = new
ArrayList();
for (ConversionRateDoc cr :
payment.getCurrencyConversionRateDocList()) {
ConversionRateDoc reversedCR = (ConversionRateDoc)
DalUtil.copy(cr, false);
+updateAuditInformation(reversedCR, now);
[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/main: 2 new changesets
details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/rev/d62e2aa3c767 changeset: 35994:d62e2aa3c767 user: RM packaging bot openbravo.com> date: Tue Jun 04 15:49:36 2019 + summary: CI: update AD_MODULE to version 35993 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: fixes bug 41007: Don't open pickers of date range filt...
details: https://code.openbravo.com/erp/devel/pi/rev/49221a5152f2
changeset: 35995:49221a5152f2
user: Carlos Aristu openbravo.com>
date: Tue Jun 04 17:06:14 2019 +0200
summary: fixes bug 41007: Don't open pickers of date range filter when
pressing enter
In the standard form view there is no shortcut to open the calendar picker.
The date fields of the date range filter pop-up should behave in the same way.
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js
| 9 -
1 files changed, 0 insertions(+), 9 deletions(-)
diffs (19 lines):
diff -r 1fddb0a46a5b -r 49221a5152f2
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js
Thu May 09 14:52:16 2019 -0400
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js
Tue Jun 04 17:06:14 2019 +0200
@@ -242,15 +242,6 @@
});
isc.OBRelativeDateItem.changeDefaults('valueFieldDefaults', {
- keyPress: function (item, form, keyName, characterValue) {
-if (keyName === 'Enter' && !isc.EventHandler.ctrlKeyDown() &&
!isc.EventHandler.altKeyDown() && !isc.EventHandler.shiftKeyDown()) {
- // canvasItem is the rangeItem
- form.canvasItem.showPicker();
- return false;
-}
-return true;
- },
-
init: function () {
this.icons = [{
width: this.calendarIconWidth,
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes issue 40646: Escapes properly HTML characters.
details: https://code.openbravo.com/erp/devel/pi/rev/1fddb0a46a5b
changeset: 35994:1fddb0a46a5b
user: Nono Carballo gmail.com>
date: Thu May 09 14:52:16 2019 -0400
summary: Fixes issue 40646: Escapes properly HTML characters.
Instead of escape HTML characters manually, a function to do so is used.
diffstat:
src/org/openbravo/erpCommon/info/Account.java | 19 ++
src/org/openbravo/erpCommon/info/AccountElementValue.java | 19 ++
src/org/openbravo/erpCommon/info/BusinessPartner.java | 19 ++
src/org/openbravo/erpCommon/info/BusinessPartnerMultiple.java | 19 ++
src/org/openbravo/erpCommon/info/DebtPayment.java | 19 ++
src/org/openbravo/erpCommon/info/DocTypeMultiple.java | 19 ++
src/org/openbravo/erpCommon/info/Invoice.java | 19 ++
src/org/openbravo/erpCommon/info/InvoiceLine.java | 19 ++
src/org/openbravo/erpCommon/info/Locator.java | 19 ++
src/org/openbravo/erpCommon/info/LocatorMultiple.java | 19 ++
src/org/openbravo/erpCommon/info/Product.java | 19 ++
src/org/openbravo/erpCommon/info/ProductComplete.java | 19 ++
src/org/openbravo/erpCommon/info/ProductMultiple.java | 19 ++
src/org/openbravo/erpCommon/info/Project.java | 19 ++
src/org/openbravo/erpCommon/info/ProjectMultiple.java | 19 ++
src/org/openbravo/erpCommon/info/SalesOrder.java | 19 ++
src/org/openbravo/erpCommon/info/SalesOrderLine.java | 19 ++
src/org/openbravo/erpCommon/info/ShipmentReceipt.java | 19 ++
src/org/openbravo/erpCommon/info/ShipmentReceiptLine.java | 19 ++
19 files changed, 76 insertions(+), 285 deletions(-)
diffs (truncated from 893 to 300 lines):
diff -r 98b6ff97783d -r 1fddb0a46a5b
src/org/openbravo/erpCommon/info/Account.java
--- a/src/org/openbravo/erpCommon/info/Account.java Tue Jun 04 10:03:45
2019 +
+++ b/src/org/openbravo/erpCommon/info/Account.java Thu May 09 14:52:16
2019 -0400
@@ -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-2016 Openbravo SLU
+ * All portions are Copyright (C) 2001-2019 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.StringEscapeUtils;
import org.openbravo.base.filter.RequestFilter;
import org.openbravo.base.filter.ValueListFilter;
import org.openbravo.base.secureApp.HttpSecureAppServlet;
@@ -471,24 +472,12 @@
if (headers[k].getField("adReferenceId").equals("32")) {
strRowsData.append(strReplaceWith).append("/images/");
}
-strRowsData.append(data[j].getField(columnname)
-.replaceAll("", "")
-.replaceAll("", "")
-.replaceAll("", "")
-.replaceAll("", "")
-.replaceAll("", "")
-.replaceAll("", "")
-.replaceAll("", "")
-.replaceAll("", "")
-.replaceAll("", "")
-.replaceAll("", "")
-.replaceAll("", "")
-.replaceAll("", ""));
+
strRowsData.append(StringEscapeUtils.escapeHtml(data[j].getField(columnname)));
} else {
if (headers[k].getField("adReferenceId").equals("32")) {
strRowsData.append(strReplaceWith).append("/images/blank.gif");
} else {
- strRowsData.append("");
+ strRowsData.append(StringEscapeUtils.escapeHtml(""));
}
}
strRowsData.append("]]>\n");
diff -r 98b6ff97783d -r 1fddb0a46a5b
src/org/openbravo/erpCommon/info/AccountElementValue.java
--- a/src/org/openbravo/erpCommon/info/AccountElementValue.java Tue Jun 04
10:03:45 2019 +
+++ b/src/org/openbravo/erpCommon/info/AccountElementValue.java Thu May 09
14:52:16 2019 -0400
@@ -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-2016 Openbravo SLU
+ * All portions are Copyright (C) 2009-2019 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.StringEscapeUtils;
import
[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/main: 2 new changesets
details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/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 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/main: 37 new changesets
details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/rev/eb9f7516347d changeset: 35955:eb9f7516347d user: Álvaro Ferraz openbravo.com> date: Thu Jan 31 13:04:31 2019 +0100 summary: [CrossStore] Use setAdminMode(false) in AdvPaymentMngtDao details: https://code.openbravo.com/erp/devel/main/rev/c9b26a80d323 changeset: 35956:c9b26a80d323 user: Álvaro Ferraz openbravo.com> date: Fri Feb 01 15:12:40 2019 +0100 summary: [CrossStore] Allow crossOrg in M_InOut.C_DocType_ID details: https://code.openbravo.com/erp/devel/main/rev/06b19c040a30 changeset: 35957:06b19c040a30 user: Álvaro Ferraz openbravo.com> date: Fri Feb 01 15:13:26 2019 +0100 summary: [CrossStore] Allow crossOrg in M_InOut.M_Warehouse_ID details: https://code.openbravo.com/erp/devel/main/rev/a00dee7926bd changeset: 35958:a00dee7926bd user: Álvaro Ferraz openbravo.com> date: Tue Feb 05 17:57:02 2019 +0100 summary: [CrossStore] Do not allow crossOrg in M_InOut.C_DocType_ID details: https://code.openbravo.com/erp/devel/main/rev/e4b959597243 changeset: 35959:e4b959597243 user: Armaignac gmail.com> date: Mon Feb 11 22:42:59 2019 -0500 summary: [CrossStore] Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/34b368e164d6 changeset: 35960:34b368e164d6 user: Armaignac gmail.com> date: Wed Feb 13 00:16:12 2019 -0500 summary: [CrossStore] Set crossOrgReference in FIN_AddPayment details: https://code.openbravo.com/erp/devel/main/rev/edd96243f21b changeset: 35961:edd96243f21b user: Armaignac gmail.com> date: Wed Feb 13 00:24:53 2019 -0500 summary: [CrossStore]Allow crossOrg in CreatedBy and UpdatedBy columns The Allow Cross Organization Reference from columns Created By and Updated By in C_Order, C_OrderLine, M_InOut and M_InoutLine was set to true details: https://code.openbravo.com/erp/devel/main/rev/d33a8362615a changeset: 35962:d33a8362615a user: Álvaro Ferraz openbravo.com> date: Fri Feb 15 13:13:06 2019 +0100 summary: [CrossStore] Revert crossOrgReference enable in FIN_AddPayment details: https://code.openbravo.com/erp/devel/main/rev/07f24677dba4 changeset: 35963:07f24677dba4 user: Álvaro Ferraz openbravo.com> date: Fri Feb 15 13:14:20 2019 +0100 summary: [CrossStore] Revert crossOrgReference enable in CreatedBy and UpdatedBy columns details: https://code.openbravo.com/erp/devel/main/rev/e3c8c3c7c6b7 changeset: 35964:e3c8c3c7c6b7 user: Álvaro Ferraz openbravo.com> date: Fri Feb 15 15:32:45 2019 +0100 summary: [CrossStore] Enable crossOrgReference in multiple columns: C_Order.updatedBy C_OrderLine.updatedBy FIN_Payment_ScheduleDetail.updatedBy FIN_Payment_Schedule.updatedBy MaterialMgmtShipmentInOut.createdBy MaterialMgmtShipmentInOut.updatedBy details: https://code.openbravo.com/erp/devel/main/rev/e87315ebec90 changeset: 35965:e87315ebec90 user: Álvaro Ferraz openbravo.com> date: Mon Feb 18 15:20:18 2019 +0100 summary: [CrossStore] Do not check warehouse when processing order or shipment details: https://code.openbravo.com/erp/devel/main/rev/9fa4111b104a changeset: 35966:9fa4111b104a user: Álvaro Ferraz openbravo.com> date: Mon Feb 18 23:26:30 2019 +0100 summary: [CrossStore] Enable crossOrgReference in multiple columns: BusinessPartner.updatedBy Invoice.updatedBy details: https://code.openbravo.com/erp/devel/main/rev/2377ddab7b4e changeset: 35967:2377ddab7b4e user: Armaignac gmail.com> date: Tue Feb 19 01:13:44 2019 -0500 summary: [CrossStore] Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/db0df3a406a9 changeset: 35968:db0df3a406a9 user: Álvaro Ferraz openbravo.com> date: Tue Feb 19 13:46:52 2019 +0100 summary: [CrossStore] Enable crossOrgReference in multiple columns: C_BPartner.UpdatedBy C_Invoice.CreatedBy C_Invoice.SalesRep_ID C_Invoice.UpdatedBy C_InvoiceLine.CreatedBy C_InvoiceLine.UpdatedBy C_Order.CreatedBy C_Order.M_Warehouse_ID C_Order.SalesRep_ID C_Order.UpdatedBy C_OrderLine.CreatedBy C_OrderLine.M_Warehouse_ID C_OrderLine.UpdatedBy FIN_Payment_Schedule.Createdby FIN_Payment_Schedule.Updatedby FIN_Payment_ScheduleDetail.Createdby FIN_Payment_ScheduleDetail.Updatedby M_InOut.CreatedBy M_InOut.M_Warehouse_ID M_InOut.SalesRep_ID M_InOut.UpdatedBy M_InOutLine.CreatedBy M_InOutLine.UpdatedBy M_Transaction.CreatedBy M_Transaction.UpdatedBy details: https://code.openbravo.com/erp/devel/main/rev/9dba31cce8d2 changeset: 35969:9dba31cce8d2 user: Álvaro Ferraz openbravo.com> date: Tue Feb 19 16:51:16 2019 +0100 summary: [CrossStore] Merge from PI details: https://code.openbravo.com/erp/devel/main/rev/f549aebf3931 changeset: 35970:f549aebf3931 user:
[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/main: 3 new changesets
details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/rev/5f50527d02b2 changeset: 35952:5f50527d02b2 user: Eduardo Becerra yahoo.com> date: Mon Jun 03 11:16:56 2019 +0200 summary: [Discount & Promo per Hour] Fixed dbconsistency (Remove "EM_OBPOS_ISCATEGORY" from "M_OFFER_TYPE.xml") details: https://code.openbravo.com/erp/devel/main/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 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
[OpenbravoERP-commits] devel/pi: [Discount & Promo per Hour] Fixed dbconsistency (Remov...
details: https://code.openbravo.com/erp/devel/pi/rev/5f50527d02b2 changeset: 35952:5f50527d02b2 user: Eduardo Becerra yahoo.com> date: Mon Jun 03 11:16:56 2019 +0200 summary: [Discount & Promo per Hour] Fixed dbconsistency (Remove "EM_OBPOS_ISCATEGORY" from "M_OFFER_TYPE.xml") diffstat: src-db/database/sourcedata/M_OFFER_TYPE.xml | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r dd4393b7793f -r 5f50527d02b2 src-db/database/sourcedata/M_OFFER_TYPE.xml --- a/src-db/database/sourcedata/M_OFFER_TYPE.xml Sun Jun 02 05:20:18 2019 + +++ b/src-db/database/sourcedata/M_OFFER_TYPE.xml Mon Jun 03 11:16:56 2019 +0200 @@ -8,7 +8,6 @@ - ___ 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/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/main: 11 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/73c8bbf59361 changeset: 35940:73c8bbf59361 user: Jorge Wederago openbravo.com> date: Fri Feb 22 10:42:24 2019 +0100 summary: [Discounts per Hour] Adding definitions to the Application Dictionary details: https://code.openbravo.com/erp/devel/main/rev/247d655ddf2a changeset: 35941:247d655ddf2a user: Eduardo Becerra yahoo.com> date: Fri May 03 12:42:18 2019 +0200 summary: [Discount & Promo per Hour] Hide availability for manual promotions details: https://code.openbravo.com/erp/devel/main/rev/23c490c575bf changeset: 35942:23c490c575bf user: Eduardo Becerra yahoo.com> date: Fri Dec 14 13:27:17 2018 +0100 summary: Promotions and Discount: Add pick and execute windows to select: Organizations, Product Categories and Products details: https://code.openbravo.com/erp/devel/main/rev/a10f96ebd6c5 changeset: 35943:a10f96ebd6c5 user: Eduardo Becerra yahoo.com> date: Mon May 06 10:04:56 2019 +0200 summary: [Discount & Promo per Hour] Change copyright information details: https://code.openbravo.com/erp/devel/main/rev/8be0898c186d changeset: 35944:8be0898c186d user: Eduardo Becerra yahoo.com> date: Mon May 06 10:14:49 2019 +0200 summary: [Discount & Promo per Hour] Set default values for week days details: https://code.openbravo.com/erp/devel/main/rev/de2b948e18b3 changeset: 35945:de2b948e18b3 user: Eduardo Becerra yahoo.com> date: Mon May 06 11:59:48 2019 +0200 summary: [Discount & Promo per Hour] Set default value for "ALLWEEKDAYS" details: https://code.openbravo.com/erp/devel/main/rev/e070c38e233e changeset: 35946:e070c38e233e user: Eduardo Becerra yahoo.com> date: Thu May 16 14:06:59 2019 +0200 summary: [Discount & Promo per Hour] Hide availability for manual promotions (Discount By Total) details: https://code.openbravo.com/erp/devel/main/rev/cb72b51da2d7 changeset: 35947:cb72b51da2d7 user: Eduardo Becerra yahoo.com> date: Fri May 17 13:15:16 2019 +0200 summary: [Discount & Promo per Hour] Hide availability for manual promotions (Payment Method Discount) details: https://code.openbravo.com/erp/devel/main/rev/9c49d692438c changeset: 35948:9c49d692438c user: Eduardo Becerra yahoo.com> date: Fri May 31 16:49:16 2019 +0200 summary: [Discount & Promo per Hour] Fixed dbconsistency problems details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/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 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 +-
[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/main: 2 new changesets
details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/rev/1355701c3858 changeset: 35939:1355701c3858 user: RM packaging bot openbravo.com> date: Fri May 31 16:42:10 2019 + summary: CI: update AD_MODULE to version 35938 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: [Discount & Promo per Hour] Fixed dbconsistency problems
details: https://code.openbravo.com/erp/devel/pi/rev/9c49d692438c changeset: 35947:9c49d692438c user: Eduardo Becerra yahoo.com> date: Fri May 31 16:49:16 2019 +0200 summary: [Discount & Promo per Hour] Fixed dbconsistency problems diffstat: src-db/database/sourcedata/AD_COLUMN.xml| 103 +-- src-db/database/sourcedata/AD_FIELD.xml | 56 +++--- src-db/database/sourcedata/M_OFFER_TYPE.xml |1 + 3 files changed, 94 insertions(+), 66 deletions(-) diffs (truncated from 386 to 300 lines): diff -r cb72b51da2d7 -r 9c49d692438c src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Fri May 17 13:15:16 2019 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Fri May 31 16:49:16 2019 +0200 @@ -249891,6 +249891,7 @@ + @@ -251990,6 +251991,7 @@ + @@ -253770,6 +253772,7 @@ + @@ -257105,6 +257108,7 @@ + @@ -257778,6 +257782,7 @@ + @@ -262723,6 +262728,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -262803,44 +262847,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -262877,6 +262883,7 @@ + @@ -264418,6 +264425,7 @@ + @@ -265410,6 +265418,7 @@ + @@ -270338,6 +270347,7 @@ + @@ -287707,6 +287717,7 @@ + @@ -294923,6 +294934,7 @@ + @@ -299830,6 +299842,7 @@ + @@ -299868,6 +299881,7 @@ + @@ -309472,6 +309486,7 @@ + @@ -317756,6 +317771,7 @@ + @@ -332128,6 +332144,7 @@ + @@ -338577,6 +338594,7 @@ + @@ -340154,6 +340172,7 @@ + @@ -344129,6 +344148,7 @@ + @@ -349202,6 +349222,7 @@ + @@ -351051,6 +351072,7 @@ + @@ -354095,6 +354117,7 @@ + @@ -388770,6 +388793,7 @@ + @@ -391331,6 +391355,7 @@ + @@ -392158,6 +392183,7 @@ + @@ -396941,6 +396967,7 @@ + ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: 8 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/73c8bbf59361 changeset: 35939:73c8bbf59361 user: Jorge Wederago openbravo.com> date: Fri Feb 22 10:42:24 2019 +0100 summary: [Discounts per Hour] Adding definitions to the Application Dictionary details: https://code.openbravo.com/erp/devel/pi/rev/247d655ddf2a changeset: 35940:247d655ddf2a user: Eduardo Becerra yahoo.com> date: Fri May 03 12:42:18 2019 +0200 summary: [Discount & Promo per Hour] Hide availability for manual promotions details: https://code.openbravo.com/erp/devel/pi/rev/23c490c575bf changeset: 35941:23c490c575bf user: Eduardo Becerra yahoo.com> date: Fri Dec 14 13:27:17 2018 +0100 summary: Promotions and Discount: Add pick and execute windows to select: Organizations, Product Categories and Products details: https://code.openbravo.com/erp/devel/pi/rev/a10f96ebd6c5 changeset: 35942:a10f96ebd6c5 user: Eduardo Becerra yahoo.com> date: Mon May 06 10:04:56 2019 +0200 summary: [Discount & Promo per Hour] Change copyright information details: https://code.openbravo.com/erp/devel/pi/rev/8be0898c186d changeset: 35943:8be0898c186d user: Eduardo Becerra yahoo.com> date: Mon May 06 10:14:49 2019 +0200 summary: [Discount & Promo per Hour] Set default values for week days details: https://code.openbravo.com/erp/devel/pi/rev/de2b948e18b3 changeset: 35944:de2b948e18b3 user: Eduardo Becerra yahoo.com> date: Mon May 06 11:59:48 2019 +0200 summary: [Discount & Promo per Hour] Set default value for "ALLWEEKDAYS" details: https://code.openbravo.com/erp/devel/pi/rev/e070c38e233e changeset: 35945:e070c38e233e user: Eduardo Becerra yahoo.com> date: Thu May 16 14:06:59 2019 +0200 summary: [Discount & Promo per Hour] Hide availability for manual promotions (Discount By Total) details: https://code.openbravo.com/erp/devel/pi/rev/cb72b51da2d7 changeset: 35946:cb72b51da2d7 user: Eduardo Becerra yahoo.com> date: Fri May 17 13:15:16 2019 +0200 summary: [Discount & Promo per Hour] Hide availability for manual promotions (Payment Method Discount) diffstat: src-db/database/model/tables/M_OFFER.xml | 127 + src-db/database/sourcedata/AD_COLUMN.xml | 994 ++ src-db/database/sourcedata/AD_ELEMENT.xml | 332 ++ src-db/database/sourcedata/AD_FIELD.xml | 1456 +- src-db/database/sourcedata/AD_FIELDGROUP.xml |10 + src-db/database/sourcedata/AD_MESSAGE.xml |96 + src-db/database/sourcedata/AD_REFERENCE.xml |36 + src-db/database/sourcedata/AD_TAB.xml |90 + src-db/database/sourcedata/AD_WINDOW.xml |45 + src-db/database/sourcedata/OBUIAPP_PARAMETER.xml |72 + src-db/database/sourcedata/OBUIAPP_PROCESS.xml |54 + src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml |27 + src/org/openbravo/common/actionhandler/OfferPickAndExecBaseActionHandler.java |83 + src/org/openbravo/common/actionhandler/OfferPickOrgActionHandler.java |48 + src/org/openbravo/common/actionhandler/OfferPickProductActionHandler.java |50 + src/org/openbravo/common/actionhandler/OfferPickProductCategoryActionHandler.java |50 + 16 files changed, 3568 insertions(+), 2 deletions(-) diffs (truncated from 4545 to 300 lines): diff -r 53465f460967 -r cb72b51da2d7 src-db/database/model/tables/M_OFFER.xml --- a/src-db/database/model/tables/M_OFFER.xml Fri May 31 12:32:25 2019 + +++ b/src-db/database/model/tables/M_OFFER.xml Fri May 17 13:15:16 2019 +0200 @@ -125,6 +125,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[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/main: 3 new changesets
details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/rev/313565b75f52 changeset: 35936:313565b75f52 user: Asier Lostalé openbravo.com> date: Fri May 31 10:01:20 2019 +0200 summary: fixed issue 40937: removed unused ApplicationDictionaryValidator class details: https://code.openbravo.com/erp/devel/main/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 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 +-
[OpenbravoERP-commits] devel/pi: fixed issue 40937: removed unused ApplicationDictionar...
details: https://code.openbravo.com/erp/devel/pi/rev/313565b75f52
changeset: 35936:313565b75f52
user: Asier Lostalé openbravo.com>
date: Fri May 31 10:01:20 2019 +0200
summary: fixed issue 40937: removed unused ApplicationDictionaryValidator
class
diffstat:
src/org/openbravo/service/system/ApplicationDictionaryValidator.java | 55
--
1 files changed, 0 insertions(+), 55 deletions(-)
diffs (59 lines):
diff -r ba77c69aebd6 -r 313565b75f52
src/org/openbravo/service/system/ApplicationDictionaryValidator.java
--- a/src/org/openbravo/service/system/ApplicationDictionaryValidator.java
Thu May 30 20:45:35 2019 +
+++ /dev/null Thu Jan 01 00:00:00 1970 +
@@ -1,55 +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) 2009-2010 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s): __.
-
- */
-
-package org.openbravo.service.system;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * This class validates several aspects of the application dictionary. The
application dictionary
- * itself is validated as well as the match between the application dictionary
and the database.
- *
- * @author mtaal
- */
-public class ApplicationDictionaryValidator {
-
- private List validators = new ArrayList();
-
- public ApplicationDictionaryValidator() {
-validators.add(new DatabaseValidator());
- }
-
- /**
- * Performs the validation using different validators. Returns the
validation results grouped by
- * type of validation.
- *
- * @return the validation result.
- */
- public Map validate() {
-final Map result = new HashMap();
-
-for (SystemValidator validator : validators) {
- result.put(validator.getCategory(), validator.validate());
-}
-return result;
- }
-}
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/main: 2 new changesets
details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/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 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/main: 4 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/05d253f229e4 changeset: 35929:05d253f229e4 user: Nono Carballo gmail.com> date: Thu May 23 14:30:35 2019 -0400 summary: Fixes issue 40863: Fixes cost calculation for voided receipt transaction When registering a transaction for a voided Goods Receipt or Shipment, the transaction cost is set to the original transaction cost. Also costs adjustments are created based on cost adjustment lines from original transaction. details: https://code.openbravo.com/erp/devel/main/rev/51cc50c5f11a changeset: 35930:51cc50c5f11a user: Nono Carballo gmail.com> date: Thu May 30 10:25:37 2019 +0200 summary: Fixes issue 40908. Increase presicion to avoid diferences. The presicion was increased to avoid unnecessary diferences when converting between currencies. details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/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 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 +-
[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/main: 2 new changesets
details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/rev/528d21b1731d changeset: 35928:528d21b1731d user: RM packaging bot openbravo.com> date: Thu May 30 08:56:16 2019 + summary: CI: update AD_MODULE to version 35927 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: Fixes issue 40908. Increase presicion to avoid diferen...
details: https://code.openbravo.com/erp/devel/pi/rev/51cc50c5f11a
changeset: 35929:51cc50c5f11a
user: Nono Carballo gmail.com>
date: Thu May 30 10:25:37 2019 +0200
summary: Fixes issue 40908. Increase presicion to avoid diferences.
The presicion was increased to avoid unnecessary diferences when converting
between currencies.
diffstat:
src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 05d253f229e4 -r 51cc50c5f11a
src/org/openbravo/erpCommon/ad_forms/AcctServer.java
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Thu May 23
14:30:35 2019 -0400
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Thu May 30
10:25:37 2019 +0200
@@ -2911,7 +2911,7 @@
if (multiply) {
return amount.multiply(conversionRateDoc.getRate());
} else {
- return amount.divide(conversionRateDoc.getRate(), 6,
RoundingMode.HALF_EVEN);
+ return amount.divide(conversionRateDoc.getRate(), 12,
RoundingMode.HALF_EVEN);
}
}
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes issue 40863: Fixes cost calculation for voided r...
details: https://code.openbravo.com/erp/devel/pi/rev/05d253f229e4
changeset: 35928:05d253f229e4
user: Nono Carballo gmail.com>
date: Thu May 23 14:30:35 2019 -0400
summary: Fixes issue 40863: Fixes cost calculation for voided receipt
transaction
When registering a transaction for a voided Goods Receipt or Shipment, the
transaction cost is set to the original transaction cost. Also costs adjustments
are created based on cost adjustment lines from original transaction.
diffstat:
src-test/src/org/openbravo/test/costing/TestCostingNoSourceAdjustments.java |
31 +--
src/org/openbravo/costing/CostingAlgorithm.java |
5 +-
src/org/openbravo/costing/CostingServer.java|
41 +-
3 files changed, 64 insertions(+), 13 deletions(-)
diffs (209 lines):
diff -r aad48da6ff1e -r 05d253f229e4
src-test/src/org/openbravo/test/costing/TestCostingNoSourceAdjustments.java
---
a/src-test/src/org/openbravo/test/costing/TestCostingNoSourceAdjustments.java
Thu May 30 02:01:07 2019 +
+++
b/src-test/src/org/openbravo/test/costing/TestCostingNoSourceAdjustments.java
Thu May 23 14:30:35 2019 -0400
@@ -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): __.
@@ -1099,6 +1099,7 @@
final BigDecimal price2 = new BigDecimal("30.00");
final BigDecimal quantity1 = new BigDecimal("180");
final BigDecimal quantity2 = new BigDecimal("80");
+final BigDecimal half = new BigDecimal("0.5");
try {
@@ -1128,7 +1129,8 @@
TestCostingUtils.runPriceBackground();
// Cancel goods shipment
- ShipmentInOut goodsShipment2 =
TestCostingUtils.cancelGoodsShipment(goodsShipment1, price2);
+ ShipmentInOut goodsShipment2 =
TestCostingUtils.cancelGoodsShipment(goodsShipment1,
+ price2.multiply(half));
// Assert product transactions
List productTransactionAssertList = new
ArrayList();
@@ -1143,7 +1145,7 @@
productTransactionAssertList.add(new
ProductTransactionAssert(OBDal.getInstance()
.get(ShipmentInOut.class, goodsShipment2.getId())
.getMaterialMgmtShipmentInOutLineList()
- .get(0), price2, price2, true));
+ .get(0), price2.multiply(half), price2, true));
TestCostingUtils.assertProductTransaction(product.getId(),
productTransactionAssertList);
// Assert product costing
@@ -1152,8 +1154,9 @@
List productCostingAssertList = new
ArrayList();
productCostingAssertList
.add(new ProductCostingAssert(transactionList.get(0), price2,
price1, price2, quantity1));
- productCostingAssertList
- .add(new ProductCostingAssert(transactionList.get(2), price2, null,
price2, quantity1));
+ productCostingAssertList.add(new
ProductCostingAssert(transactionList.get(2), price2,
+
TestCostingUtils.getProductCostings(product.getId()).get(1).getOriginalCost(),
price2,
+ quantity1));
TestCostingUtils.assertProductCosting(product.getId(),
productCostingAssertList);
// Assert cost adjustment
@@ -1165,6 +1168,10 @@
costAdjustmentAssertLineList.add(new
CostAdjustmentAssert(transactionList.get(1), "PDC",
quantity2.multiply(price2).add(quantity2.multiply(price1).negate()),
day2, false));
costAdjustmentAssertList.add(costAdjustmentAssertLineList);
+ List costAdjustmentAssertLineList1 = new
ArrayList();
+ costAdjustmentAssertLineList1.add(new
CostAdjustmentAssert(transactionList.get(2), "PDC",
+ quantity2.multiply(price2).add(quantity2.multiply(price1).negate()),
day2, true));
+ costAdjustmentAssertList.add(costAdjustmentAssertLineList1);
TestCostingUtils.assertCostAdjustment(costAdjustmentList,
costAdjustmentAssertList);
// Post cost adjustment 1 and assert it
@@ -1308,6 +1315,7 @@
final BigDecimal price1 = new BigDecimal("15.00");
final BigDecimal price2 = new BigDecimal("7.50");
final BigDecimal quantity1 = new BigDecimal("180");
+final BigDecimal two = new BigDecimal("2");
try {
@@ -1333,14 +1341,15 @@
TestCostingUtils.runPriceBackground();
// Cancel goods receipt
- ShipmentInOut goodsReceipt2 =
TestCostingUtils.cancelGoodsReceipt(goodsReceipt1, price2);
+ ShipmentInOut goodsReceipt2 =
TestCostingUtils.cancelGoodsReceipt(goodsReceipt1,
+ price2.multiply(two));
// Assert product transactions
List productTransactionAssertList = new
ArrayList();
productTransactionAssertList.add(new
ProductTransactionAssert(OBDal.getInstance()
[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/main: 6 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/268662168c37 changeset: 35921:268662168c37 user: Carlos Aristu openbravo.com> date: Wed May 29 13:56:33 2019 +0200 summary: fixes bug 40723: Client validation skipped in P grids without select column The client validations done to ensure that mandatory fields in a P grid are populated before executing a process were not being executed for those grids that does not allow selection. This is because validations were done just for the selected records of the P grid. Now we validate all the records in case the P grid does not allow selection. details: https://code.openbravo.com/erp/devel/main/rev/1924cce570cd changeset: 35922:1924cce570cd user: Augusto Mauch openbravo.com> date: Wed May 29 16:29:58 2019 +0200 summary: Related with issue 40264: Include function name in warning message details: https://code.openbravo.com/erp/devel/main/rev/c220c40da810 changeset: 35923:c220c40da810 user: Carlos Aristu openbravo.com> date: Wed May 29 17:28:40 2019 +0200 summary: fixes bug 40969: Max call stack size error in P grids that allow addition P grids have specific code to prevent hiding the inline editor of the grid when not all mandatory fields of a new record being added are populated. When this happens, the standard "hideInlineEditor" function of Smartclient's ListGrid is not executed, preventing the clearing of the "_editorShowing" flag. If this flag is not cleared and afterwards the "showInlineEditor" is invoked the maximum call stack size error appears because the function enters into a recursive loop. To fix this problem we now also prevent the execution of the "showInlineEditor" function when not all mandatory fields of a new record being added are populated. Exactly the same logic that the "hideInlineEditor" function of P grids already has. details: https://code.openbravo.com/erp/devel/main/rev/7b1f1a487277 changeset: 35924:7b1f1a487277 user: Carlos Aristu openbravo.com> date: Wed May 29 17:41:37 2019 +0200 summary: related to bug 40969: minor code improvements - Remove useless assignment details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/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 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 +-
[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/main: 4 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/8671a3b792ff changeset: 35917:8671a3b792ff user: Carlos Aristu openbravo.com> date: Wed May 29 10:00:12 2019 +0200 summary: related to bug 40721: fix null/undefined check Replaced "!record[fields[j].name]" with direct checking of null/undefined values. This is because if having a numeric field populated with a value of 0, the field was wrongly detected as empty. details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/rev/1d550d6c5cc6 changeset: 35919:1d550d6c5cc6 user: Augusto Mauch openbravo.com> date: Wed May 29 16:11:55 2019 +0200 summary: Related with issue 40264: Adds missing class, renames it to InvalidRowException details: https://code.openbravo.com/erp/devel/main/rev/0705db562021 changeset: 35920:0705db562021 user: RM packaging bot openbravo.com> date: Wed May 29 18:34:57 2019 + summary: CI: update AD_MODULE to version 35919 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 +-
[OpenbravoERP-commits] devel/pi: related to bug 40969: minor code improvements
details: https://code.openbravo.com/erp/devel/pi/rev/7b1f1a487277
changeset: 35923:7b1f1a487277
user: Carlos Aristu openbravo.com>
date: Wed May 29 17:41:37 2019 +0200
summary: related to bug 40969: minor code improvements
- Remove useless assignment
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js
| 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diffs (13 lines):
diff -r c220c40da810 -r 7b1f1a487277
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
Wed May 29 17:28:40 2019 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js
Wed May 29 17:41:37 2019 +0200
@@ -399,8 +399,7 @@
// loading it from the backend
rowEditorEnter: function (record, editValues, rowNum) {
if (this.view.actionHandler !==
"org.openbravo.advpaymentmngt.actionHandler.ModifyPaymentPlanActionHandler") {
- var i = 0,
- editRecord = this.getEditedRecord(rowNum),
+ var i, editRecord = this.getEditedRecord(rowNum),
gridFld, identifier, formFld, value, form = this.getEditForm();
if (editRecord) {
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: fixes bug 40969: Max call stack size error in P grid...
details: https://code.openbravo.com/erp/devel/pi/rev/c220c40da810
changeset: 35922:c220c40da810
user: Carlos Aristu openbravo.com>
date: Wed May 29 17:28:40 2019 +0200
summary: fixes bug 40969: Max call stack size error in P grids that allow
addition
P grids have specific code to prevent hiding the inline editor of the grid
when not all mandatory fields of a new record being added are populated. When
this happens, the standard "hideInlineEditor" function of Smartclient's
ListGrid is not executed, preventing the clearing of the "_editorShowing" flag.
If this flag is not cleared and afterwards the "showInlineEditor" is invoked
the maximum call stack size error appears because the function enters into a
recursive loop.
To fix this problem we now also prevent the execution of the
"showInlineEditor" function when not all mandatory fields of a new record being
added are populated. Exactly the same logic that the "hideInlineEditor"
function of P grids already has.
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js
| 11 +-
1 files changed, 10 insertions(+), 1 deletions(-)
diffs (35 lines):
diff -r 1924cce570cd -r c220c40da810
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
Wed May 29 16:29:58 2019 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js
Wed May 29 17:28:40 2019 +0200
@@ -981,6 +981,11 @@
showInlineEditor: function (rowNum, colNum, newCell, newRow, suppressFocus) {
var editForm, items, i, updatedBlur;
+
+if (this.hasNewRecordWithEmptyMandatoryFields()) {
+ return;
+}
+
// retrieve the initial values only if a new row has been selected
// see issue https://issues.openbravo.com/view.php?id=20653
if (newRow) {
@@ -1022,7 +1027,7 @@
hideInlineEditor: function (focusInBody, suppressCMHide) {
var ret;
-if (this.viewProperties && this.viewProperties.allowAdd &&
this.isRequiredFieldWithNoValue()) {
+if (this.hasNewRecordWithEmptyMandatoryFields()) {
return;
} else {
ret = this.Super('hideInlineEditor', arguments);
@@ -1031,6 +1036,10 @@
}
},
+ hasNewRecordWithEmptyMandatoryFields: function () {
+return this.viewProperties && this.viewProperties.allowAdd &&
this.isRequiredFieldWithNoValue();
+ },
+
validateRows: function () {
var i, row, field, errors, editRowIDs, data = this.data.allRows ||
this.data.localData;
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/main: 2 new changesets
details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/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 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/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/main: 2 new changesets
details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/rev/a1ae1cd8443c changeset: 35916:a1ae1cd8443c user: RM packaging bot openbravo.com> date: Wed May 29 11:21:47 2019 + summary: CI: update AD_MODULE to version 35915 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: Related with issue 40264: Adds missing class, renames ...
details: https://code.openbravo.com/erp/devel/pi/rev/1d550d6c5cc6 changeset: 35919:1d550d6c5cc6 user: Augusto Mauch openbravo.com> date: Wed May 29 16:11:55 2019 +0200 summary: Related with issue 40264: Adds missing class, renames it to InvalidRowException diffstat: src-db/database/lib/dbsourcemanager.jar | Bin 1 files changed, 0 insertions(+), 0 deletions(-) diffs (2 lines): diff -r 924e37a589cb -r 1d550d6c5cc6 src-db/database/lib/dbsourcemanager.jar Binary file src-db/database/lib/dbsourcemanager.jar has changed ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: related to bug 40721: fix null/undefined check
details: https://code.openbravo.com/erp/devel/pi/rev/8671a3b792ff
changeset: 35916:8671a3b792ff
user: Carlos Aristu openbravo.com>
date: Wed May 29 10:00:12 2019 +0200
summary: related to bug 40721: fix null/undefined check
Replaced "!record[fields[j].name]" with direct checking of null/undefined
values. This is because if having a numeric field populated with a value of 0,
the field was wrongly detected as empty.
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js
| 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 7df03a7a83e2 -r 8671a3b792ff
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js
Wed May 29 07:01:34 2019 +
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js
Wed May 29 10:00:12 2019 +0200
@@ -39,7 +39,7 @@
for (i = 0; i < len; i++) {
record = grid.getEditedRecord(grid.getRecordIndex(selection[i]));
for (j = 0; j < fields.length; j++) {
- if (fields[j].required && (!record[fields[j].name] ||
record[fields[j].name] === '')) {
+ if (fields[j].required && (record[fields[j].name] === null ||
record[fields[j].name] === undefined || record[fields[j].name] === '')) {
hasErrors = true;
if (!lineNumbers) {
lineNumbers = grid.getRecordIndex(selection[i]).toString();
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: fixes bug 40723: Client validation skipped in P grid...
details: https://code.openbravo.com/erp/devel/pi/rev/268662168c37
changeset: 35920:268662168c37
user: Carlos Aristu openbravo.com>
date: Wed May 29 13:56:33 2019 +0200
summary: fixes bug 40723: Client validation skipped in P grids without
select column
The client validations done to ensure that mandatory fields in a P grid are
populated before executing a process were not being executed for those grids
that does not allow selection.
This is because validations were done just for the selected records of the
P grid.
Now we validate all the records in case the P grid does not allow selection.
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js
| 19 ++---
1 files changed, 12 insertions(+), 7 deletions(-)
diffs (36 lines):
diff -r 1d550d6c5cc6 -r 268662168c37
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js
Wed May 29 16:11:55 2019 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js
Wed May 29 13:56:33 2019 +0200
@@ -31,20 +31,25 @@
condition: function (item) {
var grid = item.canvas.viewGrid,
hasErrors = false,
- i, j, fields, selection, len, record, lineNumbers;
+ i, j, fields, recordsToValidate, record, lineNumbers;
grid.endEditing();
fields = grid.getFields();
- selection = grid.getSelectedRecords() || [];
- len = selection.length;
- for (i = 0; i < len; i++) {
-record = grid.getEditedRecord(grid.getRecordIndex(selection[i]));
+ if (grid.viewProperties && grid.viewProperties.showSelect) {
+// validate the selected records
+recordsToValidate = grid.getSelectedRecords() || [];
+ } else {
+// grid doesn't allow record selection, validate all the records
+recordsToValidate = (grid.data && grid.data.allRows) || [];
+ }
+ for (i = 0; i < recordsToValidate.length; i++) {
+record =
grid.getEditedRecord(grid.getRecordIndex(recordsToValidate[i]));
for (j = 0; j < fields.length; j++) {
if (fields[j].required && (record[fields[j].name] === null ||
record[fields[j].name] === undefined || record[fields[j].name] === '')) {
hasErrors = true;
if (!lineNumbers) {
- lineNumbers = grid.getRecordIndex(selection[i]).toString();
+ lineNumbers =
grid.getRecordIndex(recordsToValidate[i]).toString();
} else {
- lineNumbers = lineNumbers + ',' +
grid.getRecordIndex(selection[i]).toString();
+ lineNumbers = lineNumbers + ',' +
grid.getRecordIndex(recordsToValidate[i]).toString();
}
}
}
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Related with issue 40264: Include function name in war...
details: https://code.openbravo.com/erp/devel/pi/rev/1924cce570cd changeset: 35921:1924cce570cd user: Augusto Mauch openbravo.com> date: Wed May 29 16:29:58 2019 +0200 summary: Related with issue 40264: Include function name in warning message diffstat: src-db/database/lib/dbsourcemanager.jar | Bin 1 files changed, 0 insertions(+), 0 deletions(-) diffs (2 lines): diff -r 268662168c37 -r 1924cce570cd src-db/database/lib/dbsourcemanager.jar Binary file src-db/database/lib/dbsourcemanager.jar has changed ___ 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/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/main: 3 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/ea3c09846afd changeset: 35910:ea3c09846afd user: Carlos Aristu openbravo.com> date: Tue May 28 18:48:54 2019 +0200 summary: fixes bug 40721: Mandatory field in P grids not correctly checked There was a wrong condition when checking if the mandatory fields in a record of a P grid. Fixing it together with minor improvements: - Deleted wrong condition to check undefined value: "record[fields[j] === undef]" - Use "!record[fields[j].name]" expression to check if the value is null or undefined - Avoid unnecessary nested "if" - Use "!lineNumbers" instead of "lineNumbers === undef" details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/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 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 +-
[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/main: 3 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/30d087840b55 changeset: 35907:30d087840b55 user: Augusto Mauch openbravo.com> date: Tue May 28 11:13:47 2019 +0200 summary: Fixes issue 40264: Ignore some invalid functions when loading the database model Openbravo does not support the definition of functions with anonymous parameters. Before this changeset, loading from the model one of those functions resulted in a NullPointerException. Now these functions will be ignored when loading the model from the database. This means that export.database will not export them, and update.database will not overwrite them. To be able to ignore a row within RowConstructor.getRow a new exception called SkipRowException has been defined. details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/rev/d51097bed845 changeset: 35909:d51097bed845 user: RM packaging bot openbravo.com> date: Tue May 28 18:00:47 2019 + summary: CI: update AD_MODULE to version 35908 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 +-
[OpenbravoERP-commits] devel/pi: fixes bug 40721: Mandatory field in P grids not corr...
details: https://code.openbravo.com/erp/devel/pi/rev/ea3c09846afd
changeset: 35909:ea3c09846afd
user: Carlos Aristu openbravo.com>
date: Tue May 28 18:48:54 2019 +0200
summary: fixes bug 40721: Mandatory field in P grids not correctly checked
There was a wrong condition when checking if the mandatory fields in a record
of a P grid. Fixing it together with minor improvements:
- Deleted wrong condition to check undefined value: "record[fields[j] ===
undef]"
- Use "!record[fields[j].name]" expression to check if the value is null or
undefined
- Avoid unnecessary nested "if"
- Use "!lineNumbers" instead of "lineNumbers === undef"
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js
| 16 -
1 files changed, 7 insertions(+), 9 deletions(-)
diffs (33 lines):
diff -r b7769c78ea10 -r ea3c09846afd
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js
Tue May 28 11:06:02 2019 +
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js
Tue May 28 18:48:54 2019 +0200
@@ -31,7 +31,7 @@
condition: function (item) {
var grid = item.canvas.viewGrid,
hasErrors = false,
- undef, i, j, fields, selection, len, record, lineNumbers;
+ i, j, fields, selection, len, record, lineNumbers;
grid.endEditing();
fields = grid.getFields();
selection = grid.getSelectedRecords() || [];
@@ -39,14 +39,12 @@
for (i = 0; i < len; i++) {
record = grid.getEditedRecord(grid.getRecordIndex(selection[i]));
for (j = 0; j < fields.length; j++) {
- if (fields[j].required) {
-if (record[fields[j].name] === null || record[fields[j].name] ===
'' || record[fields[j] === undef]) {
- hasErrors = true;
- if (lineNumbers === undef) {
-lineNumbers = grid.getRecordIndex(selection[i]).toString();
- } else {
-lineNumbers = lineNumbers + ',' +
grid.getRecordIndex(selection[i]).toString();
- }
+ if (fields[j].required && (!record[fields[j].name] ||
record[fields[j].name] === '')) {
+hasErrors = true;
+if (!lineNumbers) {
+ lineNumbers = grid.getRecordIndex(selection[i]).toString();
+} else {
+ lineNumbers = lineNumbers + ',' +
grid.getRecordIndex(selection[i]).toString();
}
}
}
___
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/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/main: 15 new changesets
details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/rev/a77a1f7e9e5f changeset: 35893:a77a1f7e9e5f user: Mark Molina doceleguas.com> date: Fri Apr 05 10:43:19 2019 -0300 summary: [C360] Renamed Business Partner "Birth Place" field to "Birthplace" details: https://code.openbravo.com/erp/devel/main/rev/4bccf87c101b changeset: 35894:4bccf87c101b user: Sandra Huguet openbravo.com> date: Tue Apr 09 13:42:38 2019 +0200 summary: [C360] Renamed Business Partner "Birthday" field to "Birthdate" details: https://code.openbravo.com/erp/devel/main/rev/487fbf874dff changeset: 35895:487fbf874dff user: Sandra Huguet openbravo.com> date: Fri May 03 15:34:32 2019 +0200 summary: [C360] Show greeting column in business partner details: https://code.openbravo.com/erp/devel/main/rev/896c7abb8b75 changeset: 35896:896c7abb8b75 user: Sandra Huguet openbravo.com> date: Mon May 13 17:19:13 2019 +0200 summary: [C360] merge from pi details: https://code.openbravo.com/erp/devel/main/rev/16951dc78af1 changeset: 35897:16951dc78af1 user: Sandra Huguet openbravo.com> date: Tue May 14 17:14:27 2019 +0200 summary: [C360] merge from posterminal details: https://code.openbravo.com/erp/devel/main/rev/2062a5cc91b7 changeset: 35898:2062a5cc91b7 user: Sandra Huguet openbravo.com> date: Mon May 20 08:32:08 2019 +0200 summary: [C360] merge from PI details: https://code.openbravo.com/erp/devel/main/rev/739c08b6ac29 changeset: 35899:739c08b6ac29 user: Sandra Huguet openbravo.com> date: Tue May 21 15:15:49 2019 +0200 summary: [C360] merge from pi details: https://code.openbravo.com/erp/devel/main/rev/268359789425 changeset: 35900:268359789425 user: Sandra Huguet openbravo.com> date: Wed May 22 12:23:27 2019 +0200 summary: [C360] merge from pi details: https://code.openbravo.com/erp/devel/main/rev/88f087a21a1b changeset: 35901:88f087a21a1b user: Sandra Huguet openbravo.com> date: Wed May 22 12:46:17 2019 +0200 summary: [C360] merge from pi details: https://code.openbravo.com/erp/devel/main/rev/a0e841ae845a changeset: 35902:a0e841ae845a user: Sandra Huguet openbravo.com> date: Wed May 22 17:32:36 2019 +0200 summary: [C360] move contact preferences and commercial auth to core details: https://code.openbravo.com/erp/devel/main/rev/0a498211f9d6 changeset: 35903:0a498211f9d6 user: Sandra Huguet openbravo.com> date: Fri May 24 13:17:11 2019 +0200 summary: [C360] merge from pi details: https://code.openbravo.com/erp/devel/main/rev/e27ad3e80175 changeset: 35904:e27ad3e80175 user: Sandra Huguet openbravo.com> date: Mon May 27 09:22:16 2019 +0200 summary: [C360] merge from pi details: https://code.openbravo.com/erp/devel/main/rev/14e100c74041 changeset: 35905:14e100c74041 user: Sandra Huguet openbravo.com> date: Tue May 28 08:21:04 2019 +0200 summary: [C360] merge from pi details: https://code.openbravo.com/erp/devel/main/rev/4cb841e668e7 changeset: 35906:4cb841e668e7 user: RM packaging bot openbravo.com> date: Tue May 28 10:51:49 2019 + summary: CI: update AD_MODULE to version 35905 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 +-
[OpenbravoERP-commits] devel/pi: Fixes issue 40264: Ignore some invalid functions when ...
details: https://code.openbravo.com/erp/devel/pi/rev/30d087840b55 changeset: 35906:30d087840b55 user: Augusto Mauch openbravo.com> date: Tue May 28 11:13:47 2019 +0200 summary: Fixes issue 40264: Ignore some invalid functions when loading the database model Openbravo does not support the definition of functions with anonymous parameters. Before this changeset, loading from the model one of those functions resulted in a NullPointerException. Now these functions will be ignored when loading the model from the database. This means that export.database will not export them, and update.database will not overwrite them. To be able to ignore a row within RowConstructor.getRow a new exception called SkipRowException has been defined. diffstat: src-db/database/lib/dbsourcemanager.jar | Bin 1 files changed, 0 insertions(+), 0 deletions(-) diffs (2 lines): diff -r 14e100c74041 -r 30d087840b55 src-db/database/lib/dbsourcemanager.jar Binary file src-db/database/lib/dbsourcemanager.jar has changed ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: 13 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/a77a1f7e9e5f changeset: 35893:a77a1f7e9e5f user: Mark Molina doceleguas.com> date: Fri Apr 05 10:43:19 2019 -0300 summary: [C360] Renamed Business Partner "Birth Place" field to "Birthplace" details: https://code.openbravo.com/erp/devel/pi/rev/4bccf87c101b changeset: 35894:4bccf87c101b user: Sandra Huguet openbravo.com> date: Tue Apr 09 13:42:38 2019 +0200 summary: [C360] Renamed Business Partner "Birthday" field to "Birthdate" details: https://code.openbravo.com/erp/devel/pi/rev/487fbf874dff changeset: 35895:487fbf874dff user: Sandra Huguet openbravo.com> date: Fri May 03 15:34:32 2019 +0200 summary: [C360] Show greeting column in business partner details: https://code.openbravo.com/erp/devel/pi/rev/896c7abb8b75 changeset: 35896:896c7abb8b75 user: Sandra Huguet openbravo.com> date: Mon May 13 17:19:13 2019 +0200 summary: [C360] merge from pi details: https://code.openbravo.com/erp/devel/pi/rev/16951dc78af1 changeset: 35897:16951dc78af1 user: Sandra Huguet openbravo.com> date: Tue May 14 17:14:27 2019 +0200 summary: [C360] merge from posterminal details: https://code.openbravo.com/erp/devel/pi/rev/2062a5cc91b7 changeset: 35898:2062a5cc91b7 user: Sandra Huguet openbravo.com> date: Mon May 20 08:32:08 2019 +0200 summary: [C360] merge from PI details: https://code.openbravo.com/erp/devel/pi/rev/739c08b6ac29 changeset: 35899:739c08b6ac29 user: Sandra Huguet openbravo.com> date: Tue May 21 15:15:49 2019 +0200 summary: [C360] merge from pi details: https://code.openbravo.com/erp/devel/pi/rev/268359789425 changeset: 35900:268359789425 user: Sandra Huguet openbravo.com> date: Wed May 22 12:23:27 2019 +0200 summary: [C360] merge from pi details: https://code.openbravo.com/erp/devel/pi/rev/88f087a21a1b changeset: 35901:88f087a21a1b user: Sandra Huguet openbravo.com> date: Wed May 22 12:46:17 2019 +0200 summary: [C360] merge from pi details: https://code.openbravo.com/erp/devel/pi/rev/a0e841ae845a changeset: 35902:a0e841ae845a user: Sandra Huguet openbravo.com> date: Wed May 22 17:32:36 2019 +0200 summary: [C360] move contact preferences and commercial auth to core details: https://code.openbravo.com/erp/devel/pi/rev/0a498211f9d6 changeset: 35903:0a498211f9d6 user: Sandra Huguet openbravo.com> date: Fri May 24 13:17:11 2019 +0200 summary: [C360] merge from pi details: https://code.openbravo.com/erp/devel/pi/rev/e27ad3e80175 changeset: 35904:e27ad3e80175 user: Sandra Huguet openbravo.com> date: Mon May 27 09:22:16 2019 +0200 summary: [C360] merge from pi details: https://code.openbravo.com/erp/devel/pi/rev/14e100c74041 changeset: 35905:14e100c74041 user: Sandra Huguet openbravo.com> date: Tue May 28 08:21:04 2019 +0200 summary: [C360] merge from pi diffstat: .hgsigs | 2 + .hgtags | 2 + legal/Licensing.txt | 14 +- lib/runtime/xstream-1.3.1.jar |Bin 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/functions/APRM_ISPAYMENTCONFIRMED.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINACC_TRANSACTION.xml | 8 - modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml | 4 - 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
[OpenbravoERP-commits] devel/main: 2 new changesets
details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/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 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/main: 3 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/a45b06d2479e changeset: 35887:a45b06d2479e user: Augusto Mauch openbravo.com> date: Mon May 27 11:48:56 2019 +0200 summary: Fixes issue 40933: Indexes are properly ordered when reversing a template The problem was that when a template that removes an index is reversed, the index is added to the end of the index list, instead of preserving the alphabetical order. To fix it, just sort again indexes and constraints after reversing the templates. details: https://code.openbravo.com/erp/devel/main/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 details: https://code.openbravo.com/erp/devel/main/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 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 +-
[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/main: 12 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/befaa9f4d43f changeset: 35875:befaa9f4d43f user: RM packaging botopenbravo.com> date: Tue May 21 13:15:48 2019 + summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/073f41cdb735 changeset: 35876:073f41cdb735 user: Asier Lostal=E9 openbravo.com> date: Tue May 21 15:56:38 2019 +0200 summary: fixed bug 40927: ModelProvider does not flag all entities with i= mages or files They were incorrectly marked only in case their one-to-many property in p= arent entity was marked to be genereted. They need to be marked in any case. details: https://code.openbravo.com/erp/devel/main/rev/fe5a1e5fb576 changeset: 35877:fe5a1e5fb576 user: Nono Carballo gmail.com> date: Tue May 14 13:09:53 2019 -0400 summary: Fixes issue 40547: Check for duplicates in Event Observer Prior this fix, duplicate values in m_ch_value were checked in a statement level trigger, blocking insertions in some flows. This fix removes trigger and adds logic for check duplicates in an Event Observer, to avoid the table mutating problem in Oracle. details: https://code.openbravo.com/erp/devel/main/rev/4dc58edab48f changeset: 35878:4dc58edab48f user: Asier Lostal=E9 openbravo.com> date: Tue May 21 14:03:22 2019 +0200 summary: fixed issue 40906: Platform FK columns do not generate one-to-ma= ny properties where it makes sense not to do so. details: https://code.openbravo.com/erp/devel/main/rev/898c207324d9 changeset: 35879:898c207324d9 user: Nono Carballo gmail.com> date: Wed May 15 18:14:49 2019 -0400 summary: Fixes for issue 40835: Hides organization field in Inventory Amo= unt Update tabs Hides organization field in Lines and Inventory tabs of Inventory Amount Update window. details: https://code.openbravo.com/erp/devel/main/rev/33ab19458665 changeset: 35880:33ab19458665 user: Nono Carballo gmail.com> date: Mon May 20 08:49:31 2019 -0400 summary: Fixes issue 40762: Makes inactive organizations available in rep= orts. Inactive organizations are included in Organization selector in reports. details: https://code.openbravo.com/erp/devel/main/rev/e7d637ae77a1 changeset: 35881:e7d637ae77a1 user: Nono Carballo gmail.com> date: Mon Apr 22 15:49:11 2019 -0400 summary: Fixes issue 40560: Uses bind parameters in query When creating the query to get exchange rates by documents, instead of use string concatenation, bind parameters are uses. details: https://code.openbravo.com/erp/devel/main/rev/6a1f11921b4b changeset: 35882:6a1f11921b4b user: Carlos Aristu openbravo.com> date: Fri May 24 10:47:32 2019 +0200 summary: related to bug 40802: simplify return statement details: https://code.openbravo.com/erp/devel/main/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/main/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 componen= ts ** 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
[OpenbravoERP-commits] devel/pi: Fixes issue 40933: Indexes are properly ordered when r...
details: https://code.openbravo.com/erp/devel/pi/rev/a45b06d2479e changeset: 35886:a45b06d2479e user: Augusto Mauch openbravo.com> date: Mon May 27 11:48:56 2019 +0200 summary: Fixes issue 40933: Indexes are properly ordered when reversing a template The problem was that when a template that removes an index is reversed, the index is added to the end of the index list, instead of preserving the alphabetical order. To fix it, just sort again indexes and constraints after reversing the templates. diffstat: src-db/database/lib/dbsourcemanager.jar | Bin 1 files changed, 0 insertions(+), 0 deletions(-) diffs (2 lines): diff -r 67bed13f91ca -r a45b06d2479e src-db/database/lib/dbsourcemanager.jar Binary file src-db/database/lib/dbsourcemanager.jar has changed ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes issue 39865: Do not create line if mandatory fie...
details: https://code.openbravo.com/erp/devel/pi/rev/67bed13f91ca
changeset: 35885:67bed13f91ca
user: Augusto Mauch openbravo.com>
date: Wed May 22 19:21:34 2019 +0200
summary: Fixes issue 39865: Do not create line if mandatory fields of current
are empty
In the view grid, if in a new line there are mandatory fields not filled in, it
should not be
possible to create a new line.
To prevent that, the updateState function of the new line toolbar button has
been updated, and
the doCellEditEnd function of ob-view-grid also takes it into account.
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
| 6 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
| 7 +--
2 files changed, 10 insertions(+), 3 deletions(-)
diffs (33 lines):
diff -r a1ba443733e7 -r 67bed13f91ca
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
Tue May 21 23:28:26 2019 +0530
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
Wed May 22 19:21:34 2019 +0200
@@ -3495,7 +3495,11 @@
}
// If leaving the row...
-if (editCompletionEvent === 'enter' || editCompletionEvent === 'arrow_up'
|| editCompletionEvent === 'arrow_down') {
+if (newRow) {
+ // do not leave the row if the row is new and not all mandatory fields
have been set
+ if (editForm && editForm.isNew && !editForm.allRequiredFieldsSet()) {
+return;
+ }
// See issue https://issues.openbravo.com/view.php?id=19830
if (this.view.standardWindow.getDirtyEditForm()) {
this.view.standardWindow.getDirtyEditForm().validateForm();
diff -r a1ba443733e7 -r 67bed13f91ca
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
Tue May 21 23:28:26 2019 +0530
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
Wed May 22 19:21:34 2019 +0200
@@ -122,8 +122,11 @@
prompt: OB.I18N.getLabel('OBUIAPP_NewRow'),
updateState: function () {
var view = this.view,
- selectedRecords = view.viewGrid.getSelectedRecords();
- this.setDisabled(view.viewGrid.isGrouped || view.isShowingForm ||
view.readOnly || view.editOrDeleteOnly || view.singleRecord ||
!view.hasValidState() || (selectedRecords && selectedRecords.length > 1) ||
view.isShowingTree || !view.roleCanCreateRecords());
+ selectedRecords = view.viewGrid.getSelectedRecords(),
+ form = view.viewGrid.getEditForm(),
+ allFieldsSet = form && form.allRequiredFieldsSet(),
+ isNew = form && form.isNew;
+ this.setDisabled(view.viewGrid.isGrouped || view.isShowingForm ||
view.readOnly || view.editOrDeleteOnly || view.singleRecord ||
!view.hasValidState() || (selectedRecords && selectedRecords.length > 1) ||
view.isShowingTree || !view.roleCanCreateRecords() || (isNew && !allFieldsSet));
},
keyboardShortcutId: 'ToolBar_NewRow'
},
___
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/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: related to bug 40802: simplify return statement
details: https://code.openbravo.com/erp/devel/pi/rev/6a1f11921b4b
changeset: 35882:6a1f11921b4b
user: Carlos Aristu openbravo.com>
date: Fri May 24 10:47:32 2019 +0200
summary: related to bug 40802: simplify return statement
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
| 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r e7d637ae77a1 -r 6a1f11921b4b
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
Mon Apr 22 15:49:11 2019 -0400
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
Fri May 24 10:47:32 2019 +0200
@@ -1496,7 +1496,7 @@
ksAction_DeleteSelectedRecords = function () {
var isRecordDeleted = me.deleteSelectedRowsByToolbarIcon();
// Return false to avoid keyboard shortcut propagation
- return isRecordDeleted ? false : true;
+ return !isRecordDeleted;
};
OB.KeyboardManager.Shortcuts.set('ViewGrid_DeleteSelectedRecords',
'OBViewGrid.body', ksAction_DeleteSelectedRecords);
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes issue 40560: Uses bind parameters in query
details: https://code.openbravo.com/erp/devel/pi/rev/e7d637ae77a1
changeset: 35881:e7d637ae77a1
user: Nono Carballo gmail.com>
date: Mon Apr 22 15:49:11 2019 -0400
summary: Fixes issue 40560: Uses bind parameters in query
When creating the query to get exchange rates by documents, instead of use
string concatenation, bind parameters are uses.
diffstat:
src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 27 ---
1 files changed, 12 insertions(+), 15 deletions(-)
diffs (49 lines):
diff -r 33ab19458665 -r e7d637ae77a1
src/org/openbravo/erpCommon/ad_forms/AcctServer.java
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Mon May 20
08:49:31 2019 -0400
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Mon Apr 22
15:49:11 2019 -0400
@@ -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-2018 Openbravo S.L.U.
+ * Contributions are Copyright (C) 2001-2019 Openbravo S.L.U.
**
*/
package org.openbravo.erpCommon.ad_forms;
@@ -1318,25 +1318,22 @@
OBQuery conversionQuery = null;
int conversionCount = 0;
if (AD_Table_ID.equals(TABLEID_Invoice)) {
- conversionQuery = OBDal.getInstance()
- .createQuery(ConversionRateDoc.class, "invoice = '" + Record_ID
+ "' and currency='"
- + currency + "' and toCurrency='" +
acctSchema.m_C_Currency_ID + "'");
+ String whereClause = "invoice.id = :recordId and currency.id =
:currency and toCurrency.id = :toCurrency";
+ conversionQuery =
OBDal.getInstance().createQuery(ConversionRateDoc.class, whereClause);
} else if (AD_Table_ID.equals(TABLEID_Payment)) {
- conversionQuery = OBDal.getInstance()
- .createQuery(ConversionRateDoc.class, "payment = '" + Record_ID
+ "' and currency='"
- + currency + "' and toCurrency='" +
acctSchema.m_C_Currency_ID + "'");
+ String whereClause = "payment.id = :recordId and currency.id =
:currency and toCurrency.id = :toCurrency";
+ conversionQuery =
OBDal.getInstance().createQuery(ConversionRateDoc.class, whereClause);
} else if (AD_Table_ID.equals(TABLEID_Transaction)) {
- conversionQuery = OBDal.getInstance()
- .createQuery(ConversionRateDoc.class,
- "financialAccountTransaction = '" + Record_ID + "' and
currency='" + currency
- + "' and toCurrency='" + acctSchema.m_C_Currency_ID +
"'");
+ String whereClause = "financialAccountTransaction.id = :recordId and
currency.id = :currency and toCurrency.id = :toCurrency";
+ conversionQuery =
OBDal.getInstance().createQuery(ConversionRateDoc.class, whereClause);
} else if (AD_Table_ID.equals(TABLEID_GLJournal)) {
- conversionQuery = OBDal.getInstance()
- .createQuery(ConversionRateDoc.class,
- "journalEntry = '" + Record_ID + "' and currency='" +
currency
- + "' and toCurrency='" + acctSchema.m_C_Currency_ID +
"'");
+ String whereClause = "journalEntry.id = :recordId and currency.id =
:currency and toCurrency.id = :toCurrency";
+ conversionQuery =
OBDal.getInstance().createQuery(ConversionRateDoc.class, whereClause);
}
if (conversionQuery != null) {
+ conversionQuery.setNamedParameter("recordId", Record_ID);
+ conversionQuery.setNamedParameter("currency", currency);
+ conversionQuery.setNamedParameter("toCurrency",
acctSchema.m_C_Currency_ID);
conversionCount = conversionQuery.count();
}
try {
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes issue 40762: Makes inactive organizations availa...
details: https://code.openbravo.com/erp/devel/pi/rev/33ab19458665
changeset: 35880:33ab19458665
user: Nono Carballo gmail.com>
date: Mon May 20 08:49:31 2019 -0400
summary: Fixes issue 40762: Makes inactive organizations available in reports.
Inactive organizations are included in Organization selector in reports.
diffstat:
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql |
2 -
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java |
15 +++--
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java|
13 ++--
src/org/openbravo/erpCommon/info/SelectorUtility_data.xsql|
15 +-
4 files changed, 23 insertions(+), 22 deletions(-)
diffs (105 lines):
diff -r 898c207324d9 -r 33ab19458665
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql
--- a/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql
Wed May 15 18:14:49 2019 -0400
+++ b/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql
Mon May 20 08:49:31 2019 -0400
@@ -149,7 +149,6 @@
(CASE WHEN
AD_ORGTYPE.ISBUSINESSUNIT='Y' OR AD_ORGTYPE.ISLEGALENTITY='Y' THEN 'Y' ELSE 'N'
END) AS BALANCED
FROM AD_ORG, AD_ORGTYPE
WHERE AD_ORGTYPE.AD_ORGTYPE_ID =
AD_ORG.AD_ORGTYPE_ID
- AND AD_ORG.ISACTIVE = 'Y'
) O, AD_ORG ORG
WHERE R.C_ACCTSCHEMA_ID = S.C_ACCTSCHEMA_ID
AND AD_ISORGINCLUDED(O.AD_ORG_ID, S.AD_ORG_ID, S.AD_CLIENT_ID) <> -1
@@ -169,7 +168,6 @@
(CASE WHEN
AD_ORGTYPE.ISBUSINESSUNIT='Y' OR AD_ORGTYPE.ISLEGALENTITY='Y' THEN 'Y' ELSE 'N'
END) AS BALANCED
FROM AD_ORG, AD_ORGTYPE
WHERE AD_ORGTYPE.AD_ORGTYPE_ID =
AD_ORG.AD_ORGTYPE_ID
- AND AD_ORG.ISACTIVE = 'Y'
) O
WHERE R.C_ACCTSCHEMA_ID = S.C_ACCTSCHEMA_ID
AND (AD_ISORGINCLUDED(O.AD_ORG_ID, S.AD_ORG_ID, S.AD_CLIENT_ID) <> -1
diff -r 898c207324d9 -r 33ab19458665
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java Wed May
15 18:14:49 2019 -0400
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java Mon May
20 08:49:31 2019 -0400
@@ -42,7 +42,6 @@
import org.openbravo.erpCommon.businessUtility.WindowTabs;
import org.openbravo.erpCommon.info.SelectorUtilityData;
import org.openbravo.erpCommon.utility.AbstractScrollableFieldProviderFilter;
-import org.openbravo.erpCommon.utility.ComboTableData;
import org.openbravo.erpCommon.utility.DateTimeData;
import org.openbravo.erpCommon.utility.LeftTabsBar;
import org.openbravo.erpCommon.utility.LimitRowsScrollableFieldProviderFilter;
@@ -511,15 +510,11 @@
xmlDocument.setParameter("calendar", vars.getLanguage().substring(0, 2));
-try {
- ComboTableData comboTableData = new ComboTableData(vars, readOnlyCP,
"TABLEDIR", "AD_ORG_ID",
- "", "", Utility.getContext(readOnlyCP, vars, "#User_Org",
"ReportGeneralLedger"),
- Utility.getContext(readOnlyCP, vars, "#User_Client",
"ReportGeneralLedger"), '*');
- comboTableData.fillParameters(null, "ReportGeneralLedger", "");
- xmlDocument.setData("reportAD_ORGID", "liststructure",
comboTableData.select(false));
-} catch (Exception ex) {
- throw new ServletException(ex);
-}
+
+xmlDocument.setData("reportAD_ORGID", "liststructure",
+SelectorUtilityData.selectAllOrganizations(readOnlyCP,
+Utility.getContext(readOnlyCP, vars, "#User_Org",
"ReportGeneralLedger"),
+Utility.getContext(readOnlyCP, vars, "#User_Client",
"ReportGeneralLedger")));
xmlDocument.setParameter("directory", "var baseDirectory = \"" +
strReplaceWith + "/\";\n");
xmlDocument.setParameter("paramLanguage", "defaultLang=\"" +
vars.getLanguage() + "\";");
diff -r 898c207324d9 -r 33ab19458665
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.javaWed May
15 18:14:49 2019 -0400
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.javaMon May
20 08:49:31 2019 -0400
@@ -444,15 +444,10 @@
xmlDocument.setParameter("messageMessage", myMessage.getMessage());
}
-try {
- ComboTableData comboTableData = new ComboTableData(vars, readOnlyCP,
"TABLEDIR", "AD_ORG_ID",
- "", "", Utility.getContext(readOnlyCP, vars, "#User_Org",
"ReportTrialBalance"),
- Utility.getContext(readOnlyCP, vars, "#User_Client",
"ReportTrialBalance"), '*');
-
[OpenbravoERP-commits] devel/pi: Fixes for issue 40835: Hides organization field in Inv...
details: https://code.openbravo.com/erp/devel/pi/rev/898c207324d9 changeset: 35879:898c207324d9 user: Nono Carballo gmail.com> date: Wed May 15 18:14:49 2019 -0400 summary: Fixes for issue 40835: Hides organization field in Inventory Amount Update tabs Hides organization field in Lines and Inventory tabs of Inventory Amount Update window. diffstat: src-db/database/sourcedata/AD_COLUMN.xml | 3 ++- src-db/database/sourcedata/AD_FIELD.xml| 10 +- src-db/database/sourcedata/AD_VAL_RULE.xml | 11 +++ 3 files changed, 18 insertions(+), 6 deletions(-) diffs (88 lines): diff -r 4dc58edab48f -r 898c207324d9 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Tue May 21 14:03:22 2019 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Wed May 15 18:14:49 2019 -0400 @@ -275078,6 +275078,7 @@ + @@ -289188,7 +289189,7 @@ - + diff -r 4dc58edab48f -r 898c207324d9 src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Tue May 21 14:03:22 2019 +0200 +++ b/src-db/database/sourcedata/AD_FIELD.xml Wed May 15 18:14:49 2019 -0400 @@ -187001,7 +187001,7 @@ - + @@ -198451,14 +198451,14 @@ - + - + @@ -259229,7 +259229,7 @@ - + @@ -264251,7 +264251,7 @@ - + diff -r 4dc58edab48f -r 898c207324d9 src-db/database/sourcedata/AD_VAL_RULE.xml --- a/src-db/database/sourcedata/AD_VAL_RULE.xmlTue May 21 14:03:22 2019 +0200 +++ b/src-db/database/sourcedata/AD_VAL_RULE.xmlWed May 15 18:14:49 2019 -0400 @@ -2289,6 +2289,17 @@ + + + + + + + + + + + ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: fixed issue 40906: Platform FK columns do not generate...
details: https://code.openbravo.com/erp/devel/pi/rev/4dc58edab48f changeset: 35878:4dc58edab48f user: Asier Lostalé openbravo.com> date: Tue May 21 14:03:22 2019 +0200 summary: fixed issue 40906: Platform FK columns do not generate one-to-many properties where it makes sense not to do so. diffstat: modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 50 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_COLUMN.xml |4 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_COLUMN.xml | 22 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_COLUMN.xml | 10 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_COLUMN.xml |8 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_COLUMN.xml |2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_COLUMN.xml | 26 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_COLUMN.xml |4 +- src-db/database/sourcedata/AD_COLUMN.xml | 322 +- 9 files changed, 224 insertions(+), 224 deletions(-) diffs (truncated from 2043 to 300 lines): diff -r fe5a1e5fb576 -r 4dc58edab48f 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 Tue May 14 13:09:53 2019 -0400 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml Tue May 21 14:03:22 2019 +0200 @@ -1581,7 +1581,7 @@ - + @@ -4344,7 +4344,7 @@ - + @@ -4384,7 +4384,7 @@ - + @@ -5815,7 +5815,7 @@ - + @@ -6174,7 +6174,7 @@ - + @@ -6375,7 +6375,7 @@ - + @@ -7328,7 +7328,7 @@ - + @@ -7530,7 +7530,7 @@ - + @@ -7808,7 +7808,7 @@ - + @@ -8755,7 +8755,7 @@ - + @@ -9106,7 +9106,7 @@ - + @@ -9531,7 +9531,7 @@ - + @@ -9927,7 +9927,7 @@ - + @@ -10332,7 +10332,7 @@ - + @@ -10371,7 +10371,7 @@ - + @@ -10529,7 +10529,7 @@ - + @@ -10569,7 +10569,7 @@ - + @@ -10648,7 +10648,7 @@ - + @@ -10811,7 +10811,7 @@ - + @@ -10929,7 +10929,7 @@ - + @@ -11214,7 +11214,7 @@ - + @@ -11414,7 +11414,7 @@ - + @@ -12697,7 +12697,7 @@ - + @@ -12776,7 +12776,7 @@ - + @@ -12893,7 +12893,7 @@ - + diff -r fe5a1e5fb576 -r 4dc58edab48f modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_COLUMN.xml Tue May 14 13:09:53 2019 -0400 +++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_COLUMN.xml Tue May 21 14:03:22 2019 +0200 @@ -676,7 +676,7 @@ - + @@ -1230,7 +1230,7 @@ - + diff -r fe5a1e5fb576 -r 4dc58edab48f modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_COLUMN.xml Tue May 14 13:09:53 2019 -0400 +++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_COLUMN.xml Tue May 21 14:03:22 2019 +0200 @@ -1235,7 +1235,7 @@ - + @@ -1713,7 +1713,7 @@ - + @@ -1752,7 +1752,7 @@ - + @@ -1872,7 +1872,7 @@ - + @@ -1911,7 +1911,7 @@ - + @@ -3227,7 +3227,7 @@ ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes issue 40547: Check for duplicates in Event Observer
details: https://code.openbravo.com/erp/devel/pi/rev/fe5a1e5fb576
changeset: 35877:fe5a1e5fb576
user: Nono Carballo gmail.com>
date: Tue May 14 13:09:53 2019 -0400
summary: Fixes issue 40547: Check for duplicates in Event Observer
Prior this fix, duplicate values in m_ch_value were checked in a statement
level trigger, blocking insertions in some flows.
This fix removes trigger and adds logic for check duplicates in an Event
Observer, to avoid the table mutating problem in Oracle.
diffstat:
src-db/database/model/triggers/M_CH_VALUE_TRG2.xml | 44
src/org/openbravo/event/CharacteristicValueEventHandler.java | 37 ++
2 files changed, 37 insertions(+), 44 deletions(-)
diffs (119 lines):
diff -r 073f41cdb735 -r fe5a1e5fb576
src-db/database/model/triggers/M_CH_VALUE_TRG2.xml
--- a/src-db/database/model/triggers/M_CH_VALUE_TRG2.xmlTue May 21
15:56:38 2019 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +
@@ -1,44 +0,0 @@
-
-
-
-
-
-
diff -r 073f41cdb735 -r fe5a1e5fb576
src/org/openbravo/event/CharacteristicValueEventHandler.java
--- a/src/org/openbravo/event/CharacteristicValueEventHandler.java Tue May
21 15:56:38 2019 +0200
+++ b/src/org/openbravo/event/CharacteristicValueEventHandler.java Tue May
14 13:09:53 2019 -0400
@@ -28,18 +28,22 @@
import org.hibernate.Session;
import org.hibernate.query.Query;
import org.hibernate.resource.transaction.spi.TransactionStatus;
+import org.openbravo.base.exception.OBException;
import org.openbravo.base.model.Entity;
import org.openbravo.base.model.ModelProvider;
import org.openbravo.base.model.Property;
import org.openbravo.base.secureApp.VariablesSecureApp;
import org.openbravo.client.kernel.RequestContext;
+import org.openbravo.client.kernel.event.EntityNewEvent;
import org.openbravo.client.kernel.event.EntityPersistenceEventObserver;
import org.openbravo.client.kernel.event.EntityUpdateEvent;
import org.openbravo.client.kernel.event.TransactionBeginEvent;
import org.openbravo.client.kernel.event.TransactionCompletedEvent;
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBDal;
+import org.openbravo.erpCommon.utility.OBMessageUtils;
import org.openbravo.materialmgmt.VariantChDescUpdateProcess;
+import org.openbravo.model.common.plm.Characteristic;
import org.openbravo.model.common.plm.CharacteristicValue;
import org.openbravo.scheduling.OBScheduler;
import org.openbravo.scheduling.ProcessBundle;
@@ -60,11 +64,44 @@
chvalueUpdated.set(null);
}
+ public void onNew(@Observes EntityNewEvent event) {
+if (!isValidEvent(event)) {
+ return;
+}
+CharacteristicValue characteristicValue = (CharacteristicValue)
event.getTargetInstance();
+checkForDuplicates(characteristicValue);
+ }
+
+ private void checkForDuplicates(CharacteristicValue characteristicValue) {
+Characteristic characteristic = characteristicValue.getCharacteristic();
+if (characteristic.isVariant()) {
+ if (existsDuplicateNameInSameCharacteristic(characteristicValue)) {
+throw new
OBException(OBMessageUtils.messageBD("DuplicatedChValueName"));
+ }
+}
+ }
+
+ private boolean existsDuplicateNameInSameCharacteristic(CharacteristicValue
characteristicValue) {
+//@formatter:off
+String hql = "select 1 from CharacteristicValue chv join
chv.characteristic ch where chv.name = :name and ch.id = :characteristicId";
+//@formatter:on
+
+Query query = OBDal.getInstance()
+.getSession()
+.createQuery(hql, Integer.class)
+.setParameter("name", characteristicValue.getName())
+.setParameter("characteristicId",
characteristicValue.getCharacteristic().getId());
+
+query.setMaxResults(1);
+return !query.list().isEmpty();
+ }
+
public void onUpdate(@Observes EntityUpdateEvent event) {
if (!isValidEvent(event)) {
return;
}
final CharacteristicValue chv = (CharacteristicValue)
event.getTargetInstance();
+checkForDuplicates(chv);
chvalueUpdated.set(chv.getId());
// Update all product characteristics configurations with updated code of
the characteristic.
// Only when product characteristics is not linked with subset.
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: fixed bug 40927: ModelProvider does not flag all entit...
details: https://code.openbravo.com/erp/devel/pi/rev/073f41cdb735
changeset: 35876:073f41cdb735
user: Asier Lostalé openbravo.com>
date: Tue May 21 15:56:38 2019 +0200
summary: fixed bug 40927: ModelProvider does not flag all entities with
images or files
They were incorrectly marked only in case their one-to-many property in parent
entity was marked to be genereted. They need to be marked in any case.
diffstat:
src/org/openbravo/base/model/ModelProvider.java | 18 ++
1 files changed, 10 insertions(+), 8 deletions(-)
diffs (35 lines):
diff -r befaa9f4d43f -r 073f41cdb735
src/org/openbravo/base/model/ModelProvider.java
--- a/src/org/openbravo/base/model/ModelProvider.java Tue May 21 13:15:48
2019 +
+++ b/src/org/openbravo/base/model/ModelProvider.java Tue May 21 15:56:38
2019 +0200
@@ -331,6 +331,16 @@
if (p.isOneToMany()) {
p.initializeName();
}
+ if (p.getReferencedProperty() != null) {
+Entity referencedEntity = p.getReferencedProperty().getEntity();
+if ("ADImage".equals(referencedEntity.getName())) {
+ entitiesWithImage.computeIfAbsent(p.getEntity(), k -> new
ArrayList<>())
+ .add(p.getName());
+} else if ("OBPRF_FILE".equals(referencedEntity.getName())) {
+ entitiesWithFile.computeIfAbsent(p.getEntity(), k -> new
ArrayList<>())
+ .add(p.getName());
+}
+ }
}
}
@@ -859,14 +869,6 @@
newProp.setOneToMany(true);
newProp.setChild(childProperty.isParent());
parentEntity.addProperty(newProp);
-
-if (parentEntity.getName().equals("ADImage")) {
- entitiesWithImage.computeIfAbsent(childProperty.getEntity(), k -> new
ArrayList<>())
- .add(childProperty.getName());
-} else if (parentEntity.getName().equals("OBPRF_FILE")) {
- entitiesWithFile.computeIfAbsent(childProperty.getEntity(), k -> new
ArrayList<>())
- .add(childProperty.getName());
-}
}
/**
___
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/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/main: 23 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/3567008be14f changeset: 35634:3567008be14f user: Javier Armendáriz openbravo.com> date: Fri Apr 12 14:54:40 2019 +0200 summary: Fixed issue 40604: NPE if email timeout is not set Adding another null check to verify not only in the case that the email config does not exist, but also that the timeout value is empty. In both cases the default timeout should be used. details: https://code.openbravo.com/erp/devel/main/rev/89116c77cd58 changeset: 35635:89116c77cd58 user: Asier Lostalé openbravo.com> date: Wed Apr 17 12:57:28 2019 +0200 summary: fixed bug 40634: 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/main/rev/c3055c4ae085 changeset: 35636:c3055c4ae085 user: Nono Carballo gmail.com> date: Tue Apr 23 11:41:35 2019 +0200 summary: Fixes issue 40638 fix match business partner by token Fix match business partner by token in import bank statement process Do properly the get in businessPartnersScroll details: https://code.openbravo.com/erp/devel/main/rev/6f0c86a72a31 changeset: 35637:6f0c86a72a31 user: Sandra Huguet openbravo.com> date: Wed Apr 24 13:20:11 2019 +0200 summary: Fixed issue 40671 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/main/rev/514d009e7897 changeset: 35638:514d009e7897 user: Nono Carballo gmail.com> date: Thu Apr 25 12:39:23 2019 +0200 summary: Fixes issue 40681: 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/main/rev/6182a34d4e8d changeset: 35639:6182a34d4e8d user: Sandra Huguet openbravo.com> date: Thu Apr 25 13:12:34 2019 +0200 summary: related to issue 40681 code review changes details: https://code.openbravo.com/erp/devel/main/rev/98ad0cda8d6f changeset: 35640:98ad0cda8d6f user: Nono Carballo gmail.com> date: Tue Apr 30 13:06:40 2019 +0200 summary: Fixes issue 40704: Escapes values printed to servlet response Escapes values before printing them to Servlet response. details: https://code.openbravo.com/erp/devel/main/rev/9296e31a9c1b changeset: 35641:9296e31a9c1b user: Asier Lostalé openbravo.com> date: Thu Apr 11 08:32:00 2019 +0200 summary: fixed issue 40712: HelpWindow.generateWindow is not using bind-variables details: https://code.openbravo.com/erp/devel/main/rev/1ea3852fd096 changeset: 35642:1ea3852fd096 user: Carlos Aristu openbravo.com> date: Thu May 02 17:24:56 2019 +0200 summary: fixes bug 40643: centralize in XMLUtils creation of objects to deal with XML details: https://code.openbravo.com/erp/devel/main/rev/a6071ba31e77 changeset: 35643:a6071ba31e77 user: Nono Carballo gmail.com> date: Thu May 02 12:00:38 2019 -0400 summary: Fixes issue 40699: 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/main/rev/210417cb1b7e changeset: 35644:210417cb1b7e user: Víctor Martínez Romanos openbravo.com> date: Fri May 03 09:54:13 2019 +0200 summary: Related to issue 40699: 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 details: https://code.openbravo.com/erp/devel/main/rev/d8689f27a689 changeset: 35645:d8689f27a689 user: Carlos Aristu openbravo.com> date: Mon May 06 10:09:03 2019 +0200 summary: fixes issue 40742: wrong export to CSV having the grid filtered by a date time After the following changeset[1], exporting the grid to CSV was not working properly having the grid filtered by a date time column. Although the fix is correct, it caused the criteria sent to the datasource in this type of requests to stop being handled properly. To avoid this problem, when exporting to CSV a grid filtered by a date time column we send in the criteria the plain date (in the same way as it is being done for the
[OpenbravoERP-commits] devel/pi: related to bug 40802: additional code improvements
details: https://code.openbravo.com/erp/devel/pi/rev/72ee96e5a9f7
changeset: 35849:72ee96e5a9f7
user: Carlos Aristu openbravo.com>
date: Mon May 20 18:06:19 2019 +0200
summary: related to bug 40802: additional code improvements
- Remove useless assignment
- Use single return statement
- Remove checks which always evaluate to true
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
| 14 +++--
1 files changed, 5 insertions(+), 9 deletions(-)
diffs (52 lines):
diff -r 2bc577948e7d -r 72ee96e5a9f7
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
Mon May 20 16:11:56 2019 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
Mon May 20 18:06:19 2019 +0200
@@ -1104,7 +1104,6 @@
this.deselectAllRecords();
if (localState.summaryFunctions) {
-hasSummaryFunction = false;
for (i = 0; i < this.getAllFields().length; i++) {
fld = this.getAllFields()[i];
// summary functions are not allowed in computed columns
@@ -1496,11 +1495,8 @@
ksAction_DeleteSelectedRecords = function () {
var isRecordDeleted = me.deleteSelectedRowsByToolbarIcon();
- if (isRecordDeleted) {
-return false; // To avoid keyboard shortcut propagation
- } else {
-return true;
- }
+ // Return false to avoid keyboard shortcut propagation
+ return isRecordDeleted ? false : true;
};
OB.KeyboardManager.Shortcuts.set('ViewGrid_DeleteSelectedRecords',
'OBViewGrid.body', ksAction_DeleteSelectedRecords);
@@ -2100,7 +2096,7 @@
getCriteria: function () {
var criteria = this.Super('getCriteria', arguments) || {};
-if ((criteria === null || !criteria.criteria) && this.initialCriteria) {
+if (!criteria.criteria && this.initialCriteria) {
criteria = isc.shallowClone(this.initialCriteria);
}
criteria = this.convertCriteria(criteria);
@@ -3237,7 +3233,7 @@
this.removeRecordFromValidationErrorList(record);
// a new id has been computed use that now
-if (record && record._newId) {
+if (record._newId) {
record.id = record._newId;
delete record._newId;
if (this.view && this.view.updateLastSelectedState) {
@@ -3706,7 +3702,7 @@
record[this.recordBaseStyleProperty] = null;
}
- if (record && record.editColumnLayout) {
+ if (record.editColumnLayout) {
isc.Log.logDebug('hideInlineEditor has record and editColumnLayout',
'OB');
record.editColumnLayout.showEditOpen();
} else if (this.currentEditColumnLayout) {
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: fixes bug 40802: "Use as filter" is not working proper...
details: https://code.openbravo.com/erp/devel/pi/rev/2bc577948e7d
changeset: 35848:2bc577948e7d
user: Carlos Aristu openbravo.com>
date: Mon May 20 16:11:56 2019 +0200
summary: fixes bug 40802: "Use as filter" is not working properly with
DateTime columns
After this changeset[1] it was fixed the ability to filter properly by a
range of DateTime values. However, this change broke the correct filtering by a
single DateTime value in this type of columns.
But when filtering a DateTime column with a single DateTime value (when not
filtering by a range of dates), in general, the idea is to use the plain date
value and build the criteria properly in the backend(See[2]).
Therefore now we are adapting the way that the criteria is build using the
"Use as Filter" menu option to generate the criteria in the same way as when
the filter is entered manually in a DateTime column. And this is done by
building the criteria to filter the DateTime column using a plain date.
[1]
https://code.openbravo.com/erp/devel/pi/rev/90ee5c965823996a7b4c0ae17d3a3ca71e3fc703
[2] https://issues.openbravo.com/view.php?id=23203
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
| 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diffs (12 lines):
diff -r 9ee5dc3a2747 -r 2bc577948e7d
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
Mon May 20 12:53:35 2019 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
Mon May 20 16:11:56 2019 +0200
@@ -2563,6 +2563,8 @@
}
// assume a date range filter item
if (isc.isA.Date(value) && field.filterEditorType ===
'OBMiniDateRangeItem') {
+// set the logicalDate property to true so that the date values
contained in the filter criteria will always be serialized as plain dates
+value.logicalDate = true;
filterFormItem.setSingleDateValue(value);
} else {
grid.filterEditor.getEditForm().setValue(field.name,
OB.Utilities.encodeSearchOperator(value));
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Related to issue 40912: Fixed dbcons
details: https://code.openbravo.com/erp/devel/pi/rev/9ee5dc3a2747 changeset: 35847:9ee5dc3a2747 user: Aaron Calero openbravo.com> date: Mon May 20 12:53:35 2019 +0200 summary: Related to issue 40912: Fixed dbcons diffstat: src-db/database/sourcedata/AD_COLUMN.xml | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (19 lines): diff -r a2d3f52ffa7a -r 9ee5dc3a2747 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Mon May 20 12:29:20 2019 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon May 20 12:53:35 2019 +0200 @@ -308794,6 +308794,7 @@ + @@ -353478,6 +353479,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/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: related to issue 40290: temporarily reverted logic
details: https://code.openbravo.com/erp/devel/pi/rev/6360fa79e464
changeset: 35844:6360fa79e464
user: Asier Lostalé openbravo.com>
date: Mon May 20 12:16:20 2019 +0200
summary: related to issue 40290: temporarily reverted logic
diffstat:
src/org/openbravo/base/model/ModelProvider.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 9e1c089e74fa -r 6360fa79e464
src/org/openbravo/base/model/ModelProvider.java
--- a/src/org/openbravo/base/model/ModelProvider.java Mon May 20 12:06:18
2019 +0200
+++ b/src/org/openbravo/base/model/ModelProvider.java Mon May 20 12:16:20
2019 +0200
@@ -837,7 +837,7 @@
*/
public boolean shouldGenerateChildPropertyInParent(Property p,
boolean generateAllChildProperties) {
-return (p.isChildPropertyInParent() || generateAllChildProperties) &&
!p.isOneToMany()
+return (true || p.isChildPropertyInParent() || generateAllChildProperties)
&& !p.isOneToMany()
&& !p.isId() && !p.isAuditInfo() && p.getReferencedProperty() != null
&& (!ENTITIES_WITHOUT_ALL_CHILD_PROPERTIES
.contains(p.getReferencedProperty().getEntity().getClassName()) ||
p.isParent())
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: 10 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/7857a7c2ab0d changeset: 35834:7857a7c2ab0d user: Aaron Calero openbravo.com> date: Wed Nov 07 09:42:12 2018 +0100 summary: [Delivery Rates] Application Dictionary definition details: https://code.openbravo.com/erp/devel/pi/rev/5ba04911ff22 changeset: 35835:5ba04911ff22 user: Aaron Calero openbravo.com> date: Tue Nov 27 18:06:43 2018 +0100 summary: [Delivery Rates] Enhanced Services Price Rules configuration details: https://code.openbravo.com/erp/devel/pi/rev/9a1270339a62 changeset: 35836:9a1270339a62 user: Aaron Calero openbravo.com> date: Wed Jan 16 12:49:55 2019 +0100 summary: [Delivery Rates] Changes after export database details: https://code.openbravo.com/erp/devel/pi/rev/ff6463c1373b changeset: 35837:ff6463c1373b user: Aaron Calero openbravo.com> date: Tue Mar 05 17:32:55 2019 +0100 summary: [Delivery Rates] Moved Maximum/Minimum fields to Posterminal details: https://code.openbravo.com/erp/devel/pi/rev/7e9b5094299e changeset: 35838:7e9b5094299e user: Aaron Calero openbravo.com> date: Mon May 06 10:50:03 2019 +0200 summary: [Delivery Rates] Fixed licensing and formatting details: https://code.openbravo.com/erp/devel/pi/rev/fe7260e68058 changeset: 35839:fe7260e68058 user: Aaron Calero openbravo.com> date: Thu May 09 13:15:22 2019 +0200 summary: [Delivery Rates] Added indexes to M_ServicePriceRule_Version on columns M_RelatedProduct_Id and M_RelatedProductCategory_Id details: https://code.openbravo.com/erp/devel/pi/rev/a141cca28d8a changeset: 35840:a141cca28d8a user: Aaron Calero openbravo.com> date: Tue May 14 09:16:20 2019 +0200 summary: [Delivery Rates] Merge with PI details: https://code.openbravo.com/erp/devel/pi/rev/d77dd3f1377a changeset: 35841:d77dd3f1377a user: Aaron Calero openbravo.com> date: Wed May 15 14:41:49 2019 +0200 summary: [Delivery Rates] Merge with PI details: https://code.openbravo.com/erp/devel/pi/rev/4401e5eb48cf changeset: 35842:4401e5eb48cf user: Aaron Calero openbravo.com> date: Fri May 17 13:22:00 2019 +0200 summary: [Delivery Rates] Merge with PI details: https://code.openbravo.com/erp/devel/pi/rev/9e1c089e74fa changeset: 35843:9e1c089e74fa user: Aaron Calero openbravo.com> date: Mon May 20 12:06:18 2019 +0200 summary: Fixed issue 40912: Improve Service Price Rules to allow configuration of specific SPRs for Products/Categories diffstat: .hgsigs | 2 + .hgtags | 2 + build.xml | 5 - legal/CPL-1.0.txt | 3 + legal/Licensing.txt | 45 +- lib/runtime/FastInfoset-1.2.15.jar |Bin lib/runtime/byte-buddy-1.8.12.jar |Bin lib/runtime/byte-buddy-1.9.10.jar |Bin lib/runtime/dom4j-1.6.1.jar |Bin lib/runtime/dom4j-2.1.1.jar |Bin lib/runtime/hibernate-commons-annotations-5.0.4.Final.jar |Bin lib/runtime/hibernate-commons-annotations-5.1.0.Final.jar |Bin lib/runtime/hibernate-core-5.3.2.Final.jar |Bin lib/runtime/hibernate-core-5.4.2.Final.jar |Bin lib/runtime/istack-commons-runtime-3.0.7.jar |Bin lib/runtime/javassist-3.22.0-GA.jar |Bin lib/runtime/javassist-3.24.0-GA.jar |Bin lib/runtime/jaxb-api-2.2.12.jar
[OpenbravoERP-commits] devel/pi: related to issue 40290: fixed merge
details: https://code.openbravo.com/erp/devel/pi/rev/f5745012a5fd changeset: 35833:f5745012a5fd user: Asier Lostalé openbravo.com> date: Mon May 20 12:04:07 2019 +0200 summary: related to issue 40290: fixed merge diffstat: src/org/openbravo/base/model/Property.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 2357e260529d -r f5745012a5fd src/org/openbravo/base/model/Property.java --- a/src/org/openbravo/base/model/Property.javaMon May 20 11:36:24 2019 +0200 +++ b/src/org/openbravo/base/model/Property.javaMon May 20 12:04:07 2019 +0200 @@ -126,6 +126,7 @@ private boolean usedSequence; private boolean isProxy; private boolean allowedCrossOrgReference; + private boolean isChildPropertyInParent; /** * Initializes this Property using the information from the Column. ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: 26 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/2256117f83a4 changeset: 35807:2256117f83a4 user: Asier Lostalé openbravo.com> date: Thu Apr 25 16:21:12 2019 +0200 summary: [dal-props] simplified if condition details: https://code.openbravo.com/erp/devel/pi/rev/f61caa4e865d changeset: 35808:f61caa4e865d user: Asier Lostalé openbravo.com> date: Thu Apr 25 16:52:12 2019 +0200 summary: [dal-props] simplified if condition details: https://code.openbravo.com/erp/devel/pi/rev/a2380b01baf8 changeset: 35809:a2380b01baf8 user: Asier Lostalé openbravo.com> date: Thu Apr 25 17:01:33 2019 +0200 summary: [dal-props] minor cleanup details: https://code.openbravo.com/erp/devel/pi/rev/b97b1d15ea83 changeset: 35810:b97b1d15ea83 user: Asier Lostalé openbravo.com> date: Fri Apr 26 08:22:44 2019 +0200 summary: [dal-props] define in AD whether child property is created in parent details: https://code.openbravo.com/erp/devel/pi/rev/ba72a852db67 changeset: 35811:ba72a852db67 user: Asier Lostalé openbravo.com> date: Fri Apr 26 09:22:37 2019 +0200 summary: [dal-props] link to parent columns always generate child property in parent details: https://code.openbravo.com/erp/devel/pi/rev/251faef79d08 changeset: 35812:251faef79d08 user: Asier Lostalé openbravo.com> date: Fri Apr 26 09:33:53 2019 +0200 summary: [dal-props] never flag columns as link to parent column when creating from DB The logic was wrong in any case as it flagged only one column in case it was just after updatedby. details: https://code.openbravo.com/erp/devel/pi/rev/ce7a374d026e changeset: 35813:ce7a374d026e user: Asier Lostalé openbravo.com> date: Tue May 07 15:39:27 2019 +0200 summary: [dal-props] merge details: https://code.openbravo.com/erp/devel/pi/rev/d01d347a48bc changeset: 35814:d01d347a48bc user: Asier Lostalé openbravo.com> date: Tue May 07 16:34:15 2019 +0200 summary: [dal-props] simplified if statement details: https://code.openbravo.com/erp/devel/pi/rev/f9617591bdbb changeset: 35815:f9617591bdbb user: Asier Lostalé openbravo.com> date: Tue May 07 16:35:40 2019 +0200 summary: [dal-props] linkToParent and properties in parent column should be independent details: https://code.openbravo.com/erp/devel/pi/rev/400a9c376855 changeset: 35816:400a9c376855 user: Asier Lostalé openbravo.com> date: Thu May 09 10:27:21 2019 +0200 summary: [hb-props] don't allow to modify new property if not in dev details: https://code.openbravo.com/erp/devel/pi/rev/f31ee7f4575e changeset: 35817:f31ee7f4575e user: Asier Lostalé openbravo.com> date: Thu May 09 10:35:25 2019 +0200 summary: [hb-props] removed outdated comment details: https://code.openbravo.com/erp/devel/pi/rev/16819b386ec6 changeset: 35818:16819b386ec6 user: Asier Lostalé openbravo.com> date: Thu May 09 10:47:16 2019 +0200 summary: [hb-props] keep backwards compatibility based on preference details: https://code.openbravo.com/erp/devel/pi/rev/513e27f438b5 changeset: 35819:513e27f438b5 user: Asier Lostalé openbravo.com> date: Thu May 09 13:00:16 2019 +0200 summary: [hb-props] properties generated due to pref are deprecated details: https://code.openbravo.com/erp/devel/pi/rev/9319e5af4481 changeset: 35820:9319e5af4481 user: Asier Lostalé openbravo.com> date: Thu May 09 13:07:13 2019 +0200 summary: [hb-pros] minor cleanup: using try with resources details: https://code.openbravo.com/erp/devel/pi/rev/7613a4e70ab3 changeset: 35821:7613a4e70ab3 user: Asier Lostalé openbravo.com> date: Thu May 09 13:26:48 2019 +0200 summary: [hb-props] show warn only when needed details: https://code.openbravo.com/erp/devel/pi/rev/676601104303 changeset: 35822:676601104303 user: Asier Lostalé openbravo.com> date: Fri May 10 11:31:17 2019 +0200 summary: [hb-pros] removed debuggin code details: https://code.openbravo.com/erp/devel/pi/rev/b582b8f28dab changeset: 35823:b582b8f28dab user: Asier Lostalé openbravo.com> date: Fri May 10 11:33:35 2019 +0200 summary: [hb-pros] updated copyright year details: https://code.openbravo.com/erp/devel/pi/rev/7acc072877a4 changeset: 35824:7acc072877a4 user: Asier Lostalé openbravo.com> date: Wed May 15 08:32:03 2019 +0200 summary: [dal-props] pi merge details: https://code.openbravo.com/erp/devel/pi/rev/cdfeaf3eb1a7 changeset: 35825:cdfeaf3eb1a7 user: Asier Lostalé openbravo.com> date: Wed May 15 13:56:57 2019 +0200 summary: [dal-props] fixed referenced child properties even not generated details: https://code.openbravo.com/erp/devel/pi/rev/e3fd56e08e6a changeset: 35826:e3fd56e08e6a user: Asier Lostalé openbravo.com> date: Wed May 15 14:34:33 2019 +0200 summary: [dal-props] sync terminology details: https://code.openbravo.com/erp/devel/pi/rev/8d004aaabef9 changeset:
[OpenbravoERP-commits] devel/pi: related to issue 40758: add test cases
details: https://code.openbravo.com/erp/devel/pi/rev/40eca50c2edc
changeset: 35806:40eca50c2edc
user: Carlos Aristu openbravo.com>
date: Mon May 20 11:08:30 2019 +0200
summary: related to issue 40758: add test cases
diffstat:
src-test/src/org/openbravo/test/AllAntTaskTests.java | 2 +
src-test/src/org/openbravo/test/dal/ImageTest.java | 99
2 files changed, 101 insertions(+), 0 deletions(-)
diffs (122 lines):
diff -r ec509bcc31cc -r 40eca50c2edc
src-test/src/org/openbravo/test/AllAntTaskTests.java
--- a/src-test/src/org/openbravo/test/AllAntTaskTests.java Mon May 20
09:20:09 2019 +0200
+++ b/src-test/src/org/openbravo/test/AllAntTaskTests.java Mon May 20
11:08:30 2019 +0200
@@ -62,6 +62,7 @@
import org.openbravo.test.dal.DalUtilTest;
import org.openbravo.test.dal.DynamicEntityTest;
import org.openbravo.test.dal.HiddenUpdateTest;
+import org.openbravo.test.dal.ImageTest;
import org.openbravo.test.dal.IssuesTest;
import org.openbravo.test.dal.MappingGenerationTest;
import org.openbravo.test.dal.OBContextTest;
@@ -180,6 +181,7 @@
ComputedColumnsTest.class, //
DatasourceEventObserver.class, //
PersistanceObserver.class, //
+ImageTest.class, //
// expression
EvaluationTest.class, //
diff -r ec509bcc31cc -r 40eca50c2edc
src-test/src/org/openbravo/test/dal/ImageTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/src-test/src/org/openbravo/test/dal/ImageTest.javaMon May 20
11:08:30 2019 +0200
@@ -0,0 +1,99 @@
+/*
+ *
+ * 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.dal;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+import java.math.BigDecimal;
+
+import org.junit.Test;
+import org.openbravo.base.exception.OBSecurityException;
+import org.openbravo.base.provider.OBProvider;
+import org.openbravo.base.weld.test.WeldBaseTest;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.model.ad.utility.Image;
+import org.openbravo.model.common.enterprise.Organization;
+import org.openbravo.model.common.plm.ProductCategory;
+import org.openbravo.test.base.TestConstants.Orgs;
+
+/**
+ * Tests the correct image handling when saving/updating/deleting entities
that have image
+ * properties.
+ */
+public class ImageTest extends WeldBaseTest {
+
+ @Test
+ public void imageIsDeleted() {
+String categoryId = createTestProductCategory();
+ProductCategory category = OBDal.getInstance().get(ProductCategory.class,
categoryId);
+assertNotNull(category.getImage());
+String imageId = category.getImage().getId();
+OBDal.getInstance().remove(category);
+OBDal.getInstance().commitAndClose();
+assertNull(OBDal.getInstance().get(Image.class, imageId));
+ }
+
+ @Test
+ public void imageOrgIsUpdated() {
+String categoryId = createTestProductCategory();
+try {
+ ProductCategory category =
OBDal.getInstance().get(ProductCategory.class, categoryId);
+
category.setOrganization(OBDal.getInstance().getProxy(Organization.class,
Orgs.ESP));
+ OBDal.getInstance().flush();
+ assertThat(category.getImage().getOrganization().getId(),
equalTo(Orgs.ESP));
+} catch (OBSecurityException ex) {
+ OBDal.getInstance().rollbackAndClose();
+ fail(ex.getMessage());
+} finally {
+ cleanUp(categoryId);
+}
+ }
+
+ private String createTestProductCategory() {
+ProductCategory category =
OBProvider.getInstance().get(ProductCategory.class);
+category.setOrganization(OBDal.getInstance().getProxy(Organization.class,
Orgs.US));
+category.setSearchKey("TestCategory");
+category.setName("TestCategory");
+category.setPlannedMargin(new BigDecimal(0));
+
+Image img = OBProvider.getInstance().get(Image.class);
+
[OpenbravoERP-commits] devel/pi: fixes bug 40758: Skip cross org check for image proper...
details: https://code.openbravo.com/erp/devel/pi/rev/ec509bcc31cc
changeset: 35805:ec509bcc31cc
user: Carlos Aristu openbravo.com>
date: Mon May 20 09:20:09 2019 +0200
summary: fixes bug 40758: Skip cross org check for image properties
The OBInterceptor has a mechanism (cross org check) that verifies whether the
organization of the main entity is in the same natural tree that the
organization of the entities referenced by the properties of the main entity.
This check is performed every time an entity is update/saved through DAL and it
is done before the execution of any event observer.
In the case of this issue, this mechanism was not allowing to save the record
because when changing the organization of an entity, if this entity had a
property referencing to an AD_Image, the organization of the AD_Image was not
being updated accordingly, which could cause the cross org check fail.
To fix this, we are now skipping the cross org check in the OBInterceptor for
those properties referencing to an AD_Image record and with the
RemoveImagesEventHandler observer, if the org in the main entity is changed, we
put exactly the same org in every AD_Image referenced by that entity.
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/event/RemoveImagesEventHandler.java
| 36 ++---
src/org/openbravo/base/model/Property.java
| 15 +++-
src/org/openbravo/dal/core/OBInterceptor.java
| 4 +-
3 files changed, 42 insertions(+), 13 deletions(-)
diffs (110 lines):
diff -r 1596542c21af -r ec509bcc31cc
modules/org.openbravo.client.application/src/org/openbravo/client/application/event/RemoveImagesEventHandler.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/RemoveImagesEventHandler.java
Fri May 17 11:14:19 2019 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/RemoveImagesEventHandler.java
Mon May 20 09:20:09 2019 +0200
@@ -36,8 +36,15 @@
import org.openbravo.dal.service.OBCriteria;
import org.openbravo.dal.service.OBDal;
import org.openbravo.model.ad.utility.Image;
+import org.openbravo.model.common.enterprise.Organization;
import org.openbravo.model.common.plm.Product;
+/**
+ * This observer takes care of deleting an image detected as no longer needed
after removing the
+ * last record referencing it. Besides, in case the organization of an entity
having image
+ * properties is updated, this observer will update the referenced images by
setting the same
+ * organization.
+ */
class RemoveImagesEventHandler extends EntityPersistenceEventObserver {
private static Entity[] entities = getImageEntities();
@@ -125,27 +132,34 @@
return;
}
+Property orgProperty =
event.getTargetInstance().getEntity().getProperty("organization");
+
// Iterate image properties of the entity
for (String property :
getImageProperties(event.getTargetInstance().getEntity())) {
Property imageProperty =
event.getTargetInstance().getEntity().getProperty(property);
+ Image bob = (Image) event.getPreviousState(imageProperty);
+ if (bob == null) {
+continue;
+ }
// If the old image is different than the new one remove the old image
if exists
if (event.getPreviousState(imageProperty) != null
&& event.getCurrentState(imageProperty) !=
event.getPreviousState(imageProperty)) {
-
-Image bob = (Image) event.getPreviousState(imageProperty);
-if (bob != null) {
- String selectedProduct = event.getId();
- if (!checkImageUtilization(selectedProduct, bob)) {
-OBContext.setAdminMode(true);
-try {
- OBDal.getInstance().remove(bob);
-} finally {
- OBContext.restorePreviousMode();
-}
+String selectedProduct = event.getId();
+if (!checkImageUtilization(selectedProduct, bob)) {
+ OBContext.setAdminMode(true);
+ try {
+OBDal.getInstance().remove(bob);
+ } finally {
+OBContext.restorePreviousMode();
}
}
+ } else if (event.getPreviousState(orgProperty) != null
+ && event.getCurrentState(orgProperty) !=
event.getPreviousState(orgProperty)) {
+// The ad_org_id of the parent entity has changed, update the
ad_org_id of the referenced
+// image to be the same
+bob.setOrganization((Organization) event.getCurrentState(orgProperty));
}
}
}
diff -r 1596542c21af -r ec509bcc31cc src/org/openbravo/base/model/Property.java
--- a/src/org/openbravo/base/model/Property.javaFri May 17 11:14:19
2019 +0200
+++ b/src/org/openbravo/base/model/Property.javaMon May 20 09:20:09
2019 +0200
@@ -11,7 +11,7 @@
* under the
[OpenbravoERP-commits] devel/pi: fixed bug 40897: broken system if tying to create a ws...
details: https://code.openbravo.com/erp/devel/pi/rev/1596542c21af
changeset: 35804:1596542c21af
user: Asier Lostalé openbravo.com>
date: Fri May 17 11:14:19 2019 +0200
summary: fixed bug 40897: broken system if tying to create a ws row with
unlimited WS
System became unreacheable after trtying to create/update a record through WS
as first action after Tomcat restart having unlimited WS access license.
This occurred because TreeTablesEventHandler initialization assumed to be in
admin mode. As unlimited access license does not do any DB modification on
login,
which is what occurs in standard login and with limited acess licenses, first
flush with dirty entities causes TreeTablesEventHandler init to fail in a
unrecoverable manner.
Now TreeTablesEventHandler is initialized in admin mode to prevent this case.
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TreeTablesEventHandler.java
| 19 ++---
1 files changed, 12 insertions(+), 7 deletions(-)
diffs (29 lines):
diff -r 59e2bd0cc7fa -r 1596542c21af
modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TreeTablesEventHandler.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TreeTablesEventHandler.java
Fri May 17 09:49:39 2019 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TreeTablesEventHandler.java
Fri May 17 11:14:19 2019 +0200
@@ -164,13 +164,18 @@
}
private static Entity[] getTreeTables() {
-OBCriteria treeTablesCriteria =
OBDal.getInstance().createCriteria(Table.class);
-treeTablesCriteria.add(Restrictions.eq(Table.PROPERTY_ISTREE, true));
-List treeTableList = treeTablesCriteria.list();
-ArrayList entityArray = new ArrayList<>();
-for (Table treeTable : treeTableList) {
-
entityArray.add(ModelProvider.getInstance().getEntityByTableId(treeTable.getId()));
+OBContext.setAdminMode(true);
+try {
+ OBCriteria treeTablesCriteria =
OBDal.getInstance().createCriteria(Table.class);
+ treeTablesCriteria.add(Restrictions.eq(Table.PROPERTY_ISTREE, true));
+ List treeTableList = treeTablesCriteria.list();
+ ArrayList entityArray = new ArrayList<>();
+ for (Table treeTable : treeTableList) {
+
entityArray.add(ModelProvider.getInstance().getEntityByTableId(treeTable.getId()));
+ }
+ return entityArray.toArray(new Entity[entityArray.size()]);
+} finally {
+ OBContext.restorePreviousMode();
}
-return entityArray.toArray(new Entity[entityArray.size()]);
}
}
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: related to issue 40747: improved comment
details: https://code.openbravo.com/erp/devel/pi/rev/59e2bd0cc7fa
changeset: 35803:59e2bd0cc7fa
user: Asier Lostalé openbravo.com>
date: Fri May 17 09:49:39 2019 +0200
summary: related to issue 40747: improved comment
diffstat:
src/org/openbravo/service/importprocess/ImportEntryManager.java | 9 +
1 files changed, 5 insertions(+), 4 deletions(-)
diffs (20 lines):
diff -r 147621d18a4d -r 59e2bd0cc7fa
src/org/openbravo/service/importprocess/ImportEntryManager.java
--- a/src/org/openbravo/service/importprocess/ImportEntryManager.java Fri May
03 03:07:04 2019 +0530
+++ b/src/org/openbravo/service/importprocess/ImportEntryManager.java Fri May
17 09:49:39 2019 +0200
@@ -629,11 +629,12 @@
// a next batch of entries to prevent retrieving from DB the
same records we have just
// handled in this cycle
try {
-// wait processingCapacityPerSecond which is the expected
entries number of entries
-// that can be processed per second, it defaults to one second
per 30 records per
+// wait a time based on the number of processed entries and
+// processingCapacityPerSecond (which is the expected number
of entries that can be
+// processed per second), it defaults to one second per 30
records per
// thread, somewhat arbitrary but high enough for most cases,
also always wait 300
-// milliseconds additional to start up threads etc.
-// note computation of timing ensures that int rounding is
done on 1000* entrycount
+// milliseconds additional to start up threads etc. note
computation of timing
+// ensures that int rounding is done on 1000* entrycount
// wait minimal 2 seconds or based on entry count, no minimal
wait in case of test
int minWait = isTest ? 0 : 2_000;
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: 5 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/6a3c5d03c3ef changeset: 35798:6a3c5d03c3ef user: Atul Gaware openbravo.com> date: Thu Apr 25 11:02:12 2019 +0530 summary: Fixes Issue 35788, Issue 40557:Remove obsolete & disabled old aprm code ** Exported v3 data set prior to remove form, process access ** Remove AccountsTransaction old tab and its fields ** Remove Form AccountsTransactions, model object, model object mapping ** Remove Transactions.html, Transactions.java, Transactions.xml ** Remove text interfaces related to Transactions.html ** Remove form access from V3Dataset, sample data in FnB Group, QA Testing ** Remove prepareRelationTemplateNoSearch method that was used in Transactions.java, Also remove isRelation variable as it was only set in prepareRelationTemplateNoSearch and no more used. ** Remove Match Statement, Match Statement Force process, its model object, model object mapping. ** Remove MatchTransaction.html, MatchTransaction.java, MatchTransaction.xml and MatchTransactionGrid.srpt, MatchTransactionGrid.xml ** Remove text interfaces for MatchTransaction.html ** Remove unused methods from MatchTransactionDao that were used in MatchTransction.java ** Remove form access in v3Dataset, FnB International Group, QA Testing ** Remove process AddOrderOrInvoice, model object, its model object mapping ** Remove AddOrderOrInvoice.java, AddOrderOrInvoice.html, AddOrderOrInvoice.xml ** Remove text interfaces for AddOrderOrInvoice.html ** Remove process access in v3 Dataset, F International Group, QA Testing ** Remove process AddPaymentFromInvoice, model object, model object mapping ** Remove text interfaces for AddPaymentFromInvoice.html ** Remove AddPaymentFromInvoice.java, AddPaymentFromInvoice.html, AddPaymentFromInvoice.xml, AddPaymentGrid.xml, AddPaymentGrid.srpt ** Remove process access in v3 Dataset, F International Group, QA Testing ** Remove process AddPaymentFromTransaction, model object & its mapping ** Remove AddPaymentFromTransaction.html, AddPaymentFromTransaction.java, AddPaymentFromTransaction.xml, AddPaymentFromTransactionGrid.srpt, AddPaymentFromTransactionGrid,xml ** Remove text interfaces for AddPaymentFromTransaction.html ** Remove process access for AddPaymentFromTransaction in QA Testing & F International Group Client ** Remove AddTransaction field, column, process from financial account window account tab, its model object, model object mapping. ** Remove column from financial account table. ** Remove AddTransaction.html, AddTransaction.java, AddTransaction.xml, AddTransactionGrid.srpt, AddTransactionGrid.srpt. ** Remove text interfaces for AddTransaction.html, AddTransactionGrid.srpt ** Remove process access in v3Dataset, F International Group, QA Testing ** Remove values for removed column from sample data ** Remove process SelectExpectedPayment, its model object & mapping ** Remove SelectExpectedPayments.java, SelectExpectedPayments.html, SelectExpectedPayments.xml, AddPaymentProposalGrid.srpt, AddPaymentProposalGrid.xml ** Remove text interfaces for SelectExpectedPayments & Grid ** Remove process access in v3Dataset, F International Group, QA Testing ** Remove unused methods in AdvPaymentMngtDao, TransactionsDao, MatchTransactionDao ** Remove AD_Message for APRM_FATS_* (except APRM_FATS_BPARTNER), APRM_bpmandatory_creditrefund, APRM_LinesAmountMismatch ** Remove AD_ELEMENT for EM_APRM_ADDTRANSACTIONS column. details: https://code.openbravo.com/erp/devel/pi/rev/7fa78055252e changeset: 35799:7fa78055252e user: Atul Gaware openbravo.com> date: Thu Apr 25 14:49:30 2019 +0530 summary: Related To Issue 35788, Issue 40557:Remove obsolete & disabled old aprm code **Remove deprecated methods that are not used in core as well as external modules. **AdvPaymentMngtDao - getFilteredPaymentMethods **AdvPaymentMngtDao - getFilteredFinancialAccounts **AdvPaymentMngtDao - getCustomerCredit **AdvPaymentMngtDao - getCustomerPaymentsWithCredit ** MatchTransactionDao - getReconciliationPending ** MatchTransactionDao - getReconciliationEndingBalance ** TransactionsDao - process details: https://code.openbravo.com/erp/devel/pi/rev/86ca5f1688dd changeset: 35800:86ca5f1688dd user: Atul Gaware openbravo.com> date: Tue Apr 30 14:51:23 2019 +0530 summary: Fixes Issue 40469:CreateFrom cleanup ** Remove printPageBank, CreateFrom_Bank.html, xml, xsql. ** Remove printPagePay. ** Remove printPageSettlement, CreateFrom_Settlement.html, xml, xsql. ** Remove printPageDPManagement, CreateFrom_DPManagement.html, xml, xsql. ** Remove printPageCRemittance, CreateFrom_CRemittance.html, xml, xsql. ** Remove unused ad_message, ad_textinterfaces for above html files. details: https://code.openbravo.com/erp/devel/pi/rev/aef2b99aa990 changeset: 35801:aef2b99aa990 user: Atul Gaware openbravo.com> date: Fri May 03 02:58:20 2019 +0530 summary: Fixes Issue 40558:Review and possibly remove old pre-aprm CreateFile (aka c_settlement_createFile)
