From 1183a6c3c58f69350b887300a72fa73e55e810d5 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 28 Nov 2011 18:02:10 +0100
Subject: [PATCH] [FIX] base_contact: Add some missing features

bzr revid: stw@openerp.com-20111128170210-sj1sldavqkhkf32r
---
 addons/base_contact/base_contact.py       | 11 +++-
 addons/base_contact/base_contact_view.xml | 71 +++++------------------
 2 files changed, 25 insertions(+), 57 deletions(-)

diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 5f53ba3f980..18935776717 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
+import addons
 
 class res_partner_contact(osv.osv):
     """ Partner Contact """
@@ -68,10 +69,16 @@ class res_partner_contact(osv.osv):
                                  relation='res.partner.job', string='Main Job'),
         'email': fields.char('E-Mail', size=240),
         'comment': fields.text('Notes', translate=True),
-        'photo': fields.binary('Image'),
+        'photo': fields.binary('Photo'),
 
     }
+
+    def _get_photo(self, cr, uid, context=None):
+        photo_path = addons.get_module_resource('base_contact', 'images', 'photo.png')
+        return open(photo_path, 'rb').read().encode('base64')
+
     _defaults = {
+        'photo' : _get_photo,
         'active' : lambda *a: True,
     }
 
@@ -180,6 +187,8 @@ class res_partner_address(osv.osv):
     _columns = {
         'address_id' : fields.many2one('res.partner.location', 'Location'),
         'contact_id' : fields.many2one('res.partner.contact', 'Contact'),
+        'contact_firstname' : fields.related('contact_id', 'first_name', type='char', size=64, string='FirstName'),
+        'contact_name' : fields.related('contact_id', 'name', type='char', size='64', string="LastName"),
         'function': fields.char('Partner Function', size=64, help="Function of this contact with this partner"),
         'date_start': fields.date('Date Start',help="Start date of job(Joining Date)"),
         'date_stop': fields.date('Date Stop', help="Last date of job"),
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index ef1723f7a35..f077c3ca4b7 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -251,6 +251,7 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <field name="name" position="replace">
+                <field name="name" />
                 <field name='job_ids' string='# of Contacts'/>
             </field>
         </field>
@@ -262,65 +263,23 @@
         <field name="inherit_id" ref="base.view_partner_address_form1"/>
         <field name='type'>form</field>
         <field name='arch' type='xml'>
-            <field name="type" position="replace">
+            <field name="type" position="replace" />
+            <field name="title" position="replace" />
+            <field name="function" position="replace" />
+            <field name="name" position="replace" />
+            <field name="active" position="after">
+                <separator string="Contact" colspan="6" />
+                <group colspan="6" col="2">
+                    <field name="title" />
+                    <field name="contact_firstname" />
+                    <field name="contact_name" />
+                </group>
             </field>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_partner_address_form_inherited1">
-        <field name='name'>res.partner.address.form.inherited1</field>
-        <field name='model'>res.partner.address</field>
-        <field name="inherit_id" ref="base.view_partner_address_form1"/>
-        <field name='type'>form</field>
-        <field name='arch' type='xml'>
-            <field name="name" position="replace">
-            </field>
-        </field>
-    </record>
-
-    <record id='view_partner_address_form_inherited2' model='ir.ui.view'>
-        <field name='name'>res.partner.address.form.inherited2</field>
-        <field name='model'>res.partner.address</field>
-        <field name="inherit_id" ref="base.view_partner_address_form1"/>
-        <field name='type'>form</field>
-        <field name='arch' type='xml'>
-            <field name="title" position="replace">
-            </field>
-        </field>
-    </record>
-
-    <record id='view_partner_address_form_inherited3' model='ir.ui.view'>
-        <field name='name'>res.partner.address.form.inherited3</field>
-        <field name='model'>res.partner.address</field>
-        <field name="inherit_id" ref="base.view_partner_address_form1"/>
-        <field name='type'>form</field>
-        <field name='arch' type='xml'>
-            <field name="function" position="replace">
-            </field>
-        </field>
-    </record>
-
-    <record id='view_partner_address_form_inherited4' model='ir.ui.view'>
-        <field name='name'>res.partner.address.form.inherited4</field>
-        <field name='model'>res.partner.address</field>
-        <field name="inherit_id" ref="base.view_partner_address_form1"/>
-        <field name='type'>form</field>
-        <field name='arch' type='xml'>
-            <field name='mobile' position="replace">
-            </field>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_partner_address_form_inherited6">
-        <field name='name'>res.partner.address.form.inherited6</field>
-        <field name='model'>res.partner.address</field>
-        <field name="inherit_id" ref="base.view_partner_address_form1"/>
-        <field name='type'>form</field>
-        <field name='arch' type='xml'>
             <field name="partner_id" position="replace">
                 <field name='partner_id' select='1'/>
-                <field name='type' select='2'/>
+                <field name='type' select='2' invisible="1"/>
                 <field name='job_id' invisible="1"/>
+                <field name="function" />
             </field>
         </field>
     </record>
@@ -332,7 +291,7 @@
         <field name="inherit_id" ref="base.view_res_partner_address_filter"/>
         <field name="arch" type="xml">
             <search string="Search Contact">
-                   <field name="job_ids"/>
+                <field name="job_ids"/>
             </search>
         </field>
     </record>