From 7d656e961b69939a1b68abae10741a4f156c60f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me?= <jem@openerp.com>
Date: Thu, 13 Feb 2014 15:30:44 +0100
Subject: [PATCH 1/7] [ADD] crm_project_issue: link module to create lead from
 issues and issues from lead

bzr revid: jem@openerp.com-20140213143044-p06ef9scr32ihef2
---
 addons/crm_project_issue/__init__.py          |  3 +++
 addons/crm_project_issue/__openerp__.py       | 21 +++++++++++++++
 addons/crm_project_issue/crm_lead.py          | 10 +++++++
 addons/crm_project_issue/crm_lead_view.xml    | 27 +++++++++++++++++++
 addons/crm_project_issue/project_issue.py     | 14 ++++++++++
 .../crm_project_issue/project_issue_view.xml  | 17 ++++++++++++
 6 files changed, 92 insertions(+)
 create mode 100644 addons/crm_project_issue/__init__.py
 create mode 100644 addons/crm_project_issue/__openerp__.py
 create mode 100644 addons/crm_project_issue/crm_lead.py
 create mode 100644 addons/crm_project_issue/crm_lead_view.xml
 create mode 100644 addons/crm_project_issue/project_issue.py
 create mode 100644 addons/crm_project_issue/project_issue_view.xml

diff --git a/addons/crm_project_issue/__init__.py b/addons/crm_project_issue/__init__.py
new file mode 100644
index 00000000000..40302ae183c
--- /dev/null
+++ b/addons/crm_project_issue/__init__.py
@@ -0,0 +1,3 @@
+
+import project_issue
+import crm_lead
\ No newline at end of file
diff --git a/addons/crm_project_issue/__openerp__.py b/addons/crm_project_issue/__openerp__.py
new file mode 100644
index 00000000000..89ef20a655e
--- /dev/null
+++ b/addons/crm_project_issue/__openerp__.py
@@ -0,0 +1,21 @@
+{
+    'name' : 'CRM Project Issues',
+    'version': '1.0',
+    'summary': 'Module linker between Leads and Issues',
+    'sequence': '19',
+    'category': 'Project Management',
+    'complexity': 'easy',
+    'description':
+        """
+CRM Project Issues
+==================
+
+Link module to map leads and issues
+        """,
+    'data': [
+        'project_issue_view.xml',
+        'crm_lead_view.xml',
+    ],
+    'depends' : ['crm', 'project_issue'],
+    'installable': True,
+}
diff --git a/addons/crm_project_issue/crm_lead.py b/addons/crm_project_issue/crm_lead.py
new file mode 100644
index 00000000000..ec83af18a39
--- /dev/null
+++ b/addons/crm_project_issue/crm_lead.py
@@ -0,0 +1,10 @@
+
+from openerp.osv import osv, fields
+
+
+class crm_lead(osv.Model):
+    _inherit = 'crm.lead'
+
+    _columns = {
+        'project_issue_ids': fields.one2many('project.issue', 'lead_id', "Project Issues"),
+    }
diff --git a/addons/crm_project_issue/crm_lead_view.xml b/addons/crm_project_issue/crm_lead_view.xml
new file mode 100644
index 00000000000..0e81f16fa9f
--- /dev/null
+++ b/addons/crm_project_issue/crm_lead_view.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="crm_project_issue_lead_form_view">
+            <field name="name">lead.form</field>
+            <field name="model">crm.lead</field>
+            <field name="inherit_id" ref="crm.crm_case_form_view_leads" />
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Related Issues">
+                        <field name="project_issue_ids" colspan="4" nolabel="1" context="{'default_name': name, 'default_partner_id' : partner_id, 'default_lead_id' : id, 'default_email_from' : email_from, 'default_description' : description}">
+                            <tree>
+                                <field name="create_date" />
+                                <field name="name" />
+                                <field name="user_id" />
+                                <field name="project_id" />
+                                <field name="partner_id" />
+                            </tree>
+                        </field>
+                    </page>
+                </notebook>
+            </field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/crm_project_issue/project_issue.py b/addons/crm_project_issue/project_issue.py
new file mode 100644
index 00000000000..9409aeb51ae
--- /dev/null
+++ b/addons/crm_project_issue/project_issue.py
@@ -0,0 +1,14 @@
+
+from openerp.osv import osv, fields
+
+
+class project_issue(osv.Model):
+    _inherit = 'project.issue'
+
+    _columns = {
+        'lead_id': fields.many2one('crm.lead', ondelete='set null', string="Related lead"),
+    }
+
+    _defaults = {
+
+    }
\ No newline at end of file
diff --git a/addons/crm_project_issue/project_issue_view.xml b/addons/crm_project_issue/project_issue_view.xml
new file mode 100644
index 00000000000..18a03b5a2c1
--- /dev/null
+++ b/addons/crm_project_issue/project_issue_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <record model="ir.ui.view" id="crm_project_issue_form_view">
+            <field name="name">project.issue.form</field>
+            <field name="model">project.issue</field>
+            <field name="inherit_id" ref="project_issue.project_issue_form_view" />
+            <field name="arch" type="xml">
+                <field name="priority" position="after">
+                    <field name="lead_id" groups="base.group_user" context="{'default_name': name, 'default_partner_id' : partner_id, 'default_email_from' : email_from, 'default_description' : description}"/>
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file

From 0ff108c00c72742693c20cb22d251bee7d463978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me?= <jem@openerp.com>
Date: Mon, 17 Feb 2014 14:57:31 +0100
Subject: [PATCH 2/7] [ADD] change the link between lead and issue. Now :
 transfrom a lead into a issue and modify the mail thread

bzr revid: jem@openerp.com-20140217135731-538vluw7i1gverjf
---
 addons/crm_project_issue/__init__.py          |  3 +-
 addons/crm_project_issue/__openerp__.py       |  3 +-
 addons/crm_project_issue/project_issue.py     | 36 +++++++++---
 .../crm_project_issue/project_issue_view.xml  | 55 ++++++++++++++-----
 addons/mail/mail_thread.py                    | 31 +++++++++++
 5 files changed, 103 insertions(+), 25 deletions(-)

diff --git a/addons/crm_project_issue/__init__.py b/addons/crm_project_issue/__init__.py
index 40302ae183c..1d0a3f683ea 100644
--- a/addons/crm_project_issue/__init__.py
+++ b/addons/crm_project_issue/__init__.py
@@ -1,3 +1,2 @@
 
-import project_issue
-import crm_lead
\ No newline at end of file
+import project_issue
\ No newline at end of file
diff --git a/addons/crm_project_issue/__openerp__.py b/addons/crm_project_issue/__openerp__.py
index 89ef20a655e..e50a6dbfa2a 100644
--- a/addons/crm_project_issue/__openerp__.py
+++ b/addons/crm_project_issue/__openerp__.py
@@ -13,8 +13,7 @@ CRM Project Issues
 Link module to map leads and issues
         """,
     'data': [
-        'project_issue_view.xml',
-        'crm_lead_view.xml',
+        'project_issue_view.xml'
     ],
     'depends' : ['crm', 'project_issue'],
     'installable': True,
diff --git a/addons/crm_project_issue/project_issue.py b/addons/crm_project_issue/project_issue.py
index 9409aeb51ae..8e7a0733932 100644
--- a/addons/crm_project_issue/project_issue.py
+++ b/addons/crm_project_issue/project_issue.py
@@ -1,14 +1,36 @@
 
 from openerp.osv import osv, fields
 
+class crm_lead_to_project_issue_wizard(osv.TransientModel):
+    """ wizard to convert a Lead into a Project Issue and move the Mail Thread """
 
-class project_issue(osv.Model):
-    _inherit = 'project.issue'
+    def action_lead_to_project_issue(self, cr, uid, ids, context=None):
+        # get the wizards
+        wizards = self.browse(cr, uid, ids, context=context)
+        lead_model = self.pool.get("crm.lead")
+        issue_model = self.pool.get("project.issue")
+
+        for wizard in wizards:
+            # get the lead to transform
+            lead = lead_model.browse(cr, uid, wizard.lead_id.id, context=context)
+            # create new project.issue
+            vals = {}
+            vals["name"] = lead.name
+            vals["description"] = lead.description
+            vals["email_from"] = lead.email_from
+            vals["partner_id"] = lead.partner_id.id
+            vals["project_id"] = wizard.project_id.id
+            issue_id = issue_model.create(cr, uid, vals, context=None) 
+            # move the mail thread
+            lead_model.transform_model_messages(cr, uid, wizard.lead_id.id, issue_id, "project.issue", context=context)
+            # delete the lead
+            lead_model.unlink(cr, uid, [wizard.lead_id.id], context=None)
+        return False
+
+
+    _name = "crm.lead2projectissue.wizard"
 
     _columns = {
-        'lead_id': fields.many2one('crm.lead', ondelete='set null', string="Related lead"),
-    }
-
-    _defaults = {
-
+        "lead_id" : fields.many2one("crm.lead","Lead", domain=[("type","=","lead")]),
+        "project_id" : fields.many2one("project.project", "Project", domain=[("use_issues","=",True)])
     }
\ No newline at end of file
diff --git a/addons/crm_project_issue/project_issue_view.xml b/addons/crm_project_issue/project_issue_view.xml
index 18a03b5a2c1..57cf256bdd3 100644
--- a/addons/crm_project_issue/project_issue_view.xml
+++ b/addons/crm_project_issue/project_issue_view.xml
@@ -1,17 +1,44 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <openerp>
-    <data>
-        
-        <record model="ir.ui.view" id="crm_project_issue_form_view">
-            <field name="name">project.issue.form</field>
-            <field name="model">project.issue</field>
-            <field name="inherit_id" ref="project_issue.project_issue_form_view" />
-            <field name="arch" type="xml">
-                <field name="priority" position="after">
-                    <field name="lead_id" groups="base.group_user" context="{'default_name': name, 'default_partner_id' : partner_id, 'default_email_from' : email_from, 'default_description' : description}"/>
-                </field>
-            </field>
-        </record>
+<data>
 
-    </data>
+    <!-- inherit view of Lead Form : adding the "convert to issue" button -->
+    <record model="ir.ui.view" id="crm_case_form_view_leads_project_issue">
+        <field name="name">CRM - Leads Form</field>
+        <field name="model">crm.lead</field>
+        <field name="inherit_id" ref="crm.crm_case_form_view_leads" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='stage_id']" position="before">
+                    <button name="%(convert_lead2projectissue_wizard_action)d" string="Convert to Issue" type="action" help="Convert to Issue" context="{'default_lead_id' : id}" />
+            </xpath>
+        </field>
+    </record>
+
+    <!-- action of converting, via wizard -->
+    <record model="ir.actions.act_window" id="convert_lead2projectissue_wizard_action" >
+        <field name="name">Convert to Issue</field>
+        <field name="res_model">crm.lead2projectissue.wizard</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+
+    <!-- view of the Wizard Form --> 
+    <record model="ir.ui.view" id="view_crm_lead2projectissue_wizard" >
+        <field name="name">crm.lead2projectissue.wizard.form</field>
+        <field name="model">crm.lead2projectissue.wizard</field>
+        <field name="arch" type="xml">
+            <form string="Convert to Issue" version="7.0">
+                <field name="lead_id" invisible="True" />
+                <label for="project_id" />
+                <field name="project_id" />
+                <footer>
+                    <button type="special" special="cancel" string="Cancel" />
+                    <button type="object" name="action_lead_to_project_issue" string="Convert" />
+                </footer>
+            </form>
+        </field>
+    </record>
+
+</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 9a8adee31c3..98b7255fcd1 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -1796,3 +1796,34 @@ class mail_thread(osv.AbstractModel):
             }
             threads.append(data)
         return sorted(threads, key=lambda x: (x['popularity'], x['id']), reverse=True)[:3]
+
+
+    def transform_model_messages(self, cr, uid, id, new_res_id, new_model, context=None):
+        """
+        Transfert the list of the mail thread messages from an model to another
+
+        :param id : the old res_id of the mail.message
+        :param new_res_id : the new res_id of the mail.message
+        :param new_model : the name of the new model of the mail.message
+
+        Example :   self.pool.get("crm.lead").transform_model_messages(self, cr, uid, 2, 4, "project.issue", context) 
+                    will transfert thread of the lead (id=2) to the issue (id=4)
+        """
+
+        # get the message ids belonging to the thread to migrate
+        message_obj = self.pool.get('mail.message')
+        msg_ids = message_obj.search(cr, uid, [
+                    ('model', '=', self._name),
+                    ('res_id', '=', id)], context=context)
+        
+        subtype_res_id = self.pool.get('ir.model.data').xmlid_to_res_id(cr, uid, 'mail.mt_comment', raise_if_not_found=True)
+        
+        # update the messages
+        for message in message_obj.browse(cr, uid, msg_ids, context=context):
+            if subtype_res_id == message.subtype_id.id:
+                # no change the subtype
+                message_obj.write(cr, uid, message.id, {"res_id" : new_res_id, "model" : new_model}, context=context)
+            else:
+                # modify the subtype
+                message_obj.write(cr, uid, message.id, {"res_id" : new_res_id, "model" : new_model, "subtype_id" : None}, context=context)
+        return True
\ No newline at end of file

From bf609585124485785cd85099216dc6930bc90f06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me?= <jem@openerp.com>
Date: Mon, 17 Feb 2014 15:26:57 +0100
Subject: [PATCH 3/7] [Fix] : external id not found in view

bzr revid: jem@openerp.com-20140217142657-qa3y5pl3ig2wars2
---
 .../crm_project_issue/project_issue_view.xml  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/crm_project_issue/project_issue_view.xml b/addons/crm_project_issue/project_issue_view.xml
index 57cf256bdd3..3dc6d84e48f 100644
--- a/addons/crm_project_issue/project_issue_view.xml
+++ b/addons/crm_project_issue/project_issue_view.xml
@@ -2,18 +2,6 @@
 <openerp>
 <data>
 
-    <!-- inherit view of Lead Form : adding the "convert to issue" button -->
-    <record model="ir.ui.view" id="crm_case_form_view_leads_project_issue">
-        <field name="name">CRM - Leads Form</field>
-        <field name="model">crm.lead</field>
-        <field name="inherit_id" ref="crm.crm_case_form_view_leads" />
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='stage_id']" position="before">
-                    <button name="%(convert_lead2projectissue_wizard_action)d" string="Convert to Issue" type="action" help="Convert to Issue" context="{'default_lead_id' : id}" />
-            </xpath>
-        </field>
-    </record>
-
     <!-- action of converting, via wizard -->
     <record model="ir.actions.act_window" id="convert_lead2projectissue_wizard_action" >
         <field name="name">Convert to Issue</field>
@@ -40,5 +28,17 @@
         </field>
     </record>
 
+    <!-- inherit view of Lead Form : adding the "convert to issue" button -->
+    <record model="ir.ui.view" id="crm_case_form_view_leads_project_issue">
+        <field name="name">CRM - Leads Form</field>
+        <field name="model">crm.lead</field>
+        <field name="inherit_id" ref="crm.crm_case_form_view_leads" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='stage_id']" position="before">
+                    <button name="%(convert_lead2projectissue_wizard_action)d" string="Convert to Issue" type="action" help="Convert to Issue" context="{'default_lead_id' : id}" />
+            </xpath>
+        </field>
+    </record>
+
 </data>
 </openerp>
\ No newline at end of file

From f1e7517ab38d973918713b0815f57a718f0df605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me?= <jem@openerp.com>
Date: Tue, 18 Feb 2014 09:39:27 +0100
Subject: [PATCH 4/7] [Change] getting

bzr revid: jem@openerp.com-20140218083927-d4ixa0cr1yddg8s2
---
 addons/crm_project_issue/__openerp__.py       |  1 +
 addons/crm_project_issue/crm_lead.py          | 10 -------
 addons/crm_project_issue/crm_lead_view.xml    | 27 -------------------
 addons/crm_project_issue/project_issue.py     |  7 ++---
 .../crm_project_issue/project_issue_view.xml  |  3 +--
 5 files changed, 6 insertions(+), 42 deletions(-)
 delete mode 100644 addons/crm_project_issue/crm_lead.py
 delete mode 100644 addons/crm_project_issue/crm_lead_view.xml

diff --git a/addons/crm_project_issue/__openerp__.py b/addons/crm_project_issue/__openerp__.py
index e50a6dbfa2a..56eccd76527 100644
--- a/addons/crm_project_issue/__openerp__.py
+++ b/addons/crm_project_issue/__openerp__.py
@@ -5,6 +5,7 @@
     'sequence': '19',
     'category': 'Project Management',
     'complexity': 'easy',
+    'author': 'OpenERP SA',
     'description':
         """
 CRM Project Issues
diff --git a/addons/crm_project_issue/crm_lead.py b/addons/crm_project_issue/crm_lead.py
deleted file mode 100644
index ec83af18a39..00000000000
--- a/addons/crm_project_issue/crm_lead.py
+++ /dev/null
@@ -1,10 +0,0 @@
-
-from openerp.osv import osv, fields
-
-
-class crm_lead(osv.Model):
-    _inherit = 'crm.lead'
-
-    _columns = {
-        'project_issue_ids': fields.one2many('project.issue', 'lead_id', "Project Issues"),
-    }
diff --git a/addons/crm_project_issue/crm_lead_view.xml b/addons/crm_project_issue/crm_lead_view.xml
deleted file mode 100644
index 0e81f16fa9f..00000000000
--- a/addons/crm_project_issue/crm_lead_view.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record model="ir.ui.view" id="crm_project_issue_lead_form_view">
-            <field name="name">lead.form</field>
-            <field name="model">crm.lead</field>
-            <field name="inherit_id" ref="crm.crm_case_form_view_leads" />
-            <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Related Issues">
-                        <field name="project_issue_ids" colspan="4" nolabel="1" context="{'default_name': name, 'default_partner_id' : partner_id, 'default_lead_id' : id, 'default_email_from' : email_from, 'default_description' : description}">
-                            <tree>
-                                <field name="create_date" />
-                                <field name="name" />
-                                <field name="user_id" />
-                                <field name="project_id" />
-                                <field name="partner_id" />
-                            </tree>
-                        </field>
-                    </page>
-                </notebook>
-            </field>
-        </record>
-
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/crm_project_issue/project_issue.py b/addons/crm_project_issue/project_issue.py
index 8e7a0733932..1a6165a3681 100644
--- a/addons/crm_project_issue/project_issue.py
+++ b/addons/crm_project_issue/project_issue.py
@@ -9,10 +9,11 @@ class crm_lead_to_project_issue_wizard(osv.TransientModel):
         wizards = self.browse(cr, uid, ids, context=context)
         lead_model = self.pool.get("crm.lead")
         issue_model = self.pool.get("project.issue")
+        lead_id = context.get('active_id',0)
 
         for wizard in wizards:
             # get the lead to transform
-            lead = lead_model.browse(cr, uid, wizard.lead_id.id, context=context)
+            lead = lead_model.browse(cr, uid, lead_id, context=context)
             # create new project.issue
             vals = {}
             vals["name"] = lead.name
@@ -22,9 +23,9 @@ class crm_lead_to_project_issue_wizard(osv.TransientModel):
             vals["project_id"] = wizard.project_id.id
             issue_id = issue_model.create(cr, uid, vals, context=None) 
             # move the mail thread
-            lead_model.transform_model_messages(cr, uid, wizard.lead_id.id, issue_id, "project.issue", context=context)
+            lead_model.transform_model_messages(cr, uid, lead_id, issue_id, "project.issue", context=context)
             # delete the lead
-            lead_model.unlink(cr, uid, [wizard.lead_id.id], context=None)
+            lead_model.unlink(cr, uid, [lead_id], context=None)
         return False
 
 
diff --git a/addons/crm_project_issue/project_issue_view.xml b/addons/crm_project_issue/project_issue_view.xml
index 3dc6d84e48f..26932a8fe35 100644
--- a/addons/crm_project_issue/project_issue_view.xml
+++ b/addons/crm_project_issue/project_issue_view.xml
@@ -17,7 +17,6 @@
         <field name="model">crm.lead2projectissue.wizard</field>
         <field name="arch" type="xml">
             <form string="Convert to Issue" version="7.0">
-                <field name="lead_id" invisible="True" />
                 <label for="project_id" />
                 <field name="project_id" />
                 <footer>
@@ -35,7 +34,7 @@
         <field name="inherit_id" ref="crm.crm_case_form_view_leads" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='stage_id']" position="before">
-                    <button name="%(convert_lead2projectissue_wizard_action)d" string="Convert to Issue" type="action" help="Convert to Issue" context="{'default_lead_id' : id}" />
+                    <button name="%(convert_lead2projectissue_wizard_action)d" string="Convert to Issue" type="action" help="Convert to Issue" />
             </xpath>
         </field>
     </record>

From 41a4d00abeb0f3dcf1f093f4a464ed7e13417bd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me?= <jem@openerp.com>
Date: Tue, 18 Feb 2014 15:30:38 +0100
Subject: [PATCH 5/7] [FIX] : modified according to tde's remarks

bzr revid: jem@openerp.com-20140218143038-msk038rdmrp1fox1
---
 addons/crm_project_issue/project_issue.py | 44 +++++++++++++++--------
 addons/mail/mail_thread.py                | 32 +++++++++--------
 2 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/addons/crm_project_issue/project_issue.py b/addons/crm_project_issue/project_issue.py
index 1a6165a3681..93b47cbf24f 100644
--- a/addons/crm_project_issue/project_issue.py
+++ b/addons/crm_project_issue/project_issue.py
@@ -5,28 +5,38 @@ class crm_lead_to_project_issue_wizard(osv.TransientModel):
     """ wizard to convert a Lead into a Project Issue and move the Mail Thread """
 
     def action_lead_to_project_issue(self, cr, uid, ids, context=None):
-        # get the wizards
+        # get the wizards and models
         wizards = self.browse(cr, uid, ids, context=context)
-        lead_model = self.pool.get("crm.lead")
-        issue_model = self.pool.get("project.issue")
-        lead_id = context.get('active_id',0)
+        Lead = self.pool["crm.lead"]
+        Issue = self.pool["project.issue"]
 
         for wizard in wizards:
             # get the lead to transform
-            lead = lead_model.browse(cr, uid, lead_id, context=context)
+            lead = wizard.lead_id
             # create new project.issue
-            vals = {}
-            vals["name"] = lead.name
-            vals["description"] = lead.description
-            vals["email_from"] = lead.email_from
-            vals["partner_id"] = lead.partner_id.id
-            vals["project_id"] = wizard.project_id.id
-            issue_id = issue_model.create(cr, uid, vals, context=None) 
+            vals = {"name": lead.name, 
+                "description": lead.description, 
+                "email_from": lead.email_from, 
+                "partner_id": lead.partner_id.id, 
+                "project_id": wizard.project_id.id
+            }
+            issue_id = Issue.create(cr, uid, vals, context=None) 
             # move the mail thread
-            lead_model.transform_model_messages(cr, uid, lead_id, issue_id, "project.issue", context=context)
+            Lead.message_change_thread(cr, uid, lead.id, issue_id, "project.issue", context=context)
             # delete the lead
-            lead_model.unlink(cr, uid, [lead_id], context=None)
-        return False
+            Lead.unlink(cr, uid, [lead.id], context=None)
+        # return the action to go to the form view of the new Issue
+        view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','project.issue'), ('name','=','project_issue_form_view')])
+        return {
+            'name': 'Issue created',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'view_id': view_id,
+            'res_model': 'project.issue',
+            'type': 'ir.actions.act_window',
+            'res_id': issue_id,
+            'context' : context
+        }
 
 
     _name = "crm.lead2projectissue.wizard"
@@ -34,4 +44,8 @@ class crm_lead_to_project_issue_wizard(osv.TransientModel):
     _columns = {
         "lead_id" : fields.many2one("crm.lead","Lead", domain=[("type","=","lead")]),
         "project_id" : fields.many2one("project.project", "Project", domain=[("use_issues","=",True)])
+    }
+
+    _defaults = {
+        "lead_id" : lambda self, cr, uid, context=None: context.get('active_id')
     }
\ No newline at end of file
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 98b7255fcd1..6ef098644ac 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -1798,7 +1798,7 @@ class mail_thread(osv.AbstractModel):
         return sorted(threads, key=lambda x: (x['popularity'], x['id']), reverse=True)[:3]
 
 
-    def transform_model_messages(self, cr, uid, id, new_res_id, new_model, context=None):
+    def message_change_thread(self, cr, uid, id, new_res_id, new_model, context=None):
         """
         Transfert the list of the mail thread messages from an model to another
 
@@ -1806,24 +1806,26 @@ class mail_thread(osv.AbstractModel):
         :param new_res_id : the new res_id of the mail.message
         :param new_model : the name of the new model of the mail.message
 
-        Example :   self.pool.get("crm.lead").transform_model_messages(self, cr, uid, 2, 4, "project.issue", context) 
+        Example :   self.pool.get("crm.lead").message_change_thread(self, cr, uid, 2, 4, "project.issue", context) 
                     will transfert thread of the lead (id=2) to the issue (id=4)
         """
 
-        # get the message ids belonging to the thread to migrate
-        message_obj = self.pool.get('mail.message')
-        msg_ids = message_obj.search(cr, uid, [
-                    ('model', '=', self._name),
-                    ('res_id', '=', id)], context=context)
-        
+        # get the sbtype id of the comment Message
         subtype_res_id = self.pool.get('ir.model.data').xmlid_to_res_id(cr, uid, 'mail.mt_comment', raise_if_not_found=True)
         
+        # get the ids of the comment and none-comment of the thread
+        message_obj = self.pool.get('mail.message')
+        msg_ids_comment = message_obj.search(cr, uid, [
+                    ('model', '=', self._name),
+                    ('res_id', '=', id),
+                    ('subtype_id.id', '=', subtype_res_id)], context=context)
+        msg_ids_not_comment = message_obj.search(cr, uid, [
+                    ('model', '=', self._name),
+                    ('res_id', '=', id),
+                    ('subtype_id.id', '!=', subtype_res_id)], context=context)
+        
         # update the messages
-        for message in message_obj.browse(cr, uid, msg_ids, context=context):
-            if subtype_res_id == message.subtype_id.id:
-                # no change the subtype
-                message_obj.write(cr, uid, message.id, {"res_id" : new_res_id, "model" : new_model}, context=context)
-            else:
-                # modify the subtype
-                message_obj.write(cr, uid, message.id, {"res_id" : new_res_id, "model" : new_model, "subtype_id" : None}, context=context)
+        message_obj.write(cr, uid, msg_ids_comment, {"res_id" : new_res_id, "model" : new_model}, context=context)
+        message_obj.write(cr, uid, msg_ids_not_comment, {"res_id" : new_res_id, "model" : new_model, "subtype_id" : None}, context=context)
+        
         return True
\ No newline at end of file

From e799c682644a6a927880b5bfc9ec8ab657a8c0b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me?= <jem@openerp.com>
Date: Wed, 19 Feb 2014 12:12:51 +0100
Subject: [PATCH 6/7] [FIX] modified with the remarks of apr

bzr revid: jem@openerp.com-20140219111251-a06rz7uw83iodp4d
---
 addons/crm_project_issue/project_issue.py       | 17 ++++++++++++-----
 addons/crm_project_issue/project_issue_view.xml |  7 ++++---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/addons/crm_project_issue/project_issue.py b/addons/crm_project_issue/project_issue.py
index 93b47cbf24f..b541bcf2eea 100644
--- a/addons/crm_project_issue/project_issue.py
+++ b/addons/crm_project_issue/project_issue.py
@@ -9,16 +9,23 @@ class crm_lead_to_project_issue_wizard(osv.TransientModel):
         wizards = self.browse(cr, uid, ids, context=context)
         Lead = self.pool["crm.lead"]
         Issue = self.pool["project.issue"]
-
+        
         for wizard in wizards:
             # get the lead to transform
             lead = wizard.lead_id
+
+            partner = self._find_matching_partner(cr, uid, context=context)
+            if not partner and (lead.partner_name or lead.contact_name):
+                partner_ids = Lead.handle_partner_assignation(cr, uid, [lead.id], context=context)
+                partner = partner_ids[lead.id]
+        
             # create new project.issue
-            vals = {"name": lead.name, 
+            vals = {"name": lead.name,
                 "description": lead.description, 
                 "email_from": lead.email_from, 
-                "partner_id": lead.partner_id.id, 
-                "project_id": wizard.project_id.id
+                "project_id": wizard.project_id.id,
+                "partner_id" : partner,
+                "user_id" : None
             }
             issue_id = Issue.create(cr, uid, vals, context=None) 
             # move the mail thread
@@ -40,7 +47,7 @@ class crm_lead_to_project_issue_wizard(osv.TransientModel):
 
 
     _name = "crm.lead2projectissue.wizard"
-
+    _inherit = 'crm.partner.binding'
     _columns = {
         "lead_id" : fields.many2one("crm.lead","Lead", domain=[("type","=","lead")]),
         "project_id" : fields.many2one("project.project", "Project", domain=[("use_issues","=",True)])
diff --git a/addons/crm_project_issue/project_issue_view.xml b/addons/crm_project_issue/project_issue_view.xml
index 26932a8fe35..2b803fd58ab 100644
--- a/addons/crm_project_issue/project_issue_view.xml
+++ b/addons/crm_project_issue/project_issue_view.xml
@@ -20,8 +20,9 @@
                 <label for="project_id" />
                 <field name="project_id" />
                 <footer>
-                    <button type="special" special="cancel" string="Cancel" />
-                    <button type="object" name="action_lead_to_project_issue" string="Convert" />
+                    <button type="object" name="action_lead_to_project_issue" string="Create Issue" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
                 </footer>
             </form>
         </field>
@@ -33,7 +34,7 @@
         <field name="model">crm.lead</field>
         <field name="inherit_id" ref="crm.crm_case_form_view_leads" />
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='stage_id']" position="before">
+            <xpath expr="//div[@name='buttons']/button" position="after">
                     <button name="%(convert_lead2projectissue_wizard_action)d" string="Convert to Issue" type="action" help="Convert to Issue" />
             </xpath>
         </field>

From f664ff2ace0a9fa73379156d7f423a43b0bbe327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me?= <jem@openerp.com>
Date: Wed, 26 Feb 2014 17:45:21 +0100
Subject: [PATCH 7/7] [FIX] : tde's last remark correction

bzr revid: jem@openerp.com-20140226164521-gccablfi8b6e36qr
---
 addons/crm_project_issue/project_issue.py | 25 +++++++++++++----------
 addons/mail/mail_thread.py                |  2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/addons/crm_project_issue/project_issue.py b/addons/crm_project_issue/project_issue.py
index b541bcf2eea..02fc8320b62 100644
--- a/addons/crm_project_issue/project_issue.py
+++ b/addons/crm_project_issue/project_issue.py
@@ -1,9 +1,23 @@
 
 from openerp.osv import osv, fields
 
+
 class crm_lead_to_project_issue_wizard(osv.TransientModel):
     """ wizard to convert a Lead into a Project Issue and move the Mail Thread """
 
+    _name = "crm.lead2projectissue.wizard"
+
+    _inherit = 'crm.partner.binding'
+
+    _columns = {
+        "lead_id" : fields.many2one("crm.lead","Lead", domain=[("type","=","lead")]),
+        "project_id" : fields.many2one("project.project", "Project", domain=[("use_issues","=",True)])
+    }
+
+    _defaults = {
+        "lead_id" : lambda self, cr, uid, context=None: context.get('active_id')
+    }
+
     def action_lead_to_project_issue(self, cr, uid, ids, context=None):
         # get the wizards and models
         wizards = self.browse(cr, uid, ids, context=context)
@@ -45,14 +59,3 @@ class crm_lead_to_project_issue_wizard(osv.TransientModel):
             'context' : context
         }
 
-
-    _name = "crm.lead2projectissue.wizard"
-    _inherit = 'crm.partner.binding'
-    _columns = {
-        "lead_id" : fields.many2one("crm.lead","Lead", domain=[("type","=","lead")]),
-        "project_id" : fields.many2one("project.project", "Project", domain=[("use_issues","=",True)])
-    }
-
-    _defaults = {
-        "lead_id" : lambda self, cr, uid, context=None: context.get('active_id')
-    }
\ No newline at end of file
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 6ef098644ac..fed5216470f 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -1822,7 +1822,7 @@ class mail_thread(osv.AbstractModel):
         msg_ids_not_comment = message_obj.search(cr, uid, [
                     ('model', '=', self._name),
                     ('res_id', '=', id),
-                    ('subtype_id.id', '!=', subtype_res_id)], context=context)
+                    ('subtype_id', '!=', subtype_res_id)], context=context)
         
         # update the messages
         message_obj.write(cr, uid, msg_ids_comment, {"res_id" : new_res_id, "model" : new_model}, context=context)