diff --git a/product/ERP5/Document/Document.py b/product/ERP5/Document/Document.py index fbd4674680b20fa60b7c6a137918476d5bfcbdc8..1e42501837d15dad389800393ba5d107561153a6 100644 --- a/product/ERP5/Document/Document.py +++ b/product/ERP5/Document/Document.py @@ -985,7 +985,7 @@ class Document(PermanentURLMixIn, XMLObject, UrlMixIn, CachedConvertableMixin, S Based on the document content, find out as many properties as needed. returns properties which should be set on the document """ - if not self.hasData(): + if getattr(self, 'hasData', None) is not None and not self.hasData(): # if document is empty, we will not find anything in its content return dict() if not self.hasBaseData(): diff --git a/product/ERP5/Document/Gadget.py b/product/ERP5/Document/Gadget.py index c7db65a25f6cd6d2ec56e2eff1328d90fc28a6d9..433b6606bb763fada37129be495b2e459d00600d 100644 --- a/product/ERP5/Document/Gadget.py +++ b/product/ERP5/Document/Gadget.py @@ -31,7 +31,7 @@ from Products.ERP5Type.XMLObject import XMLObject class Gadget(XMLObject): """ - An Gadget object holds a template information for an ERP5 Gadget part of ERP5 UI). + An Gadget object holds a template information for an ERP5 Gadget (part of ERP5 UI). """ meta_type = 'ERP5 Gadget' diff --git a/product/ERP5/Document/Image.py b/product/ERP5/Document/Image.py index 443232f095a05ffee00bd0df9706016deb01a9f6..ddace9c3a16c12f45a2bdb66dcc2587a49bf6ed2 100644 --- a/product/ERP5/Document/Image.py +++ b/product/ERP5/Document/Image.py @@ -414,7 +414,7 @@ class Image(File, OFSImage): parameter_list.append('%s:-' % format) else: parameter_list.append('-') - + #self.log(parameter_list) process = subprocess.Popen(parameter_list, stdin=subprocess.PIPE, stdout=subprocess.PIPE,