From 1d6f5aa13a9cccae1ec2d38d1d8bdb6a83bd2bc0 Mon Sep 17 00:00:00 2001
From: Fabien Morin <fabien@nexedi.com>
Date: Thu, 1 Oct 2009 10:08:20 +0000
Subject: [PATCH] - update copyright of Document and PropertySheet - remove
some unused commented code - replace 'variation_base_category' property by
PropertySheet VariationRange - remove ApparelColourRange property_sheet
because VariationRange could be used instead - set some fields title as non
required fields in some forms
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29344 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../DocumentTemplateItem/ApparelAssortment.py | 28 +----------
.../DocumentTemplateItem/ApparelCloth.py | 3 +-
.../ApparelColourRange.py | 4 +-
.../DocumentTemplateItem/ApparelComponent.py | 4 +-
.../DocumentTemplateItem/ApparelFabric.py | 13 +----
.../ApparelMeasurement.py | 2 +-
.../DocumentTemplateItem/ApparelModel.py | 3 +-
.../DocumentTemplateItem/ApparelShape.py | 3 +-
.../DocumentTemplateItem/ApparelSize.py | 2 +-
.../ApparelAssortment.py | 15 +-----
.../PropertySheetTemplateItem/ApparelCloth.py | 15 +-----
.../ApparelCollection.py | 2 +-
.../ApparelColourRange.py | 49 -------------------
.../ApparelColourRangeVariation.py | 2 +-
.../ApparelComponent.py | 14 +-----
.../ApparelComponentVariation.py | 2 +-
.../ApparelConsumption.py | 2 +-
.../ApparelFabric.py | 14 +-----
.../ApparelFabricColourVariation.py | 2 +-
.../PropertySheetTemplateItem/ApparelLabel.py | 5 +-
.../PropertySheetTemplateItem/ApparelModel.py | 14 +-----
.../ApparelModelColourVariation.py | 2 +-
.../ApparelModelMorphologyVariation.py | 2 +-
.../PropertySheetTemplateItem/ApparelShape.py | 2 +-
.../PropertySheetTemplateItem/ApparelSize.py | 2 +-
.../ApparelTransformation.py | 2 +-
.../my_title.xml | 2 +-
.../ApparelModel_view/my_title.xml | 2 +-
bt5/erp5_apparel/bt/revision | 2 +-
.../bt/template_property_sheet_id_list | 1 -
30 files changed, 37 insertions(+), 178 deletions(-)
delete mode 100644 bt5/erp5_apparel/PropertySheetTemplateItem/ApparelColourRange.py
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/ApparelAssortment.py b/bt5/erp5_apparel/DocumentTemplateItem/ApparelAssortment.py
index 9674afb756..7851d22a2a 100644
--- a/bt5/erp5_apparel/DocumentTemplateItem/ApparelAssortment.py
+++ b/bt5/erp5_apparel/DocumentTemplateItem/ApparelAssortment.py
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2002, 2004 Nexedi SARL and Contributors. All Rights Reserved.
+# Copyright (c) 2002, 2009 Nexedi SA and Contributors. All Rights Reserved.
# Jean-Paul Smets-Solanes <jp@nexedi.com>
# Romain Courteaud <romain@nexedi.com>
#
@@ -33,8 +33,6 @@ from Products.ERP5.Document.Resource import Resource
from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
from Products.ERP5Type.Base import Base
from Products.ERP5Type.XMLMatrix import XMLMatrix
-
-
from zLOG import LOG
class ApparelAssortment(Resource, XMLMatrix):
@@ -63,27 +61,5 @@ class ApparelAssortment(Resource, XMLMatrix):
, PropertySheet.Comment
, PropertySheet.ApparelCollection
, PropertySheet.ApparelSize
+ , PropertySheet.VariationRange
)
-
- # Hard Wired Variation List
- # XXX - may be incompatible with future versions of ERP5
- #variation_base_category_list = ('coloris', 'taille')
-
-
-# security.declareProtected(Permissions.View, 'getDefaultQuantityUnit')
-# def getDefaultQuantityUnit(self):
-# # Requires for Assorted Resource XXX temp patch until getAggregated methods use real classes instead of dicts
-# # and access props/cats through accessors
-# return "Unite"
-#
-# security.declareProtected(Permissions.View, 'getQuantityUnit')
-# def getQuantityUnit(self):
-# # Requires for Assorted Resource XXX temp patch until getAggregated methods use real classes instead of dicts
-# # and access props/cats through accessors
-# return "Unite"
-#
-# security.declareProtected(Permissions.View, 'getQuantityUnitList')
-# def getQuantityUnitList(self):
-# # Requires for Assorted Resource XXX temp patch until getAggregated methods use real classes instead of dicts
-# # and access props/cats through accessors
-# return ["Unite"]
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/ApparelCloth.py b/bt5/erp5_apparel/DocumentTemplateItem/ApparelCloth.py
index c46f4e9fe0..5f5ae25118 100644
--- a/bt5/erp5_apparel/DocumentTemplateItem/ApparelCloth.py
+++ b/bt5/erp5_apparel/DocumentTemplateItem/ApparelCloth.py
@@ -2,7 +2,7 @@
#
# 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.
+# Copyright (c) 2004 - 2009 Nexedi SA and Contributors. All Rights Reserved.
# Courteaud_Romain <romain@nexedi.com>
#
# WARNING: This program as such is intended to be used by professional
@@ -59,6 +59,7 @@ class ApparelCloth(Resource, XMLMatrix):
, PropertySheet.TransformedResource
, PropertySheet.IndustrialDescription
, PropertySheet.ApparelSize
+ , PropertySheet.VariationRange
)
security.declareProtected(Permissions.ModifyPortalContent, '_setSizeList')
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/ApparelColourRange.py b/bt5/erp5_apparel/DocumentTemplateItem/ApparelColourRange.py
index 08e5b89635..e38a392df8 100644
--- a/bt5/erp5_apparel/DocumentTemplateItem/ApparelColourRange.py
+++ b/bt5/erp5_apparel/DocumentTemplateItem/ApparelColourRange.py
@@ -2,7 +2,7 @@
#
# 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.
+# Copyright (c) 2004, 2009 Nexedi SA and Contributors. All Rights Reserved.
# Courteaud_Romain <romain@nexedi.com>
#
# WARNING: This program as such is intended to be used by professional
@@ -50,10 +50,10 @@ class ApparelColourRange(Resource):
# Declarative properties
property_sheets = ( PropertySheet.Base
- , PropertySheet.ApparelColourRange
, PropertySheet.XMLObject
#, PropertySheet.TransformedResource
, PropertySheet.CategoryCore
, PropertySheet.DublinCore
, PropertySheet.ApparelCollection
+ , PropertySheet.VariationRange
)
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/ApparelComponent.py b/bt5/erp5_apparel/DocumentTemplateItem/ApparelComponent.py
index 09f15d9197..6c23f6c5d2 100644
--- a/bt5/erp5_apparel/DocumentTemplateItem/ApparelComponent.py
+++ b/bt5/erp5_apparel/DocumentTemplateItem/ApparelComponent.py
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2002-2004 Nexedi SARL and Contributors. All Rights Reserved.
+# Copyright (c) 2002-2009 Nexedi SA and Contributors. All Rights Reserved.
# Jean-Paul Smets-Solanes <jp@nexedi.com>
# Courteaud_Romain <romain@nexedi.com>
#
@@ -56,9 +56,9 @@ class ApparelComponent(Resource):
, PropertySheet.Resource
, PropertySheet.Reference
, PropertySheet.ApparelCollection
+ , PropertySheet.VariationRange
)
-
# Unit conversion
security.declareProtected(Permissions.AccessContentsInformation, 'convertQuantity')
def convertQuantity(self, quantity, from_unit, to_unit):
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/ApparelFabric.py b/bt5/erp5_apparel/DocumentTemplateItem/ApparelFabric.py
index 90baaea87c..8c155f646b 100644
--- a/bt5/erp5_apparel/DocumentTemplateItem/ApparelFabric.py
+++ b/bt5/erp5_apparel/DocumentTemplateItem/ApparelFabric.py
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2002-2004 Nexedi SARL and Contributors. All Rights Reserved.
+# Copyright (c) 2002-2009 Nexedi SA and Contributors. All Rights Reserved.
# Jean-Paul Smets-Solanes <jp@nexedi.com>
# Courteaud_Romain <romain@nexedi.com>
#
@@ -57,6 +57,7 @@ class ApparelFabric(Resource):
, PropertySheet.Reference
, PropertySheet.ApparelCollection
, PropertySheet.ApparelLabel
+ , PropertySheet.VariationRange
)
@@ -79,13 +80,3 @@ class ApparelFabric(Resource):
# XXX return [my_default_quantity] + rejectIn( ['Surface/Centimetre_carre', 'Longueur/Metre'],
return [my_default_quantity] + rejectIn( ['area/square centimeters', 'measurement/meter'],
[my_default_quantity])
-
-# # Unit list
-# security.declareProtected(Permissions.AccessContentsInformation, 'getQuantityUnitList')
-# def getQuantityUnitList(self):
-# my_default_quantity = self.getCategoryDefaultMembership('quantity_unit')
-# # XXX return [my_default_quantity] + rejectIn( ['Surface/Centimetre_carre', 'Longueur/Metre'],
-# return [my_default_quantity] + rejectIn( ['Surface/Centimetre_carre', 'length/meter'],
-# [my_default_quantity])
-
-
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/ApparelMeasurement.py b/bt5/erp5_apparel/DocumentTemplateItem/ApparelMeasurement.py
index 2ea3f9b4af..787bc11905 100644
--- a/bt5/erp5_apparel/DocumentTemplateItem/ApparelMeasurement.py
+++ b/bt5/erp5_apparel/DocumentTemplateItem/ApparelMeasurement.py
@@ -2,7 +2,7 @@
#
# 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.
+# Copyright (c) 2004, 2009 Nexedi SA and Contributors. All Rights Reserved.
# Courteaud_Romain <romain@nexedi.com>
#
# WARNING: This program as such is intended to be used by professional
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/ApparelModel.py b/bt5/erp5_apparel/DocumentTemplateItem/ApparelModel.py
index a1cdf8e69c..85691e93d5 100644
--- a/bt5/erp5_apparel/DocumentTemplateItem/ApparelModel.py
+++ b/bt5/erp5_apparel/DocumentTemplateItem/ApparelModel.py
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2002-2004 Nexedi SARL and Contributors. All Rights Reserved.
+# Copyright (c) 2002-2009 Nexedi SA and Contributors. All Rights Reserved.
# Jean-Paul Smets-Solanes <jp@nexedi.com>
# Romain Courteaud <romain@nexedi.com>
#
@@ -62,4 +62,5 @@ class ApparelModel(Resource, XMLMatrix):
, PropertySheet.ApparelCollection
, PropertySheet.ApparelSize
, PropertySheet.ApparelLabel
+ , PropertySheet.VariationRange
)
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/ApparelShape.py b/bt5/erp5_apparel/DocumentTemplateItem/ApparelShape.py
index 95c114b02c..fbf596e821 100644
--- a/bt5/erp5_apparel/DocumentTemplateItem/ApparelShape.py
+++ b/bt5/erp5_apparel/DocumentTemplateItem/ApparelShape.py
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2002-2004 Nexedi SARL and Contributors. All Rights Reserved.
+# Copyright (c) 2002-2009 Nexedi SA and Contributors. All Rights Reserved.
# Jean-Paul Smets-Solanes <jp@nexedi.com>
# Romain Courteaud <romain@nexedi.com>
#
@@ -56,4 +56,5 @@ class ApparelShape(Resource):
, PropertySheet.TransformedResource
, PropertySheet.IndustrialDescription
, PropertySheet.ApparelCollection
+ , PropertySheet.VariationRange
)
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/ApparelSize.py b/bt5/erp5_apparel/DocumentTemplateItem/ApparelSize.py
index 42b55986a7..8e02520721 100644
--- a/bt5/erp5_apparel/DocumentTemplateItem/ApparelSize.py
+++ b/bt5/erp5_apparel/DocumentTemplateItem/ApparelSize.py
@@ -2,7 +2,7 @@
#
# 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.
+# 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
diff --git a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelAssortment.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelAssortment.py
index 18e86e5cf7..1ef9c95206 100644
--- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelAssortment.py
+++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelAssortment.py
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2002, 2004 Nexedi SARL and Contributors. All Rights Reserved.
+# Copyright (c) 2002, 2009 Nexedi SA and Contributors. All Rights Reserved.
# Jean-Paul Smets-Solanes <jp@nexedi.com>
# Romain Courteaud <romain@nexedi.com>
#
@@ -35,10 +35,6 @@ class ApparelAssortment:
"""
_properties = (
-# { 'id' : 'commentaires',
-# 'description' : 'Commentaires',
-# 'type' : 'text',
-# 'mode' : 'w' },
{ 'id' : 'ean13_code',
'description' : 'The EAN 13 code of this apparel model',
'type' : 'string',
@@ -53,15 +49,6 @@ 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/ApparelCloth.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelCloth.py
index 313a5835fb..f1df6166f3 100644
--- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelCloth.py
+++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelCloth.py
@@ -2,7 +2,7 @@
#
# 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.
+# 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
@@ -35,7 +35,7 @@ class ApparelCloth:
"""
_properties = (
- { 'id' : 'cad_library',
+ { 'id' : 'cad_library',
'description' : 'library name containing the lectra files',
'type' : 'string',
'mode' : 'w' },
@@ -43,7 +43,6 @@ class ApparelCloth:
'description' : 'size by default',
'type' : 'string',
'mode' : 'w' },
-
{ 'id' : 'apparel_shape_title',
'description' : 'Titles of the compatibles apparel shapes ',
'type' : 'lines',
@@ -54,7 +53,6 @@ class ApparelCloth:
'acquisition_accessor_id' : 'getTitle',
'acquisition_depends' : None,
'mode' : 'w' },
-
{ 'id' : 'apparel_measurement_title',
'description' : 'Titles of the apparel measurement associated',
'type' : 'lines',
@@ -65,13 +63,4 @@ class ApparelCloth:
'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' : 'tokens',
- 'default' : ['size'],
- 'mode' : 'r' },
)
-
diff --git a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelCollection.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelCollection.py
index 338313f816..69efa29f91 100644
--- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelCollection.py
+++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelCollection.py
@@ -2,7 +2,7 @@
#
# 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.
+# 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
diff --git a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelColourRange.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelColourRange.py
deleted file mode 100644
index 6bebb11065..0000000000
--- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelColourRange.py
+++ /dev/null
@@ -1,49 +0,0 @@
-##############################################################################
-#
-# 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/PropertySheetTemplateItem/ApparelColourRangeVariation.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelColourRangeVariation.py
index bf8575f692..64121b5de3 100644
--- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelColourRangeVariation.py
+++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelColourRangeVariation.py
@@ -2,7 +2,7 @@
#
# 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.
+# 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
diff --git a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponent.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponent.py
index cafa886a9e..b1f2410128 100644
--- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponent.py
+++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponent.py
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2002-2004 Nexedi SARL and Contributors. All Rights Reserved.
+# Copyright (c) 2002-2009 Nexedi SA and Contributors. All Rights Reserved.
# Jean-Paul Smets-Solanes <jp@nexedi.com>
# Romain Courteaud <romain@nexedi.com>
#
@@ -38,13 +38,6 @@ class ApparelComponent:
'type' : 'int',
'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' : 'tokens',
- 'default' : ['variation'],
- 'mode' : 'w' },
{ 'id' : 'p_variation_base_category',
'description' : 'A list of base categories which define possible discrete variations. '\
'Price ranges are stored as category membership. '\
@@ -52,11 +45,6 @@ class ApparelComponent:
'type' : 'lines',
'default' : ['variation'],
'mode' : 'w' },
- { 'id' : 'variation_base_category_line',
- 'description' : 'The variation base category which serves as line in the matrix representation.',
- 'type' : 'string',
- 'default' : 'variation',
- 'mode' : 'w' },
)
_categories = ( 'composition', 'visual_pattern', 'resource' )
diff --git a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponentVariation.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponentVariation.py
index 106e90364b..e6b8140b16 100644
--- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponentVariation.py
+++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponentVariation.py
@@ -2,7 +2,7 @@
#
# 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.
+# 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
diff --git a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelConsumption.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelConsumption.py
index 41f6469daa..dc09e7a710 100644
--- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelConsumption.py
+++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelConsumption.py
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2002, 2004 Nexedi SARL and Contributors. All Rights Reserved.
+# Copyright (c) 2002, 2004, 2009 Nexedi SA and Contributors. All Rights Reserved.
# Jean-Paul Smets-Solanes <jp@nexedi.com>
# Romain Courteaud <romain@nexedi.com>
#
diff --git a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabric.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabric.py
index 4fb1268a41..42c77e66ab 100644
--- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabric.py
+++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabric.py
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2002-2004 Nexedi SARL and Contributors. All Rights Reserved.
+# Copyright (c) 2002-2009 Nexedi SA and Contributors. All Rights Reserved.
# Jean-Paul Smets-Solanes <jp@nexedi.com>
# Romain Courteaud <romain@nexedi.com>
#
@@ -54,13 +54,6 @@ class ApparelFabric:
'type' : 'string',
'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' : 'tokens',
- 'default' : ['colour'],
- 'mode' : 'w' },
{ 'id' : 'p_variation_base_category',
'description' : 'A list of base categories which define possible discrete variations. '\
'Price ranges are stored as category membership. '\
@@ -68,11 +61,6 @@ class ApparelFabric:
'type' : 'lines',
'default' : ['colour'],
'mode' : 'w' },
- { 'id' : 'variation_base_category_line',
- 'description' : 'The variation base category which serves as line in the matrix representation.',
- 'type' : 'string',
- 'default' : 'colour',
- 'mode' : 'w' },
{ 'id' : 'default_apparel_fabric_colour_variation',
'description' : 'The default colour variation for this fabric',
'type' : 'content',
diff --git a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabricColourVariation.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabricColourVariation.py
index 65bc822b95..cf9c57e573 100644
--- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabricColourVariation.py
+++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabricColourVariation.py
@@ -2,7 +2,7 @@
#
# 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.
+# 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
diff --git a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelLabel.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelLabel.py
index d7248c94e5..d699827666 100644
--- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelLabel.py
+++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelLabel.py
@@ -1,9 +1,8 @@
##############################################################################
#
-# Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-# Jean-Paul Smets-Solanes <jp@nexedi.com>
-# Copyright (c) 2004 Nexedi SARL and Contributors. All Rights Reserved.
+# Copyright (c) 2002, 2004, 2009 Nexedi SA and Contributors. All Rights Reserved.
# Romain Courteaud <romain@nexedi.com>
+# Jean-Paul Smets-Solanes <jp@nexedi.com>
#
# WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsability of assessing all potential
diff --git a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModel.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModel.py
index 6270c73356..ee11f70d75 100644
--- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModel.py
+++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModel.py
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2002-2004 Nexedi SARL and Contributors. All Rights Reserved.
+# Copyright (c) 2002-2009 Nexedi SA and Contributors. All Rights Reserved.
# Jean-Paul Smets-Solanes <jp@nexedi.com>
# Romain Courteaud <romain@nexedi.com>
#
@@ -118,13 +118,6 @@ class ApparelModel:
'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' : 'tokens',
- 'default' : ['colour', 'size', 'morphology', 'industrial_phase'],
- 'mode' : 'r' },
{ 'id' : 'p_variation_base_category',
'description' : 'A list of base categories which define possible discrete variations. '\
'Price ranges are stored as category membership. '\
@@ -132,11 +125,6 @@ class ApparelModel:
'type' : 'lines',
'default' : ['colour'],
'mode' : 'w' },
- { 'id' : 'variation_base_category_line',
- 'description' : 'The variation base category which serves as line in the matrix representation.',
- 'type' : 'string',
- 'default' : 'colour',
- 'mode' : 'w' },
)
_categories = ( 'composition', 'transformation_state', 'pricing', 'origin', 'brand', 'tariff_nomenclature' )
diff --git a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModelColourVariation.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModelColourVariation.py
index 0e5febc384..e76c85386c 100644
--- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModelColourVariation.py
+++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModelColourVariation.py
@@ -2,7 +2,7 @@
#
# 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.
+# 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
diff --git a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModelMorphologyVariation.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModelMorphologyVariation.py
index 9fd176e0f5..a7a6f24dab 100644
--- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModelMorphologyVariation.py
+++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModelMorphologyVariation.py
@@ -2,7 +2,7 @@
#
# 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.
+# 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
diff --git a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelShape.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelShape.py
index 9d2dad6c6c..14c602ef4b 100644
--- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelShape.py
+++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelShape.py
@@ -2,7 +2,7 @@
#
# 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.
+# 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
diff --git a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelSize.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelSize.py
index caff4672d3..1aa6de5a0e 100644
--- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelSize.py
+++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelSize.py
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2002-2004 Nexedi SARL and Contributors. All Rights Reserved.
+# Copyright (c) 2002-2009 Nexedi SA and Contributors. All Rights Reserved.
# Jean-Paul Smets-Solanes <jp@nexedi.com>
# Romain Courteaud <romain@nexedi.com>
#
diff --git a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelTransformation.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelTransformation.py
index 968b20d6a0..67e4593769 100644
--- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelTransformation.py
+++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelTransformation.py
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2004 Nexedi SARL and Contributors. All Rights Reserved.
+# 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
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_title.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_title.xml
index b57e1f668f..659aa8d968 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_title.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_title.xml
@@ -236,7 +236,7 @@
</item>
<item>
<key> <string>required</string> </key>
- <value> <int>1</int> </value>
+ <value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_title.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_title.xml
index d19b7424a2..9c52ebf3eb 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_title.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_title.xml
@@ -236,7 +236,7 @@
</item>
<item>
<key> <string>required</string> </key>
- <value> <int>1</int> </value>
+ <value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
diff --git a/bt5/erp5_apparel/bt/revision b/bt5/erp5_apparel/bt/revision
index 801f180102..c5b431b6cb 100644
--- a/bt5/erp5_apparel/bt/revision
+++ b/bt5/erp5_apparel/bt/revision
@@ -1 +1 @@
-47
\ No newline at end of file
+50
\ 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 2bd3990a2b..d14ec365d6 100644
--- a/bt5/erp5_apparel/bt/template_property_sheet_id_list
+++ b/bt5/erp5_apparel/bt/template_property_sheet_id_list
@@ -11,7 +11,6 @@ ApparelTransformation
ApparelColourRangeVariation
ApparelAssortment
ApparelFabricColourVariation
-ApparelColourRange
ApparelModelColourVariation
ApparelComponentVariation
ApparelSize
\ No newline at end of file
--
2.30.9