diff --git a/bt5/erp5_apparel/DocumentTemplateItem/ApparelAssortment.py b/bt5/erp5_apparel/DocumentTemplateItem/ApparelAssortment.py
index 7851d22a2a5162f8061dfa4d18e413fc1ff01469..e91b340d51da73289c8c8143177132bb05a61ec9 100644
--- a/bt5/erp5_apparel/DocumentTemplateItem/ApparelAssortment.py
+++ b/bt5/erp5_apparel/DocumentTemplateItem/ApparelAssortment.py
@@ -61,5 +61,4 @@ class ApparelAssortment(Resource, XMLMatrix):
, PropertySheet.Comment
, PropertySheet.ApparelCollection
, PropertySheet.ApparelSize
- , PropertySheet.VariationRange
)
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/ApparelColourRange.py b/bt5/erp5_apparel/DocumentTemplateItem/ApparelColourRange.py
index e38a392df8861a37189e378350621ade532c3162..500c01cbfc2a9303ee50bcef773131a577853c1c 100644
--- a/bt5/erp5_apparel/DocumentTemplateItem/ApparelColourRange.py
+++ b/bt5/erp5_apparel/DocumentTemplateItem/ApparelColourRange.py
@@ -55,5 +55,5 @@ class ApparelColourRange(Resource):
, PropertySheet.CategoryCore
, PropertySheet.DublinCore
, PropertySheet.ApparelCollection
- , PropertySheet.VariationRange
+ , PropertySheet.ApparelColourRange
)
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range.xml
index 26b12e600dcd919df054bd9e21807617ea620ac5..2ffd56e2dc7cdaec920ccc3d1c392a8347d61cd1 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range.xml
@@ -27,6 +27,10 @@
<list/>
</value>
</item>
+ <item>
+ <key> <string>acquire_local_roles</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>allowed_content_types</string> </key>
<value>
@@ -63,6 +67,12 @@
<key> <string>filter_content_types</string> </key>
<value> <int>1</int> </value>
</item>
+ <item>
+ <key> <string>group_list</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
<item>
<key> <string>hidden_content_type_list</string> </key>
<value>
@@ -77,6 +87,10 @@
<key> <string>init_script</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>permission</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>property_sheet_list</string> </key>
<value>
diff --git a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelAssortment.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelAssortment.py
index 1ef9c952061d0535394e355211214cb7b32cb755..c7359b4072e6127eadb97bc52b1cd24202e2602c 100644
--- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelAssortment.py
+++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelAssortment.py
@@ -49,6 +49,14 @@ class ApparelAssortment:
'acquisition_accessor_id' : 'getTitle',
'acquisition_depends' : None,
'mode' : 'w' },
+ # Override default value
+ { 'id' : 'variation_base_category',
+ 'description' : 'A list of base categories which define possible discrete variations. '\
+ 'Variation ranges are stored as category membership. '\
+ '(prev. variation_category_list).',
+ 'type' : 'tokens',
+ 'default' : ['colour','size'],
+ 'mode' : 'r' },
)
#_categories = ( 'eip', 'collection', 'destination', 'taille', 'nomenclature_douane', 'specialise' )
diff --git a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelColourRange.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelColourRange.py
new file mode 100644
index 0000000000000000000000000000000000000000..6bebb11065f4006d14b70823a528633276f1c325
--- /dev/null
+++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelColourRange.py
@@ -0,0 +1,49 @@
+##############################################################################
+#
+# Copyright (c) 2002 Coramy SAS and Contributors. All Rights Reserved.
+# Thierry Faucher <Thierry_Faucher@coramy.com>
+# Copyright (c) 2004 Nexedi SARL and Contributors. All Rights Reserved.
+# Romain Courteaud <romain@nexedi.com>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+
+class ApparelColourRange:
+ """
+ ApparelColourRange properties and categories
+ """
+
+ _properties = (
+ # Override default value
+ { 'id' : 'variation_base_category',
+ 'description' : 'A list of base categories which define possible discrete variations. '\
+ 'Variation ranges are stored as category membership. '\
+ '(prev. variation_category_list).',
+ 'type' : 'tokens',
+ 'default' : ['colour'],
+ 'mode' : 'r' },
+ )
+ _categories = ( )
+
+
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference.xml
index 83711e178491ee771a243f0c0e034d7e845fd701..b118c393be8fbc80fc513e926ff31538a8ce39d3 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference.xml
@@ -96,14 +96,14 @@
<key> <string>left</string> </key>
<value>
<list>
- <string>my_preferred_apparel_cloth_variation_base_category</string>
- <string>my_preferred_apparel_cloth_optional_variation_base_category</string>
+ <string>my_preferred_apparel_cloth_variation_base_category_list</string>
+ <string>my_preferred_apparel_cloth_optional_variation_base_category_list</string>
<string>my_preferred_apparel_cloth_individual_variation_base_category</string>
- <string>my_preferred_apparel_component_variation_base_category</string>
- <string>my_preferred_apparel_component_optional_variation_base_category</string>
+ <string>my_preferred_apparel_component_variation_base_category_list</string>
+ <string>my_preferred_apparel_component_optional_variation_base_category_list</string>
<string>my_preferred_apparel_component_individual_variation_base_category</string>
- <string>my_preferred_apparel_shape_variation_base_category</string>
- <string>my_preferred_apparel_shape_optional_variation_base_category</string>
+ <string>my_preferred_apparel_shape_variation_base_category_list</string>
+ <string>my_preferred_apparel_shape_optional_variation_base_category_list</string>
<string>my_preferred_apparel_shape_individual_variation_base_category</string>
</list>
</value>
@@ -112,11 +112,11 @@
<key> <string>right</string> </key>
<value>
<list>
- <string>my_preferred_apparel_model_variation_base_category</string>
- <string>my_preferred_apparel_model_optional_variation_base_category</string>
+ <string>my_preferred_apparel_model_variation_base_category_list</string>
+ <string>my_preferred_apparel_model_optional_variation_base_category_lits</string>
<string>my_preferred_apparel_model_individual_variation_base_category</string>
- <string>my_preferred_apparel_fabric_variation_base_category</string>
- <string>my_preferred_apparel_fabric_optional_variation_base_category</string>
+ <string>my_preferred_apparel_fabric_variation_base_category_list</string>
+ <string>my_preferred_apparel_fabric_optional_variation_base_category_list</string>
<string>my_preferred_apparel_fabric_individual_variation_base_category</string>
</list>
</value>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_cloth_individual_variation_base_category.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_cloth_individual_variation_base_category.xml
index bac62b8e8a64efe82fafbf42d1590ad1fcea8c2b..5aacaa32c108953f54e8366339ff01b092ebf155 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_cloth_individual_variation_base_category.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_cloth_individual_variation_base_category.xml
@@ -58,9 +58,7 @@
<dictionary>
<item>
<key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
@@ -113,20 +111,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: here.getPreferredApparelClothIndividualVariationBaseCategoryList() or preferences.getPreferredProductVariationBaseCategoryList()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_cloth_optional_variation_base_category.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_cloth_optional_variation_base_category_list.xml
similarity index 84%
rename from bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_cloth_optional_variation_base_category.xml
rename to bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_cloth_optional_variation_base_category_list.xml
index 2e4013ed4a861444b2542c7f1867e2c53b46a687..1e18322785d53434f43925c467d26dcc688ef165 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_cloth_optional_variation_base_category.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_cloth_optional_variation_base_category_list.xml
@@ -20,7 +20,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>my_preferred_apparel_cloth_optional_variation_base_category</string> </value>
+ <value> <string>my_preferred_apparel_cloth_optional_variation_base_category_list</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
@@ -58,9 +58,7 @@
<dictionary>
<item>
<key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
@@ -113,20 +111,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: here.getPreferredApparelClothOptionalVariationBaseCategoryList() or preferences.getPreferredProductVariationBaseCategoryList()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_cloth_variation_base_category.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_cloth_variation_base_category_list.xml
similarity index 84%
rename from bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_cloth_variation_base_category.xml
rename to bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_cloth_variation_base_category_list.xml
index 6a945420acb540b585b0a9f3a929a262308fc794..5817b25d20109ab590291d76c60adfd4a36a9a08 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_cloth_variation_base_category.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_cloth_variation_base_category_list.xml
@@ -20,7 +20,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>my_preferred_apparel_cloth_variation_base_category</string> </value>
+ <value> <string>my_preferred_apparel_cloth_variation_base_category_list</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
@@ -58,9 +58,7 @@
<dictionary>
<item>
<key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
@@ -113,20 +111,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: here.getPreferredApparelClothVariationBaseCategoryList() or preferences.getPreferredProductVariationBaseCategoryList()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_component_individual_variation_base_category.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_component_individual_variation_base_category.xml
index f466bf043a96ee4293c982079bdd032c7638346d..3d9a51dbfbec0a82b1e6fa873545a498f900adb9 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_component_individual_variation_base_category.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_component_individual_variation_base_category.xml
@@ -58,9 +58,7 @@
<dictionary>
<item>
<key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
@@ -113,20 +111,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: here.getPreferredApparelComponentIndividualVariationBaseCategoryList() or preferences.getPreferredProductVariationBaseCategoryList()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_component_optional_variation_base_category.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_component_optional_variation_base_category_list.xml
similarity index 83%
rename from bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_component_optional_variation_base_category.xml
rename to bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_component_optional_variation_base_category_list.xml
index f23280c20bbcdbcede83d9b3880b52a997205eeb..50d51673fc7077a6ca304bc1959fa217228f4b4b 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_component_optional_variation_base_category.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_component_optional_variation_base_category_list.xml
@@ -20,7 +20,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>my_preferred_apparel_component_optional_variation_base_category</string> </value>
+ <value> <string>my_preferred_apparel_component_optional_variation_base_category_list</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
@@ -58,9 +58,7 @@
<dictionary>
<item>
<key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
@@ -113,20 +111,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: here.getPreferredApparelComponentOptionalVariationBaseCategoryList() or preferences.getPreferredProductVariationBaseCategoryList()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_component_variation_base_category.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_component_variation_base_category_list.xml
similarity index 84%
rename from bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_component_variation_base_category.xml
rename to bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_component_variation_base_category_list.xml
index f95c4b7b6dcda662000c0f22fa696982616b8f75..1c344c4dadec4e24c7ff4ea11a6dd5c5774ee430 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_component_variation_base_category.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_component_variation_base_category_list.xml
@@ -20,7 +20,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>my_preferred_apparel_component_variation_base_category</string> </value>
+ <value> <string>my_preferred_apparel_component_variation_base_category_list</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
@@ -58,9 +58,7 @@
<dictionary>
<item>
<key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
@@ -113,20 +111,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: here.getPreferredApparelComponentVariationBaseCategoryList() or preferences.getPreferredProductVariationBaseCategoryList()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_fabric_individual_variation_base_category.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_fabric_individual_variation_base_category.xml
index 80cbaa5bc2ba28329c20869164a8615a7bb08e67..bc84122d4a79d36fdd9b19615ed47fdcf235086c 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_fabric_individual_variation_base_category.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_fabric_individual_variation_base_category.xml
@@ -58,9 +58,7 @@
<dictionary>
<item>
<key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
@@ -113,20 +111,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: here.getPreferredApparelFabricIndividualVariationBaseCategoryList() or preferences.getPreferredProductVariationBaseCategoryList()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_fabric_optional_variation_base_category.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_fabric_optional_variation_base_category_list.xml
similarity index 84%
rename from bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_fabric_optional_variation_base_category.xml
rename to bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_fabric_optional_variation_base_category_list.xml
index 0d3805cc5d23f6328d09deb409c326d9ae97a6ac..b14b7e1fcbff360b437433e05d5f596b756ed8b4 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_fabric_optional_variation_base_category.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_fabric_optional_variation_base_category_list.xml
@@ -20,7 +20,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>my_preferred_apparel_fabric_optional_variation_base_category</string> </value>
+ <value> <string>my_preferred_apparel_fabric_optional_variation_base_category_list</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
@@ -58,9 +58,7 @@
<dictionary>
<item>
<key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
@@ -113,20 +111,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: here.getPreferredApparelFabricOptionalVariationBaseCategoryList() or preferences.getPreferredProductVariationBaseCategoryList()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_fabric_variation_base_category.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_fabric_variation_base_category_list.xml
similarity index 84%
rename from bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_fabric_variation_base_category.xml
rename to bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_fabric_variation_base_category_list.xml
index 67701478aa02635b769d82485af8d21dcc5bef76..03ef9aae3c07017e881386317c82898697b7becd 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_fabric_variation_base_category.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_fabric_variation_base_category_list.xml
@@ -20,7 +20,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>my_preferred_apparel_fabric_variation_base_category</string> </value>
+ <value> <string>my_preferred_apparel_fabric_variation_base_category_list</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
@@ -58,9 +58,7 @@
<dictionary>
<item>
<key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
@@ -113,20 +111,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: here.getPreferredApparelFabricVariationBaseCategoryList() or preferences.getPreferredProductVariationBaseCategoryList()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_model_individual_variation_base_category.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_model_individual_variation_base_category.xml
index 2a971f49c3dae8dd5ee4bd494ec9b913e45660e3..4c82e9d0de36e4927e45f14b51047cd16024afe0 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_model_individual_variation_base_category.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_model_individual_variation_base_category.xml
@@ -58,9 +58,7 @@
<dictionary>
<item>
<key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
@@ -113,20 +111,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: here.getPreferredApparelModelIndividualVariationBaseCategoryList() or preferences.getPreferredProductVariationBaseCategoryList()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_model_optional_variation_base_category.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_model_optional_variation_base_category_lits.xml
similarity index 84%
rename from bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_model_optional_variation_base_category.xml
rename to bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_model_optional_variation_base_category_lits.xml
index 58019c6aaa4327f883fd99f8bcc1c78130487995..7abb7214ebd31f86b318e936b474fcfd468b0117 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_model_optional_variation_base_category.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_model_optional_variation_base_category_lits.xml
@@ -20,7 +20,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>my_preferred_apparel_model_optional_variation_base_category</string> </value>
+ <value> <string>my_preferred_apparel_model_optional_variation_base_category_lits</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
@@ -58,9 +58,7 @@
<dictionary>
<item>
<key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
@@ -113,20 +111,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: here.getPreferredApparelModelOptionalVariationBaseCategoryList() or preferences.getPreferredProductVariationBaseCategoryList()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_model_variation_base_category.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_model_variation_base_category_list.xml
similarity index 84%
rename from bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_model_variation_base_category.xml
rename to bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_model_variation_base_category_list.xml
index 92ecf43617ed59de0f6f2feb9dc23cb586bfdf7a..98b54b829a65e5cfbd0c0b77eeffc87eb156f402 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_model_variation_base_category.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_model_variation_base_category_list.xml
@@ -20,7 +20,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>my_preferred_apparel_model_variation_base_category</string> </value>
+ <value> <string>my_preferred_apparel_model_variation_base_category_list</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
@@ -58,9 +58,7 @@
<dictionary>
<item>
<key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
@@ -113,20 +111,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: here.getPreferredApparelModelVariationBaseCategoryList() or preferences.getPreferredProductVariationBaseCategoryList()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_shape_individual_variation_base_category.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_shape_individual_variation_base_category.xml
index de8dea7b93c6dff23698722c7546bb693c0dd47d..43b01cfd99bc22431c2e2462bfa5d72176ba454d 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_shape_individual_variation_base_category.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_shape_individual_variation_base_category.xml
@@ -58,9 +58,7 @@
<dictionary>
<item>
<key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
@@ -113,20 +111,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: here.getPreferredApparelShapeIndividualVariationBaseCategoryList() or preferences.getPreferredProductVariationBaseCategoryList()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_shape_optional_variation_base_category.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_shape_optional_variation_base_category_list.xml
similarity index 84%
rename from bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_shape_optional_variation_base_category.xml
rename to bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_shape_optional_variation_base_category_list.xml
index 1dbb41ef5f8a815ea0d1796f0cd522a9dbf60e1c..fe7d3f671634a2a2c54c51f5952b7f21993f50c1 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_shape_optional_variation_base_category.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_shape_optional_variation_base_category_list.xml
@@ -20,7 +20,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>my_preferred_apparel_shape_optional_variation_base_category</string> </value>
+ <value> <string>my_preferred_apparel_shape_optional_variation_base_category_list</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
@@ -58,9 +58,7 @@
<dictionary>
<item>
<key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
@@ -113,20 +111,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: here.getPreferredApparelShapeOptionalVariationBaseCategoryList() or preferences.getPreferredProductVariationBaseCategoryList()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_shape_variation_base_category.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_shape_variation_base_category_list.xml
similarity index 84%
rename from bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_shape_variation_base_category.xml
rename to bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_shape_variation_base_category_list.xml
index 7401c88e6194b4c853bfece0b77e110d858b5831..b0df7ee68303ac3e1d4efa33408cf1b9b27e747f 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_shape_variation_base_category.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference/my_preferred_apparel_shape_variation_base_category_list.xml
@@ -20,7 +20,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>my_preferred_apparel_shape_variation_base_category</string> </value>
+ <value> <string>my_preferred_apparel_shape_variation_base_category_list</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
@@ -58,9 +58,7 @@
<dictionary>
<item>
<key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
@@ -113,20 +111,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: here.getPreferredApparelShapeVariationBaseCategoryList() or preferences.getPreferredProductVariationBaseCategoryList()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_apparel/bt/revision b/bt5/erp5_apparel/bt/revision
index aa92725341cfdd96ebd08910d54dcb6933dd5be5..e3f1e9b791c84fce95fe992dc246e9e2286c84ed 100644
--- a/bt5/erp5_apparel/bt/revision
+++ b/bt5/erp5_apparel/bt/revision
@@ -1 +1 @@
-76
\ No newline at end of file
+80
\ No newline at end of file
diff --git a/bt5/erp5_apparel/bt/template_property_sheet_id_list b/bt5/erp5_apparel/bt/template_property_sheet_id_list
index 26e78799c735fe1e05eda1bb9ce537a093dca671..d9996bf6b152515f66fa0b9ddc51b42d87aac272 100644
--- a/bt5/erp5_apparel/bt/template_property_sheet_id_list
+++ b/bt5/erp5_apparel/bt/template_property_sheet_id_list
@@ -14,4 +14,5 @@ ApparelFabricColourVariation
ApparelModelColourVariation
ApparelComponentVariation
ApparelSize
-ApparelPreference
\ No newline at end of file
+ApparelPreference
+ApparelColourRange
\ No newline at end of file