diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 7458594d240..329135d29a7 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -1,4 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_product_product_account_user","product.product.account.user","product.model_product_product","group_account_user",1,0,0,0
 "access_account_payment_term","account.payment.term","model_account_payment_term","account.group_account_user",1,0,0,0
 "access_account_payment_term_line","account.payment.term.line","model_account_payment_term_line","account.group_account_user",1,0,0,0
 "access_account_account_type","account.account.type","model_account_account_type","account.group_account_user",1,0,0,0
diff --git a/addons/base_action_rule/security/ir.model.access.csv b/addons/base_action_rule/security/ir.model.access.csv
index 99e4fc07c4b..a8e43372e23 100644
--- a/addons/base_action_rule/security/ir.model.access.csv
+++ b/addons/base_action_rule/security/ir.model.access.csv
@@ -1,2 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_base_action_rule","base.action.rule","model_base_action_rule",,1,1,1,1
+"access_base_action_rule","base.action.rule","model_base_action_rule",,1,0,0,0
+"access_base_action_rule_config","base.action.rule config","model_base_action_rule",base.group_system,1,0,0,0
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 79c8a0207a3..a86a3e662d1 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-		<!--		Attendee form view-->
+        <!--        Attendee form view-->
 
         <record id="base_calendar_attendee_form_view" model="ir.ui.view">
             <field name="name">calendar.attendee.form</field>
@@ -10,12 +10,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invitation details">
-                	<group col="6" colspan="4">
-	                    <field name="email" string="Invitation To"/>
-	                    <field name="cutype" string="Invitation type" />
+                    <group col="6" colspan="4">
+                        <field name="email" string="Invitation To"/>
+                        <field name="cutype" string="Invitation type" />
                         <field name="rsvp" />
                         <field name="role" string="Role" />
-	                    <field name="sent_by_uid" string="Invitation From" />
+                        <field name="sent_by_uid" string="Invitation From" />
                     </group>
                     <notebook colspan="4">
                         <page string="Invitation">
@@ -68,7 +68,7 @@
             </field>
         </record>
 
-		<!--		Attendee tree view-->
+        <!--        Attendee tree view-->
 
         <record id="base_calendar_attendee_tree_view" model="ir.ui.view">
             <field name="name">calendar.attendee.tree</field>
@@ -87,7 +87,7 @@
             </field>
         </record>
 
-		<!--		Attendee search view-->
+        <!--        Attendee search view-->
 
         <record id="base_calendar_attendee_search_view" model="ir.ui.view">
             <field name="name">calendar.attendee.search</field>
@@ -108,47 +108,47 @@
                    <field name="cutype" string="Invitation type" select="1"/>
                    <field name="event_date" select="1"/>
                    <newline/>
-				    <group expand="0" string="Group By...">
-						<filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type"
-					        domain="[]" context="{'group_by':'cutype'}" />
-					    <filter string="Role" icon="terp-gtk-select-all"
-					        domain="[]" context="{'group_by':'role'}" />
-					    <filter string="Required Reply" icon="terp-mail-replied"
-					        domain="[]" context="{'group_by':'rsvp'}" />
-					    <separator orientation="vertical" />
-					    <filter string="User" icon="terp-personal" domain="[]"
-					        context="{'group_by':'user_id'}" />
-					    <filter string="Contact" icon="terp-gtk-jump-to-ltr" domain="[]"
-					        context="{'group_by':'partner_address_id'}" />
-					    <filter string="State" icon="terp-stock_effects-object-colorize" help="Invitation Type"
+                    <group expand="0" string="Group By...">
+                        <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type"
+                            domain="[]" context="{'group_by':'cutype'}" />
+                        <filter string="Role" icon="terp-gtk-select-all"
+                            domain="[]" context="{'group_by':'role'}" />
+                        <filter string="Required Reply" icon="terp-mail-replied"
+                            domain="[]" context="{'group_by':'rsvp'}" />
+                        <separator orientation="vertical" />
+                        <filter string="User" icon="terp-personal" domain="[]"
+                            context="{'group_by':'user_id'}" />
+                        <filter string="Contact" icon="terp-gtk-jump-to-ltr" domain="[]"
+                            context="{'group_by':'partner_address_id'}" />
+                        <filter string="State" icon="terp-stock_effects-object-colorize" help="Invitation Type"
                             domain="[]" context="{'group_by':' state'}" />
-					</group>
+                    </group>
                </search>
             </field>
         </record>
-		<record id="action_view_attendee_form" model="ir.actions.act_window">
-	         <field name="name">Event Invitations</field>
-	         <field name="type">ir.actions.act_window</field>
-	         <field name="res_model">calendar.attendee</field>
-	         <field name="view_type">form</field>
-	         <field name="view_mode">tree,form</field>
-	         <field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />
-	         <field name="context">{'default_sent_by_uid': uid}</field>
-	     </record>
+        <record id="action_view_attendee_form" model="ir.actions.act_window">
+             <field name="name">Event Invitations</field>
+             <field name="type">ir.actions.act_window</field>
+             <field name="res_model">calendar.attendee</field>
+             <field name="view_type">form</field>
+             <field name="view_mode">tree,form</field>
+             <field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />
+             <field name="context">{'default_sent_by_uid': uid}</field>
+         </record>
 
-		<!-- Calenadar's menu -->
+        <!-- Calenadar's menu -->
           <menuitem id="base.menu_calendar_configuration" name="Calendar"
-            parent="base.menu_address_book" sequence="15" />
+            parent="base.menu_base_config" sequence="15" />
 
-		<!-- Invitation menu -->
+        <!-- Invitation menu -->
 
-	       <menuitem id="menu_attendee_invitations"
+           <menuitem id="menu_attendee_invitations"
             name="Event Invitations" parent="base.menu_calendar_configuration"
             sequence="10" action="action_view_attendee_form" />
 
-		<!--		ALARM FORM VIEW-->
+        <!--        ALARM FORM VIEW-->
 
-		<record id="res_alarm_form_view" model="ir.ui.view">
+        <record id="res_alarm_form_view" model="ir.ui.view">
             <field name="name">res.alarm.form</field>
             <field name="model">res.alarm</field>
             <field name="type">form</field>
@@ -165,7 +165,7 @@
             </field>
         </record>
 
-		<!--		ALARM TREE VIEW-->
+        <!--        ALARM TREE VIEW-->
 
         <record id="res_alarm_tree_view" model="ir.ui.view">
             <field name="name">res.alarm.tree</field>
@@ -189,198 +189,199 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-		<!--		Menu for Alarms-->
+        <!--        Menu for Alarms-->
 
          <menuitem id="menu_crm_meeting_avail_alarm"
             groups="base.group_extended"
             action="base_calendar.action_res_alarm_view"
             parent="base.menu_calendar_configuration" />
+
         <!-- Event Form View-->
 
-		<record model="ir.ui.view" id="event_form_view">
-	        <field name="name">Event Form</field>
-	        <field name="model">calendar.event</field>
-	        <field name="type">form</field>
-	        <field name="arch" type="xml">
-	            <form string="Events">
-	                <group col="6" colspan="4">
-	                    <field name="name" select="1" string="Summary"
-	                        colspan="4" />
-	                    <field name="allday" colspan="2" on_change="onchange_allday(allday)" />
-	                    <newline/>
-	                    <field name="date" string="Start Date" required="1" select="1"
-	                    	on_change="onchange_dates(date,duration,False,allday)" />
-	                    <field name="duration" widget="float_time"
-	                    	on_change="onchange_dates(date,duration,False,allday)" attrs="{'invisible': [('allday', '=', True)]}"/>
-	                    <field name="date_deadline" string="End Date" required="1"
-	                    	on_change="onchange_dates(date,False,date_deadline)" />
-	                    <field name="location" />
-	                    <field name="alarm_id" string="Reminder"
-	                    	widget="selection" />
-	                    <group colspan="2" col="4" >
-	                           <field name="rrule_type" string="Recurrency"
-	                                colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
-	                           <button string="Edit All"
-	                           	help="Edit all Ourrences of recurrent Meeting"
-	                           	attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
-	                           	name="open_event" icon="gtk-edit"
-	                           	type="object" />
-	                    </group>
-	                </group>
-	                <group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
-	                    <separator string="Select data for Custom Rule" colspan="8"/>
-	                    <group col="8" colspan="4">
-	                        <field name="freq" />
-	                        <field name="interval" />
-	                        <field name="count" />
-	                        <field name="end_date" />
-	                    </group>
-	                    <group col="14" colspan="4" name="Select weekdays"
-	                        attrs="{'invisible' : [('freq','!=','weekly')]}">
-	                        <field name="mo" colspan="1" />
-	                        <field name="tu" colspan="1" />
-	                        <field name="we" colspan="1" />
-	                        <field name="th" colspan="1" />
-	                        <field name="fr" colspan="1" />
-	                        <field name="sa" colspan="1" />
-	                        <field name="su" colspan="1" />
-	                        <newline />
-	                    </group>
-	                    <group col="10" colspan="4"
-	                        attrs="{'invisible' : [('freq','!=','monthly'), ('freq','!=','yearly')]}">
-	                        <group col="2" colspan="1">
-	                            <field name="select1" />
-	                        </group>
-	                        <group col="2" colspan="1"
-	                            attrs="{'invisible' : [('select1','=','day')]}">
-	                            <field name="day"
-	                                attrs="{'required' : [('select1','=','date')]}" />
-	                        </group>
-	                        <group col="3" colspan="1"
-	                            attrs="{'invisible' : [('select1','=','date')]}">
-	                            <field name="byday" string="The"
-	                                attrs="{'required' : [('select1','=','day')]}" />
-	                            <field name="week_list" nolabel="1"
-	                                attrs="{'required' : [('select1','=','day')]}" />
-	                        </group>
-	                        <group col="1" colspan="1"
-	                            attrs="{'invisible' : [('freq','!=','yearly')]}">
-	                            <field name="month_list" string="of"
-	                                colspan="1"
-	                                attrs="{'required' : [('freq','=','yearly')]}" />
-	                        </group>
-	                    </group>
-	                </group>
-	                <notebook colspan="4">
-	                <page string="Event">
-	                    <group col="6" colspan="4">
-	                         <separator colspan="6" string="Visibility"/>
-	                         <field name="user_id" string="Responsible User" />
-	                         <field name="show_as" string="Show time as"/>
-	                         <field name="class" string="Privacy"/>
-	                         <field name="recurrent_id" invisible="1" />
-	                         <field name="recurrent_uid" invisible="1" />
-	                    </group>
-	                    <separator string="Description" colspan="4" />
-	                    <field name="description" nolabel="1" colspan="4" />
-	                    <separator colspan="4"/>
-	                    </page>
-	                    <page string="Invitation Detail">
-	                        <button string="Invite People"
-	                            name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-	                            icon="terp-partner" type="action"
-	                            context="{'model' : 'calendar.event', 'attendee_field':'attendee_ids'}" colspan="2"/>
-	                        <field name="attendee_ids" colspan="4"
-	                            nolabel="1" widget="one2many" mode="tree,form">
-	                            <tree string="Invitation details" editable="top">
-	                                <field name="email" />
-	                                <field name="role" width="200" select="1" />
-	                                <field name="state" />
-	                            </tree>
-	                            <form string="Invitation details">
-	                                <notebook colspan="4">
-	                                    <page string="Details">
-	                                        <field name="email" />
-	                                        <field name="rsvp" select="1" />
-	                                        <field name="cutype" select="1" />
-	                                        <field name="role" select="1" />
-	                                        <separator colspan="4" string="" />
-	                                        <group col="6" colspan="4">
-	                                            <field name="state" select="2" />
-	                                            <button name="do_tentative"
-	                                            	states="needs-action,declined,accepted"
-	                                            	string="Uncertain"
-	                                            	type="object"
-	                                            	icon="terp-crm" />
-	                                            <button name="do_accept"
-	                                            	string="Accept"
-	                                            	states="needs-action,tentative,declined"
-	                                            	type="object"
-	                                            	icon="gtk-apply" />
-	                                            <button name="do_decline"
-	                                            	string="Decline"
-	                                            	states="needs-action,tentative,accepted"
-	                                            	type="object"
-	                                            	icon="gtk-cancel" />
-	                                            <button
-	                                            	name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-	                                            	string="Delegate"
-	                                            	type="action"
-	                                            	icon="gtk-sort-descending"
-	                                            	states="needs-action,tentative,declined,accepted"
-	                                            	context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
-	                                        </group>
-	                                    </page>
-	                                </notebook>
-	                            </form>
-	                        </field>
-	                    </page>
-	                </notebook>
-	            </form>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="event_form_view">
+            <field name="name">Event Form</field>
+            <field name="model">calendar.event</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Events">
+                    <group col="6" colspan="4">
+                        <field name="name" select="1" string="Summary"
+                            colspan="4" />
+                        <field name="allday" colspan="2" on_change="onchange_allday(allday)" />
+                        <newline/>
+                        <field name="date" string="Start Date" required="1" select="1"
+                            on_change="onchange_dates(date,duration,False,allday)" />
+                        <field name="duration" widget="float_time"
+                            on_change="onchange_dates(date,duration,False,allday)" attrs="{'invisible': [('allday', '=', True)]}"/>
+                        <field name="date_deadline" string="End Date" required="1"
+                            on_change="onchange_dates(date,False,date_deadline)" />
+                        <field name="location" />
+                        <field name="alarm_id" string="Reminder"
+                            widget="selection" />
+                        <group colspan="2" col="4" >
+                               <field name="rrule_type" string="Recurrency"
+                                    colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
+                               <button string="Edit All"
+                                   help="Edit all Ourrences of recurrent Meeting"
+                                   attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
+                                   name="open_event" icon="gtk-edit"
+                                   type="object" />
+                        </group>
+                    </group>
+                    <group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
+                        <separator string="Select data for Custom Rule" colspan="8"/>
+                        <group col="8" colspan="4">
+                            <field name="freq" />
+                            <field name="interval" />
+                            <field name="count" />
+                            <field name="end_date" />
+                        </group>
+                        <group col="14" colspan="4" name="Select weekdays"
+                            attrs="{'invisible' : [('freq','!=','weekly')]}">
+                            <field name="mo" colspan="1" />
+                            <field name="tu" colspan="1" />
+                            <field name="we" colspan="1" />
+                            <field name="th" colspan="1" />
+                            <field name="fr" colspan="1" />
+                            <field name="sa" colspan="1" />
+                            <field name="su" colspan="1" />
+                            <newline />
+                        </group>
+                        <group col="10" colspan="4"
+                            attrs="{'invisible' : [('freq','!=','monthly'), ('freq','!=','yearly')]}">
+                            <group col="2" colspan="1">
+                                <field name="select1" />
+                            </group>
+                            <group col="2" colspan="1"
+                                attrs="{'invisible' : [('select1','=','day')]}">
+                                <field name="day"
+                                    attrs="{'required' : [('select1','=','date')]}" />
+                            </group>
+                            <group col="3" colspan="1"
+                                attrs="{'invisible' : [('select1','=','date')]}">
+                                <field name="byday" string="The"
+                                    attrs="{'required' : [('select1','=','day')]}" />
+                                <field name="week_list" nolabel="1"
+                                    attrs="{'required' : [('select1','=','day')]}" />
+                            </group>
+                            <group col="1" colspan="1"
+                                attrs="{'invisible' : [('freq','!=','yearly')]}">
+                                <field name="month_list" string="of"
+                                    colspan="1"
+                                    attrs="{'required' : [('freq','=','yearly')]}" />
+                            </group>
+                        </group>
+                    </group>
+                    <notebook colspan="4">
+                    <page string="Event">
+                        <group col="6" colspan="4">
+                             <separator colspan="6" string="Visibility"/>
+                             <field name="user_id" string="Responsible User" />
+                             <field name="show_as" string="Show time as"/>
+                             <field name="class" string="Privacy"/>
+                             <field name="recurrent_id" invisible="1" />
+                             <field name="recurrent_uid" invisible="1" />
+                        </group>
+                        <separator string="Description" colspan="4" />
+                        <field name="description" nolabel="1" colspan="4" />
+                        <separator colspan="4"/>
+                        </page>
+                        <page string="Invitation Detail">
+                            <button string="Invite People"
+                                name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                                icon="terp-partner" type="action"
+                                context="{'model' : 'calendar.event', 'attendee_field':'attendee_ids'}" colspan="2"/>
+                            <field name="attendee_ids" colspan="4"
+                                nolabel="1" widget="one2many" mode="tree,form">
+                                <tree string="Invitation details" editable="top">
+                                    <field name="email" />
+                                    <field name="role" width="200" select="1" />
+                                    <field name="state" />
+                                </tree>
+                                <form string="Invitation details">
+                                    <notebook colspan="4">
+                                        <page string="Details">
+                                            <field name="email" />
+                                            <field name="rsvp" select="1" />
+                                            <field name="cutype" select="1" />
+                                            <field name="role" select="1" />
+                                            <separator colspan="4" string="" />
+                                            <group col="6" colspan="4">
+                                                <field name="state" select="2" />
+                                                <button name="do_tentative"
+                                                    states="needs-action,declined,accepted"
+                                                    string="Uncertain"
+                                                    type="object"
+                                                    icon="terp-crm" />
+                                                <button name="do_accept"
+                                                    string="Accept"
+                                                    states="needs-action,tentative,declined"
+                                                    type="object"
+                                                    icon="gtk-apply" />
+                                                <button name="do_decline"
+                                                    string="Decline"
+                                                    states="needs-action,tentative,accepted"
+                                                    type="object"
+                                                    icon="gtk-cancel" />
+                                                <button
+                                                    name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                                                    string="Delegate"
+                                                    type="action"
+                                                    icon="gtk-sort-descending"
+                                                    states="needs-action,tentative,declined,accepted"
+                                                    context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                                            </group>
+                                        </page>
+                                    </notebook>
+                                </form>
+                            </field>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
 
-		<!-- Event Tree View  -->
+        <!-- Event Tree View  -->
 
-		<record model="ir.ui.view" id="event_tree_view">
-	        <field name="name">Event Tree</field>
-	        <field name="model">calendar.event</field>
-	        <field name="type">tree</field>
-	        <field name="arch" type="xml">
-	            <tree string="Events">
-	            	<field name="name" string="Subject" />
-	            	<field name="date" string="Meeting Date" />
-	            	<field name="location" />
-	            	<field name="show_as" />
-	            	<field name="class" string="Privacy" />
-	            	<field name="user_id" invisible="1"/>
-	            </tree>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="event_tree_view">
+            <field name="name">Event Tree</field>
+            <field name="model">calendar.event</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Events">
+                    <field name="name" string="Subject" />
+                    <field name="date" string="Meeting Date" />
+                    <field name="location" />
+                    <field name="show_as" />
+                    <field name="class" string="Privacy" />
+                    <field name="user_id" invisible="1"/>
+                </tree>
+            </field>
+        </record>
 
-		<!-- Event Calendar View  -->
+        <!-- Event Calendar View  -->
 
-		<record model="ir.ui.view" id="event_calendar_view">
-	        <field name="name">Events Calendar</field>
-	        <field name="model">calendar.event</field>
-	        <field name="type">calendar</field>
-	        <field name="priority" eval="2"/>
-	        <field name="arch" type="xml">
-	            <calendar string="Events" date_start="date" color="show_as" date_delay="duration">
-	                <field name="name"/>
-	                <field name="class"/>
-	                <field name="show_as"/>
-	            </calendar>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="event_calendar_view">
+            <field name="name">Events Calendar</field>
+            <field name="model">calendar.event</field>
+            <field name="type">calendar</field>
+            <field name="priority" eval="2"/>
+            <field name="arch" type="xml">
+                <calendar string="Events" date_start="date" color="show_as" date_delay="duration">
+                    <field name="name"/>
+                    <field name="class"/>
+                    <field name="show_as"/>
+                </calendar>
+            </field>
+        </record>
 
-		<!--	 Event Search View-->
+        <!--     Event Search View-->
 
-	    <record id="view_calendar_event_filter" model="ir.ui.view">
-	        <field name="name">Calendar Events Search</field>
-	        <field name="model">calendar.event</field>
-	        <field name="type">search</field>
-	        <field name="arch" type="xml">
+        <record id="view_calendar_event_filter" model="ir.ui.view">
+            <field name="name">Calendar Events Search</field>
+            <field name="model">calendar.event</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
                 <search string="Search Events">
                        <group col="12" colspan="4">
                            <filter icon="terp-go-today" string="My Events"
@@ -396,36 +397,36 @@
                            <field name="class" select="1"/>
                        </group>
                        <newline/>
-						<group expand="0" string="Group By...">
-							<filter string="Date" icon="terp-go-month"
-						        domain="[]" context="{'group_by':'date'}" />
-						    <filter string="Availability" icon="terp-camera_test"
-						        domain="[]" context="{'group_by':'show_as'}" />
-						    <filter string="Privacy" icon="terp-locked"
-						        domain="[]" context="{'group_by':'class'}" />
-						    <separator orientation="vertical" />
-						    <filter string="Responsible" icon="terp-personal" domain="[]"
-						        context="{'group_by':'user_id'}" />
-						</group>
+                        <group expand="0" string="Group By...">
+                            <filter string="Date" icon="terp-go-month"
+                                domain="[]" context="{'group_by':'date'}" />
+                            <filter string="Availability" icon="terp-camera_test"
+                                domain="[]" context="{'group_by':'show_as'}" />
+                            <filter string="Privacy" icon="terp-locked"
+                                domain="[]" context="{'group_by':'class'}" />
+                            <separator orientation="vertical" />
+                            <filter string="Responsible" icon="terp-personal" domain="[]"
+                                context="{'group_by':'user_id'}" />
+                        </group>
                 </search>
             </field>
-		</record>
+        </record>
 
 
-	    <!-- Event action  -->
+        <!-- Event action  -->
 
-		<record id="action_view_event" model="ir.actions.act_window">
-	            <field name="name">Events</field>
-	            <field name="type">ir.actions.act_window</field>
-	            <field name="res_model">calendar.event</field>
-	            <field name="view_type">form</field>
-	            <field name="view_mode">tree,form,calendar</field>
-	            <field name="search_view_id" ref="view_calendar_event_filter"/>
-	        </record>
+        <record id="action_view_event" model="ir.actions.act_window">
+                <field name="name">Events</field>
+                <field name="type">ir.actions.act_window</field>
+                <field name="res_model">calendar.event</field>
+                <field name="view_type">form</field>
+                <field name="view_mode">tree,form,calendar</field>
+                <field name="search_view_id" ref="view_calendar_event_filter"/>
+            </record>
 
-		<!-- Event menu  -->
+        <!-- Event menu  -->
 
-		  <menuitem id="menu_events"
+        <menuitem id="menu_events"
                 name="Events" parent="base.menu_calendar_configuration"
                 sequence="5" action="action_view_event" />
 
diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv
old mode 100755
new mode 100644
index eba4e092f14..a95b1e1a129
--- a/addons/base_calendar/security/ir.model.access.csv
+++ b/addons/base_calendar/security/ir.model.access.csv
@@ -1,9 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_calendar_attendee","calendar.attendee","model_calendar_attendee",,1,1,1,1
-"access_calendar_alarm","calendar.alarm","model_calendar_alarm",,1,1,1,1
-"access_res_alarm","res.alarm","model_res_alarm",,1,1,1,1
-"access_calendar_event_all","calendar.event","model_calendar_event",,1,1,1,1
-"access_calendar_todo","calendar.todo","model_calendar_todo",,1,1,1,1
-"access_base_calendar_invite_attendee","base_calendar.invite.attendee","model_base_calendar_invite_attendee",,1,1,1,1
-"access_calendar_event_edit_all","calendar_event_edit_all","model_calendar_event_edit_all",,1,1,1,1
-"access_base_calendar_set_exrule","base.calendar.set.exrule","model_base_calendar_set_exrule",,1,1,1,1
+"access_calendar_attendee","calendar.attendee","model_calendar_attendee",base.group_user,1,1,1,1
+"access_calendar_alarm","calendar.alarm","model_calendar_alarm",base.group_user,1,1,1,1
+"access_res_alarm","res.alarm","model_res_alarm",base.group_user,1,1,1,1
+"access_calendar_event_all","calendar.event","model_calendar_event",base.group_user,1,1,1,1
+"access_calendar_todo","calendar.todo","model_calendar_todo",base.group_user,1,1,1,1
+"access_base_calendar_invite_attendee","base_calendar.invite.attendee","model_base_calendar_invite_attendee",base.group_user,1,1,1,1
+"access_calendar_event_edit_all","calendar_event_edit_all","model_calendar_event_edit_all",base.group_user,1,1,1,1
+"access_base_calendar_set_exrule","base.calendar.set.exrule","model_base_calendar_set_exrule",base.group_user,1,1,1,1
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index f854981858c..19e3f731606 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -2,22 +2,22 @@
 <openerp>
     <data>
         <menuitem id="base.menu_crm_config_sales" name="Sales"
-            parent="base.menu_base_config" sequence="1" groups="base.group_extended"/>
+            parent="base.menu_base_config" sequence="1"/>
 
         <menuitem id="menu_crm_config_lead" name="Lead"
             parent="base.menu_crm_config_sales" sequence="0" groups="base.group_extended"/>
 
         <menuitem id="menu_crm_config_opportunity" name="Opportunity"
-            parent="base.menu_crm_config_sales" sequence="1" groups="base.group_extended"/>
+            parent="base.menu_crm_config_sales" sequence="1"/>
 
         <menuitem id="menu_crm_config_meeting" name="Meeting"
-            parent="base.menu_base_config" sequence="4" groups="base.group_extended"/>
+            parent="base.menu_base_config" sequence="4"/>
 
         <menuitem id="menu_crm_config_phonecall" name="Phone Call"
             parent="base.menu_base_config" sequence="5" groups="base.group_extended"/>
 
         <menuitem id="base.next_id_64" name="Reporting"
-        	parent="base.menu_base_partner" sequence="8" />
+            parent="base.menu_base_partner" sequence="8" />
 
         <!-- Case Sections Form View -->
 
@@ -57,7 +57,7 @@
             </field>
         </record>
 
-		<!-- Case Sections Tree View -->
+        <!-- Case Sections Tree View -->
 
         <record id="crm_case_section_view_tree" model="ir.ui.view">
             <field name="name">crm.case.section.tree</field>
@@ -73,7 +73,7 @@
             </field>
         </record>
 
-		<!-- Case Sections Action -->
+        <!-- Case Sections Action -->
 
         <record id="crm_case_section_act" model="ir.actions.act_window">
             <field name="name">Sales Team</field>
@@ -82,7 +82,7 @@
             <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
 
-		<!-- CRM Stage Tree View -->
+        <!-- CRM Stage Tree View -->
 
         <record model="ir.ui.view" id="crm_case_stage_tree">
             <field name="name">crm.case.stage.tree</field>
@@ -99,7 +99,7 @@
             </field>
         </record>
 
-		<!-- CRM Stage Form View -->
+        <!-- CRM Stage Form View -->
 
         <record model="ir.ui.view" id="crm_case_stage_form">
             <field name="name">crm.case.stage.form</field>
@@ -120,7 +120,7 @@
             </field>
         </record>
 
-		<!-- CRM Stage Action -->
+        <!-- CRM Stage Action -->
 
         <record id="crm_case_stage_act" model="ir.actions.act_window">
             <field name="name">Stages</field>
@@ -144,7 +144,7 @@
             </field>
         </record>
 
-		<!-- Case Categories Tree View -->
+        <!-- Case Categories Tree View -->
 
         <record id="crm_case_categ_tree-view" model="ir.ui.view">
             <field name="name">crm.case.categ.tree</field>
@@ -158,7 +158,7 @@
             </field>
         </record>
 
-		<!-- Case Categories Action -->
+        <!-- Case Categories Action -->
 
         <record id="crm_case_categ-act" model="ir.actions.act_window">
             <field name="name">Categories</field>
@@ -173,7 +173,7 @@
 
 
 
-		<!-- Resource Type of case Tree View -->
+        <!-- Resource Type of case Tree View -->
 
         <record model="ir.ui.view" id="crm_case_resource_type_tree">
             <field name="name">crm.case.resource.type.tree</field>
@@ -188,7 +188,7 @@
             </field>
         </record>
 
-		<!-- Resource Type of case Form View -->
+        <!-- Resource Type of case Form View -->
 
         <record model="ir.ui.view" id="crm_case_resource_type_form">
             <field name="name">crm.case.resource.type.form</field>
@@ -203,7 +203,7 @@
             </field>
         </record>
 
-		<!-- Resource Type of case Action -->
+        <!-- Resource Type of case Action -->
 
         <record id="crm_case_resource_type_act" model="ir.actions.act_window">
             <field name="name">Resource Type</field>
@@ -220,7 +220,7 @@
             <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
 
-		<!-- Cases Tree View  -->
+        <!-- Cases Tree View  -->
 
         <record id="crm_case_log_tree-view" model="ir.ui.view">
             <field name="name">crm.case.log.tree</field>
@@ -240,7 +240,7 @@
             </field>
         </record>
 
-		<!-- Segmentation line Tree View  -->
+        <!-- Segmentation line Tree View  -->
 
         <record id="crm_segmentation_line_tree-view" model="ir.ui.view">
             <field name="name">crm.segmentation.line.tree</field>
@@ -257,7 +257,7 @@
             </field>
         </record>
 
-		<!-- Segmentation line Form View  -->
+        <!-- Segmentation line Form View  -->
 
         <record id="crm_segmentation_line-view" model="ir.ui.view">
             <field name="name">crm.segmentation.line.form</field>
@@ -277,7 +277,7 @@
             </field>
         </record>
 
-		<!-- CRM Segmentation  Form View  -->
+        <!-- CRM Segmentation  Form View  -->
 
         <record id="crm_segmentation-view" model="ir.ui.view">
             <field name="name">crm.segmentation.form</field>
@@ -322,7 +322,7 @@
             </field>
         </record>
 
-		<!-- CRM Segmentation  Tree View  -->
+        <!-- CRM Segmentation  Tree View  -->
 
         <record id="crm_segmentation_tree-view" model="ir.ui.view">
             <field name="name">crm.segmentation.tree</field>
@@ -383,7 +383,7 @@
                 </field>
         </record>
 
-		<!-- Inherit View From Partner  -->
+        <!-- Inherit View From Partner  -->
 
         <record id="view_partners_form_crm1" model="ir.ui.view">
                 <field name="name">view.res.partner.form.crm.inherited1</field>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index f6ac9238b3c..0601cd47c71 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -232,11 +232,9 @@
        </record>
 
        <menuitem name="Leads Analysis" id="menu_report_crm_leads_tree"
-           groups="base.group_extended"
            parent="base.next_id_64" action="action_report_crm_lead" />
 
-		<menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree"
-           groups="base.group_extended"
+       <menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree"
            parent="base.next_id_64" action="action_report_crm_opportunity" />
 
     </data>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index ddc50460e31..597d06faf7d 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -189,7 +189,6 @@
 
         <menuitem name="Phone Calls"
             action="action_report_crm_phonecall"
-            groups="base.group_extended"
             id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" />
 
     </data>
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 24523f7b072..769cb5d5c81 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -4,62 +4,62 @@
 
          <!--  Partners inherited form -->
 
-		<record id="view_crm_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.crm.info.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//notebook[last()]" position="after">
-                    <notebook colspan="4">
-		               		<page string="CRM">
-								<field name="meeting_ids" colspan="4" nolabel="1" />
-								<field name="phonecall_ids" colspan="4" nolabel="1" />
-								<field name="opportunity_ids" colspan="4" nolabel="1" domain="[('type', '=', 'opportunity')]">
-		               				<tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">
-						                <field name="create_date"/>
-						                <field name="partner_name"/>
-						                <field name="name"/>
-						                <field name="email_from"/>
-						                <field name="phone"/>
-						
-						                <field name="categ_id" invisible="1"/>
-						                <field name="type_id" invisible="1"/>
-						                <field name="referred" invisible="1"/>
-						
-						                <field name="stage_id"/>
-						                <button name="stage_previous" string="Previous"
-						                    states="open,pending" type="object" icon="gtk-go-back" />
-						                <button name="stage_next" string="Next"
-						                    states="open,pending" type="object"
-						                    icon="gtk-go-forward" />
-						                <field name="section_id"
-						                    invisible="context.get('invisible_section', True)" />
-						                <field name="user_id" />
-						                <field name="state" />
-						                <button name="case_open" string="Open"
-						                    states="draft,pending" type="object"
-						                    icon="gtk-go-forward" />
-						                <button name="case_close" string="Close"
-						                    states="open,draft,pending" type="object"
-						                    icon="gtk-close" />
-						                <button string="Convert to Opportunity"
-						                    name="convert_opportunity"
-						                    states="draft,open,pending" icon="gtk-index"
-						                    type="object" />
-						                <button name="case_escalate" string="Escalate"
-						                    states="open,draft,pending" type="object"
-						                    icon="gtk-go-up" />
-						                <button name="case_cancel" string="Cancel"
-						                    states="draft,open,pending" type="object"
-						                    icon="gtk-cancel" />
-						            </tree>
-		               			</field>
-							</page>
-						</notebook>
-                </xpath>
-            </field>
-        </record>
+<!--		<record id="view_crm_partner_info_form" model="ir.ui.view">-->
+<!--            <field name="name">res.partner.crm.info.inherit</field>-->
+<!--            <field name="model">res.partner</field>-->
+<!--            <field name="type">form</field>-->
+<!--            <field name="inherit_id" ref="base.view_partner_form"/>-->
+<!--            <field name="arch" type="xml">-->
+<!--                <xpath expr="//notebook[last()]" position="after">-->
+<!--                    <notebook colspan="4">-->
+<!--		               		<page string="CRM">-->
+<!--								<field name="meeting_ids" colspan="4" nolabel="1" />-->
+<!--								<field name="phonecall_ids" colspan="4" nolabel="1" />-->
+<!--								<field name="opportunity_ids" colspan="4" nolabel="1" domain="[('type', '=', 'opportunity')]">-->
+<!--		               				<tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">-->
+<!--						                <field name="create_date"/>-->
+<!--						                <field name="partner_name"/>-->
+<!--						                <field name="name"/>-->
+<!--						                <field name="email_from"/>-->
+<!--						                <field name="phone"/>-->
+<!--						-->
+<!--						                <field name="categ_id" invisible="1"/>-->
+<!--						                <field name="type_id" invisible="1"/>-->
+<!--						                <field name="referred" invisible="1"/>-->
+<!--						-->
+<!--						                <field name="stage_id"/>-->
+<!--						                <button name="stage_previous" string="Previous"-->
+<!--						                    states="open,pending" type="object" icon="gtk-go-back" />-->
+<!--						                <button name="stage_next" string="Next"-->
+<!--						                    states="open,pending" type="object"-->
+<!--						                    icon="gtk-go-forward" />-->
+<!--						                <field name="section_id"-->
+<!--						                    invisible="context.get('invisible_section', True)" />-->
+<!--						                <field name="user_id" />-->
+<!--						                <field name="state" />-->
+<!--						                <button name="case_open" string="Open"-->
+<!--						                    states="draft,pending" type="object"-->
+<!--						                    icon="gtk-go-forward" />-->
+<!--						                <button name="case_close" string="Close"-->
+<!--						                    states="open,draft,pending" type="object"-->
+<!--						                    icon="gtk-close" />-->
+<!--						                <button string="Convert to Opportunity"-->
+<!--						                    name="convert_opportunity"-->
+<!--						                    states="draft,open,pending" icon="gtk-index"-->
+<!--						                    type="object" />-->
+<!--						                <button name="case_escalate" string="Escalate"-->
+<!--						                    states="open,draft,pending" type="object"-->
+<!--						                    icon="gtk-go-up" />-->
+<!--						                <button name="case_cancel" string="Cancel"-->
+<!--						                    states="draft,open,pending" type="object"-->
+<!--						                    icon="gtk-cancel" />-->
+<!--						            </tree>-->
+<!--		               			</field>-->
+<!--							</page>-->
+<!--						</notebook>-->
+<!--                </xpath>-->
+<!--            </field>-->
+<!--        </record>-->
 
     </data>
 </openerp>
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index bbd437dba47..a6935144e7e 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -1,19 +1,23 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_crm_segmentation_user","crm.segmentation user","model_crm_segmentation","crm.group_crm_user",1,0,0,0
+"access_crm_segmentation_line_user","crm.segmentation.line user","model_crm_segmentation_line","crm.group_crm_user",1,0,0,0
 "access_crm_segmentation","crm.segmentation","model_crm_segmentation","crm.group_crm_manager",1,1,1,1
 "access_crm_segmentation_line","crm.segmentation.line","model_crm_segmentation_line","crm.group_crm_manager",1,1,1,1
 "access_crm_case_section","crm.case.section","model_crm_case_section","crm.group_crm_user",1,0,0,0
 "access_crm_case_categ","crm.case.categ","model_crm_case_categ","crm.group_crm_user",1,0,0,0
-"access_crm_meeting","crm.meeting","model_crm_meeting","crm.group_crm_manager",1,1,1,1
-"access_crm_lead","crm.lead","model_crm_lead","crm.group_crm_manager",1,1,1,1
-"access_crm_phonecall","crm.phonecall","model_crm_phonecall","crm.group_crm_manager",1,1,1,1
+"access_crm_meeting","crm.meeting","model_crm_meeting","crm.group_crm_user",1,1,1,1
+"access_crm_lead","crm.lead","model_crm_lead","crm.group_crm_user",1,1,1,1
+"access_crm_phonecall","crm.phonecall","model_crm_phonecall","crm.group_crm_user",1,1,1,1
+"access_crm_case_section_user","crm.case.section.user","model_crm_case_section","crm.group_crm_user",1,0,0,0
 "access_crm_case_section_manager","crm.case.section.manager","model_crm_case_section","crm.group_crm_manager",1,1,1,1
+"access_crm_case_categ_user","crm.case.categ.user","model_crm_case_categ","crm.group_crm_user",1,0,0,0
 "access_crm_case_categ_manager","crm.case.categ.manager","model_crm_case_categ","crm.group_crm_manager",1,1,1,1
 "access_crm_case_stage","crm.case.stage","model_crm_case_stage","crm.group_crm_user",1,0,0,0
 "access_crm_case_stage_manager","crm.case.stage","model_crm_case_stage","crm.group_crm_manager",1,1,1,1
 "access_crm_case_resource_type_user","crm_case_resource_type user","model_crm_case_resource_type","crm.group_crm_user",1,0,0,0
 "access_crm_case_resource_type_manager","crm_case_resource_type manager","model_crm_case_resource_type","crm.group_crm_manager",1,1,1,1
-"access_crm_lead_report_user","crm.lead.report","model_crm_lead_report","crm.group_crm_user",1,0,0,0
-"access_crm_phonecall_report_user","crm.phonecall.report","model_crm_phonecall_report","crm.group_crm_user",1,0,0,0
+"access_crm_lead_report_manager","crm.lead.report","model_crm_lead_report","crm.group_crm_manager",1,0,0,0
+"access_crm_phonecall_report_manager","crm.phonecall.report","model_crm_phonecall_report","crm.group_crm_manager",1,0,0,0
 "access_crm_lead2partner","crm.lead2partner","model_crm_lead2partner","crm.group_crm_user",1,1,1,1
 "access_crm_lead2opportunity","crm.lead2opportunity","model_crm_lead2opportunity","crm.group_crm_user",1,1,1,1
 "access_crm_opportunity2phonecall","crm.opportunity2phonecall","model_crm_opportunity2phonecall","crm.group_crm_user",1,1,1,1
@@ -24,6 +28,11 @@
 "access_crm_send_mail_attachment","crm.send.mail.attachment","model_crm_send_mail_attachment","crm.group_crm_user",1,1,1,1
 "access_crm_partner2opportunity","crm.partner2opportunity","model_crm_partner2opportunity","crm.group_crm_user",1,1,1,1
 "access_crm_lead2opportunity_partner","crm.lead2opportunity.partner","model_crm_lead2opportunity_partner","crm.group_crm_user",1,1,1,1
-"access_crm_installer","crm.installer.rule","model_crm_installer","crm.group_crm_user",1,1,1,1
-"access_crm_lead_forward_to_partner","crm.lead.forward.to.partner","model_crm_lead_forward_to_partner","crm.group_crm_user",2,2,2,2
+"access_crm_installer","crm.installer.rule","model_crm_installer","base.group_system",1,1,1,1
+"access_crm_lead_forward_to_partner","crm.lead.forward.to.partner","model_crm_lead_forward_to_partner","crm.group_crm_user",1,1,1,1
 "access_mailgate_thread","mailgate.thread","model_mailgate_thread","crm.group_crm_user",1,1,1,1
+"access_res_partner","res.partner.crm.user","base.model_res_partner","crm.group_crm_user",1,0,0,0
+"access_res_partner_address","res.partner.address.crm.user","base.model_res_partner_address","crm.group_crm_user",1,0,0,0
+"access_res_partner_category","res.partner.category.crm.user","base.model_res_partner_category","crm.group_crm_user",1,0,0,0
+"mail_gateway_mailgate_message","mail_gateway.mailgate.message","model_mailgate_message","crm.group_crm_user",1,1,1,1
+"mail_gateway_mailgate_thread","mail_gateway.mailgate.thread","model_mailgate_thread","crm.group_crm_user",1,1,1,1
diff --git a/addons/crm_profiling/wizard/open_questionnaire.py b/addons/crm_profiling/wizard/open_questionnaire.py
index 0fc50b9186a..91b82a02d1a 100644
--- a/addons/crm_profiling/wizard/open_questionnaire.py
+++ b/addons/crm_profiling/wizard/open_questionnaire.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 import pooler
@@ -50,11 +50,11 @@ class open_questionnaire(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch': _questionnaire_choice_arch, 'fields': _questionnaire_choice_fields, 'state':[('end', 'Cancel'), ('open', 'Open Questionnaire')]}
+            'result': {'type': 'form', 'arch': _questionnaire_choice_arch, 'fields': _questionnaire_choice_fields, 'state':[('end', 'Cancel','gtk-cancel'), ('open', 'Open Questionnaire','terp-camera_test')]}
         },
         'open': {
             'actions': [build_form],
-            'result': {'type': 'form', 'arch':_QUEST_FORM, 'fields': _QUEST_FIELDS, 'state':[('end', 'Cancel'), ('compute', 'Save Data')]}
+            'result': {'type': 'form', 'arch':_QUEST_FORM, 'fields': _QUEST_FIELDS, 'state':[('end', 'Cancel','gtk-cancel'), ('compute', 'Save Data','terp-stock_format-scientific')]}
         },
         'compute': {
             'actions': [],
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 0bab191d942..b1fa9a510c9 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -3,7 +3,7 @@
     <!--<menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
     <menuitem name="Document Configuration" id="menu_document_configuration" parent="menu_document"/>-->
 
-    <menuitem name="Knowledge Management" icon="terp-stock" id="base.menu_document" sequence="4"/>
+    <menuitem name="Knowledge Management" icon="terp-stock" id="base.menu_document" sequence="4" groups="base.group_user"/>
     <menuitem name="Configuration" id="base.menu_document_configuration" parent="base.menu_document" sequence="50"/>
     <menuitem name="Document Management" id="menu_document_management_configuration" parent="base.menu_document_configuration" sequence="1"/>
 
@@ -13,15 +13,15 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Storage Media">
-            	<group colspan="4" col="4">
-	                <field name="name" select="1" colspan="4"/>
-	                <field name="user_id"/>
-	                <field name="type"/>
-	                <field name="online"/>
-	                <field name="readonly"/>
+                <group colspan="4" col="4">
+                    <field name="name" select="1" colspan="4"/>
+                    <field name="user_id"/>
+                    <field name="type"/>
+                    <field name="online"/>
+                    <field name="readonly"/>
                 </group>
                 <group colspan="2" attrs="{'invisible':[('type','!=','realstore')]}">
-                	<field name="path"/>
+                    <field name="path"/>
                 </group>
             </form>
         </field>
@@ -71,13 +71,13 @@
                     <newline/>
                     <field name="domain" attrs="{'required': [('type','=','ressource')], 'readonly': [('type','=','static')]}"/>
                     <field name="ressource_tree"/>
-					<field name="resource_field" 	domain="[('model_id','=',ressource_type_id), ('ttype', 'in', ('char', 'selection', 'date', 'datetime'))]"/>
+                    <field name="resource_field"     domain="[('model_id','=',ressource_type_id), ('ttype', 'in', ('char', 'selection', 'date', 'datetime'))]"/>
                     <field name="ressource_id" select="2" readonly="1"/>
                     <field name="ressource_parent_type_id"/>
                 </page>
                 <page string="Generated Files">
                     <label colspan="4" string="For each entry here, virtual files will appear in this folder." />
-					<field name="content_ids" nolabel="1" colspan="4" attrs="{'readonly': [('ressource_type_id','=',False)]}">
+                    <field name="content_ids" nolabel="1" colspan="4" attrs="{'readonly': [('ressource_type_id','=',False)]}">
                         <form string="Contents">
                             <field name="name"/>
                             <field name="sequence"/>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 75da20cef20..5e862781408 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -10,6 +10,7 @@
             id="menu_hr_configuration"
             name="Configuration"
             parent="hr.menu_hr_root"
+            groups="group_hr_manager"
             sequence="50" />
         <menuitem
             id="menu_view_employee_category_configuration_form"
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index e43c73ed108..50656820e99 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -1,12 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_evaluation_evaluation","hr_evaluation.evaluation","model_hr_evaluation_evaluation","hr.group_hr_user",1,0,0,0
-"access_hr_evaluation_evaluation_manager","hr_evaluation.evaluation","model_hr_evaluation_evaluation","hr.group_hr_manager",1,1,1,1
+"access_hr_evaluation_evaluation","hr_evaluation.evaluation","model_hr_evaluation_evaluation","hr.group_hr_user",1,1,1,1
 "access_hr_evaluation_plan","hr_evaluation.plan","model_hr_evaluation_evaluation","hr.group_hr_user",1,0,0,0
 "access_hr_evaluation_plan_manager","hr_evaluation.plan","model_hr_evaluation_plan","hr.group_hr_manager",1,1,1,1
 "access_hr_evaluation_plan_phase","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase","hr.group_hr_user",1,0,0,0
 "access_hr_evaluation_plan_phase_manager","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase","hr.group_hr_manager",1,1,1,1
-"access_hr_evaluation_interview","hr.evaluation.interview","model_hr_evaluation_interview","hr.group_hr_user",1,0,0,0
-"access_hr_evaluation_interview_manager","hr.evaluation.interview","model_hr_evaluation_interview","hr.group_hr_manager",1,1,1,1
-"access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report",,1,0,0,0
-"access_hr_evaluation_reminder_manager","hr.evaluation.reminder","model_hr_evaluation_reminder","hr.group_hr_manager",1,1,1,1
-"access_hr_evaluation_reminder","hr.evaluation.reminder","model_hr_evaluation_reminder","hr.group_hr_user",1,0,0,0
+"access_hr_evaluation_interview","hr.evaluation.interview","model_hr_evaluation_interview","hr.group_hr_user",1,1,1,1
+"access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report","hr.group_hr_manager",1,0,0,0
+"access_hr_evaluation_reminder","hr.evaluation.reminder","model_hr_evaluation_reminder","hr.group_hr_user",1,1,1,1
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index f8898499c4d..40e82cb1a15 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_applicant","hr.applicant","model_hr_applicant","hr.group_hr_manager",1,1,1,1
-"access_hr_recruitment_report","hr.recruitment.report","model_hr_recruitment_report",,1,0,0,0
+"access_hr_applicant","hr.applicant","model_hr_applicant","hr.group_hr_user",1,1,1,1
+"access_hr_recruitment_report","hr.recruitment.report","model_hr_recruitment_report","hr.group_hr_manager",1,0,0,0
diff --git a/addons/hr_timesheet_invoice/security/ir.model.access.csv b/addons/hr_timesheet_invoice/security/ir.model.access.csv
index 6349b4f766c..c8b65d13c36 100644
--- a/addons/hr_timesheet_invoice/security/ir.model.access.csv
+++ b/addons/hr_timesheet_invoice/security/ir.model.access.csv
@@ -3,9 +3,9 @@
 "access_hr_timesheet_invoice_factor_acc_inv","hr_timesheet_invoice.factor.account.invoice","model_hr_timesheet_invoice_factor","account.group_account_invoice",1,1,1,1
 "access_report_analytic_account_close","report.analytic.account.close","model_report_analytic_account_close","account.group_account_manager",1,0,0,0
 "access_report_account_analytic_line_to_invoice","report.account.analytic.line.to.invoice","model_report_account_analytic_line_to_invoice","account.group_account_manager",1,0,0,0
-"access_report_timesheet_user","report_timesheet.user","model_report_timesheet_user","base.group_user",1,0,0,0
-"access_report_timesheet_account","report_timesheet.account","model_report_timesheet_account","base.group_user",1,0,0,0
-"access_report_timesheet_account_date","report_timesheet.account.date","model_report_timesheet_account_date","base.group_user",1,0,0,0
-"access_report_timesheet_invoice","report_timesheet.invoice","model_report_timesheet_invoice","base.group_user",1,0,0,0
-"access_report_random_timesheet","report_random_timesheet","model_report_random_timesheet","base.group_user",1,0,0,0
-"access_report_random_timesheet_lines","random_timesheet_lines","model_random_timesheet_lines","base.group_user",1,0,0,0
+"access_report_timesheet_user","report_timesheet.user","model_report_timesheet_user","hr.group_hr_manager",1,0,0,0
+"access_report_timesheet_account","report_timesheet.account","model_report_timesheet_account","hr.group_hr_manager",1,0,0,0
+"access_report_timesheet_account_date","report_timesheet.account.date","model_report_timesheet_account_date","hr.group_hr_manager",1,0,0,0
+"access_report_timesheet_invoice","report_timesheet.invoice","model_report_timesheet_invoice","hr.group_hr_manager",1,0,0,0
+"access_report_random_timesheet","report_random_timesheet","model_report_random_timesheet","hr.group_hr_manager",1,0,0,0
+"access_report_random_timesheet_lines","random_timesheet_lines","model_random_timesheet_lines","hr.group_hr_manager",1,0,0,0
diff --git a/addons/mrp_repair/__openerp__.py b/addons/mrp_repair/__openerp__.py
index 12a796b4f3b..fa01d7120fd 100644
--- a/addons/mrp_repair/__openerp__.py
+++ b/addons/mrp_repair/__openerp__.py
@@ -34,7 +34,7 @@
            * Notes for the technician and for the final customer           
 """,
     'author': 'Tiny',
-    'depends': ['base', 'sale', 'account'],
+    'depends': ['mrp', 'sale', 'account'],
     'update_xml': [
         'security/ir.model.access.csv',
         'mrp_repair_sequence.xml',        
diff --git a/addons/product/security/ir.model.access.csv b/addons/product/security/ir.model.access.csv
index 062db9e34e8..f1c24509ac9 100644
--- a/addons/product/security/ir.model.access.csv
+++ b/addons/product/security/ir.model.access.csv
@@ -18,7 +18,6 @@
 "access_product_ul_user","product.ul.user","model_product_ul","base.group_user",1,0,0,0
 "access_product_category_user","product.category.user","model_product_category","base.group_user",1,0,0,0
 "access_product_template_user","product.template.user","model_product_template","base.group_user",1,0,0,0
-"access_product_product_user","product.product.user","model_product_product","base.group_user",1,0,0,0
 "access_product_packaging_user","product.packaging.user","model_product_packaging","base.group_user",1,0,0,0
 "access_product_supplierinfo_user","product.supplierinfo.user","model_product_supplierinfo","base.group_user",1,0,0,0
 "access_pricelist_partnerinfo_user","pricelist.partnerinfo.user","model_pricelist_partnerinfo","base.group_user",1,0,0,0
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index de0f55b80b1..a40026f6585 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -24,4 +24,4 @@
 "access_sale_advance_payment_inv_manager","sale.advance.payment.inv","model_sale_advance_payment_inv","group_sale_manager",1,1,1,1
 "access_sale_open_invoice","sale.open.invoice","model_sale_open_invoice","group_sale_user",1,1,1,0
 "access_sale_open_invoice_manager","sale.open.invoice","model_sale_open_invoice","group_sale_manager",1,1,1,1
-
+"access_product_product_sale_user","product.product.sale.user","model_product_product","group_sale_user",1,0,0,0