From f1a7cf722b621ba83ffc5aa65e3ea20a5f692363 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 24 May 2010 11:41:15 +0530
Subject: [PATCH] [IMP,FIX]: base_contact: Improvement in base_contact for
 res.partner.function removed in base

bzr revid: rpa@tinyerp.com-20100524061115-3g4ilc6k175mnajy
---
 addons/base_contact/base_contact.py         |  9 ++--
 addons/base_contact/base_contact_demo.xml   | 57 ++++++++++-----------
 addons/base_contact/base_contact_view.xml   | 16 +++---
 addons/base_contact/test/base_contact00.yml | 12 ++---
 4 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 7b963ef09ee..23589fd2d6d 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -72,8 +72,8 @@ class res_partner_contact(osv.osv):
                  it will allow you to hide the partner contact without removing it."),
         'partner_id': fields.related('job_ids','address_id','partner_id',type='many2one',\
                          relation='res.partner', string='Main Employer'),
-        'function_id': fields.related('job_ids','function_id',type='many2one', \
-                            relation='res.partner.function', string='Main Function'),
+        'function': fields.related('job_ids', 'function', type='char', \
+                                 string='Main Function'),
         'job_id': fields.function(_main_job, method=True, type='many2one',\
                                  relation='res.partner.job', string='Main Job'),
         'email': fields.char('E-Mail', size=240),
@@ -164,7 +164,7 @@ class res_partner_job(osv.osv):
             return []
         res = []
         for r in self.browse(cr, uid, ids):
-            funct = r.function_id and (", " + r.function_id.name) or ""
+            funct = r.function and (", " + r.function) or ""
             res.append((r.id, self.pool.get('res.partner.contact').name_get(cr, uid, \
                                     [r.contact_id.id])[0][1] + funct))
         return res
@@ -215,8 +215,7 @@ class res_partner_job(osv.osv):
         'address_id': fields.many2one('res.partner.address', 'Address', \
                         help='Address which is linked to the Partner'), # TO Correct: domain=[('partner_id', '=', name)]
         'contact_id': fields.many2one('res.partner.contact','Contact', required=True, ondelete='cascade'),
-        'function_id': fields.many2one('res.partner.function','Partner Function', \
-                            help="Function of this contact with this partner"),
+        'function': fields.char('Partner Function', size=34, help="Function of this contact with this partner"),
         'sequence_contact': fields.integer('Contact Seq.',help='Order of\
                      importance of this address in the list of addresses of the linked contact'),
         'sequence_partner': fields.integer('Partner Seq.',help='Order of importance\
diff --git a/addons/base_contact/base_contact_demo.xml b/addons/base_contact/base_contact_demo.xml
index 1945e1dd899..6acdd08cf14 100644
--- a/addons/base_contact/base_contact_demo.xml
+++ b/addons/base_contact/base_contact_demo.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <!-- Create the functions -->
-        <record id="res_partner_function_privateaddress0" model="res.partner.function">
-            <field eval="&quot;&quot;&quot;Private Address&quot;&quot;&quot;" name="name"/>
-            <field name="code">PA</field>
-        </record>
 
         <!-- Create the contacts -->
         <record id="res_partner_contact_mortier0" model="res.partner.contact">
@@ -171,35 +166,35 @@
         <!-- Create the jobs -->
         <record id="res_partner_job_0" model="res.partner.job">
             <field name="address_id" ref="base.res_partner_address_1"/>
-            <field name="function_id" ref="base.function_sale"/>
+            <field name="function">Salesman</field>
             <field name="contact_id" ref="res_partner_contact_mortier0"/>
             <field name="sequence_partner">2</field>
         </record>
         <record id="res_partner_job_1" model="res.partner.job">
             <field name="address_id" ref="base.res_partner_address_2"/>
-            <field name="function_id" ref="base.function_sale"/>
+            <field name="function">Salesman</field>
             <field eval="&quot;&quot;&quot;contact@tecsas.fr&quot;&quot;&quot;" name="email"/>
             <field name="contact_id" ref="res_partner_contact_jacot0"/>
         </record>
         <record id="res_partner_job_2" model="res.partner.job">
             <field name="address_id" ref="base.res_partner_address_3"/>
-            <field name="function_id" ref="base.function_it"/>
+            <field name="function">CTO</field>
             <field eval="&quot;&quot;&quot;info@mediapole.net&quot;&quot;&quot;" name="email"/>
             <field name="contact_id" ref="res_partner_contact_passot0"/>
         </record>
         <record id="res_partner_job_3" model="res.partner.job">
             <field name="address_id" ref="base.res_partner_address_tang"/>
-            <field name="function_id" ref="base.function_sale"/>
+            <field name="function">Salesman</field>
             <field name="contact_id" ref="res_partner_contact_tang0"/>
         </record>
         <record id="res_partner_job_4" model="res.partner.job">
             <field name="address_id" ref="base.res_partner_address_wong"/>
-            <field name="function_id" ref="base.function_sale"/>
+            <field name="function">Salesman</field>
             <field name="contact_id" ref="res_partner_contact_wong0"/>
         </record>
         <record id="res_partner_job_5" model="res.partner.job">
             <field name="address_id" ref="base.res_partner_address_6"/>
-            <field name="function_id" ref="base.function_director"/>
+            <field name="function">CEO</field>
             <field name="contact_id" ref="res_partner_contact_lacarte0"/>
             <field name="sequence_contact">1</field>
             <field name="sequence_partner">0</field>
@@ -207,120 +202,120 @@
         </record>
         <record id="res_partner_job_6" model="res.partner.job">
             <field name="address_id" ref="base.res_partner_address_7"/>
-            <field name="function_id" ref="base.function_sale"/>
+            <field name="function">Salesman</field>
             <field name="contact_id" ref="res_partner_contact_lavente0"/>
         </record>
         <record id="res_partner_job_7" model="res.partner.job">
             <field name="address_id" ref="base.res_partner_address_8"/>
-            <field name="function_id" ref="base.function_it"/>
+            <field name="function">CTO</field>
             <field name="contact_id" ref="res_partner_contact_lelitre0"/>
         </record>
         <record id="res_partner_job_8" model="res.partner.job">
             <field name="address_id" ref="base.res_partner_address_9"/>
-            <field name="function_id" ref="base.function_director"/>
+            <field name="function">CEO</field>
             <field name="contact_id" ref="res_partner_contact_grosbonnet0"/>
         </record>
         <record id="res_partner_job_9" model="res.partner.job">
             <field name="address_id" ref="base.res_partner_address_10"/>
-            <field name="function_id" ref="base.function_sale"/>
+            <field name="function">Salesman</field>
             <field name="contact_id" ref="res_partner_contact_lesbrouffe0"/>
         </record>
         <record id="res_partner_job_10" model="res.partner.job">
             <field name="address_id" ref="base.res_partner_address_zen"/>
-            <field name="function_id" ref="base.function_it"/>
+            <field name="function">CTO</field>
             <field name="contact_id" ref="res_partner_contact_zen0"/>
         </record>
         <record id="res_partner_job_11" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
-            <field name="function_id" ref="base.function_sale"/>
+            <field name="function">Salesman</field>
             <field eval="&quot;&quot;&quot;re@mycompany.com&quot;&quot;&quot;" name="email"/>
             <field name="contact_id" ref="res_partner_contact_mignon0"/>
         </record>
         <record id="res_partner_job_12" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
-            <field name="function_id" ref="base.function_it"/>
+            <field name="function">CTO</field>
             <field eval="&quot;&quot;&quot;st@mycompany.com&quot;&quot;&quot;" name="email"/>
             <field name="contact_id" ref="res_partner_contact_wirtel0"/>
         </record>
         <record id="res_partner_job_13" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
-            <field name="function_id" ref="base.function_it"/>
+            <field name="function">CTO</field>
             <field eval="&quot;&quot;&quot;ch@mycompany.com&quot;&quot;&quot;" name="email"/>
             <field name="contact_id" ref="res_partner_contact_simonis0"/>
         </record>
         <record id="res_partner_job_14" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
-            <field name="function_id" ref="base.function_it"/>
+            <field name="function">CTO</field>
             <field eval="&quot;&quot;&quot;ol@mycompany.com&quot;&quot;&quot;" name="email"/>
             <field name="contact_id" ref="res_partner_contact_laurent0"/>
         </record>
         <record id="res_partner_job_15" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
-            <field name="function_id" ref="base.function_it"/>
+            <field name="function">CTO</field>
             <field eval="&quot;&quot;&quot;fl@mycompany.com&quot;&quot;&quot;" name="email"/>
             <field name="contact_id" ref="res_partner_contact_lambotte0"/>
         </record>
         <record id="res_partner_job_16" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
-            <field name="function_id" ref="base.function_sale"/>
+            <field name="function">Salesman</field>
             <field eval="&quot;&quot;&quot;av@mycompany.com&quot;&quot;&quot;" name="email"/>
             <field name="contact_id" ref="res_partner_contact_vandewerve0"/>
         </record>
         <record id="res_partner_job_17" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
-            <field name="function_id" ref="base.function_it"/>
+            <field name="function">CTO</field>
             <field eval="&quot;&quot;&quot;fb@mycompany.com&quot;&quot;&quot;" name="email"/>
             <field name="contact_id" ref="res_partner_contact_semal0"/>
         </record>
         <record id="res_partner_job_18" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
-            <field name="function_id" ref="base.function_it"/>
+            <field name="function">CTO</field>
             <field eval="&quot;&quot;&quot;qd@mycompany.com&quot;&quot;&quot;" name="email"/>
             <field name="contact_id" ref="res_partner_contact_depaoli0"/>
         </record>
         <record id="res_partner_job_19" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
-            <field name="function_id" ref="base.function_it"/>
+            <field name="function">CTO</field>
             <field eval="&quot;&quot;&quot;ne@mycompany.com&quot;&quot;&quot;" name="email"/>
             <field name="contact_id" ref="res_partner_contact_elkhayat0"/>
         </record>
         <record id="res_partner_job_20" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
-            <field name="function_id" ref="base.function_it"/>
+            <field name="function">CTO</field>
             <field eval="&quot;&quot;&quot;ph@mycompany.com&quot;&quot;&quot;" name="email"/>
             <field name="contact_id" ref="res_partner_contact_luu0"/>
         </record>
         <record id="res_partner_job_21" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
-            <field name="function_id" ref="base.function_director"/>
+            <field name="function">CEO</field>
             <field eval="&quot;&quot;&quot;fp@mycompany.com&quot;&quot;&quot;" name="email"/>
             <field name="contact_id" ref="res_partner_contact_pinckears0"/>
             <field name="sequence_partner">-1</field>
         </record>
         <record id="res_partner_job_22" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
-            <field name="function_id" ref="base.function_sale"/>
+            <field name="function">Salesman</field>
             <field eval="&quot;&quot;&quot;cd@mycompany.com&quot;&quot;&quot;" name="email"/>
             <field name="contact_id" ref="res_partner_contact_debois0"/>
         </record>
         <record id="res_partner_job_23" model="res.partner.job">
             <field name="address_id" ref="res_partner_address_0"/>
             <field name="contact_id" ref="res_partner_contact_mortier0"/>
-            <field name="function_id" ref="res_partner_function_privateaddress0"/>
             <field name="sequence_contact">5</field>
+            <field name="function">PA</field>
         </record>
         <record id="res_partner_job_24" model="res.partner.job">
             <field eval="1" name="sequence_contact"/>
             <field name="address_id" ref="res_partner_address_1"/>
             <field name="contact_id" ref="res_partner_contact_lacarte0"/>
-            <field name="function_id" ref="res_partner_function_privateaddress0"/>
+            <field name="function">PA</field>
             <field name="sequence_contact">5</field>
         </record>
         <record id="res_partner_job_25" model="res.partner.job">
             <field eval="2" name="sequence_contact"/>
             <field name="address_id" ref="base.res_partner_address_1"/>
             <field name="contact_id" ref="res_partner_contact_lacarte0"/>
-            <field name="function_id" ref="base.function_director"/>
+            <field name="function">CEO</field>
             <field name="sequence_contact">1</field>
         </record>
     </data>
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 42f2e51b2ee..8852ea19980 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -16,7 +16,7 @@
                 <field name="email"/>
                 <field name="lang_id"/>
                 <field name="partner_id"/>
-                <field name="function_id"/>
+                <field name="function"/>
             </tree>
         </field>
     </record>
@@ -38,7 +38,7 @@
                        <group string="Partner" colspan="2" col="2">
                            <field name="partner_id" invisible="1" select="1"/>
                            <field name="title" select="1"/>
-                           <field name="function_id" invisible="1"/>
+                           <field name="function" invisible="1"/>
                         <field name="email"/>
                            <field name="lang_id"/>
                            <field name="active"/>
@@ -51,7 +51,7 @@
                        <field name="job_ids" colspan="4" nolabel="1" mode="tree,form">
                             <form string="Functions and Addresses">
                                <group string="Partner" colspan="2" col="4">
-                                   <field name="function_id"/>
+                                   <field name="function"/>
                                    <field name="address_id"/>
                                    <field name="name"/>
                                    <field name="date_start" />
@@ -69,7 +69,7 @@
                             </form>
                             <tree string="Functions and Addresses">
                                 <field name="sequence_contact" string="Seq."/>
-                                <field name="function_id"/>
+                                <field name="function"/>
                                 <field name="name"/>
                                 <field name="address_id"/>
                                 <field name="phone"/>
@@ -152,7 +152,7 @@
                             <tree string="Contacts" editable="top">
                                 <field name="sequence_partner"/>
                                 <field name="contact_id"/>
-                                <field name="function_id"/>
+                                <field name="function"/>
                                 <field name="phone"/>
                                 <field name="fax"/>
                                 <field name="extension"/>
@@ -164,7 +164,7 @@
                                 <field name="sequence_partner"/>
                                 <field name="name"/>
                                 <field name="contact_id"/>
-                                <field name="function_id"/>
+                                <field name="function"/>
                             </group>
                             <group string="Communication" colspan="2" col="2">
                                 <field name="phone"/>
@@ -337,7 +337,7 @@
         <field name="arch" type="xml">
             <tree string="Contact Functions">
                 <field name="contact_id"/>
-                <field name="function_id"/>
+                <field name="function"/>
                 <field name="name"/>
                 <field name="address_id"/>
                 <field name="email"/>
@@ -360,7 +360,7 @@
 	             <field name="name" select="1" on_change="onchange_partner(name)"/>
 	             <field name="address_id" select="1" attrs="{'required': [('name', '!=', False)]}" on_change="onchange_address(address_id)"/>
 	             <field name="contact_id" select="1"/>
-	             <field name="function_id" select="1"/>
+	             <field name="function" select="1"/>
 	             <field name="email" widget="email"/>
 	             <field name="phone"/>
 	             <field name="fax"/>
diff --git a/addons/base_contact/test/base_contact00.yml b/addons/base_contact/test/base_contact00.yml
index a1b112e4e2a..5a76e25c424 100644
--- a/addons/base_contact/test/base_contact00.yml
+++ b/addons/base_contact/test/base_contact00.yml
@@ -23,7 +23,7 @@
         first_name: Laura
         job_ids:
             - email: lwilliams@mydomain.com
-              function_id: base_contact.res_partner_function_privateaddress0
+              function: PA
               phone: (+32).10.45.18.77
               sequence_contact: 1
               state: current
@@ -44,7 +44,7 @@
               zip: '2324324'
               job_ids:
                 - address_id: res_partner_address_1
-                  function_id: base.function_director
+                  function: CEO
                   contact_id: res_partner_contact_williams0
                   sequence_partner: 2
                   state: current
@@ -66,10 +66,10 @@
         first_name: Nicolas
         job_ids:
           - address_id: base.main_address
-            function_id: base.function_it
+            function: CTO
             state: current
           - address_id: base.res_partner_address_3000
-            function_id: base.function_director
+            function: CEO
             state: current
         lang_id: res_lang_french0
         mobile: (+32).23.44.32.12
@@ -84,10 +84,10 @@
     first_name: Christina
     job_ids:
       - address_id: base.res_partner_address_1
-        function_id: base.function_director
+        function: CEO
         state: past
       - address_id: base.res_partner_address_1
-        function_id: base.function_it
+        function: CTO
         state: current
     lang_id: base_contact.res_lang_french0
     mobile: (+32).10.45.18.77