From 4f3ae43615b2fff1dce9880a14bfcacdcd06f121 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 23 Mar 2012 16:52:48 +0100
Subject: [PATCH] [IMP] config wizards: move back to form in popup

bzr revid: rco@openerp.com-20120323155248-5ok844qr47ywiq46
---
 addons/base_setup/base_setup_views.xml | 5 +++++
 addons/mrp/res_config_view.xml         | 6 ++++++
 addons/purchase/res_config_view.xml    | 6 ++++++
 addons/stock/res_config_view.xml       | 6 ++++++
 4 files changed, 23 insertions(+)

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 1fdd250e864..7b2cd8af4b2 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -152,6 +152,10 @@
                 <group name="config_contracts" colspan="4"/>
                 <group name="config_emails" colspan="4"/>
                 <group name="config_crm" colspan="4"/>
+                <newline/>
+                <label colspan="2"/>
+                <button string="Cancel" icon="gtk-cancel" special="cancel"/>
+                <button string="Apply" icon="gtk-ok" type="object" name="execute"/>
             </form>
         </field>
     </record>
@@ -162,6 +166,7 @@
         <field name="res_model">sale.config.settings</field>
         <field name="view_id" ref="base.view_sale_config_settings"/>
         <field name="view_mode">form</field>
+        <field name="target">new</field>
     </record>
 
   </data>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index dc988592ba8..c30bd533a38 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -21,6 +21,11 @@
 
 		            <separator string="Bill Of Material" colspan="4"/>
                     <field name="group_mrp_properties"/>
+                    <newline/>
+
+                    <label colspan="2"/>
+                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
+                    <button string="Apply" icon="gtk-ok" type="object" name="execute"/>
                 </form>
             </field>
         </record>
@@ -30,6 +35,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.config.settings</field>
             <field name="view_mode">form</field>
+            <field name="target">new</field>
         </record>
 
         <menuitem id="base.menu_mrp_config" name="Manufacturing" parent="base.menu_config"
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 07551738bf1..0bc9f86ae7b 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -30,6 +30,11 @@
 
                     <separator string="Products" colspan="4"/>
                     <field name="module_product_manufacturer"/>
+                    <newline/>
+
+                    <label colspan="2"/>
+                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
+                    <button string="Apply" icon="gtk-ok" type="object" name="execute"/>
                 </form>
             </field>
         </record>
@@ -39,6 +44,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.config.settings</field>
             <field name="view_mode">form</field>
+            <field name="target">new</field>
         </record>
 
         <menuitem id="menu_purchase_config" name="Purchase" parent="base.menu_config"
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 987a1a89943..986e06bbc40 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -32,6 +32,11 @@
                     <field name="group_stock_inventory_properties"/>
                     <newline/>
                     <field name="module_claim_from_delivery"/>
+                    <newline/>
+
+                    <label colspan="2"/>
+                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
+                    <button string="Apply" icon="gtk-ok" type="object" name="execute"/>
                 </form>
             </field>
         </record>
@@ -41,6 +46,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.config.settings</field>
             <field name="view_mode">form</field>
+            <field name="target">new</field>
         </record>
 
         <menuitem id="menu_stock_config_settings" name="Warehouse" parent="base.menu_config"