Merge pull request #445 from Jarsa-dev/10.0-base_partner_merge

Migrate base_partner_merge to V10

base_partner_merge/README.rst

@@ -25,7 +25,7 @@ You can access the wizard by going in a view list of contacts select one or mult
 
 .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
    :alt: Try me on Runbot
-   :target: https://runbot.odoo-community.org/runbot/134/9.0
+   :target: https://runbot.odoo-community.org/runbot/134/10.0
 
 Bug Tracker
 ===========

base_partner_merge/__init__.py

@@ -1,2 +1,5 @@
-from . import base_partner_merge
-from . import validate_email
+# -*- coding: utf-8 -*-
+# Copyright 2016 Camptocamp SA
+# Copyright 2017 Jarsa Sistemas
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from . import wizard

base_partner_merge/__manifest__.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-# © 2016 Camptocamp SA
+# Copyright 2016 Camptocamp SA
+# Copyright 2017 Jarsa Sistemas
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     'name': "Deduplicate Contacts (No CRM)",
@@ -7,14 +8,13 @@
     'author': "Camptocamp,Odoo Community Association (OCA)",
     'license': 'AGPL-3',
     'category': 'Generic Modules/Base',
-    'version': '9.0.1.0.0',
+    'version': '10.0.1.0.0',
     'depends': [
         'base',
         'mail'
     ],
     'data': [
-        'security/ir.model.access.csv',
         'views/base_partner_merge.xml',
     ],
-    'installable': False,
+    'installable': True,
 }

base_partner_merge/security/ir.model.access.csv

@@ -1 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"

base_partner_merge/validate_email.py

@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-# © 2016 Camptocamp SA
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from openerp.addons.crm.validate_email import *  # noqa

base_partner_merge/views/base_partner_merge.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-
+<odoo>
     <record model="ir.actions.act_window" id="action_partner_deduplicate">
         <field name="name">Deduplicate Contacts</field>
         <field name="res_model">base.partner.merge.automatic.wizard</field>
@@ -10,7 +8,6 @@
         <field name="target">new</field>
         <field name="context">{'active_test': False}</field>
     </record>
-
     <record model='ir.ui.view' id='base_partner_merge_automatic_wizard_form'>
         <field name='name'>base.partner.merge.automatic.wizard.form</field>
         <field name='model'>base.partner.merge.automatic.wizard</field>
@@ -74,45 +71,44 @@
                     </group>
                 </sheet>
                 <footer>
-                        <button name='merge_cb' string='Merge Contacts'
+                    <button name='action_merge' string='Merge Contacts'
                         class='oe_highlight'
                         type='object'
-                            attrs="{'invisible': [('state', 'in', ('option', 'finished' ))]}"
-                            />
-                        <button name='next_cb' string='Skip these contacts'
-                            type='object'  class='oe_link'
+                        attrs="{'invisible': [('state', 'in', ('option', 'finished' ))]}" />
+                    <button name='action_skip' string='Skip these contacts'
+                        type='object'
                         attrs="{'invisible': [('state', '!=', 'selection')]}" />
-                        <button name='start_process_cb'
+                    <button name='action_start_manual_process'
                         string='Merge with Manual Check'
                         type='object'  class='oe_highlight'
                         attrs="{'invisible': [('state', '!=', 'option')]}" />
-                        <button name='automatic_process_cb'
+                    <button name='action_start_automatic_process'
                         string='Merge Automatically'
                         type='object' class='oe_highlight'
                         confirm="Are you sure to execute the automatic merge of your contacts ?"
                         attrs="{'invisible': [('state', '!=', 'option')]}" />
-                        <button name='update_all_process_cb'
+                    <button name='action_update_all_process'
                         string='Merge Automatically all process'
                         type='object'
                         confirm="Are you sure to execute the list of automatic merges of your contacts ?"
                         attrs="{'invisible': [('state', '!=', 'option')]}" />
                     <span class="or_cancel" attrs="{'invisible': [('state', '=', 'finished')]} ">or
-                            <button name="close_cb" special="nosave" string="Cancel" type="object" class="oe_link oe_inline"/>
+                        <button special="cancel" string="Cancel" type="object" class="oe_link oe_inline"/>
                     </span>
                     <span class="or_cancel" attrs="{'invisible': [('state', '!=', 'finished')]} ">
-                            <button name="close_cb" special="nosave"
-                                string="Close"
-                                type="object"
-                                class="oe_link oe_inline"/>
+                        <button special="cancel" string="Close" type="object" class="oe_link oe_inline"/>
                     </span>
                 </footer>
             </form>
         </field>
     </record>
-
-        <act_window id="action_partner_merge" res_model="base.partner.merge.automatic.wizard" src_model="res.partner"
-            target="new" multi="True" key2="client_action_multi" view_mode="form" name="Merge Selected Contacts"/>
-
-    </data>
-
-</openerp>
+    <act_window
+        id="action_partner_merge"
+        res_model="base.partner.merge.automatic.wizard"
+        src_model="res.partner"
+        target="new"
+        multi="True"
+        key2="client_action_multi"
+        view_mode="form"
+        name="Merge Selected Contacts"/>
+</odoo>

base_partner_merge/wizard/__init__.py

@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Camptocamp SA
+# Copyright 2017 Jarsa Sistemas
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from . import base_partner_merge
+from . import validate_email

base_partner_merge/base_partner_merge.py → base_partner_merge/wizard/base_partner_merge.py

@@ -1,11 +1,8 @@
 # -*- coding: utf-8 -*-
-# © 2016 Camptocamp SA
+# Copyright 2016 Camptocamp SA
+# Copyright 2017 Jarsa Sistemas
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from openerp.addons.crm.base_partner_merge import *  # noqa
-
-
-class NoCRMResPartner(ResPartner):  # noqa
-    _module = 'base_partner_merge'
+from odoo.addons.crm.wizard.base_partner_merge import *  # noqa
 
 
 class NoCRMMergePartnerLine(MergePartnerLine):  # noqa

base_partner_merge/wizard/validate_email.py

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Camptocamp SA
+# Copyright 2017 Jarsa Sistemas
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo.addons.crm.wizard.validate_email import *  # noqa