diff --git a/models/duplicate.py b/models/duplicate.py index 9dae18a..17f972e 100644 --- a/models/duplicate.py +++ b/models/duplicate.py @@ -26,12 +26,14 @@ class opendons_duplicate_partner(models.Model): def find_duplicate_partner(self): self.env['opendons.duplicate_partner'].search([]).unlink() - rules=self.env['opendons.duplicate_rule'].search([]) + rules=self.env['opendons.duplicate_rule'].search([('active','=','true')]) dbl_partner_ids=[] - groupby_fields='' - list_field=[] + i=1 for rule in rules: + groupby_fields='' + selected_fields='' + list_field=[] for f in rule.field_ids: if i==1:groupby_fields+="'"+f.field+"'" else:groupby_fields+=",'"+f.field+"'" @@ -60,9 +62,6 @@ class opendons_duplicate_partner(models.Model): domain='' - # if len(list_field)==1: - # domain= "('"+list_field[0]+"','=','"+list_field[0]+"')" - # else: if len(list_field)>1:domain="['&'," else:domain="[" @@ -88,7 +87,8 @@ class opendons_duplicate_partner(models.Model): action.update( { "domain": [("id", "in", dbl_partner_ids)], - "limit": 500, + "limit": 5000, + "context":{'view_mode':'tree'} } ) return action @@ -104,6 +104,7 @@ class opendons_duplicate_rule(models.Model): string='fields', ) + active=fields.Boolean('active' ,default=True) diff --git a/views/duplicate.xml b/views/duplicate.xml index 6329c8a..1d61492 100644 --- a/views/duplicate.xml +++ b/views/duplicate.xml @@ -7,7 +7,8 @@ opendons.duplicate_rule - + + @@ -31,6 +32,7 @@
+