From e1ec62f4283ace126febfae482d9c4f0ce7062e0 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 20 May 2010 11:45:25 +0530
Subject: [PATCH] [IMP]: crm: Improvement in meeting, phonecall for
 _inherits(mailgate thread)

bzr revid: rpa@tinyerp.com-20100520061525-d390dgd29z21br8t
---
 addons/crm/crm_meeting.py       |  4 +++-
 addons/crm/crm_meeting_view.xml | 10 +++++-----
 addons/crm/crm_phonecall.py     |  3 ++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 1582c61491c..633558334b7 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -43,7 +43,8 @@ class crm_meeting(osv.osv, crm_case):
     _name = 'crm.meeting'
     _description = "Meeting Cases"
     _order = "id desc"
-    _inherit = ["mailgate.thread", "calendar.event"]
+    _inherit = ["calendar.event"]
+    _inherits = {'mailgate.thread': 'thread_id'}
 
     _columns = {
         # From crm.case
@@ -58,6 +59,7 @@ class crm_meeting(osv.osv, crm_case):
         'id': fields.integer('ID'),
 
         # Meeting fields
+        'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
         'categ_id': fields.many2one('crm.case.categ', 'Meeting Type', \
                         domain="[('object_id.model', '=', 'crm.meeting')]", \
             ),
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 70461fc8eb3..894fdbb6207 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -24,15 +24,15 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Meetings">
-               	<group col="6" colspan="4">
+                <group col="6" colspan="4">
                     <field name="name" select="1" string="Summary"
-                        colspan="2" />
+                    	required="1" colspan="2" />
                     <field name="categ_id" widget="selection"
                         string="Meeting Type"
                         groups="base.group_extended"
                         domain="[('object_id.model', '=', 'crm.meeting')]" />
-					<field name="allday" colspan="2" on_change="onchange_allday(allday)" />
-					<field name="date" string="Start Date" required="1"
+                    <field name="allday" colspan="2" on_change="onchange_allday(allday)" />
+                    <field name="date" string="Start Date" required="1"
                         on_change="onchange_dates(date,duration,False,allday)" />
                     <field name="duration" widget="float_time"
                         on_change="onchange_dates(date,duration,False,allday)" />
@@ -327,7 +327,7 @@
                     </field>
                 </field>
         </record>
-        
+
         <!--  Partners inherited form -->
 
 		<record id="view_meeting_partner_info_form" model="ir.ui.view">
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 4644f129c87..7a6c728789c 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -31,12 +31,13 @@ class crm_phonecall(osv.osv, crm_case):
     _name = "crm.phonecall"
     _description = "Phonecall Cases"
     _order = "id desc"
-    _inherit = 'mailgate.thread'
+    _inherits = {'mailgate.thread': 'thread_id'}
 
     _columns = {
         # From crm.case
         'name': fields.char('Name', size=64),
         'active': fields.boolean('Active', required=False), 
+        'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
                         select=True, help='Sales team to which Case belongs to.\
                              Define Responsible user and Email account for mail gateway.'),