[Erp5-report] r31039 fabien - in /erp5/trunk/bt5/erp5_apparel: PortalTypePropertySheetTempl...

[nobody at svn.erp5.org]

Author: fabien
Date: Thu Dec  3 16:15:38 2009
New Revision: 31039

URL: http://svn.erp5.org?rev=31039&view=rev
Log:
* remove ApparelColourRangeVariation propertysheet since the properties should be defined using preferences.
* reorder Preferences fields related to ApparelColourRangeVariation to keep same order than for other portal_type
* add the preference properties to the property_sheet

Modified:
    erp5/trunk/bt5/erp5_apparel/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
    erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelPreference.py
    erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference.xml
    erp5/trunk/bt5/erp5_apparel/bt/revision
    erp5/trunk/bt5/erp5_apparel/bt/template_portal_type_property_sheet_list
    erp5/trunk/bt5/erp5_apparel/bt/template_property_sheet_id_list

Modified: erp5/trunk/bt5/erp5_apparel/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PortalTypePropertySheetTemplateItem/property_sheet_list.xml?rev=31039&r1=31038&r2=31039&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PortalTypePropertySheetTemplateItem/property_sheet_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PortalTypePropertySheetTemplateItem/property_sheet_list.xml [utf8] Thu Dec  3 16:15:38 2009
@@ -7,7 +7,6 @@
   <item>Reference</item>
  </portal_type>
  <portal_type id="Apparel Colour Range Variation">
-  <item>ApparelColourRangeVariation</item>
   <item>TransformedResource</item>
  </portal_type>
  <portal_type id="Apparel Component">

Modified: erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelPreference.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelPreference.py?rev=31039&r1=31038&r2=31039&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelPreference.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelPreference.py [utf8] Thu Dec  3 16:15:38 2009
@@ -139,4 +139,25 @@
       'default'     : [],
       'write_permission': 'Manage properties',
       'mode'        : '' },
+    { 'id'          : 'preferred_apparel_colour_range_variation_base_category',
+      'description' : 'Defines base categories axes in apparel_colour_range variations',
+      'type'        : 'lines',
+      'preference'  : 1,
+      'default'     : [],
+      'write_permission': 'Manage properties',
+      'mode'        : '' },
+    { 'id'          : 'preferred_apparel_colour_range_individual_variation_base_category',
+      'description' : 'Defines base categories axes in apparel_colour_range variations',
+      'type'        : 'lines',
+      'preference'  : 1,
+      'default'     : [],
+      'write_permission': 'Manage properties',
+      'mode'        : '' },
+    { 'id'          : 'preferred_apparel_colour_range_optional_variation_base_category',
+      'description' : 'Defines base categories axes in apparel_colour_range variations',
+      'type'        : 'lines',
+      'preference'  : 1,
+      'default'     : [],
+      'write_permission': 'Manage properties',
+      'mode'        : '' },
   )

Modified: erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference.xml?rev=31039&r1=31038&r2=31039&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference.xml [utf8] Thu Dec  3 16:15:38 2009
@@ -118,9 +118,9 @@
                         <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_list</string>
+                        <string>my_preferred_apparel_colour_range_variation_base_category_list</string>
+                        <string>my_preferred_apparel_colour_range_optional_variation_base_category_list</string>
                         <string>my_preferred_apparel_colour_range_individual_variation_base_category_list</string>
-                        <string>my_preferred_apparel_colour_range_optional_variation_base_category_list</string>
-                        <string>my_preferred_apparel_colour_range_variation_base_category_list</string>
                       </list>
                     </value>
                 </item>

Modified: erp5/trunk/bt5/erp5_apparel/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/bt/revision?rev=31039&r1=31038&r2=31039&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/bt/revision [utf8] Thu Dec  3 16:15:38 2009
@@ -1,1 +1,1 @@
-202
+203

Modified: erp5/trunk/bt5/erp5_apparel/bt/template_portal_type_property_sheet_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/bt/template_portal_type_property_sheet_list?rev=31039&r1=31038&r2=31039&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/bt/template_portal_type_property_sheet_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/bt/template_portal_type_property_sheet_list [utf8] Thu Dec  3 16:15:38 2009
@@ -1,7 +1,6 @@
 Apparel Assortment Colour Variation | ApparelModelColourVariation
 Apparel Bath | ApparelFabricColourVariation
 Apparel Bath | Reference
-Apparel Colour Range Variation | ApparelColourRangeVariation
 Apparel Colour Range Variation | TransformedResource
 Apparel Component Variation | ApparelComponentVariation
 Apparel Component Variation | Resource

Modified: erp5/trunk/bt5/erp5_apparel/bt/template_property_sheet_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/bt/template_property_sheet_id_list?rev=31039&r1=31038&r2=31039&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/bt/template_property_sheet_id_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/bt/template_property_sheet_id_list [utf8] Thu Dec  3 16:15:38 2009
@@ -6,7 +6,6 @@
 ApparelComponent
 ApparelModel
 ApparelLabel
-ApparelColourRangeVariation
 ApparelAssortment
 ApparelFabricColourVariation
 ApparelModelColourVariation