diff --git a/src-db/database/model/tables/M_CHARACTERISTIC.xml b/src-db/database/model/tables/M_CHARACTERISTIC.xml
--- a/src-db/database/model/tables/M_CHARACTERISTIC.xml
+++ b/src-db/database/model/tables/M_CHARACTERISTIC.xml
@@ -49,6 +49,10 @@
+
+
+
+
@@ -59,6 +63,7 @@
+
diff --git a/src-db/database/model/tables/M_PRODUCT_CH.xml b/src-db/database/model/tables/M_PRODUCT_CH.xml
--- a/src-db/database/model/tables/M_PRODUCT_CH.xml
+++ b/src-db/database/model/tables/M_PRODUCT_CH.xml
@@ -65,6 +65,10 @@
+
+
+
+
@@ -87,6 +91,7 @@
+
diff --git a/src-db/database/model/tables/M_PRODUCT_CH_CONF.xml b/src-db/database/model/tables/M_PRODUCT_CH_CONF.xml
--- a/src-db/database/model/tables/M_PRODUCT_CH_CONF.xml
+++ b/src-db/database/model/tables/M_PRODUCT_CH_CONF.xml
@@ -71,6 +71,10 @@
+
+
+
+
diff --git a/src-db/database/model/triggers/M_CH_SUBSET_VALUE_TRG.xml b/src-db/database/model/triggers/M_CH_SUBSET_VALUE_TRG.xml
--- a/src-db/database/model/triggers/M_CH_SUBSET_VALUE_TRG.xml
+++ b/src-db/database/model/triggers/M_CH_SUBSET_VALUE_TRG.xml
@@ -54,7 +54,10 @@
pch.m_product_ch_id, :new.m_ch_value_id, :new.skcode
FROM m_product_ch pch
WHERE pch.m_characteristic_id = v_characteristic_id
- AND pch.m_ch_subset_id = :new.m_ch_subset_id;
+ AND pch.m_ch_subset_id = :new.m_ch_subset_id
+ AND exists (select 1 from m_product where m_product_id=pch.m_product_id AND isgeneric='Y')
+ AND pch.isvariant='Y'
+ AND pch.isexplodeconf = 'Y';
END IF;
END M_CH_SUBSET_VALUE_TRG
]]>