[Merge] Partner,bank,crm,country object Usability changes

bzr revid: vir@tinyerp.com-20100602124229-5sca7x0kv8x2rh2a

6 files changed, 26 insertions, 19 deletions

diff --git a/bin/addons/base/res/bank_view.xml b/bin/addons/base/res/bank_view.xml
index a60be66a254..6ad61a044a2 100644
--- a/bin/addons/base/res/bank_view.xml
+++ b/bin/addons/base/res/bank_view.xml
@@ -51,7 +51,6 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="action_res_bank_form" groups="group_extended" id="menu_action_res_bank_form" parent="menu_base_config" sequence="40"/>
-
+        <menuitem action="action_res_bank_form" groups="group_extended" id="menu_action_res_bank_form" parent="menu_config_address_book" sequence="40"/>
     </data>
 </openerp>
diff --git a/bin/addons/base/res/country_view.xml b/bin/addons/base/res/country_view.xml
index 485b95ed7ea..431c75fb3c4 100644
--- a/bin/addons/base/res/country_view.xml
+++ b/bin/addons/base/res/country_view.xml
@@ -37,8 +37,9 @@
             <field name="view_type">form</field>
         </record>
 
-        <menuitem id="menu_localisation" name="Localisation" parent="menu_base_config" sequence="30"/>
-        <menuitem action="action_country" id="menu_country_partner" parent="menu_localisation"/>
+        <menuitem id="menu_localisation" name="Localisation" parent="menu_config_address_book" sequence="4"/>
+
+        <menuitem action="action_country" id="menu_country_partner" parent="menu_localisation" sequence="0"/>
 
         <!--
           State
@@ -78,7 +79,7 @@
             <field name="view_id" ref="view_country_state_tree"/>
         </record>
 
-        <menuitem action="action_country_state" id="menu_country_state_partner" parent="menu_localisation"/>
+          <menuitem action="action_country_state" id="menu_country_state_partner" parent="menu_localisation" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/bin/addons/base/res/partner/crm_view.xml b/bin/addons/base/res/partner/crm_view.xml
index d4cde6844bd..3fb9b1e2ee0 100644
--- a/bin/addons/base/res/partner/crm_view.xml
+++ b/bin/addons/base/res/partner/crm_view.xml
@@ -30,8 +30,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem id="next_id_14" name="Partner Events" parent="base.menu_base_config_partner"/>
-        <menuitem action="res_partner_canal-act" id="menu_res_partner_canal-act" parent="next_id_14"/>
+        <menuitem id="menu_partner_events" name="Events" parent="menu_config_address_book"/>
+        <menuitem action="res_partner_canal-act" id="menu_res_partner_canal-act" parent="menu_partner_events"/>
 
         <record id="res_partner_som_tree-view" model="ir.ui.view">
             <field name="name">res.partner.som.tree</field>
@@ -62,7 +62,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="res_partner_som-act" id="menu_res_partner_som-act" parent="base.next_id_14"/>
+        <menuitem action="res_partner_som-act" id="menu_res_partner_som-act" parent="menu_partner_events"/>
 
         <record id="res_partner_event-wopartner-view_form" model="ir.ui.view">
             <field name="name">res.partner.event.form</field>
@@ -93,4 +93,4 @@
             </field>
         </record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index 84994ffe9ab..e8076a8ee03 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -275,7 +275,7 @@ class res_partner_address(osv.osv):
     _description ='Partner Addresses'
     _name = 'res.partner.address'
     _columns = {
-        'partner_id': fields.many2one('res.partner', 'Partner', ondelete='set null', select=True, help="Keep empty for a private address, not related to partner."),
+        'partner_id': fields.many2one('res.partner', 'Company Name', ondelete='set null', select=True, help="Keep empty for a private address, not related to partner."),
         'type': fields.selection( [ ('default','Default'),('invoice','Invoice'), ('delivery','Delivery'), ('contact','Contact'), ('other','Other') ],'Address Type', help="Used to select automatically the right address according to the context in sales and purchases documents."),
         'function': fields.char('Function', size=64),
         'title': fields.selection(_contact_title_get, 'Title', size=32),
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 7c448ba78f7..f33d525bf86 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -2,12 +2,17 @@
 <openerp>
     <data>
         <menuitem icon="terp-partner" id="menu_base_partner" name="Sales" sequence="0"/>
+
         <menuitem id="menu_address_book" name="Address Book" parent="menu_base_partner" sequence="2"/>
+
         <menuitem id="menu_base_config" name="Configuration" parent="menu_base_partner" sequence="9"
             groups="group_system"/>
 
-        <menuitem id="menu_base_config_partner" name="Partners" parent="menu_base_config" sequence="10" groups="base.group_extended"/>
-        <menuitem id="menu_base_config_contact" name="Contacts" parent="menu_base_config" sequence="20" />
+        <menuitem id="menu_config_address_book" name="Address Book" parent="menu_base_config" sequence="3"
+            groups="group_system"/>
+
+        <menuitem id="menu_config_crm_address_contact" name="Contacts" parent="menu_config_address_book" sequence="3"
+            groups="group_system"/>
 
         <!--
           =====================
@@ -202,7 +207,8 @@
             <field name="view_type">form</field>
             <field name="domain">[('domain','=','partner')]</field>
         </record>
-        <menuitem action="action_partner_title_partner" id="menu_partner_title_partner" parent="menu_base_config_partner" sequence="10"/>
+
+        <menuitem action="action_partner_title_partner" id="menu_partner_title_partner" name="Company Title" parent="menu_config_address_book" sequence="0"/>
 
         <record id="action_partner_title_contact" model="ir.actions.act_window">
             <field name="name">Contact Titles</field>
@@ -211,8 +217,8 @@
             <field name="view_type">form</field>
             <field name="domain">[('domain','=','contact')]</field>
         </record>
-        <menuitem action="action_partner_title_contact" id="menu_partner_title_contact" parent="menu_base_config_contact" sequence="10"/>
 
+        <menuitem action="action_partner_title_contact" id="menu_partner_title_contact" name="Titles" parent="menu_config_crm_address_contact" sequence="3"/>
         <!--
           =======================
           Partner
@@ -578,7 +584,8 @@
             <field name="res_model">res.partner.category</field>
             <field name="view_type">form</field>
         </record>
-        <menuitem action="action_partner_category_form" id="menu_partner_category_form" parent="base.menu_base_config_partner"/>
+
+        <menuitem action="action_partner_category_form" id="menu_partner_category_form" name="Categories" sequence="1" parent="menu_config_address_book"/>
 
         <act_window domain="[('partner_id', '=', active_id)]"
             id="act_res_partner_event" name="Events"
diff --git a/bin/addons/base/res/res_currency_view.xml b/bin/addons/base/res/res_currency_view.xml
index f68fe20f447..daa286ad07f 100644
--- a/bin/addons/base/res/res_currency_view.xml
+++ b/bin/addons/base/res/res_currency_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <record id="view_currency_tree" model="ir.ui.view">
             <field name="name">res.currency.tree</field>
             <field name="model">res.currency</field>
@@ -53,8 +53,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        
-        <menuitem action="action_currency_form" id="menu_action_currency_form" parent="menu_localisation" sequence="11"/>
-        
+
+        <menuitem action="action_currency_form" id="menu_action_currency_form" parent="menu_localisation" sequence="3"/>
+
     </data>
 </openerp>