diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
index 32551d438c4..38d0a10b4e8 100644
--- a/addons/crm/crm_installer.py
+++ b/addons/crm/crm_installer.py
@@ -37,6 +37,7 @@ class crm_installer(osv.osv_memory):
         'thunderbird': fields.boolean('Thunderbird', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
         'outlook': fields.boolean('MS-Outlook', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
         'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application."),
+        'crm_todo': fields.boolean('CRM TODO', help=" add a todo list in your Opportunities form."),
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 35ff5a0a7cc..eb17934972f 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -32,6 +32,7 @@
                   <field name="crm_fundraising" />
                   <field name="wiki_sale_faq"/>
                     <field name="sale_crm" invisible="1"/>
+                    <field name="crm_todo"/>
             </group>
             <group colspan="2" col="2">
                 <separator string="Synchronization" colspan="4" />
diff --git a/addons/crm_todo/__openerp__.py b/addons/crm_todo/__openerp__.py
index e3a609124d4..709005b2cff 100644
--- a/addons/crm_todo/__openerp__.py
+++ b/addons/crm_todo/__openerp__.py
@@ -29,7 +29,7 @@
     """,
     'author': 'OpenERP SA',
     #'images': ['images/project_gtd.jpeg'],
-    'depends': ['crm'],
+    'depends': ['crm','project_gtd'],
     'init_xml': [],
     'update_xml': [
         #'project_todo_view.xml',
diff --git a/addons/crm_todo/crm_todo.py b/addons/crm_todo/crm_todo.py
index ae186e5ba55..45caf957db2 100644
--- a/addons/crm_todo/crm_todo.py
+++ b/addons/crm_todo/crm_todo.py
@@ -26,10 +26,11 @@ import tools
 from tools.translate import _
 
 class crm_todo(osv.osv):
-    _name ="crm.todo"
+    """_name = 'crm.todo'"""
     _description = "TODO"
+    _inherit = 'crm.lead'
     _columns = {
-        'todo_ids': fields.one2many('project.gtd.timebox', 'name', 'TODO'),
+        'todo_ids': fields.one2many('project.gtd.timebox', 'todo_id', 'TODO'),
     }
 crm_todo()
 
diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml
index e7e3d3dda99..4e8272fadf3 100644
--- a/addons/crm_todo/crm_todo_view.xml
+++ b/addons/crm_todo/crm_todo_view.xml
@@ -4,7 +4,7 @@
 
     <record model="ir.ui.view" id="crm_todo_form">
         <field name="name">crm.todo.form</field>
-        <field name="model">crm.todo</field>
+        <field name="model">crm.lead</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Category of ideas">
@@ -15,11 +15,25 @@
 
     <record model="ir.actions.act_window" id="crm_todo_action">
         <field name="name">CRM TODO</field>
-        <field name="res_model">crm.todo</field>
+        <field name="res_model">crm.lead</field>
         <field name="view_type">form</field>
         <field name="view_mode">form</field>
     </record>
-
+	<record id="crm_todo_opportunity_add" model="ir.ui.view">
+          <field name="name">TODO</field>
+          <field name="model">crm.lead</field>
+          <field name="type">form</field>
+          <field name="inherit_id" ref="crm.crm_case_form_view_oppor" />
+          <field name="arch" type="xml">
+            <data>
+            <xpath expr="/form/group/field[@name = 'message_ids']" position="after">
+               		<field name="todo_ids" colspan="4" nolabel="1"/>
+             
+            </xpath>
+            
+            </data>
+          </field>
+        </record>
     <menuitem name="TODOs" id="menu_crm_todo" parent="base.menu_sales" action="crm_todo_action"/>
     </data>
 </openerp>
diff --git a/addons/project/installer.py b/addons/project/installer.py
index 693e2d58018..a06e897d9d4 100644
--- a/addons/project/installer.py
+++ b/addons/project/installer.py
@@ -46,6 +46,7 @@ class project_installer(osv.osv_memory):
                  "in the SCRUM methodology."),
         'project_gtd': fields.boolean('Getting Things Done',
             help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
+        'project_todo': fields.boolean('Project TODO', help=" add a todo list in your Opportunities form."),
     }
 project_installer()
 
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 32b235e4691..f3d6ce2b762 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -33,6 +33,7 @@
             <separator string="Methodologies" colspan="4"/>
             <field name="project_scrum"/>
             <field name="project_gtd"/>
+            <field name="project_todo"/>
           </group>
         </data>
       </field>
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index 7d2b355afc1..1503b53f734 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -47,6 +47,7 @@ class project_gtd_timebox(osv.osv):
         'name': fields.char('Timebox', size=64, required=True, select=1, translate=1),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of timebox."),
         'icon': fields.selection(tools.icons, 'Icon', size=64),
+        'todo_id': fields.many2one('crm.lead','TODO'),
     }
 
 project_gtd_timebox()
diff --git a/addons/project_todo/project_todo_demo.xml b/addons/project_todo/project_todo_demo.xml
index 05be9a0eee8..971642bcf1b 100644
--- a/addons/project_todo/project_todo_demo.xml
+++ b/addons/project_todo/project_todo_demo.xml
@@ -6,6 +6,5 @@
             <field name="name">TODO</field>
             <field name="icon">terp-check</field>
         </record>
-
     </data>
 </openerp>