From e49264711c46ce06f7894b37a3fd671dbb411a52 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 26 Jun 2012 09:47:46 +0200
Subject: [PATCH 1/2] [IMP] res.config.settings: add method 'cancel' to reload
 the view

bzr revid: rco@openerp.com-20120626074746-1x5x47rm01klx2hp
---
 openerp/addons/base/res/res_config.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py
index e7f54c6966e..9277184a822 100644
--- a/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@ -541,4 +541,12 @@ class res_config_settings(osv.osv_memory):
             'tag': 'reload',
         }
 
+    def cancel(self, cr, uid, ids, context=None):
+        # ignore the current record, and send the action to reopen the view
+        act_window = self.pool.get('ir.actions.act_window')
+        action_ids = act_window.search(cr, uid, [('res_model', '=', self._name)])
+        if action_ids:
+            return act_window.read(cr, uid, action_ids[0], [], context=context)
+        return {}
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 0806d443e823af7dbc90405ba7446dc2f4f7f2b1 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 26 Jun 2012 09:49:46 +0200
Subject: [PATCH 2/2] [IMP] config wizards: add an action on button 'Cancel' to
 get the expected behavior

bzr revid: rco@openerp.com-20120626074946-a1tzebh85ta6v75l
---
 addons/account/res_config_view.xml    | 2 +-
 addons/base_setup/res_config_view.xml | 4 ++--
 addons/hr/res_config_view.xml         | 2 +-
 addons/knowledge/res_config_view.xml  | 2 +-
 addons/marketing/res_config_view.xml  | 2 +-
 addons/mrp/res_config_view.xml        | 2 +-
 addons/project/res_config_view.xml    | 2 +-
 addons/purchase/res_config_view.xml   | 2 +-
 addons/stock/res_config_view.xml      | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index ef492f697e4..a27513a9f0c 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -18,7 +18,7 @@
                 <form string="Configure Accounting" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                     <field name="has_default_company" invisible="1" />
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index de991fe6725..93523f06746 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -9,7 +9,7 @@
                 <form string="General Settings" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <group string="Company Settings">
@@ -56,7 +56,7 @@
                 <form string="Configure Sales" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <field name="module_crm" invisible="1"/>
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index a1bf809a5c9..f96f4a80ab2 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -17,7 +17,7 @@
                 <form string="Configure Human Resources" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <group string="Additional Features">
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 32569a3d545..80d13e6283a 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -9,7 +9,7 @@
                 <form string="Configure Knowledge" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <group>
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index 8f29627734e..83053afe614 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -9,7 +9,7 @@
                 <form string="Configure Marketing" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <group string="Campaigns">
                         <field name="module_marketing_campaign"/>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 353b6c063b6..da1243452b1 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -9,7 +9,7 @@
                 <form string="Configure Manufacturing" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <group string="Manufacturing Order">
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index b1daeb66b22..28258c483ce 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -9,7 +9,7 @@
                 <form string="Configure Project" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <group string="Project">
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index c08c13792c8..1afd2d04a90 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -9,7 +9,7 @@
                 <form string="Configure Purchases" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <group string="Invoicing">
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index d6caa78cc13..2f3a4214af8 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -10,7 +10,7 @@
                 <form string="Configure Warehouse" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <group string="Traceability">