From 2f5580d7aba52ed9022ac0efda49658153c6ff5f Mon Sep 17 00:00:00 2001 From: Sergi Almacellas Abellana Date: Mon, 4 Jul 2016 12:08:26 +0200 Subject: [PATCH] Improve purchase rec_name issue4878 review21091002 --- purchase.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/purchase.py b/purchase.py index 01f6e32dd6..f5a3110e90 100644 --- a/purchase.py +++ b/purchase.py @@ -571,8 +571,11 @@ class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin): }) def get_rec_name(self, name): - return (self.number or str(self.id) - + ' - ' + self.party.name) + if self.number: + return self.number + elif self.reference: + return '[%s]' % self.reference + return '(%s)' % self.id @classmethod def search_rec_name(cls, name, clause): @@ -581,13 +584,10 @@ class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin): bool_op = 'AND' else: bool_op = 'OR' - names = value.split(' - ', 1) domain = [bool_op, - ('number', operator, names[0]), - ('reference', operator, names[0]), + ('number', operator, value), + ('reference', operator, value), ] - if len(names) != 1 and names[1]: - domain = [bool_op, domain, ('party', operator, names[1])] return domain @classmethod