Improvements

bzr revid: fp@tinyerp.com-ddc88760cda98a0e9615b9c9c2634649fb1e661b

diff --git a/bin/addons/base/res/bank_view.xml b/bin/addons/base/res/bank_view.xml
index 9b9ccd2..1fc5966 100644 (file)
--- a/bin/addons/base/res/bank_view.xml
+++ b/bin/addons/base/res/bank_view.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0"?>
 <terp>
        <data>
-               <menuitem name="Financial Management" icon="terp-account" id="menu_finance_main"/>
-               <menuitem name="Financial Management/Configuration"
-                       groups="group_admin" sequence="1"/>
-
                <record model="ir.ui.view" id="view_res_bank_form">
                        <field name="name">res.bank.form</field>
                        <field name="model">res.bank</field>
@@ -47,12 +43,13 @@
                </record>
 
                <record model="ir.actions.act_window" id="action_res_bank_form">
+                       <field name="name">Banks</field>
                        <field name="res_model">res.bank</field>
                        <field name="view_type">form</field>
                        <field name="view_mode">tree,form</field>
                </record>
 
-               <menuitem name="Financial Management/Configuration/Banks"
+               <menuitem parent="menu_base_config"
                        action="action_res_bank_form" sequence="12"
                        id="menu_action_res_bank_form"/>
 

diff --git a/bin/addons/base/res/country_view.xml b/bin/addons/base/res/country_view.xml
index ea45872..5047813 100644 (file)
--- a/bin/addons/base/res/country_view.xml
+++ b/bin/addons/base/res/country_view.xml
@@ -31,13 +31,18 @@
                </record>
 
                <record model="ir.actions.act_window" id="action_country">
-                       <field name="name">Country</field>
+                       <field name="name">Countries</field>
                        <field name="type">ir.actions.act_window</field>
                        <field name="res_model">res.country</field>
                        <field name="view_type">form</field>
                </record>
 
-               <menuitem name="Partners/Configuration/Localisation/Countries"
+               <menuitem
+                       parent="menu_base_config"
+                       name="Localisation"
+                       id="menu_localisation"/>
+               <menuitem
+                       parent="menu_localisation"
                        groups="group_admin" action="action_country"
                        id="menu_country_partner"/>
 
@@ -79,7 +84,7 @@
                        <field name="view_id" ref="view_country_state_tree"/>
                </record>
 
-               <menuitem name="Partners/Configuration/Localisation/States"
+               <menuitem parent="menu_localisation"
                        groups="group_admin" action="action_country_state"
                        id="menu_country_state_partner"/>
 

diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 570c603..6558070 100644 (file)
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -1,8 +1,18 @@
 <?xml version="1.0"?>
 <terp>
 <data>
-       <menuitem name="Partners" sequence="0" icon="terp-partner" id="menu_base_partner"/>
-       <menuitem name="Partners/Configuration" groups="group_admin" sequence="1" id="menu_base_config"/>
+       <menuitem 
+               name="Partners" 
+               sequence="0" 
+               icon="terp-partner" 
+               id="menu_base_partner"/>
+
+       <menuitem
+               name="Configuration" 
+               parent="menu_base_partner" 
+               groups="group_admin" 
+               sequence="1" 
+               id="menu_base_config"/>
 
        <!--
        ================================

diff --git a/bin/addons/base/res/res_currency_view.xml b/bin/addons/base/res/res_currency_view.xml
index 2350110..84bc5c0 100644 (file)
--- a/bin/addons/base/res/res_currency_view.xml
+++ b/bin/addons/base/res/res_currency_view.xml
@@ -2,10 +2,6 @@
 <terp>
 <data>
 
-       <menuitem name="Financial Management" icon="terp-account"/>
-       <menuitem name="Financial Management/Configuration"
-               groups="group_admin" sequence="1"/>
-
        <record model="ir.ui.view" id="view_currency_tree">
                <field name="name">res.currency.tree</field>
                <field name="model">res.currency</field>
@@ -47,14 +43,17 @@
                </field>
        </record>
        <record model="ir.actions.act_window" id="action_currency_form">
+               <field name="name">Currencies</field>
                <field name="res_model">res.currency</field>
                <field name="view_type">form</field>
                <field name="view_mode">tree,form</field>
        </record>
 
-       <menuitem name="Financial Management/Configuration/Currencies" action="action_currency_form" sequence="11" id="menu_action_currency_form"/>
-
-       <menuitem name="Administration/Configuration/Base/Define Currencies" action="action_currency_form" sequence="1" id="menu_currency_def"/>
+       <menuitem 
+               parent="menu_localisation" 
+               action="action_currency_form" 
+               sequence="11" 
+               id="menu_action_currency_form"/>
 
 </data>
 </terp>