Skip to content

Commit

Permalink
[MIG] crm_deduplicate_filter: Migrated to 10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
luismontalba committed Jun 8, 2017
1 parent 43325a5 commit 97feb8b
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
6 changes: 4 additions & 2 deletions crm_deduplicate_filter/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ Usage

To use this module, you need to:

#. Go to *Sales > Tools > Deduplicate Contacts*.
#. Go to *CRM/Sales > Tools > Deduplicate Contacts*.
#. Mark "'Is a company?' field selected", "Parent company not set" or
"Parent company set (Contacts)" in the section 'Exclude contacts having'.
#. This criteria will be used for excluding in the deduplication the selected
kind of records.

.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
:alt: Try me on Runbot
:target: https://runbot.odoo-community.org/runbot/111/9.0
:target: https://runbot.odoo-community.org/runbot/111/10.0

Bug Tracker
===========
Expand All @@ -41,6 +41,7 @@ Credits
Images
------

* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
* `Funnel <https://openclipart.org/detail/245510/funnel>`_.
* `Arrow <https://openclipart.org/detail/131875/convergent>`_.

Expand All @@ -49,6 +50,7 @@ Contributors

* Pedro M. Baeza <pedro.baeza@tecnativa.com>
* Vicent Cubells <vicent.cubells@tecnativa.com>
* Luis M. Ontalba <luis.martinez@tecnativa.com>

Maintainer
----------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

{
"name": "Exclude records from the deduplication",
"version": "9.0.1.0.0",
"version": "10.0.1.0.0",
"category": "Tools",
"website": "https://www.tecnativa.com",
"author": "Tecnativa, "
Expand Down
10 changes: 5 additions & 5 deletions crm_deduplicate_filter/tests/test_crm_deduplicate_filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# Copyright 2016 Pedro M. Baeza <pedro.baeza@tecnativa.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).

from openerp.tests import common
from openerp.tools.safe_eval import safe_eval
from odoo.tests import common
from odoo.tools.safe_eval import safe_eval


class TestDeduplicateFilter(common.TransactionCase):
Expand Down Expand Up @@ -36,7 +36,7 @@ def setUp(self):

def test_deduplicate_exclude_is_company(self):
self.wizard.exclude_is_company = True
self.wizard.start_process_cb()
self.wizard.action_start_manual_process()
matched_founds = 0
for line in self.wizard.line_ids:
match_ids = safe_eval(line.aggr_ids)
Expand All @@ -50,7 +50,7 @@ def test_deduplicate_exclude_is_company(self):

def test_deduplicate_exclude_not_parent(self):
self.wizard.exclude_not_parent = True
self.wizard.start_process_cb()
self.wizard.action_start_manual_process()
matched_founds = 0
for line in self.wizard.line_ids:
match_ids = safe_eval(line.aggr_ids)
Expand All @@ -64,7 +64,7 @@ def test_deduplicate_exclude_not_parent(self):

def test_deduplicate_exclude_parent(self):
self.wizard.exclude_parent = True
self.wizard.start_process_cb()
self.wizard.action_start_manual_process()
matched_founds = 0
for line in self.wizard.line_ids:
match_ids = safe_eval(line.aggr_ids)
Expand Down
1 change: 0 additions & 1 deletion crm_deduplicate_filter/wizards/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
# Copyright 2016 Antiun Ingeniería S.L. - Jairo Llopis
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).

from . import partner_merge
2 changes: 1 addition & 1 deletion crm_deduplicate_filter/wizards/partner_merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright 2016 Pedro M. Baeza <pedro.baeza@tecnativa.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).

from openerp import api, fields, models
from odoo import api, fields, models


class BasePartnerMergeAutomaticWizard(models.TransientModel):
Expand Down

0 comments on commit 97feb8b

Please sign in to comment.