From d84dadad8bb96332944d48f0d446d4061c85b652 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 27 Mar 2012 13:39:38 +0200
Subject: [PATCH] [IMP] sale, purchase, stock, mrp, project: open wizards in
 main frame instead of popup

bzr revid: rco@openerp.com-20120327113938-hwjopircwmuqgwvf
---
 addons/base_setup/base_setup_views.xml | 11 +++--------
 addons/mrp/res_config_view.xml         |  8 +-------
 addons/project/res_config_view.xml     | 12 +++---------
 addons/purchase/res_config_view.xml    | 11 +++--------
 addons/stock/res_config_view.xml       | 10 ++--------
 5 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 78d512b8d0d..efc071fec68 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -143,30 +143,25 @@
     </record>
 
     <record id="base.view_sale_config_settings" model="ir.ui.view">
-        <field name="name">sale.config.settings</field>
+        <field name="name">sale settings</field>
         <field name="model">sale.config.settings</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Configure Sales &amp; CRM">
+            <form string="Configure Sales">
                 <group name="config_sale" colspan="4"/>
                 <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>
     
     <record id="base.action_sale_config" model="ir.actions.act_window">
-        <field name="name">Configure Sales &amp; CRM</field>
+        <field name="name">Configure Sales</field>
         <field name="type">ir.actions.act_window</field>
         <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 c30bd533a38..d520b760268 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -2,7 +2,7 @@
     <data>
 
         <record id="view_mrp_config" model="ir.ui.view">
-            <field name="name">Configure Manufacturing</field>
+            <field name="name">mrp settings</field>
             <field name="model">mrp.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
@@ -21,11 +21,6 @@
 
 		            <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>
@@ -35,7 +30,6 @@
             <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/project/res_config_view.xml b/addons/project/res_config_view.xml
index c7da2eaa723..99ea3d5e26b 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
-                <form string="Configure Projects">
+                <form string="Configure Project">
                     <separator string="Project" colspan="4"/>
                     <field name="module_project_mrp"/>
                     <field name="module_project_timesheet"/>
@@ -21,24 +21,18 @@
                     <separator string="Helpdesk and support" colspan="4"/>
                     <group name="support" colspan="4"/>
                     <field name="module_project_issue_sheet"/>
-
-                    <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>
 
         <record id="action_config_settings" model="ir.actions.act_window">
-            <field name="name">Configure Projects</field>
+            <field name="name">Configure Project</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">project.config.settings</field>
             <field name="view_mode">form</field>
-            <field name="target">new</field>
         </record>
 
-        <menuitem id="base.menu_project_config" name="Projects" parent="base.menu_config"
+        <menuitem id="base.menu_project_config" name="Project" parent="base.menu_config"
             sequence="5" action="action_config_settings"/>
 
     </data>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 4356a0c6209..1009ac0d8d9 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -2,11 +2,11 @@
     <data>
 
         <record id="view_purchase_configuration" model="ir.ui.view">
-            <field name="name">Purchase Application</field>
+            <field name="name">purchase settings</field>
             <field name="model">purchase.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Purchase Application">
+                <form string="Configure Purchases">
                     <group colspan="4" col="6">
                         <separator string="Invoicing" colspan="6"/>
                         <field name="default_invoice_method" />
@@ -28,10 +28,6 @@
                         <separator string="Products" colspan="6"/>
                         <field name="module_product_manufacturer"/>
                     </group>
-
-                    <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,10 +37,9 @@
             <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"
+        <menuitem id="menu_purchase_config" name="Purchases" parent="base.menu_config"
             sequence="2" action="action_purchase_configuration"/>
 
     </data>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 986e06bbc40..07de945cb22 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -3,11 +3,11 @@
     <data>
 
         <record id="view_stock_config_settings" model="ir.ui.view">
-            <field name="name">Warehouse Application</field>
+            <field name="name">stock settings</field>
             <field name="model">stock.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string ="Warehouse Application">
+                <form string ="Configure Warehouse">
                     <separator string="Traceability" colspan="4"/>
                     <field name="group_stock_production_lot"/>
                     <newline/>
@@ -32,11 +32,6 @@
                     <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>
@@ -46,7 +41,6 @@
             <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"