* remove ApparelColourRangeVariation propertysheet since the properties should...

* 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

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31040 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_apparel/PortalTypePropertySheetTemplateItem/property_sheet_list.xml

@@ -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">

bt5/erp5_apparel/PropertySheetTemplateItem/ApparelColourRangeVariation.py

-##############################################################################
-#
-# Copyright (c) 2002 Coramy SAS and Contributors. All Rights Reserved.
-#          Thierry Faucher <Thierry_Faucher@coramy.com>
-# Copyright (c) 2004 - 2009 Nexedi SA 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 ApparelColourRangeVariation:
-  """
-    ApparelColourRangeVariation properties and categories
-  """
-
-  _properties = (
-  {   'id'          : 'apparel_fabric_colour_variation_title', 
-      'description' : 'Title of the apparel fabric colour variation',
-      'type'        : 'lines',
-      'acquisition_base_category' : ('specialise',),
-      'acquisition_portal_type'   : ('Apparel Fabric Colour Variation',),
-      'acquisition_copy_value'    : 0,
-      'acquisition_mask_value'    : 0,
-      'acquisition_accessor_id'   : 'getTitle',
-      'acquisition_depends'       : None,
-      'mode'        : 'w' },
-
-   # Override default value XXX
-   {   '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'        : 'lines',
-        'default'     : ('colour', ),
-        'mode'        : 'r' },
-   )

bt5/erp5_apparel/PropertySheetTemplateItem/ApparelPreference.py

@@ -139,4 +139,25 @@ class ApparelPreference:
       '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'        : '' },
   )

bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/SystemPreference_viewApparelPreference.xml

@@ -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_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>
+                        <string>my_preferred_apparel_colour_range_optional_variation_base_category_list</string>
+                        <string>my_preferred_apparel_colour_range_individual_variation_base_category_list</string>
                       </list>
                     </value>
                 </item>

bt5/erp5_apparel/bt/revision

-202
\ No newline at end of file
+203
\ No newline at end of file

bt5/erp5_apparel/bt/template_portal_type_property_sheet_list

 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

bt5/erp5_apparel/bt/template_property_sheet_id_list

@@ -6,7 +6,6 @@ ApparelConsumption
 ApparelComponent
 ApparelModel
 ApparelLabel
-ApparelColourRangeVariation
 ApparelAssortment
 ApparelFabricColourVariation
 ApparelModelColourVariation