diff --git a/product/ERP5Type/Base.py b/product/ERP5Type/Base.py index 323b700e1907d9d710eff927e858fbdf416a4c93..b393ee4cb3ce9b6ceb5062a813161d5b1e5bb460 100644 --- a/product/ERP5Type/Base.py +++ b/product/ERP5Type/Base.py @@ -780,8 +780,7 @@ class Base( CopyContainer, PortalContent, ActiveObject, ERP5PropertyManager ): return default_value security.declareProtected( Permissions.AccessContentsInformation, 'getProperty' ) - _marker=[] - def getProperty(self, key, d=_marker, **kw): + def getProperty(self, key, d=None, **kw): """ Previous Name: getValue @@ -802,11 +801,7 @@ class Base( CopyContainer, PortalContent, ActiveObject, ERP5PropertyManager ): method = getattr(self, accessor_name) return method(**kw) else: - value = ERP5PropertyManager.getProperty(self, key, d=d, **kw) - if value is self._marker: - return getattr(self,key) - else: - return getattr(self,key,d) + return ERP5PropertyManager.getProperty(self, key, d=d, **kw) security.declareProtected( Permissions.AccessContentsInformation, 'getPropertyList' ) def getPropertyList(self, key, d=None):