Browse Source

[FIX] partner_identification: Infinite loop in search (#436)

pull/644/head
Dave Lasley 8 years ago
committed by tarteo
parent
commit
fdb96b1a0f
  1. 2
      partner_identification/__openerp__.py
  2. 20
      partner_identification/models/res_partner.py
  3. 2
      partner_identification/tests/test_res_partner.py

2
partner_identification/__openerp__.py

@ -11,7 +11,7 @@
{ {
'name': 'Partner Identification Numbers', 'name': 'Partner Identification Numbers',
'category': 'Customer Relationship Management', 'category': 'Customer Relationship Management',
'version': '10.0.1.1.0',
'version': '10.0.1.1.1',
'depends': [ 'depends': [
'sales_team', 'sales_team',
], ],

20
partner_identification/models/res_partner.py

@ -44,7 +44,7 @@ class ResPartner(models.Model):
'social_security', 'SSN', 'social_security', 'SSN',
), ),
search=lambda s, *a: s._search_identification( search=lambda s, *a: s._search_identification(
'social_security', 'SSN', *a
'SSN', *a
), ),
) )
@ -86,7 +86,7 @@ class ResPartner(models.Model):
'social_security', 'SSN', 'social_security', 'SSN',
), ),
search=lambda s, *a: s._search_identification( search=lambda s, *a: s._search_identification(
'social_security', 'SSN', *a
'SSN', *a
), ),
) )
@ -136,8 +136,7 @@ class ResPartner(models.Model):
)) ))
@api.model @api.model
def _search_identification(self, field_name, category_code,
operator, value):
def _search_identification(self, category_code, operator, value):
""" Search method for an identification field. """ Search method for an identification field.
Example: Example:
@ -152,19 +151,22 @@ class ResPartner(models.Model):
'social_security', 'SSN', 'social_security', 'SSN',
), ),
search=lambda s, *a: s._search_identification( search=lambda s, *a: s._search_identification(
'social_security', 'SSN', *a
'SSN', *a
), ),
) )
Args: Args:
field_name (str): Name of field to set.
category_code (str): Category code of the Identification type. category_code (str): Category code of the Identification type.
operator (str): Operator of domain.
value (str): Value to search for.
Returns: Returns:
list: Domain to search with. list: Domain to search with.
""" """
return [
(field_name, operator, value),
id_numbers = self.env['res.partner.id_number'].search([
('name', operator, value),
('category_id.code', '=', category_code), ('category_id.code', '=', category_code),
])
return [
('id_numbers.id', 'in', id_numbers.ids),
] ]

2
partner_identification/tests/test_res_partner.py

@ -18,7 +18,7 @@ class ResPartner(models.Model):
'social_security', 'SSN', 'social_security', 'SSN',
), ),
search=lambda s, *a: s._search_identification( search=lambda s, *a: s._search_identification(
'social_security', 'SSN', *a
'SSN', *a
), ),
) )

Loading…
Cancel
Save