date:20180920

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

2018-09-20 Thread hg

details:   https://code.openbravo.com/erp/devel/pi/rev/ca4fbc83aa05
changeset: 34783:ca4fbc83aa05
user:  RM packaging bot  openbravo.com>
date:  Thu Sep 20 23:59:36 2018 +
summary:   CI: update AD_MODULE to version 34782

details:   https://code.openbravo.com/erp/devel/pi/rev/ef2e1f127dad
changeset: 34784:ef2e1f127dad
user:  RM packaging bot  openbravo.com>
date:  Fri Sep 21 00:17:29 2018 +
summary:   CI: merge back from main

diffstat:

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

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

2018-09-20 Thread hg

details:   https://code.openbravo.com/erp/devel/main/rev/85f5194946aa
changeset: 34779:85f5194946aa
user:  RM packaging bot  openbravo.com>
date:  Mon Sep 17 11:08:27 2018 +
summary:   CI: merge back from main

details:   https://code.openbravo.com/erp/devel/main/rev/b3ead782e3e7
changeset: 34780:b3ead782e3e7
user:  Javier Armendáriz  openbravo.com>
date:  Wed Sep 12 09:27:14 2018 +0200
summary:   Fixed issue 38173: Removed all code related to Registration popup.

This commit removes:
- AD info regarding registration form
- AD_Registration_Info table
- JS References to registration popup

details:   https://code.openbravo.com/erp/devel/main/rev/484a4cb67c8c
changeset: 34781:484a4cb67c8c
user:  Asier Lostalé  openbravo.com>
date:  Thu Sep 20 14:52:14 2018 +0200
summary:   related to issue 39229: don't use source path for updating ref data

details:   https://code.openbravo.com/erp/devel/main/rev/5e148ccda173
changeset: 34782:5e148ccda173
user:  Carlos Aristu  openbravo.com>
date:  Thu Sep 20 17:45:30 2018 +0200
summary:   related to issue 39229: update copyright year

details:   https://code.openbravo.com/erp/devel/main/rev/ca4fbc83aa05
changeset: 34783:ca4fbc83aa05
user:  RM packaging bot  openbravo.com>
date:  Thu Sep 20 23:59:36 2018 +
summary:   CI: update AD_MODULE to version 34782

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_MENU.xml 
 |   14 -
 
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/src-db/database/sourcedata/AD_TREENODE.xml
  |   11 -
 
modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_MENU_PARAMETERS.xml
  |   25 -
 
modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml
|   11 -
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js
 |   16 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-layout.js
   |6 -
 
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 +-

[OpenbravoERP-commits] devel/pi: related to issue 39229: update copyright year

2018-09-20 Thread hg

details:   https://code.openbravo.com/erp/devel/pi/rev/5e148ccda173
changeset: 34782:5e148ccda173
user:  Carlos Aristu  openbravo.com>
date:  Thu Sep 20 17:45:30 2018 +0200
summary:   related to issue 39229: update copyright year

diffstat:

 src/org/openbravo/erpCommon/businessUtility/COAUtility.java |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 484a4cb67c8c -r 5e148ccda173 
src/org/openbravo/erpCommon/businessUtility/COAUtility.java
--- a/src/org/openbravo/erpCommon/businessUtility/COAUtility.java   Thu Sep 
20 14:52:14 2018 +0200
+++ b/src/org/openbravo/erpCommon/businessUtility/COAUtility.java   Thu Sep 
20 17:45:30 2018 +0200
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2017 Openbravo SLU
+ * All portions are Copyright (C) 2010-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  __.
  


___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

[OpenbravoERP-commits] devel/pi: related to issue 39229: don't use source path for upda...

2018-09-20 Thread hg

details:   https://code.openbravo.com/erp/devel/pi/rev/484a4cb67c8c
changeset: 34781:484a4cb67c8c
user:  Asier Lostalé  openbravo.com>
date:  Thu Sep 20 14:52:14 2018 +0200
summary:   related to issue 39229: don't use source path for updating ref data

diffstat:

 src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData.java|  33 
+
 src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData_data.xsql   |   6 +-
 src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java |   2 +-
 3 files changed, 23 insertions(+), 18 deletions(-)

diffs (128 lines):

diff -r b3ead782e3e7 -r 484a4cb67c8c 
src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData.java
--- a/src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData.java Wed Sep 
12 09:27:14 2018 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData.java Thu Sep 
20 14:52:14 2018 +0200
@@ -11,14 +11,13 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2008-2017 Openbravo SLU
+ * All portions are Copyright (C) 2008-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  __.
  
  */
 package org.openbravo.erpCommon.ad_forms;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -31,8 +30,10 @@
 import org.openbravo.base.filter.IsIDFilter;
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.database.ConnectionProvider;
+import org.openbravo.erpCommon.businessUtility.InitialSetupUtility;
 import org.openbravo.erpCommon.businessUtility.WindowTabs;
 import org.openbravo.erpCommon.modules.ModuleReferenceDataOrgTree;
 import org.openbravo.erpCommon.modules.ModuleUtiltiy;
@@ -43,6 +44,7 @@
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.model.ad.module.Module;
 import org.openbravo.model.ad.system.Client;
+import org.openbravo.model.ad.utility.DataSet;
 import org.openbravo.model.common.enterprise.Organization;
 import org.openbravo.service.db.DalConnectionProvider;
 import org.openbravo.service.db.DataImportService;
@@ -211,24 +213,27 @@
 
 StringBuffer strError = new StringBuffer("");
 for (int j = 0; j < data.length; j++) {
-  String strPath = vars.getSessionValue("#SOURCEPATH");
-  if (!data[j].javapackage.equals("org.openbravo"))
-strPath = strPath + "/modules/" + data[j].javapackage;
-  strPath = strPath + "/referencedata/standard";
-  File datasetFile = new File(strPath + "/" + 
Utility.wikifiedName(data[j].datasetname)
-  + ".xml");
-  if (!datasetFile.exists()) {
-continue;
-  }
+  String fileName = Utility.wikifiedName(data[j].datasetname);
   if (UpdateReferenceDataData.existsOrgModule(cp, vars.getClient(), 
strOrganization,
   data[j].adModuleId, data[j].version).equals("0")) {
 // Not installed previously
-String strXml = Utility.fileToString(datasetFile.getPath());
+OBContext.setAdminMode(true);
+String strXml;
+try {
+  strXml = 
InitialSetupUtility.getDatasetContent(OBDal.getInstance().get(DataSet.class,
+  data[j].adDatasetId));
+} catch (IOException ignore) {
+  log4j.error("Error updating reference data for " + fileName, 
ignore);
+  continue;
+} finally {
+  OBContext.restorePreviousMode();
+}
+
 ImportResult myResult = myData.importDataFromXML(
 OBDal.getInstance().get(Client.class, vars.getClient()),
 OBDal.getInstance().get(Organization.class, strOrganization), 
strXml, OBDal
 .getInstance().get(Module.class, data[j].adModuleId), 
true);
-m_info.append(SALTO_LINEA).append("File: 
").append(datasetFile.getName()).append(":")
+m_info.append(SALTO_LINEA).append("File: 
").append(fileName).append(":")
 .append(SALTO_LINEA);
 if (myResult.getLogMessages() != null && 
!myResult.getLogMessages().equals("")
 && !myResult.getLogMessages().equals("null")) {
@@ -262,7 +267,7 @@
   .append(SALTO_LINEA);
 }
   } else {
-m_info.append(SALTO_LINEA).append("File: 
").append(datasetFile.getName()).append(":")
+m_info.append(SALTO_LINEA).append("File: 
").append(fileName).append(":")
 .append(SALTO_LINEA);
 m_info
 .append(SALTO_LINEA)
diff -r b3ead782e3e7 -r 484a4cb67c8c

[OpenbravoERP-commits] devel/pi: Fixed issue 38173: Removed all code related to Registr...

2018-09-20 Thread hg

details:   https://code.openbravo.com/erp/devel/pi/rev/b3ead782e3e7
changeset: 34780:b3ead782e3e7
user:  Javier Armendáriz  openbravo.com>
date:  Wed Sep 12 09:27:14 2018 +0200
summary:   Fixed issue 38173: Removed all code related to Registration popup.

This commit removes:
- AD info regarding registration form
- AD_Registration_Info table
- JS References to registration popup

diffstat:

 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MENU.xml 
 |   14 -
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TREENODE.xml
  |   11 -
 
modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_MENU_PARAMETERS.xml
  |   25 -
 
modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml
|   11 -
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js
 |   16 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-layout.js
   |6 -
 referencedata/sampledata/F_B_International_Group/AD_FORM_ACCESS.xml
  |  140 ---
 referencedata/sampledata/F_B_International_Group/OBUIAPP_VIEW_ROLE_ACCESS.xml  
  |  130 ---
 referencedata/sampledata/QA_Testing/AD_FORM_ACCESS.xml 
  |   42 -
 referencedata/sampledata/QA_Testing/OBUIAPP_VIEW_ROLE_ACCESS.xml   
  |   38 -
 src-db/database/build-create.xml   
  |6 -
 src-db/database/model/postscript-Oracle.sql
  |   11 -
 src-db/database/model/postscript-PostgreSql.sql
  |   34 -
 src-db/database/model/tables/AD_REGISTRATION_INFO.xml  
  |   55 -
 src-db/database/model/triggers/AD_REGISTRATION_INFO_TRG.xml
  |   38 -
 src-db/database/sourcedata/AD_COLUMN.xml   
  |  425 --
 src-db/database/sourcedata/AD_DATASET_TABLE.xml
  |   14 -
 src-db/database/sourcedata/AD_ELEMENT.xml  
  |   40 -
 src-db/database/sourcedata/AD_FORM.xml 
  |   13 -
 src-db/database/sourcedata/AD_MESSAGE.xml  
  |   14 -
 src-db/database/sourcedata/AD_MODEL_OBJECT.xml 
  |   12 -
 src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml 
  |   10 -
 src-db/database/sourcedata/AD_TABLE.xml
  |   23 -
 src-db/database/sourcedata/AD_TEXTINTERFACES.xml   
  |   44 -
 src-test/src/org/openbravo/test/role/inheritance/AccessPropagation.java
  |   20 +-
 src-test/src/org/openbravo/test/role/inheritance/DeletedAccessPropagation.java 
  |   19 +-
 src-test/src/org/openbravo/test/role/inheritance/HorizontalInheritance.java
  |   23 +-
 src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceTestUtils.java 
  |  111 ++-
 src-test/src/org/openbravo/test/role/inheritance/VerticalInheritance.java  
  |   19 +-
 src/org/openbravo/erpCommon/ad_forms/Heartbeat.html
  |   14 -
 src/org/openbravo/erpCommon/ad_forms/Heartbeat.java
  |5 -
 src/org/openbravo/erpCommon/ad_forms/Heartbeat.xml 
  |3 +-
 src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java  
  |4 -
 src/org/openbravo/erpCommon/ad_forms/ModuleManagement_LocalChanges.html
  |   16 +-
 src/org/openbravo/erpCommon/ad_forms/Register_data.xsql
  |   44 -
 src/org/openbravo/erpCommon/ad_forms/Registration.html

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

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

[OpenbravoERP-commits] devel/pi: related to issue 39229: update copyright year

[OpenbravoERP-commits] devel/pi: related to issue 39229: don't use source path for upda...

[OpenbravoERP-commits] devel/pi: Fixed issue 38173: Removed all code related to Registr...

5 matches

Site Navigation

Mail list logo

Footer information