0045935: Errors when migrating brands to product characteristics when upgrading to 20Q4.1

diff --git a/build/classes/org/openbravo/retail/posterminal/modulescript/ConvertBrandIntoCharacteristic.class b/build/classes/org/openbravo/retail/posterminal/modulescript/ConvertBrandIntoCharacteristic.class
index a01016a17943742c2012e46f5316cafa0a707796..746d91e710f03409c09cbd2803ea5818f651efb8 100644
Binary files a/build/classes/org/openbravo/retail/posterminal/modulescript/ConvertBrandIntoCharacteristic.class and b/build/classes/org/openbravo/retail/posterminal/modulescript/ConvertBrandIntoCharacteristic.class differ
diff --git a/build/classes/org/openbravo/retail/posterminal/modulescript/ConvertBrandIntoCharacteristicData.class b/build/classes/org/openbravo/retail/posterminal/modulescript/ConvertBrandIntoCharacteristicData.class
index 01bc018aa968c1cd6df8849ce7792338d2dc579e..150f41df3fbd4734b29ce823f48dd82f2131129c 100644
Binary files a/build/classes/org/openbravo/retail/posterminal/modulescript/ConvertBrandIntoCharacteristicData.class and b/build/classes/org/openbravo/retail/posterminal/modulescript/ConvertBrandIntoCharacteristicData.class differ
diff --git a/src-util/modulescript/src/org/openbravo/retail/posterminal/modulescript/ConvertBrandIntoCharacteristic.java b/src-util/modulescript/src/org/openbravo/retail/posterminal/modulescript/ConvertBrandIntoCharacteristic.java
index 93c484d2d01a6404005cfae7855250c3c78dd1f0..1abcb8f3916aaf20db0e9b9a65ddf2a3b473490b 100644
--- a/src-util/modulescript/src/org/openbravo/retail/posterminal/modulescript/ConvertBrandIntoCharacteristic.java
+++ b/src-util/modulescript/src/org/openbravo/retail/posterminal/modulescript/ConvertBrandIntoCharacteristic.java
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2020 Openbravo S.L.U.
+ * Copyright (C) 2020-2021 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -13,7 +13,6 @@ import java.util.UUID;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-
 import org.openbravo.database.ConnectionProvider;
 import org.openbravo.modulescript.ModuleScript;
 import org.openbravo.modulescript.ModuleScriptExecutionLimits;
@@ -34,6 +33,11 @@ public class ConvertBrandIntoCharacteristic extends ModuleScript {
           ConvertBrandIntoCharacteristicData[] data = ConvertBrandIntoCharacteristicData
               .selectBrandByClient(cp);
           for (ConvertBrandIntoCharacteristicData brand : data) {
+            // Create Characteristic Tree
+            if (!ConvertBrandIntoCharacteristicData.existCharacteristicsTree(cp,
+                brand.adClientId)) {
+              ConvertBrandIntoCharacteristicData.insertCharacteristicsTree(cp.getConnection(), cp, brand.adClientId);
+            }
             String id = UUID.randomUUID().toString().replace("-", "").toUpperCase();
             ConvertBrandIntoCharacteristicData.insertCharacteristic(cp.getConnection(), cp, id,
                 brand.adClientId);
diff --git a/src-util/modulescript/src/org/openbravo/retail/posterminal/modulescript/ConvertBrandIntoCharacteristic_data.xsql b/src-util/modulescript/src/org/openbravo/retail/posterminal/modulescript/ConvertBrandIntoCharacteristic_data.xsql
index a04baee9814c25a54631d9454f52a9b1800bc899..edd46f67bba9fd428e7a23aa0e44ecd0d91d8408 100644
--- a/src-util/modulescript/src/org/openbravo/retail/posterminal/modulescript/ConvertBrandIntoCharacteristic_data.xsql
+++ b/src-util/modulescript/src/org/openbravo/retail/posterminal/modulescript/ConvertBrandIntoCharacteristic_data.xsql
@@ -2,7 +2,7 @@
 <!--
 /*
  ************************************************************************************
- * Copyright (C) 2020 Openbravo S.L.U.
+ * Copyright (C) 2020-2021 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -162,4 +162,22 @@
       ]]>
     </Sql>
   </SqlMethod>
+  <SqlMethod name="existCharacteristicsTree" type="preparedStatement" return="boolean">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+        select count(ad_tree_id) as ad_tree_id from ad_tree where ad_client_id = ? and ad_tree_id ='899D83A7B7E24F57911A91AE82DCA496'
+      ]]>
+    </Sql>
+    <Parameter name="adClientId"/>
+  </SqlMethod>
+  <SqlMethod name="insertCharacteristicsTree" type="preparedStatement" connection="true" return="rowCount">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+      insert into ad_tree(ad_tree_id, ad_client_id, ad_org_id, createdby, updatedby, name, description, treetype, isallnodes, ad_table_id) values ('899D83A7B7E24F57911A91AE82DCA496', ?, '0', '100', '100', 'Product Characteristic tree', null, 'CH', 'Y', 'E913D17C9B3847CF92235082DBE2EC44')
+      ]]>
+    </Sql>
+    <Parameter name="adClientId"/>
+  </SqlMethod>
 </SqlClass>