From b4f5d7f8df6e8d22e1b67cd4a58bb511bcfd5c54 Mon Sep 17 00:00:00 2001
From: rga <rga@rga-desktop>
Date: Wed, 2 Jun 2010 19:43:12 +0530
Subject: [PATCH] Change type of partner title field, selection to many2one

bzr revid: rga@rga-desktop-20100602141312-xmd2fv5dwuei10lv
---
 bin/addons/base/res/partner/partner.py       | 16 ++--------------
 bin/addons/base/res/partner/partner_demo.xml |  9 ---------
 bin/addons/base/res/partner/partner_view.xml |  8 ++++----
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index e5bb6a4f1cb..bab92eab179 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -90,18 +90,6 @@ class res_partner_title(osv.osv):
     _order = 'name'
 res_partner_title()
 
-def _contact_title_get(self, cr, uid, context={}):
-    obj = self.pool.get('res.partner.title')
-    ids = obj.search(cr, uid, [('domain', '=', 'contact')])
-    res = obj.read(cr, uid, ids, ['shortcut','name'], context)
-    return [(r['shortcut'], r['name']) for r in res] + [('','')]
-
-def _partner_title_get(self, cr, uid, context={}):
-    obj = self.pool.get('res.partner.title')
-    ids = obj.search(cr, uid, [('domain', '=', 'partner')])
-    res = obj.read(cr, uid, ids, ['shortcut','name'], context)
-    return [(r['shortcut'], r['name']) for r in res] +  [('','')]
-
 def _lang_get(self, cr, uid, context={}):
     obj = self.pool.get('res.lang')
     ids = obj.search(cr, uid, [], context=context)
@@ -116,7 +104,7 @@ class res_partner(osv.osv):
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True),
         'date': fields.date('Date', select=1),
-        'title': fields.selection(_partner_title_get, 'Title', size=32),
+        'title': fields.many2one('res.partner.title','Title'),
         'parent_id': fields.many2one('res.partner','Parent Partner', select=2),
         'child_ids': fields.one2many('res.partner', 'parent_id', 'Partner Ref.'),
         'ref': fields.char('Reference', size=64),
@@ -277,7 +265,7 @@ class res_partner_address(osv.osv):
         'partner_id': fields.many2one('res.partner', 'Partner', 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),
+        'title': fields.many2one('res.partner.title','Title'),
         'name': fields.char('Contact Name', size=64, select=1),
         'street': fields.char('Street', size=128),
         'street2': fields.char('Street2', size=128),
diff --git a/bin/addons/base/res/partner/partner_demo.xml b/bin/addons/base/res/partner/partner_demo.xml
index f5d70a2490d..ccb1ae13658 100644
--- a/bin/addons/base/res/partner/partner_demo.xml
+++ b/bin/addons/base/res/partner/partner_demo.xml
@@ -229,7 +229,6 @@
             <field name="city">Taiwan</field>
             <field name="name">Tang</field>
             <field name="zip">23410</field>
-            <field name="title">M.</field>
             <field model="res.country" name="country_id" search="[('name','=','Taiwan')]"/>
             <field name="street">31 Hong Kong street</field>
             <field name="type">default</field>
@@ -239,7 +238,6 @@
             <field name="city">Hong Kong</field>
             <field name="name">Wong</field>
             <field name="zip">23540</field>
-            <field name="title">M.</field>
             <field model="res.country" name="country_id" search="[('name','=','China')]"/>
             <field name="street">56 Beijing street</field>
             <field name="type">default</field>
@@ -249,7 +247,6 @@
             <field name="city">Bruxelles</field>
             <field name="name">Etienne Lacarte</field>
             <field name="zip">2365</field>
-            <field name="title">M.</field>
             <field model="res.country" name="country_id" search="[('name','=','Belgium')]"/>
             <field name="street">23 rue du Vieux Bruges</field>
             <field name="type">default</field>
@@ -259,7 +256,6 @@
             <field name="city">Namur</field>
             <field name="name">Jean Guy Lavente</field>
             <field name="zip">2541</field>
-            <field name="title">M.</field>
             <field model="res.country" name="country_id" search="[('name','=','Belgium')]"/>
             <field name="street">42 rue de la Lesse</field>
             <field name="type">default</field>
@@ -269,7 +265,6 @@
             <field name="city">Wavre</field>
             <field name="name">Sylvie Lelitre</field>
             <field name="zip">5478</field>
-            <field name="title">Ms.</field>
             <field model="res.country" name="country_id" search="[('name','=','Belgium')]"/>
             <field name="street">69 rue de Chimay</field>
             <field name="type">default</field>
@@ -279,7 +274,6 @@
             <field name="city">Paris</field>
             <field name="name">Arthur Grosbonnet</field>
             <field name="zip">75016</field>
-            <field name="title">M.</field>
             <field model="res.country" name="country_id" search="[('name','=','France')]"/>
             <field name="street">1 rue Rockfeller</field>
             <field name="type">default</field>
@@ -289,7 +283,6 @@
             <field name="city">Alencon</field>
             <field name="name">Sebastien LANGE</field>
             <field name="zip">61000</field>
-            <field name="title">M.</field>
             <field name="email">contact@syleam.fr</field>
             <field name="street">1 place de l'Église</field>
             <field name="phone">+33 (0) 2 33 31 22 10</field>
@@ -301,7 +294,6 @@
             <field name="city">Liege</field>
             <field name="name">Karine Lesbrouffe</field>
             <field name="zip">6985</field>
-            <field name="title">Mss</field>
             <field model="res.country" name="country_id" search="[('name','=','Belgium')]"/>
             <field name="street">2 Impasse de la Soif</field>
             <field name="type">default</field>
@@ -311,7 +303,6 @@
             <field name="city">Shanghai</field>
             <field name="name">Zen</field>
             <field name="zip">4785552</field>
-            <field name="title">M.</field>
             <field model="res.country" name="country_id" search="[('name','=','China')]"/>
             <field name="street">52 Chop Suey street</field>
             <field name="type">default</field>
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 55a98112506..ff7da63109a 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -64,7 +64,7 @@
                         <field name="company_id" groups="base.group_multi_company" widget="selection" colspan="2"/>
                         <newline/>
                         <field name="name"/>
-                        <field domain="[('domain', '=', 'contact')]" name="title"/>
+                        <field domain="[('domain', '=', 'contact')]" name="title" widget="selection"/>
                         <field name="function"/>
                     </group>
                       <group colspan="2" col="2">
@@ -122,7 +122,7 @@
             <field name="arch" type="xml">
                 <form string="Contacts">
                     <field name="name" select="1"/>
-                    <field domain="[('domain', '=', 'contact')]" name="title"/>
+                    <field domain="[('domain', '=', 'contact')]" name="title" widget="selection"/>
                     <field name="street"/>
                     <field name="street2"/>
                     <field name="type"/>
@@ -235,7 +235,7 @@
                         <group colspan="5" col="6">
                             <field name="name" select="1"/>
                             <field name="ref"/>
-                            <field domain="[('domain', '=', 'partner')]" name="title" groups="base.group_extended"/>
+                            <field domain="[('domain', '=', 'partner')]" name="title"  size="0" groups="base.group_extended" widget="selection"/>
                             <field name="lang"/>
                         </group>
                         <group colspan="1" col="2">
@@ -250,7 +250,7 @@
                                 <form string="Partner Contacts">
                                     <group colspan="4" col="6">
                                         <field name="name"/>
-                                        <field domain="[('domain', '=', 'contact')]" name="title" size="0"/>
+                                        <field domain="[('domain', '=', 'contact')]" name="title" size="0" widget="selection"/>
                                         <field name="function"/>
                                     </group>
                                     <newline/>