Commit 1d6f5aa1 authored by Fabien Morin's avatar Fabien Morin

- 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
parent 863815a0
##############################################################################
#
# 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"]
......@@ -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')
......
......@@ -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
)
##############################################################################
#
# 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):
......
##############################################################################
#
# 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])
......@@ -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
......
##############################################################################
#
# 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
)
##############################################################################
#
# 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
)
......@@ -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
......
##############################################################################
#
# 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' )
......
......@@ -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' },
)
......@@ -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
......
##############################################################################
#
# 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 = ( )
......@@ -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
......
##############################################################################
#
# 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' )
......
......@@ -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
......
##############################################################################
#
# 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>
#
......
##############################################################################
#
# 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',
......
......@@ -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
......
##############################################################################
#
# 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
......
##############################################################################
#
# 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' )
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
##############################################################################
#
# 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>
#
......
##############################################################################
#
# 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
......
......@@ -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>
......
......@@ -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>
......
47
\ No newline at end of file
50
\ No newline at end of file
......@@ -11,7 +11,6 @@ ApparelTransformation
ApparelColourRangeVariation
ApparelAssortment
ApparelFabricColourVariation
ApparelColourRange
ApparelModelColourVariation
ApparelComponentVariation
ApparelSize
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment