[OpenbravoERP-commits] devel/pi: 2 new changesets

2018-05-15 Thread hg
details:   https://code.openbravo.com/erp/devel/pi/rev/79b08258a2aa
changeset: 33961:79b08258a2aa
user:  RM packaging bot  openbravo.com>
date:  Tue May 15 18:18:15 2018 +
summary:   CI: update AD_MODULE to version 33960

details:   https://code.openbravo.com/erp/devel/pi/rev/3470c011cf77
changeset: 33962:3470c011cf77
user:  RM packaging bot  openbravo.com>
date:  Tue May 15 18:32:09 2018 +
summary:   CI: merge back from main

diffstat:

 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml  
   |   2 +-
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |   4 +-
 
modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml
   |   2 +-
 
modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|   2 +-
 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml   
   |   2 +-
 
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   |   2 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
 |   2 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |   8 +-
 
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
  |   2 +-
 
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   |   2 +-
 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml   
   |   2 +-
 
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   |   6 +-
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml 
   |   2 +-
 
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
 |   4 +-
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml 
  |   2 +-
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|   2 +-
 modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml  
   |   2 +-
 
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |   2 +-
 
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
|   2 +-
 
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
 |   2 +-
 
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
 |   2 +-
 
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |   2 +-
 
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
 |   2 +-
 
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |  10 ++--
 
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
 |   2 +-
 
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |   4 +-
 
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
 |   2 +-
 
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |   2 +-
 modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
   |   2 +-
 
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|   2 +-
 
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
 |   2 +-
 
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |  12 ++--
 
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
|   2 +-
 
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
 |   2 +-
 
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
  |   2 +-
 
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   |   6 +-
 
modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml
|   2 +-
 
modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
 |   2 +-
 

[OpenbravoERP-commits] devel/main: 6 new changesets

2018-05-15 Thread hg
details:   https://code.openbravo.com/erp/devel/main/rev/8642b9530182
changeset: 33956:8642b9530182
user:  Atul Gaware  openbravo.com>
date:  Mon May 14 18:13:00 2018 +0530
summary:   Fixes Issue 38521: Operative quantity in goods shipment line
field gets overridden when using Create Lines From
functionality

Modifying AUM qty as per on hand qty in product selector
to be done only when receipt/shipment line is not linked
with order line

details:   https://code.openbravo.com/erp/devel/main/rev/32cfd33daee1
changeset: 33957:32cfd33daee1
user:  Alvaro Ferraz  openbravo.com>
date:  Mon May 14 18:21:41 2018 +0200
summary:   Related to issue 38521: Code review improvements

details:   https://code.openbravo.com/erp/devel/main/rev/844e420a74a6
changeset: 33958:844e420a74a6
user:  RM packaging bot  openbravo.com>
date:  Mon May 14 19:29:02 2018 +
summary:   CI: merge back from main

details:   https://code.openbravo.com/erp/devel/main/rev/4bf53115b637
changeset: 33959:4bf53115b637
user:  Armaignac  gmail.com>
date:  Tue May 01 18:01:20 2018 -0400
summary:   Fixes issue 38386: Same search key can be used twice in warehouse 
definition

The same Search Key in warehouse and storage bin can be used twice because a 
missing
constraint

An unique constraints was added to warehouse definition.

details:   https://code.openbravo.com/erp/devel/main/rev/78f6e305eb5e
changeset: 33960:78f6e305eb5e
user:  Atul Gaware  openbravo.com>
date:  Tue May 15 15:33:25 2018 +0530
summary:   Related to issue 38386: Same search key can be used twice in
warehouse definition

A build validation to check whether there exists a warehouse
with same value within client to avoid failure of build
when adding a unique constraint for client and value in
m_warehouse table.

details:   https://code.openbravo.com/erp/devel/main/rev/79b08258a2aa
changeset: 33961:79b08258a2aa
user:  RM packaging bot  openbravo.com>
date:  Tue May 15 18:18:15 2018 +
summary:   CI: update AD_MODULE to version 33960

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 

[OpenbravoERP-commits] devel/pi: 2 new changesets

2018-05-15 Thread hg
details:   https://code.openbravo.com/erp/devel/pi/rev/4bf53115b637
changeset: 33959:4bf53115b637
user:  Armaignac  gmail.com>
date:  Tue May 01 18:01:20 2018 -0400
summary:   Fixes issue 38386: Same search key can be used twice in warehouse 
definition

The same Search Key in warehouse and storage bin can be used twice because a 
missing
constraint

An unique constraints was added to warehouse definition.

details:   https://code.openbravo.com/erp/devel/pi/rev/78f6e305eb5e
changeset: 33960:78f6e305eb5e
user:  Atul Gaware  openbravo.com>
date:  Tue May 15 15:33:25 2018 +0530
summary:   Related to issue 38386: Same search key can be used twice in
warehouse definition

A build validation to check whether there exists a warehouse
with same value within client to avoid failure of build
when adding a unique constraint for client and value in
m_warehouse table.

diffstat:

 src-db/database/model/tables/M_WAREHOUSE.xml   
   |6 +-
 
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedClientWarehouseValue.class
 |  Bin 
 
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedClientWarehouseValueData.class
 |  Bin 
 
src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedClientWarehouseValue.java
|   62 ++
 
src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedClientWarehouseValue_data.xsql
   |   49 +++
 5 files changed, 116 insertions(+), 1 deletions(-)

diffs (141 lines):

diff -r 844e420a74a6 -r 78f6e305eb5e 
src-db/database/model/tables/M_WAREHOUSE.xml
--- a/src-db/database/model/tables/M_WAREHOUSE.xml  Mon May 14 19:29:02 
2018 +
+++ b/src-db/database/model/tables/M_WAREHOUSE.xml  Tue May 15 15:33:25 
2018 +0530
@@ -97,8 +97,12 @@
 
   
   
+
 
-
+  
+  
+
+
   
   
   
diff -r 844e420a74a6 -r 78f6e305eb5e 
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedClientWarehouseValue.class
Binary file 
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedClientWarehouseValue.class
 has changed
diff -r 844e420a74a6 -r 78f6e305eb5e 
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedClientWarehouseValueData.class
Binary file 
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedClientWarehouseValueData.class
 has changed
diff -r 844e420a74a6 -r 78f6e305eb5e 
src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedClientWarehouseValue.java
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ 
b/src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedClientWarehouseValue.java
Tue May 15 15:33:25 2018 +0530
@@ -0,0 +1,62 @@
+/*
+ *
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2018 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  __.
+ 
+ */
+package org.openbravo.buildvalidation;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.openbravo.base.ExecutionLimits;
+import org.openbravo.buildvalidation.BuildValidation;
+import org.openbravo.database.ConnectionProvider;
+import org.openbravo.modulescript.OpenbravoVersion;
+
+/**
+ * This validation is related to Issue 0038386: Same search key can be used 
twice in warehouse
+ * definition
+ */
+
+public class DuplicatedClientWarehouseValue extends BuildValidation {
+  @Override
+  public List execute() {
+ConnectionProvider cp = getConnectionProvider();
+ArrayList errors = new ArrayList();
+try {
+  if 
(DuplicatedClientWarehouseValueData.existsDuplicatedClientWarehouseValue(cp)) {
+DuplicatedClientWarehouseValueData[] clientWarehouse = 
DuplicatedClientWarehouseValueData
+.duplicatedClientWarehouseValue(cp);
+errors
+.add("Due to a database constraint modification, is no longer 
allowed to "
++ "have the same Warehouse search key more than once within 
client. "
++