diff --git a/addons/account/account_end_fy.xml b/addons/account/account_end_fy.xml
index 5f4ed44adfe..650bffc58e9 100644
--- a/addons/account/account_end_fy.xml
+++ b/addons/account/account_end_fy.xml
@@ -14,7 +14,7 @@
             action="action_account_period_tree"
             id="menu_action_account_period_close_tree"
             parent="account.menu_account_end_year_treatments"
-            sequence="0" groups="base.group_extended,group_account_manager,group_account_user"/>
+            sequence="0" groups="base.group_extended"/>
         
     </data>
 </openerp>
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 22ab46a1775..7b7e6b308b1 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -26,14 +26,19 @@
         <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
         <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting"/>
         <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/>
-        <menuitem id="menu_journals" sequence="9" name="Journals" parent="menu_finance_accounting" groups="base.group_extended,group_account_manager"/>
-        <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30" groups="group_account_manager"/>
+        <menuitem id="menu_journals" sequence="9" name="Journals" parent="menu_finance_accounting" groups="group_account_manager"/>
+        <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30"/>
         <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
         <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
         <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="5" groups="group_account_user,group_account_manager"/>
-        <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15" groups="base.group_extended,group_account_manager,group_account_user"/>
 
-        <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_manager,group_account_user" sequence="25"/>
+        <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries"
+            parent="menu_finance_periodical_processing" sequence="15"
+            groups="base.group_extended"/>
+
+        <menuitem id="menu_account_end_year_treatments"
+            name="End of Period" parent="menu_finance_periodical_processing"
+            sequence="25"/>
         <menuitem id="menu_finance_periodical_processing_billing" name="Billing" parent="menu_finance_periodical_processing" sequence="35"/>
 
         <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index a8b3f5ad31d..39b861d1775 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -762,7 +762,7 @@
             <field name="search_view_id" ref="view_account_type_search"/>
             <field name="help">An account type is used to determine how an account is used in each journal. The deferral method of an account type determines the process for the annual closing. Reports such as the Balance Sheet and the Profit and Loss report use the category (profit/loss or balance sheet). For example, the account type could be linked to an asset account, expense account or payable account. From this view, you can create and manage the account types you need for your company.</field>
         </record>
-        <menuitem action="action_account_type_form" groups="base.group_extended,group_account_manager" sequence="6" id="menu_action_account_type_form" parent="account_account_menu"/>
+        <menuitem action="action_account_type_form" sequence="6" id="menu_action_account_type_form" parent="account_account_menu"/>
         <!--
     Entries
     -->
@@ -1227,7 +1227,7 @@
             id="menu_action_account_moves_all"
             parent="account.menu_finance_entries"
             sequence="1"
-            groups="group_account_user,group_account_manager"
+            groups="group_account_user"
         />
 
         <record id="action_move_line_select" model="ir.actions.act_window">
@@ -1475,7 +1475,7 @@
             action="action_move_journal_line"
             id="menu_action_move_journal_line_form"
             parent="account.menu_finance_entries"
-            groups="group_account_user,group_account_manager"
+            groups="group_account_user"
             sequence="5"/>
 
         <record id="action_move_line_form" model="ir.actions.act_window">
@@ -1742,7 +1742,7 @@
         </record>
         <menuitem
             action="action_model_form" id="menu_action_model_form" sequence="5"
-            parent="account.menu_configuration_misc" groups="base.group_extended,group_account_manager"/>
+            parent="account.menu_configuration_misc" groups="base.group_extended"/>
 
         <!--
             # Payment Terms
@@ -1842,8 +1842,7 @@
             <field name="search_view_id" ref="view_payment_term_search"/>
         </record>
         <menuitem action="action_payment_term_form"
-            id="menu_action_payment_term_form" parent="menu_configuration_misc"
-            groups="group_account_manager"/>
+            id="menu_action_payment_term_form" parent="menu_configuration_misc"/>
 
         <!--
         # Account Subscriptions
@@ -1958,7 +1957,7 @@
         </record>
         <menuitem
             name="Define Recurring Entries" action="action_subscription_form"
-            groups="base.group_extended,group_account_manager,group_account_user"
+            groups="base.group_extended"
             id="menu_action_subscription_form" sequence="1"
             parent="account.menu_finance_recurrent_entries"/>
 
@@ -2095,17 +2094,17 @@
             id="account_template_folder"
             name="Templates"
             parent="menu_finance_accounting"
-            groups="base.group_multi_company,group_account_manager"/>
+            groups="base.group_multi_company"/>
         <menuitem
             id="account_template_taxes"
             name="Taxes"
             parent="account_template_folder"
-            groups="base.group_multi_company,group_account_manager" sequence="2"/>
+            sequence="2"/>
         <menuitem
             id="account_template_accounts"
             name="Accounts"
             parent="account_template_folder"
-            groups="base.group_multi_company,group_account_manager" sequence="1"/>
+            sequence="1"/>
 
 
         <record id="view_account_template_form" model="ir.ui.view">
@@ -2751,8 +2750,8 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
             <field name="view_id" ref="account_cash_statement_graph"/>
             <field name="act_window_id" ref="action_view_bank_statement_tree"/>
         </record>
-        <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"
-            groups="group_account_user,group_account_manager"/>
+        <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines"
+            parent="menu_finance_bank_and_cash"/>
 
         <record id="action_partner_all" model="ir.actions.act_window">
             <field name="name">Partners</field>
diff --git a/addons/account/project/project.py b/addons/account/project/project.py
index 9574cc416a9..764bedeb2b3 100644
--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@ -24,6 +24,7 @@ from osv import osv
 
 class account_analytic_journal(osv.osv):
     _name = 'account.analytic.journal'
+    _description = 'Analytic Journal'
     _columns = {
         'name': fields.char('Journal Name', size=64, required=True),
         'code': fields.char('Journal Code', size=8),
@@ -49,4 +50,4 @@ class account_journal(osv.osv):
 
 account_journal()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/project_report.xml b/addons/account/project/project_report.xml
index dcfdd52a771..3ee449e01b5 100644
--- a/addons/account/project/project_report.xml
+++ b/addons/account/project/project_report.xml
@@ -1,15 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <report auto="False" id="analytic_journal_print" menu="False" model="account.analytic.journal" name="account.analytic.account.journal" rml="account/project/report/analytic_journal.rml" string="Analytic Journal"/>
+        <report auto="False" id="analytic_journal_print" menu="False"
+            model="account.analytic.journal" name="account.analytic.account.journal"
+            rml="account/project/report/analytic_journal.rml" string="Analytic Journal"/>
 
-        <report auto="False" id="account_analytic_account_balance" menu="False" model="account.analytic.account" name="account.analytic.account.balance" rml="account/project/report/analytic_balance.rml" string="Analytic Balance"/>
+        <report auto="False" id="account_analytic_account_balance" menu="False"
+            model="account.analytic.account" name="account.analytic.account.balance"
+            rml="account/project/report/analytic_balance.rml" string="Analytic Balance"/>
 
-        <report auto="False" id="account_analytic_account_inverted_balance" menu="False" model="account.analytic.account" name="account.analytic.account.inverted.balance" rml="account/project/report/inverted_analytic_balance.rml" string="Inverted Analytic Balance"/>
+        <report auto="False" id="account_analytic_account_inverted_balance"
+            menu="False" model="account.analytic.account"
+            name="account.analytic.account.inverted.balance"
+            rml="account/project/report/inverted_analytic_balance.rml"
+            string="Inverted Analytic Balance"/>
 
-        <report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
+        <report auto="False" id="account_analytic_account_cost_ledger" menu="False"
+            model="account.analytic.account" name="account.analytic.account.cost_ledger"
+            rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
 
-        <report auto="False" id="account_analytic_account_quantity_cost_ledger" menu="False" model="account.analytic.account" name="account.analytic.account.quantity_cost_ledger" rml="account/project/report/quantity_cost_ledger.rml" string="Cost Ledger (Only quantities)"/>
+        <report auto="False" id="account_analytic_account_quantity_cost_ledger" 
+            menu="False" model="account.analytic.account" 
+            name="account.analytic.account.quantity_cost_ledger" 
+            rml="account/project/report/quantity_cost_ledger.rml" 
+            string="Cost Ledger (Only quantities)"/>
 
     </data>
 </openerp>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index e0a2b18756b..79a13bf1ffd 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -112,7 +112,9 @@
             <field name="view_id" ref="view_account_analytic_account_tree"/>
             <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
         </record>
-        <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic_accounting" groups="analytic.group_analytic_accounting,group_account_manager"/>
+        <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account"
+            parent="menu_analytic_accounting"
+            groups="analytic.group_analytic_accounting"/>
 
         <record id="act_account_renew_view" model="ir.actions.act_window">
             <field name="name">Accounts to Renew</field>
@@ -133,7 +135,9 @@
             <field name="help">The normal chart of accounts has a structure defined by the legal requirement of the country. The analytic chart of account structure should reflect your own business needs in term of costs/revenues reporting. They are usually structured by contracts, projects, products or departements. Most of the OpenERP operations (invoices, timesheets, expenses, etc) generate analytic entries on the related account.</field>
         </record>
 
-        <menuitem groups="analytic.group_analytic_accounting,group_account_manager,group_account_user" id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
+        <menuitem groups="analytic.group_analytic_accounting" id="next_id_40" 
+            name="Analytic" parent="account.menu_finance_generic_reporting"
+            sequence="4"/>
 
         <record id="view_account_analytic_line_form" model="ir.ui.view">
             <field name="name">account.analytic.line.form</field>
@@ -340,7 +344,7 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_analytic_journal_search" />
         </record>
-        <menuitem groups="analytic.group_analytic_accounting,group_account_manager" action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting" sequence="5"/>
+        <menuitem groups="analytic.group_analytic_accounting" action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting" sequence="5"/>
 
         #
         # Open journal entries
@@ -352,7 +356,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem groups="analytic.group_analytic_accounting,group_account_manager,group_account_user" action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_entries"/>
+        <menuitem groups="analytic.group_analytic_accounting"
+            action="action_account_analytic_journal_open_form"
+            id="account_analytic_journal_entries"
+            parent="menu_finance_entries"/>
 
         #
         # Reporting
@@ -364,7 +371,9 @@
             <field name="view_type">tree</field>
             <field name="help">To print an analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount.</field>
         </record>
-        <menuitem groups="analytic.group_analytic_accounting,group_account_manager,group_account_user" action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/>
+        <menuitem groups="analytic.group_analytic_accounting"
+            action="action_account_analytic_journal_tree" 
+            id="account_analytic_journal_print" parent="account.next_id_40"/>
 
         #
         # Statistics
diff --git a/addons/account/project/wizard/account_analytic_chart_view.xml b/addons/account/project/wizard/account_analytic_chart_view.xml
index f7391dcf86f..e4c13a07601 100644
--- a/addons/account/project/wizard/account_analytic_chart_view.xml
+++ b/addons/account/project/wizard/account_analytic_chart_view.xml
@@ -39,7 +39,7 @@
             action="action_account_analytic_chart"
             id="menu_action_analytic_account_tree2"
             icon="STOCK_INDENT"
-            groups="analytic.group_analytic_accounting,group_account_manager,group_account_user"/>
+            groups="analytic.group_analytic_accounting"/>
 
     </data>
 </openerp>
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index d99cad9535e..a9b781d21a9 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -100,7 +100,7 @@
 
     <menuitem action="action_analytic_entries_report"
         id="menu_action_analytic_entries_report"
-        groups="analytic.group_analytic_accounting,group_account_manager"
+        groups="analytic.group_analytic_accounting"
         parent="account.menu_finance_statistic_report_statement" sequence="4"/>
 
 </data>
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index 90ecdb9b191..a18adaa0320 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -52,7 +52,7 @@
             action="action_account_automatic_reconcile"
             id="menu_automatic_reconcile"
             parent="periodical_processing_reconciliation"
-            groups="base.group_extended,group_account_manager,group_account_user"/>
+            groups="base.group_extended"/>
 
         <record id="account_automatic_reconcile_view1" model="ir.ui.view">
              <field name="name">Automatic reconcile unreconcile</field>
diff --git a/addons/account_coda/security/ir.model.access.csv b/addons/account_coda/security/ir.model.access.csv
index 3ab8dccd4ad..9eb831185d5 100644
--- a/addons/account_coda/security/ir.model.access.csv
+++ b/addons/account_coda/security/ir.model.access.csv
@@ -1,5 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_account_coda","account.coda","model_account_coda","account.group_account_user",1,0,0,0
 "access_account_coda_manager","account.coda","model_account_coda","account.group_account_manager",1,1,1,1
-"access_account_coda_import_manager","account.coda.import","model_account_coda_import","account.group_account_manager",1,1,1,1
 "access_account_coda_import_user","account.coda","model_account_coda","account.group_account_user",1,0,0,0
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 311822376eb..edfee9e7614 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -47,13 +47,12 @@ AVAILABLE_PRIORITIES = [
 class crm_case(object):
     """A simple python class to be used for common functions """
 
-    
     def _find_lost_stage(self, cr, uid, type, section_id):
         return self._find_percent_stage(cr, uid, 0.0, type, section_id)
         
     def _find_won_stage(self, cr, uid, type, section_id):
         return self._find_percent_stage(cr, uid, 100.0, type, section_id)
-    
+
     def _find_percent_stage(self, cr, uid, percent, type, section_id):
         """
             Return the first stage with a probability == percent
@@ -105,7 +104,6 @@ class crm_case(object):
         if not stage.on_change:
             return {'value':{}}
         return {'value':{'probability': stage.probability}}
-    
 
     def _get_default_partner_address(self, cr, uid, context=None):
 
@@ -208,7 +206,6 @@ class crm_case(object):
         next_stage = stage_pool.browse(cr, uid, next_stage_id, context=context)
         if not next_stage:
             return False
-            
         next_seq = next_stage.sequence
         if not current_seq :
             current_seq = 0
@@ -221,10 +218,8 @@ class crm_case(object):
     def stage_change(self, cr, uid, ids, context=None, order='sequence'):
         if context is None:
             context = {}
-            
         stage_pool = self.pool.get('crm.case.stage')
         stage_type = context and context.get('stage_type','')
-        
         current_seq = False
         next_stage_id = False
 
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 18ba93d6501..eb2ba39f56e 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -196,23 +196,21 @@
 
 <!-- Leads by user and section Action -->
 
-        <record id="action_report_crm_lead" model="ir.actions.act_window">
-            <field name="name">Leads Analysis</field>
-            <field name="res_model">crm.lead.report</field>
-            <field name="view_type">form</field>
-            <field name="context">{'search_default_filter_lead': 1, 'search_default_lead':1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="domain">[('type', '=', 'lead')]</field>
-            <field name="help">Leads Analysis allows you to check different CRM related information. Check for treatment delays, number of responses given and emails sent. You can sort out your leads analysis by different groups to get accurate grained analysis.</field>
-        </record>
-
+       <record id="action_report_crm_lead" model="ir.actions.act_window">
+           <field name="name">Leads Analysis</field>
+           <field name="res_model">crm.lead.report</field>
+           <field name="view_type">form</field>
+           <field name="context">{'search_default_filter_lead': 1, "search_default_user":1, "search_default_this_month":1, 'group_by_no_leaf':1, 'group_by':[]}</field>
+           <field name="view_mode">tree,graph</field>
+           <field name="domain">[]</field>
+           <field name="help">Leads Analysis allows you to check different CRM related information. Check for treatment delays, number of responses given and emails sent. You can sort out your leads analysis by different groups to get accurate grained analysis.</field>
+       </record>
        <record model="ir.actions.act_window.view" id="action_report_crm_lead_tree">
             <field name="sequence" eval="1"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_report_crm_lead_tree"/>
             <field name="act_window_id" ref="action_report_crm_lead"/>
        </record>
-
        <record model="ir.actions.act_window.view" id="action_report_crm_lead_graph">
             <field name="sequence" eval="2"/>
             <field name="view_mode">graph</field>
diff --git a/addons/l10n_be/security/ir.model.access.csv b/addons/l10n_be/security/ir.model.access.csv
index de2c3f15547..0343f29f43a 100644
--- a/addons/l10n_be/security/ir.model.access.csv
+++ b/addons/l10n_be/security/ir.model.access.csv
@@ -1,4 +1 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_l10n_be_vat_declaration_manager","l1on.be.vat.declaration manager","model_l1on_be_vat_declaration","account.group_account_manager",1,1,1,1
-"access_partner_vat_intra_manager","partner.vat.intra manager","model_partner_vat_intra","account.group_account_manager",1,1,1,1
-"access_partner_vat_manager","partner.vat manager","model_partner_vat","account.group_account_manager",1,1,1,1
diff --git a/addons/product/product.py b/addons/product/product.py
index 372919f6212..c55105a1b16 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -805,5 +805,4 @@ class res_users(osv.osv):
     _defaults = {
         'groups_id': _get_group,
     }
-
 res_users()
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 094b6d43e57..25abf4d7333 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -243,7 +243,9 @@
         <field name="context">{'contact_display': 'partner', 'search_default_real':1, 'search_default_location_type_internal':1,'search_default_group_product':1,'group_by':[], 'group_by_no_leaf':1}</field>
         <field name="help">Inventory Analysis allows you to easily check and analyse your company stock levels. Sort and group by selection criteria in order to better analyse and manage your company  activities.</field>
     </record>
-    <menuitem action="action_stock_inventory_report" id="menu_action_stock_inventory_report" parent="next_id_61" sequence="4" groups="base.group_user"/>
+    <menuitem action="action_stock_inventory_report"
+        id="menu_action_stock_inventory_report" 
+        parent="next_id_61" sequence="4"/>
 
 
 </data>
diff --git a/addons/stock/report/stock_inventory_move.rml b/addons/stock/report/stock_inventory_move.rml
old mode 100755
new mode 100644
diff --git a/addons/stock/report/stock_inventory_move_report.py b/addons/stock/report/stock_inventory_move_report.py
old mode 100755
new mode 100644
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ececf425e66..1683914c082 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -231,7 +231,7 @@
         </record>
         <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="3"/>
         <menuitem action="action_tracking_form" id="menu_action_tracking_form"
-            groups="base.group_extended,group_stock_user"
+            groups="base.group_extended"
             parent="menu_traceability"/>
 
         <record id="lot_line_tree" model="ir.ui.view">
@@ -551,7 +551,10 @@
             <field name="view_id" ref="view_location_tree"/>
             <field name="help">This is the structure of your company's warehouses and locations. You can click on a location to get the list of the products and their stock level in this particular location and all its children.</field>
         </record>
-        <menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_inventory_control" groups="base.group_extended,group_stock_manager" sequence="20"/>
+        <menuitem action="action_location_tree"
+            id="menu_action_location_tree"
+            parent="menu_stock_inventory_control"
+            sequence="20"/>
 
         <record id="view_warehouse" model="ir.ui.view">
             <field name="name">stock.warehouse</field>