From f5afa1e2f79e34165c01d4e5da55e2913cff1349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Maes?= <jem@openerp.com>
Date: Tue, 3 May 2016 13:58:00 +0200
Subject: [PATCH] [REF] crm : rename method in base_merge_partner wizard for
 better understanding

---
 addons/crm/wizard/base_partner_merge.py       | 27 +++++++++----------
 .../crm/wizard/base_partner_merge_views.xml   | 14 +++++-----
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/addons/crm/wizard/base_partner_merge.py b/addons/crm/wizard/base_partner_merge.py
index 680ea6fff26..3a8c406599f 100644
--- a/addons/crm/wizard/base_partner_merge.py
+++ b/addons/crm/wizard/base_partner_merge.py
@@ -441,21 +441,20 @@ class MergePartnerAutomatic(models.TransientModel):
     # ----------------------------------------
 
     @api.multi
-    def close_cb(self):
+    def action_close(self):
         self.ensure_one()
         return {'type': 'ir.actions.act_window_close'}
 
     @api.multi
-    def next_cb(self):
+    def action_skip(self):
         """ Skip this wizard line. Don't compute any thing, and simply redirect to the new step."""
         self.ensure_one()
         if self.current_line_id:
             self.current_line_id.unlink()
-        return self._next_screen()
+        return self._action_next_screen()
 
-    #TODO JEM : rename with action_ prefix
     @api.multi
-    def _next_screen(self):
+    def _action_next_screen(self):
         """ return the action of the next screen ; this means the wizard is set to treat the
             next wizard line. Each line is a subset of partner that can be merged together.
             If no line left, the end screen will be displayed (but an action is still returned).
@@ -521,7 +520,7 @@ class MergePartnerAutomatic(models.TransientModel):
         _logger.info("counter: %s", counter)
 
     @api.multi
-    def start_process_cb(self):
+    def action_start_manual_process(self):
         """ Start the process 'Merge with Manual Check'. Fill the wizard according to the group_by and exclude
             options, and redirect to the first step (treatment of first wizard line). After, for each subset of
             partner to merge, the wizard will be actualized.
@@ -532,16 +531,16 @@ class MergePartnerAutomatic(models.TransientModel):
         groups = self._compute_selected_groupby()
         query = self._generate_query(groups, self.maximum_group)
         self._process_query(query)
-        return self._next_screen()
+        return self._action_next_screen()
 
     @api.multi
-    def automatic_process_cb(self):
+    def action_start_automatic_process(self):
         """ Start the process 'Merge Automatically'. This will fill the wizard with the same mechanism as 'Merge
             with Manual Check', but instead of refreshing wizard with the current line, it will automatically process
             all lines by merging partner grouped according to the checked options.
         """
         self.ensure_one()
-        self.start_process_cb()  # here we don't redirect to the next screen, since it is automatic process
+        self.action_start_manual_process()  # here we don't redirect to the next screen, since it is automatic process
         self.refresh()   # TODO JEM : deprecated, what to do ?
 
         for line in self.line_ids:
@@ -617,14 +616,14 @@ class MergePartnerAutomatic(models.TransientModel):
         }
 
     @api.multi
-    def update_all_process_cb(self):
+    def action_update_all_process(self):
         self.ensure_one()
         self.parent_migration_process_cb()
 
         # NOTE JEM : seems louche to create a new wizard instead of reuse the current one with updated options.
         # since it is like this from the initial commit of this wizard, I don't change it. yet ...
         wizard = self.create({'group_by_vat': True, 'group_by_email': True, 'group_by_name': True})
-        wizard.automatic_process_cb()
+        wizard.action_start_automatic_process()
 
         # NOTE JEM : no idea if this query is usefull
         self._cr.execute("""
@@ -637,10 +636,10 @@ class MergePartnerAutomatic(models.TransientModel):
                 is_company IS NOT NULL
         """)
 
-        return self._next_screen()
+        return self._action_next_screen()
 
     @api.multi
-    def merge_cb(self):
+    def action_merge(self):
         """ Merge Contact button. Merge the selected partners, and redirect to
             the end screen (since there is no other wizard line to process.
         """
@@ -661,4 +660,4 @@ class MergePartnerAutomatic(models.TransientModel):
         if self.current_line_id:
             self.current_line_id.unlink()
 
-        return self._next_screen()
+        return self._action_next_screen()
diff --git a/addons/crm/wizard/base_partner_merge_views.xml b/addons/crm/wizard/base_partner_merge_views.xml
index 0189b348705..67fbf2c4f50 100644
--- a/addons/crm/wizard/base_partner_merge_views.xml
+++ b/addons/crm/wizard/base_partner_merge_views.xml
@@ -71,32 +71,32 @@
                         </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'
+                        <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 name="action_close" special="nosave" string="Cancel" type="object" class="oe_link oe_inline"/>
                         </span>
                         <span class="or_cancel" attrs="{'invisible': [('state', '!=', 'finished')]} ">
-                            <button name="close_cb" special="nosave"
+                            <button name="action_close" special="nosave"
                                 string="Close"
                                 type="object"
                                 class="oe_link oe_inline"/>