From 1ca5b10918ff2c2bc81a4cad616bd6fcea81eef9 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 23 Nov 2011 12:46:51 +0530
Subject: [PATCH] [FIX] project data, plugin document_get

bzr revid: al@openerp.com-20111123071651-0frq669h3f9cm7tu
---
 addons/plugin/plugin_handler.py               |  6 +++--
 addons/project/project_data.xml               | 26 +++----------------
 .../project_long_term_data.xml                | 11 --------
 3 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
index b21f7423263..c4859771e35 100644
--- a/addons/plugin/plugin_handler.py
+++ b/addons/plugin/plugin_handler.py
@@ -41,20 +41,22 @@ class plugin_handler(osv.osv_memory):
         model = False
         res_id = 0
         url = False
+        name = ""
 
         msg = mail_message_obj.parse_message(email)
         references = [msg.get('message-id')]
         refs =  msg.get('references',False)
         if refs:
             references.extend(refs.split())
-            
+
         msg_ids = mail_message_obj.search(cr, uid, [('message_id','in',references)])
         if msg_ids:
             msg = mail_message_obj.browse(cr, uid, msg_ids[0])
             res_id = msg.res_id
             model = msg.model
             url = self._make_url(cr, uid, res_id, model)
-        return (model,  res_id, url)
+            name =  self.pool.get(model).name_get(cr, uid, res_id)[1]
+        return (model, res_id, url, name)
 
     def document_type(self, cr, uid, context=None):
         """
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index d78f208526a..a3bfe9be673 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -1,30 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-    
-        <!--
-        Requests Links
-        -->
-        <record id="req_link_project" model="res.request.link">
-            <field name="name">Project</field>
-            <field name="object">project.project</field>
-        </record>
-
-        <record id="req_link_task" model="res.request.link">
-            <field name="name">Project task</field>
-            <field name="object">project.task</field>
-        </record>
-        
-        <!--
-        Resource: project.project
-        -->
-
+    <data noupdate="1">
+        <!-- Resource: project.project -->
         <record id="all_projects_account" model="account.analytic.account">
             <field name="name">Projects</field>
             <field name="code">3</field>
         </record>
-        <function eval="('default',False,'parent_id', [('project.project', False)], all_projects_account, True, False, False, False, True)" id="parent_project_default_set" model="ir.values" name="set"/>
-
+        <function id="parent_project_default_set" model="ir.values" name="set" eval="('default',False,'parent_id', [('project.project', False)], all_projects_account, True, False, False, False, True)"/>
 
         <!-- Task Stages -->
         <record id="project_tt_specification" model="project.task.type">
@@ -47,7 +29,5 @@
             <field name="name">Deployment</field>
             <field name="project_default" eval="1"/>
         </record>
-
-
     </data>
 </openerp>
diff --git a/addons/project_long_term/project_long_term_data.xml b/addons/project_long_term/project_long_term_data.xml
index 8da591f1337..ebc084668b7 100644
--- a/addons/project_long_term/project_long_term_data.xml
+++ b/addons/project_long_term/project_long_term_data.xml
@@ -1,16 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-        <!-- Requests Links -->
-        <record id="req_link_project" model="res.request.link">
-            <field name="name">Project</field>
-            <field name="object">project.project</field>
-        </record>
-        <record id="req_link_task" model="res.request.link">
-            <field name="name">Project task</field>
-            <field name="object">project.task</field>
-        </record>
-
     </data>
 </openerp>