From 20ce4e4288b5bb73b9aafd5191a521e17bc3ae2b Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 18 Jun 2012 18:01:48 +0200
Subject: [PATCH] [REF] Review the form views

bzr revid: stw@openerp.com-20120618160148-h69gfk1xwzyk97z0
---
 openerp/addons/base/res/res_partner.py       |  2 +-
 openerp/addons/base/res/res_partner_view.xml | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 5eb4f1232ef..1dbad434ed6 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -136,7 +136,7 @@ class res_partner(osv.osv):
         'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts'),
         'ref': fields.char('Reference', size=64, select=1),
         'lang': fields.selection(_lang_get, 'Language', help="If the selected language is loaded in the system, all documents related to this partner will be printed in this language. If not, it will be english."),
-        'user_id': fields.many2one('res.users', 'Salesman', help='The internal user that is in charge of communicating with this partner if any.'),
+        'user_id': fields.many2one('res.users', 'Salesperson', help='The internal user that is in charge of communicating with this partner if any.'),
         'vat': fields.char('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."),
         'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
         'website': fields.char('Website',size=64, help="Website of Partner or Company"),
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 99735659f7b..e4f6b164e2f 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -117,10 +117,16 @@
                             <label for="parent_id" class="oe_form_readonly_hidden"/>
                         </div>
                         <h2 attrs="{'invisible': [('is_company','=', True)]}">
-                            <field name="parent_id" string="Company"
+                            <field name="parent_id"
                                 domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
                                 class="oe_form_inline"
                                 on_change="onchange_address(use_parent_address, parent_id)"/>, 
+                            
+                        </h2>
+                        <div attrs="{'invisible' : [('is_company', '=', True)]}">
+                            <label for="function" class="oe_form_readonly_hidden" />
+                        </div>
+                        <h2 attrs="{'invisible' : [('is_company', '=', True)]}">
                             <field name="function" class="oe_form_inline" placeholder="Job Position"/>
                         </h2>
                         <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
@@ -218,16 +224,16 @@
                         <page string="Sales &amp; Purchases" attrs="{'invisible': [('customer', '=', False), ('supplier', '=', False)]}">
                             <group>
                                 <group>
-                                    <field name="lang"/>
-                                    <field name="user_id"/>
-                                    <field name="date"/>
+                                    <field name="user_id" />
                                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    <field name="ref"/>
+                                    <field name="lang"/>
+                                    <field name="date"/>
                                 </group>
                                 <group>
                                     <field name="customer"/>
                                     <field name="supplier"/>
                                     <field name="active"/>
-                                    <field name="ref"/>
                                 </group>
                             </group>
                         </page>