[Erp5-report] r29343 - in /erp5/trunk/bt5/erp5_apparel: DocumentTemplateItem/ PropertySheet...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Oct 1 12:08:10 CEST 2009
Author: fabien
Date: Thu Oct 1 12:08:05 2009
New Revision: 29343
URL: http://svn.erp5.org?rev=29343&view=rev
Log:
- 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
Modified:
erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelAssortment.py
erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelCloth.py
erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelColourRange.py
erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelComponent.py
erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelFabric.py
erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelMeasurement.py
erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelModel.py
erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelShape.py
erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelSize.py
erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelAssortment.py
erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelCloth.py
erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelCollection.py
erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelColourRangeVariation.py
erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponent.py
erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponentVariation.py
erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelConsumption.py
erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabric.py
erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabricColourVariation.py
erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelLabel.py
erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModel.py
erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModelColourVariation.py
erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModelMorphologyVariation.py
erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelShape.py
erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelSize.py
erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelTransformation.py
erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_title.xml
erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_title.xml
erp5/trunk/bt5/erp5_apparel/bt/revision
erp5/trunk/bt5/erp5_apparel/bt/template_property_sheet_id_list
Modified: erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelAssortment.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelAssortment.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelAssortment.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelAssortment.py [utf8] Thu Oct 1 12:08:05 2009
@@ -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 at nexedi.com>
# Romain Courteaud <romain at nexedi.com>
#
@@ -33,8 +33,6 @@
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 @@
, 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"]
Modified: erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelCloth.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelCloth.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelCloth.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelCloth.py [utf8] Thu Oct 1 12:08:05 2009
@@ -2,7 +2,7 @@
#
# Copyright (c) 2002 Coramy SAS and Contributors. All Rights Reserved.
# Thierry_Faucher <Thierry_Faucher at 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 at nexedi.com>
#
# WARNING: This program as such is intended to be used by professional
@@ -59,6 +59,7 @@
, PropertySheet.TransformedResource
, PropertySheet.IndustrialDescription
, PropertySheet.ApparelSize
+ , PropertySheet.VariationRange
)
security.declareProtected(Permissions.ModifyPortalContent, '_setSizeList')
Modified: erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelColourRange.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelColourRange.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelColourRange.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelColourRange.py [utf8] Thu Oct 1 12:08:05 2009
@@ -2,7 +2,7 @@
#
# Copyright (c) 2002 Coramy SAS and Contributors. All Rights Reserved.
# Thierry_Faucher <Thierry_Faucher at 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 at nexedi.com>
#
# WARNING: This program as such is intended to be used by professional
@@ -50,10 +50,10 @@
# Declarative properties
property_sheets = ( PropertySheet.Base
- , PropertySheet.ApparelColourRange
, PropertySheet.XMLObject
#, PropertySheet.TransformedResource
, PropertySheet.CategoryCore
, PropertySheet.DublinCore
, PropertySheet.ApparelCollection
+ , PropertySheet.VariationRange
)
Modified: erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelComponent.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelComponent.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelComponent.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelComponent.py [utf8] Thu Oct 1 12:08:05 2009
@@ -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 at nexedi.com>
# Courteaud_Romain <romain at nexedi.com>
#
@@ -56,8 +56,8 @@
, PropertySheet.Resource
, PropertySheet.Reference
, PropertySheet.ApparelCollection
+ , PropertySheet.VariationRange
)
-
# Unit conversion
security.declareProtected(Permissions.AccessContentsInformation, 'convertQuantity')
Modified: erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelFabric.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelFabric.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelFabric.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelFabric.py [utf8] Thu Oct 1 12:08:05 2009
@@ -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 at nexedi.com>
# Courteaud_Romain <romain at nexedi.com>
#
@@ -57,6 +57,7 @@
, PropertySheet.Reference
, PropertySheet.ApparelCollection
, PropertySheet.ApparelLabel
+ , PropertySheet.VariationRange
)
@@ -79,13 +80,3 @@
# 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])
-
-
Modified: erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelMeasurement.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelMeasurement.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelMeasurement.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelMeasurement.py [utf8] Thu Oct 1 12:08:05 2009
@@ -2,7 +2,7 @@
#
# Copyright (c) 2002 Coramy SAS and Contributors. All Rights Reserved.
# Thierry_Faucher <Thierry_Faucher at 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 at nexedi.com>
#
# WARNING: This program as such is intended to be used by professional
Modified: erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelModel.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelModel.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelModel.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelModel.py [utf8] Thu Oct 1 12:08:05 2009
@@ -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 at nexedi.com>
# Romain Courteaud <romain at nexedi.com>
#
@@ -62,4 +62,5 @@
, PropertySheet.ApparelCollection
, PropertySheet.ApparelSize
, PropertySheet.ApparelLabel
+ , PropertySheet.VariationRange
)
Modified: erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelShape.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelShape.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelShape.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelShape.py [utf8] Thu Oct 1 12:08:05 2009
@@ -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 at nexedi.com>
# Romain Courteaud <romain at nexedi.com>
#
@@ -56,4 +56,5 @@
, PropertySheet.TransformedResource
, PropertySheet.IndustrialDescription
, PropertySheet.ApparelCollection
+ , PropertySheet.VariationRange
)
Modified: erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelSize.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelSize.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelSize.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/DocumentTemplateItem/ApparelSize.py [utf8] Thu Oct 1 12:08:05 2009
@@ -2,7 +2,7 @@
#
# Copyright (c) 2002 Coramy SAS and Contributors. All Rights Reserved.
# Thierry_Faucher <Thierry_Faucher at 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 at nexedi.com>
#
# WARNING: This program as such is intended to be used by professional
Modified: erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelAssortment.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelAssortment.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelAssortment.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelAssortment.py [utf8] Thu Oct 1 12:08:05 2009
@@ -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 at nexedi.com>
# Romain Courteaud <romain at nexedi.com>
#
@@ -35,10 +35,6 @@
"""
_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 @@
'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' )
Modified: erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelCloth.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelCloth.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelCloth.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelCloth.py [utf8] Thu Oct 1 12:08:05 2009
@@ -2,7 +2,7 @@
#
# Copyright (c) 2002 Coramy SAS and Contributors. All Rights Reserved.
# Thierry Faucher <Thierry_Faucher at 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 at nexedi.com>
#
# WARNING: This program as such is intended to be used by professional
@@ -35,7 +35,7 @@
"""
_properties = (
- { 'id' : 'cad_library',
+ { 'id' : 'cad_library',
'description' : 'library name containing the lectra files',
'type' : 'string',
'mode' : 'w' },
@@ -43,7 +43,6 @@
'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 @@
'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 @@
'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' },
)
-
Modified: erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelCollection.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelCollection.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelCollection.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelCollection.py [utf8] Thu Oct 1 12:08:05 2009
@@ -2,7 +2,7 @@
#
# Copyright (c) 2002 Coramy SAS and Contributors. All Rights Reserved.
# Thierry Faucher <Thierry_Faucher at 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 at nexedi.com>
#
# WARNING: This program as such is intended to be used by professional
Modified: erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelColourRangeVariation.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelColourRangeVariation.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelColourRangeVariation.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelColourRangeVariation.py [utf8] Thu Oct 1 12:08:05 2009
@@ -2,7 +2,7 @@
#
# Copyright (c) 2002 Coramy SAS and Contributors. All Rights Reserved.
# Thierry Faucher <Thierry_Faucher at 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 at nexedi.com>
#
# WARNING: This program as such is intended to be used by professional
Modified: erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponent.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponent.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponent.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponent.py [utf8] Thu Oct 1 12:08:05 2009
@@ -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 at nexedi.com>
# Romain Courteaud <romain at nexedi.com>
#
@@ -38,13 +38,6 @@
'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 @@
'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' )
Modified: erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponentVariation.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponentVariation.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponentVariation.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponentVariation.py [utf8] Thu Oct 1 12:08:05 2009
@@ -2,7 +2,7 @@
#
# Copyright (c) 2002 Coramy SAS and Contributors. All Rights Reserved.
# Thierry Faucher <Thierry_Faucher at 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 at nexedi.com>
#
# WARNING: This program as such is intended to be used by professional
Modified: erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelConsumption.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelConsumption.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelConsumption.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelConsumption.py [utf8] Thu Oct 1 12:08:05 2009
@@ -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 at nexedi.com>
# Romain Courteaud <romain at nexedi.com>
#
Modified: erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabric.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabric.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabric.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabric.py [utf8] Thu Oct 1 12:08:05 2009
@@ -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 at nexedi.com>
# Romain Courteaud <romain at nexedi.com>
#
@@ -54,24 +54,12 @@
'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. '\
'(prev. variation_category_list).',
'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',
Modified: erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabricColourVariation.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabricColourVariation.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabricColourVariation.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabricColourVariation.py [utf8] Thu Oct 1 12:08:05 2009
@@ -2,7 +2,7 @@
#
# Copyright (c) 2002 Coramy SAS and Contributors. All Rights Reserved.
# Thierry Faucher <Thierry_Faucher at 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 at nexedi.com>
#
# WARNING: This program as such is intended to be used by professional
Modified: erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelLabel.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelLabel.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelLabel.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelLabel.py [utf8] Thu Oct 1 12:08:05 2009
@@ -1,9 +1,8 @@
##############################################################################
#
-# Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
+# Copyright (c) 2002, 2004, 2009 Nexedi SA and Contributors. All Rights Reserved.
+# Romain Courteaud <romain at nexedi.com>
# Jean-Paul Smets-Solanes <jp at nexedi.com>
-# Copyright (c) 2004 Nexedi SARL and Contributors. All Rights Reserved.
-# Romain Courteaud <romain at nexedi.com>
#
# WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsability of assessing all potential
Modified: erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModel.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModel.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModel.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModel.py [utf8] Thu Oct 1 12:08:05 2009
@@ -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 at nexedi.com>
# Romain Courteaud <romain at nexedi.com>
#
@@ -118,24 +118,12 @@
'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. '\
'(prev. variation_category_list).',
'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' },
)
Modified: erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModelColourVariation.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModelColourVariation.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModelColourVariation.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModelColourVariation.py [utf8] Thu Oct 1 12:08:05 2009
@@ -2,7 +2,7 @@
#
# Copyright (c) 2002 Coramy SAS and Contributors. All Rights Reserved.
# Thierry Faucher <Thierry_Faucher at 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 at nexedi.com>
#
# WARNING: This program as such is intended to be used by professional
Modified: erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModelMorphologyVariation.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModelMorphologyVariation.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModelMorphologyVariation.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModelMorphologyVariation.py [utf8] Thu Oct 1 12:08:05 2009
@@ -2,7 +2,7 @@
#
# Copyright (c) 2002 Coramy SAS and Contributors. All Rights Reserved.
# Thierry Faucher <Thierry_Faucher at 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 at nexedi.com>
#
# WARNING: This program as such is intended to be used by professional
Modified: erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelShape.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelShape.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelShape.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelShape.py [utf8] Thu Oct 1 12:08:05 2009
@@ -2,7 +2,7 @@
#
# Copyright (c) 2002 Coramy SAS and Contributors. All Rights Reserved.
# Thierry Faucher <Thierry_Faucher at 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 at nexedi.com>
#
# WARNING: This program as such is intended to be used by professional
Modified: erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelSize.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelSize.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelSize.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelSize.py [utf8] Thu Oct 1 12:08:05 2009
@@ -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 at nexedi.com>
# Romain Courteaud <romain at nexedi.com>
#
Modified: erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelTransformation.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelTransformation.py?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelTransformation.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelTransformation.py [utf8] Thu Oct 1 12:08:05 2009
@@ -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 at nexedi.com>
#
# WARNING: This program as such is intended to be used by professional
Modified: erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_title.xml?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_title.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_title.xml [utf8] Thu Oct 1 12:08:05 2009
@@ -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>
Modified: erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_title.xml?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_title.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_title.xml [utf8] Thu Oct 1 12:08:05 2009
@@ -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>
Modified: erp5/trunk/bt5/erp5_apparel/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/bt/revision?rev=29343&r1=29342&r2=29343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/bt/revision [utf8] Thu Oct 1 12:08:05 2009
@@ -1,1 +1,1 @@
-47
+50
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=29343&r1=29342&r2=29343&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 Oct 1 12:08:05 2009
@@ -11,7 +11,6 @@
ApparelColourRangeVariation
ApparelAssortment
ApparelFabricColourVariation
-ApparelColourRange
ApparelModelColourVariation
ApparelComponentVariation
ApparelSize
More information about the Erp5-report
mailing list