diff --git a/product/ERP5/Constraint/ResourceMeasuresConsistency.py b/product/ERP5/Constraint/ResourceMeasuresConsistency.py index 68c9e0ee90425a4b6628fe9063e542afc6c09e79..0ab3400bb277ab3edcc447e2a23f8813648ee421 100644 --- a/product/ERP5/Constraint/ResourceMeasuresConsistency.py +++ b/product/ERP5/Constraint/ResourceMeasuresConsistency.py @@ -60,9 +60,6 @@ class ResourceMeasuresConsistency(Constraint): error_list = [] portal = obj.getPortalObject() - if obj.getPortalType() not in portal.getPortalResourceTypeList(): - return error_list - error = lambda msg, **kw: error_list.append( self._generateError(obj, self._getMessage(msg), mapping=kw)) diff --git a/product/ERP5/PropertySheet/Resource.py b/product/ERP5/PropertySheet/Resource.py index c1155857d78233b48dc45adfee050867de81851a..0c032e7b38e9e0a1efb01730b2ffe0b8d9bf727b 100644 --- a/product/ERP5/PropertySheet/Resource.py +++ b/product/ERP5/PropertySheet/Resource.py @@ -179,13 +179,6 @@ class Resource: ) - _constraints = ( - { 'id': 'resource_measures_consistency', - 'description': '', - 'type': 'ResourceMeasuresConsistency', - }, - ) - _categories = ( 'source', 'destination', 'quantity_unit', 'price_unit', 'weight_unit', 'length_unit', 'height_unit', 'width_unit', 'volume_unit', diff --git a/product/ERP5/PropertySheet/ResourceConstraint.py b/product/ERP5/PropertySheet/ResourceConstraint.py new file mode 100644 index 0000000000000000000000000000000000000000..0b6af6fb8fdbe7659bd7f85a986a78674d66c521 --- /dev/null +++ b/product/ERP5/PropertySheet/ResourceConstraint.py @@ -0,0 +1,36 @@ +############################################################################## +# +# Copyright (c) 2008 Nexedi SARL and Contributors. All Rights Reserved. +# +# 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 ResourceConstraint: + """Constraints for Resource + """ + + _constraints = ( + { 'id': 'resource_measures_consistency', + 'type': 'ResourceMeasuresConsistency', + }, + )