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 ]]> diff --git a/src-db/database/model/triggers/M_CH_VALUE_TRG.xml b/src-db/database/model/triggers/M_CH_VALUE_TRG.xml --- a/src-db/database/model/triggers/M_CH_VALUE_TRG.xml +++ b/src-db/database/model/triggers/M_CH_VALUE_TRG.xml @@ -90,8 +90,9 @@ FROM m_product_ch pch WHERE pch.m_characteristic_id = :new.m_characteristic_id AND pch.m_ch_subset_id IS NULL - AND exists (select 1 from m_product where m_product_id=pch.m_product_id AND isgeneric='Y') - AND pch.isvariant='Y'; + 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; IF DELETING THEN diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml +++ b/src-db/database/sourcedata/AD_COLUMN.xml @@ -231502,6 +231502,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -332599,7 +332669,7 @@ - + diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml --- a/src-db/database/sourcedata/AD_ELEMENT.xml +++ b/src-db/database/sourcedata/AD_ELEMENT.xml @@ -21646,6 +21646,19 @@ + + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml +++ b/src-db/database/sourcedata/AD_FIELD.xml @@ -189579,6 +189579,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -291161,7 +291217,6 @@ - @@ -291270,7 +291325,7 @@ - + @@ -292891,7 +292946,7 @@ - + @@ -293447,7 +293502,7 @@ - + @@ -296360,7 +296415,7 @@ - + @@ -298058,7 +298113,7 @@ - + diff --git a/src-db/database/sourcedata/AD_TAB.xml b/src-db/database/sourcedata/AD_TAB.xml --- a/src-db/database/sourcedata/AD_TAB.xml +++ b/src-db/database/sourcedata/AD_TAB.xml @@ -16395,7 +16395,7 @@ - + diff --git a/src/org/openbravo/erpCommon/ad_callouts/SL_ProductCh_Characteristic.java b/src/org/openbravo/erpCommon/ad_callouts/SL_ProductCh_Characteristic.java --- a/src/org/openbravo/erpCommon/ad_callouts/SL_ProductCh_Characteristic.java +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_ProductCh_Characteristic.java @@ -35,6 +35,7 @@ if (StringUtils.isNotBlank(strCharacteristicId)) { Characteristic ch = OBDal.getInstance().get(Characteristic.class, strCharacteristicId); info.addResult("inpisvariant", ch.isVariant() ? "Y" : "N"); + info.addResult("inpisexplodeconf", ch.isExplodeConfigurationTab() ? "Y" : "N"); } } diff --git a/src/org/openbravo/event/ProductCharacteristicEventHandler.java b/src/org/openbravo/event/ProductCharacteristicEventHandler.java --- a/src/org/openbravo/event/ProductCharacteristicEventHandler.java +++ b/src/org/openbravo/event/ProductCharacteristicEventHandler.java @@ -60,8 +60,7 @@ return entities; } - public void onDelete(@Observes - EntityDeleteEvent event) { + public void onDelete(@Observes EntityDeleteEvent event) { if (!isValidEvent(event)) { return; } @@ -73,8 +72,7 @@ deleteProductCharacteristicValue(prCh); } - public void onSave(@Observes - EntityNewEvent event) { + public void onSave(@Observes EntityNewEvent event) { if (!isValidEvent(event)) { return; } @@ -102,21 +100,22 @@ final Entity prodCharEntity = ModelProvider.getInstance().getEntity( ProductCharacteristic.ENTITY_NAME); - final Property charConfListProperty = prodCharEntity - .getProperty(ProductCharacteristic.PROPERTY_PRODUCTCHARACTERISTICCONFLIST); - @SuppressWarnings("unchecked") - List prChConfs = (List) event - .getCurrentState(charConfListProperty); - Set newChValues = getValuesToAdd(prCh); - for (String[] strChValueId : newChValues) { - prChConfs - .add(getCharacteristicConf(prCh, strChValueId[0], strChValueId[1], strChValueId[2])); + if (prCh.isExplodeConfigurationTab()) { + final Property charConfListProperty = prodCharEntity + .getProperty(ProductCharacteristic.PROPERTY_PRODUCTCHARACTERISTICCONFLIST); + @SuppressWarnings("unchecked") + List prChConfs = (List) event + .getCurrentState(charConfListProperty); + Set newChValues = getValuesToAdd(prCh); + for (String[] strChValueId : newChValues) { + prChConfs.add(getCharacteristicConf(prCh, strChValueId[0], strChValueId[1], + strChValueId[2])); + } } } } - public void onUpdate(@Observes - EntityUpdateEvent event) { + public void onUpdate(@Observes EntityUpdateEvent event) { if (!isValidEvent(event)) { return; } @@ -166,50 +165,55 @@ } } - final Property charConfListProperty = prodCharEntity - .getProperty(ProductCharacteristic.PROPERTY_PRODUCTCHARACTERISTICCONFLIST); - @SuppressWarnings("unchecked") - List prChConfs = (List) event - .getCurrentState(charConfListProperty); + if (prCh.isExplodeConfigurationTab()) { + final Property charConfListProperty = prodCharEntity + .getProperty(ProductCharacteristic.PROPERTY_PRODUCTCHARACTERISTICCONFLIST); + @SuppressWarnings("unchecked") + List prChConfs = (List) event + .getCurrentState(charConfListProperty); - final List existingValues = new ArrayList(); - for (ProductCharacteristicConf prChConf : prCh.getProductCharacteristicConfList()) { - existingValues.add((String) DalUtil.getId(prChConf.getCharacteristicValue())); - } - Set valuesToAdd = getValuesToAdd(prCh); - for (String[] strNewValue : valuesToAdd) { - if (existingValues.remove(strNewValue[0])) { - OBCriteria prChConfCrit = OBDal.getInstance().createCriteria( - ProductCharacteristicConf.class); - prChConfCrit.add(Restrictions.eq( - ProductCharacteristicConf.PROPERTY_CHARACTERISTICOFPRODUCT, prCh)); - prChConfCrit.add(Restrictions.eq(ProductCharacteristicConf.PROPERTY_CHARACTERISTICVALUE, - OBDal.getInstance().get(CharacteristicValue.class, strNewValue[0]))); - prChConfCrit.setFilterOnActive(false); - ProductCharacteristicConf prChConf = (ProductCharacteristicConf) prChConfCrit - .uniqueResult(); - prChConf.setCode(strNewValue[1]); - prChConf.setActive(Boolean.parseBoolean(strNewValue[2])); - OBDal.getInstance().save(prChConf); - continue; + final List existingValues = new ArrayList(); + for (ProductCharacteristicConf prChConf : prCh.getProductCharacteristicConfList()) { + existingValues.add((String) DalUtil.getId(prChConf.getCharacteristicValue())); } - prChConfs.add(getCharacteristicConf(prCh, strNewValue[0], strNewValue[1], strNewValue[2])); - } - // remove not needed - if (!existingValues.isEmpty()) { - for (String strChValueId : existingValues) { - OBCriteria prChConfCrit = OBDal.getInstance().createCriteria( - ProductCharacteristicConf.class); - prChConfCrit.add(Restrictions.eq( - ProductCharacteristicConf.PROPERTY_CHARACTERISTICOFPRODUCT, prCh)); - prChConfCrit.add(Restrictions.eq(ProductCharacteristicConf.PROPERTY_CHARACTERISTICVALUE, - OBDal.getInstance().get(CharacteristicValue.class, strChValueId))); - prChConfCrit.setFilterOnActive(false); - ProductCharacteristicConf prChConf = (ProductCharacteristicConf) prChConfCrit - .uniqueResult(); + Set valuesToAdd = getValuesToAdd(prCh); + for (String[] strNewValue : valuesToAdd) { + if (existingValues.remove(strNewValue[0])) { + OBCriteria prChConfCrit = OBDal.getInstance() + .createCriteria(ProductCharacteristicConf.class); + prChConfCrit.add(Restrictions.eq( + ProductCharacteristicConf.PROPERTY_CHARACTERISTICOFPRODUCT, prCh)); + prChConfCrit.add(Restrictions.eq( + ProductCharacteristicConf.PROPERTY_CHARACTERISTICVALUE, + OBDal.getInstance().get(CharacteristicValue.class, strNewValue[0]))); + prChConfCrit.setFilterOnActive(false); + ProductCharacteristicConf prChConf = (ProductCharacteristicConf) prChConfCrit + .uniqueResult(); + prChConf.setCode(strNewValue[1]); + prChConf.setActive(Boolean.parseBoolean(strNewValue[2])); + OBDal.getInstance().save(prChConf); + continue; + } + prChConfs + .add(getCharacteristicConf(prCh, strNewValue[0], strNewValue[1], strNewValue[2])); + } + // remove not needed + if (!existingValues.isEmpty()) { + for (String strChValueId : existingValues) { + OBCriteria prChConfCrit = OBDal.getInstance() + .createCriteria(ProductCharacteristicConf.class); + prChConfCrit.add(Restrictions.eq( + ProductCharacteristicConf.PROPERTY_CHARACTERISTICOFPRODUCT, prCh)); + prChConfCrit.add(Restrictions.eq( + ProductCharacteristicConf.PROPERTY_CHARACTERISTICVALUE, + OBDal.getInstance().get(CharacteristicValue.class, strChValueId))); + prChConfCrit.setFilterOnActive(false); + ProductCharacteristicConf prChConf = (ProductCharacteristicConf) prChConfCrit + .uniqueResult(); - prChConfs.remove(prChConf); - OBDal.getInstance().remove(prChConf); + prChConfs.remove(prChConf); + OBDal.getInstance().remove(prChConf); + } } } }