CI: merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Thu, 22 Feb 2018 17:13:18 +0000
changeset 33547 c4ccb5d59890
parent 33546 72f923b76be5 (diff)
parent 33543 980a6ad5bbf5 (current diff)
child 33548 4949275527c9
CI: merge back from main
src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/model/tables/M_INVENTORYLINE.xml	Thu Feb 22 16:58:36 2018 +0000
+++ b/src-db/database/model/tables/M_INVENTORYLINE.xml	Thu Feb 22 17:13:18 2018 +0000
@@ -119,6 +119,10 @@
       <index name="M_INVENTORYLINE_INVENTORY" unique="false">
         <index-column name="M_INVENTORY_ID"/>
       </index>
+      <index name="M_INVENTORYLINE_INVENTORYLINE" unique="false">
+        <index-column name="RELATEDINVENTORYLINEID"/>
+        <whereClause><![CDATA[RELATEDINVENTORYLINEID IS NOT NULL]]></whereClause>
+      </index>
       <index name="M_INVENTORYLINE_PRODUCT" unique="false">
         <index-column name="M_PRODUCT_ID"/>
       </index>
--- a/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 22 16:58:36 2018 +0000
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 22 17:13:18 2018 +0000
@@ -22,7 +22,7 @@
 <!--0-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--0-->  <REFERENCEDATAINFO><![CDATA[Standard document types for orders, invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--0-->  <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
 <!--0-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--0--></AD_MODULE>
--- a/src-db/database/sourcedata/AD_TABLE_TREE.xml	Thu Feb 22 16:58:36 2018 +0000
+++ b/src-db/database/sourcedata/AD_TABLE_TREE.xml	Thu Feb 22 17:13:18 2018 +0000
@@ -113,7 +113,7 @@
 <!--6C111DA125CF407C976768B301D6AF26-->  <TREESTRUCTURE><![CDATA[LinkToParent]]></TREESTRUCTURE>
 <!--6C111DA125CF407C976768B301D6AF26-->  <ISHANDLENODESMANUALLY><![CDATA[N]]></ISHANDLENODESMANUALLY>
 <!--6C111DA125CF407C976768B301D6AF26-->  <ISMAINTREE><![CDATA[Y]]></ISMAINTREE>
-<!--6C111DA125CF407C976768B301D6AF26-->  <NODEDELETIONPOLICY><![CDATA[DNAIHC]]></NODEDELETIONPOLICY>
+<!--6C111DA125CF407C976768B301D6AF26-->  <NODEDELETIONPOLICY><![CDATA[RCN]]></NODEDELETIONPOLICY>
 <!--6C111DA125CF407C976768B301D6AF26--></AD_TABLE_TREE>
 
 <!--8CA3833994EA4CF0B535A56307C5A11A--><AD_TABLE_TREE>
--- a/src/org/openbravo/event/ProductCharacteristicValueEventHandler.java	Thu Feb 22 16:58:36 2018 +0000
+++ b/src/org/openbravo/event/ProductCharacteristicValueEventHandler.java	Thu Feb 22 17:13:18 2018 +0000
@@ -45,7 +45,8 @@
 
 public class ProductCharacteristicValueEventHandler extends EntityPersistenceEventObserver {
   private static final int IMPORT_ENTRY_SIZE = 100;
-  protected Logger logger = LoggerFactory.getLogger(this.getClass());
+  private static Logger logger = LoggerFactory
+      .getLogger(ProductCharacteristicValueEventHandler.class);
   private static Entity[] entities = { ModelProvider.getInstance().getEntity(
       ProductCharacteristicValue.ENTITY_NAME) };
   private static ThreadLocal<Set<String>> prodchvalueUpdated = new ThreadLocal<Set<String>>();