[IMP] base_setup,project: move view for project settings inside project

bzr revid: rco@openerp.com-20120326141741-740zjvyudkesz0w3

3 files changed, 22 insertions, 37 deletions

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 8f838d0f632..78d512b8d0d 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -169,31 +169,5 @@
         <field name="target">new</field>
     </record>
 
-    <record id="base.project_settings_form_view" model="ir.ui.view">
-        <field name="name">project.config.settings</field>
-        <field name="model">project.config.settings</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Configure Projects">
-                <group name="project" colspan="4"/>
-                <separator string="Helpdesk and support" colspan="4"/>
-                <group name="helpdesk" 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_project_config" model="ir.actions.act_window">
-        <field name="name">Configure Projects</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">project.config.settings</field>
-        <field name="view_id" ref="base.project_settings_form_view"/>
-        <field name="view_mode">form</field>
-        <field name="target">new</field>
-    </record>
-
   </data>
 </openerp>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 2980358c5c7..c7da2eaa723 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -1,14 +1,13 @@
 <openerp>
     <data>
 
-        <record id="view_project_config" model="ir.ui.view">
-            <field name="name">Project Application</field>
+        <record id="view_config_settings" model="ir.ui.view">
+            <field name="name">project settings</field>
             <field name="model">project.config.settings</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.project_settings_form_view"/>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
-                <group name="project" position="after">
+                <form string="Configure Projects">
                     <separator string="Project" colspan="4"/>
                     <field name="module_project_mrp"/>
                     <field name="module_project_timesheet"/>
@@ -18,17 +17,29 @@
                     <separator string="Planning" colspan="4"/>
                     <field name="module_project_planning"/>
                     <field name="module_project_long_term"/>
-                </group>
 
-                <group name="helpdesk" position="after">
+                    <separator string="Helpdesk and support" colspan="4"/>
+                    <group name="support" colspan="4"/>
                     <field name="module_project_issue_sheet"/>
+
                     <newline/>
-                </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>
 
+        <record id="action_config_settings" model="ir.actions.act_window">
+            <field name="name">Configure Projects</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"
-            sequence="5" action="base.action_project_config"/>
+            sequence="5" action="action_config_settings"/>
 
     </data>
 </openerp>
diff --git a/addons/project_issue/res_config_view.xml b/addons/project_issue/res_config_view.xml
index a07f42a9a1f..d2cc501bc96 100644
--- a/addons/project_issue/res_config_view.xml
+++ b/addons/project_issue/res_config_view.xml
@@ -2,13 +2,13 @@
 <openerp>
     <data>
 
-        <record id="view_project_config_issue" model="ir.ui.view">
+        <record id="view_config_settings" model="ir.ui.view">
             <field name="name">Project Application</field>
             <field name="model">project.config.settings</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.project_settings_form_view"/>
+            <field name="inherit_id" ref="project.view_config_settings"/>
             <field name="arch" type="xml">
-                <group name="helpdesk" position="after">
+                <group name="support" position="after">
                     <field name="fetchmail_issue"/>
                     <group colspan="2" attrs="{'invisible': [('fetchmail_issue','=',False)]}">
                         <field name="issue_server" attrs="{'required': [('fetchmail_issue','=',True)]}"/>