From 5b6285ba7abcc54b2baeb42894d81a1bc29e0adb Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Tue, 19 Jul 2011 14:05:17 +0530
Subject: [PATCH 1/8] [IMP]:new module added project_todo and cem_todo

bzr revid: han@tinyerp.com-20110719083517-f1zxuh9jr6q88uvo
---
 addons/crm/crm_lead_view.xml                  |  4 +-
 addons/crm/crm_opportunity_view.xml           | 12 +--
 addons/crm_todo/__init__.py                   | 23 ++++++
 addons/crm_todo/__openerp__.py                | 48 +++++++++++
 addons/crm_todo/crm_todo.py                   | 39 +++++++++
 addons/crm_todo/crm_todo_demo.xml             | 11 +++
 addons/crm_todo/crm_todo_view.xml             | 25 ++++++
 addons/crm_todo/project_todo_view.xml         | 81 +++++++++++++++++++
 addons/mail_gateway/mail_gateway.py           | 24 +++---
 addons/project_gtd/project_gtd.py             |  2 +-
 addons/project_todo/__init__.py               | 23 ++++++
 addons/project_todo/__openerp__.py            | 48 +++++++++++
 addons/project_todo/project_todo.py           | 46 +++++++++++
 addons/project_todo/project_todo_demo.xml     | 11 +++
 addons/project_todo/project_todo_gtd_view.xml | 58 +++++++++++++
 addons/project_todo/project_todo_view.xml     | 81 +++++++++++++++++++
 16 files changed, 515 insertions(+), 21 deletions(-)
 create mode 100644 addons/crm_todo/__init__.py
 create mode 100644 addons/crm_todo/__openerp__.py
 create mode 100644 addons/crm_todo/crm_todo.py
 create mode 100644 addons/crm_todo/crm_todo_demo.xml
 create mode 100644 addons/crm_todo/crm_todo_view.xml
 create mode 100644 addons/crm_todo/project_todo_view.xml
 create mode 100644 addons/project_todo/__init__.py
 create mode 100644 addons/project_todo/__openerp__.py
 create mode 100644 addons/project_todo/project_todo.py
 create mode 100644 addons/project_todo/project_todo_demo.xml
 create mode 100644 addons/project_todo/project_todo_gtd_view.xml
 create mode 100644 addons/project_todo/project_todo_view.xml

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 55be89c2252..b5ebf4e1cbe 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -183,7 +183,7 @@
                        <field colspan="4" name="email_cc" widget="char" size="512"/>
                    </group>
                     <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-                        <tree string="History">
+                        <tree string="Notes">
                             <field name="display_text" string="History Information"/>
                             <field name="history" invisible="1"/>
                             <button
@@ -215,7 +215,7 @@
 
                                     </page>
                                     <page string="Attachments">
-                                        <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+                                        <field name="attachment_ids" colspan="4" nolabel="1"/>
                                     </page>
                                     </notebook>
                                 </form>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index b49edb850da..9fc8774649a 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -137,11 +137,8 @@
                         </page>
 
                         <page string="Communication &amp; History" groups="base.group_extended">
-                            <group colspan="4">
-                                <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
-                            </group>
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-                                <tree string="History">
+                                <tree string="Note">
                                     <field name="display_text" string="History Information"/>
                                     <field name="history" invisible="1"/>
                                     <button
@@ -150,7 +147,7 @@
                                         context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
                                         icon="terp-mail-replied" type="action" />
                                 </tree>
-                                <form string="History">
+                                <form string="Note">
                                     <group col="4" colspan="4">
                                         <field name="email_from"/>
                                         <field name="date"/>
@@ -174,7 +171,7 @@
 
                                         </page>
                                         <page string="Attachments">
-                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+                                            <field name="attachment_ids" colspan="4" nolabel="1"/>
                                         </page>
                                     </notebook>
                                 </form>
@@ -208,6 +205,9 @@
                             <field name="ref2"/>
                         </page>
                         </notebook>
+                        <group colspan="4">
+                            <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
+                        </group>
                     </form>
                 </field>
             </record>
diff --git a/addons/crm_todo/__init__.py b/addons/crm_todo/__init__.py
new file mode 100644
index 00000000000..348eae998b4
--- /dev/null
+++ b/addons/crm_todo/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+import crm_todo
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm_todo/__openerp__.py b/addons/crm_todo/__openerp__.py
new file mode 100644
index 00000000000..e3a609124d4
--- /dev/null
+++ b/addons/crm_todo/__openerp__.py
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'TODO - Customer Relationship Management',
+    'version': '1.0',
+    'category': 'Sales',
+    'description': """
+
+    """,
+    'author': 'OpenERP SA',
+    #'images': ['images/project_gtd.jpeg'],
+    'depends': ['crm'],
+    'init_xml': [],
+    'update_xml': [
+        #'project_todo_view.xml',
+        'crm_todo_view.xml',
+        #'project_todo_demo.xml',
+        
+    ],
+    'demo_xml': [ ],
+    'test':[
+    
+    ],
+    'installable': True,
+    'active': False,
+    #'certificate': '0043525236301',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_todo/crm_todo.py b/addons/crm_todo/crm_todo.py
new file mode 100644
index 00000000000..ae186e5ba55
--- /dev/null
+++ b/addons/crm_todo/crm_todo.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import sys
+
+from osv import fields, osv
+import tools
+from tools.translate import _
+
+class crm_todo(osv.osv):
+    _name ="crm.todo"
+    _description = "TODO"
+    _columns = {
+        'todo_ids': fields.one2many('project.gtd.timebox', 'name', 'TODO'),
+    }
+crm_todo()
+
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_todo/crm_todo_demo.xml b/addons/crm_todo/crm_todo_demo.xml
new file mode 100644
index 00000000000..05be9a0eee8
--- /dev/null
+++ b/addons/crm_todo/crm_todo_demo.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+
+        <record model="project.gtd.timebox" id="timebox_todo">
+            <field name="name">TODO</field>
+            <field name="icon">terp-check</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml
new file mode 100644
index 00000000000..e7e3d3dda99
--- /dev/null
+++ b/addons/crm_todo/crm_todo_view.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+
+    <record model="ir.ui.view" id="crm_todo_form">
+        <field name="name">crm.todo.form</field>
+        <field name="model">crm.todo</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Category of ideas">
+                <field name="todo_ids" nolabel="1"/>
+            </form>
+        </field>
+    </record>
+
+    <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="view_type">form</field>
+        <field name="view_mode">form</field>
+    </record>
+
+    <menuitem name="TODOs" id="menu_crm_todo" parent="base.menu_sales" action="crm_todo_action"/>
+    </data>
+</openerp>
diff --git a/addons/crm_todo/project_todo_view.xml b/addons/crm_todo/project_todo_view.xml
new file mode 100644
index 00000000000..57842bc72ee
--- /dev/null
+++ b/addons/crm_todo/project_todo_view.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="project_todo_form">
+            <field name="name">project.todo.form</field>
+            <field name="model">project.todo</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="TODO">
+                    <field name="name"/>
+                    <field name="sequence"/>
+                    <field name="icon"/>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="project_todo_tree">
+            <field name="name">project.todo.tree</field>
+            <field name="model">project.todo</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="TODO">
+                    <field name="name"/>
+                    <field name="sequence" invisible="1"/>
+                    <field name="icon"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="project_todo_search" model="ir.ui.view">
+            <field name="name">project.todo.search</field>
+            <field name="model">project.todo</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+            <search string="TODO">
+                    
+            </search>
+            </field>
+        </record>
+        
+        <!--<record id="action_view_project_todo" model="ir.actions.act_window">
+            <field name="name">Project TODO</field>
+            <field name="res_model">project.todo</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>-->
+
+        <record model="ir.actions.act_window" id="open_project_todo_tree">
+            <field name="name">Title</field>
+            <field name="res_model">project.todo</field>
+            <field name="help">Contexts are defined in the "Getting Things Done" methodology. It allows you to categorize your tasks according to the context in which they have to be done: at the office, at home, when I take my car, etc.</field>
+        </record>
+
+        <menuitem name="TODO" id="menu_open_todo" parent="project.menu_tasks_config" action="open_project_todo_tree"/>
+    
+        <record model="ir.ui.view" id="project_todo_task_tree">
+            <field name="name">project.task.todo</field>
+            <field name="model">project.task</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="project.view_task_tree2" />
+            <field name="arch" type="xml">
+            <field name="remaining_hours" position="before">
+                <field string="TODO" name="todo_id"/>
+            </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="project_todo_task">
+            <field name="name">project.todo.form</field>
+            <field name="model">project.task</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.view_task_form2" />
+            <field name="arch" type="xml">
+            <field name="progress" position="before">
+                <field name="todo_id" widget="selection"/>
+            </field>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index c67a2668192..f0af0800962 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -264,24 +264,24 @@ class mailgate_message(osv.osv):
     _description = 'Mailgateway Message'
     _order = 'date desc'
     _columns = {
-        'name':fields.text('Subject', readonly=True),
+        'name':fields.text('Subject'),
         'model': fields.char('Object Name', size=128, select=1, readonly=True),
         'res_id': fields.integer('Resource ID', select=1, readonly=True),
         'ref_id': fields.char('Reference Id', size=256, readonly=True, help="Message Id in Email Server.", select=True),
-        'date': fields.datetime('Date', readonly=True),
+        'date': fields.datetime('Date'),
         'history': fields.boolean('Is History?', readonly=True),
-        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
+        'user_id': fields.many2one('res.users', 'User Responsible'),
         'message': fields.text('Message', readonly=True),
-        'email_from': fields.char('From', size=128, help="Email From", readonly=True),
-        'email_to': fields.char('To', help="Email Recipients", size=256, readonly=True),
-        'email_cc': fields.char('Cc', help="Carbon Copy Email Recipients", size=256, readonly=True),
-        'email_bcc': fields.char('Bcc', help='Blind Carbon Copy Email Recipients', size=256, readonly=True),
-        'message_id': fields.char('Message Id', size=1024, readonly=True, help="Message Id on Email.", select=True),
-        'references': fields.text('References', readonly=True, help="References emails."),
-        'description': fields.text('Description', readonly=True),
+        'email_from': fields.char('From', size=128, help="Email From"),
+        'email_to': fields.char('To', help="Email Recipients", size=256),
+        'email_cc': fields.char('Cc', help="Carbon Copy Email Recipients", size=256),
+        'email_bcc': fields.char('Bcc', help='Blind Carbon Copy Email Recipients', size=256),
+        'message_id': fields.char('Message Id', size=1024, help="Message Id on Email.", select=True),
+        'references': fields.text('References', help="References emails."),
+        'description': fields.text('Description'),
         'partner_id': fields.many2one('res.partner', 'Partner', required=False),
-        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments', readonly=True),
-        'display_text': fields.function(_get_display_text, method=True, type='text', size="512", string='Display Text'),
+        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
+        'display_text': fields.function(_get_display_text, method=True, type='text', size="512", string='Notes'),
     }
 
     def init(self, cr):
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index a3c9d48476b..7d2b355afc1 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -108,7 +108,7 @@ class project_task(osv.osv):
         if (res['type'] == 'search') and access_pool.check_groups(cr, uid, "project_gtd.group_project_getting"):
             tt = timebox_obj.browse(cr, uid, timebox_obj.search(cr,uid,[]), context=context)
             search_extended ='''<newline/><group col="%d" expand="%d" string="%s">''' % (len(tt)+7,1,_('Getting Things Done'))
-            search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" help="Undefined Timebox" string="%s"/>''' % (_('Inbox'),)
+            search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" help="Undefined Timebox" string="%s" />''' % (_('Inbox'),)
             search_extended += '''<filter context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" help="Getting things done" string="%s"/>''' % (_('GTD'),)
             search_extended += '''<separator orientation="vertical"/>'''
             for time in tt:
diff --git a/addons/project_todo/__init__.py b/addons/project_todo/__init__.py
new file mode 100644
index 00000000000..60b603fbbc6
--- /dev/null
+++ b/addons/project_todo/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+#import project_todo
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_todo/__openerp__.py b/addons/project_todo/__openerp__.py
new file mode 100644
index 00000000000..9d05c84c3d2
--- /dev/null
+++ b/addons/project_todo/__openerp__.py
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'TODO - Project Management Module',
+    'version': '1.0',
+    'category': 'Project Management',
+    'description': """
+
+    """,
+    'author': 'OpenERP SA',
+    #'images': ['images/project_gtd.jpeg'],
+    'depends': ['project','project_gtd'],
+    'init_xml': [],
+    'update_xml': [
+        #'project_todo_view.xml',
+        'project_todo_gtd_view.xml',
+        #'project_todo_demo.xml',
+        
+    ],
+    'demo_xml': ['project_todo_demo.xml',],
+    'test':[
+    
+    ],
+    'installable': True,
+    'active': False,
+    #'certificate': '0043525236301',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_todo/project_todo.py b/addons/project_todo/project_todo.py
new file mode 100644
index 00000000000..62e9379fada
--- /dev/null
+++ b/addons/project_todo/project_todo.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import sys
+
+from osv import fields, osv
+import tools
+from tools.translate import _
+
+class project_gtd_timebox(osv.osv):
+    _inherit = "project.gtd.timebox"
+    _description = "TODO"
+    _columns = {
+        'name': fields.char('Title', size=128, required=True, select=1, translate=1),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of contexts."),
+        'icon': fields.selection(tools.icons, 'Icon', size=64),
+    }
+    _defaults = {
+        'sequence': 1
+    }
+    _order = "sequence, name"
+
+project_gtd_timebox()
+
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_todo/project_todo_demo.xml b/addons/project_todo/project_todo_demo.xml
new file mode 100644
index 00000000000..05be9a0eee8
--- /dev/null
+++ b/addons/project_todo/project_todo_demo.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+
+        <record model="project.gtd.timebox" id="timebox_todo">
+            <field name="name">TODO</field>
+            <field name="icon">terp-check</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/project_todo/project_todo_gtd_view.xml b/addons/project_todo/project_todo_gtd_view.xml
new file mode 100644
index 00000000000..9a290675b13
--- /dev/null
+++ b/addons/project_todo/project_todo_gtd_view.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+
+    <record model="ir.ui.view" id="project_task_todo_tree">
+        <field name="name">project.task.tree.timebox</field>
+        <field name="model">project.task</field>
+        <field name="type">tree</field>
+        <field name="inherit_id" ref="project.view_task_tree2" />
+        <field name="arch" type="xml">
+            <field name="remaining_hours" position="after">
+            
+            </field>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="project_task_todo_form">
+        <field name="name">project.task.form.timebox</field>
+        <field name="model">project.task</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="project.view_task_form2" />
+        <field name="arch" type="xml">
+            <field name="progress" position="after">
+           
+            </field>
+        </field>
+    </record>
+
+    <record id="view_task_search_todo" model="ir.ui.view">
+            <field name="name">project.task.search.todo</field>
+            <field name="model">project.task</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+               <search string="Task Edition">
+                    <group col="20" colspan="4">
+                        <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft and In Progress tasks" icon="terp-check"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
+                        <separator orientation="vertical"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+    <record model="ir.actions.act_window" id="open_todo_timebox_tree">
+        <field name="name">TODO</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">project.task</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="project_task_todo_tree"/>
+        <field name="search_view_id" ref="view_task_search_todo"/>
+        <field name="context">{"search_default_todo":1,'group_by_no_leaf':1}</field>
+        <field name="help">Timeboxes are defined in the "Getting Things Done" methodology. A timebox defines a period of time in order to categorize your tasks: today, this week, this month, long term.</field>
+    </record>
+
+    <menuitem name="TODO" id="menu_open_todo_time_timeboxes" parent="project.menu_project_management" action="open_todo_timebox_tree"/>
+    </data>
+</openerp>
diff --git a/addons/project_todo/project_todo_view.xml b/addons/project_todo/project_todo_view.xml
new file mode 100644
index 00000000000..57842bc72ee
--- /dev/null
+++ b/addons/project_todo/project_todo_view.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="project_todo_form">
+            <field name="name">project.todo.form</field>
+            <field name="model">project.todo</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="TODO">
+                    <field name="name"/>
+                    <field name="sequence"/>
+                    <field name="icon"/>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="project_todo_tree">
+            <field name="name">project.todo.tree</field>
+            <field name="model">project.todo</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="TODO">
+                    <field name="name"/>
+                    <field name="sequence" invisible="1"/>
+                    <field name="icon"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="project_todo_search" model="ir.ui.view">
+            <field name="name">project.todo.search</field>
+            <field name="model">project.todo</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+            <search string="TODO">
+                    
+            </search>
+            </field>
+        </record>
+        
+        <!--<record id="action_view_project_todo" model="ir.actions.act_window">
+            <field name="name">Project TODO</field>
+            <field name="res_model">project.todo</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>-->
+
+        <record model="ir.actions.act_window" id="open_project_todo_tree">
+            <field name="name">Title</field>
+            <field name="res_model">project.todo</field>
+            <field name="help">Contexts are defined in the "Getting Things Done" methodology. It allows you to categorize your tasks according to the context in which they have to be done: at the office, at home, when I take my car, etc.</field>
+        </record>
+
+        <menuitem name="TODO" id="menu_open_todo" parent="project.menu_tasks_config" action="open_project_todo_tree"/>
+    
+        <record model="ir.ui.view" id="project_todo_task_tree">
+            <field name="name">project.task.todo</field>
+            <field name="model">project.task</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="project.view_task_tree2" />
+            <field name="arch" type="xml">
+            <field name="remaining_hours" position="before">
+                <field string="TODO" name="todo_id"/>
+            </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="project_todo_task">
+            <field name="name">project.todo.form</field>
+            <field name="model">project.task</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.view_task_form2" />
+            <field name="arch" type="xml">
+            <field name="progress" position="before">
+                <field name="todo_id" widget="selection"/>
+            </field>
+            </field>
+        </record>
+    </data>
+</openerp>

From 2196d2771613f106a282a2b53cfde01f868ec13c Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Tue, 26 Jul 2011 12:55:52 +0530
Subject: [PATCH 2/8] [IMP]: confliction solved

bzr revid: han@tinyerp.com-20110726072552-fmu0a40ohew417qf
---
 addons/mail_gateway/mail_gateway_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index d05bfbc0d91..6b36b87b545 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -12,7 +12,7 @@
             <field name="arch" type="xml">
              <form string="mailgate message">
                     <group colspan="4" col="6">
-                        <field name="name" string="Subject" required="1" select="1"  widget="char" size="512"/>
+                        <field name="name" string="Subject" select="1"  widget="char" size="512"/>
                         <field name="date" required="1" select="1"/>
                         <field name="user_id" string="Owner" select="1"/>
                         <field name="partner_id" readonly="1" />

From 06af6ca94e0a3a64d04dafc486105421bb327159 Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Tue, 26 Jul 2011 12:58:29 +0530
Subject: [PATCH 3/8] [IMP]: confliction solved

bzr revid: han@tinyerp.com-20110726072829-z8ysp919hoicl8b6
---
 addons/mail_gateway/mail_gateway_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 6b36b87b545..b78acc737d7 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -13,7 +13,7 @@
              <form string="mailgate message">
                     <group colspan="4" col="6">
                         <field name="name" string="Subject" select="1"  widget="char" size="512"/>
-                        <field name="date" required="1" select="1"/>
+                        <field name="date" select="1"/>
                         <field name="user_id" string="Owner" select="1"/>
                         <field name="partner_id" readonly="1" />
                     </group>

From 8cb2df39c867f34b14e80e8d7a47d08e541e7bec Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Fri, 5 Aug 2011 18:10:01 +0530
Subject: [PATCH 4/8] [IMP]

bzr revid: han@tinyerp.com-20110805124001-eekluj7lsllns6l4
---
 addons/crm/crm_opportunity_view.xml | 66 ++++++++++++++---------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 9fc8774649a..0c8225c9aa1 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -57,13 +57,6 @@
                                     string="Contact"
                                     on_change="onchange_partner_address_id(partner_address_id, email_from)"
                                     colspan="1" />
-                                <group col="3" colspan="2">
-                                    <field name="email_from" string="Email" />
-                                    <button string="Send Email"
-                                    name="%(crm.action_crm_send_mail)d"
-                                    context="{'mail':'new', 'model': 'crm.lead'}"
-                                    icon="terp-mail-message-new" type="action" />
-                                </group>
                                     <field name="phone"/>
 
                             </group>
@@ -135,10 +128,40 @@
                         		<field name="optout" on_change="on_change_optout(optout)"/>
                             </group>
                         </page>
-
-                        <page string="Communication &amp; History" groups="base.group_extended">
+                        <page string="Extra Info" groups="base.group_extended">
+                            <group col="2" colspan="2">
+                                <separator string="Dates" colspan="2"/>
+                                <field name="create_date"/>
+                                <field name="write_date"/>
+                                <field name="date_closed"/>
+                                <field name="date_open"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator string="Misc" colspan="2"/>
+                                <field name="active"/>
+                                <field name="day_open"/>
+                                <field name="day_close"/>
+                                <field name="referred"/>
+                            </group>
+                            <separator colspan="4" string="References"/>
+                            <field name="ref"/>
+                            <field name="ref2"/>
+                        </page>
+                        </notebook>
+                        <group colspan="4">
+                            <group col="3" colspan="2">
+                                <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
+                            </group>
+                            <newline/>
+                            <group col="3" colspan="2">
+                                    <field name="email_from" string="Email" />
+                                    <button string="Send Email"
+                                    name="%(crm.action_crm_send_mail)d"
+                                    context="{'mail':'new', 'model': 'crm.lead'}"
+                                    icon="terp-mail-message-new" type="action" />
+                             </group>
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-                                <tree string="Note">
+                            <tree string="Note">
                                     <field name="display_text" string="History Information"/>
                                     <field name="history" invisible="1"/>
                                     <button
@@ -184,29 +207,6 @@
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'crm.lead'}"
                                 icon="terp-mail-message-new" type="action" />
-                        </page>
-                        <page string="Extra Info" groups="base.group_extended">
-                            <group col="2" colspan="2">
-                                <separator string="Dates" colspan="2"/>
-                                <field name="create_date"/>
-                                <field name="write_date"/>
-                                <field name="date_closed"/>
-                                <field name="date_open"/>
-                            </group>
-                            <group col="2" colspan="2">
-                                <separator string="Misc" colspan="2"/>
-                                <field name="active"/>
-                                <field name="day_open"/>
-                                <field name="day_close"/>
-                                <field name="referred"/>
-                            </group>
-                            <separator colspan="4" string="References"/>
-                            <field name="ref"/>
-                            <field name="ref2"/>
-                        </page>
-                        </notebook>
-                        <group colspan="4">
-                            <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
                         </group>
                     </form>
                 </field>

From 544bb8472561973166520f7eff93651d49a78d40 Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Wed, 17 Aug 2011 12:34:20 +0530
Subject: [PATCH 5/8] [IMP]: added crm_todo module

bzr revid: han@tinyerp.com-20110817070420-shuzw3bks0i28bm9
---
 addons/crm/crm_installer.py               |  1 +
 addons/crm/crm_installer_view.xml         |  1 +
 addons/crm_todo/__openerp__.py            |  2 +-
 addons/crm_todo/crm_todo.py               |  5 +++--
 addons/crm_todo/crm_todo_view.xml         | 20 +++++++++++++++++---
 addons/project/installer.py               |  1 +
 addons/project/project_installer.xml      |  1 +
 addons/project_gtd/project_gtd.py         |  1 +
 addons/project_todo/project_todo_demo.xml |  1 -
 9 files changed, 26 insertions(+), 7 deletions(-)

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>

From 8ae9536d75bfce5d9710a20a701d88024426b32e Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Mon, 29 Aug 2011 11:17:15 +0530
Subject: [PATCH 6/8] [IMP] remove confliction

bzr revid: han@tinyerp.com-20110829054715-pics8t7v7t9xyb01
---
 addons/crm/crm_installer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
index 38d0a10b4e8..1c4706a10d9 100644
--- a/addons/crm/crm_installer.py
+++ b/addons/crm/crm_installer.py
@@ -37,7 +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."),
+        'crm_todo': fields.boolean('CRM TODO', help=" add a crm 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):

From 875ecfcad9f380843441b02868153c20a670f3b5 Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Mon, 29 Aug 2011 11:40:51 +0530
Subject: [PATCH 7/8] [IMP] improved crm and project todo

bzr revid: han@tinyerp.com-20110829061051-jtympazkidl8s8xy
---
 addons/project/installer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/installer.py b/addons/project/installer.py
index a06e897d9d4..28a44e918b7 100644
--- a/addons/project/installer.py
+++ b/addons/project/installer.py
@@ -46,7 +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_todo': fields.boolean('Project TODO', help=" add a project todo list in your Opportunities form."),
     }
 project_installer()
 

From 6eb0ddca6e4e24471b482065ec9850f213e633a0 Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Mon, 29 Aug 2011 12:23:46 +0530
Subject: [PATCH 8/8] [IMP] confliction soved from project todo

bzr revid: han@tinyerp.com-20110829065346-mpz8hmh122dvcjqb
---
 addons/project/project_installer.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 32e162b8ed6..6349ea72340 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -10,13 +10,12 @@
           <data>
           <xpath expr="//group[@name='project']" position="replace">
             <newline/>
-<<<<<<< TREE
+            <group>
             <separator string="Methodologies" colspan="4"/>
             <field name="project_scrum"/>
             <field name="project_gtd"/>
             <field name="project_todo"/>
           </group>
-=======
             <separator  string="Project Management Features" colspan="4" />
             <field name="project_issue" />
             <field name="project_long_term" />
@@ -26,7 +25,6 @@
             <field name="project_scrum" />
             <field name="project_gtd" />
           </xpath>
->>>>>>> MERGE-SOURCE
         </data>
       </field>
     </record>