diff --git a/base_partner_merge/hooks.py b/base_partner_merge/hooks.py index be65d9b0b..6151a2255 100644 --- a/base_partner_merge/hooks.py +++ b/base_partner_merge/hooks.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # © 2017 Therp BV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -import sys import inspect from openerp.models import MetaModel diff --git a/base_partner_merge/tests/test_merge.py b/base_partner_merge/tests/test_merge.py index 063b2ca41..5ad473aa5 100644 --- a/base_partner_merge/tests/test_merge.py +++ b/base_partner_merge/tests/test_merge.py @@ -36,24 +36,32 @@ class PartnerMergeTestCase(TransactionCase): def test_10_name_merge(self): """ Merge users with duplicate names """ self._unlink_all() - self._create_duplicates('name', 'Donald Duck', - 'email', ['donald@therp.nl', 'donald@sunflowerweb.nl']) - self._create_duplicates('name', 'Mickey Mouse', - 'email', ['mickey@therp.nl', 'mickey@sunflowerweb.nl']) + self._create_duplicates( + 'name', 'Donald Duck', + 'email', ['donald@therp.nl', 'donald@sunflowerweb.nl'], + ) + self._create_duplicates( + 'name', 'Mickey Mouse', + 'email', ['mickey@therp.nl', 'mickey@sunflowerweb.nl'], + ) self._count_donalds_mickeys(2, 2) # Merge all names that start with 'D', - self.partner.deduplicate_on_fields(['name'], - domain=[('name', 'like', 'D%')]) + self.partner.deduplicate_on_fields( + ['name'], domain=[('name', 'like', 'D%')], + ) self._count_donalds_mickeys(1, 2) def test_20_ref_merge(self): """ Merge users with duplicate references """ self._unlink_all() - self._create_duplicates('ref', 'DD123', - 'name', ['Donald Duck', 'Mickey Mouse']) + self._create_duplicates( + 'ref', 'DD123', + 'name', ['Donald Duck', 'Mickey Mouse'], + ) # Merge on reference, leaving out guys that have no ref - self.partner.deduplicate_on_fields(['ref'], - domain=[('ref', '!=', False)]) + self.partner.deduplicate_on_fields( + ['ref'], domain=[('ref', '!=', False)], + ) # Test if only one remains after partners = self.partner.search([('ref', '=', 'DD123')]) self.assertEquals(len(partners), 1) @@ -61,10 +69,11 @@ class PartnerMergeTestCase(TransactionCase): def test_30_ref_merge(self): """ Fringe case: three guys, two to merge """ self._unlink_all() - self._create_duplicates('ref', 'DD123', - 'name', ['Donald Duck', 'Donald Duck', 'Mickey Mouse']) - self.partner.deduplicate_on_fields(['ref'], - domain=[('name', '=', 'Donald Duck')]) + self._create_duplicates( + 'ref', 'DD123', + 'name', ['Donald Duck', 'Donald Duck', 'Mickey Mouse'], + ) + self.partner.deduplicate_on_fields( + ['ref'], domain=[('name', '=', 'Donald Duck')], + ) self._count_donalds_mickeys(1, 1) - -