diff --git a/product/ERP5/Document/Amount.py b/product/ERP5/Document/Amount.py index 2793616169923fd49063a9d936c1d4b5484054bb..63ac6d962469771e5a3e9bcc439f8670db84969c 100644 --- a/product/ERP5/Document/Amount.py +++ b/product/ERP5/Document/Amount.py @@ -179,7 +179,7 @@ class Amount(Base, Variated): security.declareProtected(Permissions.AccessContentsInformation, 'getVariationBaseCategoryItemList') - def getVariationBaseCategoryItemList(self,display_id='title_or_id',**kw): + def getVariationBaseCategoryItemList(self,display_id='getTitleOrId',**kw): """ Returns a list of base_category tuples. """ @@ -455,6 +455,7 @@ class Amount(Base, Variated): def getNetTargetQuantity(self): """ Take into account efficiency in target quantity + XXX - dreprecated """ quantity = self.getTargetQuantity() efficiency = self.getTargetEfficiency() diff --git a/product/ERP5/Document/EmailDocument.py b/product/ERP5/Document/EmailDocument.py index ae9f7642d4f7c5c7b77e7408f4fa5325356201d8..ec116edcd37883505b6fdcef6f976ab143241233 100644 --- a/product/ERP5/Document/EmailDocument.py +++ b/product/ERP5/Document/EmailDocument.py @@ -322,12 +322,6 @@ class EmailDocument(File, TextDocument): subject = ''.join(subject.split('\n')) return subject - def title_or_id(self): - """Return the title if it is not blank and the id otherwise. - XXX - What is this !!!! why here ??? - """ - return self.getTitleOrId() - security.declareProtected(Permissions.AccessContentsInformation, 'getStartDate') def getStartDate(self, default=_MARKER): """ diff --git a/product/ERP5/Document/Image.py b/product/ERP5/Document/Image.py index 287a746ee57a56152adef65677d2de2c84951e21..ed64a1ca4b50d6058c97d1eef306bbc697d12c41 100644 --- a/product/ERP5/Document/Image.py +++ b/product/ERP5/Document/Image.py @@ -317,7 +317,7 @@ class Image(File, OFSImage): portal_transforms = getToolByName(self, 'portal_transforms') result = portal_transforms.convertToData(mime_type, content, object=self, context=self, - filename=self.title_or_id(), + filename=self.getTitleOrId(), mimetype=src_mimetype) if result is None: # portal_transforms fails to convert. diff --git a/product/ERP5/Document/Transformation.py b/product/ERP5/Document/Transformation.py index 15cca3494397f3bef21aea899fb8ba452eb17259..e2a616b904e408f1c983346c9e060d24d4333e7d 100644 --- a/product/ERP5/Document/Transformation.py +++ b/product/ERP5/Document/Transformation.py @@ -114,7 +114,7 @@ class Transformation(XMLObject, Predicate, Variated): security.declareProtected(Permissions.AccessContentsInformation, 'getVariationRangeBaseCategoryItemList') - def getVariationRangeBaseCategoryItemList(self,display_id='title_or_id',**kw): + def getVariationRangeBaseCategoryItemList(self, display_id='getTitleOrId', **kw): """ Returns possible variations of the transformation as a list of tuples (id, title). This is mostly