From a108da0f141e0e44775a0d1c4174dc61c62d8d76 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 25 May 2010 18:57:33 +0530
Subject: [PATCH] [IMP]: crm: Removed function_name field from
 lead(res.partner.function is removed)

bzr revid: rpa@tinyerp.com-20100525132733-5jdxhb33z478k22e
---
 addons/crm/crm_lead.py                      | 1 -
 addons/crm/crm_lead_view.xml                | 2 +-
 addons/crm/scripts/php/crmlead.php          | 2 +-
 addons/crm/wizard/crm_forward_to_partner.py | 2 +-
 addons/crm/wizard/crm_lead_to_partner.py    | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 3a358ddf649..c1060f3e658 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -137,7 +137,6 @@ and users by email"),
                                 method=True, multi='day_open', type="float", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 method=True, multi='day_close', type="float", store=True),
-        'function_name': fields.char('Function', size=64),
         'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 7a9c45f11e2..d62614f85df 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -72,7 +72,7 @@
                         <field name="partner_name" string="Partner Name" colspan="4"/>
                         <newline/>
                         <field domain="[('domain', '=', 'contact')]" name="title"/>
-                        <field name="function_name" />
+                        <field name="function" />
                         <field name="street" colspan="4"/>
                         <field name="street2" colspan="4"/>
                         <field name="zip"/>
diff --git a/addons/crm/scripts/php/crmlead.php b/addons/crm/scripts/php/crmlead.php
index aa23e5c78ba..91cfe7649ed 100644
--- a/addons/crm/scripts/php/crmlead.php
+++ b/addons/crm/scripts/php/crmlead.php
@@ -117,7 +117,7 @@ class Contact
 							  "email_from" => new xmlrpcval($post['email'], "string"),
 							  "phone" => new xmlrpcval($post['phone'], "string"),
 							  "partner_name" => new xmlrpcval($post['name'], "string"),
-							  "function_name" => new xmlrpcval($post["jobtitle"], "string"),
+							  "function" => new xmlrpcval($post["jobtitle"], "string"),
 							  "zip" => new xmlrpcval($post['zip'], "string"),
 							  "stage_id" => new xmlrpcval(6, "int"),
 							  "city" => new xmlrpcval($post['city'], "string"),
diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py
index 153f136cfb2..156ab3311f4 100644
--- a/addons/crm/wizard/crm_forward_to_partner.py
+++ b/addons/crm/wizard/crm_forward_to_partner.py
@@ -212,7 +212,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         lead = lead_proxy.browse(cr, uid, lead_id, context=context)
         if lead.type == 'lead':
                 field_names = [
-                    'partner_name', 'title', 'function_name', 'street', 'street2', 
+                    'partner_name', 'title', 'function', 'street', 'street2', 
                     'zip', 'city', 'country_id', 'state_id', 'email_from', 
                     'phone', 'fax', 'mobile'
                 ]
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 2decc56b806..98a075ba1ba 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -155,7 +155,7 @@ class crm_lead2partner(osv.osv_memory):
                         'email': lead.email_from,
                         'fax': lead.fax,
                         'title': lead.title,
-                        'function': lead.function_name,
+                        'function': lead.function,
                         'street': lead.street,
                         'street2': lead.street2,
                         'zip': lead.zip,