Browse Source

[MIG] crm_deduplicate_by_ref: Migration to 12.0

12.0
david 4 years ago
parent
commit
59e41401df
  1. 1
      partner_deduplicate_by_ref/__init__.py
  2. 2
      partner_deduplicate_by_ref/__manifest__.py
  3. 2
      partner_deduplicate_by_ref/tests/test_partner_deduplicate_by_ref.py
  4. 2
      partner_deduplicate_by_ref/wizards/partner_merge.py
  5. 2
      partner_deduplicate_by_ref/wizards/partner_merge_view.xml

1
partner_deduplicate_by_ref/__init__.py

@ -1,3 +1,2 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from . import wizards

2
partner_deduplicate_by_ref/__manifest__.py

@ -2,7 +2,7 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
{
"name": "Deduplicate Contacts by reference",
"version": "11.0.1.0.0",
"version": "12.0.1.0.0",
"category": "Tools",
"website": "https://www.github.com/OCA/partner-contact",
"author": "Tecnativa, "

2
partner_deduplicate_by_ref/tests/test_crm_deduplicate_by_ref.py → partner_deduplicate_by_ref/tests/test_partner_deduplicate_by_ref.py

@ -7,7 +7,7 @@ from odoo.tools.safe_eval import safe_eval
class TestDeduplicateByRef(common.TransactionCase):
def setUp(self):
super(TestDeduplicateByRef, self).setUp()
super().setUp()
self.partner_1 = self.env['res.partner'].create({
'name': 'Partner 1',
'ref': '123456',

2
partner_deduplicate_by_ref/wizards/partner_merge.py

@ -14,7 +14,7 @@ class BasePartnerMergeAutomaticWizard(models.TransientModel):
There's no better way to do it, as there are no hooks for adding
this criteria regularly.
"""
query = super(BasePartnerMergeAutomaticWizard, self)._generate_query(
query = super()._generate_query(
fields, maximum_group=maximum_group)
if 'ref' in fields:
if 'WHERE' in query:

2
partner_deduplicate_by_ref/wizards/partner_merge_view.xml

@ -6,7 +6,7 @@
<record id="base_partner_merge_automatic_wizard_form" model="ir.ui.view">
<field name="model">base.partner.merge.automatic.wizard</field>
<field name="inherit_id" ref="crm.base_partner_merge_automatic_wizard_form"/>
<field name="inherit_id" ref="base.base_partner_merge_automatic_wizard_form"/>
<field name="arch" type="xml">
<field name="group_by_parent_id" position="after">
<field name="group_by_ref"/>

Loading…
Cancel
Save