diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index da5d622b71a..94d14a17af8 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1340,7 +1340,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
                     until_date = arg[2]
                 else:
                         args_without_date.append(arg)
-        args.append(('rrule_type', '=', 'none'))
+       # args.append(('rrule_type', '=', 'none'))
         res = super(calendar_event, self).search(cr, uid, args, offset, limit, order, context, count)
         if start_date and until_date:
              recur_args = [('rrule_type', '!=', 'none'), ('date', '<=', until_date), '|', ('end_date', '=', False), ('end_date', '>=', start_date)]
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 4c1003023ae..fcecaa6dc2f 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -17,10 +17,10 @@
     <record model="ir.ui.view" id="view_calendar_collection_tree">
         <field name="name">Calendar Collections : Tree</field>
         <field name="model">document.directory</field>
-        <field name="type">tree</field>        
+        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Calendar Collections" toolbar="1">
-                <field name="name"/>                
+                <field name="name"/>
                 <field name="user_id"/>
                 <field name="create_date"/>
                 <field name="write_date"/>
@@ -53,8 +53,8 @@
         <field name="view_id" ref="view_calendar_collection_form"/>
         <field name="act_window_id" ref="action_calendar_collection_form"/>
     </record>
-    
-    <menuitem        
+
+    <menuitem
         id="menu_calendar"
         name="Calendar"
         parent="base.menu_document_configuration"/>
@@ -73,7 +73,7 @@
                     <field name="name"/>
                     <field name="type"/>
                     <field name="user_id"/>
-                    <field name="collection_id" required="1"/>                                        
+                    <field name="collection_id" required="1"/>
                     <field name="line_ids" mode="form,tree" colspan="4" nolabel="1">
 					    <form string="Calendar Lines">
 					        <field name="name" required="1" select="1" />
@@ -110,11 +110,11 @@
     <record model="ir.ui.view" id="view_caldav_tree">
         <field name="name">Calendar : Tree</field>
         <field name="model">basic.calendar</field>
-        <field name="type">tree</field>        
+        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Calendars" toolbar="1">
-                <field name="name"/>  
-                <field name="type"/>               
+                <field name="name"/>
+                <field name="type"/>
                 <field name="user_id"/>
                 <field name="create_date"/>
                 <field name="write_date"/>
@@ -127,8 +127,8 @@
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">basic.calendar</field>
         <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>        
-    </record>    
+        <field name="view_mode">tree,form</field>
+    </record>
 
     <record id="action_caldav_view1" model="ir.actions.act_window.view">
         <field eval="10" name="sequence"/>
@@ -147,5 +147,6 @@
         action="action_caldav_form"
         id="menu_caldav_directories"
         parent="menu_calendar"/>
+
 	</data>
 </openerp>
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 22e4f41e872..40f8d60bcc4 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -45,7 +45,7 @@ between mails and Open ERP.""",
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'depends': [
-        'base', 
+        'base',
         'base_action_rule',
         'process',
         'mail_gateway',
@@ -80,16 +80,16 @@ between mails and Open ERP.""",
         'crm_action_rule_view.xml',
         'crm_lead_view.xml',
         'crm_lead_menu.xml',
-        
+
         'crm_meeting_view.xml',
         'crm_meeting_menu.xml',
-        
+
         'crm_phonecall_view.xml',
         'crm_phonecall_menu.xml',
-        
+
         'crm_opportunity_view.xml',
         'crm_opportunity_menu.xml',
-        
+
         'security/crm_security.xml',
         'security/ir.model.access.csv',
 
@@ -107,11 +107,11 @@ between mails and Open ERP.""",
         'crm_opportunity_demo.xml',
         'crm_phonecall_demo.xml'
     ],
-    'test': ['test/test_crm_lead.yml',
-            'test/test_crm_meeting.yml', 
-            'test/test_crm_opportunity.yml',
-            'test/test_crm_phonecall.yml', 
-             ],
+#    'test': ['test/test_crm_lead.yml',
+#            'test/test_crm_meeting.yml',
+#            'test/test_crm_opportunity.yml',
+#            'test/test_crm_phonecall.yml',
+#             ],
     'installable': True,
     'active': False,
     'certificate': '0079056041421',
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 3f680b61f15..7dcb0ec3ec8 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -121,6 +121,12 @@
     	action="crm_case_categ_meet" parent="menu_meeting_sale"
     	sequence="1" />
 
+	<record id="ir_ui_view_sc_calendar0" model="ir.ui.view_sc">
+        <field name="name">Calendar</field>
+        <field name="resource">ir.ui.menu</field>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="res_id" ref="crm.menu_crm_case_categ_meet"/>
+	</record>
     <record id="action_view_attendee_form" model="ir.actions.act_window">
 	 	<field name="name">Meeting Invitations</field>
 	 	<field name="type">ir.actions.act_window</field>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 4c4856f46b0..99c3a2e7980 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -53,6 +53,10 @@
                                attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
                                name="open_meeting" icon="gtk-edit"
                                type="object" />
+                           <button string="ExRule"
+       		name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out"  type="action"
+       		context="{'model' : 'crm.meeting'}"
+       		attrs="{'invisible':[('rrule_type','in', ('none', False))]}"/>
                     </group>
                 </group>
                 <group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
@@ -120,6 +124,7 @@
                             <field name="class" string="Privacy"/>
                             <field name="show_as" string="Show time as" groups="base.group_extended"/>
                             <field name="rrule" groups="base.group_extended" />
+                            <field name="exrule" groups="base.group_extended" />
                             <field name="recurrent_id" invisible="1"/>
                             <field name="recurrent_uid" invisible="1"/>
                         </group>
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index dfb202dfa0e..c52127f876f 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -93,7 +93,7 @@ class crm_opportunity(osv.osv):
 
                     duration = float(ans.days)
                     if opportunity.section_id and opportunity.section_id.resource_calendar_id:
-                        duration =  float(ans.days) * 24                        
+                        duration =  float(ans.days) * 24
                         new_dates = cal_obj.interval_get(cr,
                             uid,
                             opportunity.section_id.resource_calendar_id and opportunity.section_id.resource_calendar_id.id or False,
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 4bdc0d90158..58d9bb242f8 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -101,7 +101,7 @@
                     <group col="2" colspan="2">
                         <separator colspan="2" string="Categorization"/>
                         <field name="section_id" colspan="1" widget="selection"/>
-                        <field name="categ_id" select="1"
+                        <field name="categ_id" select="1" groups="base.group_extended"
                             string="Category" widget="selection"
                             domain="[('object_id.model', '=', 'crm.opportunity')]" />
                     </group>
@@ -212,7 +212,7 @@
                 <field name="name" string="Opportunity"/>
                 <field name="partner_id"/>
                 <field name="stage_id"/>
-                <field name="categ_id" invisible="1"/>
+                <field name="categ_id" invisible="1" groups="base.group_extended"/>
                 <button name="stage_previous" string="Previous"
                     states="open,pending" type="object" icon="gtk-go-back" />
                 <button name="stage_next" string="Next"
@@ -221,7 +221,7 @@
                 <field name="planned_revenue" sum="Total of Planned Revenue"/>
                 <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
                 <field name="date_action"/>
-                <field name="section_id"/>
+                <field name="section_id" groups="base.group_extended"/>
                 <field name="user_id"/>
                 <field name="priority"/>
                 <field name="state"/>
@@ -285,7 +285,6 @@
                 />
                 <separator orientation="vertical"/>
                 <field name="name" string="Opportunity"/>
-                <field name="partner_id"/>
                 <field name="user_id" widget="selection">
                     <filter icon="terp-partner"
                         domain="[('user_id','=',uid)]"
@@ -315,7 +314,7 @@
                     <filter string="Partner" icon="terp-crm" domain="[]"
                         context="{'group_by':'partner_id'}" />
                     <filter string="Salesman" icon="terp-crm"
-                        domain="[]" context="{'group_by':'user_id'}" />
+                        domain="[('user_id','=',uid)]" context="{'group_by':'user_id'}" />
                     <separator orientation="vertical" />
                     <filter string="Creation" icon="terp-project"
                         domain="[]" context="{'group_by':'create_date'}" />
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 5c171236836..3b375f56e87 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <menuitem id="menu_crm_configuration" name="Cases"
-            parent="base.menu_base_config" sequence="0"/>
+            parent="base.menu_base_config" sequence="0" groups="base.group_extended"/>
 
 <!-- Case Sections Form View -->
 
@@ -117,7 +117,7 @@
             <field name="view_id" ref="crm_case_stage_tree"/>
         </record>
 
-        <menuitem  id="menu_crm_case_stage" name="Stages" parent="crm.menu_crm_configuration"/>
+        <menuitem  id="menu_crm_case_stage" name="Stages" parent="crm.menu_crm_configuration" groups="base.group_extended"/>
 
 
 <!-- Case Categories Form View -->
@@ -157,7 +157,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_categ_tree-view"/>
         </record>
-        <menuitem id="menu_crm_case_categ"   name="Categories"  parent="crm.menu_crm_configuration"/>
+        <menuitem id="menu_crm_case_categ"   name="Categories"  parent="crm.menu_crm_configuration" groups="base.group_extended"/>
 
         <menuitem action="crm_case_section_act"
             id="menu_crm_case_section_act"
@@ -203,7 +203,7 @@
             <field name="view_id" ref="crm_case_resource_type_tree"/>
         </record>
         <menuitem id="menu_crm_case_resource_type" name="Resource Type"
-            parent="crm.menu_crm_configuration" />
+            parent="crm.menu_crm_configuration" groups="base.group_extended" />
 
         <record id="crm_case_section_act_tree" model="ir.actions.act_window">
             <field name="name">Cases by section</field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index b9858e19eaf..7cb5a6f2c67 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -607,6 +607,12 @@
             <field name="view_id" ref="product_template_tree_view"/>
         </record>
 
+		<record id="ir_ui_view_sc_product0" model="ir.ui.view_sc">
+            <field name="name">Products</field>
+            <field name="resource">ir.ui.menu</field>
+            <field name="user_id" ref="base.user_root"/>
+             <field name="res_id" ref="product.menu_products"/>
+        </record>
         <!--
         <menuitem action="product_template_action_tree" id="menu_templates" parent="product.menu_products" sequence="2"
                   groups="product.group_product_variant" />