diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 9e121a1d561..d4d182a2dc5 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -9,13 +9,16 @@
         <field name="domain">['|', ('type','=','lead'), ('type','=',False)]</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
+        <field name="context">{'search_default_current':1}</field>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
@@ -25,6 +28,8 @@
 
     <menuitem id="base.menu_sales" name="Sales"
         parent="base.menu_base_partner" sequence="1" />
+        
+
     <menuitem parent="base.menu_sales" name="Leads"
         groups="base.group_extended"
         id="menu_crm_case_categ0_act_leads"
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 4bb6a2ef678..b6d8ae2ed51 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -270,7 +270,7 @@
             <search string="Search Leads">
                 <filter icon="terp-project"
                     string="Current"
-                    default="1"
+                    default="1" name="current"
                     domain="[('state','in',('draft','open'))]"/>
                 <filter icon="terp-project"
                     string="Open"
@@ -313,7 +313,7 @@
                         help="Show Sales Team"/>
                 </field>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="14">
+                <group expand="0" string="Group By..." colspan="14">
                     <filter string="Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="State" icon="terp-crm" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Source" icon="terp-crm" domain="[]" context="{'group_by':'categ_id'}"/>
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 38cfba16a6b..30baebaec53 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -55,7 +55,8 @@ class crm_meeting(osv.osv, crm_case):
                         select=True, help='Sales team to which Case belongs to.\
                              Define Responsible user and Email account for mail gateway.'), 
         'email_from': fields.char('Email', size=128, help="These people will receive email."),
-        
+        'id': fields.integer('ID'),
+
         # Meeting fields
         'categ_id': fields.many2one('crm.case.categ', 'Meeting Type', \
                         domain="[('object_id.model', '=', 'crm.meeting')]", \
@@ -74,7 +75,8 @@ class crm_meeting(osv.osv, crm_case):
     }
 
     _defaults = {
-        'state': lambda *a: 'draft',
+        'state': lambda *a: 'draft', 
+        'active': lambda *a: 1, 
     }
 
     def open_meeting(self, cr, uid, ids, context=None):
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 3fd8a37d05e..562274ee301 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -12,7 +12,6 @@
         domain="[('partner_id', '=', active_id)]"
     />
 
-
     <record model="ir.actions.act_window" id="crm_case_categ_meet_create_partner">
         <field name="context" eval="{'default_state':'draft'}"/>
     </record>
@@ -24,18 +23,21 @@
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_meet_partner">
         <field name="sequence" eval="2"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_tree_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_meet_partner">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
         <field name="view_id" ref="crm_case_form_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
     </record>
+
 	<record model="ir.actions.act_window.view" id="action_crm_tag_gantt_meet_partner">
         <field name="sequence" eval="3"/>
         <field name="view_mode">gantt</field>
@@ -43,68 +45,36 @@
         <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
     </record>
 
-	<act_window
-        id="crm_case_categ_meet_case"
-        name="Schedule a Meeting"
-        res_model="crm.meeting"
-        src_model="mailgate.thread"
-        view_mode="calendar,tree,form,gantt"
-        context="{'default_case_id': active_id, 'default_duration': 4.0}"
-        />
-
-    <record model="ir.actions.act_window" id="crm_case_categ_meet_case">
-        <field name="context" eval="{'default_state':'draft'}"/>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_case">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet_case"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_meet_case">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet_case"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_meet_case">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet_case"/>
-    </record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_gantt_meet_case">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">gantt</field>
-        <field name="view_id" ref="crm_case_gantt_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet_case"/>
-    </record>
-
     <record model="ir.actions.act_window" id="crm_case_categ_meet">
+        <field name="name">Meetings</field>
         <field name="res_model">crm.meeting</field>
         <field name="view_mode">calendar,tree,form,gantt</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
+        <field name="context">{'search_default_current':1}</field>
         <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
         <field name="sequence" eval="1"/>
         <field name="view_mode">calendar</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meet"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_meet">
         <field name="sequence" eval="2"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_tree_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meet"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_form__meet">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
         <field name="view_id" ref="crm_case_form_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meet"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_gantt_meet">
         <field name="sequence" eval="1"/>
         <field name="view_mode">gantt</field>
@@ -136,43 +106,5 @@
 			name="Meeting Invitations" parent="crm.menu_meeting_sale"
 			sequence="10" action="action_view_attendee_form" />
 
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_meetall3">
-        <field name="name">Next Meetings</field>
-        <field name="res_model">crm.meeting</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar,form,gantt</field>
-        <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="domain"
-        	eval="[('state','in',('pending','draft','open')),('date','>=',time.strftime('%Y-%m-%d'))]" />
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetall3">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="act_window_id" ref="crm_case_category_act_meetall3"/>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetall3">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_meet"/>
-        <field name="act_window_id" ref="crm_case_category_act_meetall3"/>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetall3">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view_meet"/>
-        <field name="act_window_id" ref="crm_case_category_act_meetall3"/>
-    </record>
-
-	<record model="ir.actions.act_window.view" id="action_crm_tag_gantt_view_meetall3">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">gantt</field>
-        <field name="view_id" ref="crm_case_gantt_view_meet"/>
-        <field name="act_window_id" ref="crm_case_category_act_meetall3"/>
-    </record>
 </data>
 </openerp>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 75243f506be..14693086e4a 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -263,12 +263,12 @@
         <field name="arch" type="xml">
                 <search string="Search Meetings">
                        <group col="12" colspan="4">
-                           <filter icon="terp-crm" string="My Meetings"
+                       		<filter icon="terp-project" name="current" string="Current"
+	                           domain="[('state','in',('draft', 'open'))]"
+	                           help="Current Meetings"/>
+                           <filter icon="terp-partner" string="My Meetings"
                                domain="[('user_id','=',uid)]"
                                help="My Meetings" />
-                           <filter icon="terp-crm" name="current" string="Current"
-                           domain="[('state','in',('draft', 'open'))]"
-                           help="Current Meetings"/>
                            <separator orientation="vertical"/>
                            <field name="name" select="1" string="Subject"/>
                            <field name="partner_id" select="1" />
@@ -280,6 +280,22 @@
                            </field>
                            <field name="user_id" select="1" widget="selection"/>
                        </group>
+                       <newline/>
+						<group expand="0" string="Group By..." colspan="16">
+							<filter string="Date" icon="terp-project"
+						        domain="[]" context="{'group_by':'date'}" />
+						    <filter string="Privacy" icon="terp-crm"
+						        domain="[]" context="{'group_by':'class'}" />
+						    <separator orientation="vertical" />
+						    <filter string="Responsible" icon="terp-crm" domain="[]"
+						        context="{'group_by':'user_id'}" />
+						    <filter string="Partner" icon="terp-partner" domain="[]"
+						        context="{'group_by':'partner_id'}" />
+						    <separator orientation="vertical" />
+						    <filter string="State" icon="terp-crm" domain="[]"
+						        context="{'group_by':'state'}" />
+						    <separator orientation="vertical" />
+						</group>
                 </search>
             </field>
         </record>
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index 1616520028e..cfce1a6aa9a 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -27,29 +27,35 @@
           <field name="res_model">crm.lead</field>
           <field name="view_mode">tree,form,graph</field>
           <field name="domain">[('type','=','opportunity')]</field>
+          <field name="context">{'search_default_current':1}</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
      </record>
+
      <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
           <field name="sequence" eval="1"/>
           <field name="view_mode">tree</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
      </record>
+
      <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor11">
           <field name="sequence" eval="2"/>
           <field name="view_mode">form</field>
           <field name="view_id" ref="crm_case_form_view_oppor"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
      </record>
+
      <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_oppor11">
           <field name="sequence" eval="4"/>
           <field name="view_mode">graph</field>
           <field name="view_id" ref="crm_case_graph_view_opportunity"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
      </record>
+
      <menuitem id="base.menu_sales" name="Sales"
      	parent="base.menu_base_partner" sequence="1" />
+
      <menuitem name="Opportunities" id="menu_crm_case_opp"
      	parent="base.menu_sales" action="crm_case_category_act_oppor11"
      	sequence="2" />
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 3c3e76f89ac..3e7d6ac119b 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -274,7 +274,7 @@
             <search string="Search Opportunities">
                 <filter icon="terp-project"
                     string="Current"
-                    default="1"
+                    name="current"
                     domain="[('state','in',('draft','open'))]"/>
                 <filter icon="terp-project"
                     string="Open"
@@ -311,7 +311,7 @@
                         help="My section" />
                 </field>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="16">
+                <group expand="0" string="Group By..." colspan="16">
                     <filter string="Stage" icon="terp-crm" domain="[]"
                         context="{'group_by':'stage_id'}" />
                     <filter string="Priority" icon="terp-crm" domain="[]"
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index ccfd02b6309..96232677cc0 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -84,6 +84,7 @@ class crm_phonecall(osv.osv, crm_case):
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 
         'state': lambda *a: 'draft', 
+        'active': lambda *a: 1, 
     }
     
     # From crm.case
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index a8941ccce6f..e11ef95e442 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -277,7 +277,7 @@
                        help="My section" />
                </field>
                <newline/>
-               <group expand="1" string="Group By..." colspan="4">
+               <group expand="0" string="Group By..." colspan="4">
                    <filter string="Partner" icon="terp-crm" domain="[]"
                        context="{'group_by':'partner_id'}" />
                    <filter string="Responsible" icon="terp-crm"
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity.py b/addons/crm/wizard/crm_phonecall_to_opportunity.py
index 231b3625722..453a4098926 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity.py
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity.py
@@ -97,7 +97,6 @@ Call Could not convert into Opportunity"))
                                 'type': 'opportunity', 
                                 'phone': case.partner_phone or False,
                             })
-                new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id)
                 vals = {
                             'partner_id': this.partner_id.id,
                             'opportunity_id' : new_opportunity_id,
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 76ea81ca2ce..2b9148083b3 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -251,7 +251,7 @@
             <field name="arch" type="xml">
                 <search string="Search Claims">
                    <filter icon="gtk-new" string="Current"
-                       domain="[('state','in',('draft', 'open'))]"
+                       domain="[('state','in',('draft', 'open'))]" name="current"
                        separator="1" help="Current Claims" default="1"
                    />
                    <filter icon="gtk-execute"
@@ -283,7 +283,7 @@
                            help="My section" />
                    </field>
                    <newline/>
-                   <group expand="1" string="Group By..." colspan="10" col="20">
+                   <group expand="0" string="Group By..." colspan="10" col="20">
                        <filter string="Deadline" icon="terp-crm"
                            domain="[]"
                            context="{'group_by':'date_deadline'}" />
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 3790985075c..adc34900a89 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -31,6 +31,7 @@ class crm_fundraising(osv.osv, crm.crm_case):
     _inherit ='mailgate.thread'
 
     _columns = {
+            'id': fields.integer('ID'), 
             'name': fields.char('Name', size=128, required=True), 
             'description': fields.text('Description'), 
             'create_date': fields.datetime('Creation Date' , readonly=True), 
diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml
index eab0603c446..9a8d6dee46f 100644
--- a/addons/crm_fundraising/crm_fundraising_menu.xml
+++ b/addons/crm_fundraising/crm_fundraising_menu.xml
@@ -12,6 +12,7 @@
         <field name="name">Funds</field>
         <field name="res_model">crm.fundraising</field>
         <field name="view_mode">tree,form,graph</field>
+        <field name="context">{"search_default_current":1}</field>
         <field name="view_id" ref="crm_fundraising.crm_case_tree_view_fund"/>
         <field name="search_view_id" ref="crm_fundraising.view_crm_case_fund_filter"/>
     </record>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index f826cadfb8e..963526e148f 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -60,7 +60,6 @@
         <field name="arch" type="xml">
             <tree string="Funds Tree"
                 colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
-                <field name="id" />
                 <field name="name" string="Fund Description" />
                 <field name="categ_id" />
                 <field name="type_id" string="Payment Mode" />
@@ -68,6 +67,7 @@
                 <field name="probability" />
                 <field name="user_id" />
                 <field name="state" />
+                <field name="partner_id" invisible="1"/>
                 <button name="case_close" string="Done"
                     states="open,draft,pending" type="object"
                     icon="gtk-close" />
@@ -261,23 +261,23 @@
             <field name="arch" type="xml">
                 <search string="Search Funds">
                    <group col='6' colspan='4'>
+                       <filter icon="gtk-new" string="Current"
+                           domain="[('state','in',('draft', 'open'))]" name="current"
+                           help="Current Funds" />
+                       <filter icon="gtk-yes" string="Open"
+                           domain="[('state','=','open')]"
+                           help="Open Funds" />
+                       <filter icon="gtk-media-pause"
+                           string="Pending"
+                           domain="[('state','=','pending')]"
+                           help="Pending Funds" />
+                       <separator orientation="vertical" />
                        <filter icon="terp-partner" string="My Funds"
                            default="1" domain="[('user_id','=',uid)]"
                            separator="1"
                            help="Funds Related to Current User"
                            />
                        <separator orientation="vertical" />
-                       <filter icon="gtk-new" string="Current Funds"
-                           domain="[('state','in',('draft', 'open'))]"
-                           help="Current Funds" />
-                       <filter icon="gtk-yes" string="Open Funds"
-                           domain="[('state','=','open')]"
-                           help="Open Funds" />
-                       <filter icon="gtk-media-pause"
-                           string="Pending Funds"
-                           domain="[('state','=','pending')]"
-                           help="Pending Funds" />
-                       <separator orientation="vertical" />
                        <field name="state" select="1" />
                        <field name="name" select='1'
                            string="Fund Description" />
@@ -293,6 +293,19 @@
                                help="My section" />
                        </field>
                    </group>
+                   <newline/>
+                   <group expand="0" string="Group By..." colspan="10" col="20">
+                       <filter string="Partner" icon="terp-partner"
+                           domain="[]"
+                           context="{'group_by':'partner_id'}" />
+                       <filter string="Responsible" icon="terp-crm"
+                           domain="[]"
+                           context="{'group_by':'user_id'}" />
+                       <separator orientation="vertical" />
+                       <filter string="Type" icon="terp-project"
+                           domain="[]"
+                           context="{'group_by':'type_id'}" />
+                   </group>
                </search>
             </field>
         </record>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 33fc24b1548..b37ea9597bf 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -240,7 +240,7 @@
                         help="My section" />
                 </field>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="12" col="20">
+                <group expand="0" string="Group By..." colspan="12" col="20">
                     <filter string="Customer" icon="terp-crm"
                         domain="[]" context="{'group_by':'partner_id'}" />
                     <filter string="State" icon="terp-crm" domain="[]"