diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 2260a9f0965..dfa2a9b7009 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -139,8 +139,8 @@ and users by email"),
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('res_model','=',_name)]),
-        'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('res_model','=',_name)]),
+        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('model','=',_name)]),
+        'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)]),
     }
 
     _defaults = {
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index c33339047d8..9fe9b8e6170 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -256,12 +256,11 @@
         <field name="type">calendar</field>
         <field name="priority" eval="2"/>
         <field name="arch" type="xml">
-            <calendar string="Meeting For Leads Generation"
-                date_start="create_date" color="user_id"
-                date_delay="duration">
+            <calendar string="Leads Generation"
+                date_start="create_date" color="user_id">
                 <field name="name" />
                 <field name="partner_name" />
-                <field name="partner_contact" />
+                <field name="partner_address_id" />
             </calendar>
         </field>
     </record>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 34bdafe1c58..5d1bb3f29d7 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -148,6 +148,7 @@
                         <button string="Invite People"
                             name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
                             icon="terp-partner" type="action"
+                            attrs="{'readonly': [('state', '=', 'done')]}"
                             context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
                         <field name="attendee_ids" colspan="4"
                             nolabel="1" widget="one2many" mode="tree,form">
@@ -214,10 +215,27 @@
             <tree string="Meetings"
                 colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="name" string="Subject" />
-                <field name="partner_id" string="Partner" />
-                <field name="date" string="Meeting Date" />
+                <field name="date" string="Start Date" />
                 <field name="duration" />
+                <field name="partner_id" string="Partner" />
+                <field name="location" />
+                <field name="categ_id" string="Meeting Type"/>
+                <field name="class" string="Privacy"/>
                 <field name="state"/>
+                <field name="user_id" invisible="1"/>
+                <field name="show_as" invisible="1" string="Show time as"/>
+                <button name="case_reset" string="Reset to Unconfirmed"
+                   states="open,done,cancel" type="object"
+                   icon="gtk-convert" />
+                <button name="case_open" string="Confirm"
+                   states="draft" type="object"
+                   icon="gtk-go-forward" />
+                <button name="case_close" string="Done"
+                            states="open" type="object"
+                            icon="gtk-jump-to" />
+                <button name="case_cancel" string="Cancel"
+                   states="draft,open" type="object"
+                   icon="gtk-cancel" />
             </tree>
         </field>
     </record>
@@ -268,6 +286,10 @@
                                 help="Current Meetings"/>
                            <separator orientation="vertical"/>
                            <field name="name" select="1" string="Subject"/>
+                           <field name="categ_id" select="1"
+                           	string="Meeting Type" widget="selection"
+                           	domain="[('object_id.model', '=', 'crm.meeting')]" />
+                           <separator orientation="vertical"/>
                            <field name="partner_id" select="1" />
                            <field name="section_id" select="1" widget="selection">
                                <filter icon="terp-personal+"
@@ -282,16 +304,26 @@
                                 domain="[]" context="{'group_by':'date'}" />
                             <filter string="Privacy" icon="terp-locked"
                                 domain="[]" context="{'group_by':'class'}" />
+                            <filter string="Show time as" icon="terp-project"
+                                domain="[]" context="{'group_by':'show_as'}" />
                             <separator orientation="vertical" />
                             <filter string="Responsible" icon="terp-personal" domain="[]"
                                 context="{'group_by':'user_id'}" />
                             <filter string="Partner" icon="terp-personal" domain="[]"
                                 context="{'group_by':'partner_id'}" />
                             <separator orientation="vertical" />
+                            <filter string="Meeting Type" help="Meeting Type"
+                            	icon="terp-stock_symbol-selection" domain="[]"
+                            	context="{'group_by':'categ_id'}" />
                             <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
                                 context="{'group_by':'state'}" />
                             <separator orientation="vertical" />
                         </group>
+                        <newline/>
+                        <group expand="0" string="Extended Options...">
+                           <field name="class" select="1" string="Privacy"/>
+                           <field name="show_as" string="Show time as" select="1"/>
+                        </group>
                 </search>
             </field>
         </record>
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 440033a2400..0adbf2f2489 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -143,9 +143,10 @@ class crm_opportunity(osv.osv):
             context = {
                 'default_opportunity_id': opp.id,
                 'default_partner_id': opp.partner_id and opp.partner_id.id or False,
+                'default_user_id': uid, 
                 'default_section_id': opp.section_id and opp.section_id.id or False,
                 'default_email_from': opp.email_from,
-                'default_state': 'open',
+                'default_state': 'open',  
                 'default_name': opp.name
             }
             value = {
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index cb24990416f..36163abfa00 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -7,9 +7,9 @@
             name="Phone calls"
             res_model="crm.phonecall"
             src_model="crm.lead"
-            view_mode="calendar,tree,form"
+            view_mode="tree,calendar,form"
             context="{'default_duration': 1.0 ,'default_opportunity_id': active_id}"
-            domain="[('user_id','=',uid),('opportunity_id', '=', active_id)]"
+            domain="[('opportunity_id', '=', active_id)]"
             view_type="form"/>
 
     <act_window
@@ -19,7 +19,7 @@
             src_model="crm.lead"
             view_mode="tree,form,calendar,"
             context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
-            domain="[('user_id','=',uid), ('opportunity_id', '=', active_id)]"
+            domain="[('opportunity_id', '=', active_id)]"
             view_type="form"/>
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 550d82f86ac..4060337bdd7 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -258,6 +258,8 @@
                         <field name="section_id"
                             invisible="context.get('invisible_section', True)" />
                         <field name="user_id"/>
+                        <field name="priority" invisible="1"/>
+                        <field name="categ_id" invisible="1"/>
                         <field name="state"/>
                         <button name="case_open" string="Open"
                             states="draft,pending" type="object"
@@ -299,14 +301,14 @@
                 <field name="arch" type="xml">
                     <search string="Search Opportunities">
                         <filter icon="terp-check"
-                            string="Current"
+                            string="Current"  help="Current Opportunities"
                             name="current"
                             domain="[('state','in',('draft','open'))]"/>
                         <filter icon="terp-camera_test"
-                            string="Open"
+                            string="Open"  help="Open Opportunities"
                             domain="[('state','=','open')]"/>
                         <filter icon="terp-gtk-media-pause"
-                            string="Pending"
+                            string="Pending"  help="Pending Opportunities"
                             domain="[('state','=','pending')]"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today"
@@ -352,8 +354,10 @@
                             <separator orientation="vertical" />
                             <filter string="Creation" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'create_date'}" />
-                            <filter string="Exp.Closing" icon="terp-go-month"
-                                domain="[]" context="{'group_by':'date_deadline'}" />
+                            <filter string="Exp.Closing"
+                                icon="terp-go-month"
+                                help="Expected Closing" domain="[]"
+                                context="{'group_by':'date_deadline'}" />
                         </group>
                     </search>
                 </field>
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index a94bf5d9b59..1d6a855c208 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -82,8 +82,8 @@ class crm_phonecall(osv.osv, crm_case):
         'date_closed': fields.datetime('Closed', readonly=True), 
         'date': fields.datetime('Date'), 
         'opportunity_id': fields.many2one ('crm.lead', 'Opportunity'), 
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('res_model','=',_name)]),
-        'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('res_model','=',_name)]),
+        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('model','=',_name)]),
+        'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)]),
     }
 
     _defaults = {
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 9061e6a62d4..a70bd45875d 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -147,7 +147,7 @@ class crm_lead_report(osv.osv):
                     0 as avg_answers,
                     0.0 as perc_done,
                     0.0 as perc_cancel,
-                    (select count(id) from mailgate_message where res_id=c.id and res_model='crm.lead') as email,
+                    (select count(id) from mailgate_message where res_id=c.id and model='crm.lead') as email,
                     date_trunc('day',c.create_date) as create_date,
                     avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as  delay_close,
                     avg(extract('epoch' from (c.date_deadline - c.date_closed)))/(3600*24) as  delay_expected,
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 827ee867169..da8db534812 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -9,13 +9,15 @@
             <field name="model">crm.opportunity2phonecall</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Schedule Other Call">
+                <form string="Schedule a PhoneCall">
+                    <separator string="Schedule a PhoneCall" colspan="4"/>
 					<group colspan="2" >
                 		<field name="name"/>
                 		<field name="date" string="Planned Date"/>
                 		<newline/>
 						<field name="user_id" />
 						<field name="section_id"/>
+						<separator string="" colspan="4"/>
 						<label string ="" colspan="2"/>
 						<button name="action_cancel" string="_Cancel"
 							icon="gtk-cancel" special="cancel" />