diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 2a0ed14080f..ba91c4b75dd 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -163,7 +163,8 @@
         <!-- Invitation menu -->
 
            <menuitem id="menu_attendee_invitations"
-            name="Event Invitations" parent="base.menu_calendar_configuration"
+            parent="base.menu_calendar_configuration"
+            groups="base.group_extended"
             sequence="10" action="action_view_attendee_form" />
 
         <!--        ALARM FORM VIEW-->
@@ -496,6 +497,7 @@
 
         <menuitem id="menu_events"
                 name="Events" parent="base.menu_calendar_configuration"
+                groups="base.group_extended"
                 sequence="5" action="action_view_event" />
 
      </data>
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index cb80a7d28e9..2a49e43e683 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -33,9 +33,10 @@
         </record>
 
         <record model="crm.case.stage" id="stage_lead5">
-            <field name="name">Win</field>
+            <field name="name">Won</field>
             <field eval="'100'" name="probability"/>
             <field eval="'5'" name="sequence"/>
+            <field eval="1" name="on_change"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
 
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 2821024bfbf..98b311592b7 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -13,7 +13,8 @@
         <field name="context">{'object_id':'crm.meeting'}</field>
     </record>
 
-     <menuitem action="crm_meeting_categ_action" name="Categories of Meeting"
+     <menuitem action="crm_meeting_categ_action"
+        groups="base.group_extended"
         id="menu_crm_case_meeting-act" parent="base.menu_calendar_configuration" sequence="1"/>
 
     <!-- CRM Meetings Form View -->
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 771212a171d..2b0062eb9d5 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -85,10 +85,11 @@ class crm_opportunity(osv.osv):
         """
         res = super(crm_opportunity, self).case_close(cr, uid, ids, args)
         stage_id = super(crm_opportunity, self).stage_next(cr, uid, ids, context={'force_domain': [('probability', '=', 0)]})
-        if not stage_id:
-            raise osv.except_osv(_('Warning !'), _('There is no stage for lost opportunities defined for this Sale Team.'))
-        value = self.onchange_stage_id(cr, uid, ids, stage_id, context={})['value']
-        value.update({'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'), 'stage_id': stage_id})
+        value = {}
+        if stage_id:
+            value = self.onchange_stage_id(cr, uid, ids, stage_id, context={}).get('value', {})
+            value['stage_id'] = stage_id
+        value.update({'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
 
         res = self.write(cr, uid, ids, value)
         for (id, name) in self.name_get(cr, uid, ids):
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index b52694d8b20..66b6f04553b 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -14,14 +14,14 @@
                             <label string="Stage:" align="1.0"/>
                             <group colspan="1" col="4">
                                 <field name="stage_id" nolabel="1"
+                                    widget="selection"
                                     on_change="onchange_stage_id(stage_id)"
-                                    domain="[('object_id.model', '=', 'crm.lead')]"
-                                    readonly="1" />
+                                    domain="[('object_id.model', '=', 'crm.lead')]"/>
                                 <button name="stage_previous"
-                                states="open,pending" type="object"
-                                icon="gtk-go-back" string="" />
-                                <button name="stage_next" states="open,pending"
-                                type="object" icon="gtk-go-forward" string="" />
+                                    states="draft,open,pending" type="object"
+                                    icon="gtk-go-back" string="" />
+                                <button name="stage_next" states="draft,open,pending"
+                                    type="object" icon="gtk-go-forward" string="" />
                             </group>
                             <field name="user_id"/>
 
@@ -88,7 +88,7 @@
                                     groups="base.group_extended"
                                     icon="gtk-go-up" />
                                 <button name="case_cancel" string="Cancel"
-                                    states="draft,open,pending" type="object"
+                                    states="draft" type="object"
                                     icon="gtk-close" />
                                 <button name="case_mark_lost" string="Mark Lost"
                                     states="open,pending" type="object"
@@ -283,14 +283,6 @@
                             string="Pending"  help="Pending Opportunities"
                             domain="[('state','=','pending')]"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-today" string="Today"
-                            domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                            help="Todays' Opportunities" />
-                        <filter icon="terp-go-week" string="7 Days"
-                            help="Opportunities created during last 7 days"
-                            domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))]"
-                        />
-                        <separator orientation="vertical"/>
                         <field name="name" string="Opportunity"/>
                         <field name="partner_id"/>
                         <field name="user_id">
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index bb15b3631b8..daafc19a621 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -202,6 +202,7 @@
 
          <menuitem action="crm_case_resource_type_act"
             id="menu_crm_case_resource_type_act" sequence="4"
+            groups="base.group_extended"
             parent="base.menu_sale_config_sales" />
 
         <record id="crm_case_section_act_tree" model="ir.actions.act_window">
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 490523b4e12..0f396e65a8b 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -27,8 +27,8 @@
             <field name="hr_recruitment"/>
             <field name="hr_timesheet_sheet"/>
             <field name="hr_contract"/>
-            <field name="hr_evaluation"/>
             <field name="hr_attendance"/>
+            <field name="hr_evaluation" groups="base.group_extended"/>
             <field name="hr_payroll" groups="base.group_extended"/>
             <field name="hr_payroll_account" groups="base.group_extended"/>
           </group>
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
index 1d650d814e9..1bd615b8699 100644
--- a/addons/hr/installer.py
+++ b/addons/hr/installer.py
@@ -51,8 +51,7 @@ class hr_installer(osv.osv_memory):
     _defaults = {
         'hr_holidays': True,
         'hr_expense': True,
-        }
-
+    }
 hr_installer()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 706996ed55a..ab118295db5 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -135,16 +135,6 @@
         </record>
 
          <!--        Emails action-->
-        <record model="ir.actions.act_window" id="action_view_mailgate_message">
-            <field name="name">Emails</field>
-            <field name="res_model">mailgate.message</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('history', '=', True)]</field>
-            <field name="view_id" ref="view_mailgate_message_tree"/>
-            <field name="context">{"search_default_user_id":uid}</field>
-        </record>
-
         <record model="ir.actions.act_window" id="action_view_mailgate_thread">
             <field name="name">Mailgateway Threads</field>
             <field name="res_model">mailgate.thread</field>
@@ -196,18 +186,9 @@
             view_id="view_mailgate_message_tree"
             />
 
-
-      <menuitem name="Emails" id="menu_base_config_mail"
-        parent="base.menu_base_partner" sequence="5" />
-
-    <menuitem name="Emails" id="menu_mailgate_message"
-        parent="menu_base_config_mail"
-        action="mail_gateway.action_view_mailgate_message"
-       />
-
     <act_window
        id="act_res_partner_open_email" name="Attachments"
-        res_model="ir.attachment"
+       res_model="ir.attachment"
        src_model="mailgate.message"
        domain="[('res_id', '=', res_id),('res_model','=',model)]"/>
 
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index b96ba8fb7e3..6cd35f3a533 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -29,10 +29,9 @@
                             <attribute name="string">Configure</attribute>
                   </xpath>
                   <group colspan="8">
+                        <field name="marketing_campaign" />
                         <field name="email_template" />
                         <field name="crm_profiling" />
-                        <field name="marketing_campaign" />
-                        <field name="marketing_campaign_mailchimp" />
                   </group>
                 </data>
             </field>
diff --git a/addons/marketing/marketing_wizard.py b/addons/marketing/marketing_wizard.py
index 8d1a6fa50ed..4b95bbb86da 100644
--- a/addons/marketing/marketing_wizard.py
+++ b/addons/marketing/marketing_wizard.py
@@ -29,10 +29,8 @@ class marketing_installer(osv.osv_memory):
             help="Helps you to design templates of emails and integrate them in your different processes."),
         'marketing_campaign':fields.boolean('Marketing Campaigns',
             help="Helps you to manage marketing campaigns and automate actions and communication steps."),
-        'marketing_campaign_mailchimp':fields.boolean('Mailchimp Integration',
-            help="This modules integrate mailchimp.com's service with OpenERP to automate mass mailings."),
         'crm_profiling':fields.boolean('Profiling Tools',
-            help="Helps you to perform segmentation within partners and design segmentation questionnaires")
+            help="Helps you to perform segmentation of partners and design segmentation questionnaires")
     }
 marketing_installer()
 
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 45ebaa8ee57..7e9ae7ce45e 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -257,11 +257,12 @@
             <field name="domain">[('parent_id','=',False)]</field>
             <field name="view_type">tree</field>
             <field name="view_id" ref="product_category_tree_view"/>
-            <field name="help">Products category opens a tree structure view of your products by category.</field>
+            <field name="help">This is a hyerarchical structure of your product's categories, you can enter a category to browse all products in this category and his children.</field>
         </record>
         <menuitem
             action="product_category_action"
             id="product.menu_products_category"
+            groups="base.group_extended"
             parent="base.menu_product"
             sequence="0"/>
         <record id="product_category_action_form" model="ir.actions.act_window">
diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py
index 06be50a903f..54fd0602802 100644
--- a/addons/profile_tools/installer.py
+++ b/addons/profile_tools/installer.py
@@ -25,15 +25,13 @@ class misc_tools_installer(osv.osv_memory):
     _inherit = 'res.config.installer'
 
     _columns = {
-        'lunch':fields.boolean('Lunch',help='Helps to manage Lunch Orders.'),
-        'subscription':fields.boolean('Recurring Documents',help='Helps to add subscription on documents.'),
-        'survey':fields.boolean('Survey',help='Manages Custom Surveys.'),
-        'idea':fields.boolean('Idea',help='Manages ideas and votes'),
-        'audittrail':fields.boolean('Audit Trail',help="Lets you to track user's operations on specific Objects."),
+        'lunch':fields.boolean('Lunch',help='A simple module to help you to manage Lunch orders.'),
+        'subscription':fields.boolean('Recurring Documents',help='Helps to generate automatically recurring documents.'),
+        'survey':fields.boolean('Survey',help='Allows you to organize surveys.'),
+        'idea':fields.boolean('Ideas Box',help='Promote ideas of the employees, votes and discussion on best ideas.'),
     }
     _defaults = {
         'lunch': True,
     }
-
 misc_tools_installer()
 
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index c9b5f744b77..bc445e7818f 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -26,10 +26,9 @@
           </xpath>
           <group colspan="8">
             <field name="lunch"/>
-            <field name="subscription"/>
-            <field name="survey"/>
             <field name="idea"/>
-            <field name="audittrail"/>
+            <field name="survey"/>
+            <field name="subscription" groups="base.group_extended"/>
           </group>
         </data>
       </field>
diff --git a/addons/project/installer.py b/addons/project/installer.py
index 4662ebeda5d..7a147737768 100644
--- a/addons/project/installer.py
+++ b/addons/project/installer.py
@@ -34,14 +34,10 @@ class project_installer(osv.osv_memory):
         'hr_timesheet_sheet': fields.boolean('Timesheets',
             help="Tracks and helps employees encode and validate timesheets "
                  "and attendances."),
-        'hr_timesheet_invoice': fields.boolean('Invoice Based on Hours',
-            help="Helps generate invoices based on human resources "
-                 "costs and general expenses."),
+        'project_timesheet': fields.boolean('Bill Time on Tasks',
+            help="Helps generate invoices based on time spent on tasks, if activated on the project."),
         'account_budget': fields.boolean('Budgets',
             help="Helps accountants manage analytic and crossover budgets."),
-        'project_messages': fields.boolean('Project Messages',
-            help="Lets employees send messages to other members of the "
-                 "projects they're working on."),
         'project_issue': fields.boolean('Issues Tracker',
             help="Automatically synchronizes project tasks and crm cases."),
         # Methodologies
@@ -50,7 +46,7 @@ class project_installer(osv.osv_memory):
                  "in the SCRUM methodology."),
         'project_gtd': fields.boolean('Getting Things Done',
             help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
-        }
+    }
 
     _defaults={
         'project_issue': True,
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 2c22a4b6743..2b46cc0ab5f 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -27,11 +27,11 @@
             <field name="project_issue"/>
             <field name="project_long_term" groups="base.group_extended"/>
             <field name="hr_timesheet_sheet"/>
-            <field name="hr_timesheet_invoice"/>
+            <field name="project_timesheet"/>
             <field name="account_budget" groups="base.group_extended"/>
-            <field name="project_messages" groups="base.group_extended"/>
+            <newline/>
             <separator string="Methodologies" colspan="4"/>
-            <field name="project_scrum" groups="base.group_extended"/>
+            <field name="project_scrum"/>
             <field name="project_gtd"/>
           </group>
         </data>
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index 021d30da687..e1be86fe661 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -30,7 +30,7 @@
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'project', 'hr_timesheet_sheet', 'hr_timesheet_invoice'],
+    'depends': ['project', 'hr_timesheet_sheet', 'hr_timesheet_invoice'],
     'init_xml': [],
     'update_xml': ["security/ir.model.access.csv","process/project_timesheet_process.xml", "report/task_report_view.xml", "project_timesheet_view.xml"],
     'demo_xml': [],
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index ca6c8cb64c8..089a2389703 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -180,10 +180,11 @@ class crm_make_sale(osv.osv_memory):
         'partner_id': fields.many2one('res.partner', 'Customer', required=True), 
         'sale_order_line': fields.one2many('sale.order.make.line', 'opportunity_order_id', 'Product Line'), 
         'analytic_account': fields.many2one('account.analytic.account', 'Analytic Account'), 
-        'close': fields.boolean('Close Case', help='Check this to close the case after having created the sale order.'), 
+        'close': fields.boolean('Close Opportunity', help='Check this to close the opportunity after having created the sale order.'), 
     }
     _defaults = {
          'shop_id': _get_shop_id, 
+         'close': lambda *args: 1, 
          'partner_id': _selectPartner, 
     }
 
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index c6b589145c7..54550a08bf1 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -9,13 +9,13 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
               <form string="Create a Sale Order" >
-              		<group width="660" height="300">
                     <group colspan="4">
                         <field name="partner_id" required="1"/>
                         <field name="shop_id" required="1" widget="selection"/>
-                        <field name="analytic_account" domain="[('parent_id','!=',False)]" />
-                        <field name="close" required="1"/>
-                    	</group>
+                        <field name="analytic_account" domain="[('type','=','normal')]"
+                            groups="base.group_extended"/>
+                        <field name="close"/>
+                    </group>
                             <field colspan="4" mode="tree,form,graph" name="sale_order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sale Order Lines">
                                     <notebook>
@@ -65,7 +65,6 @@
                     <button special="cancel" string="_Close" icon="gtk-cancel"/>
                     <button name="makeOrder" string="_Create" type="object" icon='gtk-ok'/>
                 </group>
-                </group>
             </form>
           </field>
        </record>