diff --git a/addons/account/account.py b/addons/account/account.py
index aa0a27ad76d..8d7912356a6 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 import time
-from datetime import datetime
+from datetime import datetime, timedelta
 from dateutil.relativedelta import relativedelta
 from operator import itemgetter
 
@@ -79,9 +79,19 @@ class account_payment_term(osv.osv):
             elif line.value == 'balance':
                 amt = round(amount, prec)
             if amt:
-                next_date = datetime.strptime(date_ref, '%Y-%m-%d') + relativedelta(days=line.days)
+                next_date = (datetime.strptime(date_ref, '%Y-%m-%d') + relativedelta(days=line.days))
                 if line.days2 < 0:
-                    next_date += relativedelta(day=line.days2)
+                    nyear = next_date.strftime("%Y")
+                    nmonth = str(int(next_date.strftime("%m"))% 12+1)
+                    nday = "1"
+
+                    ndate = "%s-%s-%s" % (nyear, nmonth, nday)
+                    nseconds = time.mktime(time.strptime(ndate, '%Y-%m-%d'))
+                    next_month = datetime.fromtimestamp(nseconds)
+
+                    delta = timedelta(seconds=1)
+                    next_date = next_month - delta
+                    next_date = next_date + relativedelta(days=line.days2)
                 if line.days2 > 0:
                     next_date += relativedelta(day=line.days2, months=1)
                 result.append( (next_date.strftime('%Y-%m-%d'), amt) )
@@ -1236,7 +1246,7 @@ class account_move(osv.osv):
         return amount
 
     def _centralise(self, cr, uid, move, mode, context=None):
-        assert(mode in ('debit', 'credit'), 'Invalid Mode') #to prevent sql injection
+        assert mode in ('debit', 'credit'), 'Invalid Mode' #to prevent sql injection
         if context is None:
             context = {}
 
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 58cc997a111..e5912a8b763 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -3,22 +3,22 @@
     <data>
 
         <menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="13"/>
-        <menuitem id="menu_finance_receivables" name="Receivables" parent="menu_finance" sequence="1"/>
-        <menuitem id="menu_finance_payables" name="Payables" parent="menu_finance" sequence="2"/>
+        <menuitem id="menu_finance_receivables" name="Receivables" parent="menu_finance" sequence="1" groups="group_account_user,group_account_manager,base.group_system"/>
+        <menuitem id="menu_finance_payables" name="Payables" parent="menu_finance" sequence="2" groups="group_account_user,group_account_manager,base.group_system"/>
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/>
 <!--        <menuitem id="menu_accounting" name="Accounting" parent="menu_finance" sequence="5"/>-->
-        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user"/>
+        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user,group_account_manager,base.group_system"/>
         <menuitem id="periodical_processing_journal_entries_validation" name="Entries to Review" parent="menu_finance_periodical_processing"/>
         <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
 <!--            <menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
         <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
 <!--            <menuitem id="periodical_processing_end_of_period" name="End of Period" parent="menu_finance_periodical_processing"/>-->
-        <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5"/>
-        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12"/>
+        <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5" groups="base.group_system"/>
+        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12" groups="base.group_system"/>
         <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
-        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13"/>
+        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13" groups="base.group_system"/>
         <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
         <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
         <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts"/>
@@ -35,7 +35,7 @@
 <!--        <menuitem id="menu_finance_legal_statement1" name="Legal Statements" parent="account.menu_finance_reporting" sequence="200"/>-->
 
         <menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="4"
-        groups="group_account_user"/>
+        groups="group_account_user,group_account_manager,base.group_system"/>
         <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15"/>
 
 <!--        <menuitem id="menu_finance_periodical_processing11" name="Periodical Processing" parent="account.menu_finance"-->
@@ -43,15 +43,15 @@
 <!--            groups="group_account_user"/>-->
         <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing"/>
 
-        <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
+        <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300" groups="account.group_account_manager"/>
 
-        <menuitem 
-        parent="account.menu_finance_legal_statement" 
+        <menuitem
+        parent="account.menu_finance_legal_statement"
         id="final_accounting_reports"
         name="Accounting Reports"/>
 
-        <menuitem 
-        parent="account.menu_finance_legal_statement" 
+        <menuitem
+        parent="account.menu_finance_legal_statement"
         id="menu_journals_report"
         name="Journals"/>
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 0f64ef5c734..3bf8fe47238 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -665,7 +665,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_account_type_form" groups="base.group_extended" id="menu_action_account_type_form" parent="menu_low_level"/>
+        <menuitem action="action_account_type_form" groups="base.group_extended,base.group_system" id="menu_action_account_type_form" parent="menu_low_level"/>
         <!--
     Entries
     -->
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index d40d4037c97..35437fa019a 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -462,7 +462,7 @@ class account_invoice(osv.osv):
             date_invoice = time.strftime('%Y-%m-%d')
 
         pterm_list = pt_obj.compute(cr, uid, payment_term_id, value=1, date_ref=date_invoice)
-
+    
         if pterm_list:
             pterm_list = [line[0] for line in pterm_list]
             pterm_list.sort()
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 65223706f40..3fe3e34cfe7 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -307,7 +307,13 @@
             <field name="model">account.analytic.journal</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="analytic Journals">
+                <search string="Analytic Journals">
+                	<group>
+                		<field name="name"/>
+                    	<field name="code"/>
+                    	<field name="type"/>
+                	</group>
+                	<newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
                     </group>
@@ -334,6 +340,7 @@
             <field name="res_model">account.analytic.journal</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,search</field>
+            <field name="search_view_id" ref="view_analytic_journal_search" />
         </record>
         <menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting"/>
 
diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py
index 515c9edf8c0..a70d79cdd40 100644
--- a/addons/account/report/account_aged_partner_balance.py
+++ b/addons/account/report/account_aged_partner_balance.py
@@ -49,18 +49,17 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
 		self.query = data['form'].get('query_line', '')
 		self.direction_selection = data['form'].get('direction_selection', 'past')
 		self.date_from = data['form'].get('date_from', time.strftime('%Y-%m-%d'))
+		if (data['form']['result_selection'] == 'customer' ):
+			self.ACCOUNT_TYPE = ['receivable']
+		elif (data['form']['result_selection'] == 'supplier'):
+			self.ACCOUNT_TYPE = ['payable']
+		else:
+			self.ACCOUNT_TYPE = ['payable','receivable']
 		return super(aged_trial_report, self).set_context(objects, data, ids, report_type=report_type)
 
 	def _get_lines(self, form):
 		res = []
 		account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
-		if (form['result_selection'] == 'customer' ):
-			self.ACCOUNT_TYPE = ['receivable']
-		elif (form['result_selection'] == 'supplier'):
-			self.ACCOUNT_TYPE = ['payable']
-		else:
-			self.ACCOUNT_TYPE = ['payable','receivable']
-
 		self.cr.execute('SELECT DISTINCT res_partner.id AS id,\
 					res_partner.name AS name \
 				FROM res_partner,account_move_line AS l, account_account\
@@ -129,8 +128,8 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
 
 		# Use one query per period and store results in history (a list variable)
 		# Each history will contain : history[1] = {'<partner_id>': <partner_debit-credit>}
-                history = []
-                for i in range(5):
+		history = []
+		for i in range(5):
 			self.cr.execute('SELECT partner_id, SUM(debit-credit)\
 					FROM account_move_line AS l, account_account\
 					WHERE (l.account_id = account_account.id)\
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index bcc9c75be57..076369f7e10 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -67,7 +67,7 @@ class account_balance(report_sxw.rml_parse, common_report_header):
             return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['id']).company_id.name
         return super(account_balance ,self)._get_account(data)
 
-    def lines(self, form, ids=[], done=None, level=1):
+    def lines(self, form, ids=[], done=None):#, level=1):
         obj_account = self.pool.get('account.account')
         if not ids:
             ids = self.ids
@@ -94,7 +94,7 @@ class account_balance(report_sxw.rml_parse, common_report_header):
         child_ids = obj_account._get_children_and_consol(self.cr, self.uid, ids, ctx)
         if child_ids:
             ids = child_ids
-        accounts = obj_account.read(self.cr, self.uid, ids, ['type','code','name','debit','credit','balance','parent_id'], ctx)
+        accounts = obj_account.read(self.cr, self.uid, ids, ['type','code','name','debit','credit','balance','parent_id','level'], ctx)
         for account in accounts:
             if account['id'] in done:
                 continue
@@ -104,7 +104,7 @@ class account_balance(report_sxw.rml_parse, common_report_header):
                     'type': account['type'],
                     'code': account['code'],
                     'name': account['name'],
-                    'level': level,
+                    'level': account['level'],
                     'debit': account['debit'],
                     'credit': account['credit'],
                     'balance': account['balance'],
@@ -124,12 +124,12 @@ class account_balance(report_sxw.rml_parse, common_report_header):
 #                    return False
 #                if not _check_rec(account) :
 #                    continue
-            if account['parent_id']:
+#            if account['parent_id']:
 #                acc = obj_account.read(self.cr, self.uid, [ account['parent_id'][0] ] ,['name'], ctx)
-                for r in result_acc:
-                    if r['id'] == account['parent_id'][0]:
-                        res['level'] = r['level'] + 1
-                        break
+#                for r in result_acc:
+#                    if r['id'] == account['parent_id'][0]:
+#                        res['level'] = r['level'] + 1
+#                        break
             if form['display_account'] == 'bal_movement':
                 if res['credit'] > 0 or res['debit'] > 0 or res['balance'] > 0 :
                     result_acc.append(res)
diff --git a/addons/account/report/voucher_print.rml b/addons/account/report/voucher_print.rml
index 795fd678645..028575c81f2 100644
--- a/addons/account/report/voucher_print.rml
+++ b/addons/account/report/voucher_print.rml
@@ -170,7 +170,7 @@
           <para style="P12">Dated :</para>
         </td>
         <td>
-          <para style="P13">[[ time.strftime('%d %B,%Y', time.strptime(voucher.date , '%Y-%m-%d')) or '' ]]</para>
+          <para style="P13">[[ formatLang(voucher.date, date=True) or '' ]]</para>
         </td>
       </tr>
       <tr>
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 391d7371bbe..f580bdbc92f 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -2,20 +2,20 @@
 <openerp><data>
 
     <record id="group_account_invoice" model="res.groups">
-        <field name="name">Finance / Invoice</field>
+        <field name="name">Accounting / Invoice</field>
     </record>
 
     <record id="group_account_user" model="res.groups">
-        <field name="name">Finance / Accountant</field>
+        <field name="name">Accounting / Accountant</field>
     </record>
 
     <record id="group_account_manager" model="res.groups">
-        <field name="name">Finance / Manager</field>
+        <field name="name">Accounting / Manager</field>
     </record>
 
-    <record id="menu_finance_configuration" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
+<!--    <record id="menu_finance_configuration" model="ir.ui.menu">-->
+<!--        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>-->
+<!--    </record>-->
 
     <record id="menu_finance_reporting" model="ir.ui.menu">
         <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index b9d2f8377c0..c43a1edebeb 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -24,13 +24,13 @@
 "access_account_subscription_line","account.subscription.line","model_account_subscription_line","account.group_account_user",1,1,1,1
 "access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1
 "access_account_account_template","account.account.template","model_account_account_template","account.group_account_manager",1,1,1,1
-"access_account_tax_code_template","account.tax.code.template","model_account_tax_code_template","account.group_account_manager",1,1,1,1
+"access_account_tax_code_template","account.tax.code.template","model_account_tax_code_template","account.group_account_manager",1,0,0,0
 "access_account_chart_template","account.chart.template","model_account_chart_template","account.group_account_manager",1,1,1,1
 "access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1
-"access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,1,1,1
+"access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,0,0,0
 "access_account_bank_statement_reconcile","account.bank.statement.reconcile","model_account_bank_statement_reconcile","account.group_account_user",1,1,1,1
 "access_account_bank_statement_reconcile_line","account.bank.statement.reconcile.line","model_account_bank_statement_reconcile_line","account.group_account_user",1,1,1,1
-"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,1,1,1
+"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,0,0,0
 "access_account_analytic_line","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
 "access_report_hr_timesheet_invoice_journal","report.hr.timesheet.invoice.journal","model_report_hr_timesheet_invoice_journal","account.group_account_manager",1,0,0,0
 "access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","base.group_user",1,0,0,0
@@ -38,8 +38,8 @@
 "access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
 "access_account_invoice_line_uinvoice","account.invoice.line","model_account_invoice_line","account.group_account_invoice",1,1,1,1
 "access_account_invoice_tax_uinvoice","account.invoice.tax","model_account_invoice_tax","account.group_account_invoice",1,1,1,1
-"access_account_analytic_line_uinvoice","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
-"access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,1,1,1
+"access_account_analytic_line_uinvoice","account.analytic.line","model_account_analytic_line","account.group_account_manager",1,0,0,0
+"access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,0,0,0
 "access_account_move_line_uinvoice","account.move.line invoice","model_account_move_line","account.group_account_invoice",1,1,1,1
 "access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_invoice",1,1,1,1
 "access_account_journal_period_uinvoice","account.journal.period","model_account_journal_period","account.group_account_invoice",1,1,1,1
@@ -52,9 +52,9 @@
 "access_account_journal_column_manager","account.journal.column","model_account_journal_column","account.group_account_manager",1,1,1,1
 "access_account_journal_manager","account.journal","model_account_journal","account.group_account_manager",1,1,1,1
 "access_account_journal_invoice","account.journal invoice","model_account_journal","account.group_account_invoice",1,0,0,0
-"access_account_period_manager","account.period","model_account_period","account.group_account_manager",1,1,1,1
+"access_account_period_manager","account.period","model_account_period","account.group_account_manager",1,0,0,0
 "access_account_period_invoice","account.period invoice","model_account_period","account.group_account_invoice",1,0,0,0
-"access_account_tax_code_manager","account.tax.code","model_account_tax_code","account.group_account_manager",1,1,1,1
+"access_account_tax_code_manager","account.tax.code","model_account_tax_code","account.group_account_manager",1,0,0,0
 "access_account_tax_manager","account.tax","model_account_tax","account.group_account_manager",1,1,1,1
 "access_account_invoice_group_invoice","account.invoice group invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
 "access_account_analytic_account_manager","account.analytic.account","analytic.model_account_analytic_account","account.group_account_manager",1,1,1,1
@@ -82,15 +82,76 @@
 "access_account_fiscal_position_account_template","account.fiscal.position.account.template","model_account_fiscal_position_account_template","account.group_account_manager",1,1,1,1
 "access_account_sequence_fiscal_year","account.sequence.fiscalyear","model_account_sequence_fiscalyear","account.group_account_user",1,1,1,1
 "access_account_sequence_fiscal_year_user","account.sequence.fiscalyear user","model_account_sequence_fiscalyear","base.group_user",1,0,0,0
-"access_report_account_receivable","report.account.receivable","model_report_account_receivable","account.group_account_manager",1,0,0,0
+"access_report_account_receivable","report.account.receivable","model_report_account_receivable","account.group_account_manager",1,1,1,1
 "access_temp_range","temp.range","model_temp_range","account.group_account_manager",1,0,0,0
 "access_report_aged_receivable","report.aged.receivable","model_report_aged_receivable","account.group_account_manager",1,0,0,0
 "access_report_invoice_created","report.invoice.created","model_report_invoice_created","account.group_account_manager",1,0,0,0
 "access_report_account_type_sales","report.account_type.sales","model_report_account_type_sales","account.group_account_manager",1,0,0,0
 "access_report_account_sales","report.account.sales","model_report_account_sales","account.group_account_manager",1,0,0,0
-"access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_account_manager",1,0,0,0
+"access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_account_manager",1,1,1,1
 "access_account_account_report_manager","account.account.report","model_account_account_report","account.group_account_manager",1,0,0,0
-"access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,0,0,0
+"access_res_partner_group_account_manager","res_partner group_account_manager","model_res_partner","account.group_account_manager",1,1,1,1
+"access_account_invoice_accountant","account.invoice accountant","model_account_invoice","account.group_account_user",1,0,0,0
+"access_account_tax_code_accountant","account.tax.code accountant","model_account_tax_code","account.group_account_user",1,1,1,1
+"access_account_analytic_chart","account.analytic.chart","model_account_analytic_chart","account.group_account_user",1,1,1,1
+"access_account_move_line_manager","account.move.line manager","model_account_move_line","account.group_account_manager",1,1,1,1
+"access_account_move_manager","account.move manager","model_account_move","account.group_account_manager",1,0,0,0
+"access_account_invoice_manager","account.invoice manager","model_account_invoice","account.group_account_manager",1,0,0,0
+"access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,0,0,0
+"access_account_analytic_chart_manager","account.analytic.chart manager","model_account_analytic_chart","account.group_account_manager",1,0,0,0
+"access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,1,1,1
 "access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0
 "access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,1,1,1
 "access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,0,0,0
+"access_account_move_line_system","account.move.line system","model_account_move_line","base.group_system",1,0,0,0
+"access_account_invoice_system","account.invoice system","model_account_invoice","base.group_system",1,0,0,0
+"access_account_bank_statement_system","account.bank.statement system","model_account_bank_statement","base.group_system",1,0,0,0
+"access_account_move_system","account.move system","model_account_move","base.group_system",1,0,0,0
+"access_account_analytic_line_system","account.analytic.line system","model_account_analytic_line","base.group_system",1,0,0,0
+"access_account_analytic_system","account.analytic.chart system","model_account_analytic_chart","base.group_system",1,0,0,0
+"access_account_tax_code_system","account.tax.code system","model_account_tax_code","base.group_system",1,1,1,1
+"access_account_journal_system","account.journal system","model_account_journal","base.group_system",1,1,1,1
+"access_account_chart_system","account.chart system","model_account_chart","base.group_system",1,0,0,0
+"access_account_period_system","account.period system","model_account_period","base.group_system",1,1,1,1
+"access_account_chart_accountant","account.chart accountant","model_account_chart","group_account_user",1,0,0,0
+"access_account_journal_view_system","account.journal.view system","model_account_journal_view","base.group_system",1,1,1,1
+"access_account_account_type_system","account.account.type system","model_account_account_type","base.group_system",1,1,1,1
+"access_account_analytic_journal_system","account.analytic.journal system","model_account_analytic_journal","base.group_system",1,1,1,1
+"access_account_fiscalyear_system","account.fiscalyear system","model_account_fiscalyear","base.group_system",1,1,1,1
+"access_account_tax_system","account.tax system","model_account_tax","base.group_system",1,1,1,1
+"access_account_model_system","account.model system","model_account_model","base.group_system",1,1,1,1
+"access_account_subscription_system","account.subscription system","model_account_subscription","base.group_system",1,1,1,1
+"access_account_journal_column_system","account.journal.column system","model_account_journal_column","base.group_system",1,1,1,1
+"access_account_invoice_report_system","account.invoice.report system","model_account_invoice_report","base.group_system",1,0,0,0
+"access_account_entries_report_system","account.entries.report system","model_account_entries_report","base.group_system",1,0,0,0
+"access_analytic_entries_report_system","analytic.entries.report system","model_analytic_entries_report","base.group_system",1,0,0,0
+"access_account_journal_period_system","account.journal.period system","model_account_journal_period","base.group_system",1,0,0,0
+"access_account_invoice_tax_system","account.invoice.tax system","model_account_invoice_tax","base.group_system",1,0,0,0
+"access_account_tax_code_template_system","account.tax.code.template system","model_account_tax_code_template","base.group_system",1,1,1,1
+"access_account_sequence_fiscal_year_system","account.sequence.fiscalyear system","model_account_sequence_fiscalyear","base.group_system",1,1,1,1
+"access_account_fiscal_position_system","account.fiscal.position system","model_account_fiscal_position","base.group_system",1,1,1,1
+"access_account_move_reconcile_system","account.move.reconcile system","model_account_move_reconcile","base.group_system",1,0,0,0
+"access_account_account_system","account.account system","model_account_account","base.group_system",1,1,1,1
+"access_account_analytic_system","account.analytic.account system","analytic.model_account_analytic_account","base.group_system",1,1,1,1
+"access_account_model_line_system","account.model.line system","model_account_model_line","base.group_system",1,1,1,1
+"access_account_subscription_line_system","account.subscription.line system","model_account_subscription_line","base.group_system",1,1,1,1
+"access_account_payment_term_system","account.payment.term system","model_account_payment_term","base.group_system",1,1,1,1
+"access_account_payment_term_line_system","account.payment.term.line system","model_account_payment_term_line","base.group_system",1,1,1,1
+"access_report_account_receivable_system","report.account.receivable system","model_report_account_receivable","base.group_system",1,1,1,1
+"access_account_fiscal_position_tax_system","account.fiscal.position.tax system","model_account_fiscal_position_tax","base.group_system",1,1,1,1
+"access_account_fiscal_position_account_template_system","account.fiscal.position.account.template system","model_account_fiscal_position_account_template","base.group_system",1,1,1,1
+"access_account_journal_view_invoice","account.journal.view invoice","model_account_journal_view","account.group_account_invoice",1,1,1,1
+"access_account_fiscal_position_account_system","account.fiscal.position.account system","model_account_fiscal_position_account","base.group_system",1,1,1,1
+"access_account_journal_column_invoice","account.journal.column invoice","model_account_journal_column","account.group_account_invoice",1,1,1,1
+"access_account_invoice_tax_manager","account.invoice.tax manager","model_account_invoice_tax","account.group_account_manager",1,0,0,0
+"access_account_invoice_tax_accountant","account.invoice.tax accountant","model_account_invoice_tax","account.group_account_user",1,0,0,0
+"access_account_move_reconcile_manager","account.move.reconcile manager","model_account_move_reconcile","account.group_account_manager",1,0,0,0
+"access_account_analytic_line_invoice","account.analytic.line invoice","model_account_analytic_line","account.group_account_invoice",1,1,1,1
+"access_account_invoice_line_accountant","account.invoice.line accountant","model_account_invoice_line","account.group_account_user",1,0,0,0
+"access_res_partner_address_accountant","res.partner.address accountant","base.model_res_partner_address","account.group_account_user",1,0,0,0
+"access_account_invoice_line_manager","account.invoice.line manager","model_account_invoice_line","account.group_account_manager",1,0,0,0
+"access_analytic_report_manager","analytic.report manager","model_analytic_report","account.group_account_manager",1,1,1,1
+"access_account_account_invoice","account.account invoice","model_account_account","account.group_account_invoice",1,1,1,1
+"access_res_partner_address_invoice","res.partner.address invoice","base.model_res_partner_address","account.group_account_invoice",1,1,1,1
+"access_account_invoice_line_system","account.invoice.line system","model_account_invoice_line","base.group_system",1,0,0,0
+"access_account_analytic_accountant","account.analytic.account accountant","analytic.model_account_analytic_account","account.group_account_user",1,1,1,1
diff --git a/addons/account/wizard/account_statement_from_invoice.py b/addons/account/wizard/account_statement_from_invoice.py
index 0523b5f60ca..a409bb77f89 100644
--- a/addons/account/wizard/account_statement_from_invoice.py
+++ b/addons/account/wizard/account_statement_from_invoice.py
@@ -92,7 +92,7 @@ class account_statement_from_invoice_lines(osv.osv_memory):
                 'ref': line.ref,
                 'reconcile_id': reconcile_id,
                 'date': time.strftime('%Y-%m-%d'), #time.strftime('%Y-%m-%d'), #line.date_maturity or,
-                }, context=context)
+            }, context=context)
         return {}
 
 account_statement_from_invoice_lines()
@@ -107,10 +107,10 @@ class account_statement_from_invoice(osv.osv_memory):
         'date': fields.date('Date payment',required=True),
         'journal_ids': fields.many2many('account.journal', 'account_journal_relation', 'account_id', 'journal_id', 'Journal'),
         'line_ids': fields.many2many('account.move.line', 'account_move_line_relation', 'move_id', 'line_id', 'Invoices'),
-        }
+    }
     _defaults = {
         'date':lambda *a: time.strftime('%Y-%m-%d'),
-        }
+    }
 
     def search_invoices(self, cr, uid, ids, context=None):
 
@@ -167,4 +167,4 @@ class account_statement_from_invoice(osv.osv_memory):
         }
 
 account_statement_from_invoice()
-# 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/wizard/account_statement_from_invoice_view.xml b/addons/account/wizard/account_statement_from_invoice_view.xml
index b1c0e68534e..c5f42851e69 100644
--- a/addons/account/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account/wizard/account_statement_from_invoice_view.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_account_statement_from_invoice" model="ir.ui.view">
+        <record id="view_account_statement_from_invoice" model="ir.ui.view">
             <field name="name">account.statement.from.invoice.form</field>
             <field name="model">account.statement.from.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Invoices in Statement">
-                	<group colspan="4" >
-						<field name="date"/>
-						<newline/>
-	                	<field name="journal_ids"  domain="[('type','in',['sale','purchase','cash'])]"/>
-                	</group>
+                    <group colspan="4" >
+                        <field name="date"/>
+                        <newline/>
+                        <field name="journal_ids"  domain="[('type','in',['sale','purchase','cash'])]"/>
+                    </group>
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="terp-gtk-go-back-rtl" string="Go" name="search_invoices" type="object"/>
+                        <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Go" name="search_invoices" type="object"/>
                    </group>
                </form>
             </field>
         </record>
 
-		<record id="action_view_account_statement_from_invoice" model="ir.actions.act_window">
-        	<field name="name">Import Invoices in Statement</field>
+        <record id="action_view_account_statement_from_invoice" model="ir.actions.act_window">
+            <field name="name">Import Invoices in Statement</field>
             <field name="res_model">account.statement.from.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           	<field name="view_id" ref="view_account_statement_from_invoice"/>
-           	<field name="target">new</field>
+               <field name="view_id" ref="view_account_statement_from_invoice"/>
+               <field name="target">new</field>
         </record>
 
         <record id="view_account_statement_from_invoice_lines" model="ir.ui.view">
@@ -36,27 +36,26 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Entries">
-                	<group colspan="4" >
-	                	<field name="line_ids" />
-                	</group>
+                    <group colspan="4" expand="1">
+                        <separator string="Payable and Receivables" colspan="4"/>
+                        <field name="line_ids" colspan="4" nolabel="1"/>
+                    </group>
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-execute" string="Ok" name="populate_statement" type="object"/>
+                           <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-execute" string="Ok" name="populate_statement" type="object"/>
                    </group>
                </form>
             </field>
         </record>
-		<record id="action_view_account_statement_from_invoice_lines" model="ir.actions.act_window">
-        	<field name="name">Import Entries</field>
+        <record id="action_view_account_statement_from_invoice_lines" model="ir.actions.act_window">
+            <field name="name">Import Entries</field>
             <field name="res_model">account.statement.from.invoice.lines</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           	<field name="view_id" ref="view_account_statement_from_invoice_lines"/>
-           	<field name="target">new</field>
-           	<field name="context">{'statement_id': active_id}</field>
+               <field name="view_id" ref="view_account_statement_from_invoice_lines"/>
+               <field name="target">new</field>
+               <field name="context">{'statement_id': active_id}</field>
         </record>
-
-
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account_analytic_analysis/security/ir.model.access.csv b/addons/account_analytic_analysis/security/ir.model.access.csv
index 80b9f37db1f..4db9c88f766 100644
--- a/addons/account_analytic_analysis/security/ir.model.access.csv
+++ b/addons/account_analytic_analysis/security/ir.model.access.csv
@@ -1,3 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_account_analytic_analysis_summary_user,account_analytic_analysis.summary.user,model_account_analytic_analysis_summary_user,account.group_account_manager,1,0,0,0
 access_account_analytic_analysis_summary_month,account_analytic_analysis.summary.month,model_account_analytic_analysis_summary_month,account.group_account_manager,1,0,0,0
+access_account_analytic_account_user,account.analytic.account.user,model_account_analytic_account,base.group_user,1,0,0,0
+access_account_analytic_account_system,account.analytic.account.system,model_account_analytic_account,base.group_system,1,0,0,0
diff --git a/addons/account_analytic_default/security/ir.model.access.csv b/addons/account_analytic_default/security/ir.model.access.csv
index 16ef9a23ffd..112fe2fcbf4 100644
--- a/addons/account_analytic_default/security/ir.model.access.csv
+++ b/addons/account_analytic_default/security/ir.model.access.csv
@@ -1,3 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_account_analytic_default,account.analytic.default,model_account_analytic_default,account.group_account_user,1,0,0,0
 access_account_analytic_default_manager,account.analytic.default.manager,model_account_analytic_default,account.group_account_manager,1,1,1,1
+access_account_analytic_default_invoice,account.analytic.default invoice,model_account_analytic_default,account.group_account_invoice,1,1,1,1
diff --git a/addons/account_analytic_plans/security/ir.model.access.csv b/addons/account_analytic_plans/security/ir.model.access.csv
index f7f141ac15a..708094dc520 100644
--- a/addons/account_analytic_plans/security/ir.model.access.csv
+++ b/addons/account_analytic_plans/security/ir.model.access.csv
@@ -6,3 +6,5 @@
 "access_account_analytic_plan_line_invoice","account.analytic.plan.line.invoice","model_account_analytic_plan_line","account.group_account_user",1,1,1,1
 "access_account_analytic_plan_instance_manager","account.analytic.plan.instance manager","model_account_analytic_plan_instance","account.group_account_manager",1,1,1,1
 "access_account_analytic_plan_instance_line_manager","account.analytic.plan.instance.line manager","model_account_analytic_plan_instance_line","account.group_account_manager",1,1,1,1
+"access_account_analytic_plan_system","account.analytic.plan system","model_account_analytic_plan","base.group_system",1,1,1,1
+"access_account_analytic_plan_line_system","account.analytic.plan.line system","model_account_analytic_plan_line","base.group_system",1,1,1,1
diff --git a/addons/account_budget/security/ir.model.access.csv b/addons/account_budget/security/ir.model.access.csv
index 682a2ea3783..e068630ae88 100644
--- a/addons/account_budget/security/ir.model.access.csv
+++ b/addons/account_budget/security/ir.model.access.csv
@@ -1,5 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crossovered_budget","crossovered.budget","model_crossovered_budget","account.group_account_manager",1,1,1,1
+"access_crossovered_budget","crossovered.budget","model_crossovered_budget","account.group_account_manager",1,0,0,0
 "access_crossovered_budget_lines","crossovered.budget.lines","model_crossovered_budget_lines","account.group_account_manager",1,1,1,1
-"access_account_budget_post","account.budget.post","model_account_budget_post","account.group_account_manager",1,1,1,1
+"access_account_budget_post","account.budget.post","model_account_budget_post","account.group_account_manager",1,0,0,0
 "access_account_budget_post_dotation","account.budget.post.dotation","model_account_budget_post_dotation","account.group_account_manager",1,1,1,1
+"access_account_budget_post_accountant","account.budget.post accountant","model_account_budget_post","account.group_account_user",1,1,1,1
+"access_crossovered_budget_accountant","crossovered.budget accountant","model_crossovered_budget","account.group_account_user",1,1,1,1
+"access_account_budget_post_system","account.budget.post system","model_account_budget_post","base.group_system",1,0,0,0
+"access_crossovered_budget_system","crossovered.budget system","model_crossovered_budget","base.group_system",1,0,0,0
+"access_crossovered_budget_lines_system","crossovered.budget.lines system","model_crossovered_budget_lines","base.group_system",1,1,1,1
+"access_crossovered_budget_lines_accountant","crossovered.budget.lines accountant","model_crossovered_budget_lines","account.group_account_user",1,1,1,1
diff --git a/addons/account_coda/security/ir.model.access.csv b/addons/account_coda/security/ir.model.access.csv
index 3ab8dccd4ad..df4faec11ee 100644
--- a/addons/account_coda/security/ir.model.access.csv
+++ b/addons/account_coda/security/ir.model.access.csv
@@ -3,3 +3,4 @@
 "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
+"access_account_coda_system","account.coda system","model_account_coda","base.group_system",1,0,0,0
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index e5639535742..b44bdcca22f 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -85,7 +85,7 @@
             <field name="search_view_id" ref="view_account_followup_filter"/>
             <field name="view_type">form</field>
         </record>
-        <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.menu_finance_configuration"/>
+        <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.menu_finance_configuration" groups="base.group_system"/>
 
         <report auto="False" id="account_followup_followup_report" menu="False" model="account_followup.followup" name="account_followup.followup.print" rml="account_followup/report/rappel.rml" string="Followup Report"/>
 
diff --git a/addons/account_followup/report/report_followup_print.py b/addons/account_followup/report/report_followup_print.py
index 08c572a5ba9..eadb43c729d 100644
--- a/addons/account_followup/report/report_followup_print.py
+++ b/addons/account_followup/report/report_followup_print.py
@@ -50,7 +50,7 @@ class report_rappel(report_sxw.rml_parse):
         res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
         res_partner_address = pooler.get_pool(self.cr.dbname).get('res.partner.address')
         adr = res_partner.address_get(self.cr, self.uid, [partner.id], [type])[type]
-        return adr and res_partner_address.read(self.cr, self.uid, [adr]) or False
+        return adr and res_partner_address.read(self.cr, self.uid, [adr]) or [{}]
 
     def _lines_get(self, partner):
         moveline_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
@@ -95,4 +95,4 @@ report_sxw.report_sxw('report.account_followup.followup.print',
         'res.partner', 'addons/account_followup/report/rappel.rml',
         parser=report_rappel)
 
-# 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_followup/security/ir.model.access.csv b/addons/account_followup/security/ir.model.access.csv
index 85a5f888c5a..3e62e778b7c 100644
--- a/addons/account_followup/security/ir.model.access.csv
+++ b/addons/account_followup/security/ir.model.access.csv
@@ -1,7 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_account_followup_stat","account_followup.stat","model_account_followup_stat","account.group_account_user",1,0,0,0
-"access_account_followup_followup","account_followup.followup","model_account_followup_followup","account.group_account_user",1,0,0,0
+"access_account_followup_followup","account_followup.followup","model_account_followup_followup","base.group_system",1,1,1,1
 "access_account_followup_followup_line","account_followup.followup.line","model_account_followup_followup_line","account.group_account_user",1,0,0,0
 "access_account_followup_stat_manager","account_followup.stat.manager","model_account_followup_stat","account.group_account_manager",1,1,1,1
-"access_account_followup_followup_manager","account_followup.followup.manager","model_account_followup_followup","account.group_account_manager",1,1,1,1
+"access_account_followup_followup_manager","account_followup.followup.manager","model_account_followup_followup","base.group_system",1,1,1,1
 "access_account_followup_followup_line_manager","account_followup.followup.line.manager","model_account_followup_followup_line","account.group_account_manager",1,1,1,1
+"access_account_followup_followup_line_system","account_followup.followup.line system","model_account_followup_followup_line","base.group_system",1,1,1,1
+"access_account_followup_followup_accountant","account_followup.followup user","model_account_followup_followup","account.group_account_user",1,0,0,0
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index 930ab044eb6..4bbb61198cd 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -84,7 +84,7 @@
         <field name="view_mode">tree,form</field>
     </record>
     <menuitem name="Notification Message" id="menu_finan_config_notify_message" parent="account.menu_finance_configuration"/>
-    <menuitem name="All Notification Messages" id="menu_notify_mesage_tree_form" action="notify_mesage_tree_form" parent="menu_finan_config_notify_message"/>
+    <menuitem name="All Notification Messages" id="menu_notify_mesage_tree_form" action="notify_mesage_tree_form" parent="menu_finan_config_notify_message" groups="base.group_system"/>
 
 
 
diff --git a/addons/account_invoice_layout/security/ir.model.access.csv b/addons/account_invoice_layout/security/ir.model.access.csv
index c838392e6eb..6eede39eb70 100644
--- a/addons/account_invoice_layout/security/ir.model.access.csv
+++ b/addons/account_invoice_layout/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_notify_message,notify.message,model_notify_message,account.group_account_invoice,1,1,1,1
+access_notify_message_system,notify.message system,model_notify_message,base.group_system,1,1,1,1
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index bb1b2a5be4b..1eaec699b95 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -92,7 +92,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem id="next_id_44" name="Payment" parent="account.menu_finance_configuration"/>
+        <menuitem id="next_id_44" name="Payment" parent="account.menu_finance_configuration" groups="base.group_system"/>
 
         <menuitem action="action_payment_mode_form" id="menu_action_payment_mode_form" parent="next_id_44"/>
 
diff --git a/addons/account_payment/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml
index 9705473a33a..dd6b117d184 100644
--- a/addons/account_payment/security/account_payment_security.xml
+++ b/addons/account_payment/security/account_payment_security.xml
@@ -3,7 +3,7 @@
 <data noupdate="1">
 
     <record id="group_account_payment" model="res.groups">
-        <field name="name">Finance / Payments</field>
+        <field name="name">Accounting / Payments</field>
     </record>
 
 </data>
diff --git a/addons/account_payment/security/ir.model.access.csv b/addons/account_payment/security/ir.model.access.csv
index 09ee2170239..168083eb9de 100644
--- a/addons/account_payment/security/ir.model.access.csv
+++ b/addons/account_payment/security/ir.model.access.csv
@@ -6,3 +6,8 @@
 "access_account_journal_payement","account.journal payment","account.model_account_journal","group_account_payment",1,0,0,0
 "access_account_invoice_payment","account.invoice payment","account.model_account_invoice","group_account_payment",1,0,0,0
 "access_account_move_line_payment","account.move.line payment","account.model_account_move_line","group_account_payment",1,0,0,0
+"access_payment_order_accountant","payment.order accountant","model_payment_order","account.group_account_user",1,1,1,1
+"access_payment_order_manager","payment.order manager","model_payment_order","account.group_account_manager",1,0,0,0
+"access_payment_order_system","payment.order system","model_payment_order","base.group_system",1,0,0,0
+"access_payment_mode_system","payment.mode system","model_payment_mode","base.group_system",1,1,1,1
+"access_payment_type_system","payment.type system","model_payment_type","base.group_system",1,1,1,1
diff --git a/addons/account_report/account_view.xml b/addons/account_report/account_view.xml
index bec76093070..4b25851e37f 100644
--- a/addons/account_report/account_view.xml
+++ b/addons/account_report/account_view.xml
@@ -90,9 +90,9 @@
             <field name="domain"/>
             <field name="view_id" ref="view_account_report_tree_simple"/>
         </record>
-        <menuitem 
-            parent="account.menu_finance_generic_reporting" 
-            id="menu_menu_finance_generic_reporting" 
+        <menuitem
+            parent="account.menu_finance_generic_reporting"
+            id="menu_menu_finance_generic_reporting"
             name="Reporting"/>
 
         <menuitem action="action_account_report_tree" id="menu_action_account_report_tree_define" parent="menu_menu_finance_generic_reporting" sequence="20"/>
@@ -120,7 +120,7 @@
             <field name="view_id" ref="view_account_report_tree"/>
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
-        
+
         <menuitem action="action_account_report_tree_view" id="menu_action_account_report_tree_view" parent="menu_menu_finance_generic_reporting" sequence="5"/>
 
         <record id="action_account_report_tree_view_fiscal" model="ir.actions.act_window">
diff --git a/addons/account_report/security/ir.model.access.csv b/addons/account_report/security/ir.model.access.csv
index ace4bc06db0..66fe44b6714 100644
--- a/addons/account_report/security/ir.model.access.csv
+++ b/addons/account_report/security/ir.model.access.csv
@@ -1,3 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_report_report","account.report.report","model_account_report_report","account.group_account_manager",1,0,0,0
+"access_account_report_report_system","account.report.report system","model_account_report_report","base.group_system",1,0,0,0
 "access_account_report_history","account.report.history","model_account_report_history","account.group_account_manager",1,0,0,0
+"access_account_report_report","account.report.report","model_account_report_report","account.group_account_user",1,1,0,0
+"access_account_report_report_manager","account.report.report manager","model_account_report_report","account.group_account_manager",1,1,1,1
diff --git a/addons/account_reporting/security/ir.model.access.csv b/addons/account_reporting/security/ir.model.access.csv
index 78dfe260864..e84e663dfda 100644
--- a/addons/account_reporting/security/ir.model.access.csv
+++ b/addons/account_reporting/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_color_rml,color.rml,model_color_rml,account.group_account_manager,1,1,1,1
-access_account_report_bs,account.report.bs,model_account_report_bs,account.group_account_manager,1,1,1,1
+access_account_report_bs,account.report.bs,model_account_report_bs,base.group_system,1,1,1,1
diff --git a/addons/account_voucher/security/ir.model.access.csv b/addons/account_voucher/security/ir.model.access.csv
index 8ea4401d6d9..bf7ee564bc1 100644
--- a/addons/account_voucher/security/ir.model.access.csv
+++ b/addons/account_voucher/security/ir.model.access.csv
@@ -1,5 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_voucher_user","account.voucher","model_account_voucher","account.group_account_user",1,0,0,0
+"access_account_voucher_user","account.voucher","model_account_voucher","account.group_account_user",1,1,1,1
 "access_account_voucher_line_user","account.voucher.line","model_account_voucher_line","account.group_account_user",1,0,0,0
-"access_account_voucher_manager","account.voucher","model_account_voucher","account.group_account_manager",1,1,1,1
+"access_account_voucher_manager","account.voucher","model_account_voucher","account.group_account_manager",1,0,0,0
 "access_account_voucher_line_manager","account.voucher.line","model_account_voucher_line","account.group_account_manager",1,1,1,1
+"access_account_voucher_invoice","account.voucher invoice","model_account_voucher","account.group_account_invoice",1,1,1,1
+"access_account_voucher_system","account.voucher system","model_account_voucher","base.group_system",1,0,0,0
+"access_account_voucher_line_accountant","account.voucher.line accountant","model_account_voucher_line","account.group_account_user",1,1,1,1
+"access_account_voucher_line_invoice","account.voucher.line invoice","model_account_voucher_line","account.group_account_invoice",1,1,1,1
diff --git a/addons/analytic_user_function/security/ir.model.access.csv b/addons/analytic_user_function/security/ir.model.access.csv
index a7220a93054..d8f2f0d2116 100644
--- a/addons/analytic_user_function/security/ir.model.access.csv
+++ b/addons/analytic_user_function/security/ir.model.access.csv
@@ -2,5 +2,5 @@
 "access_analytic_user_funct_user","analytic user funct user","model_analytic_user_funct_grid","account.group_account_manager",1,0,0,0
 "access_analytic_user_funct_manager","analytic user funct manager","model_analytic_user_funct_grid","account.group_account_manager",1,1,1,1
 "access_analytic_user_funct_account_manager","analytic user funct account manager","model_analytic_user_funct_grid","account.group_account_manager",1,1,1,1
-"access_analytic_user_funct_grid_hr_user","analytic user funct grid hr user","model_analytic_user_funct_grid","hr.group_hr_user",1,0,0,0
-"access_analytic_user_funct_grid_hr_manager","analytic user funct grid hr manager","model_analytic_user_funct_grid","hr.group_hr_manager",1,1,1,1
+"access_analytic_user_funct_grid_hr_user","analytic user funct grid hr user","model_analytic_user_funct_grid","base.group_hr_user",1,0,0,0
+"access_analytic_user_funct_grid_hr_manager","analytic user funct grid hr manager","model_analytic_user_funct_grid","base.group_hr_manager",1,1,1,1
diff --git a/addons/auction/security/ir.model.access.csv b/addons/auction/security/ir.model.access.csv
index b06179bf000..cd4ec1a77f0 100644
--- a/addons/auction/security/ir.model.access.csv
+++ b/addons/auction/security/ir.model.access.csv
@@ -13,3 +13,12 @@
 "access_report_auction_adjudication","report.auction.adjudication","model_report_auction_adjudication","base.group_user",1,0,0,0
 "access_report_object_encoded","report.object.encoded","model_report_object_encoded","base.group_user",1,0,0,0
 "access_aie_category","aie.category","model_aie_category","base.group_user",1,0,0,0
+"access_auction_dates_system","auction.dates system","model_auction_dates","base.group_system",1,0,0,0
+"access_auction_lots_system","auction.lots system","model_auction_lots","base.group_system",1,0,0,0
+"access_auction_deposit_system","auction.deposit system","model_auction_deposit","base.group_system",1,0,0,0
+"access_auction_bid_system","auction.bid system","model_auction_bid","base.group_system",1,0,0,0
+"access_auction_artists_system","auction.artists system","model_auction_artists","base.group_system",1,1,1,1
+"access_auction_lot_category_system","auction.lot.category system","model_auction_lot_category","base.group_system",1,1,1,1
+"access_auction_lot_history_system","auction.lot.history system","model_auction_lot_history","base.group_system",1,0,0,0
+"access_auction_deposit_cost_system","auction.deposit.cost system","model_auction_deposit_cost","base.group_system",1,0,0,0
+"access_auction_bid_line_system","auction.bid.line system","model_auction_bid_line","base.group_system",1,0,0,0
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 710fc9d0075..c8adf10b168 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <menuitem id="base.menu_base_action_rule" name="Automated Actions"
-            groups="base.group_extended"
+            groups="base.group_extended,base.group_system"
             parent="base.menu_base_config" sequence="3" />
 
         <!--
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 2324be6adbd..a13144d495a 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -157,7 +157,7 @@
 
         <!-- Calenadar's menu -->
           <menuitem id="base.menu_calendar_configuration" name="Calendar"
-            parent="base.menu_base_config" sequence="6" />
+            parent="base.menu_base_config" sequence="6" groups="base.group_system" />
 
         <!-- Invitation menu -->
 
@@ -211,7 +211,7 @@
         <!--        Menu for Alarms-->
 
          <menuitem id="menu_crm_meeting_avail_alarm"
-            groups="base.group_extended"
+            groups="base.group_extended,base.group_system"
             action="base_calendar.action_res_alarm_view"
             parent="base.menu_calendar_configuration" />
 
diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv
index 8638226ece7..f54b3f0470b 100644
--- a/addons/base_calendar/security/ir.model.access.csv
+++ b/addons/base_calendar/security/ir.model.access.csv
@@ -1,6 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"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_todo","calendar.todo","model_calendar_todo","base.group_user",1,1,1,1
-"access_calendar_event","calendar.event.user","model_calendar_event","base.group_user",1,1,1,1
+"access_calendar_attendee","calendar.attendee","model_calendar_attendee","base.group_system",1,1,1,1
+"access_calendar_alarm","calendar.alarm","model_calendar_alarm","base.group_system",1,1,1,1
+"access_res_alarm","res.alarm","model_res_alarm","base.group_system",1,1,1,1
+"access_calendar_todo","calendar.todo","model_calendar_todo","base.group_system",1,1,1,1
+"access_calendar_event","calendar.event.user","model_calendar_event","base.group_system",1,1,1,1
diff --git a/addons/base_contact/__openerp__.py b/addons/base_contact/__openerp__.py
index 7aa210fd0bf..30fd52ee26f 100644
--- a/addons/base_contact/__openerp__.py
+++ b/addons/base_contact/__openerp__.py
@@ -43,6 +43,7 @@
     'depends': ['base','process'],
     'init_xml': [],
     'update_xml': [
+        'security/base_contact_security.xml',
         'security/ir.model.access.csv',
         'base_contact_view.xml',
         'base_contact_installer_view.xml', 
diff --git a/addons/base_contact/security/base_contact_security.xml b/addons/base_contact/security/base_contact_security.xml
new file mode 100644
index 00000000000..72b692ca372
--- /dev/null
+++ b/addons/base_contact/security/base_contact_security.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+
+    <record id="base.group_sale_salesman" model="res.groups">
+        <field name="name">Sales / User</field>
+    </record>
+
+    <record id="base.group_sale_manager" model="res.groups">
+        <field name="name">Sales / Manager</field>
+    </record>
+</data>
+</openerp>
diff --git a/addons/base_contact/security/ir.model.access.csv b/addons/base_contact/security/ir.model.access.csv
index 3334990b426..6918f7004fd 100644
--- a/addons/base_contact/security/ir.model.access.csv
+++ b/addons/base_contact/security/ir.model.access.csv
@@ -3,3 +3,4 @@
 "access_res_partner_job","res.partner.job","model_res_partner_job","base.group_partner_manager",1,1,1,1
 "access_res_partner_contact_all","res.partner.contact all","model_res_partner_contact",base.group_user,1,0,0,0
 "access_res_partner_job_all","res.partner.job all","model_res_partner_job",base.group_user,1,0,0,0
+"access_group_sale_salesman","res.partner.contact.sale.salesman","model_res_partner_contact",base.group_sale_salesman,1,1,1,0
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 9c02c5f20c1..25309ff512a 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -91,24 +91,23 @@ class base_setup_installer(osv.osv_memory):
         'crm': True,
         }
 
+    def _if_mrp(self, cr, uid, ids, context=None):
+        if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
+               .view == 'simple':
+            return ['mrp_jit']
+        return None
+
+    def _if_knowledge(self, cr, uid, ids, context=None):
+        if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
+               .view == 'simple':
+            return ['document_ftp']
+        return None
 
     def onchange_moduleselection(self, cr, uid, ids, *args):
-        progress = self._progress(cr, uid) - round((len(filter(lambda x: x==1, args)))*80/len(args))
-        if progress <= 10.0:
-            progress = 10.0
+        closed, total = self.get_current_progress(cr, uid)
+
+        progress = round(100. * closed / (total + len(filter(None, args))))
+        if progress < 10.:
+            progress = 10.
         return {'value':{'progress':progress}}
-
-    def modules_to_install(self, cr, uid, ids, context=None):
-        modules = super(base_setup_installer, self).modules_to_install(cr, uid, ids, context=context)
-        interface_id = self.pool.get('res.config.view').search(cr, uid, [])
-        interface = self.pool.get('res.config.view').read(cr, uid, interface_id)[0]
-        modules_selected = self.read(cr, uid, ids)[0]
-        added_modules = []
-        if interface.get('view', '') == 'simple' :
-            if modules_selected.get('mrp', False):
-                added_modules.append('mrp_jit')
-            if modules_selected.get('knowledge', False):
-                added_modules.append('document_ftp')
-        return modules | set(added_modules)
 base_setup_installer()
-
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index 72f054e0161..8282e9a5d07 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -26,7 +26,7 @@
     'description': """Base module for all dashboards.""",
     'author': 'OpenERP SA',
     'depends': ['base'],
-    'update_xml': ['security/ir.model.access.csv', 'wizard/board_menu_create_view.xml', 'board_view.xml'],
+    'update_xml': ['security/board_security.xml','security/ir.model.access.csv', 'wizard/board_menu_create_view.xml', 'board_view.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/board/security/board_security.xml b/addons/board/security/board_security.xml
new file mode 100644
index 00000000000..ee544e098cc
--- /dev/null
+++ b/addons/board/security/board_security.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+
+    <record id="base.group_sale_salesman" model="res.groups">
+        <field name="name">Sales / User</field>
+    </record>
+
+</data>
+</openerp>
diff --git a/addons/board/security/ir.model.access.csv b/addons/board/security/ir.model.access.csv
index 6788173d3e2..44b9c3cfb6d 100644
--- a/addons/board/security/ir.model.access.csv
+++ b/addons/board/security/ir.model.access.csv
@@ -3,3 +3,4 @@
 "access_board_board_line","board.board.line","model_board_board_line","base.group_user",1,1,1,1
 "access_board_note_type","board.note.type","model_board_note_type","base.group_user",1,1,1,1
 "access_board_note","board.note","model_board_note","base.group_user",1,1,1,1
+"access_board_board_sale_salesman","board.board.sale.salesman","model_board_board","base.group_sale_salesman",1,1,1,1
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 0bb854fea17..3b730456f5d 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -32,7 +32,7 @@
         parent="base.menu_base_partner" sequence="1" />
 
     <menuitem parent="base.menu_sales" name="Leads"
-        groups="base.group_extended"
+        groups="base.group_extended,base.group_system"
         id="menu_crm_case_categ0_act_leads"
         action="crm_case_category_act_leads_all" sequence="1" />
 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 709178a2cc3..12be0527a07 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -14,7 +14,7 @@
     </record>
 
      <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" name="Stages"
-        groups="base.group_extended" sequence="0"
+        groups="base.group_extended,base.group_system" sequence="0"
         parent="base.menu_crm_config_lead" />
 
 
@@ -30,7 +30,7 @@
 
       <menuitem action="crm_lead_resource_act"
             id="menu_crm_lead_resource_act" name="Lead Sources"
-            groups="base.group_extended" sequence="2"
+            groups="base.group_extended,base.group_system" sequence="2"
             parent="base.menu_crm_config_lead" />
 
         <!-- CRM Lead Form View  -->
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 311f8e2424f..457670aa282 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -86,7 +86,7 @@
 <!-- ALL MEETINGS -->
 
     <menuitem name="Meetings" id="menu_meeting_sale"
-        parent="base.menu_base_partner" sequence="3" />
+        parent="base.menu_base_partner" sequence="3"/>
 
     <menuitem name="Meetings" id="menu_crm_case_categ_meet"
         action="crm_case_categ_meet" parent="menu_meeting_sale"
@@ -112,7 +112,7 @@
     <menuitem id="menu_attendee_invitations"
             name="Meeting Invitations" parent="crm.menu_meeting_sale"
             sequence="10" action="action_view_attendee_form"
-            groups="base.group_extended" />
+            groups="base.group_extended,base.group_sale_salesman,base.group_sale_manager" />
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index c058732a3dd..c6a0ae3c370 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -64,7 +64,7 @@ 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', '=', 100)]})
         if not stage_id:
-            raise osv.except_osv(_('Warning !'), _('There is no stage for won oppportunities defined for this Sale Team.'))
+            raise osv.except_osv(_('Warning !'), _('There is no stage for won 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})
 
@@ -87,7 +87,7 @@ 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 oppportunities defined for this Sale Team.'))
+            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})
 
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index 27d25e34ef9..60ade626071 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -30,8 +30,6 @@
           <field name="context">{'search_default_user_id':uid,'search_default_current':1, 'default_type': 'opportunity'}</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
-          <field name="help">Opportunities allows you to track your best deals pipeline: history of the communication, expected revenues, stage of each opportunity, excepted closings, etc. Opportunities are usually connected with the email gateway: new emails may create opportunities and each opportunity automatically gets the history of the conversation with the customer.
-          Your teams will be able to plan meeting and phonecalls from opportunities, to convert opportunities into quotations, to manage documents related to the opportunity, to track all activities related to this customer, etc.</field>
      </record>
 
      <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 481e92ec134..feaadc6fbcc 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -57,7 +57,7 @@
     </record>
 
     <menuitem name="Phone Calls" id="menu_crm_case_phone"
-        groups="base.group_extended"
+        groups="base.group_extended,base.group_system"
         parent="base.menu_base_partner" sequence="4" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 41375001257..ba5c8edab77 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -6,13 +6,13 @@
             parent="base.menu_base_config" sequence="1"/-->
 
         <menuitem id="base.menu_crm_config_lead" name="Leads &amp; Opportunities"
-            parent="base.menu_base_config" sequence="2" groups="base.group_extended"/>
+            parent="base.menu_base_config" sequence="2" groups="base.group_extended,base.group_system"/>
 
         <!--menuitem id="menu_crm_config_meeting" name="Meeting"
             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"/>
+            parent="base.menu_base_config" sequence="5" groups="base.group_extended,base.group_system"/>
 
         <menuitem id="base.next_id_64" name="Reporting"
             parent="base.menu_base_partner" sequence="11" />
@@ -87,11 +87,11 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
-        
+
         <menuitem action="crm_case_section_act"
             id="menu_crm_case_section_act" sequence="4"
             parent="base.menu_crm_config_lead" />
-            
+
 
         <!-- CRM Stage Tree View -->
 
@@ -177,7 +177,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_categ_tree-view"/>
         </record>
-        
+
          <menuitem action="crm_case_categ-act"
             id="menu_crm_case_categ-act" name="Categories"
             parent="base.menu_crm_config_lead" sequence="1"/>
@@ -342,7 +342,7 @@
 
        <menuitem action="crm_segmentation_tree-act"
             id="menu_crm_segmentation-act"
-            groups="base.group_extended" sequence="2"
+            groups="base.group_extended,base.group_system" sequence="2"
             parent="base.menu_base_action_rule" />
 
         <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
@@ -354,7 +354,7 @@
                 <page string="Current Activity" position="inside">
                     <field name="context_section_id" completion="1"
                         widget="selection"
-                        context="{'user_prefence':True}" 
+                        context="{'user_prefence':True}"
                         readonly="0"/>
                 </page>
             </field>
@@ -416,8 +416,8 @@
                     </field>
                 </field>
         </record>
-        
-        
+
+
         <!-- Custom Case Sections -->
         <record id="crm_case_section_custom_view_form" model="ir.ui.view">
             <field name="name">crm.case.section.custom.form</field>
@@ -463,9 +463,9 @@
                 </tree>
             </field>
         </record>
-        
+
         <!-- Custom crm case-->
-        
+
         <record id="crm_case_custom_tree_view" model="ir.ui.view">
             <field name="name">Custom Cases - Tree</field>
             <field name="model">crm.case.custom</field>
@@ -593,7 +593,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="crm_case_custom_calendar_view">
             <field name="name">Custom Cases - Calendar</field>
             <field name="model">crm.case.custom</field>
@@ -607,7 +607,7 @@
                 </calendar>
             </field>
         </record>
-      
+
       <!-- Custom Cases Search View -->
 
     <record id="crm_case_custom_search_view" model="ir.ui.view">
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 36e0633cfe9..02e7601d6ce 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -231,10 +231,11 @@
        </record>
 
        <menuitem name="Leads Analysis" id="menu_report_crm_leads_tree"
-            groups="base.group_extended"
+            groups="base.group_extended,base.group_sale_manager"
            parent="base.next_id_64" action="action_report_crm_lead" sequence="3"/>
 
        <menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree"
+            groups="base.group_extended,base.group_sale_manager"
            parent="base.next_id_64" action="action_report_crm_opportunity" sequence="4"/>
 
     </data>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 120bc9f859d..66e8bd5cfa4 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -189,7 +189,7 @@
         </record>
 
         <menuitem name="Phone Calls Analysis"
-            groups="base.group_extended"
+            groups="base.group_extended,base.group_sale_manager"
             action="action_report_crm_phonecall"
             id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" sequence="5"/>
 
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index d72847c44e3..b679ef791ba 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -2,20 +2,20 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="group_crm_manager" model="res.groups">
-        <field name="name">CRM / Manager</field>
+    <record id="base.group_sale_manager" model="res.groups">
+        <field name="name">Sales / Manager</field>
     </record>
 
-    <record id="group_crm_user" model="res.groups">
-        <field name="name">CRM / User</field>
+    <record id="base.group_sale_salesman" model="res.groups">
+        <field name="name">Sales / User</field>
     </record>
 
     <record model='ir.ui.menu' id='base.menu_base_partner'>
-        <field name="groups_id" eval="[(4,ref('group_crm_manager')),(4,ref('group_crm_user'))]"/>
+        <field name="groups_id" eval="[(4,ref('base.group_sale_manager')),(4,ref('base.group_sale_salesman'))]"/>
     </record>
 
     <record model="ir.ui.menu" id="base.menu_base_config">
-        <field eval="[(4, ref('crm.group_crm_manager'))]" name="groups_id"/>
+        <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
     </record>
 
     </data>
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index a849c040ece..5f8cbe9719c 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -1,45 +1,64 @@
 "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_manager","crm.meeting.manager","model_crm_meeting","crm.group_crm_manager",1,1,1,1
-"access_crm_lead_manager","crm.lead.manager","model_crm_lead","crm.group_crm_manager",1,1,1,1
-"access_crm_phonecall_manager","crm.phonecall.manager","model_crm_phonecall","crm.group_crm_manager",1,1,1,1
+"access_crm_segmentation_user","crm.segmentation user","model_crm_segmentation","base.group_sale_salesman",1,0,0,0
+"access_crm_segmentation_line_user","crm.segmentation.line user","model_crm_segmentation_line","base.group_sale_salesman",1,0,0,0
+"access_crm_segmentation","crm.segmentation","model_crm_segmentation","base.group_sale_manager",1,1,1,1
+"access_crm_segmentation_line","crm.segmentation.line","model_crm_segmentation_line","base.group_sale_manager",1,1,1,1
+"access_crm_case_section","crm.case.section","model_crm_case_section","base.group_sale_salesman",1,1,1,0
+"access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_sale_salesman",1,1,1,0
+"access_crm_meeting_manager","crm.meeting.manager","model_crm_meeting","base.group_sale_manager",1,0,0,0
+"access_crm_lead_manager","crm.lead.manager","model_crm_lead","base.group_sale_manager",1,0,0,0
+"access_crm_phonecall_system","crm.phonecall.system","model_crm_phonecall","base.group_system",1,0,0,0
+"access_crm_phonecall_manager","crm.phonecall.manager","model_crm_phonecall","base.group_sale_manager",1,0,0,0
 "access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_user",1,0,0,0
-"access_crm_meeting","crm.meeting","model_crm_meeting","crm.group_crm_user",1,1,1,1
+"access_crm_meeting","crm.meeting","model_crm_meeting","base.group_sale_salesman",1,1,1,0
 "access_crm_meeting_all","crm.meeting_allll","model_crm_meeting","base.group_user",1,0,0,0
-"access_crm_lead","crm.lead","model_crm_lead","crm.group_crm_user",1,1,1,1
+"access_crm_lead","crm.lead","model_crm_lead","base.group_sale_salesman",1,1,1,1
 "access_crm_lead.all","crm.lead.all","model_crm_lead","base.group_user",1,0,0,0
-"access_crm_phonecall","crm.phonecall","model_crm_phonecall","crm.group_crm_user",1,1,1,1
+"access_crm_phonecall","crm.phonecall","model_crm_phonecall","base.group_sale_salesman",1,1,1,0
 "access_crm_phonecall.all","crm.phonecall.all","model_crm_phonecall","base.group_user",1,0,0,0
-"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_section_user","crm.case.section.user","model_crm_case_section","base.group_sale_salesman",1,1,1,0
+"access_crm_case_section_manager","crm.case.section.manager","model_crm_case_section","base.group_sale_manager",1,1,1,1
+"access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_system",1,1,1,1
 "access_crm_case_stage","crm.case.stage","model_crm_case_stage","base.group_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.user","model_crm_lead_report","crm.group_crm_user",1,0,0,0
-"access_crm_phonecall_report_user","crm.phonecall.report.user","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_res_partner_manager","res.partner.crm.manager","base.model_res_partner","crm.group_crm_manager",1,0,1,0
-"access_res_partner_address_manager","res.partner.address.crm.user.manager","base.model_res_partner_address","crm.group_crm_manager",1,0,1,0
-"access_res_partner_category_manager","res.partner.category.crm.manager","base.model_res_partner_category","crm.group_crm_manager",1,0,0,0
-"mail_gateway_mailgate_message_manager","mail_gateway.mailgate.message.manager","mail_gateway.model_mailgate_message","crm.group_crm_manager",1,1,1,1
-"mail_gateway_mailgate_thread_manager","mail_gateway.mailgate.thread.manager","mail_gateway.model_mailgate_thread","crm.group_crm_manager",1,1,1,1
-"access_calendar_attendee_crm_user","calendar.attendee.crm.user","model_calendar_attendee","crm.group_crm_user",1,1,1,0
-"access_calendar_attendee_crm_manager","calendar.attendee.crm.manager","model_calendar_attendee","crm.group_crm_manager",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","mail_gateway.model_mailgate_message","crm.group_crm_user",1,1,1,1
-"mail_gateway_mailgate_thread","mail_gateway.mailgate.thread","mail_gateway.model_mailgate_thread","crm.group_crm_user",1,1,1,1
-"access_crm_case_section_custom_user","crm.case.section.custom.user","model_crm_case_section_custom","crm.group_crm_user",1,0,0,0
-"access_crm_case_section_custom_manager","crm.case.section.custom.manager","model_crm_case_section_custom","crm.group_crm_manager",1,1,1,1
-"access_crm_case_custom_user","crm.case.custom.user","model_crm_case_custom","crm.group_crm_user",1,1,1,1
-"access_crm_case_custom_manager","crm.case.custom.manager","model_crm_case_custom","crm.group_crm_manager",1,1,1,1
+"access_crm_case_stage_manager","crm.case.stage","model_crm_case_stage","base.group_sale_manager",1,1,1,1
+"access_crm_case_resource_type_user","crm_case_resource_type user","model_crm_case_resource_type","base.group_sale_salesman",1,1,1,0
+"access_crm_case_resource_type_manager","crm_case_resource_type manager","model_crm_case_resource_type","base.group_sale_manager",1,1,1,1
+"access_crm_phonecall_report_user","crm.phonecall.report.user","model_crm_phonecall_report","base.group_sale_salesman",1,0,0,0
+"access_crm_lead_report_manager","crm.lead.report","model_crm_lead_report","base.group_sale_manager",1,1,1,1
+"access_crm_phonecall_report_manager","crm.phonecall.report","model_crm_phonecall_report","base.group_sale_manager",1,1,1,1
+"access_res_partner_manager","res.partner.crm.manager","base.model_res_partner","base.group_sale_manager",1,0,0,0
+"access_res_partner_address_manager","res.partner.address.crm.user.manager","base.model_res_partner_address","base.group_sale_manager",1,0,0,0
+"access_res_partner_category_manager","res.partner.category.crm.manager","base.model_res_partner_category","base.group_sale_manager",1,0,0,0
+"mail_gateway_mailgate_message_manager","mail_gateway.mailgate.message.manager","mail_gateway.model_mailgate_message","base.group_sale_manager",1,0,0,0
+"mail_gateway_mailgate_thread_manager","mail_gateway.mailgate.thread.manager","mail_gateway.model_mailgate_thread","base.group_sale_manager",1,1,1,1
+"access_calendar_attendee_crm_user","calendar.attendee.crm.user","model_calendar_attendee","base.group_sale_salesman",1,1,1,0
+"access_calendar_attendee_crm_manager","calendar.attendee.crm.manager","model_calendar_attendee","base.group_sale_manager",1,1,1,1
+"access_res_partner","res.partner.crm.user","base.model_res_partner","base.group_sale_salesman",1,1,1,0
+"access_res_partner_address","res.partner.address.crm.user","base.model_res_partner_address","base.group_sale_salesman",1,1,1,0
+"access_res_partner_category","res.partner.category.crm.user","base.model_res_partner_category","base.group_sale_salesman",1,1,1,0
+"mail_gateway_mailgate_message","mail_gateway.mailgate.message","mail_gateway.model_mailgate_message","base.group_system",1,1,1,1
+"mail_gateway_mailgate_thread","mail_gateway.mailgate.thread","mail_gateway.model_mailgate_thread","base.group_sale_salesman",1,1,1,1
+"access_crm_case_section_custom_user","crm.case.section.custom.user","model_crm_case_section_custom","base.group_sale_salesman",1,0,0,0
+"access_crm_case_section_custom_manager","crm.case.section.custom.manager","model_crm_case_section_custom","base.group_sale_manager",1,1,1,1
+"access_crm_case_custom_user","crm.case.custom.user","model_crm_case_custom","base.group_sale_salesman",1,1,1,1
+"access_crm_case_custom_manager","crm.case.custom.manager","model_crm_case_custom","base.group_sale_manager",1,1,1,1
+"access_crm_lead_extended","crm.lead.extended","model_crm_lead","base.group_extended",1,1,1,1
+"access_crm_phonecall_extended","crm.phonecall.extended","model_crm_phonecall","base.group_extended",1,1,1,1
+"mail_gateway_mailgate_message_user","mail_gateway.mailgate.message.user","mail_gateway.model_mailgate_message","base.group_sale_salesman",1,1,1,1
+"access_base_res_bank_system","base.res.bank system","base.model_res_bank","base.group_system",1,1,1,1
+"access_crm_case_stage_system","crm.case.stage system","model_crm_case_stage","base.group_system",1,1,1,1
+"access_crm_case_categ_manager","crm.case.categ manager","model_crm_case_categ","base.group_sale_manager",1,1,1,0
+"access_crm_case_resource_type_system","crm.case.resource.type system","model_crm_case_resource_type","base.group_system",1,1,1,1
+"access_crm_case_section_system","crm.case.section system","model_crm_case_section","base.group_system",1,1,1,1
+"access_crm_lead_report_system","crm.lead.report system","model_crm_lead_report","base.group_system",1,1,1,1
+"access_base_res_country_system","base.res.country system","base.model_res_country","base.group_system",1,1,1,1
+"access_base_res_country_state_system","base.res.country.state system","base.model_res_country_state","base.group_system",1,1,1,1
+"access_base_action_rule_system","base.action.rule system","model_base_action_rule","base.group_system",1,1,1,1
+"access_crm_segmentation_system","crm.segmentation system","model_crm_segmentation","base.group_system",1,1,1,1
+"access_crm_segmentation_line_system","crm.segmentation.line system","model_crm_segmentation_line","base.group_system",1,1,1,1
+"access_base_calendar_res_alarm_system","base.calendar.res.alarm system","base_calendar.model_res_alarm","base.group_system",1,1,1,1
+"access_res_partner_address_system","res.partner.address system","base.model_res_partner_address","base.group_system",1,0,0,0
+"access_crm_lead_report_user","crm.lead.report user","model_crm_lead_report","base.group_sale_salesman",1,1,1,1
+"access_base_res_partner_canal_system","base.res.partner.canal system","base.model_res_partner_canal","base.group_system",1,1,1,1
+"access_res_partner_category_system","res.partner.category system","base.model_res_partner_category","base.group_system",1,1,1,1
+"access_res_partner_title_system","res.partner.title system","base.model_res_partner_title","base.group_system",1,1,1,1
diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/test_crm_lead.yml
index f61021a5606..337b52954b3 100644
--- a/addons/crm/test/test_crm_lead.yml
+++ b/addons/crm/test/test_crm_lead.yml
@@ -12,7 +12,7 @@
      context_lang: en_US
      context_section_id: crm.section_sales_department
      groups_id:
-       - crm.group_crm_user
+       - base.group_sale_salesman
      login: user_crm
      name: user_crm
      password: user_crm
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 3e853936541..f0ef9ae0651 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem id="base.menu_aftersale" name="After-Sale Services"
-            groups="base.group_extended"
+            groups="base.group_extended,base.group_system"
             parent="base.menu_base_partner" sequence="7" />
 
         <!-- Claims Menu -->
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 3878400e40d..8e2c4c17a33 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem id="menu_config_claim" name="Claim"
-            groups="base.group_extended"
+            groups="base.group_extended,base.group_system"
             parent="base.menu_base_config" sequence="6" />
 
         <!-- Claims categories  -->
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 37fd3ec015a..b535d51c40d 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -212,7 +212,7 @@
         </record>
 
        <menuitem name="Claims Analysis" id="menu_report_crm_claim_tree"
-           groups="base.group_extended"
+           groups="base.group_extended,base.group_sale_manager"
            action="action_report_crm_claim" parent="base.next_id_64" sequence="6"/>
 
 
diff --git a/addons/crm_claim/security/ir.model.access.csv b/addons/crm_claim/security/ir.model.access.csv
index beb40a19dca..ac18ba24b78 100644
--- a/addons/crm_claim/security/ir.model.access.csv
+++ b/addons/crm_claim/security/ir.model.access.csv
@@ -1,5 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_claim_manager","crm.claim.manager","model_crm_claim","crm.group_crm_manager",1,1,1,1
-"access_crm_claim_user","crm.claim.user","model_crm_claim","crm.group_crm_user",1,1,1,1
-"access_crm_claim_report_user","crm.claim.report.user","model_crm_claim_report","crm.group_crm_user",1,0,0,0
-"access_crm_claim_report_manager","crm.claim.report.manager","model_crm_claim_report","crm.group_crm_manager",1,0,0,0
+"access_crm_claim_manager","crm.claim.manager","model_crm_claim","base.group_sale_manager",1,0,0,0
+"access_crm_claim_user","crm.claim.user","model_crm_claim","base.group_sale_salesman",1,1,1,0
+"access_crm_claim_report_manager","crm.claim.report.manager","model_crm_claim_report","base.group_sale_manager",1,1,1,1
+"access_crm_claim_extended","crm.claim.extended","model_crm_claim","base.group_extended",1,1,1,1
+"access_crm_claim_system","crm.claim.system","model_crm_claim","base.group_system",1,0,0,0
diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml
index 3c97e662d30..d7115b3a3ca 100644
--- a/addons/crm_fundraising/crm_fundraising_menu.xml
+++ b/addons/crm_fundraising/crm_fundraising_menu.xml
@@ -5,7 +5,7 @@
 <!-- MENU -->
 
     <menuitem id="base.menu_fundrising" name="Fund Raising"
-        groups="base.group_extended"
+        groups="base.group_extended,base.group_system"
         parent="base.menu_base_partner" sequence="8" />
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index f6ac9d22c2a..6421623e386 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -3,7 +3,7 @@
     <data>
            <!-- Fund Raising Configuration Menu -->
         <menuitem id="menu_config_fundrising" name="Fund Raising"
-        groups="base.group_extended"
+        groups="base.group_extended,base.group_system"
         parent="base.menu_base_config" sequence="8" />
 
         <!-- Fund Raising Categories Form View -->
@@ -18,7 +18,7 @@
         </record>
 
         <menuitem action="crm_fund_categ_action" name="Categories"
-            id="menu_crm_case_fundraising-act" groups="base.group_extended"
+            id="menu_crm_case_fundraising-act" groups="base.group_extended,base.group_system"
             parent="menu_config_fundrising" />
 
         <!-- Fund Stage Form View -->
@@ -33,7 +33,7 @@
         </record>
 
          <menuitem action="crm_fundraising_stage_act"
-            groups="base.group_extended" name="Stages"
+            groups="base.group_extended,base.group_system" name="Stages"
             id="menu_crm_fundraising_stage_act"
             parent="menu_config_fundrising" />
 
@@ -50,7 +50,7 @@
         </record>
 
        <menuitem action="crm_fundraising_resource_act"
-            groups="base.group_extended" name="Resource Type"
+            groups="base.group_extended,base.group_system" name="Resource Type"
             id="menu_crm_fundraising_resource_act"
             parent="menu_config_fundrising" />
 
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index a0fd2e35583..9d1be15afb1 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -200,7 +200,7 @@
 
         <menuitem name="Fundraising Analysis"
             action="action_report_crm_fundraising"
-            groups="base.group_extended"
+            groups="base.group_extended,base.group_sale_manager"
             id="menu_report_crm_fundraising_tree" parent="base.next_id_64" sequence="20"/>
 
     </data>
diff --git a/addons/crm_fundraising/security/ir.model.access.csv b/addons/crm_fundraising/security/ir.model.access.csv
index 44880de6332..ce7d699f36b 100644
--- a/addons/crm_fundraising/security/ir.model.access.csv
+++ b/addons/crm_fundraising/security/ir.model.access.csv
@@ -1,5 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_fundraising_manager","crm.fundraising.manager","model_crm_fundraising","crm.group_crm_manager",1,1,1,1
-"access_crm_fundraising_user","crm.fundraising.user","model_crm_fundraising","crm.group_crm_user",1,1,1,1
-"access_crm_fundraising_report_user","crm.fundraising.report.user","model_crm_fundraising_report","crm.group_crm_user",1,0,0,0
-"access_crm_fundraising_report_manager","crm.fundraising.report.manager","model_crm_fundraising_report","crm.group_crm_manager",1,0,0,0
+"access_crm_fundraising_manager","crm.fundraising.manager","model_crm_fundraising","base.group_sale_manager",1,0,0,0
+"access_crm_fundraising_user","crm.fundraising.user","model_crm_fundraising","base.group_sale_salesman",1,1,1,0
+"access_crm_fundraising_report_user","crm.fundraising.report.user","model_crm_fundraising_report","base.group_sale_salesman",1,0,0,0
+"access_crm_fundraising_report_manager","crm.fundraising.report.manager","model_crm_fundraising_report","base.group_sale_manager",1,1,1,1
+"access_crm_fundraising_system","crm.fundraising.system","model_crm_fundraising","base.group_system",1,0,0,0
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 0fe887bab6f..d840d9430fe 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -3,7 +3,7 @@
     <data>
        <!-- Helpdesk Support Categories Configuration Menu-->
        <menuitem id="menu_config_helpdesk" name="Helpdesk"
-        groups="base.group_extended"
+        groups="base.group_extended,base.group_system"
         parent="base.menu_base_config" sequence="7" />
 
         <!-- Helpdesk Support Categories Form View -->
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 2544a506fd5..d9ea03ad9e8 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -181,7 +181,7 @@
         </record>
 
         <menuitem name="Helpdesk Analysis" action="action_report_crm_helpdesk"
-            groups="base.group_extended"
+            groups="base.group_extended,base.group_sale_manager"
             id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" sequence="7"/>
 
     </data>
diff --git a/addons/crm_helpdesk/security/ir.model.access.csv b/addons/crm_helpdesk/security/ir.model.access.csv
index c156428afbd..37bbd40ab29 100644
--- a/addons/crm_helpdesk/security/ir.model.access.csv
+++ b/addons/crm_helpdesk/security/ir.model.access.csv
@@ -1,5 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_helpdesk_manager","crm.helpdesk.manager","model_crm_helpdesk","crm.group_crm_manager",1,1,1,1
-"access_crm_helpdesk_user","crm.helpdesk.user","model_crm_helpdesk","crm.group_crm_user",1,1,1,1
-"access_report_crm_helpdesk_user","report.crm.helpdesk.user","model_crm_helpdesk_report","crm.group_crm_user",1,1,1,1
-"access_report_crm_helpdesk_manager","report.crm.helpdesk.manager","model_crm_helpdesk_report","crm.group_crm_manager",1,1,1,1
+"access_crm_helpdesk_manager","crm.helpdesk.manager","model_crm_helpdesk","base.group_sale_manager",1,0,0,0
+"access_crm_helpdesk_user","crm.helpdesk.user","model_crm_helpdesk","base.group_sale_salesman",1,1,1,1
+"access_report_crm_helpdesk_manager","report.crm.helpdesk.manager","model_crm_helpdesk_report","base.group_sale_manager",1,1,1,1
+"access_crm_helpdesk_extended","crm.helpdesk.extended","model_crm_helpdesk","base.group_extended",1,1,1,1
+"access_crm_helpdesk_system","crm.helpdesk.system","model_crm_helpdesk","base.group_system",1,0,0,0
diff --git a/addons/crm_profiling/security/ir.model.access.csv b/addons/crm_profiling/security/ir.model.access.csv
index a52b8fd4e7b..f60a6041c9f 100644
--- a/addons/crm_profiling/security/ir.model.access.csv
+++ b/addons/crm_profiling/security/ir.model.access.csv
@@ -1,8 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_profiling_question","crm_profiling.question","model_crm_profiling_question",,1,0,0,0
-"access_crm_profiling_questionnaire","crm_profiling.questionnaire","model_crm_profiling_questionnaire",,1,0,0,0
-"access_crm_profiling_answer_all","crm_profiling.answer all","model_crm_profiling_answer",,1,0,0,0
-"access_crm_profiling_answer","crm_profiling.answer","model_crm_profiling_answer","crm.group_crm_user",1,1,1,1
-"access_crm_profiling_question_manager","crm_profiling.question manager","model_crm_profiling_question","crm.group_crm_manager",1,1,1,1
-"access_crm_profiling_questionnaire_manager","crm_profiling.questionnaire manager","model_crm_profiling_questionnaire","crm.group_crm_manager",1,1,1,1
-"access_crm_profiling_answer_manager","crm_profiling.answer manager","model_crm_profiling_answer","crm.group_crm_manager",1,1,1,1
+"access_crm_profiling_question","crm_profiling.question","model_crm_profiling_question","base.group_system",1,1,1,1
+"access_crm_profiling_questionnaire_manager","crm_profiling.questionnaire manager","model_crm_profiling_questionnaire","base.group_system",1,1,1,1
+"access_crm_profiling_answer_system","crm_profiling.answer system","model_crm_profiling_answer","base.group_system",1,1,1,1
+"access_crm_profiling_answer_user","crm_profiling.answer user","model_crm_profiling_answer","base.group_sale_salesman",1,1,1,0
+"access_crm_profiling_answer_manager","crm_profiling.answer manager","model_crm_profiling_answer","base.group_sale_manager",1,0,0,0
+"access_crm_profiling_question_manager","crm_profiling.question manager","model_crm_profiling_question","base.group_sale_salesman",1,1,1,0
+"access_crm_profiling_question_user","crm_profiling.question user","model_crm_profiling_question","base.group_sale_manager",1,0,0,0
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 704442c778e..fdef01e2ef2 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -36,7 +36,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="menu_delivery"/>
+        <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="menu_delivery" groups="base.group_system"/>
 
         <!-- Delivery Grids -->
         <record id="view_delivery_grid_tree" model="ir.ui.view">
diff --git a/addons/delivery/security/ir.model.access.csv b/addons/delivery/security/ir.model.access.csv
index 948a85c35c7..409fba3becd 100644
--- a/addons/delivery/security/ir.model.access.csv
+++ b/addons/delivery/security/ir.model.access.csv
@@ -1,9 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_delivery_carrier","delivery.carrier","model_delivery_carrier","sale.group_sale_user",1,0,0,0
-"access_delivery_grid","delivery.grid","model_delivery_grid","sale.group_sale_user",1,0,0,0
-"access_delivery_grid_line","delivery.grid.line","model_delivery_grid_line","sale.group_sale_user",1,0,0,0
-"access_delivery_carrier_manager","delivery.carrier","model_delivery_carrier","sale.group_sale_manager",1,1,1,1
-"access_delivery_grid_manager","delivery.grid","model_delivery_grid","sale.group_sale_manager",1,1,1,1
-"access_delivery_grid_line_manager","delivery.grid.line","model_delivery_grid_line","sale.group_sale_manager",1,1,1,1
+"access_delivery_carrier","delivery.carrier","model_delivery_carrier","base.group_sale_salesman",1,0,0,0
+"access_delivery_grid","delivery.grid","model_delivery_grid","base.group_sale_salesman",1,0,0,0
+"access_delivery_grid_line","delivery.grid.line","model_delivery_grid_line","base.group_sale_salesman",1,0,0,0
+"access_delivery_carrier_manager","delivery.carrier","model_delivery_carrier","base.group_sale_manager",1,1,1,1
+"access_delivery_grid_manager","delivery.grid","model_delivery_grid","base.group_sale_manager",1,1,1,1
+"access_delivery_grid_line_manager","delivery.grid.line","model_delivery_grid_line","base.group_sale_manager",1,1,1,1
 "access_delivery_carrier_partner_manager","delivery.carrier partner_manager","model_delivery_carrier","base.group_partner_manager",1,0,0,0
-"access_delivery_carrier_stock_worker","delivery.carrier stock_worker","model_delivery_carrier","stock.group_stock_user",1,0,0,0
+"access_delivery_carrier_stock_system","delivery.carrier stock_system","model_delivery_carrier","base.group_system",1,1,1,1
+"access_delivery_grid_system","delivery.grid.system","model_delivery_grid","base.group_system",1,1,1,1
+"access_delivery_grid_line_system","delivery.grid.line.system","model_delivery_grid_line","base.group_system",1,1,1,1
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index 4899178de2f..930d20a1b52 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -56,7 +56,7 @@
             id="menu_reports_document"
             parent="menu_reporting"
             sequence="0"
-            groups="document.group_document_manager"/>
+            groups="base.group_system"/>
 
 
          <menuitem
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index f6e21f338e7..62108a616b9 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -61,7 +61,7 @@
         name="Storage Media"
         action="action_document_storage_form"
         id="menu_document_storage_media"
-        groups="base.group_extended"
+        groups="base.group_extended,base.group_system"
         parent="menu_document_management_configuration"/>
 
     <record model="ir.ui.view" id="view_document_directory_form">
@@ -335,7 +335,6 @@
         <field name="name">Document</field>
         <field name="view_type">form</field>
         <field name="search_view_id" ref="view_attach_filter"/>
-        <field name="help">Documents give your access to all attached documents; it's a repository of all attached documents (mails, documents attached to a project, etc.)</field>
     </record>
     <menuitem name="Documents" id="menu_document_doc" parent="knowledge.menu_document" sequence="0"/>
     <menuitem
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index d7b51ec19dc..2bf1a2adb57 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -2,16 +2,16 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="group_document_user" model="res.groups">
-        <field name="name">Document / User</field>
+    <record id="base.group_document_user" model="res.groups">
+        <field name="name">Knowledge / User</field>
     </record>
 
-    <record id="group_document_manager" model="res.groups">
-        <field name="name">Document / Manager</field>
-    </record>
+<!--    <record id="group_document_manager" model="res.groups">-->
+<!--        <field name="name">Document / Manager</field>-->
+<!--    </record>-->
 
     <record id="knowledge.menu_document_configuration" model="ir.ui.menu">
-        <field name="groups_id" eval="[(6,0,[ref('group_document_manager')])]"/>
+        <field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>
     </record>
 
 
diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv
index 9684932b2a6..132daa1b7a6 100644
--- a/addons/document/security/ir.model.access.csv
+++ b/addons/document/security/ir.model.access.csv
@@ -1,22 +1,26 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_document_directory_all","document.directory all","model_document_directory",,1,0,0,0
-"access_document_directory_group_document_manager","document.directory document manager","model_document_directory","group_document_manager",1,1,1,1
+"access_document_directory_group_document_manager","document.directory document manager","model_document_directory","base.group_system",1,1,1,1
 "access_document_directory_group_system","document.directory group system","model_document_directory","base.group_system",1,1,1,1
 "access_document_directory_content_all","document.directory.content all","model_document_directory_content",,1,0,0,0
-"access_document_directory_content_group_document_manager","document.directory.content document manager","model_document_directory_content","group_document_manager",1,1,1,1
+"access_document_directory_content_group_document_manager","document.directory.content document manager","model_document_directory_content","base.group_system",1,1,1,1
 "access_document_directory_content_group_system","document.directory.content group system","model_document_directory_content","base.group_system",1,1,1,1
-"access_document_directory_content_type_group_document_manager","document.directory.content.type document manager","model_document_directory_content_type","group_document_manager",1,1,1,1
+"access_document_directory_content_type_group_document_manager","document.directory.content.type document manager","model_document_directory_content_type","base.group_system",1,1,1,1
 "access_document_directory_content_type_group_system","document.directory.content.type group system","model_document_directory_content_type","base.group_user",1,0,0,0
-"access_document_storage_group_document_manager","document.storage document manager","model_document_storage","group_document_manager",1,1,1,1
+"access_document_storage_group_document_manager","document.storage document manager","model_document_storage","base.group_system",1,1,1,1
 "access_document_storage_group_system","document.storage group system","model_document_storage","base.group_user",1,0,0,0
+"access_document_storage_group_user","document.storage group user","model_document_storage","base.group_document_user",1,1,1,1
+"access_ir_attachment_group_user","ir.attachment user","base.model_ir_attachment","base.group_document_user",1,1,1,1
+"access_ir_attachment_group_system","ir.attachment system","base.model_ir_attachment","base.group_system",1,0,0,0
+"access_res_partner_group_user","res.partner user","base.model_res_partner","base.group_document_user",1,1,1,1
 "access_document_directory_dctx_all","document.directory.dctx all","model_document_directory_dctx",,1,0,0,0
-"access_document_directory_dctx_group_document_manager","document.directory.dctx document manager","model_document_directory_dctx","group_document_manager",1,1,1,1
+"access_document_directory_dctx_group_document_manager","document.directory.dctx document manager","model_document_directory_dctx","base.group_system",1,1,1,1
 "access_document_directory_dctx_group_system","document.directory.dctx group system","model_document_directory_dctx","base.group_system",1,1,1,1
-"access_report_document_user_group_document_manager","report.document.user document manager","model_report_document_user","document.group_document_manager",1,0,0,0
+"access_report_document_user_group_document_manager","report.document.user document manager","model_report_document_user","base.group_system",1,0,0,0
 "access_report_document_user_group_system","report.document.user group system","model_report_document_user","base.group_system",1,0,0,0
-"access_report_files_partner_group_document_manager","report.files.partner document manager","model_report_files_partner","document.group_document_manager",1,0,0,0
+"access_report_files_partner_group_document_manager","report.files.partner document manager","model_report_files_partner","base.group_system",1,0,0,0
 "access_report_files_partner_group_system","report.files.partner group system","model_report_files_partner","base.group_system",1,0,0,0
-"access_report_document_file_group_document_manager","report.document.file document manager","model_report_document_file","document.group_document_manager",1,0,0,0
+"access_report_document_file_group_document_manager","report.document.file document manager","model_report_document_file","base.group_system",1,0,0,0
 "access_report_document_file_group_system","report.document.file group system","model_report_document_file","base.group_system",1,0,0,0
-"access_report_document_wall_group_document_manager","report.document.wall document manager","model_report_document_wall","document.group_document_manager",1,0,0,0
+"access_report_document_wall_group_document_manager","report.document.wall document manager","model_report_document_wall","base.group_system",1,0,0,0
 "access_report_document_wall_group_system","report.document.wall group system","model_report_document_wall","base.group_system",1,0,0,0
diff --git a/addons/email_template/security/email_template_security.xml b/addons/email_template/security/email_template_security.xml
index 9dc788f6780..7e6c1f4b560 100755
--- a/addons/email_template/security/email_template_security.xml
+++ b/addons/email_template/security/email_template_security.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data noupdate="0">
 
-        <record id="res_groups_email_template_admin" model="res.groups">
-            <field name="name">Marketing / Email Template</field>
+        <record id="base.res_groups_email_template_admin" model="res.groups">
+            <field name="name">Marketing / User</field>
         </record>
 
     </data>
diff --git a/addons/email_template/security/ir.model.access.csv b/addons/email_template/security/ir.model.access.csv
index ddc7533659a..ef5297f52bc 100644
--- a/addons/email_template/security/ir.model.access.csv
+++ b/addons/email_template/security/ir.model.access.csv
@@ -1,5 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_email_template_engines","email_template.engines","model_email_template_engines","email_template.res_groups_email_template_admin",1,1,1,1
-"access_email_template_account","email_template.account","model_email_template_account","email_template.res_groups_email_template_admin",1,1,1,1
-"access_email_template","email.template","model_email_template","email_template.res_groups_email_template_admin",1,1,1,1
-"access_email_template_mailbox","email_template.mailbox","model_email_template_mailbox","email_template.res_groups_email_template_admin",1,1,1,1
+"access_email_template_engines","email_template.engines","model_email_template_engines","base.res_groups_email_template_admin",1,1,1,1
+"access_email_template_account","email_template.account","model_email_template_account","base.res_groups_email_template_admin",1,0,0,0
+"access_email_template","email.template","model_email_template","base.res_groups_email_template_admin",1,0,0,0
+"access_email_template_mailbox","email_template.mailbox","model_email_template_mailbox","base.res_groups_email_template_admin",1,1,1,1
+"access_email_template_account_system","email_template.account system","model_email_template_account","base.group_system",1,1,1,1
+"access_email_template_system","email.template system","model_email_template","base.group_system",1,1,1,1
+"access_email_template_mailbox_system","email_template.mailbox system","model_email_template_mailbox","base.group_system",1,0,0,0
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 099457acfd6..fcabd668146 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -35,8 +35,8 @@
             <field name="res_model">event.type</field>
             <field name="view_type">form</field>
         </record>
-        <menuitem name="Configuration" id="base.menu_event_config" parent="base.marketing_menu" sequence="30" groups="base.group_extended"/>
-        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_event_config" groups="base.group_extended,crm.group_crm_manager"/>
+        <menuitem name="Configuration" id="base.menu_event_config" parent="base.marketing_menu" sequence="30" groups="base.group_extended,base.group_system"/>
+        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_event_config" groups="base.group_extended,base.group_sale_manager,base.group_system"/>
 
     <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index f6af4429ad5..d62332af156 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -124,7 +124,7 @@
        </record>
 
         <!--<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>-->
-        <menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" sequence="3"/>
+        <menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="base.group_system,base.group_marketing_manager"/>
  
     <!-- end...  -->
     </data>
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index 4f29fc90837..a847550d7dd 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -3,12 +3,19 @@
 	<data>
 	
 	
-    <record id="group_event_manager" model="res.groups">
-        <field name="name">EVENT / Manager</field>
+    <record id="base.group_marketing_manager" model="res.groups">
+        <field name="name">Marketing / Manager</field>
+    </record>
+    <record id="base.res_groups_email_template_admin" model="res.groups">
+        <field name="name">Marketing / User</field>
     </record>
 
-    <record id="group_event_subscriber" model="res.groups">
-        <field name="name">EVENT / Subscriber</field>
+    <record id="base.group_sale_manager" model="res.groups">
+        <field name="name">Sales / Manager</field>
+    </record>
+
+    <record id="base.group_sale_salesman" model="res.groups">
+        <field name="name">Sales / User</field>
     </record>
   
 
diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index b8db28fbef2..747f12a479c 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -1,13 +1,20 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_event_type","event.type","model_event_type","event.group_event_subscriber",1,0,0,0
-"access_event_type_manager","event.type manager","model_event_type","event.group_event_manager",1,1,1,1
-"access_event_event","event.event","model_event_event","event.group_event_subscriber",1,1,1,0
-"access_event_registration","event.registration","model_event_registration","event.group_event_subscriber",1,1,1,0
-"access_report_event_registration","report.event.registration","model_report_event_registration","event.group_event_subscriber",1,0,0,0
-"access_event_event_manager","event.event manager","model_event_event","event.group_event_manager",1,1,1,1
-"access_event_registration_manager","event.registration manager","model_event_registration","event.group_event_manager",1,1,1,1
-"access_crm_case_section_manager","crm.case.section manager","crm.model_crm_case_section","event.group_event_manager",1,1,1,1
-"access_product_product","product.product.product manager","product.model_product_product","event.group_event_manager",1,1,1,1
-"access_report_event_registration","report.event.registration","model_report_event_registration","event.group_event_manager",1,1,1,1
-"access_event_registration_badge","event.registration.badge","model_event_registration_badge","event.group_event_subscriber",1,1,1,1
-"access_event_registration_badge","event.registration.badge","model_event_registration_badge","event.group_event_manager",1,1,1,1
+"access_event_type","event.type","model_event_type","base.res_groups_email_template_admin",1,0,0,0
+"access_event_type_manager","event.type manager","model_event_type","base.group_marketing_manager",1,1,1,1
+"access_event_event","event.event","model_event_event","base.res_groups_email_template_admin",1,1,1,0
+"access_event_registration","event.registration","model_event_registration","base.res_groups_email_template_admin",1,1,1,0
+"access_report_event_registration","report.event.registration","model_report_event_registration","base.res_groups_email_template_admin",1,1,1,1
+"access_event_event_manager","event.event manager","model_event_event","base.group_marketing_manager",1,0,0,0
+"access_event_registration_manager","event.registration manager","model_event_registration","base.group_marketing_manager",1,0,0,0
+"access_crm_case_section_manager","crm.case.section manager","crm.model_crm_case_section","base.group_marketing_manager",1,1,1,1
+"access_product_product","product.product.product manager","product.model_product_product","base.group_marketing_manager",1,1,1,1
+"access_report_event_registration","report.event.registration","model_report_event_registration","base.group_marketing_manager",1,1,1,1
+"access_event_registration_badge","event.registration.badge","model_event_registration_badge","base.res_groups_email_template_admin",1,1,1,1
+"access_event_registration_badge","event.registration.badge","model_event_registration_badge","base.group_marketing_manager",1,1,1,1
+"access_event_event_sale_salesman","event.event.sale","model_event_event","base.group_sale_salesman",1,0,0,0
+"access_event_event_system","event.event system","model_event_event","base.group_system",1,0,0,0
+"access_event_registration_system","event.registration system","model_event_registration","base.group_system",1,0,0,0
+"access_report_event_registration_system","report.event.registration system","model_report_event_registration","base.group_system",1,1,1,1
+"access_account_account_invoice_system","account.account.invoice","account.model_account_invoice","base.group_system",1,0,0,0
+"access_event_type_sytem","event.type system","model_event_type","base.group_system",1,1,1,1
+"access_account_account_invoice_manager","account.account.invoice","account.model_account_invoice","base.group_marketing_manager",1,0,0,0
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index a10c7cc29b1..995f1c05621 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -125,9 +125,7 @@ class hr_employee(osv.osv):
         'work_email': fields.related('address_id', 'email', type='char', size=240, string='Work E-mail', readonly=True),
         'work_location': fields.char('Office Location', size=32),
         'notes': fields.text('Notes'),
-        'parent_id': fields.many2one('hr.employee', 'Manager', select=True),
-#        'parent_id': fields.related('department_id', 'manager_id',  string='Manager', type='many2one'),
-#        'category_id': fields.many2one('hr.employee.category', 'Category'),
+        'parent_id': fields.related('department_id', 'manager_id', relation='hr.employee', string='Manager', type='many2one', store=True, select=True),
         'category_ids': fields.many2many('hr.employee.category', 'employee_category_rel','category_id','emp_id','Category'),
         'child_ids': fields.one2many('hr.employee', 'parent_id', 'Subordinates'),
         'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade'),
@@ -179,4 +177,4 @@ class hr_department(osv.osv):
 hr_department()
 
 
-# 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/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index 28be1d987f4..ad637250ed7 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <!-- Employee Category -->
 
+        <record id="category_experience" model="hr.employee.category">
+            <field name="name">Experience</field>
+        </record>
+
+        <record id="category_ranking" model="hr.employee.category">
+            <field name="name">Ranking</field>
+        </record>
+
         <record id="category_ceo" model="hr.employee.category">
             <field name="name">CEO</field>
+            <field name="parent_id" ref="category_ranking"/>
         </record>
 
         <record id="category_cto" model="hr.employee.category">
@@ -14,7 +23,7 @@
         </record>
 
         <record id="category_managers" model="hr.employee.category">
-            <field name="name">Managers(Tech. Heads)</field>
+            <field name="name">Managers (Tech. Heads)</field>
             <field name="parent_id" ref="category_cto"/>
         </record>
 
@@ -23,19 +32,24 @@
             <field name="parent_id" ref="category_managers"/>
         </record>
 
-        <record id="category_sr_exec" model="hr.employee.category">
-            <field name="name">Sr. Executives(Team Leads)</field>
+        <record id="category_employee" model="hr.employee.category">
+            <field name="name">Employees</field>
             <field name="parent_id" ref="category_project_managers"/>
         </record>
 
+        <record id="category_sr_exec" model="hr.employee.category">
+            <field name="name">Sr. Executives (5 years)</field>
+            <field name="parent_id" ref="category_experience"/>
+        </record>
+
         <record id="category_jr_exec" model="hr.employee.category">
-            <field name="name">Jr. Executives(Developers)</field>
-            <field name="parent_id" ref="category_sr_exec"/>
+            <field name="name">Jr. Executives (6 months)</field>
+            <field name="parent_id" ref="category_experience"/>
         </record>
 
         <record id="category_trainee" model="hr.employee.category">
-            <field name="name">Trainee(Intership)</field>
-            <field name="parent_id" ref="category_jr_exec"/>
+            <field name="name">Trainee</field>
+            <field name="parent_id" ref="category_experience"/>
         </record>
 
 
@@ -44,12 +58,21 @@
         <record id="employee1" model="hr.employee">
             <field name="name">Fabien Pinckaers</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <!--<field name="regime">45</field>-->
             <field name="user_id" ref="base.user_root"/>
-            <field name="category_id" ref="hr.category_ceo"/>
-            <!--<field name="holiday_max">25</field>-->
+            <field name="category_ids" eval="[(6, 0, [ref('category_sr_exec'),ref('category_ceo')])]"/>
         </record>
 
+        <record id="employee2" model="hr.employee">
+            <field name="name">Quentin Paolino</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="category_ids" eval="[(6, 0, [ref('category_jr_exec'),ref('category_managers')])]"/>
+        </record>
+
+        <record id="employee3" model="hr.employee">
+            <field name="name">Antoine Philippe</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="category_ids" eval="[(6, 0, [ref('category_trainee')])]"/>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/hr/hr_department_demo.xml b/addons/hr/hr_department_demo.xml
index 2fb859a804e..082aa010e76 100644
--- a/addons/hr/hr_department_demo.xml
+++ b/addons/hr/hr_department_demo.xml
@@ -104,6 +104,14 @@
             <field name="department_id" ref="dep_it"/>
         </record>
 
+        <!-- assign department on employee -->
+        <record id="employee2" model="hr.employee">
+            <field name="department_id" ref="hr.dep_technical"/>
+        </record>
+
+        <record id="employee3" model="hr.employee">
+            <field name="department_id" ref="hr.dep_technical"/>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 1b96956394f..29e3b04f2c9 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -72,7 +72,6 @@
             <field name="res_model">hr.department</field>
             <field name="view_type">form</field>
             <field name="search_view_id" ref="view_department_filter"/>
-            <field name="help">Your Company's Departments Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitements, etc.</field>
         </record>
 
        <menuitem action="open_module_tree_department" id="menu_department_def" parent="hr.menu_department_tree"/>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 6d826db1a6b..7d8c7b62644 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -2,11 +2,11 @@
 <openerp>
     <data>
 
-        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"/>
+        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15" />
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
-        <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="group_hr_manager" sequence="50"/>
-        <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" groups="group_hr_manager" sequence="1"/>
-        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" name="Employees" sequence="1"/>
+        <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_system" sequence="50"/>
+        <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
+        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" groups="base.group_system" name="Employees" sequence="1" />
 
         <!--
         ==========
@@ -59,11 +59,8 @@
                             </group>
                             <group col="2" colspan="2">
                             <separator string="Position" colspan="2"/>
-                            <field name="job_id" widget="selection"/>
+                            <field name="job_id" widget="selection" domain="[('state','!=','old')]"/>
                             <field name="department_id" widget="selection"/>
-                            <!--<separator string="Managers" colspan="2"/>
-                            <field name="parent_id" />
-                            <field name="coach_id" />-->
                             </group>
                         </page>
                         <page string="Categories">
@@ -126,7 +123,7 @@
             <field name="view_type">tree</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_employee_tree"/>
-            <field name="domain">[('parent_id','=',False)]</field>
+            <field name="domain">[('parent_id','=',False),('user_id','=',uid)]</field>
             <field name="search_view_id" ref="view_employee_filter"/>
         </record>
 
@@ -147,7 +144,6 @@
             <field name="domain">[]</field>
             <field name="view_id" ref="view_employee_tree"/>
             <field name="search_view_id" ref="view_employee_filter"/>
-            <field name="help">The employee directory contains all data related to your employees: from their photo up to their hourly estimated costs for the timesheets. Employees are managed by departments and can be linked to users to manage their access rights.</field>
         </record>
 
         <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/>
@@ -312,7 +308,7 @@
             <field eval="True" name="object"/>
         </record>
 
-        <menuitem action="open_view_categ_tree" groups="base.group_extended"
+        <menuitem action="open_view_categ_tree" groups="base.group_extended,base.group_system"
             id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
 
         <record id="view_hr_job_form" model="ir.ui.view">
@@ -344,8 +340,8 @@
                     <group col="6" colspan="4">
 	                    <field name="state"/>
 	                    <button name="job_recruitement" string="In Recruitement" states="open" type="object" icon="gtk-go-forward"/>
-		                <button name="job_open" string="Open" states="old" type="object" icon="terp-camera_test"/>
-                        <button name="job_old" string="Old" states="open,recruit" type="object" icon="gtk-cancel"/>
+		            <button name="job_open" string="Open" states="old,recruit" type="object" icon="terp-camera_test"/>
+                            <button name="job_old" string="Old" states="open,recruit" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
@@ -392,10 +388,9 @@
             <field name="res_model">hr.job</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="help">Job Positions are used to define the jobs, the requirements. You can attach a survey to a job position. This survey will be used in the recruitement process to evaluate the applicants for this job position.</field>
         </record>
 
-        <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root"/>
+        <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_manager"/>
         <menuitem parent="base.menu_crm_case_job_req_main" id="menu_hr_job" action="action_hr_job" sequence="2"/>
 
     </data>
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index bc8e7ec2496..4f7691f03e9 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -2,11 +2,11 @@
 <openerp>
 <data noupdate="1">
 
-    <record id="group_hr_manager" model="res.groups">
+    <record id="base.group_hr_manager" model="res.groups">
         <field name="name">Human Resources / Manager</field>
     </record>
 
-    <record id="group_hr_user" model="res.groups">
+    <record id="base.group_hr_user" model="res.groups">
         <field name="name">Human Resources / User</field>
     </record>
 
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index da1043f7b90..e6e5c5c3c47 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -1,9 +1,17 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_employee_category","hr.employee.category","model_hr_employee_category","hr.group_hr_user",1,0,0,0
-"access_hr_employee","hr.employee","model_hr_employee","hr.group_hr_user",1,1,1,1
-"access_hr_employee_resource","resource.resource","resource.model_resource_resource","hr.group_hr_user",1,1,1,1
-"access_hr_department","hr.department","model_hr_department","hr.group_hr_user",1,0,0,0
-"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","hr.group_hr_manager",1,1,1,1
-"access_hr_department_manager","hr.department.manager","model_hr_department","hr.group_hr_manager",1,1,1,1
-"access_hr_employee_marital_status","hr.employee.marital.status","model_hr_employee_marital_status","hr.group_hr_user",1,1,1,1
-"access_hr_job","hr.job","model_hr_job","hr.group_hr_user",1,0,0,0
+"access_hr_employee_category","hr.employee.category","model_hr_employee_category","base.group_hr_user",1,0,0,0
+"access_hr_employee","hr.employee","model_hr_employee","base.group_hr_user",1,1,1,1
+"access_hr_employee_resource","resource.resource","resource.model_resource_resource","base.group_hr_user",1,1,1,1
+"access_hr_department","hr.department","model_hr_department","base.group_hr_user",1,0,0,0
+"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,0,0,0
+"access_hr_department_manager","hr.department.manager","model_hr_department","base.group_hr_manager",1,1,1,1
+"access_hr_employee_marital_status","hr.employee.marital.status","model_hr_employee_marital_status","base.group_system",1,1,1,1
+"access_hr_job","hr.job","model_hr_job","base.group_hr_user",1,0,0,0
+"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,0,0,0
+"access_hr_employee_manager","hr.employee.manager","model_hr_employee","base.group_hr_manager",1,1,1,1
+"access_hr_employee_resource","resource.resource","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
+"access_hr_department","hr.department","model_hr_department","base.group_hr_manager",1,1,1,1
+"access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
+"access_hr_job","hr.job","model_hr_job","base.group_hr_manager",1,1,1,1
+"access_hr_employee","hr.employee","model_hr_employee_category","base.group_system",1,1,1,1
+
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index f6d7365356f..15acf1985a5 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -39,6 +39,7 @@
                     <field name="employee_id"/>
                     <field name="name"/>
                     <field name="action"/>
+                    <field name="day" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -71,11 +72,10 @@
             <field name="view_mode">tree,form</field>
             <field name="context">{"search_default_employee":1}</field>
             <field name="search_view_id" ref="view_hr_attendance_filter" />
-            <field name="help">Time Tracking functionality aims to manage employee's attendances on the basis of the actions (Sign in/Sign out) performed by them. You can also link this to an attndance machine using OpenERP's webservices features.</field>
         </record>
 
         <menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="hr.menu_hr_root" sequence="3"/>
-        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_time_tracking"       groups="hr.group_hr_manager" sequence="3"/>
+        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_time_tracking" groups="base.group_hr_manager,base.group_hr_user,group_hr_attendance" sequence="3"/>
 
         <record id="edit_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.form</field>
@@ -110,7 +110,7 @@
             <field name="view_id" ref="view_attendance_reason"/>
         </record>
 
-        <menuitem sequence="9" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
+        <menuitem sequence="9" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves" />
         <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_config"/>
 
         <record id="hr_attendance_employee" model="ir.ui.view">
diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index ca7faa5c6f8..1fb40252872 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -1,6 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_action_reason_employee","hr action reason employee","model_hr_action_reason","hr_attendance.group_hr_attendance",1,0,0,0
-"access_hr_action_reason_employee","hr action reason employee","model_hr_action_reason","hr.group_hr_manager",1,1,1,1
-"access_hr_attendance_employee","hr attendance employee","model_hr_attendance","hr_attendance.group_hr_attendance",1,1,1,1
-"access_hr_employee_attendance","hr employee attendance sign in out","hr.model_hr_employee","hr_attendance.group_hr_attendance",1,0,0,0
-"access_hr_attendance_resource","hr resource attendance sign in out","resource.model_resource_resource","hr_attendance.group_hr_attendance",1,0,0,0
+"access_hr_action_reason_employee","hr action reason employee","model_hr_action_reason","group_hr_attendance",1,0,0,0
+"access_hr_action_reason_employee","hr action reason employee","model_hr_action_reason","base.group_hr_manager",1,1,1,1
+"access_hr_action_reason_employee_user","hr action reason employee user","model_hr_attendance","base.group_hr_user",1,1,1,1
+"access_hr_action_reason_employee_manager","hr action reason employee manager","model_hr_attendance","base.group_hr_manager",1,1,1,1
+"access_hr_attendance_employee","hr attendance employee","model_hr_attendance","group_hr_attendance",1,1,1,1
+"access_hr_employee_attendance","hr employee attendance sign in out","hr.model_hr_employee","group_hr_attendance",1,1,1,1
+"access_hr_attendance_resource","hr resource attendance sign in out","resource.model_resource_resource","group_hr_attendance",1,1,1,1
+"access_hr_job_attendance","hr_job_attendance","hr.model_hr_job","group_hr_attendance",1,0,0,0
+"access_hr_department_attendance","hr.department attendance","hr.model_hr_department","group_hr_attendance",1,0,0,0
+"access_hr_action_reason","hr.action.reason","model_hr_action_reason","base.group_system",1,1,1,1
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index ff366fcbce9..04a6ce6c53d 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -47,7 +47,7 @@
         </record>
 
         <menuitem action="action_hr_attendance_sigh_in_out" id="menu_hr_attendance_sigh_in_out"
-            parent="menu_hr_time_tracking" sequence="4"/>
+            parent="menu_hr_time_tracking" sequence="4" groups="base.group_hr_manager,base.group_hr_user,group_hr_attendance"/>
 
        <record id="view_hr_attendance_so_ask" model="ir.ui.view">
             <field name="name">hr.sign.in.out.ask.form</field>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 5ff928916c9..d32f9301b36 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -57,7 +57,7 @@
             <field name="search_view_id" ref="hr_contract_wage_type_view_search"/>
         </record>
 
-        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5"/>
+        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5" groups="base.group_system"/>
         <menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56"/>
 
         <record id="hr_contract_wage_type_period_view_form" model="ir.ui.view">
diff --git a/addons/hr_contract/security/hr_contract_security.xml b/addons/hr_contract/security/hr_contract_security.xml
index f407166082c..b891099e447 100644
--- a/addons/hr_contract/security/hr_contract_security.xml
+++ b/addons/hr_contract/security/hr_contract_security.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="group_hr_contract" model="res.groups">
-            <field name="name">Human Resources / Contracts</field>
+        <record id="base.group_hr_contract" model="res.groups">
+            <field name="name">Human Resources / Contract</field>
         </record>
 
     </data>
diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv
index 5237b6c01d4..0df71fbd082 100644
--- a/addons/hr_contract/security/ir.model.access.csv
+++ b/addons/hr_contract/security/ir.model.access.csv
@@ -1,15 +1,17 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_contract_wage_type_period_user","hr.contract.wage.type.period user","model_hr_contract_wage_type_period","hr.group_hr_user",1,0,0,0
-"access_hr_contract_wage_type_period","hr.contract.wage.type.period","model_hr_contract_wage_type_period","hr.group_hr_manager",1,1,1,1
-"access_hr_contract_wage_type_user","hr.contract.wage.type user","model_hr_contract_wage_type","hr.group_hr_user",1,0,0,0
-"access_hr_contract_wage_type","hr.contract.wage.type","model_hr_contract_wage_type","hr.group_hr_manager",1,1,1,1
-"access_hr_contract_wage_type_contract","hr.contract.wage.type contract","model_hr_contract_wage_type","group_hr_contract",1,1,1,1
-"access_hr_contract_wage_type_period_contract","hr.contract.wage.type.period contract","model_hr_contract_wage_type_period","group_hr_contract",1,1,1,1
-"access_hr_contract_user","hr.contract user","model_hr_contract","hr.group_hr_user",1,0,0,0
-"access_hr_contract","hr.contract","model_hr_contract","group_hr_contract",1,1,1,1
-"access_hr_employee_contract","hr.employee contract","hr.model_hr_employee","group_hr_contract",1,0,0,0
-"access_hr_resource_contract","hr.employee.resource contract","resource.model_resource_resource","group_hr_contract",1,0,0,0
-"access_hr_resource_calendar_contract","hr.employee.resource.calendar contract","resource.model_resource_calendar","group_hr_contract",1,0,0,0
-"access_hr_job_contract","hr.employee.job contract","hr.model_hr_job","group_hr_contract",1,0,0,0
-"access_hr_contract_type_user","hr.contract.type user","model_hr_contract_type","hr.group_hr_user",1,0,0,0
-"access_hr_contract_type","hr.contract.type","model_hr_contract_type","group_hr_contract",1,1,1,1
+"access_hr_contract_wage_type_period","hr.contract.wage.type.period","model_hr_contract_wage_type_period","base.group_hr_manager",1,1,1,1
+"access_hr_contract_wage_type","hr.contract.wage.type","model_hr_contract_wage_type","base.group_hr_manager",1,1,1,1
+"access_hr_contract_wage_type_contract","hr.contract.wage.type contract","model_hr_contract_wage_type","base.group_hr_contract",1,1,1,1
+"access_hr_contract_wage_type_period_contract","hr.contract.wage.type.period contract","model_hr_contract_wage_type_period","base.group_hr_contract",1,1,1,1
+"access_hr_contract","hr.contract","model_hr_contract","base.group_hr_contract",1,1,1,1
+"access_hr_employee_contract","hr.employee contract","hr.model_hr_employee","base.group_hr_contract",1,1,1,1
+"access_hr_resource_contract","hr.employee.resource contract","resource.model_resource_resource","base.group_hr_contract",1,1,1,1
+"access_hr_resource_calendar_contract","hr.employee.resource.calendar contract","resource.model_resource_calendar","base.group_hr_contract",1,1,1,1
+"access_hr_job_contract","hr.employee.job contract","hr.model_hr_job","base.group_hr_contract",1,1,1,1
+"access_hr_contract_type","hr.contract.type","model_hr_contract_type","base.group_hr_contract",1,1,1,1
+"access_hr_contract_wage_type","hr.contract.wage.type","model_hr_contract_wage_type","base.group_system",1,1,1,1
+"access_hr_contract_wage_type_period","hr.contract.wage.type.period","model_hr_contract_wage_type_period","base.group_system",1,1,1,1
+"access_hr_contract_type","hr.contract.type","model_hr_contract_type","base.group_system",1,1,1,1
+"access_hr_contract","hr.contract","model_hr_contract","base.group_system",1,1,1,1
+"access_hr_contract_type","hr.contract.type","model_hr_employee","base.group_system",1,1,1,1
+
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index a2ddebc5f20..44be7549dd3 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -62,8 +62,8 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
-        <menuitem name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4"/>
+        <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6" groups="base.group_hr_manager"/>
+        <menuitem name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4" groups="base.group_system"/>
         <menuitem parent="menu_eval_hr_config" id="menu_open_view_hr_evaluation_plan_tree"
             action="open_view_hr_evaluation_plan_tree"/>
 
@@ -173,7 +173,7 @@
                         </page>
                         <page string="Internal Notes">
                             <field name="note_action" colspan="4" nolabel="1"
-                                groups="hr.group_hr_manager"/>
+                                groups="base.group_hr_manager"/>
                         </page>
                         <page string="Public Notes">
                             <field name="note_summary" colspan="4" nolabel="1"/>
@@ -261,7 +261,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="search_view_id" ref="hr_evaluation.evaluation_search"/>
-            <field name="help">Each employee can be assigned to an evaluation plan. These plans define the frequency and the way you manage your periodic personnal evalautions. You will be able to define steps and attach interview forms to each step. OpenERP manages all kind of evaluations: bottom-up, top-down, self evaluation and final evaluation by the manager.</field>
         </record>
 
         <menuitem name="Evaluation" parent="menu_eval_hr" id="menu_open_view_hr_evaluation_tree"
@@ -348,12 +347,11 @@
             <field name="domain">[('is_evaluation' ,'=', True)]</field>
             <field name="context">{"search_default_todo":1,"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
-            <field name="help">Interview Requests are generated automatically by OpenERP according to employees evaluation plan. Each user receives automatic emails and requests to perform evaluation of their collegues periodically.</field>
         </record>
 
-        <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
+        <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests" groups="base.group_hr_manager" 
             action="action_hr_evaluation_interview_tree"/>
-        <menuitem name="Evaluation Reminders" parent="menu_eval_hr" id="menu_eval_send_mail"
+        <menuitem name="Evaluation Reminders" parent="menu_eval_hr" id="menu_eval_send_mail" groups="base.group_hr_manager"
            action="action_hr_evaluation_send_mail" sequence="45"/>
 
       <!-- Evaluation Interviews Button on Employee Form -->
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index 7f6355a3c06..89ed8f20099 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -1,8 +1,11 @@
 "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,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,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_evaluation","hr_evaluation.evaluation","model_hr_evaluation_evaluation","base.group_hr_user",1,1,1,1
+"access_hr_evaluation_evaluation_manager","hr_evaluation.evaluation","model_hr_evaluation_evaluation","base.group_hr_manager",1,0,0,0
+"access_hr_evaluation_plan","hr_evaluation.plan","model_hr_evaluation_evaluation","base.group_hr_user",1,0,0,0
+"access_hr_evaluation_plan_manager","hr_evaluation.plan","model_hr_evaluation_plan","base.group_hr_manager",1,0,0,0
+"access_hr_evaluation_plan_phase","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase","base.group_hr_user",1,0,0,0
+"access_hr_evaluation_plan_phase_manager","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase","base.group_hr_manager",1,0,0,0
+"access_hr_evaluation_interview","hr.evaluation.interview","model_hr_evaluation_interview","base.group_hr_user",1,1,1,1
+"access_hr_evaluation_interview_manager","hr.evaluation.interview","model_hr_evaluation_interview","base.group_hr_manager",1,0,0,0
+"access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report","base.group_hr_manager",1,0,0,0
+"access_hr_evaluation_plan","hr_evaluation.plan","model_hr_evaluation_plan","base.group_system",1,1,1,1
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 0e4a1c34095..06c33fe46f7 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -29,6 +29,7 @@
                 <tree string="Expenses" colors="blue:state=='draft'">
                     <field name="date"/>
                     <field name="employee_id"/>
+                    <field name="user_id" invisible="1"/>
                     <field name="department_id" groups="base.group_extended"/>
                     <field name="ref"/>
                     <field name="name"/>
@@ -158,11 +159,10 @@
             <field name="view_type">form</field>
             <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
-            <field name="help">The OpenERP expenses management module allows you to track the full flow. Every month, the employees record their expenses. At the end of the month, their managers validates the expenses sheets which creates costs on projects/analytic accounts. The accountant validates the proposed entries and the employee can be reimbursed. You can also reinvoice the customer at the end of the flow.</field>
         </record>
 
-        <menuitem id="next_id_49" name="Expenses" sequence="4" parent="hr.menu_hr_root"/>
-        <menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="next_id_49" groups="hr.group_hr_manager"/>
+        <menuitem id="next_id_49" name="Expenses" sequence="4" parent="hr.menu_hr_root" groups="base.group_hr_user"/>
+        <menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="next_id_49" groups="base.group_hr_manager,base.group_hr_user"/>
 
         <record id="view_product_hr_expense_form" model="ir.ui.view">
             <field name="name">product.product.expense.form</field>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 942c7f13316..0f3f74a1ce5 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -10,6 +10,7 @@
             <tree colors="blue:state in ('draft');black:state in ('confirm','accepted','invoiced','paid');gray:state in('cancelled')" string="Expenses Analysis">
                 <field name="date" invisible="1"/>
                 <field name="employee_id" invisible="1"/>
+                <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="day" invisible="1"/>
@@ -51,27 +52,27 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Expenses Analysis">
-            	<group>
-            		<filter icon="terp-go-year" string="  365 Days  "
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Expenses during last 7 year"/>
-	                <filter icon="terp-go-month" string="   30 Days   "
-	                    name="month"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Expenses during last month"/>
-		            <filter icon="terp-go-week" string="    7 Days    " separator="1"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Expenses during last 7 days"/>
-	                <separator orientation="vertical"/>
+              <group>
+                <filter icon="terp-go-year" string="  365 Days  "
+                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+                      help="Expenses during last 7 year"/>
+                  <filter icon="terp-go-month" string="   30 Days   "
+                      name="month"
+                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+                      help="Expenses during last month"/>
+                <filter icon="terp-go-week" string="    7 Days    " separator="1"
+                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Expenses during last 7 days"/>
+                  <separator orientation="vertical"/>
                     <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Expenses"/>
                     <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
-		                help = "Confirm Expenses"/>
+                    help = "Confirm Expenses"/>
                     <filter string="Accepted" icon="terp-camera_test" domain="[('state','=','accepted')]"
-	                    help = "Accepted Expenses"/>
+                      help = "Accepted Expenses"/>
                     <separator orientation="vertical"/>
                     <field name="employee_id"/>
                     <field name="department_id"/>
-				</group>
-				<newline/>
+        </group>
+        <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
                     <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index 43ae736b9ff..7489959057a 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -1,4 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_expense_expense","hr.expense.expense","model_hr_expense_expense","hr.group_hr_user",1,1,1,1
-"access_hr_expense_line","hr.expense.line","model_hr_expense_line","hr.group_hr_user",1,1,1,1
-"access_hr_expense_report","hr.expense.report","model_hr_expense_report","hr.group_hr_user",1,0,0,0
+"access_hr_expense_expense","hr.expense.expense","model_hr_expense_expense","base.group_hr_user",1,1,1,1
+"access_hr_expense_line","hr.expense.line","model_hr_expense_line","base.group_hr_user",1,1,1,1
+"access_hr_expense_report","hr.expense.report","model_hr_expense_report","base.group_hr_manager",1,0,0,0
+"access_product_product_hr_expense","product.product.hr.expense","product.model_product_product","base.group_hr_user",1,0,0,0
+"access_product_template_hr_expense","product.template.hr.expense","product.model_product_template","base.group_hr_user",1,0,0,0
+"access_product_uom_hr_expense","product.uom.hr.expense","product.model_product_uom","base.group_hr_user",1,0,0,0
+"access_product_price_type","product.price.type","product.model_product_price_type","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 61649cb0c47..8ecdb0d2cd6 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -137,6 +137,7 @@
                     <field name="name"/>
                     <field name="holiday_status_id"/>
                     <field name="manager_id" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
                     <field name="type"/>
                     <field name="state"/>
                 </tree>
@@ -194,6 +195,7 @@
                     <field name="name" invisible="1"/>
                     <field name="holiday_status_id"/>
                     <field name="manager_id" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
                     <field name="type" invisible="1"/>
                     <field name="state" invisible="1"/>
                 </tree>
@@ -215,6 +217,7 @@
                     <field name="name"/>
                     <field name="holiday_status_id"/>
                     <field name="manager_id" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
                     <field name="type"/>
                     <field name="state"/>
                 </tree>
@@ -253,7 +256,6 @@
             <field name="domain">[('type','=','remove')]</field>
             <field name="context">{'search_default_user_id':uid}</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
-            <field name="help">Leaves requests can be recorded by employees and validated by their managers. Once a leave request is validated it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc) and manage allowances per type.</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_open_ask_holidays_tree">
@@ -314,7 +316,7 @@
             parent="menu_open_ask_holidays"
             id="menu_open_company_allocation"
             action="open_company_allocation"
-            groups="hr.group_hr_manager"
+            groups="base.group_hr_manager"
             sequence="40"/>
 
         <!-- holidays status -->
@@ -355,7 +357,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
+        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves" groups="base.group_system"/>
         <menuitem name="Leave Status"
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index d928a8dcb9b..eedc4a78336 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -1,11 +1,10 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","hr.group_hr_user",1,0,0,0
-"access_hr_holidays_user","hr holidays user","model_hr_holidays","hr.group_hr_user",1,1,1,0
-"access_hr_holydays_status_manager","hr.holidays.status manager","model_hr_holidays_status","hr.group_hr_manager",1,1,1,1
-"access_hr_holidays_manager","hr holidays manager","model_hr_holidays","hr.group_hr_manager",1,1,1,1
-"access_hr_holidays_remain","hr holidays user","model_hr_holidays_remaining_leaves_user","hr.group_hr_user",1,0,0,0
-"access_hr_holidays_report","hr.holidays.report","model_hr_holidays_report","hr.group_hr_manager",1,1,1,1
-"access_hr_holidays_remaining_leaves_user","hr.hr.holidays.remaining.leaves.user","model_hr_holidays_remaining_leaves_user","hr.group_hr_manager",1,1,1,1
-"access_available_holidays_report","hr.available.holidays.report","model_available_holidays_report","hr.group_hr_manager",1,1,1,1
-"access_hr_holidays_report_user","hr.holidays.report","model_hr_holidays_report","hr.group_hr_user",1,0,0,0
-"access_available_holidays_report_user","hr.available.holidays.report","model_available_holidays_report","hr.group_hr_user",1,0,0,0
+"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","base.group_hr_user",1,0,0,0
+"access_hr_holidays_user","hr holidays user","model_hr_holidays","base.group_hr_user",1,1,1,0
+"access_hr_holydays_status_manager","hr.holidays.status manager","model_hr_holidays_status","base.group_hr_manager",1,0,0,0
+"access_hr_holidays_manager","hr holidays manager","model_hr_holidays","base.group_hr_manager",1,0,0,0
+"access_hr_holidays_remain","hr holidays user","model_hr_holidays_remaining_leaves_user","base.group_hr_user",1,0,0,0
+"access_hr_holidays_report","hr.holidays.report","model_hr_holidays_report","base.group_hr_manager",1,0,0,0
+"access_hr_holidays_remaining_leaves_user","hr.hr.holidays.remaining.leaves.user","model_hr_holidays_remaining_leaves_user","base.group_hr_manager",1,0,0,0
+"access_available_holidays_report","hr.available.holidays.report","model_available_holidays_report","base.group_hr_manager",1,0,0,0
+"access_hr_holydays_status","hr.holidays.status","model_hr_holidays_status","base.group_system",1,1,1,1
diff --git a/addons/hr_holidays/test/test_hr_holiday.yml b/addons/hr_holidays/test/test_hr_holiday.yml
index 03c1666dc6f..720ca5e9e84 100644
--- a/addons/hr_holidays/test/test_hr_holiday.yml
+++ b/addons/hr_holidays/test/test_hr_holiday.yml
@@ -8,8 +8,8 @@
     context_lang: en_US
     groups_id:
       - base.group_user
-      - hr.group_hr_manager
-      - hr.group_hr_user
+      - base.group_hr_manager
+      - base.group_hr_user
     login: user1
     name: user1
     password: user1
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 188a5e84197..b7886da2df0 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -45,11 +45,13 @@
     'init_xml': [
     ],
     'update_xml': [
+        'security/hr_security.xml',
         'hr_payroll_view.xml',
         'hr_payroll_workflow.xml',
         'hr_payroll_sequence.xml',
         'hr_paroll_report.xml',
         'hr_payroll_data.xml',
+        'security/ir.model.access.csv',
         'wizard/hr_payroll_create_analytic.xml',
         'wizard/hr_payroll_employees_detail.xml',
         'wizard/hr_payroll_year_salary.xml',
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 2ad028bd752..d6f787dad22 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -3,7 +3,7 @@
     <data>
         <!-- Root Menus -->
         <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll"/>
-        <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll"/>
+        <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll" groups="base.group_system"/>
         <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll"/>
 
         <!-- Passport Views    -->
@@ -425,11 +425,13 @@
                 <tree colors="blue:state in ('draft');black:state in ('confirm','new','hr_check','accont_check');gray:state in('done','cancel')" string="Payslip">
                     <field name="number"/>
                     <field name="employee_id"/>
+                    <field name="register_id" invisible="1"/>
                     <field name="name"/>
                     <field name="date"/>
                     <field name="grows"/>
                     <field name="net"/>
                     <field name="state"/>
+                    <field name="company_id"/>
                 </tree>
             </field>
         </record>
@@ -529,10 +531,10 @@
                     </group>
                     <newline/>
                     <group col="8" colspan="4" expand="0" string="Group By...">
-                        <filter string="Register" icon="terp-folder-yellow" name="register_id" context="{'register_id':self}"/>
-                        <filter string="Employees" icon="terp-partner" name="employee_id" context="{'employee_id':self}"/>
-                        <filter string="Periods" name="period_id" icon="terp-go-month" context="{'period_id':self}"/>
-                        <filter string="Staes" name="state" icon="terp-stock_effects-object-colorize" context="{'state':self}"/>
+                        <filter string="Register" icon="terp-folder-yellow" name="register_id" context="{'group_by':'register_id'}"/>
+                        <filter string="Employees" icon="terp-partner" name="employee_id" context="{'group_by':'employee_id'}"/>
+                        <filter string="Companies" name="company_id" icon="terp-go-month" context="{'group_by':'company_id'}"/>
+                        <filter string="States" name="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_payroll/security/hr_security.xml b/addons/hr_payroll/security/hr_security.xml
new file mode 100644
index 00000000000..23e57fecba8
--- /dev/null
+++ b/addons/hr_payroll/security/hr_security.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="1">
+
+    <record id="group_hr_payroll" model="res.groups">
+        <field name="name">Human Resources / Payroll</field>
+    </record>
+
+</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv
new file mode 100644
index 00000000000..b887cae0651
--- /dev/null
+++ b/addons/hr_payroll/security/ir.model.access.csv
@@ -0,0 +1,30 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_hr_employee_category_payroll","hr.payroll.employee.category","hr.model_hr_employee_category","group_hr_payroll",1,0,0,0
+"access_hr_employee_payroll","hr.payroll.employee","hr.model_hr_employee","group_hr_payroll",1,0,0,0
+"aceess_hr_contract_wage_type","hr.contract.wage.type","model_hr_contract_wage_type","group_hr_payroll",1,1,1,1
+"access_hr_passport","hr.passport","model_hr_passport","group_hr_payroll",1,1,1,1
+"access_hr_payroll_structure","hr.payroll.structure","model_hr_payroll_structure","group_hr_payroll",1,1,1,1
+"access_hr_contract","hr.contract","model_hr_contract","group_hr_payroll",1,1,1,1
+"access_hr_payroll_register","hr.payroll.register","model_hr_payroll_register","group_hr_payroll",1,1,1,1
+"access_hr_payroll_advice","hr.payroll.advice","model_hr_payroll_advice","group_hr_payroll",1,1,1,1
+"access_hr_payroll_advice_line","hr.payroll.advice.line","model_hr_payroll_advice_line","group_hr_payroll",1,1,1,1
+"access_hr_contibution_register","hr.contibution.register","model_hr_contibution_register","group_hr_payroll",1,1,1,1
+"access_hr_contibution_register_line","hr.contibution.register.line","model_hr_contibution_register_line","group_hr_payroll",1,1,1,1
+"access_hr_allounce_deduction_category","hr.allounce.deduction.category","model_hr_allounce_deduction_categoty","group_hr_payroll",1,1,1,1
+"access_company_contribution","company.contribution","model_company_contribution","group_hr_payroll",1,1,1,1
+"access_company_contribution_line","company.contribution.line","model_company_contribution_line","group_hr_payroll",1,1,1,1
+"access_hr_holidays_status","hr.holidays.status","hr_holidays.model_hr_holidays_status","group_hr_payroll",1,0,0,0
+"access_hr_expense_expense","hr.expense.expense","hr_expense.model_hr_expense_expense","group_hr_payroll",1,0,0,0
+"access_hr_payslip","hr.payslip","model_hr_payslip","group_hr_payroll",1,1,1,1
+"access_hr_payslip_account_move","hr.payslip.account.move","model_hr_payslip_account_move","group_hr_payroll",1,1,1,1
+"access_hr_payslip_line_condition","hr.payslip.line.condition","model_hr_payslip_line_condition","group_hr_payroll",1,1,1,1
+"access_hr_payslip_line","hr.payslip.line","model_hr_payslip_line","group_hr_payroll",1,1,1,1
+"access_hr_payslip_line_line","hr.payslip.line.line","model_hr_payslip_line_line","group_hr_payroll",1,1,1,1
+"access_account_journal_payroll","hr.payroll.journal","account.model_account_journal","group_hr_payroll",1,0,0,0
+"access_account_journal_view_payroll","account.journal.view.payroll","account.model_account_journal_view","group_hr_payroll",1,0,0,0
+"access_account_journal_column_payroll","account.journal.column.payroll","account.model_account_journal_column","group_hr_payroll",1,0,0,0
+"access_account_fiscalyear_payroll","account.fiscalyear.payroll","account.model_account_fiscalyear","group_hr_payroll",1,0,0,0
+"access_hr_payslip_contract","hr.payslip.contract","model_hr_payslip","base.group_hr_contract",1,0,0,0
+"access_hr_payroll_structure","hr.payroll.structure","model_hr_payroll_structure","base.group_system",1,1,1,1
+"access_company_contribution","company.contribution","model_company_contribution","base.group_system",1,1,1,1
+"access_hr_passport_sys","hr.passport","model_hr_passport","base.group_system",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 bad86afd5c0..e680fe8e6b9 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -1,5 +1,6 @@
 "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_user",1,1,1,1
-"access_hr_recruitment_report","hr.recruitment.report","model_hr_recruitment_report","hr.group_hr_manager",1,0,0,0
-"access_hr_recruitment_stage","hr.recruitment.stage","model_hr_recruitment_stage","hr.group_hr_user",1,1,1,1
-"access_hr_recruitment_degree","hr.recruitment.degree","model_hr_recruitment_degree","hr.group_hr_user",1,1,1,1
+"access_hr_applicant","hr.applicant","model_hr_applicant","base.group_hr_user",1,1,1,1
+"access_hr_recruitment_report","hr.recruitment.report","model_hr_recruitment_report","base.group_hr_manager",1,0,0,0
+"access_hr_recruitment_stage","hr.recruitment.stage","model_hr_recruitment_stage","base.group_hr_user",1,1,1,1
+"access_hr_recruitment_degree","hr.recruitment.degree","model_hr_recruitment_degree","base.group_hr_user",1,1,1,1
+"access_hr_recruitment_stage","hr.recruitment.stage","model_hr_recruitment_stage","base.group_system",1,1,1,1
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index 1354788f77b..081972582b0 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -17,10 +17,10 @@
 -->
         <!--<menuitem id="next_id_48" name="Timesheet" parent="hr.menu_hr_reporting"/>-->
        <!-- <menuitem action="wizard_hr_timesheet" id="menu_wizard_hr_timesheet" parent="next_id_48" type="wizard"
-            groups="hr.group_hr_manager"/>-->
+            groups="base.group_hr_manager"/>-->
         <!--<menuitem action="wizard_hr_timesheet" id="menu_wizard_hr_timesheet" parent="menu_hr_reporting_timesheet" type="wizard"
 
-            groups="hr.group_hr_manager"
+            groups="base.group_hr_manager"
             />-->
        <!-- <wizard id="wizard_hr_timesheet_my" menu="False" model="hr.employee" name="hr.analytical.timesheet.my" string="Print My Timesheet"/>
         <menuitem
@@ -28,7 +28,7 @@
             id="menu_wizard_hr_timesheet_my"
             parent="menu_hr_reporting_timesheet"
             type="wizard"
-            groups="hr.group_hr_user"
+            groups="base.group_hr_user"
             />-->
 
         <report auto="False" id="report_users_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet" xsl="hr_timesheet/report/users_timesheet.xsl"/>
@@ -37,7 +37,7 @@
         <!--<menuitem
             action="wizard_hr_timesheet_users"
             id="menu_wizard_hr_timesheet_users"
-            groups="hr.group_hr_manager"
+            groups="base.group_hr_manager"
             parent="menu_hr_reporting_timesheet" type="wizard"/>
 -->
     </data>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 9f8100cd184..34be022bb0f 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -34,7 +34,6 @@
                     <newline/>
                     <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/>
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
-
                     <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" select="1"/>
                     <field name="amount"/>
                     <field name="general_account_id"/>
@@ -83,11 +82,10 @@
             <field name="view_mode">tree,form</field>
             <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="hr_timesheet_line_search"/>
-            <field name="help">This functionality gives you a list of work done by user, product and analytic account (or project). A search tool allows you to make fine-grained analysis.</field>
         </record>
 
-		<menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
-		<menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
+    <menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
+    <menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
 
         <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.employee.extd_form</field>
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index 2ae7f12464a..ad3583bfab9 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -1,5 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","hr.group_hr_user",1,1,1,1
-"access_hr_account_analytic_line","account.account.analytic.line","account.model_account_analytic_line","hr.group_hr_user",1,1,1,0
-"access_account_analytic_journal","account.account.analytic.journal","account.model_account_analytic_journal","hr.group_hr_user",1,0,0,0
-"access_product_product_user","product.product user","product.model_product_product","hr.group_hr_user",1,0,0,0
+"access_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","base.group_hr_user",1,1,1,1
+"access_hr_account_analytic_line","account.account.analytic.line","account.model_account_analytic_line","base.group_hr_user",1,1,1,0
+"access_account_analytic_journal","account.account.analytic.journal","account.model_account_analytic_journal","base.group_hr_user",1,0,0,0
+"access_product_product_user","product.product user","product.model_product_product","base.group_hr_user",1,0,0,0
+"access_product_template_hr_timesheet","product.template.hr.timesheet","product.model_product_template","base.group_hr_user",1,0,0,0
+"access_product_uom_hr_timesheet","product.uom.hr.timesheet","product.model_product_uom","base.group_hr_user",1,0,0,0
diff --git a/addons/hr_timesheet/test/test_hr_timesheet.yml b/addons/hr_timesheet/test/test_hr_timesheet.yml
index 43143e4e324..ce132a5f85a 100644
--- a/addons/hr_timesheet/test/test_hr_timesheet.yml
+++ b/addons/hr_timesheet/test/test_hr_timesheet.yml
@@ -20,11 +20,11 @@
     company_id: base.main_company
     context_lang: en_US
     groups_id:
-      - hr.group_hr_user
+      - base.group_hr_user
       - hr_attendance.group_hr_attendance
       - base.group_user
       - base.group_extended
-      - hr.group_hr_manager
+      - base.group_hr_manager
     login: user1
     name: user1
     password: user1
@@ -124,7 +124,7 @@
     quantity_max: 0.0
     state: open
 
-- 
+-
   My work for this project is over and I stop working by clicking on "Stop Work" button of this wizard.
 -
   !python {model: hr.sign.out.project}: |
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index cb51fcc1cb3..d71946abfd9 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -38,7 +38,7 @@
         <menuitem action="action_hr_timesheet_users"
         	id="menu_hr_timesheet_users"
         	parent="menu_hr_reporting_timesheet"
-        	groups="hr.group_hr_manager" sequence="3" icon="STOCK_PRINT"/>
+        	groups="base.group_hr_manager" sequence="3" icon="STOCK_PRINT"/>
 
 
      </data>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
index b1a6cc0dc51..eed0e97ecf7 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
@@ -36,7 +36,7 @@
            id="print_account_analytic_profit"
            parent="menu_hr_reporting_timesheet_invoice"
            type="wizard"
-           groups="hr.group_hr_manager"/>-->
+           groups="base.group_hr_manager"/>-->
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index cbdef2a28ba..cabf51546c2 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -506,12 +506,12 @@
                 parent="base.menu_project_management_time_tracking"
                 sequence="7"/-->
       <!--<menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board"
-            parent="hr_attendance.menu_hr_time_tracking" groups="hr.group_hr_manager"/>
+            parent="hr_attendance.menu_hr_time_tracking" groups="base.group_hr_manager"/>
            <menuitem
                 action="action_random_timesheet_lines_board"
                 id="menu_hr_action_random_timesheet_lines_board"
                 name="Working Hours"
                 parent="hr_attendance.menu_hr_time_tracking"
-                groups="hr.group_hr_manager" sequence="2"/>-->
+                groups="base.group_hr_manager" sequence="2"/>-->
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/security/ir.model.access.csv b/addons/hr_timesheet_invoice/security/ir.model.access.csv
index c8b65d13c36..0d65ae44f1b 100644
--- a/addons/hr_timesheet_invoice/security/ir.model.access.csv
+++ b/addons/hr_timesheet_invoice/security/ir.model.access.csv
@@ -1,11 +1,13 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_timesheet_invoice_factor_hr_user","hr_timesheet_invoice.factor.hr.user","model_hr_timesheet_invoice_factor","hr.group_hr_user",1,0,0,0
+"access_hr_timesheet_invoice_factor_hr_user","hr_timesheet_invoice.factor.hr.user","model_hr_timesheet_invoice_factor","base.group_hr_user",1,0,0,0
 "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","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
+"access_report_timesheet_user","report_timesheet.user","model_report_timesheet_user","base.group_hr_manager",1,0,0,0
+"access_report_timesheet_account","report_timesheet.account","model_report_timesheet_account","base.group_hr_manager",1,0,0,0
+"access_report_timesheet_account_date","report_timesheet.account.date","model_report_timesheet_account_date","base.group_hr_manager",1,0,0,0
+"access_report_timesheet_invoice","report_timesheet.invoice","model_report_timesheet_invoice","base.group_hr_manager",1,0,0,0
+"access_report_random_timesheet","report_random_timesheet","model_report_random_timesheet","base.group_hr_manager",1,0,0,0
+"access_report_random_timesheet_lines","random_timesheet_lines","model_random_timesheet_lines","base.group_hr_manager",1,0,0,0
+"access_report_analytic_account_close_system","report.analytic.account.close system","model_report_analytic_account_close","base.group_system",1,1,1,1
+"access_report_account_analytic_line_to_invoice_system","report.account.analytic.line.to.invoice system","model_report_account_analytic_line_to_invoice","base.group_system",1,1,1,1
diff --git a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
index 80d85246631..0c69af2616b 100644
--- a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
+++ b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-		<record id="action_timesheet_report_all" model="ir.actions.act_window">
-		        <field name="name">Timesheets by Month</field>
-		        <field name="type">ir.actions.act_window</field>
-		        <field name="res_model">timesheet.report</field>
-		        <field name="view_type">form</field>
-		        <field name="view_mode">graph,tree</field>
-		        <field name="domain">[('user_id','=',uid), ('month', '=' , time.strftime('%m')), ('year', '=', time.strftime('%Y'))]</field>
-		        <field name="view_id" ref="hr_timesheet_sheet.view_timesheet_report_graph"/>
-		</record>
+    <record id="action_timesheet_report_all" model="ir.actions.act_window">
+            <field name="name">Timesheets by Month</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">timesheet.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="domain">[('user_id','=',uid), ('month', '=' , time.strftime('%m')), ('year', '=', time.strftime('%Y'))]</field>
+            <field name="view_id" ref="hr_timesheet_sheet.view_timesheet_report_graph"/>
+    </record>
 
-		<record id="action_hr_timesheet_sheet_graph" model="ir.actions.act_window">
+    <record id="action_hr_timesheet_sheet_graph" model="ir.actions.act_window">
             <field name="name">Timesheets</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr_timesheet_sheet.sheet</field>
@@ -23,12 +23,12 @@
         <record id="board_hr_timesheet_form" model="ir.ui.view">
             <field name="name">board.hr.timesheet.form</field>
             <field name="model">board.board</field>
-			<field name="inherit_id" ref="hr.board_hr_form"/>              
+      <field name="inherit_id" ref="hr.board_hr_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<xpath expr="/form/hpaned/child2" position="inside"> 
-					<action colspan="4" height="220" name="%(action_hr_timesheet_sheet_graph)d" string="Timesheets by Month" />
-				</xpath>
+        <xpath expr="/form/hpaned/child2" position="inside">
+          <action colspan="4" height="220" name="%(action_hr_timesheet_sheet_graph)d" string="Timesheets by Month" />
+        </xpath>
             </field>
         </record>
         <record id="hr_timesheet_sheet_tree" model="ir.ui.view">
@@ -39,6 +39,7 @@
                 <tree colors="blue:state in ('draft');black:state in ('confirm','new');gray:state in('done')" string="Timesheets">
                     <field name="date_from"/>
                     <field name="user_id"/>
+                    <field name="department_id" invisible="1"/>
                     <field name="name"/>
                     <field name="total_attendance"/>
                     <field name="total_timesheet"/>
@@ -46,7 +47,7 @@
                 </tree>
             </field>
         </record>
-        
+
      <!--   Add in projectboard
         <record id="act_hr_timesheet_sheet" model="ir.actions.act_window">
             <field name="name">Timesheets</field>
@@ -54,16 +55,16 @@
             <field name="domain">[('state','&lt;&gt;','done'),('user_id','in',department_users_get())]</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="hr_timesheet_sheet_tree"/>
-        </record>  
-		<record id="board_project_timesheet_form" model="ir.ui.view">
+        </record>
+    <record id="board_project_timesheet_form" model="ir.ui.view">
             <field name="name">board.project.timesheet.form</field>
             <field name="model">board.board</field>
-			<field name="inherit_id" ref="project.board_project_manager_form"/>              
+      <field name="inherit_id" ref="project.board_project_manager_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<xpath expr="/form/hpaned/child1" position="inside"> 
-					<action colspan="4" height="150" name="%(act_hr_timesheet_sheet)d" string="User's timesheets" width="510"/>
-				</xpath>
+        <xpath expr="/form/hpaned/child1" position="inside">
+          <action colspan="4" height="150" name="%(act_hr_timesheet_sheet)d" string="User's timesheets" width="510"/>
+        </xpath>
             </field>
         </record>-->
     </data>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index be04a9d5186..3369efe5a5f 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -232,10 +232,10 @@
              name="Time Tracking"
              parent="base.menu_main_pm" sequence="5"/>
          <menuitem action="hr_timesheet_sheet.act_hr_timesheet_sheet_form" id="menu_act_project_management_timesheet_sheet_form" parent="base.menu_project_management_time_tracking"
-             groups="hr.group_hr_manager" sequence="5"/>
+              sequence="5"/>
         <!--<menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/>-->
         <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
-            groups="hr.group_hr_manager" sequence="1"/>
+            groups="base.group_hr_manager" sequence="1"/>
 
         <!--
             Company inheritancy
@@ -338,6 +338,7 @@
                 <tree colors="blue:state in ('draft');black:state in ('confirm','new');gray:state in('done')" string="Timesheets">
                     <field name="date_from"/>
                     <field name="user_id"/>
+                    <field name="department_id" invisible="1"/>
                     <field name="name"/>
                     <field name="total_attendance"/>
                     <field name="total_timesheet"/>
@@ -346,8 +347,8 @@
             </field>
         </record>
 
-	<!-- Timesheet Button on Employee Form -->
-	<act_window domain="[('user_id', '=', user_id)]" id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
+  <!-- Timesheet Button on Employee Form -->
+  <act_window domain="[('user_id', '=', user_id)]" id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index 141a1667404..9411a2db6a2 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_timesheet_sheet_sheet","hr_timesheet_sheet.sheet","model_hr_timesheet_sheet_sheet","hr.group_hr_user",1,1,1,1
-"access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","hr.group_hr_user",1,1,1,1
-"access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","hr.group_hr_user",1,1,1,1
-"access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","hr.group_hr_manager",1,0,0,0
+"access_hr_timesheet_sheet_sheet","hr_timesheet_sheet.sheet","model_hr_timesheet_sheet_sheet","base.group_hr_user",1,1,1,1
+"access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","base.group_hr_user",1,1,1,1
+"access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","base.group_hr_user",1,1,1,1
+"access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,0,0,0
diff --git a/addons/html_view/__openerp__.py b/addons/html_view/__openerp__.py
index 8ffd2f6abd4..aaaec27fc09 100644
--- a/addons/html_view/__openerp__.py
+++ b/addons/html_view/__openerp__.py
@@ -9,9 +9,9 @@
     "description": """
     This is the test module which shows html tag supports in normal xml form view.
     """,
-    'update_xml': ['html_view.xml'],
+    'update_xml': ['security/ir.model.access.csv','html_view.xml',],
     'installable': True,
     'active': False,
     'certificate': '',
 }
-# 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/html_view/security/ir.model.access.csv b/addons/html_view/security/ir.model.access.csv
index 0b1057cfd1e..e79e65bb4b5 100644
--- a/addons/html_view/security/ir.model.access.csv
+++ b/addons/html_view/security/ir.model.access.csv
@@ -1,2 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_html_view","html.view","model_html_view",,1,0,0,0
+"access_html_view","html.view","model_html_view","base.group_system",1,0,0,0
+"access_html_view_sale_user","html.view user","model_html_view","base.group_sale_salesman",1,1,1,0
+"access_html_view_sale_manager","html.view manager","model_html_view","base.group_sale_manager",1,0,0,0
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 309cc824cb7..1020e2d03c1 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -65,7 +65,7 @@
     </record>
 
     <menuitem name="Configuration" parent="base.menu_tools"
-         id="base.menu_lunch_survey_root" sequence="20"/>
+         id="base.menu_lunch_survey_root" sequence="20" groups="base.group_system"/>
 
     <menuitem name="Ideas" parent="base.menu_lunch_survey_root" id="menu_ideas" sequence="3"/>
 
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index d2a4006a7e0..b78c8c0648c 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -84,7 +84,7 @@
             <field name="context">{'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
         </record>
 
-        <menuitem action="action_report_vote_all" id="menu_report_vote_all" parent="menu_idea_reporting" sequence="1"/>
+        <menuitem action="action_report_vote_all" id="menu_report_vote_all" parent="menu_idea_reporting" sequence="1" groups="base.group_survey_manager"/>
     </data>
 </openerp>
 
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index 6fd4b290086..29afc0c875f 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -8,6 +8,19 @@
 <!--		<record id="idea.menu_reporting" model="ir.ui.menu">-->
 <!--			<field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>-->
 <!--		</record>-->
+
+    <record id="base.group_sale_salesman" model="res.groups">
+        <field name="name">Sales / User</field>
+    </record>
+
+   	<record model="res.groups" id="base.group_survey_manager">
+        	<field name="name">Tools / Manager</field>
+   		</record>
+   	<record model="res.groups" id="base.group_survey_user">
+        	<field name="name">Tools / User</field>
+   	</record>
+
+
 	</data>
 </openerp>
 
diff --git a/addons/idea/security/ir.model.access.csv b/addons/idea/security/ir.model.access.csv
index 6c15c223c06..cd6f56cf60e 100644
--- a/addons/idea/security/ir.model.access.csv
+++ b/addons/idea/security/ir.model.access.csv
@@ -7,3 +7,16 @@
 "access_idea_comment","idea.comment","model_idea_comment","base.group_system",1,1,1,1
 "access_idea_comment_user","idea.comment","model_idea_comment","base.group_user",1,1,1,0
 "access_report_vote","report.vote","model_report_vote","base.group_user",1,1,1,1
+"access_idea_idea_sale_salesman","idea.idea.sale","model_idea_idea","base.group_sale_salesman",1,1,1,1
+"access_idea_vote_sale_salesman","idea.vote.sale","model_idea_vote","base.group_sale_salesman",1,1,1,1
+"access_idea_category_user","idea.category user","model_idea_category","base.group_survey_user",1,1,1,1
+"access_idea_idea_user","idea.idea user","model_idea_idea","base.group_survey_user",1,1,1,1
+"access_idea_vote_user","idea.vote user","model_idea_vote","base.group_survey_user",1,1,1,1
+"access_idea_category_manager","idea.category manager","model_idea_category","base.group_survey_manager",1,0,0,0
+"access_idea_idea_manager","idea.idea manager","model_idea_idea","base.group_survey_manager",1,0,0,0
+"access_idea_vote_manager","idea.vote manager","model_idea_vote","base.group_survey_manager",1,0,0,0
+"access_idea_vote_stat_user","idea.vote.stat user","model_idea_vote_stat","base.group_survey_user",1,1,1,1
+"access_idea_comment_user","idea.comment user","model_idea_comment","base.group_survey_user",1,1,1,1
+"access_report_vote_manager","report.vote manager","model_report_vote","base.group_survey_manager",1,1,1,1
+"access_idea_idea_system","idea.idea system","model_idea_idea","base.group_system",1,0,0,0
+"access_idea_vote_system","idea.vote system","model_idea_vote","base.group_system",1,0,0,0
diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index a20d0378f82..e56c35fdd66 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -30,6 +30,7 @@
     'website': 'http://www.openerp.com',
     'init_xml': [],
     'update_xml': [
+        'security/knowledge_security.xml',
         'security/ir.model.access.csv',
         'knowledge_installer.xml',
         'knowledge_view.xml',
diff --git a/addons/knowledge/security/ir.model.access.csv b/addons/knowledge/security/ir.model.access.csv
index 0343f29f43a..d111677a4d3 100644
--- a/addons/knowledge/security/ir.model.access.csv
+++ b/addons/knowledge/security/ir.model.access.csv
@@ -1 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_ir_attachment_sale_manager","ir_attachment manager","base.model_ir_attachment","base.group_sale_manager",1,1,1,1
+"access_ir_attachment_partner_manager","ir_attachment_partner manager","base.model_ir_attachment","base.group_partner_manager",1,1,1,1
diff --git a/addons/knowledge/security/knowledge_security.xml b/addons/knowledge/security/knowledge_security.xml
new file mode 100644
index 00000000000..ff98b19f62b
--- /dev/null
+++ b/addons/knowledge/security/knowledge_security.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+            <record id="base.group_sale_manager" model="res.groups">
+                <field name="name">Sales / Manager</field>
+            </record>
+</data>
+</openerp>
diff --git a/addons/l10n_be/security/ir.model.access.csv b/addons/l10n_be/security/ir.model.access.csv
index 0343f29f43a..de2c3f15547 100644
--- a/addons/l10n_be/security/ir.model.access.csv
+++ b/addons/l10n_be/security/ir.model.access.csv
@@ -1 +1,4 @@
 "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/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index dbc857a30c3..f3af9f7368e 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -5,7 +5,7 @@
     	<menuitem
         id="menu_finance_belgian_statement"
         name="Belgium Statements"
-        parent="account.menu_finance_legal_statement"/>
+        parent="account.menu_finance_legal_statement" groups="account.group_account_manager"/>
 
     	<record id="view_vat_declaration" model="ir.ui.view">
             <field name="name">Vat Declaraion</field>
@@ -67,7 +67,8 @@
 	        name="Periodical VAT Declaration"
 	        parent="menu_finance_belgian_statement"
 	        action="action_vat_declaration"
-	        id="l10_be_vat_declaration"/>
+	        id="l10_be_vat_declaration"
+            groups="account.group_account_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index 7ffbe191ba0..04be5fba2d0 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -39,6 +39,7 @@
     """,
     "init_xml": [],
     "update_xml": [
+        'security/lunch_security.xml',
         'security/ir.model.access.csv',
         'wizard/lunch_order_cancel_view.xml',
         'wizard/lunch_order_confirm_view.xml',
diff --git a/addons/lunch/security/ir.model.access.csv b/addons/lunch/security/ir.model.access.csv
index bd5ca5df0d5..5d5ab895aa0 100644
--- a/addons/lunch/security/ir.model.access.csv
+++ b/addons/lunch/security/ir.model.access.csv
@@ -5,3 +5,15 @@
 "access_lunch_cashmove","lunch.cashmove","model_lunch_cashmove","base.group_user",1,1,1,1
 "access_lunch_order","lunch.order","model_lunch_order","base.group_user",1,1,1,1
 "access_report_lunch_amount","report.lunch.amount","model_report_lunch_amount","base.group_user",1,1,1,1
+"access_lunch_order_sale_salesman","lunch.order.sale","model_lunch_order","base.group_sale_salesman",1,1,1,1
+"access_lunch_order_user","lunch.order user","model_lunch_order","base.group_survey_user",1,1,1,1
+"access_lunch_order_manager","lunch.order manager","model_lunch_order","base.group_survey_manager",1,0,0,0
+"access_lunch_cashmove_user","lunch.cashmove user","model_lunch_cashmove","base.group_survey_user",1,1,1,1
+"access_lunch_cashmove_manager","lunch.cashmove manager","model_lunch_cashmove","base.group_survey_manager",1,0,0,0
+"access_report_lunch_amount_manager","report.lunch.amount manager","model_report_lunch_amount","base.group_survey_manager",1,1,1,1
+"access_lunch_category_system","lunch.category system","model_lunch_category","base.group_system",1,1,1,1
+"access_lunch_product_system","lunch.product system","model_lunch_product","base.group_system",1,1,1,1
+"access_lunch_cashbox_system","lunch.cashbox system","model_lunch_cashbox","base.group_system",1,1,1,1
+"access_lunch_order_system","lunch.order system","model_lunch_order","base.group_system",1,0,0,0
+"access_lunch_cashmove_system","lunch.cashmove system","model_lunch_cashmove","base.group_system",1,0,0,0
+"access_report_lunch_order_manager","report.lunch.order manager","model_report_lunch_order","base.group_survey_manager",1,1,1,1
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
new file mode 100644
index 00000000000..c87ace64801
--- /dev/null
+++ b/addons/lunch/security/lunch_security.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+
+    <record id="base.group_sale_salesman" model="res.groups">
+        <field name="name">Sales / User</field>
+    </record>
+   	<record model="res.groups" id="base.group_survey_manager">
+        	<field name="name">Tools / Manager</field>
+   		</record>
+   	<record model="res.groups" id="base.group_survey_user">
+        	<field name="name">Tools / User</field>
+   	</record>
+
+</data>
+</openerp>
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index fb70a08efc3..f30416ed8fe 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -179,7 +179,7 @@
 
         <menuitem id="base.menu_base_config_mail" name="Mail" parent="base.menu_base_config" sequence="4"/>
         <menuitem id="menu_mailgate_message" name="Emails" action="action_view_mailgate_message"
-           parent="base.menu_base_config_mail" sequence="5"/>
+           parent="base.menu_base_config_mail" sequence="5" groups="base.group_system"/>
 
         <act_window domain="[('partner_id', '=', active_id), ('history', '=', True)]"
             id="act_res_partner_emails" name="Emails"
diff --git a/addons/mail_gateway/security/ir.model.access.csv b/addons/mail_gateway/security/ir.model.access.csv
index badba5d4e3e..db70d947de2 100644
--- a/addons/mail_gateway/security/ir.model.access.csv
+++ b/addons/mail_gateway/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"
-"mail_gateway_mailgate_message","mail_gateway.mailgate.message","model_mailgate_message","base.group_user",1,1,1,1
-"mail_gateway_mailgate_thread","mail_gateway.mailgate.thread","model_mailgate_thread","base.group_user",1,1,1,1
+"mail_gateway_mailgate_message","mail_gateway.mailgate.message","model_mailgate_message","base.group_system",1,1,1,1
+"mail_gateway_mailgate_thread","mail_gateway.mailgate.thread","model_mailgate_thread","base.group_system",1,1,1,1
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index 1735d6464fe..4234b65eb5f 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -2,8 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"
-            groups="group_marketing_user"/>
+        <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"/>
 
         <record id="view_marketing_installer" model="ir.ui.view">
             <field name="name">marketing.installer.view</field>
diff --git a/addons/marketing/security/marketing_security.xml b/addons/marketing/security/marketing_security.xml
index 232b3ecce79..834c763b8d0 100644
--- a/addons/marketing/security/marketing_security.xml
+++ b/addons/marketing/security/marketing_security.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-
-    <record id="group_marketing_user" model="res.groups">
+    <record id="base.res_groups_email_template_admin" model="res.groups">
         <field name="name">Marketing / User</field>
     </record>
-
 </data>
 </openerp>
+<!--group_marketing_user-->
diff --git a/addons/marketing_campaign/security/ir.model.access.csv b/addons/marketing_campaign/security/ir.model.access.csv
index 43a24d9e5eb..903ca7ac72a 100644
--- a/addons/marketing_campaign/security/ir.model.access.csv
+++ b/addons/marketing_campaign/security/ir.model.access.csv
@@ -1,8 +1,10 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_marketing_campaign_admin","marketing.campaign","model_marketing_campaign","marketing_campaign.res_groups_marketing_campaign",1,1,1,1
-"access_marketing_campaign_segment_campaignadmin","marketing.campaign.segment","model_marketing_campaign_segment","marketing_campaign.res_groups_marketing_campaign",1,1,1,1
-"access_marketing_campaign_activity_campaignadmin","marketing.campaign.activity","model_marketing_campaign_activity","marketing_campaign.res_groups_marketing_campaign",1,1,1,1
-"access_marketing_campaign_workitem_campaignadmin","marketing.campaign.workitem","model_marketing_campaign_workitem","marketing_campaign.res_groups_marketing_campaign",1,1,1,1
-"access_marketing_campaign_transition_campaignadmin","marketing.campaign.transition","model_marketing_campaign_transition","marketing_campaign.res_groups_marketing_campaign",1,1,1,1
-"access_marketing_campaign_analysis_campaignadmin","campaign.analysis","model_campaign_analysis","marketing_campaign.res_groups_marketing_campaign",1,0,0,0
+"access_marketing_campaign_admin","marketing.campaign","model_marketing_campaign","base.res_groups_email_template_admin",1,1,1,1
+"access_marketing_campaign_segment_campaignadmin","marketing.campaign.segment","model_marketing_campaign_segment","base.res_groups_email_template_admin",1,1,1,1
+"access_marketing_campaign_activity_campaignadmin","marketing.campaign.activity","model_marketing_campaign_activity","base.res_groups_email_template_admin",1,1,1,1
+"access_marketing_campaign_workitem_campaignadmin","marketing.campaign.workitem","model_marketing_campaign_workitem","base.res_groups_email_template_admin",1,1,1,1
+"access_marketing_campaign_transition_campaignadmin","marketing.campaign.transition","model_marketing_campaign_transition","base.res_groups_email_template_admin",1,1,1,1
+"access_marketing_campaign_analysis_campaignadmin","campaign.analysis","model_campaign_analysis","base.res_groups_email_template_admin",1,1,1,1
 "access_marketing_campaign_workitem_all","marketing.campaign.workitem","model_marketing_campaign_workitem","base.group_user",1,0,0,0
+"access_email_template_user","email.template","model_email_template","base.res_groups_email_template_admin",1,1,1,1
+"access_email_template_account_user","email_template.account.user","email_template.model_email_template_account","base.res_groups_email_template_admin",1,1,1,1
diff --git a/addons/marketing_campaign/security/marketing_campaign_security.xml b/addons/marketing_campaign/security/marketing_campaign_security.xml
index e28fd4867ce..b9267694818 100644
--- a/addons/marketing_campaign/security/marketing_campaign_security.xml
+++ b/addons/marketing_campaign/security/marketing_campaign_security.xml
@@ -2,9 +2,12 @@
 <openerp>
     <data>
 
-        <record id="res_groups_marketing_campaign" model="res.groups">
-            <field name="name">Marketing / Campaign</field>
+        <record id="base.res_groups_email_template_admin" model="res.groups">
+            <field name="name">Marketing / User</field>
         </record>
+        <!--record id="res_groups_marketing_campaign" model="res.groups">
+            <field name="name">Marketing / Campaign</field>
+        </record-->
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/marketing_campaign_mailchimp/security/ir.model.access.csv b/addons/marketing_campaign_mailchimp/security/ir.model.access.csv
new file mode 100644
index 00000000000..d54743b7ed8
--- /dev/null
+++ b/addons/marketing_campaign_mailchimp/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_mailchimp_account_user","mailchimp.account.user","marketing_campaign_mailchimp.model_mailchimp_account","base.res_groups_email_template_admin",1,1,1,1
+"access_mailchimp_account_system","mailchimp.account.user","marketing_campaign_mailchimp.model_mailchimp_account","base.groups_system",1,0,0,0
+"access_email_template_account_system","email_template_account_user","marketing_campaign_mailchimp.model_email_template_account","base.res_groups_email_template_admin",1,1,1,1
+"access_email_template_campaign","email_template_campaign","model_email_template","base.res_groups_email_template_admin",1,1,1,1
diff --git a/addons/marketing_campaign_mailchimp/security/marketing_security.xml b/addons/marketing_campaign_mailchimp/security/marketing_security.xml
new file mode 100644
index 00000000000..0a6393a367a
--- /dev/null
+++ b/addons/marketing_campaign_mailchimp/security/marketing_security.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    <record id="base.res_groups_email_template_admin" model="res.groups">
+        <field name="name">Marketing / User</field>
+    </record>
+
+</data>
+</openerp>
+<!--group_marketing_user-->
diff --git a/addons/membership/security/ir.model.access.csv b/addons/membership/security/ir.model.access.csv
index f3d91646c44..6cf3eb755c2 100644
--- a/addons/membership/security/ir.model.access.csv
+++ b/addons/membership/security/ir.model.access.csv
@@ -1,4 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_membership_membership_line_partner_manager","membership.membership_line partner_manager","model_membership_membership_line","base.group_partner_manager",1,1,1,1
+"access_membership_membership_line_partner_manager","membership.membership_line partner_manager","model_membership_membership_line","base.group_partner_manager",1,0,0,0
 "access_membership_membership_line","membership.membership_line","model_membership_membership_line",,1,0,0,0
 "access_report_membership","report.membership","model_report_membership","base.group_partner_manager",1,0,0,0
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index ca003b33daa..8e4a2e2d0d4 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
-            groups="group_mrp_user,group_mrp_manager" sequence="8"/>
+            groups="group_mrp_user,group_mrp_manager,base.group_system" sequence="8"/>
         <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="5"/>
         <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
 
@@ -11,6 +11,7 @@
         <menuitem name="Master Data"
                   id="menu_mrp_bom"
                   parent="base.menu_mrp_root"
+                  groups="mrp.group_mrp_user,mrp.group_mrp_manager,base.group_system"
                   sequence="5" />
 
         <!--
@@ -41,7 +42,7 @@
             id="menu_mrp_configuration"
             name="Configuration"
             parent="base.menu_mrp_root"
-            groups="group_mrp_manager"
+            groups="base.group_system"
             sequence="50" />
 
         <record id="mrp_property_tree_view" model="ir.ui.view">
@@ -109,10 +110,11 @@
             action="mrp_property_action"
             id="menu_mrp_property_action"
             parent="menu_mrp_property"
-            groups="base.group_extended" />
+            groups="base.group_extended,base.group_system" />
         <menuitem
             action="mrp_property_group_action"
             id="menu_mrp_property_group_action"
+            groups="base.group_system"
             parent="menu_mrp_property"/>
 
         <!--
@@ -421,11 +423,12 @@
             action="mrp_bom_form_action"
             id="menu_mrp_bom_form_action"
             parent="menu_mrp_bom"
+            groups="mrp.group_mrp_user,mrp.group_mrp_manager,base.group_system"
             sequence="10"/>
         <menuitem
             action="mrp_bom_form_action2"
             id="menu_mrp_bom_form_action2"
-            groups="base.group_extended"
+            groups="base.group_extended,mrp.group_mrp_user,mrp.group_mrp_manager,base.group_system"
             parent="menu_mrp_bom"
             sequence="20"/>
 
@@ -483,7 +486,7 @@
 <!--        <menuitem action="procurement.procurement_action5" id="menu_mrp_procurement_exception_action"-->
 <!--                  parent="mrp.menu_mrp_control" sequence="1" />-->
 
-         <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="3"/>
+         <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" groups="base.group_system,mrp.group_mrp_user,mrp.group_mrp_manager" sequence="3"/>
         <menuitem action="procurement.action_compute_schedulers" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90"/>
 
         <!--
@@ -768,7 +771,7 @@
             <field name="context">{'search_default_Current':1}</field>
             <field name="help">Manufacturing Orders describe the operations that need to be carried out and the raw materials usage for each stage of production. You use specifications (bills of materials) to work out the raw material requirements and the manufacturing orders needed for the finished products. Once the bills of materials have been defined, Open ERP becomes capable of automatically deciding on the manufacturing route depending on the needs of the company.</field>
         </record>
-        <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_manufacturing" sequence="1"/>
+        <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_manufacturing" groups="base.group_system,mrp.group_mrp_user,mrp.group_mrp_manager" sequence="1"/>
 
         <record id="mrp_production_action2_gantt" model="ir.actions.act_window">
             <field name="name">Manufacturing Orders Planning</field>
@@ -908,10 +911,10 @@
             src_model="product.product"/>
 
         <!-- Menu for Resource for MRP-->
-        <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing" sequence="3"/>
+        <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing" groups="mrp.group_mrp_user" sequence="3" />
 
         <menuitem id="menu_pm_resources_mrp" name="Resources" parent="base.menu_mrp_root"
-            groups="base.group_extended"
+            groups="base.group_extended,mrp.group_mrp_user,mrp.group_mrp_manager,base.group_system"
             sequence="4"/>
         <menuitem id="menu_pm_resources_config" name="Resources" parent="menu_mrp_configuration"/>
         <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index e823bd036d8..51577db1ce2 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -1,17 +1,16 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mrp_workcenter","mrp.workcenter","model_mrp_workcenter","mrp.group_mrp_user",1,0,0,0
+"access_mrp_workcenter","mrp.workcenter","model_mrp_workcenter","mrp.group_mrp_user",1,1,1,1
 "access_mrp_routing","mrp.routing","model_mrp_routing","mrp.group_mrp_user",1,0,0,0
 "access_mrp_routing_workcenter","mrp.routing.workcenter","model_mrp_routing_workcenter","mrp.group_mrp_user",1,0,0,0
-"access_mrp_bom","mrp.bom","model_mrp_bom","group_mrp_user",1,0,0,0
+"access_mrp_bom","mrp.bom","model_mrp_bom","group_mrp_user",1,1,1,0
 "access_mrp_bom_revision","mrp.bom.revision","model_mrp_bom_revision","group_mrp_user",1,0,0,0
-"access_mrp_production","mrp.production","model_mrp_production","mrp.group_mrp_user",1,1,1,1
-"access_mrp_production_workcenter_line","mrp.production.workcenter.line","model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1
+"access_mrp_production","mrp.production user","model_mrp_production","mrp.group_mrp_user",1,1,1,1
 "access_mrp_production_product_line","mrp.production.product.line","model_mrp_production_product_line","mrp.group_mrp_user",1,1,1,1
 "access_procurement","procurement.order","model_procurement_order","mrp.group_mrp_user",1,1,1,1
-"access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_user",1,1,1,1
+"access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_routing_manager","mrp.routing.manager","model_mrp_routing","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_routing_workcenter_manager","mrp.routing.workcenter.manager","model_mrp_routing_workcenter","mrp.group_mrp_manager",1,1,1,1
-"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,1,1,1
+"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,0,0,0
 "access_mrp_bom_revision_manager","mrp.bom.revision.manager","model_mrp_bom_revision","mrp.group_mrp_manager",1,1,1,1
 "access_stock_location_mrp_worker","stock.location mrp_worker","stock.model_stock_location","mrp.group_mrp_user",1,0,0,0
 "access_stock_move_mrp_worker","stock.move mrp_worker","stock.model_stock_move","mrp.group_mrp_user",1,1,1,0
@@ -19,12 +18,72 @@
 "access_stock_warehouse","stock.warehouse mrp_worker","stock.model_stock_warehouse","mrp.group_mrp_user",1,0,0,0
 "access_account_analytic_journal_mrp_worker","account.analytic.journal mrp_worker","account.model_account_analytic_journal","mrp.group_mrp_user",1,0,0,0
 "access_account_account","account.account mrp_worker","account.model_account_account","mrp.group_mrp_user",1,0,0,0
-"access_purchase_order_mrp_worker","purchase.order mrp_worker","purchase.model_purchase_order","mrp.group_mrp_user",1,0,0,0
+"access_purchase_order_mrp_worker","purchase.order mrp_worker","purchase.model_purchase_order","mrp.group_mrp_user",1,1,1,1
 "access_purchase_order_line_mrp_worker","purchase.order.line mrp_worker","purchase.model_purchase_order_line","mrp.group_mrp_user",1,0,0,0
-"access_hr_timesheet_group_mrp_worker","resource.calendar mrp_worker","resource.model_resource_calendar","mrp.group_mrp_user",1,0,0,0
+"access_hr_timesheet_group_mrp_worker","resource.calendar mrp_worker","resource.model_resource_calendar","base.group_system",1,1,1,1
 "access_procurement_stock_worker","procurement.order stock_worker","model_procurement_order","stock.group_stock_user",1,1,1,1
+"access_procurement_user","procurement.order.user","model_procurement_order","base.group_user",1,1,1,1
 "access_mrp_production_stock_worker","mrp.production stock_worker","model_mrp_production","stock.group_stock_user",1,0,0,0
-"access_mrp_production_order","mrp.production.order","model_mrp_production_order","mrp.group_mrp_user",1,0,0,0
+"access_mrp_production_order","mrp.production.order","model_mrp_production_order","mrp.group_mrp_manager",1,1,1,1
 "access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,0,0,0
 "access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,0,0,0
 "access_product_product_manager","product.product manager","model_product_product","mrp.group_mrp_manager",1,1,1,1
+"access_account_sequence_fiscalyear","account.sequence.fiscalyear","account.model_account_sequence_fiscalyear","mrp.group_mrp_user",1,1,1,1
+"access_product_product_user","product.product user","model_product_product","mrp.group_mrp_user",1,1,1,1
+"access_product_template_user","product.template user","product.model_product_template","mrp.group_mrp_user",1,1,1,1
+"access_product_uom_user","product.uom user","product.model_product_uom","mrp.group_mrp_user",1,1,1,1
+"access_product_supplierinfo_user","product.supplierinfo user","product.model_product_supplierinfo","mrp.group_mrp_user",1,1,1,1
+"access_res_partner_address","res.partner.address","base.model_res_partner_address","mrp.group_mrp_user",1,1,1,1
+"access_stock_tracking","stock.tracking","stock.model_stock_tracking","mrp.group_mrp_user",1,1,1,0
+"access_res_partner","res.partner","base.model_res_partner","mrp.group_mrp_user",1,1,1,0
+"access_workcenter_user","mrp.production.workcenter.line.user","model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1
+"access_resource_calendar_leaves_user","mrp.resource.calendar.leaves.user","resource.model_resource_calendar_leaves","mrp.group_mrp_user",1,1,1,1
+"access_resource_calendar_leaves_manager","mrp.resource.calendar.leaves.manager","resource.model_resource_calendar_leaves","mrp.group_mrp_manager",1,0,0,0
+"access_product_puom_categ","product.uom.categ","product.model_product_uom_categ","mrp.group_mrp_user",1,1,1,0
+"access_resource_resource","resource.resource","resource.model_resource_resource","mrp.group_mrp_user",1,1,1,0
+"access_board_board_user","mrp.board.board","board.model_board_board","mrp.group_mrp_user",1,1,1,0
+"access_account_sequence_fiscalyear_manager","account.sequence.fiscalyear","account.model_account_sequence_fiscalyear","mrp.group_mrp_manager",1,0,0,0
+"access_product_template_manager","product.template mgr","product.model_product_template","mrp.group_mrp_manager",1,0,0,0
+"access_product_uom_manager","product.uom user","product.model_product_uom","mrp.group_mrp_manager",1,0,0,0
+"access_product_supplierinfo_manager","product.supplierinfo user","product.model_product_supplierinfo","mrp.group_mrp_manager",1,0,0,0
+"access_res_partner_address_manager","res.partner.address","base.model_res_partner_address","mrp.group_mrp_manager",1,0,0,0
+"access_stock_tracking_manager","stock.tracking","stock.model_stock_tracking","mrp.group_mrp_manager",1,0,0,0
+"access_res_partner_manager","res.partner","base.model_res_partner","mrp.group_mrp_manager",1,0,0,0
+"access_product_puom_categ_manager","product.uom.categ","product.model_product_uom_categ","mrp.group_mrp_manager",1,0,0,0
+"access_resource_resource_manager","resource.resource","resource.model_resource_resource","mrp.group_mrp_manager",1,0,0,0
+"access_board_board_manager","mrp.board.board","board.model_board_board","mrp.group_mrp_manager",1,0,0,0
+"access_mrp_production_manager","mrp.production manager","model_mrp_production","mrp.group_mrp_manager",1,0,0,0
+"access_procurement_manager","procurement.order","model_procurement_order","mrp.group_mrp_manager",1,0,0,0
+"access_workcenter_manager","mrp.production.workcenter.line","model_mrp_production_workcenter_line","mrp.group_mrp_manager",1,0,0,0
+"access_stock_move_mrp_manager","stock.move mrp_manager","stock.model_stock_move","mrp.group_mrp_manager",1,0,0,0
+"access_mrp_production_product_line_manager","mrp.production.product.line manager","model_mrp_production_product_line","mrp.group_mrp_manager",1,0,0,0
+"access_account_sequence_fiscalyear_system","account.sequence.fiscalyear.system","account.model_account_sequence_fiscalyear","mrp.group_mrp_manager",1,0,0,0
+"access_product_template_system","product.template mgr.system","product.model_product_template","base.group_system",1,0,0,0
+"access_product_uom_system","product.uom user.system","product.model_product_uom","base.group_system",1,0,0,0
+"access_product_supplierinfo_system","product.supplierinfo system","product.model_product_supplierinfo","base.group_system",1,0,0,0
+"access_res_partner_address_system","res.partner.address.system","base.model_res_partner_address","base.group_system",1,0,0,0
+"access_stock_tracking_system","stock.tracking.system","stock.model_stock_tracking","base.group_system",1,0,0,0
+"access_res_partner_system","res.partner.system","base.model_res_partner","base.group_system",1,0,0,0
+"access_product_puom_categ_system","product.uom.categ.system","product.model_product_uom_categ","base.group_system",1,0,0,0
+"access_resource_resource_system","resource.resource.system","resource.model_resource_resource","base.group_system",1,0,0,0
+"access_board_board_system","mrp.board.board.system","board.model_board_board","base.group_system",1,0,0,0
+"access_mrp_production_system","mrp.production.system","model_mrp_production","base.group_system",1,0,0,0
+"access_procurement_system","procurement.order.system","model_procurement_order","base.group_system",1,0,0,0
+"access_workcenter_system","mrp.production.workcenter.line.system","model_mrp_production_workcenter_line","base.group_system",1,0,0,0
+"access_stock_move_mrp_system","stock.move mrp_manager.system","stock.model_stock_move","base.group_system",1,0,0,0
+"access_mrp_production_product_line_system","mrp.production.product.line manager.system","model_mrp_production_product_line","base.group_system",1,0,0,0
+"access_mrp_production_order_system","mrp.production.order.system","model_mrp_production_order","base.group_system",1,0,0,0
+"access_report_workcenter_load_system","report.workcenter.load.system","model_report_workcenter_load","base.group_system",1,0,0,0
+"access_report_mrp_inout_system","report.mrp.inout.system","model_report_mrp_inout","base.group_system",1,0,0,0
+"access_product_product_system","product.product system","model_product_product","base.group_system",1,0,0,0
+"access_mrp_routing_system","mrp.routing.system","model_mrp_routing","base.group_system",1,0,0,0
+"access_mrp_routing_workcenter_system","mrp.routing.workcenter.system","model_mrp_routing_workcenter","base.group_system",1,0,0,0
+"access_mrp_bom_system","mrp.bom.system","model_mrp_bom","base.group_system",1,0,0,0
+"access_mrp_bom_revision_system","mrp.bom.revision.system","model_mrp_bom_revision","base.group_system",1,0,0,0
+"access_mrp_property_system","mrp.property.system","procurement.model_mrp_property","base.group_system",1,1,1,1
+"access_mrp_property_group_system","mrp.property.group.system","procurement.model_mrp_property_group","base.group_system",1,1,1,1
+"access_mrp_routing_system","mrp.routing.system","model_mrp_routing","base.group_system",1,1,1,1
+"access_mrp_workcenter_system","mrp.workcenter.system","model_mrp_workcenter","base.group_system",1,0,0,0
+"access_mrp_production_system","mrp.production system","model_mrp_production","base.group_system",1,0,0,0
+"access_stock_production_lot_user","stock.production.lot","stock.model_stock_production_lot","mrp.group_mrp_user",1,1,1,1
+"access_stock_warehouse_orderpoint_manager","stock.warehouse.orderpoint","procurement.model_stock_warehouse_orderpoint","mrp.group_mrp_manager",1,0,0,0
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 285f5ff43da..a576566602a 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -3,7 +3,7 @@
 <data>
     <menuitem id="menu_mrp_planning" name="Planning"
         parent="base.menu_mrp_root" sequence="2"
-        groups="base.group_extended"/>
+        groups="base.group_extended,mrp.group_mrp_manager,mrp.group_mrp_user"/>
         
     <record id="mrp_production_form_inherit_view" model="ir.ui.view">
 	    <field name="name">mrp.production.form.inherit</field>
diff --git a/addons/mrp_operations/security/ir.model.access.csv b/addons/mrp_operations/security/ir.model.access.csv
index 4271f8e627a..f0ee723292f 100755
--- a/addons/mrp_operations/security/ir.model.access.csv
+++ b/addons/mrp_operations/security/ir.model.access.csv
@@ -1,3 +1,9 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_mrp_operations_operation_code,mrp_operations.operation.code,model_mrp_operations_operation_code,mrp.group_mrp_user,1,1,1,1
-access_mrp_operations_operation,mrp_operations.operation,model_mrp_operations_operation,mrp.group_mrp_user,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_mrp_operations_operation_code","operations.operation.code","model_mrp_operations_operation_code","mrp.group_mrp_user",1,1,1,1
+"access_mrp_operations_operation_code_manager","operations.operation.code.manager","model_mrp_operations_operation_code","mrp.group_mrp_manager",1,0,0,0
+"access_mrp_operations_operation","operations.operation","model_mrp_operations_operation","mrp.group_mrp_user",1,1,1,1
+"access_mrp_operations_operation_manager","operations.operation.manager","model_mrp_operations_operation","mrp.group_mrp_manager",1,0,0,0
+"access_mrp_production_user","mrp_production_user","model_mrp_production","mrp.group_mrp_user",1,1,1,1
+"access_mrp_production_manager","mrp_production_manager","model_mrp_production","mrp.group_mrp_manager",1,0,0,0
+"access_mrp_production_workcenter_line","mrp.production.workcenter.line","mrp.model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1
+"access_mrp_production_workcenter_line_manager","mrp.production.workcenter.line.manager","mrp.model_mrp_production_workcenter_line","mrp.group_mrp_manager",1,0,0,0
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index cf58fdefe4a..bc776ea0723 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -213,7 +213,7 @@
             <field name="search_view_id" ref="view_repair_order_form_filter"/>
         </record>    
 
-        <menuitem action="action_repair_order_tree" id="menu_repair_order" parent="mrp.menu_mrp_manufacturing" name="Repair Orders" sequence="50"/>
+        <menuitem action="action_repair_order_tree" id="menu_repair_order" parent="mrp.menu_mrp_manufacturing" groups="mrp.group_mrp_user" name="Repair Orders" sequence="50"/>
 
     </data>
 </openerp>
diff --git a/addons/mrp_repair/security/ir.model.access.csv b/addons/mrp_repair/security/ir.model.access.csv
index 0f12f66a815..e8b611bd933 100644
--- a/addons/mrp_repair/security/ir.model.access.csv
+++ b/addons/mrp_repair/security/ir.model.access.csv
@@ -3,5 +3,22 @@
 "access_mrp_repair_manager","MRP Repair manager","model_mrp_repair","stock.group_stock_manager",1,1,1,1
 "access_mrp_repair_line_user","MRP Repair Line user","model_mrp_repair_line","stock.group_stock_user",1,0,0,0
 "access_mrp_repair_line_manager","MRP Repair Line manager","model_mrp_repair_line","stock.group_stock_manager",1,1,1,1
-"access_mrp_repair_fee_user","MRP Repair Fee user","model_mrp_repair_fee","stock.group_stock_user",1,0,0,0
-"access_mrp_repair_fee_manager","MRP Repair Fee manager","model_mrp_repair_fee","stock.group_stock_manager",1,1,1,1
+"access_mrp_repair_fee_user","MRP Repair Fee user","model_mrp_repair_fee","stock.group_stock_user",1,1,1,1
+"access_mrp_repair_fee_manager","MRP Repair Fee manager","model_mrp_repair_fee","stock.group_stock_manager",1,0,0,0
+"access_mrp_repair_user","MRP Repair user","model_mrp_repair","mrp.group_mrp_user",1,1,1,1
+"access_mrp_repair_manager","MRP Repair manager","model_mrp_repair","mrp.group_mrp_manager",1,0,0,0
+"access_product_pricelist_manager","product.pricelist manager","product.model_product_pricelist","mrp.group_mrp_manager",1,0,0,0
+"access_product_pricelist_user","product.pricelist user","product.model_product_pricelist","mrp.group_mrp_user",1,1,1,1
+"access_stock_production_lot_user","stock.production.lot user","stock.model_stock_production_lot","mrp.group_mrp_user",1,1,1,1
+"access_stock_production_lot_manager","stock.production.lot manager","stock.model_stock_production_lot","mrp.group_mrp_manager",1,0,0,0
+"access_mrp_repair_line_user","mrp.repair.line user","model_mrp_repair_line","mrp.group_mrp_user",1,1,1,1
+"access_mrp_repair_line_manager","mrp.repair.line manager","model_mrp_repair_line","mrp.group_mrp_manager",1,0,0,0
+"access_stock_production_lot_revision_manager","stock.production.lot.revision manager","stock.model_stock_production_lot_revision","mrp.group_mrp_manager",1,0,0,0
+"access_stock_production_lot_revision_user","stock.production.lot.revision user","stock.model_stock_production_lot_revision","mrp.group_mrp_user",1,1,1,1
+"access_product_price_type_manager","product.price.type manager","product.model_product_price_type","mrp.group_mrp_manager",1,0,0,0
+"access_product_price_type_user","product.price.type","product.model_product_price_type","mrp.group_mrp_user",1,1,1,1
+"access_account_tax_user","account.tax","account.model_account_tax","mrp.group_mrp_user",1,1,1,1
+"access_account_tax_manager","account.tax manager","account.model_account_tax","mrp.group_mrp_manager",1,0,0,0
+"access_mrp_repair_fee_user_mrp","MRP Repair Fee user mrp","model_mrp_repair_fee","mrp.group_mrp_user",1,1,1,1
+"access_mrp_repair_fee_mgr","MRP Repair Fee mgr","model_mrp_repair_fee","mrp.group_mrp_manager",1,0,0,0
+
diff --git a/addons/mrp_subproduct/security/ir.model.access.csv b/addons/mrp_subproduct/security/ir.model.access.csv
index 3c6547410d4..cd093fa6ff1 100644
--- a/addons/mrp_subproduct/security/ir.model.access.csv
+++ b/addons/mrp_subproduct/security/ir.model.access.csv
@@ -1,3 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mrp_subproduct_user","mrp.subproduct","model_mrp_subproduct","mrp.group_mrp_user",1,0,0,0
-"access_mrp_subproduct_manager","mrp.subproduct","model_mrp_subproduct","mrp.group_mrp_manager",1,1,1,1
+"access_mrp_subproduct_user","mrp.subproduct","model_mrp_subproduct","mrp.group_mrp_user",1,1,1,1
+"access_mrp_subproduct_manager","mrp.subproduct manager","model_mrp_subproduct","mrp.group_mrp_manager",1,0,0,0
+"access_mrp_subproduct_system","mrp.subproduct system","model_mrp_subproduct","base.group_system",1,0,0,0
diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index a56b596f7e1..abc3387f15c 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -65,7 +65,7 @@
             <field name="login">editor_demo</field>
             <field name="company_id" ref="res_company_oerp_editor"/>
             <field name="company_ids" eval="[(4, ref('res_company_oerp_editor'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
+            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
         </record>
         <record id="res_users_sales_demo_us" model="res.users">
             <field name="password">sales_demo_us</field>
@@ -73,7 +73,7 @@
             <field name="login">sales_demo_us</field>
             <field name="company_id" ref="res_company_oerp_us"/>
             <field name="company_ids" eval="[(4, ref('res_company_oerp_us'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
+            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
         </record>
         <record id="res_users_sales_demo_be" model="res.users">
             <field name="password">sales_demo_be</field>
@@ -81,7 +81,7 @@
             <field name="login">sales_demo_be</field>
             <field name="company_id" ref="res_company_oerp_be"/>
             <field name="company_ids" eval="[(4, ref('res_company_oerp_be'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
+            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
         </record>
         <record id="res_users_sales_demo_in" model="res.users">
             <field name="password">sales_demo_in</field>
@@ -89,7 +89,7 @@
             <field name="login">sales_demo_in</field>
             <field name="company_id" ref="res_company_oerp_in"/>
             <field name="company_ids" eval="[(4, ref('res_company_oerp_in'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
+            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
         </record>
         <record id="res_users_odoo_demo" model="res.users">
             <field name="password">odoo_demo</field>
@@ -97,7 +97,7 @@
             <field name="login">odoo_demo</field>
             <field name="company_id" ref="res_company_odoo"/>
             <field name="company_ids" eval="[(4, ref('res_company_odoo'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
+            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
         </record>
 
 
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 42657e2ceea..a4b81a471b1 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -3,7 +3,7 @@
     <data>
         <menuitem name="Point of Sale" id="menu_point_root" sequence="21"
             icon="terp-partner"
-            groups="group_pos_manager,group_pos_user"/>
+            groups="group_pos_manager,group_pos_user,base.group_system"/>
 
         <record model="ir.ui.view" id="view_pos_pos_form">
             <field name="name">pos.order</field>
@@ -176,7 +176,7 @@
         </record>
 
         <menuitem name="Daily Operations" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
-        <menuitem name="Sales Order" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1"/>
+        <menuitem name="Sales Order" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1" groups="group_pos_manager,group_pos_user,base.group_system"/>
         <menuitem name="Products" id="menu_point_of_sale_product" parent="menu_point_root" sequence="15" />
 
         <menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale_product" sequence="2" name="Products"/>
@@ -746,7 +746,7 @@
         </record>
 
         <menuitem name="Configuration" parent="menu_point_root"
-            id="menu_point_config_product" sequence="25"/>
+            id="menu_point_config_product" sequence="25" groups="base.group_system"/>
 
         <record model="ir.actions.act_window" id="action_product_input">
             <field name="name">Products</field>
@@ -771,7 +771,8 @@
         <menuitem name="Products for Input Operations"
                     parent="menu_point_config_product"
                     action="action_product_input"
-                    id="products_for_input_operations"/>
+                    id="products_for_input_operations"
+                    groups="base.group_system"/>
 
         <record model="ir.actions.act_window" id="action_product_output">
             <field name="name">Products</field>
@@ -796,7 +797,8 @@
         <menuitem name="Products for Output Operations"
                     parent="menu_point_config_product"
                     action="action_product_output"
-                    id="products_for_output_operations"/>
+                    id="products_for_output_operations"
+                    groups="base.group_system"/>
 
 <!--        <menuitem name="Register Management" parent="menu_point_root"-->
 <!--            id="menu_point_config" sequence="4"/>-->
@@ -863,13 +865,13 @@
         </record>
 
         <!--  Miscelleanous Operations/Reporting -->
-        <menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="20"/>
+        <menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="20" groups="group_pos_manager,base.group_system"/>
 <!--         <menuitem name="Registers" parent="menu_point_rep" id="menu_point_report_register" sequence="0" />
         <menuitem name="Sales" parent="menu_point_rep" id="menu_point_report_sale" sequence="1" />
 
-        <menuitem name="Details Of Operations" parent="menu_point_report_sale" id="menu_details_of_oper" sequence="1" groups="base.group_extended"/>
+        <menuitem name="Details Of Operations" parent="menu_point_report_sale" id="menu_details_of_oper" sequence="1" groups="base.group_extended,group_pos_manager,base.group_system"/>
         <menuitem name="All Sales" parent="menu_details_of_oper"
-                        id="menu_action_all_sales_tree3" action="action_pos_order_tree3" sequence="1"  groups="base.group_extended"/>
+                        id="menu_action_all_sales_tree3" action="action_pos_order_tree3" sequence="1"  groups="base.group_extended,base.group_system,group_pos_manager"/>
         <menuitem name="Sales of the day" parent="menu_action_all_sales_tree3"
                         id="menu_action_sale_of_day_tree2" action="action_trans_pos_tree_today"/>
         <menuitem name="Accepted Sales" parent="menu_action_all_sales_tree3"
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index 7fcdc0b36e0..34efcd6c2f5 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -1,34 +1,78 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_pos_config_journal","pos.config.journal","model_pos_config_journal","point_of_sale.group_pos_user",1,0,0,0
-"access_pos_order","pos.order","model_pos_order","point_of_sale.group_pos_user",1,1,1,1
-"access_pos_order_line","pos.order.line","model_pos_order_line","point_of_sale.group_pos_user",1,1,1,1
-"access_pos_payment","pos.payment","model_pos_payment","point_of_sale.group_pos_user",1,1,1,1
-"access_report_transaction_pos","report.transaction.pos","model_report_transaction_pos","point_of_sale.group_pos_manager",1,0,0,0
-"access_pos_config_journal_manager","pos.config.journal.manager","model_pos_config_journal","point_of_sale.group_pos_manager",1,1,1,1
-"access_account_journal_pos_manager","account.journal pos_manager","account.model_account_journal","point_of_sale.group_pos_manager",1,0,0,0
-"access_account_journal_pos_user","account.journal pos_user","account.model_account_journal","point_of_sale.group_pos_user",1,0,0,0
-"access_account_move_pos_user","account.move pos_user","account.model_account_move","point_of_sale.group_pos_user",1,0,0,0
-"access_account_account_pos_user","account.account pos_user","account.model_account_account","point_of_sale.group_pos_user",1,0,0,0
-"access_stock_picking_pos_user","stock.picking pos_user","stock.model_stock_picking","point_of_sale.group_pos_user",1,1,1,1
-"access_sale_shop_pos_user","sale.shop pos_user","sale.model_sale_shop","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_config_journal","pos.config.journal","model_pos_config_journal","group_pos_user",1,0,0,0
+"access_pos_order","pos.order","model_pos_order","group_pos_user",1,1,1,1
+"access_pos_order_line","pos.order.line","model_pos_order_line","group_pos_user",1,1,1,1
+"access_pos_order_manager","pos.order manager","model_pos_order","group_pos_manager",1,0,0,0
+"access_pos_order_line_manager","pos.order.line manager","model_pos_order_line","group_pos_manager",1,1,1,1
+"access_pos_payment","pos.payment","model_pos_payment","group_pos_user",1,1,1,1
+"access_report_transaction_pos","report.transaction.pos","model_report_transaction_pos","group_pos_manager",1,1,1,1
+"access_pos_config_journal_manager","pos.config.journal.manager","model_pos_config_journal","group_pos_manager",1,1,1,1
+"access_account_journal_pos_manager","account.journal pos_manager","account.model_account_journal","group_pos_manager",1,0,0,0
+"access_account_journal_pos_user","account.journal pos_user","account.model_account_journal","group_pos_user",1,0,0,0
+"access_account_move_pos_user","account.move pos_user","account.model_account_move","group_pos_user",1,0,0,0
+"access_account_account_pos_user","account.account pos_user","account.model_account_account","group_pos_user",1,0,0,0
+"access_stock_picking_pos_user","stock.picking pos_user","stock.model_stock_picking","group_pos_user",1,1,1,1
+"access_sale_shop_pos_user","sale.shop pos_user","sale.model_sale_shop","group_pos_user",1,0,0,0
+"access_sale_shop_pos_manager","sale.shop pos_manager","sale.model_sale_shop","group_pos_manager",1,0,0,0
+"access_sale_shop_pos_system","sale.shop pos_system","sale.model_sale_shop","group_pos_manager",1,0,0,0
 "access_pos_order_stock_worker","pos.order stock_worker","model_pos_order","stock.group_stock_user",1,0,0,0
-"access_stock_move_pos_user","stock.move pos_user","stock.model_stock_move","point_of_sale.group_pos_user",1,1,1,1
-"access_report_sales_by_user_pos","report.sales.by.user.pos","model_report_sales_by_user_pos","point_of_sale.group_pos_user",1,0,0,0
-"access_report_sales_by_user_pos_month","report.sales.by.user.pos.month","model_report_sales_by_user_pos_month","point_of_sale.group_pos_user",1,0,0,0
-"access_report_sales_by_margin_pos","report.sales.by.margin.pos","model_report_sales_by_margin_pos","point_of_sale.group_pos_user",1,0,0,0
-"access_report_sales_by_margin_pos_month","report.sales.by.margin.pos.month","model_report_sales_by_margin_pos_month","point_of_sale.group_pos_user",1,0,0,0
-"access_report_pos_order","report.pos.order","model_report_pos_order","point_of_sale.group_pos_user",1,0,0,0
-"access_account_bank_statement","account.bank.statement","account.model_account_bank_statement","point_of_sale.group_pos_user",1,1,1,0
-"access_account_bank_statement_line","account.bank.statement.line","account.model_account_bank_statement_line","point_of_sale.group_pos_user",1,1,1,0
-"access_account_period","account.period","account.model_account_period","point_of_sale.group_pos_user",1,1,1,0
-"access_account_fiscalyear","account.fiscalyear","account.model_account_fiscalyear","point_of_sale.group_pos_user",1,1,1,0
-"access_account_cashbox_line","account.cashbox.line","account.model_account_cashbox_line","point_of_sale.group_pos_user",1,1,1,0
-"access_product_product","product.product","product.model_product_product","point_of_sale.group_pos_user",1,1,1,0
-"access_account_move_line","account.move.line","account.model_account_move_line","point_of_sale.group_pos_user",1,1,1,0
-"access_account_move","account.move","account.model_account_move","point_of_sale.group_pos_user",1,1,1,0
-"access_account_journal","account.journal","account.model_account_journal","point_of_sale.group_pos_user",1,1,1,0
-"access_account_journal_view","account.journal.view","account.model_account_journal_view","point_of_sale.group_pos_user",1,1,1,0
-"access_account_analytic_line","account.analytic.line","analytic.model_account_analytic_line","point_of_sale.group_pos_user",1,1,1,0
-"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","point_of_sale.group_pos_user",1,1,1,0
-"access_account_journal_column","account.journal.column","account.model_account_journal_column","point_of_sale.group_pos_user",1,1,1,0
-"access_report_cash_register","report.cash.register","model_report_cash_register","point_of_sale.group_pos_user",1,1,1,0
+"access_stock_move_pos_user","stock.move pos_user","stock.model_stock_move","group_pos_user",1,1,1,1
+"access_report_sales_by_user_pos","report.sales.by.user.pos","model_report_sales_by_user_pos","group_pos_user",1,0,0,0
+"access_report_sales_by_user_pos_month","report.sales.by.user.pos.month","model_report_sales_by_user_pos_month","group_pos_user",1,0,0,0
+"access_report_sales_by_margin_pos","report.sales.by.margin.pos","model_report_sales_by_margin_pos","group_pos_user",1,0,0,0
+"access_report_sales_by_margin_pos_month","report.sales.by.margin.pos.month","model_report_sales_by_margin_pos_month","group_pos_user",1,0,0,0
+"access_report_pos_order","report.pos.order","model_report_pos_order","group_pos_user",1,1,1,1
+"access_report_pos_order_system","report.pos.order.system","model_report_pos_order","base.group_system",1,1,1,1
+"access_report_pos_order","report.pos.order","model_report_pos_order","group_pos_manager",1,1,1,1
+"access_account_bank_statement","account.bank.statement","account.model_account_bank_statement","group_pos_user",1,1,1,0
+"access_account_bank_statement_manager","account.bank.statement manager","account.model_account_bank_statement","group_pos_manager",1,0,0,0
+"access_account_bank_statement_system","account.bank.statement system","account.model_account_bank_statement","base.group_system",1,0,0,0
+"access_account_bank_statement_line","account.bank.statement.line","account.model_account_bank_statement_line","group_pos_user",1,1,1,0
+"access_account_period_pos","account.period pos user","account.model_account_period","group_pos_user",1,1,1,0
+"access_account_period_pos_manager","account.period pos manager","account.model_account_period","group_pos_manager",1,0,0,0
+"access_account_period_pos_system","account.period pos system","account.model_account_period","base.group_system",1,0,0,0
+"access_account_fiscalyear_pos_user","account.fiscalyear user","account.model_account_fiscalyear","group_pos_user",1,1,1,0
+"access_account_fiscalyear_pos_manager","account.fiscalyear manager","account.model_account_fiscalyear","group_pos_manager",1,0,0,0
+"access_account_fiscalyear_pos_system","account.fiscalyear user","account.model_account_fiscalyear","base.group_system",1,0,0,0
+"access_account_cashbox_line","account.cashbox.line","account.model_account_cashbox_line","group_pos_user",1,1,1,0
+"access_product_product","product.product","product.model_product_product","group_pos_user",1,0,0,0
+"access_product_template_pos_user","product.template pos user","product.model_product_template","group_pos_user",1,0,0,0
+"access_product_product_pos_manager","product.product.pos manager","product.model_product_product","group_pos_manager",1,0,0,0
+"access_product_template_pos_manager","product.template pos manager","product.model_product_template","group_pos_manager",1,0,0,0
+"access_account_move_line","account.move.line","account.model_account_move_line","group_pos_user",1,1,1,0
+"access_account_move","account.move","account.model_account_move","group_pos_user",1,1,1,0
+"access_account_journal","account.journal","account.model_account_journal","group_pos_user",1,1,1,0
+"access_account_journal_manager","account.journal manager","account.model_account_journal","group_pos_manager",1,0,0,0
+"access_account_journal_system","account.journal system","account.model_account_journal","base.group_system",1,0,0,0
+"access_account_journal_view","account.journal.view","account.model_account_journal_view","group_pos_user",1,1,1,0
+"access_account_journal_view_manager","account.journal.view manager","account.model_account_journal_view","group_pos_manager",1,0,0,0
+"access_account_journal_view_system","account.journal.view system","account.model_account_journal_view","base.group_system",1,0,0,0
+"access_account_analytic_line","account.analytic.line","analytic.model_account_analytic_line","group_pos_user",1,1,1,0
+"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","group_pos_user",1,1,1,0
+"access_account_journal_column","account.journal.column","account.model_account_journal_column","group_pos_user",1,1,1,0
+"access_account_journal_column_manager","account.journal.column manager","account.model_account_journal_column","group_pos_manager",1,0,0,0
+"access_account_journal_column_system","account.journal.column system","account.model_account_journal_column","base.group_system",1,0,0,0
+"access_report_check_register","report.cash.register","model_report_cash_register","group_pos_manager",1,1,1,1
+"access_product_product_pos","product.product.pos","product.model_product_product","base.group_system",1,0,0,0
+"access_product_template_pos","product.template pos","product.model_product_template","base.group_system",1,1,1,1
+"access_pos_order_system","pos.order system","model_pos_order","base.group_system",1,0,0,0
+"access_pos_order_line_system","pos.order.line system","model_pos_order_line","base.group_system",1,0,0,0
+"access_account_bank_statement_line_manager","account.bank.statement.line manager","account.model_account_bank_statement_line","group_pos_manager",1,0,0,0
+"access_account_invoice_manager","account.invoice manager","account.model_account_invoice","group_pos_manager",1,1,1,1
+"access_pos_payment_manager","pos.payment manager","model_pos_payment","group_pos_manager",1,0,0,0
+"access_report_transaction_pos_system","report.transaction.pos system","model_report_transaction_pos","base.group_system",1,1,1,1
+"access_account_bank_statement_line_system","account.bank.statement.line system","account.model_account_bank_statement_line","base.group_system",1,0,0,0
+"access_product_product_supplierinfo","product.supplierinfo system","product.model_product_supplierinfo","base.group_system",1,0,0,0
+"access_pos_payment_system","pos.payment system","model_pos_payment","base.group_system",1,0,0,0
+"access_product_product_supplierinfo_manager","product.supplierinfo manager","product.model_product_supplierinfo","group_pos_manager",1,0,0,0
+"access_product_product_supplierinfo_user","product.supplierinfo user","product.model_product_supplierinfo","group_pos_user",1,0,0,0
+"access_product_product_packaging_system","product.packaging system","product.model_product_packaging","base.group_system",1,0,0,0
+"access_product_product_packaging_user","product.packaging user","product.model_product_packaging","group_pos_user",1,0,0,0
+"access_product_product_packaging_manager","product.packaging manager","product.model_product_packaging","group_pos_manager",1,0,0,0
+"access_account_sequence_fiscalyear_manager","account.sequence.fiscalyear manager","account.model_account_sequence_fiscalyear","group_pos_manager",1,0,0,0
+"access_stock_warehouse_manager","stock.warehouse manager","stock.model_stock_warehouse","group_pos_manager",1,0,0,0
+"access_stock_location_manager","stock.location manager","stock.model_stock_location","group_pos_manager",1,0,0,0
+"access_product_uom_manager","product.uom manager","product.model_product_uom","group_pos_manager",1,0,0,0
+"access_res_partner_manager","res.partner manager","base.model_res_partner","group_pos_manager",1,0,0,0
+"access_product_category_manager","product.category manager","product.model_product_category","group_pos_manager",1,0,0,0
+"access_product_pricelist_manager","product.pricelist manager","product.model_product_pricelist","group_pos_manager",1,0,0,0
diff --git a/addons/point_of_sale/wizard/pos_box_entries.xml b/addons/point_of_sale/wizard/pos_box_entries.xml
index 5334b2064d5..f04c4232ace 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.xml
+++ b/addons/point_of_sale/wizard/pos_box_entries.xml
@@ -14,7 +14,6 @@
 			    	<field name="journal_id"/>
 			    	<field name="product_id"/>
 			    	<field name="amount"/>
-<!--				    	<field name="ref"/>-->
 			    	<group colspan="4" col="2">
 				 		<button icon='gtk-cancel' special="cancel"
                 			string="Close" />
diff --git a/addons/procurement/security/ir.model.access.csv b/addons/procurement/security/ir.model.access.csv
index 03930c47407..b1dadfb3ee0 100644
--- a/addons/procurement/security/ir.model.access.csv
+++ b/addons/procurement/security/ir.model.access.csv
@@ -1,8 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_procurement","procurement.order","model_procurement_order","base.group_user",1,0,0,0
 "access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint","stock.group_stock_manager",1,1,1,1
+"access_stock_warehouse_orderpoint_system","stock.warehouse.orderpoint system","model_stock_warehouse_orderpoint","stock.group_stock_manager",1,1,1,1
+"access_stock_warehouse_orderpoint_user","stock.warehouse.orderpoint user","model_stock_warehouse_orderpoint","base.group_system",1,0,0,0
 "access_mrp_property_group","mrp.property.group","model_mrp_property_group","stock.group_stock_manager",1,1,1,1
 "access_mrp_property","mrp.property","model_mrp_property","stock.group_stock_manager",1,1,1,1
 "access_mrp_property_group","mrp.property.group","model_mrp_property_group","base.group_user",1,0,0,0
 "access_mrp_property","mrp.property","model_mrp_property","base.group_user",1,0,0,0
-
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 634bb9da109..430fa4b513e 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem groups="base.group_extended" id="menu_product_pricelist_main" name="Pricelists" parent="prod_config_main" sequence="50"/>
+        <menuitem groups="base.group_extended,base.group_system" id="menu_product_pricelist_main" name="Pricelists" parent="prod_config_main" sequence="50"/>
 
         <record id="product_pricelist_version_form_view" model="ir.ui.view">
             <field name="name">product.pricelist.version.form</field>
@@ -42,7 +42,7 @@
             <field name="view_id" ref="product_pricelist_version_tree_view"/>
         </record>
         <menuitem
-            action="product_pricelist_action" id="menu_product_pricelist_action" 
+            action="product_pricelist_action" id="menu_product_pricelist_action"
             parent="product.menu_product_pricelist_main" sequence="2"/>
 
         <record id="product_pricelist_item_tree_view" model="ir.ui.view">
@@ -110,7 +110,7 @@
                 </search>
             </field>
         </record>
-        
+
 
         <record id="product_pricelist_view_tree" model="ir.ui.view">
             <field name="name">product.pricelist.tree</field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index bd3becd3cdd..e50d8f81bcb 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem groups="base.group_extended" id="prod_config_main" name="Product" parent="base.menu_base_config" sequence="9"/>
+        <menuitem groups="base.group_extended,base.group_system" id="prod_config_main" name="Product" parent="base.menu_base_config" sequence="9"/>
 
         <record id="product_search_form_view" model="ir.ui.view">
             <field name="name">product.search.form</field>
@@ -150,7 +150,7 @@
                             <field groups="base.group_extended" name="cost_method"/>
                             <newline/>
                             <field groups="base.group_extended" name="seller_id"/>
-                            <newline/>  
+                            <newline/>
                             <field colspan="4" name="seller_ids" nolabel="1"/>
                         </page>
                         <page string="Descriptions">
@@ -194,11 +194,10 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="product_product_tree_view"/>
             <field name="search_view_id" ref="product_search_form_view"/>
-            <field name="help">In OpenERP, a product is something you can buy and sell. It can be a raw material, a stockable product, a consumable or a service. The product form contains a detailed information on the products like procurement logistic, sales price, product category, suppliers, etc.</field>
         </record>
 
-        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
-        <menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1"/>
+        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9" />
+        <menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,product.group_product_manager"/>
 
         <record id="product_normal_action_puchased" model="ir.actions.act_window">
             <field name="name">Products</field>
@@ -253,7 +252,6 @@
             <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>
         </record>
         <menuitem
             action="product_category_action"
@@ -268,7 +266,7 @@
             <field name="view_id" ref="product_category_list_view"/>
         </record>
         <menuitem action="product_category_action_form"
-            groups="base.group_extended"
+            groups="base.group_extended,base.group_system"
             id="menu_product_category_action_form"
             parent="prod_config_main" sequence="2"/>
 
@@ -401,7 +399,7 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem
-            action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="prod_config_main" sequence="3"/>
+            action="product_ul_form_action" groups="base.group_extended,base.group_system" id="menu_product_ul_form_action" parent="prod_config_main" sequence="3"/>
 
         <record id="product_packaging_tree_view" model="ir.ui.view">
             <field name="name">product.packaging.tree.view</field>
diff --git a/addons/product/security/ir.model.access.csv b/addons/product/security/ir.model.access.csv
index f1c24509ac9..1e1572a3c0a 100644
--- a/addons/product/security/ir.model.access.csv
+++ b/addons/product/security/ir.model.access.csv
@@ -28,4 +28,15 @@
 "access_product_pricelist_item_user","product.pricelist.item.user","model_product_pricelist_item","base.group_user",1,0,0,0
 "access_product_pricelist_type_partner_manager","product.pricelist.type partner manager","model_product_pricelist_type","base.group_partner_manager",1,0,0,0
 "access_product_pricelist_partner_manager","product.pricelist partner manager","model_product_pricelist","base.group_partner_manager",1,0,0,0
-"access_ir_property_group_product_manager","ir_property group_product_manager","base.model_ir_property",product.group_product_manager,1,1,1,1
+"access_ir_property_group_product_manager","ir_property group_product_manager","base.model_ir_property","product.group_product_manager",1,1,1,1
+"access_product_group_res_partner","res_partner group_product_manager","base.model_res_partner","product.group_product_manager",1,1,1,1
+"access_product_price_type","product.price.type ","model_product_price_type","base.group_system",1,1,1,1
+"access_product_pricelist_type","product.pricelist.type ","model_product_pricelist_type","base.group_system",1,1,1,1
+"access_product_pricelist","product.pricelist ","model_product_pricelist","base.group_system",1,1,1,1
+"access_product_pricelist_version","product.pricelist.version ","model_product_pricelist_version","base.group_system",1,1,1,1
+"access_product_pricelist_item","product.pricelist.item ","model_product_pricelist_item","base.group_system",1,1,1,1
+"access_product_uom_categ","product.uom.categ","model_product_uom_categ","base.group_system",1,1,1,1
+"access_product_uom","product.uom","model_product_uom","base.group_system",1,1,1,1
+"access_product_ul_system","product.ul system","model_product_ul","base.group_system",1,1,1,1
+"access_product_product_system","product.product system","model_product_product","base.group_system",1,0,0,0
+"access_product_category_system","product.category.system","model_product_category","base.group_system",1,1,1,1
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index dffeafb47fc..171cf523b8b 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -7,7 +7,13 @@
     </record>
     <record id="group_product_manager" model="res.groups">
         <field name="name">Product / Manager</field>
+    </record>
 
+    <record id="base.group_sale_manager" model="res.groups">
+        <field name="name">Sales / Manager</field>
+    </record>
+    <record id="base.group_sale_salesman" model="res.groups">
+        <field name="name">Sales / User</field>
     </record>
 
     <record id="product_comp_rule" model="ir.rule">
diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index 145ea83858c..7ebd5f34588 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -84,7 +84,7 @@
             </field>
         </record>
 
-  <menuitem icon="STOCK_JUSTIFY_FILL" action="product_margin_act_window" id="menu_action_product_margin" name="Product Margins" sequence="5" parent="base.menu_product" />
+  <menuitem icon="STOCK_JUSTIFY_FILL" action="product_margin_act_window" id="menu_action_product_margin" name="Product Margins" sequence="5" parent="base.menu_product" groups="base.group_sale_salesman,base.group_sale_manager,product.group_product_manager,base.group_system"/>
 
 </data>
 </openerp>
diff --git a/addons/project/project.py b/addons/project/project.py
index 7be2956bed0..15c3f890f7b 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -647,42 +647,35 @@ class project_work(osv.osv):
     def create(self, cr, uid, vals, *args, **kwargs):
         project_obj = self.pool.get('project.project')
         uom_obj = self.pool.get('product.uom')
-
-        if (not 'task_id' in vals) or (not 'hours' in vals):
-            return super(project_work, self).create(cr, uid, vals, *args, **kwargs)
-        if not vals['hours']:
-            vals['hours'] = 0.00
-
-        user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
-        duration = vals['hours']
-
-        if user_uom != default_uom:
-            duration =  uom_obj._compute_qty(cr, uid, default_uom, duration, user_uom)
-        cr.execute('update project_task set remaining_hours=remaining_hours - %s where id=%s', (duration, vals['task_id']))
-        return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
+        if vals.get('hours', False):
+            user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
+            duration = vals['hours']
+            if user_uom != default_uom:
+                duration =  uom_obj._compute_qty(cr, uid, default_uom, duration, user_uom)
+            cr.execute('update project_task set remaining_hours=remaining_hours - %s where id=%s', (duration, vals['task_id']))
+        return super(project_work, self).create(cr, uid, vals, *args, **kwargs)
 
     def write(self, cr, uid, ids, vals, context=None):
         project_obj = self.pool.get('project.project')
         uom_obj = self.pool.get('product.uom')
-
-        if context is None:
-            context = {}
-        if not vals['hours']:
-            vals['hours'] = 0.00
-
-        user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
-        duration = vals['hours']
-
-        if user_uom == default_uom:
-            for work in self.browse(cr, uid, ids, context):
-                cr.execute('update project_task set remaining_hours=remaining_hours - %s + (%s) where id=%s', (duration, work.hours, work.task_id.id))
-        else:
-            for work in self.browse(cr, uid, ids, context):
-                duration =  uom_obj._compute_qty(cr, uid, default_uom, duration, user_uom)
-                del_work =  uom_obj._compute_qty(cr, uid, default_uom, work.hours, user_uom)
-                cr.execute('update project_task set remaining_hours=remaining_hours - %s + (%s) where id=%s', (duration, del_work, work.task_id.id))
-
-        return super(project_work,self).write(cr, uid, ids, vals, context)
+        if vals.get('hours', False):
+            old_hours = self.browse(cr, uid, ids, context=context)
+            user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
+            duration = vals['hours']
+            for old in old_hours:
+                if vals.get('hours') != old.hours:
+                    # this code is only needed when we update the hours of the project
+                    # TODO: it may still a second calculation if the task.id is changed
+                    # at this task.
+                    if user_uom == default_uom:
+                        for work in self.browse(cr, uid, ids, context=context):
+                            cr.execute('update project_task set remaining_hours=remaining_hours - %s + (%s) where id=%s', (duration, work.hours, work.task_id.id))
+                    else:
+                        for work in self.browse(cr, uid, ids, context=context):
+                            duration =  uom_obj._compute_qty(cr, uid, default_uom, duration, user_uom)
+                            del_work =  uom_obj._compute_qty(cr, uid, default_uom, work.hours, user_uom)
+                            cr.execute('update project_task set remaining_hours=remaining_hours - %s + (%s) where id=%s', (duration, del_work, work.task_id.id))
+        return super(project_work,self).write(cr, uid, ids, vals, context=context)
 
     def unlink(self, cr, uid, ids, *args, **kwargs):
         context = kwargs.get('context', {})
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 32421308671..5e263f252f2 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -5,10 +5,10 @@
         <menuitem
             icon="terp-project" id="base.menu_main_pm"
             name="Project" sequence="10"
-            groups="group_project_manager,group_project_user"/>
+            groups="group_project_manager,group_project_user,base.group_system"/>
 
         <menuitem id="menu_project_management" name="Project Management" parent="base.menu_main_pm" sequence="1"/>
-        <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
+        <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60" groups="base.group_system"/>
 
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
@@ -526,7 +526,7 @@ Issues like bugs in a system, client complain, materials breakdown are collected
             <field name="view_id" ref="task_type_tree"/>
         </record>
 
-        <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1"/>
+        <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1" groups="base.group_system"/>
         <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_tasks_config" sequence="1"/>
 
         <act_window domain="[('user_id', '=', active_id)]" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 0292864397e..8d1dd450702 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -147,7 +147,7 @@
             <field name="help">Get detailed analysis by task</field>
         </record>
 
-        <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
+        <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report" groups="project.group_project_manager"/>
 
    <!-- Views and action for project dashboard -->
    <record id="view_project_vs_remaining_hours_tree" model="ir.ui.view">
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index b418b0a0dbf..22feb0fa998 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -1,16 +1,16 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_project_manager","project.project manager","model_project_project","project.group_project_manager",1,1,1,1
-"access_account_analytic_account_manager","account.analytic.account","analytic.model_account_analytic_account","project.group_project_manager",1,1,1,1
-"access_project_project","project.project","model_project_project","project.group_project_user",1,0,0,0
-"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","project.group_project_user",1,0,0,0
-"access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,0,0,0
+"access_project_project_manager","project.project manager","model_project_project","project.group_project_manager",1,0,0,0
+"access_account_analytic_account_manager","account.analytic.account","analytic.model_account_analytic_account","project.group_project_manager",1,0,0,0
+"access_project_project","project.project","model_project_project","project.group_project_user",1,1,1,1
+"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","project.group_project_user",1,1,1,1
+"access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,1,1,1
 "access_project_task_type","project.task.type","model_project_task_type","project.group_project_manager",1,1,1,1
-"access_project_task_manager","project.task manager","model_project_task","project.group_project_manager",1,1,1,1
+"access_project_task_manager","project.task manager","model_project_task","project.group_project_manager",1,0,0,0
 "access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,1
 "access_project_task_work","project.task.work","model_project_task_work","project.group_project_user",1,1,1,1
 "access_project_task_work_manager","project.task.work.manager","model_project_task_work","project.group_project_manager",1,1,1,1
 "access_project_message","project.message","model_project_message","project.group_project_user",1,1,1,1
-"access_report_project_task_user","report.project.task.user","model_report_project_task_user","project.group_project_manager",1,0,0,0
+"access_report_project_task_user","report.project.task.user","model_report_project_task_user","project.group_project_manager",1,1,1,1
 "access_project_vs_hours","project.vs.hours","model_project_vs_hours","project.group_project_user",1,1,1,1
 "access_task_by_days","task.by.days","model_task_by_days","project.group_project_user",1,1,1,1
 "access_partner_task user","base.res.partner user","base.model_res_partner","project.group_project_user",1,0,0,0
@@ -19,3 +19,14 @@
 "access_partner_address_task manager","base.res.partner.address manager","base.model_res_partner_address","project.group_project_manager",1,0,0,0
 "access_task_on_partner","project.task on partners","model_project_task","base.group_user",1,0,0,0
 "access_project_on_partner","project.project on partners","model_project_project","base.group_user",1,0,0,0
+"access_project_message_manager","project.message manager","model_project_message","project.group_project_manager",1,0,0,0
+"access_project_message_system","project.message system","model_project_message","base.group_system",1,0,0,0
+"access_project_task_system","project.task system","model_project_task","base.group_system",1,0,0,0
+"access_project_project_system","project.project system","model_project_project","base.group_system",1,1,1,1
+"access_project_task_work_system","project.task.work system","model_project_task_work","base.group_system",1,0,0,0
+"access_project_task_type_system","project.task.type system","model_project_task_type","base.group_system",1,1,1,1
+"access_report_project_task_user_system","report.project.task.user system","model_report_project_task_user","base.group_system",1,0,0,0
+"access_project_vs_hours_manager","project.vs.hours.manager","model_project_vs_hours","project.group_project_manager",1,1,1,1
+"access_account_analytic_account_system","account.analytic.account system","analytic.model_account_analytic_account","base.group_system",1,0,0,0
+"access_project_vs_hours_system","project.vs.hours.system","model_project_vs_hours","base.group_system",1,0,0,0
+"mail_gateway_mailgate_message_project_user","mail_gateway.mailgate.message user","mail_gateway.model_mailgate_message","project.group_project_user",1,1,1,0
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 8527b480955..b89634ec12a 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -31,7 +31,7 @@
     </record>
 
 <!--    <menuitem name="Time Management" id="menu_open_gtd_time" parent="project.menu_definitions" groups="group_project_getting"/>-->
-    <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting" 
+    <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting,base.group_system" 
                 parent="project.menu_tasks_config" action="open_gtd_context_tree"/>
 
     <record model="ir.ui.view" id="view_gtd_timebox_tree">
diff --git a/addons/project_gtd/security/ir.model.access.csv b/addons/project_gtd/security/ir.model.access.csv
index 0398fbfb0ee..210ac9f6c4a 100644
--- a/addons/project_gtd/security/ir.model.access.csv
+++ b/addons/project_gtd/security/ir.model.access.csv
@@ -5,3 +5,5 @@
 "access_project_gtd_timebox_user","project.gtd.timebox project user","model_project_gtd_timebox","project.group_project_user",1,0,0,0
 "access_project_gtd_context_manager","project.gtd.context project manager","model_project_gtd_context","project.group_project_manager",1,1,1,1
 "access_project_gtd_timebox_manager","project.gtd.timebox project manager","model_project_gtd_timebox","project.group_project_manager",1,1,1,1
+"access_project_gtd_context_system","project.gtd.context system","model_project_gtd_context","base.group_system",1,1,1,1
+"access_project_gtd_timebox_system","project.gtd.timebox system","model_project_gtd_timebox","base.group_system",1,1,1,1
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 3845cf6bce0..ced7f127995 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-       <menuitem  id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2"/>
+       <menuitem  id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2" groups="base.group_system"/>
 
         <record id="project_issue_categ_action" model="ir.actions.act_window">
             <field name="name">Issue Categories</field>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 2389e65e1d7..386020f3020 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -175,7 +175,7 @@
 	    </record>
         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
         <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
-        <menuitem action="action_project_issue_report" id="menu_project_issue_report_tree" parent="base.menu_project_report"/>
+        <menuitem action="action_project_issue_report" id="menu_project_issue_report_tree" parent="base.menu_project_report" groups="project.group_project_manager"/>
 
 
   </data>
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index 29b2532eb55..4d76b713cac 100755
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_issue_all","project.issue","model_project_issue","project.group_project_manager",1,1,1,1
+"access_project_issue_all","project.issue","model_project_issue","project.group_project_manager",1,0,0,0
 "access_project_issue_user","project.issue","model_project_issue","project.group_project_user",1,1,1,1
 "access_project_issue","project.issue","model_project_issue","project_issue.group_project_supporter",1,1,1,1
 "access_project_issue_report_all","project.issue.report","model_project_issue_report","project.group_project_manager",1,1,1,1
@@ -8,5 +8,15 @@
 "access_crm_case_categ_supp","crm.case.categ","crm.model_crm_case_categ","project_issue.group_project_supporter",1,0,0,0
 "access_crm_case_resource_type_project","crm_case_resource_type manager","crm.model_crm_case_resource_type","project.group_project_manager",1,1,1,1
 "access_crm_case_resource_supp","crm_case_resource_type manager","crm.model_crm_case_resource_type","project_issue.group_project_supporter",1,0,0,0
-"access_crm_case_stage_project","crm.case.stage","crm.model_crm_case_stage","project.group_project_manager",1,1,1,1
 "access_crm_case_stage_manager_suppo","crm.case.stage","crm.model_crm_case_stage","project_issue.group_project_supporter",1,0,0,0
+"access_project_issue_system","project.issue system","model_project_issue","base.group_system",1,0,0,0
+"access_crm_case_stage_manager_system","crm.case.stage system","crm.model_crm_case_stage","base.group_system",1,1,1,1
+"access_project_issue_report_system","project.issue.report system","model_project_issue_report","base.group_system",1,0,0,0
+"access_crm_case_section_system","crm.case.section system","crm.model_crm_case_section","base.group_system",1,1,1,1
+"access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,0,0,0
+"access_hr_timesheet_sheet_sheet_project_user","hr_timesheet_sheet.sheet user","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_user",1,1,1,0
+"access_hr_analytic_timesheet_project_user","hr_analytic_timesheet user","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_user",1,1,1,0
+"access_hr_analytic_timesheet_project_manager","hr_analytic_timesheet manager","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_manager",1,0,0,0
+"access_hr_timesheet_sheet_sheet_project_manager","hr_timesheet_sheet.sheet manager","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_manager",1,0,0,0
+"access_hr_analytic_timesheet_system","hr_analytic_timesheet system","hr_timesheet_sheet.model_hr_analytic_timesheet","base.group_system",1,0,0,0
+"access_hr_timesheet_sheet_sheet_project_system","hr_timesheet_sheet.sheet system","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","base.group_system",1,0,0,0
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 3c6c19a4d64..02f405131c6 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -315,7 +315,7 @@
     # ------------------------------------------------------
 
         <menuitem action="act_project_phase"
-            groups="base.group_extended"
+            groups="base.group_extended,project.group_project_user,project.group_project_manager,base.group_system"
             id="menu_project_phase" parent="base.menu_project_long_term" sequence="1"/>
 
         <menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
@@ -323,10 +323,10 @@
 
         <!--<menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>-->
         <menuitem id="menu_pm_resources_project1"
-            groups="base.group_extended"
+            groups="base.group_extended,base.group_system"
             name="Resources" parent="project.menu_definitions" sequence="3"/>
 
-        <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4"/>
+        <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4" groups="project.group_project_user,project.group_project_manager,base.group_system"/>
         <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="project.menu_project_management" sequence="4"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index b829675772e..3653cd375f1 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -1,3 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_phase","project.phase","model_project_phase",project.group_project_user,1,1,1,1
-"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation",project.group_project_user,1,1,1,1
+"access_project_phase","project.phase","model_project_phase",project.group_project_user,1,1,1,0
+"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation",project.group_project_user,1,1,1,0
+"access_project_phase_manager","project.phase manager","model_project_phase",project.group_project_manager,1,0,0,0
+"access_project_resource_allocation_manager","project.resource.allocation manager","model_project_resource_allocation",project.group_project_manager,1,0,0,0
+"access_project_resource_allocation_system","project.resource.allocation system","model_project_resource_allocation",base.group_system,1,0,0,0
+"access_project_phase_system","project.phase system","model_project_phase",base.group_system,1,0,0,0
+"access_resource_resource_user","resource.resource user","resource.model_resource_resource",project.group_project_user,1,1,1,1
+"access_resource_calendar_leaves_user","resource.calendar.leaves user","resource.model_resource_calendar_leaves","project.group_project_user",1,1,1,1
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index b72aa69c011..4b7fa3cb493 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -223,7 +223,7 @@
             parent="base.menu_main_pm" />
 
         <menuitem action="action_account_analytic_planning_form"
-            id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3"/>
+            id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3" groups="project.group_project_user,project.group_project_manager,base.group_system"/>
 
         <!--
             Planning statistics
diff --git a/addons/project_planning/security/ir.model.access.csv b/addons/project_planning/security/ir.model.access.csv
index a589a05b669..330a25485c7 100644
--- a/addons/project_planning/security/ir.model.access.csv
+++ b/addons/project_planning/security/ir.model.access.csv
@@ -1,8 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_report_account_analytic_planning","report_account_analytic.planning","model_report_account_analytic_planning","project.group_project_manager",1,1,1,1
-"access_report_account_analytic_planning_line","report_account_analytic.planning.line","model_report_account_analytic_planning_line","project.group_project_manager",1,1,1,1
-"access_report_account_analytic_planning_stat_manager","report_account_analytic.planning.stat manager","model_report_account_analytic_planning_stat","project.group_project_manager",1,1,1,1
-"access_report_account_analytic_planning_stat","report_account_analytic.planning.stat","model_report_account_analytic_planning_stat","project.group_project_user",1,0,0,0
+"access_report_account_analytic_planning_project_manager","report_account_analytic.planning manager","model_report_account_analytic_planning","project.group_project_manager",1,0,0,0
+"access_report_account_analytic_planning_line_project_manager","report_account_analytic.planning.line manager","model_report_account_analytic_planning_line","project.group_project_manager",1,0,0,0
+"access_report_account_analytic_planning_stat_project_manager","report_account_analytic.planning.stat manager","model_report_account_analytic_planning_stat","project.group_project_manager",1,0,0,0
+"access_report_account_analytic_planning_stat_project_user","report_account_analytic.planning.stat user","model_report_account_analytic_planning_stat","project.group_project_user",1,1,1,0
 "access_account_analytic_account_project_manager","account.analytic.account project manager","analytic.model_account_analytic_account","project.group_project_manager",1,1,1,1
-"access_report_account_analytic_planning_user","report_account_analytic.planning.user","model_report_account_analytic_planning_user","project.group_project_manager",1,1,1,1
-"access_report_account_analytic_planning_account","report_account_analytic.planning.account","model_report_account_analytic_planning_account","project.group_project_manager",1,1,1,1
+"access_report_account_analytic_planning__project_user","report_account_analytic.planning user","model_report_account_analytic_planning_user","project.group_project_user",1,1,1,0
+"access_report_account_analytic_planning_account_project_manager","report_account_analytic.planning.account","model_report_account_analytic_planning_account","project.group_project_manager",1,1,1,1
+"access_report_account_analytic_planning_line_project_user","report_account_analytic.planning.line user","model_report_account_analytic_planning_line","project.group_project_user",1,1,1,0
+"access_report_account_analytic_planning_account_project_user","report_account_analytic.planning.account user","model_report_account_analytic_planning_account","project.group_project_user",1,1,1,0
+"access_report_account_analytic_planning_system","report_account_analytic.planning system","model_report_account_analytic_planning","base.group_system",1,0,0,0
diff --git a/addons/project_scrum/security/ir.model.access.csv b/addons/project_scrum/security/ir.model.access.csv
index 752e834b1e0..109dba056df 100644
--- a/addons/project_scrum/security/ir.model.access.csv
+++ b/addons/project_scrum/security/ir.model.access.csv
@@ -1,9 +1,12 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_scrum_sprint","project_scrum.sprint","model_project_scrum_sprint","project.group_project_user",1,0,0,0
-"access_scrum_product_backlog","project_scrum.product.backlog","model_project_scrum_product_backlog","project.group_project_user",1,1,1,1
-"access_scrum_meeting","project_scrum.meeting","model_project_scrum_meeting","project.group_project_user",1,0,0,0
-"access_scrum_meeting_manager","project_scrum.meeting.manager","model_project_scrum_meeting","project.group_project_manager",1,1,1,1
-"access_scrum_sprint_manager","project_scrum.sprint.manager","model_project_scrum_sprint","project.group_project_manager",1,1,1,1
-"access_scrum_product_backlog_manager","project_scrum.product.backlog manager","model_project_scrum_product_backlog","project.group_project_manager",1,1,1,1
+"access_scrum_sprint","project_scrum.sprint","model_project_scrum_sprint","project.group_project_user",1,1,1,0
+"access_scrum_product_backlog","project_scrum.product.backlog","model_project_scrum_product_backlog","project.group_project_user",1,1,1,0
+"access_scrum_meeting","project_scrum.meeting","model_project_scrum_meeting","project.group_project_user",1,1,1,0
+"access_scrum_meeting_manager","project_scrum.meeting.manager","model_project_scrum_meeting","project.group_project_manager",1,0,0,0
+"access_scrum_sprint_manager","project_scrum.sprint.manager","model_project_scrum_sprint","project.group_project_manager",1,0,0,0
+"access_scrum_product_backlog_manager","project_scrum.product.backlog manager","model_project_scrum_product_backlog","project.group_project_manager",1,0,0,0
 "access_product_uom_project_manager","product.uom project manager","product.model_product_uom","project.group_project_manager",1,1,1,1
 "access_product_uom_project_user","product.uom project user","product.model_product_uom","project.group_project_user",1,0,0,0
+"access_scrum_sprint_system","project_scrum.sprint system","model_project_scrum_sprint","base.group_system",1,0,0,0
+"access_scrum_product_backlog_system","project_scrum.product.backlog system","model_project_scrum_product_backlog","base.group_system",1,0,0,0
+"access_scrum_meeting_system","project_scrum.meeting system","model_project_scrum_meeting","base.group_system",1,0,0,0
diff --git a/addons/project_timesheet/security/ir.model.access.csv b/addons/project_timesheet/security/ir.model.access.csv
index 69075f64e05..ae44690329f 100644
--- a/addons/project_timesheet/security/ir.model.access.csv
+++ b/addons/project_timesheet/security/ir.model.access.csv
@@ -1,2 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_report_timesheet_task_user","report.timesheet.task.user","model_report_timesheet_task_user","project.group_project_manager",1,0,0,0
+"access_hr_analytic_timesheet_user","hr.analytic.timesheet.user","model_hr_analytic_timesheet","project.group_project_user",1,1,1,0
+"access_hr_timesheet_sheet_sheet_user","hr.timesheet.sheet.sheet.user","model_hr_timesheet_sheet.sheet","project.group_project_user",1,1,1,0
+"access_hr_analytic_timesheet_system","hr.analytic.timesheet system","model_hr_analytic_timesheet","base.group_system",1,1,1,1
+"access_hr_timesheet_sheet_sheet_system","hr.timesheet.sheet.sheet system","model_hr_timesheet_sheet.sheet","base.group_system",1,1,1,1
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 79ef45424d2..2010ac7a93e 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-       <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases"
-            groups="group_purchase_user" sequence="3"/>
+       <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" sequence="3"/>
        <menuitem id="menu_procurement_management" name="Purchase Management"
-            parent="base.menu_purchase_root" sequence="1"/>
+            parent="base.menu_purchase_root" sequence="1" />
 
         <!--supplier addresses action-->
         <record id="action_supplier_address_form" model="ir.actions.act_window">
@@ -225,7 +224,7 @@
             <field name="search_view_id" ref="view_purchase_order_filter"/>
         </record>
         <menuitem action="purchase_rfq" id="menu_purchase_rfq" parent="menu_procurement_management"
-                sequence="6"/>
+                sequence="6" groups="group_purchase_manager,group_purchase_user"/>
 
         <record id="purchase_form_action" model="ir.actions.act_window">
             <field name="name">Purchase Orders</field>
@@ -235,7 +234,7 @@
             <field name="context">{'search_default_approved': 1,'search_default_create_uid':uid}</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
         </record>
-        <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management"/>
+        <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management" />
 
 
         <record id="purchase_order_line_form" model="ir.ui.view">
@@ -367,7 +366,7 @@
         <menuitem
             action="purchase_line_form_action2"
             id="menu_purchase_line_order_draft"
-            groups="base.group_extended"
+            groups="base.group_extended,group_purchase_user,group_purchase_manager"
             parent="menu_procurement_management_invoice"
             sequence="12"/>
 
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 7a3b35725d4..86784a34351 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -1,34 +1,43 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_purchase_order","purchase.order","model_purchase_order","purchase.group_purchase_user",1,1,1,1
-"access_purchase_order_line","purchase.order.line","model_purchase_order_line","purchase.group_purchase_user",1,1,1,1
-"access_stock_location_purchase_user","stock.location","stock.model_stock_location","purchase.group_purchase_user",1,0,0,0
-"access_stock_warehouse_purchase_user","stock.warehouse","stock.model_stock_warehouse","purchase.group_purchase_user",1,0,0,0
-"access_stock_picking_purchase_user","stock.picking","stock.model_stock_picking","purchase.group_purchase_user",1,1,1,1
-"access_stock_move_purchase_user","stock.move","stock.model_stock_move","purchase.group_purchase_user",1,1,1,1
+"access_purchase_order","purchase.order","model_purchase_order","group_purchase_user",1,1,1,1
+"access_purchase_order_manager","purchase.order","model_purchase_order","group_purchase_manager",1,1,1,1
+"access_purchase_order_line","purchase.order.line user","model_purchase_order_line","group_purchase_user",1,1,1,1
+"access_purchase_order_line_manager","purchase.order.line manager","model_purchase_order_line","group_purchase_manager",1,0,0,0
+"access_stock_location_purchase_user","stock.location","stock.model_stock_location","group_purchase_user",1,0,0,0
+"access_stock_warehouse_purchase_user","stock.warehouse","stock.model_stock_warehouse","group_purchase_user",1,0,0,0
+"access_stock_picking_purchase_user","stock.picking","stock.model_stock_picking","group_purchase_user",1,1,1,1
+"access_stock_move_purchase_user","stock.move","stock.model_stock_move","group_purchase_user",1,1,1,1
 "access_purchase_order_stock_worker","purchase.order","model_purchase_order","stock.group_stock_user",1,0,0,0
 "access_purchase_order_line_stock_worker","purchase.order.line","model_purchase_order_line","stock.group_stock_user",1,0,0,0
-"access_account_tax_purchase_user","account.tax","account.model_account_tax","purchase.group_purchase_user",1,0,0,0
-"access_report_purchase_order","purchase.report","model_purchase_report","purchase.group_purchase_manager",1,0,0,0
-"access_purchase_order_manager","purchase.order","model_purchase_order","purchase.group_purchase_manager",1,1,1,1
-"access_purchase_order_line_manager","purchase.order.line","model_purchase_order_line","purchase.group_purchase_manager",1,1,1,1
-"access_stock_location_purchase_user_manager","stock.location","stock.model_stock_location","purchase.group_purchase_manager",1,0,0,0
-"access_stock_warehouse_purchase_user_manager","stock.warehouse","stock.model_stock_warehouse","purchase.group_purchase_manager",1,0,0,0
-"access_stock_picking_purchase_user_manager","stock.picking","stock.model_stock_picking","purchase.group_purchase_manager",1,1,1,1
-"access_stock_move_purchase_user_manager","stock.move","stock.model_stock_move","purchase.group_purchase_manager",1,1,1,1
-"access_account_tax_purchase_user_manager","account.tax","account.model_account_tax","purchase.group_purchase_manager",1,0,0,0
-"access_product_product_purchase_user","product.product.purchase.user","product.model_product_product","group_purchase_user",1,0,0,0
+"access_account_tax_purchase_user","account.tax","account.model_account_tax","group_purchase_user",1,0,0,0
+"access_report_purchase_order","purchase.report","model_purchase_report","group_purchase_manager",1,1,1,1
+"access_report_purchase_order_user","purchase.report user","model_purchase_report","group_purchase_user",1,0,0,0
+"access_purchase_order_line_manager","purchase.order.line","model_purchase_order_line","group_purchase_manager",1,1,1,1
+"access_stock_location_purchase_user_manager","stock.location","stock.model_stock_location","group_purchase_manager",1,0,0,0
+"access_stock_warehouse_purchase_user_manager","stock.warehouse","stock.model_stock_warehouse","group_purchase_manager",1,0,0,0
+"access_stock_picking_purchase_user_manager","stock.picking","stock.model_stock_picking","group_purchase_manager",1,1,1,1
+"access_stock_move_purchase_user_manager","stock.move","stock.model_stock_move","group_purchase_manager",1,1,1,1
+"access_account_tax_purchase_user_manager","account.tax","account.model_account_tax","group_purchase_manager",1,0,0,0
+"access_product_product_purchase_user","product.product.purchase.user","product.model_product_product","group_purchase_user",1,1,1,1
+"access_product_product_purchase_manager","product.product.purchase.manager","product.model_product_product","group_purchase_manager",1,0,0,0
+"access_product_template_purchase_user","product.template purchase_user","product.model_product_template","group_purchase_user",1,1,1,1
+"access_product_template_purchase_manager","product.template purchase_manager","product.model_product_template","group_purchase_manager",1,0,0,0
 "access_account_invoice_purchase","account_invoice purchase","account.model_account_invoice","group_purchase_user",1,1,1,1
 "access_account_invoice_line_purchase","account_invoice.line purchase","account.model_account_invoice_line","group_purchase_user",1,1,1,1
+"access_account_invoice_purchase_manager","account_invoice purchase manager","account.model_account_invoice","group_purchase_manager",1,0,0,0
+"access_account_invoice_line_purchase_manager","account_invoice.line purchase manager","account.model_account_invoice_line","group_purchase_manager",1,0,0,0
 "access_account_invoice_tax_purchase","account_invoice.tax purchase","account.model_account_invoice_tax","group_purchase_user",1,1,1,1
 "access_account_fiscal_position_purchase_user","account.fiscal.position purchase","account.model_account_fiscal_position","group_purchase_user",1,0,0,0
 "access_account_sequence_fiscalyear_purchase_user","account.sequence.fiscalyear purchase","account.model_account_sequence_fiscalyear","group_purchase_user",1,1,1,1
 "access_res_partner_purchase_user","res.partner purchase","base.model_res_partner","group_purchase_user",1,0,0,0
 "access_res_partner_address_purchase_user","res.partner.address purchase","base.model_res_partner_address","group_purchase_user",1,0,0,0
-"access_account_journal","account.journal","account.model_account_journal","purchase.group_purchase_user",1,1,1,0
-"access_account_journal_manager","account.journal","account.model_account_journal","purchase.group_purchase_manager",1,1,1,1
-"access_account_period","account.period","account.model_account_period","purchase.group_purchase_user",1,0,0,0
-"access_account_fiscalyear","account.fiscalyear","account.model_account_fiscalyear","purchase.group_purchase_user",1,0,0,0
-"access_account_move","account.move","account.model_account_move","purchase.group_purchase_user",1,1,1,1
-"access_account_move_line","account.move.line","account.model_account_move_line","purchase.group_purchase_user",1,1,1,1
-"access_account_analytic_line","account.analytic.line","account.model_account_analytic_line","purchase.group_purchase_user",1,1,1,1
-"access_account_move_reconcile","account.move.reconcile","account.model_account_move_reconcile","purchase.group_purchase_user",1,1,1,1
+"access_account_journal","account.journal","account.model_account_journal","group_purchase_user",1,1,1,0
+"access_account_journal_manager","account.journal","account.model_account_journal","group_purchase_manager",1,1,1,1
+"access_account_period","account.period","account.model_account_period","group_purchase_user",1,0,0,0
+"access_account_fiscalyear","account.fiscalyear","account.model_account_fiscalyear","group_purchase_user",1,0,0,0
+"access_account_move","account.move","account.model_account_move","group_purchase_user",1,1,1,1
+"access_account_move_line","account.move.line","account.model_account_move_line","group_purchase_user",1,1,1,1
+"access_account_analytic_line","account.analytic.line","account.model_account_analytic_line","group_purchase_user",1,1,1,1
+"access_account_move_reconcile","account.move.reconcile","account.model_account_move_reconcile","group_purchase_user",1,1,1,1
+"access_report_stock_move","report.stock.move.manager","stock.model_report_stock_move","group_purchase_manager",1,1,1,1
+"access_report_stock_move_user","report.stock.move.user","stock.model_report_stock_move","group_purchase_user",1,0,0,0
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index b8e488ac0cf..0a436500986 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -82,7 +82,7 @@
                         <separator colspan="4" string=""/>
                          <group col="8" colspan="4">
                           <label colspan="6"  string=""/>
-                        <button name="%(action_purchase_requisition_partner)d" string="Requests for Quotation" type="action" icon="gtk-execute" 
+                        <button name="%(action_purchase_requisition_partner)d" string="Requests for Quotation" type="action" icon="gtk-execute"
                            attrs="{'readonly': [('state', '=', 'done')]}" />
                         </group>
                    </page>
@@ -168,7 +168,7 @@
             </field>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="procurement_normal_form_view_inherit">
         <field name="name">procurement.form.inherit</field>
         <field name="type">form</field>
diff --git a/addons/purchase_requisition/security/ir.model.access.csv b/addons/purchase_requisition/security/ir.model.access.csv
index 8ba518cea7d..d3c6b66de92 100644
--- a/addons/purchase_requisition/security/ir.model.access.csv
+++ b/addons/purchase_requisition/security/ir.model.access.csv
@@ -1,3 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_purchase_requisition","purchase.requisition","model_purchase_requisition","purchase.group_purchase_user",1,1,1,1
 "access_purchase_requisition_line","purchase.requisition.line","model_purchase_requisition_line","purchase.group_purchase_user",1,1,1,1
+"access_purchase_requisition_manager","purchase.requisition manager","model_purchase_requisition","purchase.group_purchase_manager",1,0,0,0
+"access_purchase_requisition_line_manager","purchase.requisition.line manager","model_purchase_requisition_line","purchase.group_purchase_manager",1,0,0,0
diff --git a/addons/resource/security/ir.model.access.csv b/addons/resource/security/ir.model.access.csv
index 8d1d231a84b..18ba8bb037b 100644
--- a/addons/resource/security/ir.model.access.csv
+++ b/addons/resource/security/ir.model.access.csv
@@ -1,6 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_resource_calendar","resource.calendar","model_resource_calendar","base.group_system",1,1,1,1
 "access_resource_calendar_attendance","resource.calendar.attendance","model_resource_calendar_attendance","base.group_system",1,1,1,1
-"access_resource_resource","resource.resource","model_resource_resource","base.group_system",1,1,1,1
+"access_resource_resource","resource.resource","model_resource_resource","base.group_system",1,0,0,0
 "access_resource_resource_all","resource.resource all","model_resource_resource",,1,0,0,0
 "access_resource_calendar_leaves","resource.calendar.leaves","model_resource_calendar_leaves","base.group_system",1,1,1,1
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 69b9b1c094a..e138f718333 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="sale.group_sale_user"/>
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system"/>
         <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
@@ -289,7 +289,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
-            <field name="help">The sale order manages the invoicing, the product fullfilment and the delivery processes. OpenERP can handle products, services and consumables so that a sale order can trigger tasks, manufacturing orders, purchases, etc. It support several invoicing methods according to your configuration: from the sale order, from the pickings, etc.</field>
         </record>
         <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="3"/>
 
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 97fcf9f7dee..6d434fa9bd6 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -1,19 +1,51 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_sale_shop","sale.shop","model_sale_shop","group_sale_user",1,0,0,0
-"access_sale_order","sale.order","model_sale_order","group_sale_user",1,1,1,0
-"access_sale_order_line","sale.order.line","model_sale_order_line","group_sale_user",1,1,1,0
+"access_sale_shop","sale.shop","model_sale_shop","base.group_sale_salesman",1,1,1,1
+"access_sale_order","sale.order","model_sale_order","base.group_sale_salesman",1,1,1,1
+"access_sale_order_line","sale.order.line","model_sale_order_line","base.group_sale_salesman",1,1,1,0
 "access_sale_shop_admin","sale.shop","model_sale_shop","base.group_system",1,1,1,1
-"access_account_invoice_salesman","account_invoice salesman","account.model_account_invoice","group_sale_user",1,1,1,1
-"access_account_invoice_line_salesman","account_invoice.line salesman","account.model_account_invoice_line","group_sale_user",1,1,1,1
-"access_account_payment_term_salesman","account_payment_term salesman","account.model_account_payment_term","group_sale_user",1,0,0,0
-"access_account_analytic_account_salesman","account_analytic_account salesman","analytic.model_account_analytic_account","group_sale_user",1,1,1,1
-"access_stock_picking_salesman","stock_picking salesman","stock.model_stock_picking","group_sale_user",1,1,1,1
-"access_stock_move_salesman","stock_move salesman","stock.model_stock_move","group_sale_user",1,1,1,0
-"access_procurement_salesman","procurement.order salesman","procurement.model_procurement_order","group_sale_user",1,1,1,1
+"access_account_invoice_salesman","account_invoice salesman","account.model_account_invoice","base.group_sale_salesman",1,1,1,1
+"access_account_invoice_line_salesman","account_invoice.line salesman","account.model_account_invoice_line","base.group_sale_salesman",1,1,1,1
+"access_account_payment_term_salesman","account_payment_term salesman","account.model_account_payment_term","base.group_sale_salesman",1,0,0,0
+"access_account_analytic_account_salesman","account_analytic_account salesman","analytic.model_account_analytic_account","base.group_sale_salesman",1,1,1,1
+"access_stock_picking_salesman","stock_picking salesman","stock.model_stock_picking","base.group_sale_salesman",1,1,1,1
+"access_stock_move_salesman","stock_move salesman","stock.model_stock_move","base.group_sale_salesman",1,1,1,0
+"access_procurement_salesman","procurement.order salesman","procurement.model_procurement_order","base.group_sale_salesman",1,1,1,1
 "access_sale_order_stock_worker","sale.order stock worker","model_sale_order","stock.group_stock_user",1,1,0,0
 "access_sale_order_line_stock_worker","sale.order.line stock worker","model_sale_order_line","stock.group_stock_user",1,1,0,0
-"access_sale_order_manager","sale.order.manager","model_sale_order","group_sale_manager",1,1,1,1
-"access_sale_order_line_manager","sale.order.line.manager","model_sale_order_line","group_sale_manager",1,1,1,1
-"access_sale_report_manager","sale.report","model_sale_report","group_sale_manager",1,0,0,0
-"access_product_product_sale_user","product.product.sale.user","model_product_product","group_sale_user",1,0,0,0
-"access_sale_account_journal","account.journal sale order.user","account.model_account_journal","group_sale_user",1,0,0,0
+"access_sale_order_manager","sale.order.manager","model_sale_order","base.group_sale_manager",1,0,0,0
+"access_sale_order_line_manager","sale.order.line.manager","model_sale_order_line","base.group_sale_manager",1,0,0,0
+"access_sale_report_manager","sale.report","model_sale_report","base.group_sale_manager",1,1,1,1
+"access_ir_property_sales","ir.property.sales","base.model_ir_property","base.group_sale_salesman",1,1,1,1
+"access_sale_account_journal","account.journal sale order.user","account.model_account_journal","base.group_sale_salesman",1,0,0,0
+"access_res_partner_sale_user","res.partner.sale.user","base.model_res_partner","base.group_sale_salesman",1,1,1,1
+"access_res_partner_sale_manager","res.partner.sale.user","base.model_res_partner","base.group_sale_manager",1,0,0,0
+"access_res_partner_sale_system","res.partner.sale.system","base.model_res_partner","base.group_system",1,0,0,0
+"access_report_stock_move_sales","report.stock.move.sale","stock.model_report_stock_move","base.group_sale_manager",1,1,1,1
+"access_stock_picking_sales","stock.picking.sales","stock.model_stock_picking","base.group_sale_manager",1,1,1,1
+"access_product_template_sale_user","product.template sale use","product.model_product_template","base.group_sale_salesman",1,1,1,1
+"access_product_product_sale_user","product.product sale use","product.model_product_product","base.group_sale_salesman",1,1,1,1
+"access_product_template_sale","product.template sale manager","product.model_product_template","base.group_sale_manager",1,0,0,0
+"access_product_product_sale","product.product sale manager","product.model_product_product","base.group_sale_manager",1,0,0,0
+"access_sale_shop_manager","account.journal sale order.user","model_sale_shop","base.group_sale_manager",1,0,0,0
+"access_account_fiscalyear_manager","account.fiscalyear.manager","account.model_account_fiscalyear","base.group_sale_manager",1,0,0,0
+"access_account_fiscalyear_user","account.fiscalyear.user","account.model_account_fiscalyear","base.group_sale_salesman",1,1,1,1
+"access_res_partner_address_user","res.partner.address.user","base.model_res_partner_address","base.group_sale_salesman",1,1,1,1
+"access_account_tax_user","account.tax.user","account.model_account_tax","base.group_sale_salesman",1,1,1,1
+"access_product_packaging_user","product.packaging.user","product.model_product_packaging","base.group_sale_salesman",1,1,1,1
+"access_res_country_system","res.country system","base.model_res_country","base.group_system",1,1,1,1
+"access_res_country_state_system","res.country.state system","base.model_res_country_state","base.group_system",1,1,1,1
+"access_res_partner_title_system","res.partner.title system","base.model_res_partner_title","base.group_system",1,1,1,1
+"access_sale_order_system","sale.order.system","model_sale_order","base.group_system",1,0,0,0
+"access_sale_order_line_system","sale.order.line.system","model_sale_order_line","base.group_system",1,0,0,0
+"access_product_product_system","product.product.system","product.model_product_product","base.group_system",1,0,0,0
+"access_stock_picking_system","stock.picking.system","stock.model_stock_picking","base.group_system",1,0,0,0
+"access_sale_report_system","sale.report.system","model_sale_report","base.group_system",1,0,0,0
+"access_ir_attachment_system","ir.attachment.system","base.model_ir_attachment","base.group_system",1,0,0,0
+"access_ir_attachment_sales","ir.attachment.sales","base.model_ir_attachment","base.group_sale_salesman",1,1,1,1
+"access_ir_attachment_manager","ir.attachment.manager","base.model_ir_attachment","base.group_sale_manager",1,0,0,0
+"access_res_partner_bank_type_system","res.partner.bank.type.system","base.model_res_partner_bank_type","base.group_system",1,0,0,0
+"access_stock_warehouse_manager","stock.warehouse.manager","stock.model_stock_warehouse","base.group_sale_manager",1,0,0,0
+"access_product_uom_manager","product.uom.manager","product.model_product_uom","base.group_sale_manager",1,0,0,0
+"access_product_supplierinfo_manager","product.supplierinfo.manager","product.model_product_supplierinfo","base.group_sale_manager",1,0,0,0
+"access_product_packaging_manager","product.packaging.manager","product.model_product_packaging","base.group_sale_manager",1,0,0,0
+"access_stock_location_manager","stock.location.manager","stock.model_stock_location","base.group_sale_manager",1,0,0,0
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 6eb4315fcd2..557f30f637e 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -2,19 +2,19 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="group_sale_manager" model="res.groups">
-        <field name="name">Sale / Manager</field>
+    <record id="base.group_sale_manager" model="res.groups">
+        <field name="name">Sales / Manager</field>
     </record>
-    <record id="group_sale_user" model="res.groups">
-        <field name="name">Sale / Salesman</field>
+    <record id="base.group_sale_salesman" model="res.groups">
+        <field name="name">Sales / User</field>
     </record>
 
     <record model='ir.ui.menu' id='menu_action_shop_form'>
-        <field name="groups_id" eval="[(6,0,[ref('group_sale_manager')])]"/>
+        <field name="groups_id" eval="[(6,0,[ref('base.group_sale_manager')])]"/>
     </record>
-    
+
     <record model="ir.ui.menu" id="base.menu_base_partner">
-        <field eval="[(4, ref('sale.group_sale_user'))]" name="groups_id"/>
+        <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
     </record>
 
     <record model="ir.rule" id="sale_order_comp_rule">
diff --git a/addons/sale_analytic_plans/__init__.py b/addons/sale_analytic_plans/__init__.py
index 8d09c9a356b..f798725d09e 100644
--- a/addons/sale_analytic_plans/__init__.py
+++ b/addons/sale_analytic_plans/__init__.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/>.
 #
 ##############################################################################
 
@@ -24,5 +24,6 @@
 #----------------------------------------------------------
 
 import sale_analytic_plans
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sale_analytic_plans/__openerp__.py b/addons/sale_analytic_plans/__openerp__.py
index 0394816f4eb..b4e25d65da3 100644
--- a/addons/sale_analytic_plans/__openerp__.py
+++ b/addons/sale_analytic_plans/__openerp__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-
 {
     'name': 'Sales Analytic Distribution Management',
     'version': '1.0',
@@ -37,4 +36,4 @@
     'active': False,
     'certificate': '0066055860861',
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale_analytic_plans/sale_analytic_plans.py b/addons/sale_analytic_plans/sale_analytic_plans.py
index 0d10817e19a..9fffae1d74a 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans.py
+++ b/addons/sale_analytic_plans/sale_analytic_plans.py
@@ -18,22 +18,23 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import time
 
 from osv import fields, osv
 
 class sale_order_line(osv.osv):
     _inherit = 'sale.order.line'
     _columns = {
-        'analytics_id':fields.many2one('account.analytic.plan.instance','Analytic Distribution'),
+        'analytics_id': fields.many2one('account.analytic.plan.instance', 'Analytic Distribution'),
     }
     def invoice_line_create(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         line_obj = self.pool.get('account.invoice.line')
         create_ids = super(sale_order_line,self).invoice_line_create(cr, uid, ids, context=context)
         i = 0
         for line in self.browse(cr, uid, ids, context):
-            line_obj.write(cr, uid, [create_ids[i]], {'analytics_id':line.analytics_id.id})
-            i = i+1
+            line_obj.write(cr, uid, [create_ids[i]], {'analytics_id': line.analytics_id.id})
+            i = i + 1
         return create_ids
 
 sale_order_line()
diff --git a/addons/sale_crm/__init__.py b/addons/sale_crm/__init__.py
index d36ce25fd33..f5db3f4333b 100644
--- a/addons/sale_crm/__init__.py
+++ b/addons/sale_crm/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,11 +15,11 @@
 #    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 wizard
 import sale_crm
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 4b8baa1654e..68226183320 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-
 {
     'name': 'Creates Sale orders from Opportunity',
     'version': '1.0',
@@ -45,8 +44,9 @@ crm modules.
                    'security/sale_crm_security.xml',
                    ],
     'demo_xml': [],
+    'test': ['test/sale_crm.yml'],
     'installable': True,
     'active': False,
     'certificate': '0064360130141',
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index 6efb7f68c8e..03521356f64 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -28,7 +28,7 @@ class sale_order(osv.osv):
     }
 
     def _get_section(self, cr, uid, context=None):
-       return context.get('context_section_id',False)
+       return context.get('context_section_id', False)
 
     _defaults = {
           'section_id': _get_section
@@ -36,4 +36,4 @@ class sale_order(osv.osv):
 
 sale_order()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 4d393b22435..545083ab037 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -25,7 +25,7 @@
 	            </field>
 	        </field>
 	    </record>
-	
+
 	    <record id="view_sales_order_filter_inherit" model="ir.ui.view">
 	        <field name="name">sale.order.list.select</field>
 	        <field name="model">sale.order</field>
@@ -42,7 +42,6 @@
 	            </field>
 	        </field>
 	    </record>
-	    
-	</data>
-</openerp>
 
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/sale_crm/test/sale_crm.yml b/addons/sale_crm/test/sale_crm.yml
new file mode 100644
index 00000000000..3d4542dc7b1
--- /dev/null
+++ b/addons/sale_crm/test/sale_crm.yml
@@ -0,0 +1,50 @@
+-
+  In order to test the sale_crm module in the Open-ERP,
+  I create an opportunity and create a sale order through 'Convert to Sale' wizard .
+-
+  I create an opportunity
+-
+  !record {model: crm.lead, id: crm_lead_opportunity0}:
+    country_id: base.be
+    name: Opportunity-1
+    planned_revenue: 50000.0
+    probability: 70.0
+    partner_address_id: base.res_partner_address_7
+    partner_id: base.res_partner_4
+    planned_revenue: 0.0
+    probability: 0.0
+    section_id: crm.section_sales_department
+    type: opportunity
+    categ_id: crm.categ_oppor1
+-
+  Then I click on the 'Convert to Sale' wizard
+-
+  I place a sale order for product keyboard having quantity 50
+-
+  !record {model: crm.make.sale, id: crm_make_sale_0}:
+    partner_id: base.res_partner_4
+    sale_order_line:
+      - name: '[KEYA] Keyboard - AZERTY'
+        price_unit: 7.0
+        product_uom: product.product_uom_unit
+        product_uom_qty: 50.0
+        delay: 7.0
+        product_id: product.product_product_24
+        type: make_to_stock
+    shop_id: sale.shop
+-
+  Then I click on the 'Ok' button of wizard
+-
+  !python {model: crm.make.sale}: |
+    self.makeOrder(cr, uid, [ref("crm_make_sale_0")], {"lang": "en_US", "tz": False,
+      "active_model": "crm.lead", "section_id": False, "default_type": "opportunity",
+      "search_default_user_id": 1, "search_default_current": 1, "active_ids": [1],
+      "active_id": (1)})
+-
+  I verify that a sale order has been generated from an opportunity
+-
+  !python {model: sale.order}: |
+    crm_obj = self.pool.get('crm.lead')
+    crm = self.browse(cr, uid, ref("crm_lead_opportunity0"))
+    so = self.search(cr, uid, [('origin','=', 'Opportunity: %s' % str(crm.id))])
+    assert so, "Sale order has not been created "
\ No newline at end of file
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 371d206e4f7..c4aeefc6eae 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -19,9 +19,10 @@
 #
 ##############################################################################
 
+import time
+
 from osv import fields, osv
 from tools.translate import _
-import time
 import decimal_precision as dp
 
 class crm_make_sale(osv.osv_memory):
@@ -29,7 +30,7 @@ class crm_make_sale(osv.osv_memory):
 
     _name = "crm.make.sale"
     _description = "Make sale"
-    
+
     def _selectPartner(self, cr, uid, context=None):
         """
         This function gets default value for partner_id field.
@@ -38,17 +39,16 @@ class crm_make_sale(osv.osv_memory):
         @param uid: the current user’s ID for security checks,
         @param context: A standard dictionary for contextual values
         @return : default value of partner_id field.
-        """ 
+        """
         if not context:
             context = {}
-            
+        lead_obj = self.pool.get('crm.lead')
         active_id = context and context.get('active_id', False) or False
         if not active_id:
             return False
-        lead_obj = self.pool.get('crm.lead')
         lead = lead_obj.read(cr, uid, active_id, ['partner_id'])
-        return  lead['partner_id']
-    
+        return lead['partner_id']
+
     def makeOrder(self, cr, uid, ids, context=None):
         """
         This function  create Quotation on given case.
@@ -61,26 +61,26 @@ class crm_make_sale(osv.osv_memory):
         """
         if not context:
             context = {}
-            
+
         mod_obj = self.pool.get('ir.model.data')
         case_obj = self.pool.get('crm.lead')
         sale_obj = self.pool.get('sale.order')
         partner_obj = self.pool.get('res.partner')
         sale_line_obj = self.pool.get('sale.order.line')
-        
+
         result = mod_obj._get_id(cr, uid, 'sale', 'view_sales_order_filter')
         id = mod_obj.read(cr, uid, result, ['res_id'])
-        
+
         data = context and context.get('active_ids', []) or []
-             
-        for make in self.browse(cr, uid, ids):  
+
+        for make in self.browse(cr, uid, ids):
             default_partner_addr = partner_obj.address_get(cr, uid, [make.partner_id.id],
                     ['invoice', 'delivery', 'contact'])
             default_pricelist = partner_obj.browse(cr, uid, make.partner_id.id,
                          context).property_product_pricelist.id
             fpos_data = partner_obj.browse(cr, uid, make.partner_id.id, context).property_account_position
             new_ids = []
-    
+
             for case in case_obj.browse(cr, uid, data):
                 if case.partner_id and case.partner_id.id:
                     partner_id = case.partner_id.id
@@ -94,10 +94,10 @@ class crm_make_sale(osv.osv_memory):
                     fpos = fpos_data and fpos_data.id or False
                     partner_addr = default_partner_addr
                     pricelist = default_pricelist
-    
+
                 if False in partner_addr.values():
                     raise osv.except_osv(_('Data Insufficient!'),_('Customer has no addresses defined!'))
-    
+
                 vals = {
                     'origin': 'Opportunity: %s' % str(case.id),
                     'section_id': case.section_id and case.section_id.id or False,
@@ -110,11 +110,11 @@ class crm_make_sale(osv.osv_memory):
                     'date_order': time.strftime('%Y-%m-%d'),
                     'fiscal_position': fpos,
                 }
-    
+
                 if partner_id:
                     partner = partner_obj.browse(cr, uid, partner_id, context=context)
                     vals['user_id'] = partner.user_id and partner.user_id.id or uid
-    
+
                 if make.analytic_account.id:
                     vals['project_id'] = make.analytic_account.id
                 new_id = sale_obj.create(cr, uid, vals)
@@ -139,10 +139,10 @@ class crm_make_sale(osv.osv_memory):
                 new_ids.append(new_id)
                 message = _('Opportunity ') + " '" + case.name + "' "+ _("is converted to Sales Quotation.")
                 self.log(cr, uid, case.id, message)
-    
+
             if make.close:
                 case_obj.case_close(cr, uid, data)
-            
+
             if not new_ids:
                 return {}
             if len(new_ids)<=1:
@@ -171,30 +171,29 @@ class crm_make_sale(osv.osv_memory):
         'shop_id': fields.many2one('sale.shop', 'Shop', required=True),
         '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.'),              
+        '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.'),
     }
     _defaults = {
          'partner_id': _selectPartner,
          'close': 1
     }
- 
-    
+
 crm_make_sale()
 
 class sale_order_make_line(osv.osv_memory):
-   
+
     def product_id_change(self, cr, uid, ids, product, qty=0,
             uom=False, qty_uos=0, uos=False, name='', partner_id=False,
             lang=False, update_tax=True, packaging=False, flag=False):
         if not  partner_id:
             raise osv.except_osv(_('No Customer Defined !'), _('You have to select a customer in the sale form !\nPlease set one customer before choosing a product.'))
-        date_order = time.strftime('%Y-%m-%d') 
+        date_order = time.strftime('%Y-%m-%d')
         part = self.pool.get('res.partner').browse(cr, uid, partner_id)
         pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
         fiscal_position = part.property_account_position and part.property_account_position.id or False
         return self.pool.get('sale.order.line').product_id_change(cr, uid, ids, pricelist, product, qty, uom, qty_uos, uos, name, partner_id, lang, update_tax, date_order, packaging, fiscal_position, flag)
-    
+
     _name = 'sale.order.make.line'
     _description = 'Opportunity Sale Order Line'
     _columns = {
@@ -223,8 +222,6 @@ class sale_order_make_line(osv.osv_memory):
         'product_packaging': False
     }
 
-sale_order_make_line()   
+sale_order_make_line()
 
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index ac1ef80e011..736a0712b53 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -58,20 +58,20 @@
                             </field>
                             <newline/>
 
-				
+
                 <separator colspan="4"/>
                 <group col="4" colspan="4">
                     <label string="" colspan="2"/>
                     <button special="cancel" string="_Close" icon="gtk-cancel"/>
-                    <button name="makeOrder" string="_Ok" type="object" icon='gtk-ok'/>
+                    <button name="makeOrder" string="_Create" type="object" icon='gtk-ok'/>
                 </group>
                 </group>
             </form>
           </field>
        </record>
-       
+
        <!-- crm make sale's  action -->
-       
+
        <record id="action_crm_make_sale" model="ir.actions.act_window">
           <field name="name">Make Quotation</field>
           <field name="type">ir.actions.act_window</field>
@@ -80,6 +80,6 @@
           <field name="view_mode">form</field>
           <field name="target">new</field>
        </record>
-       
+
    </data>
 </openerp>
diff --git a/addons/sale_journal/__init__.py b/addons/sale_journal/__init__.py
index f846067a3b4..b41a4be55d1 100644
--- a/addons/sale_journal/__init__.py
+++ b/addons/sale_journal/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,9 +15,10 @@
 #    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 sale_journal
 import report
 
diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py
index 48b5d3aaeb2..4fde94fc709 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -54,6 +54,7 @@
         'security/ir.model.access.csv',
         'sale_journal_view.xml',
         'report/sale_journal_report_view.xml',
+        'report/picking_journal_report_view.xml',
     ],
     'demo_xml': ['sale_journal_demo.xml'],
     'test': [
diff --git a/addons/sale_journal/report/__init__.py b/addons/sale_journal/report/__init__.py
index 0f9b6da35da..bfe23eb8cce 100644
--- a/addons/sale_journal/report/__init__.py
+++ b/addons/sale_journal/report/__init__.py
@@ -20,5 +20,6 @@
 ##############################################################################
 
 import sale_journal_report 
+import picking_journal_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale_journal/report/picking_journal_report.py b/addons/sale_journal/report/picking_journal_report.py
new file mode 100644
index 00000000000..0b447f45cce
--- /dev/null
+++ b/addons/sale_journal/report/picking_journal_report.py
@@ -0,0 +1,86 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    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/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+import tools
+
+class sale_journal_picking_report(osv.osv):
+    """
+    Picking list by journal and by invoice
+    """
+    _name = "sale.journal.picking.report"
+    _description = "Picking lists"
+    _auto = False
+    _columns = {
+        'name': fields.char('Year', size=64, required=False, readonly=True), 
+        'month': fields.selection([('01', 'January'), ('02', 'February'), ('03', 'March'), ('04', 'April'), ('05', 'May'), ('06', 'June'), 
+                          ('07', 'July'), ('08', 'August'), ('09', 'September'), ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True), 
+
+        'invoice_state':fields.selection([
+            ("invoiced", "invoiced"), 
+            ("2binvoiced", "to be invoiced"), 
+            ("none", "None")
+        ], "Invoice state", readonly=True), 
+        'state': fields.selection([
+            ('draft', 'draft'), 
+            ('auto', 'waiting'), 
+            ('confirmed', 'confirmed'), 
+            ('assigned', 'assigned'), 
+            ('done', 'done'), 
+            ('cancel', 'cancel'), 
+        ], 'State', readonly=True), 
+        'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoicing method', readonly=True), 
+        'journal_id': fields.many2one('sale_journal.picking.journal', 'Journal', readonly=True), 
+        'quantity': fields.float('Quantities', readonly=True), 
+        'price_total': fields.float('Total Price', readonly=True), 
+        'price_average': fields.float('Average Price', readonly=True), 
+        'count': fields.integer('# of Lines', readonly=True), 
+    }
+    _order = 'journal_id, name desc, price_total desc'
+    
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'sale_journal_picking_report')
+
+        cr.execute("""
+            create or replace view sale_journal_picking_report as (
+                select
+                    min(l.id) as id,
+                    to_char(s.date, 'YYYY') as name,
+                    to_char(s.date, 'MM') as month,
+                    s.state,
+                    s.invoice_state,
+                    s.invoice_type_id,
+                    s.journal_id,
+                    sum(l.product_qty) as quantity,
+                    count(*) as count,
+                    sum(l.product_qty*ol.price_unit*(1.0-ol.discount/100.0)) as price_total,
+                    (sum(l.product_qty*ol.price_unit*(1.0-ol.discount/100.0))/sum(l.product_qty))::decimal(16,2) as price_average
+                from stock_picking s
+                    right join stock_move l on (s.id=l.picking_id)
+                    left join sale_order_line ol on (l.sale_line_id=ol.id)
+                group by s.journal_id, s.invoice_type_id, to_char(s.date, 'YYYY'),to_char(s.date, 'MM'),s.state, s.invoice_state
+                order by s.invoice_type_id, s.invoice_state, s.state
+                )
+        """)
+        
+sale_journal_picking_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale_journal/report/picking_journal_report_view.xml b/addons/sale_journal/report/picking_journal_report_view.xml
new file mode 100644
index 00000000000..bcfa293a64c
--- /dev/null
+++ b/addons/sale_journal/report/picking_journal_report_view.xml
@@ -0,0 +1,105 @@
+<openerp>
+   <data> 
+   
+     <!-- picking by journal and invoice's tree view-->
+
+        <record model="ir.ui.view" id="view_sale_journal_picking_report_tree">
+            <field name="name">sale.journal.picking.report.tree</field>
+            <field name="model">sale.journal.picking.report</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Picking Journal">
+                    <field name="name" invisible="1"/>
+                    <field name="month" invisible="1"/>
+                    <field name="invoice_state" invisible="1"/>
+                    <field name="state" invisible="1"/>
+                    <field name="invoice_type_id" invisible="1"/>
+                    <field name="journal_id" invisible="1"/>
+                    <field name="quantity" />
+                    <field name="count" />
+                    <field name="price_average"/>
+                    <field name="price_total"/>
+                </tree>
+            </field>
+        </record>
+
+        <!-- picking journal's graph view -->
+
+        <record id="view_sale_journal_picking_graph" model="ir.ui.view">
+            <field name="name">sale.journal.picking.report.graph</field>
+            <field name="model">sale.journal.picking.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+               <graph string="Picking journal Statistics" type="bar">
+                 <field name="journal_id"/>
+                 <field name="invoice_type_id"/>
+                 <field name="price_total"/>
+              </graph>
+           </field>
+       </record>
+
+       <!-- Picking journal search view -->
+
+        <record model="ir.ui.view" id="view_sale_journal_picking_report_search">
+            <field name="name">sale.journal.picking.report.search</field>
+            <field name="model">sale.journal.picking.report</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Picking journal">
+                    <group col="8" colspan="4">
+                        <filter icon="terp-go-year" string="This Year" name="year" domain="[('name','=',time.strftime('%%Y'))]" help="Picking by invoice or by journal method in this year"/>
+                        <filter icon="terp-go-month" string="This Month" name="month" domain="[('month','=',time.strftime('%%m'))]" help="Picking by invoice or by journal method in this month"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-document-new"
+                                string="Draft"
+                                domain="[('state','=','draft')]"/>
+                        <filter icon="terp-gtk-media-pause"
+                                string="Pending"
+                                domain="[('state','=','waiting')]"/>
+                        <filter icon="terp-camera_test"
+                                string="Confirmed"
+                                domain="[('state','=','confirmed')]"/>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="month" select="1"/>
+                        <field name="invoice_state" select="1"/>
+                        <field name="state" select="1"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="4" col="12">
+                        <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+                        <filter string="Invoice" icon="terp-dolar" context="{'group_by':'invoice_type_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Invoice state" icon="terp-stock_effects-object-colorize" context="{'group_by':'invoice_state'}"/>
+                        <filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_sale_journal_picking_report_open">
+            <field name="name">Statistics on picking to invoice</field>
+            <field name="res_model">sale.journal.picking.report</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
+        </record>
+
+    <!-- Action for picking journal view -->
+
+        <record model="ir.actions.act_window" id="action_sale_journal_picking_report_open_menu_all">
+            <field name="name">Picking Journal</field>
+            <field name="res_model">sale.journal.picking.report</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="search_view_id" ref="view_sale_journal_picking_report_search"/>
+            <field name="context">{'search_default_month':1, 'group_by_no_leaf':1,'group_by':[]}</field>
+        </record>
+
+        <menuitem name="Picking journal" id="menu_invoice_type_picking_stats_open_all" parent="stock.next_id_61" 
+                  action="action_sale_journal_picking_report_open_menu_all" sequence="8"/>
+
+    </data>
+</openerp>
diff --git a/addons/sale_journal/report/sale_journal_report.py b/addons/sale_journal/report/sale_journal_report.py
index 2e793d91933..723a7f88722 100644
--- a/addons/sale_journal/report/sale_journal_report.py
+++ b/addons/sale_journal/report/sale_journal_report.py
@@ -72,70 +72,4 @@ class sale_journal_report(osv.osv):
         
 sale_journal_report()
 
-#==========================================
-#picking report
-#==========================================
-
-
-class sale_journal_picking_report(osv.osv):
-    """
-    Picking list by journal and by invoice
-    """
-    _name = "sale.journal.picking.report"
-    _description = "Picking lists"
-    _auto = False
-    _columns = {
-        'name': fields.char('Year', size=64, required=False, readonly=True), 
-        'month': fields.selection([('01', 'January'), ('02', 'February'), ('03', 'March'), ('04', 'April'), ('05', 'May'), ('06', 'June'), 
-                          ('07', 'July'), ('08', 'August'), ('09', 'September'), ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True), 
-
-        'invoice_state':fields.selection([
-            ("invoiced", "invoiced"), 
-            ("2binvoiced", "to be invoiced"), 
-            ("none", "None")
-        ], "Invoice state", readonly=True), 
-        'state': fields.selection([
-            ('draft', 'draft'), 
-            ('auto', 'waiting'), 
-            ('confirmed', 'confirmed'), 
-            ('assigned', 'assigned'), 
-            ('done', 'done'), 
-            ('cancel', 'cancel'), 
-        ], 'State', readonly=True), 
-        'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoicing method', readonly=True), 
-        'journal_id': fields.many2one('sale_journal.picking.journal', 'Journal', readonly=True), 
-        'quantity': fields.float('Quantities', readonly=True), 
-        'price_total': fields.float('Total Price', readonly=True), 
-        'price_average': fields.float('Average Price', readonly=True), 
-        'count': fields.integer('# of Lines', readonly=True), 
-    }
-    _order = 'journal_id, name desc, price_total desc'
-    
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'sale_journal_picking_report')
-
-        cr.execute("""
-            create or replace view sale_journal_picking_report as (
-                select
-                    min(l.id) as id,
-                    to_char(s.date, 'YYYY') as name,
-                    to_char(s.date, 'MM') as month,
-                    s.state,
-                    s.invoice_state,
-                    s.invoice_type_id,
-                    s.journal_id,
-                    sum(l.product_qty) as quantity,
-                    count(*) as count,
-                    sum(l.product_qty*ol.price_unit*(1.0-ol.discount/100.0)) as price_total,
-                    (sum(l.product_qty*ol.price_unit*(1.0-ol.discount/100.0))/sum(l.product_qty))::decimal(16,2) as price_average
-                from stock_picking s
-                    right join stock_move l on (s.id=l.picking_id)
-                    left join sale_order_line ol on (l.sale_line_id=ol.id)
-                group by s.journal_id, s.invoice_type_id, to_char(s.date, 'YYYY'),to_char(s.date, 'MM'),s.state, s.invoice_state
-                order by s.invoice_type_id, s.invoice_state, s.state
-                )
-        """)
-        
-sale_journal_picking_report()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_journal/report/sale_journal_report_view.xml b/addons/sale_journal/report/sale_journal_report_view.xml
index ae454f7674b..63caea90768 100644
--- a/addons/sale_journal/report/sale_journal_report_view.xml
+++ b/addons/sale_journal/report/sale_journal_report_view.xml
@@ -81,109 +81,8 @@
 	        <field name="context">{'search_default_journal': 1,'group_by_no_leaf':1,'group_by':[]}</field>
 	    </record>
 
-	    <menuitem name="Sales by Journal" id="menu_sale_journal_report_open_all" 
-	              parent="base.next_id_64" action="action_sale_journal_report_open_menu_all" sequence="2"/>
-
-	 <!-- picking by journal and invoice's tree view-->
-
-
-		<record model="ir.ui.view" id="view_sale_journal_picking_report_tree">
-			<field name="name">sale.journal.picking.report.tree</field>
-			<field name="model">sale.journal.picking.report</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Picking Journal">
-					<field name="name" invisible="1"/>
-					<field name="month" invisible="1"/>
-					<field name="invoice_state" invisible="1"/>
-					<field name="state" invisible="1"/>
-					<field name="invoice_type_id" invisible="1"/>
-					<field name="journal_id" invisible="1"/>
-					<field name="quantity" />
-					<field name="count" />
-					<field name="price_average"/>
-					<field name="price_total"/>
-				</tree>
-			</field>
-		</record>
-
-		<!-- picking journal's graph view -->
-
-		<record id="view_sale_journal_picking_graph" model="ir.ui.view">
-	        <field name="name">sale.journal.picking.report.graph</field>
-            <field name="model">sale.journal.picking.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-               <graph string="Picking journal Statistics" type="bar">
-                 <field name="journal_id"/>
-                 <field name="invoice_type_id"/>
-                 <field name="price_total"/>
-              </graph>
-           </field>
-       </record>
-
-       <!-- Picking journal search view -->
-
-		<record model="ir.ui.view" id="view_sale_journal_picking_report_search">
-			<field name="name">sale.journal.picking.report.search</field>
-			<field name="model">sale.journal.picking.report</field>
-			<field name="type">search</field>
-			<field name="arch" type="xml">
-				<search string="Picking journal">
-					<group col="8" colspan="4">
-						<filter icon="terp-go-year" string="This Year" name="year" domain="[('name','=',time.strftime('%%Y'))]" help="Picking by invoice or by journal method in this year"/>
-		               	<filter icon="terp-go-month" string="This Month" name="month" domain="[('month','=',time.strftime('%%m'))]" help="Picking by invoice or by journal method in this month"/>
-		               	<separator orientation="vertical"/>
-		                <filter icon="terp-document-new"
-		                    	string="Draft"
-		                    	domain="[('state','=','draft')]"/>
-		                <filter icon="terp-gtk-media-pause"
-		                		string="Pending"
-		                		domain="[('state','=','waiting')]"/>
-		                <filter icon="terp-camera_test"
-		                		string="Confirmed"
-		                		domain="[('state','=','confirmed')]"/>
-		               	<separator orientation="vertical"/>
-						<field name="name" select="1"/>
-						<field name="month" select="1"/>
-						<field name="invoice_state" select="1"/>
-						<field name="state" select="1"/>
-		            </group>
-		            <newline/>
-		            <group expand="1" string="Group By..." colspan="4" col="12">
-	                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
-	                    <filter string="Invoice" icon="terp-dolar" context="{'group_by':'invoice_type_id'}"/>
-	                    <separator orientation="vertical"/>
-	                    <filter string="Invoice state" icon="terp-stock_effects-object-colorize" context="{'group_by':'invoice_state'}"/>
-	                    <filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-					</group>
-				</search>
-			</field>
-		</record>
-
-		<record model="ir.actions.act_window" id="action_sale_journal_picking_report_open">
-			<field name="name">Statistics on picking to invoice</field>
-			<field name="res_model">sale.journal.picking.report</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="domain">[('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
-		</record>
-
-	<!-- Action for picking journal view -->
-
-		<record model="ir.actions.act_window" id="action_sale_journal_picking_report_open_menu_all">
-			<field name="name">Picking Journal</field>
-			<field name="res_model">sale.journal.picking.report</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,graph</field>
-			<field name="search_view_id" ref="view_sale_journal_picking_report_search"/>
-			<field name="context">{'search_default_month':1, 'group_by_no_leaf':1,'group_by':[]}</field>
-		</record>
-
-		<menuitem name="Picking journal" id="menu_invoice_type_picking_stats_open_all" parent="stock.next_id_61" 
-		          action="action_sale_journal_picking_report_open_menu_all" sequence="8"/>
+	    <menuitem name="Sales by Journal" id="menu_sale_journal_report_open_all"
+	              parent="base.next_id_64" action="action_sale_journal_report_open_menu_all" sequence="2" groups="base.group_sale_manager"/>
 
 	</data>
 </openerp>
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index 5c6007824ac..10f2606955a 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -43,10 +43,10 @@ class sale_journal(osv.osv):
     _name = 'sale_journal.sale.journal'
     _description = 'Sale Journal'
     _columns = {
-        'name': fields.char('Journal', size=64, required=True),
-        'code': fields.char('Code', size=16, required=True),
-        'user_id': fields.many2one('res.users', 'Responsible', required=True),
-        'date': fields.date('Journal date', required=True),
+        'name': fields.char('Journal', size=64, required=True, states={'close':[('readonly',True)]}),
+        'code': fields.char('Code', size=16, required=True, states={'close':[('readonly',True)]}),
+        'user_id': fields.many2one('res.users', 'Responsible', required=True, states={'close':[('readonly',True)]}),
+        'date': fields.date('Journal date', required=True, states={'close':[('readonly',True)]}),
         'date_created': fields.date('Creation date', readonly=True, required=True),
         'date_close': fields.date('Close date ', readonly=True),
         'sale_stats_ids': fields.one2many("sale.journal.report", "journal_id", 'Sale stats', readonly=True),
@@ -167,19 +167,19 @@ class picking_journal(osv.osv):
                 wf_service = netsvc.LocalService("workflow")
                 wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_cancel', cr)
         return True
-   
+
     def button_open(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'open'})
         return True
-    
+
     def button_draft(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'draft'})
         return True
-    
+
     def button_close(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'close', 'date_close':time.strftime('%Y-%m-%d')})
         return True
-    
+
     def button_reset(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'draft'})
         for (id,name) in self.name_get(cr, uid, ids):
@@ -188,15 +188,15 @@ class picking_journal(osv.osv):
         return True
 
     def button_picking_confirm(self, cr, uid, ids, context={}):
-        
+
         self.write(cr, uid, ids, {'state':'confirm'})
         for id in ids:
             pick_ids = self.pool.get('stock.picking').search(cr, uid, [('journal_id','=',id)])
             for pickid in pick_ids:
                 wf_service = netsvc.LocalService("workflow")
-                wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_confirm', cr)        
+                wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_confirm', cr)
         return True
-    
+
     def copy(self, cr, uid, id, default=None, context=None):
         """Overrides orm copy method
         @param self: The object pointer
@@ -211,7 +211,7 @@ class picking_journal(osv.osv):
             default = {}
         default.update({'picking_stats_ids': []})
         return super(picking_journal, self).copy(cr, uid, id, default=default, context=context)
-    
+
 picking_journal()
 
 #==============================================
@@ -236,7 +236,7 @@ res_partner()
 class picking(osv.osv):
     _inherit = "stock.picking"
     _columns = {
-        'journal_id': fields.many2one('sale_journal.picking.journal', 'Journal',  domain=[('state','!=', 'close')],help="Picking Journal"),
+        'journal_id': fields.many2one('sale_journal.picking.journal', 'Picking Journal',  domain=[('state','!=', 'close')],help="Picking Journal"),
         'sale_journal_id': fields.many2one('sale_journal.sale.journal', 'Sale Journal'),
         'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type', readonly=True)
     }
@@ -264,5 +264,7 @@ class sale(osv.osv):
             itype = self.pool.get('res.partner').browse(cr, uid, part).property_invoice_type.id
             result['value']['invoice_type_id'] = itype
         return result
+
 sale()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index fdcc70f710a..e59b743ed91 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -2,7 +2,7 @@
    <data>
 
         <menuitem id="menu_sale_journal_config" name="Sale Journals"
-            parent="base.menu_base_config" sequence="5"/>
+            parent="base.menu_base_config" sequence="5" groups="base.group_system"/>
 
    <!--  sale journal invoice Type's Form  view -->
 
@@ -155,7 +155,7 @@
                 <field name="origin" position="after">
                 	<group colspan="2" col="2">
 	                    <separator string="Journal" colspan="4"/>
-	                    <field name="journal_id" select="1"/>
+	                    <field name="journal_id" select="1" widget="selection" domain="[('state','in', ('draft', 'open'))]"/>
 	                    <field name="invoice_type_id" select="1" widget="selection"/>
                     </group>
                 </field>
@@ -453,7 +453,7 @@
             <field name="search_view_id" ref="view_picking_journal_search"/>
         </record>
 
-        <menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_warehouse_config" action="action_definition_picking_journal"/>
+        <menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_warehouse_config" action="action_definition_picking_journal" groups="base.group_system"/>
 
         <record model="ir.actions.act_window" id="action_invoice_type_tree">
             <field name="name">Picking by invoice_method</field>
@@ -501,7 +501,7 @@
             <field name="inherit_id" ref="stock.view_stock_delivery_filter"/>
             <field name="arch" type="xml">
                 <xpath expr="/search/group[@string='Group By...']/filter[@string='Partner']" position="after">
-                   	<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                   	<filter string="Picking Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                 </xpath>
             </field>
         </record>                 
@@ -513,7 +513,7 @@
             <field name="inherit_id" ref="stock.view_picking_out_search"/>
             <field name="arch" type="xml">
                 <xpath expr="/search/group[@string='Group By...']/filter[@string='Partner']" position="after">
-                   	<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                   	<filter string="Picking Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                 </xpath>
             </field>
         </record>
@@ -525,7 +525,7 @@
             <field name="inherit_id" ref="stock.view_picking_in_search"/>
             <field name="arch" type="xml">
                 <xpath expr="/search/group[@string='Group By...']/filter[@string='Partner']" position="after">
-                   	<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                   	<filter string="Picking Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                 </xpath>
             </field>
         </record>    
@@ -537,7 +537,7 @@
             <field name="inherit_id" ref="stock.view_picking_internal_search"/>
             <field name="arch" type="xml">
                 <xpath expr="/search/group[@string='Group By...']/filter[@string='Origin']" position="after">
-                   	<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                   	<filter string="Picking Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                 </xpath>
             </field>
         </record>    
diff --git a/addons/sale_journal/security/ir.model.access.csv b/addons/sale_journal/security/ir.model.access.csv
index 0a7ed3742ab..8b1f5b41f41 100644
--- a/addons/sale_journal/security/ir.model.access.csv
+++ b/addons/sale_journal/security/ir.model.access.csv
@@ -1,10 +1,17 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_sale_journal_invoice_type_finance_invoice","sale_journal.invoice.type invoice","model_sale_journal_invoice_type","account.group_account_invoice",1,0,0,0
 "access_sale_journal_invoice_type_partner_manager","sale_journal.invoice.type partner manager","model_sale_journal_invoice_type","base.group_partner_manager",1,0,0,0
-"access_sale_journal_sale_journal","sale_journal.sale.journal","model_sale_journal_sale_journal","sale.group_sale_user",1,0,0,0
-"access_sale_journal_invoice_type_manager","sale_journal.invoice.type.manager","model_sale_journal_invoice_type","sale.group_sale_manager",1,1,1,1
-"access_sale_journal_sale_journal_manager","sale_journal.sale.journal.manager","model_sale_journal_sale_journal","sale.group_sale_manager",1,1,1,1
-"access_sale_journal_picking_journal_manager","sale_journal.picking.journal.manager","model_sale_journal_picking_journal","sale.group_sale_manager",1,1,1,1
+"access_sale_journal_sale_journal","sale_journal.sale.journal","model_sale_journal_sale_journal","base.group_sale_salesman",1,0,0,0
+"access_sale_journal_invoice_type_manager","sale_journal.invoice.type.manager","model_sale_journal_invoice_type","base.group_sale_manager",1,1,1,1
+"access_sale_journal_sale_journal_manager","sale_journal.sale.journal.manager","model_sale_journal_sale_journal","base.group_sale_manager",1,1,1,1
+"access_sale_journal_picking_journal_manager","sale_journal.picking.journal.manager","model_sale_journal_picking_journal","base.group_sale_manager",1,1,1,1
 "access_sale_journal_sale_journal_stock_worker","sale_journal.sale.journal stock worker","model_sale_journal_sale_journal","stock.group_stock_user",1,0,0,0
 "access_sale_journal_picking_journal_stock_worker","sale_journal.picking.journal stock worker","model_sale_journal_picking_journal","stock.group_stock_user",1,0,0,0
 "access_sale_journal_invoice_type_stock_worker","sale_journal.invoice_type stock worker","model_sale_journal_invoice_type","stock.group_stock_user",1,0,0,0
+"access_sale_journal_sale_journal_report_manager","sale_journal_sale_journal_report_manager","model_sale_journal_report","base.group_sale_manager",1,1,1,1
+"access_sale_journal_sale_journal_report_system","sale_journal_sale_journal_report_system","model_sale_journal_report","base.group_system",1,0,0,0
+"access_sale_journal_picking_report","sale_journal_picking_report","model_sale_journal_picking_report","stock.group_stock_manager",1,1,1,1
+"access_sale_journal_picking_journal","sale_journal_picking_journal","model_sale_journal_picking_journal","base.group_system",1,1,1,1
+"access_stock_picking_journal_system","stock_picking_journal_system","stock.model_stock_picking","base.group_system",1,1,1,1
+"access_sale_journal_invoice_type_system","sale_journal.invoice.type.system","model_sale_journal_invoice_type","base.group_system",1,1,1,1
+"access_sale_journal_sale_journal_system","sale_journal.sale.journal.system","model_sale_journal_sale_journal","base.group_system",1,1,1,1
diff --git a/addons/sale_layout/__openerp__.py b/addons/sale_layout/__openerp__.py
index b4c647627ba..2e2c23edff8 100755
--- a/addons/sale_layout/__openerp__.py
+++ b/addons/sale_layout/__openerp__.py
@@ -1,5 +1,5 @@
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -14,22 +14,22 @@
 #    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/>.
 #
 ##############################################################################
 
 {
-    "name" : "Sale Order Layout Improvement",
+    "name" : "Sale Order Layout",
     "version" : "1.0",
-    "depends" : ["base", "sale"],
+    "depends" : ["sale", "account_invoice_layout"],
     "author" : "OpenERP SA",
     "description": """
-    This module provides some features to improve the layout of the Sale Order.
+    This module provides features to improve the layout of the Sale Order.
 
     It gives you the possibility to
         * order all the lines of an sale order
         * add titles, comment lines, sub total lines
-        * draw horizontal lines and put page breaks    
+        * draw horizontal lines and put page breaks
 
     """,
     "website" : "http://www.openerp.com",
@@ -37,12 +37,10 @@
     "init_xml" : [],
     "demo_xml" : [],
     "update_xml" : [
-#        "security/ir.model.access.csv",
         "sale_layout_view.xml",
         "sale_layout_report.xml",
     ],
     "active": False,
     "installable": True
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale_layout/sale_layout.py b/addons/sale_layout/sale_layout.py
index d493b7d6840..9bb73a8e1c3 100755
--- a/addons/sale_layout/sale_layout.py
+++ b/addons/sale_layout/sale_layout.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -19,12 +19,14 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields,osv
 from tools import config
 import decimal_precision as dp
 from tools.translate import _
+
 class sale_order_line(osv.osv):
-    
+
     def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
         tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
@@ -84,7 +86,7 @@ class sale_order_line(osv.osv):
             if vals['layout_type'] == 'break':
                 vals['name'] = ' '
             if vals['layout_type'] != 'article':
-                vals['product_uom_qty']= 0                
+                vals['product_uom_qty']= 0
         return super(sale_order_line, self).create(cr, user, vals, context)
 
     def write(self, cr, user, ids, vals, context=None):
@@ -100,7 +102,7 @@ class sale_order_line(osv.osv):
             default = {}
         default['layout_type'] = self.browse(cr, uid, id).layout_type
         return super(sale_order_line, self).copy(cr, uid, id, default, context)
-    
+
 
     _name = "sale.order.line"
     _order = "order_id, sequence asc"
@@ -115,17 +117,17 @@ class sale_order_line(osv.osv):
                 ('line','Separator Line'),
                 ('break','Page Break'),]
             ,'Layout Type', select=True, required=True),
-        'sequence': fields.integer('Sequence Number'), 
+        'sequence': fields.integer('Sequence Number'),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft':[('readonly',False)]}),
         'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2)),
-        'product_uom': fields.many2one('product.uom', 'Product UoM'),   
-    }   
+        'product_uom': fields.many2one('product.uom', 'Product UoM'),
+    }
 
     _defaults = {
         'layout_type': lambda *a: 'article',
     }
-sale_order_line()
 
+sale_order_line()
 
 class one2many_mod2(fields.one2many):
     def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
@@ -155,6 +157,7 @@ class sale_order(osv.osv):
         'abstract_line_ids': fields.one2many('sale.order.line', 'order_id', 'Order Lines',readonly=True, states={'draft':[('readonly',False)]}),
         'order_line': one2many_mod2('sale.order.line', 'order_id', 'Order Lines',readonly=True, states={'draft':[('readonly',False)]}),
     }
-sale_order()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
+sale_order()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale_margin/report/report_margin_view.xml b/addons/sale_margin/report/report_margin_view.xml
index 1dcafe50de3..31616ff96fe 100644
--- a/addons/sale_margin/report/report_margin_view.xml
+++ b/addons/sale_margin/report/report_margin_view.xml
@@ -89,6 +89,6 @@
 
 		<menuitem name="Invoice Report" id="menu_report_account_invoice_product" parent="account.menu_finance_reporting"/>
 
-		<menuitem name="Invoice" id="menu_report_account_invoice_reoirt" parent="menu_report_account_invoice_product" action="action_report_account_invoice_report"/>
+		<menuitem name="Invoice" id="menu_report_account_invoice_reoirt" parent="menu_report_account_invoice_product" action="action_report_account_invoice_report" groups="account.group_account_manager"/>
 	</data>
 </openerp>
diff --git a/addons/sale_margin/security/ir.model.access.csv b/addons/sale_margin/security/ir.model.access.csv
index 6cab8a4c33d..d7752fa1961 100644
--- a/addons/sale_margin/security/ir.model.access.csv
+++ b/addons/sale_margin/security/ir.model.access.csv
@@ -1,2 +1,2 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_report_account_invoice_product","report.account.invoice.product","model_report_account_invoice_product","account.group_account_invoice",1,1,1,1
+"access_report_account_invoice_product","report.account.invoice.product","model_report_account_invoice_product","account.group_account_manager",1,1,1,1
diff --git a/addons/sale_order_dates/i18n/en_US.po b/addons/sale_order_dates/i18n/en_US.po
new file mode 100644
index 00000000000..4d6da819818
--- /dev/null
+++ b/addons/sale_order_dates/i18n/en_US.po
@@ -0,0 +1,56 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_order_dates
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-08-09 12:40:22+0000\n"
+"PO-Revision-Date: 2010-08-09 12:40:22+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_order_dates
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: sale_order_dates
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: sale_order_dates
+#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
+msgid "Sale Order Dates"
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr ""
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr ""
+
+#. module: sale_order_dates
+#: model:ir.module.module,description:sale_order_dates.module_meta_information
+msgid "Add commitment, requested and effective dates on the sale order.\n"
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr ""
\ No newline at end of file
diff --git a/addons/sale_order_dates/i18n/fr.po b/addons/sale_order_dates/i18n/fr.po
new file mode 100644
index 00000000000..e6e596e6902
--- /dev/null
+++ b/addons/sale_order_dates/i18n/fr.po
@@ -0,0 +1,56 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_order_dates
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-08-09 12:45:51+0000\n"
+"PO-Revision-Date: 2010-08-09 12:45:51+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_order_dates
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: sale_order_dates
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: sale_order_dates
+#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
+msgid "Sale Order Dates"
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr ""
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr ""
+
+#. module: sale_order_dates
+#: model:ir.module.module,description:sale_order_dates.module_meta_information
+msgid "Add commitment, requested and effective dates on the sale order.\n"
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr ""
\ No newline at end of file
diff --git a/addons/sale_order_dates/i18n/sale_order_dates.pot b/addons/sale_order_dates/i18n/sale_order_dates.pot
new file mode 100644
index 00000000000..d66893f706e
--- /dev/null
+++ b/addons/sale_order_dates/i18n/sale_order_dates.pot
@@ -0,0 +1,56 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_order_dates
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-08-09 12:18:27+0000\n"
+"PO-Revision-Date: 2010-08-09 12:18:27+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_order_dates
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: sale_order_dates
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: sale_order_dates
+#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
+msgid "Sale Order Dates"
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr ""
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr ""
+
+#. module: sale_order_dates
+#: model:ir.module.module,description:sale_order_dates.module_meta_information
+msgid "Add commitment, requested and effective dates on the sale order.\n"
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr ""
\ No newline at end of file
diff --git a/addons/sale_order_dates/sale_order_dates.py b/addons/sale_order_dates/sale_order_dates.py
index ad36d7c582d..ce82796235f 100644
--- a/addons/sale_order_dates/sale_order_dates.py
+++ b/addons/sale_order_dates/sale_order_dates.py
@@ -19,11 +19,12 @@
 #
 ##############################################################################
 
-from osv import fields, osv
 import time
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 
+from osv import fields, osv
+
 class sale_order_dates(osv.osv):
     _inherit = 'sale.order'
     _name = 'sale.order'
@@ -59,7 +60,7 @@ class sale_order_dates(osv.osv):
         'requested_date': fields.date('Requested Date'),
         'effective_date': fields.function(_get_effective_date, method=True, type='date', store=True,string='Effective Date'),
     }
+
 sale_order_dates()
 
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index ddc4f3461da..3ef7ce2e866 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -241,7 +241,7 @@
       <font color="white"> </font>
     </para>
     <section>
-      <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'assigned' )],'move_lines') ]]</para>
+      <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'confirmed' or line.state=='done' or line.state=='assigned')],'move_lines') ]]</para>
       <blockTable colWidths="257.0,58.0,61.0,46.0,26.0,74.0" style="Move_Line_Contect_Assign_State">[[ picking.move_lines or removeParentNode('blockTable')]]
         <tr>
           <td>
@@ -267,13 +267,17 @@
       <para style="terp_default_2">
         <font color="white"> </font>
       </para>
+        <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+        <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
   
-    <para style="terp_default_5cm_Above_Space">[[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('section') ]]</para>
-    <para style="terp_default_Bold_9">Non Assigned Products: [[ ( move_lines.state == 'assigned' or move_lines.state == 'done' or move_lines.state == 'confirmed' ) and removeParentNode('para') ]]</para>
-    <para style="terp_default_1cm_above_space">[[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('para') ]]</para>
   </section>    
+	<para style="terp_default_Bold_9">[[ ([line for line in picking.move_lines if (line.state == 'draft'  or line.state=='waiting' )])  and 'Non Assigned Products:' or removeParentNode('para') ]]</para>
     <section>
-      <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state != 'assigned' )],'move_lines') and removeParentNode('section') ]]</para>
+      <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]]</para>
       <blockTable colWidths="257.0,57.0,62.0,46.0,26.0,74.0" style="Move_Line_Content_Other_State">[[ picking.move_lines or removeParentNode('blockTable')]]
         <tr>
           <td>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 9d269160fb9..2c8c1ad80e9 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -219,7 +219,7 @@
         <field name="search_view_id"  eval="False"/>
         <field name="context">{'contact_display': 'partner', 'search_default_real':1, 'search_default_location_type_internal':1,'search_default_group_product':1,'search_default_group_location':1,'group_by':[], 'group_by_no_leaf':1}</field>
     </record>
-    <menuitem action="action_stock_inventory_report" id="menu_action_stock_inventory_report" parent="next_id_61" sequence="4"/>
+    <menuitem action="action_stock_inventory_report" id="menu_action_stock_inventory_report" parent="next_id_61" sequence="4" groups="base.group_system,base.group_user"/>
 
 
 </data>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 86d9cac4337..a120ce0c571 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -1,25 +1,54 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_stock_incoterms_all","stock.incoterms all","model_stock_incoterms",,1,0,0,0
-"access_stock_incoterms_manager","stock.incoterms manager","model_stock_incoterms",stock.group_stock_manager,1,1,1,1
+"access_stock_incoterms_manager","stock.incoterms manager","model_stock_incoterms","stock.group_stock_manager",1,1,1,1
 "access_stock_warehouse_manager","stock.warehouse.manager","model_stock_warehouse","stock.group_stock_manager",1,1,1,1
 "access_stock_warehouse_user","stock.warehouse.user","model_stock_warehouse","base.group_user",1,0,0,0
-"access_stock_location_manager","stock.location.manager","model_stock_location","stock.group_stock_manager",1,1,1,1
-"access_stock_location_user","stock.location.user","model_stock_location","base.group_user",1,0,0,0
+"access_stock_location_manager","stock.location.manager","model_stock_location","stock.group_stock_manager",1,0,0,0
+"access_stock_location_user","stock.location.user","model_stock_location","base.group_user",1,1,1,1
 "access_stock_journal_user","stock.journal.user","model_stock_journal","base.group_user",1,0,0,0
 "access_stock_journal_manager","stock.journal.manager","model_stock_journal","stock.group_stock_manager",1,1,1,1
-"access_stock_tracking","stock.tracking","model_stock_tracking","stock.group_stock_user",1,1,1,0
-"access_stock_picking","stock.picking","model_stock_picking","stock.group_stock_user",1,1,1,1
-"access_stock_production_lot","stock.production.lot","model_stock_production_lot","stock.group_stock_user",1,1,1,0
+"access_stock_tracking_user","stock.tracking user","model_stock_tracking","stock.group_stock_user",1,1,1,1
+"access_stock_tracking_manager","stock.tracking manager","model_stock_tracking","stock.group_stock_manager",1,0,0,0
+"access_stock_tracking_system","stock.tracking systen","model_stock_tracking","base.group_system",1,0,0,0
+"access_stock_picking_user","stock.picking user","model_stock_picking","stock.group_stock_user",1,1,1,1
+"access_stock_picking_manager","stock.picking manager","model_stock_picking","stock.group_stock_manager",1,0,0,0
+"access_stock_picking_system","stock.picking system","model_stock_picking","base.group_system",1,0,0,0
+"access_stock_production_lot_manager","stock.production.lot manager","model_stock_production_lot","stock.group_stock_manager",1,0,0,0
+"access_stock_production_lot_system","stock.production.lot system","model_stock_production_lot","base.group_system",1,0,0,0
+"access_stock_production_lot_user","stock.production.lot user","model_stock_production_lot","stock.group_stock_user",1,1,1,1
 "access_stock_production_lot_revision","stock.production.lot.revision","model_stock_production_lot_revision","stock.group_stock_user",1,1,1,1
-"access_stock_move","stock.move","model_stock_move","stock.group_stock_user",1,1,1,1
-"access_stock_inventory","stock.inventory","model_stock_inventory","stock.group_stock_user",1,1,1,1
-"access_stock_inventory_line","stock.inventory.line","model_stock_inventory_line","stock.group_stock_user",1,1,1,1
+"access_stock_move_manager","stock.move manager","model_stock_move","stock.group_stock_manager",1,0,0,0
+"access_stock_move_user","stock.move user","model_stock_move","stock.group_stock_user",1,1,1,1
+"access_stock_move_system","stock.move system","model_stock_move","base.group_system",1,0,0,0
+"access_stock_inventory_user","stock.inventory user","model_stock_inventory","stock.group_stock_user",1,1,1,1
+"access_stock_inventory_system","stock.inventory system","model_stock_inventory","base.group_system",1,0,0,0
+"access_stock_inventory_manager","stock.inventory manager","model_stock_inventory","stock.group_stock_manager",1,0,0,0
+"access_stock_inventory_line_user","stock.inventory.line user","model_stock_inventory_line","stock.group_stock_user",1,1,1,1
+"access_stock_inventory_line_manager","stock.inventory.line manager","model_stock_inventory_line","stock.group_stock_manager",1,0,0,0
+"access_stock_inventory_line_system","stock.inventory.line system","model_stock_inventory_line","base.group_system",1,0,0,0
 "access_stock_report_prodlots","stock.report.prodlots","model_stock_report_prodlots","stock.group_stock_manager",1,0,0,0
-"access_stock_location_product_manager","stock.location product manager","model_stock_location","product.group_product_manager",1,1,1,1
-"access_stock_lines_date","report.stock.lines.date all","model_report_stock_lines_date",stock.group_stock_user,1,0,0,0
+"access_stock_location_product_manager","stock.location product manager","model_stock_location","product.group_product_manager",1,0,0,0
+"access_stock_lines_date_user","report.stock.lines.date user","model_report_stock_lines_date","stock.group_stock_user",1,0,0,0
+"access_stock_lines_date_manager","report.stock.lines.date manager","model_report_stock_lines_date","stock.group_stock_manager",1,1,1,1
+"access_stock_lines_date_system","report.stock.lines.date system","model_report_stock_lines_date","base.group_system",1,0,0,0
 "access_stock_report_tracklots","stock.report.tracklots","model_stock_report_tracklots","stock.group_stock_user",1,1,1,1
 "access_report_products_to_received_planned","report.products.to.received.planned","model_report_products_to_received_planned","stock.group_stock_user",1,1,1,1
 "access_report_delivery_products_planned","report.delivery.products.planned","model_report_delivery_products_planned","stock.group_stock_user",1,1,1,1
-"access_report_stock_move","report.stock.move","model_report_stock_move","stock.group_stock_user",1,1,1,1
-"access_report_stock_inventory","report.stock.inventory","model_report_stock_inventory","stock.group_stock_user",1,1,1,1
-"access_report_stock_picking","report.stock.picking","model_report_stock_picking","stock.group_stock_user",1,1,1,1
+"access_report_stock_move_user","report.stock.move user","model_report_stock_move","stock.group_stock_user",1,0,0,0
+"access_report_stock_move_system","report.stock.move system","model_report_stock_move","base.group_system",1,0,0,0
+"access_report_stock_move_manager","report.stock.move manager","model_report_stock_move","stock.group_stock_manager",1,1,1,1
+"access_report_stock_inventory_user","report.stock.inventory user","model_report_stock_inventory","stock.group_stock_user",1,1,1,1
+"access_report_stock_inventory_manager","report.stock.inventory manager","model_report_stock_inventory","stock.group_stock_manager",1,1,1,1
+"access_report_stock_inventory_system","report.stock.inventory system","model_report_stock_inventory","base.group_system",1,0,0,0
+"access_report_stock_picking_user","report.stock.picking user","model_report_stock_picking","stock.group_stock_user",1,1,1,1
+"access_report_stock_picking_manager","report.stock.picking manager","model_report_stock_picking","stock.group_stock_manager",1,1,1,1
+"access_report_stock_picking_system","report.stock.picking system","model_report_stock_picking","base.group_system",1,0,0,0
+"access_stock_warehouse_system","stock.warehouse.system","model_stock_warehouse","base.group_system",1,1,1,1
+"access_stock_location_system","stock.location.system","model_stock_location","base.group_system",1,1,1,1
+"access_stock_journal_system","stock.journal.system","model_stock_journal","base.group_system",1,1,1,1
+"access_product_product_stock","product_product_stock","product.model_product_product","base.group_system",1,0,0,0
+"access_product_template_stock_system","product.template stock system","product.model_product_template","base.group_system",1,0,0,0
+"access_product_product_stock_user","product_product_stock_user","product.model_product_product","stock.group_stock_user",1,1,1,1
+"access_product_template_stock_user","product.template stock user","product.model_product_template","stock.group_stock_user",1,1,1,1
+"access_product_product_stock_manager","product_product_stock_manager","product.model_product_product","stock.group_stock_manager",1,0,0,0
+"access_product_template_stock_manager","product.template stock manager","product.model_product_template","stock.group_stock_manager",1,0,0,0
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 099e32a889b..7280e238e8b 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -3,18 +3,26 @@
 <data noupdate="0">
 
     <record id="group_stock_manager" model="res.groups">
-        <field name="name">Inventory / Manager</field>
+        <field name="name">Warehouse / Manager</field>
     </record>
     <record id="group_stock_user" model="res.groups">
-        <field name="name">Inventory / Worker</field>
+        <field name="name">Warehouse / User</field>
     </record>
 
     <record model='ir.ui.menu' id='menu_stock_root'>
-        <field name="groups_id" eval="[(6,0,[ref('group_stock_manager'),ref('group_stock_user')])]"/>
+        <field name="groups_id" eval="[(6,0,[ref('group_stock_manager'),ref('group_stock_user'),ref('base.group_system')])]"/>
     </record>
 
-    <record model='ir.ui.menu' id='menu_stock_configuration'>
-        <field name="groups_id" eval="[(6,0,[ref('group_stock_manager')])]"/>
+    <record model='ir.ui.menu' id='menu_action_location_tree'>
+        <field name="groups_id" eval="[(6,0,[ref('group_stock_manager'),ref('group_stock_user'),ref('base.group_system')])]"/>
+    </record>
+
+    <record model='ir.ui.menu' id='menu_action_tracking_form'>
+        <field name="groups_id" eval="[(6,0,[ref('group_stock_manager'),ref('group_stock_user'),ref('base.group_system')])]"/>
+    </record>
+
+    <record model='ir.ui.menu' id='menu_action_production_lot_form'>
+        <field name="groups_id" eval="[(6,0,[ref('group_stock_manager'),ref('group_stock_user'),ref('base.group_system')])]"/>
     </record>
 
 <!-- multi -->
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 5b7d46f9c20..9230270feeb 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1583,7 +1583,7 @@ class stock_move(osv.osv):
                     'address_id': picking.address_id.id,
                     'invoice_state': 'none',
                     'date': picking.date,
-                    'sale_id': picking.sale_id.id
+                    'sale_id':' sale_id' in picking._columns.keys() and  picking.sale_id.id or False
                     })
                 for move, (loc, auto, delay, journal, company_id, ptype) in todo:
                     new_id = move_obj.copy(cr, uid, move.id, {
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index 68b324dc9b2..f1adfc33816 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -3,7 +3,7 @@
     <data>
         <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Future Stock Forecast"/>
         <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" rml="stock/report/picking.rml"/>
- 		<report id="report_packing_list" model="stock.picking" name="stock.picking.list2" string="Packing list" rml="stock/report/packing.rml"/>        
+ 		<!--<report id="report_packing_list" model="stock.picking" name="stock.picking.list2" string="Packing list" rml="stock/report/packing.rml"/>-->        
         <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
         <report auto="False"  id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Overview" rml="stock/report/lot_overview.rml" groups="base.group_extended"/>
         <report auto="False" id="report_lot_location" model="stock.location" name="lot.location" rml="stock/report/lot_location.rml" string="Lots by location"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 5980870f89f..772726743be 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -7,8 +7,8 @@
         <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2"/>
         <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
         <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
-        <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15"/>
-        <menuitem id="menu_warehouse_config" name="Warehouse mangement" parent="menu_stock_configuration" sequence="1"/>
+        <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="base.group_system"/>
+        <menuitem id="menu_warehouse_config" name="Warehouse mangement" parent="menu_stock_configuration" sequence="1" groups="base.group_system"/>
         <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
 
         <record id="stock_inventory_line_tree" model="ir.ui.view">
@@ -355,55 +355,6 @@
             </field>
         </record>
 
-        <!--wizard
-            id="action_lot4"
-            model="stock.production.lot"
-            name="stock.traceability.lot.downstream"
-            string="Downstream traceability"/-->
-
-        <!--wizard
-            id="action4"
-            model="stock.tracking"
-            name="stock.traceability.upstream"
-            string="Upstream traceability"/-->
-
-        <!--wizard
-            id="action2"
-            model="stock.tracking"
-            name="stock.traceability.downstream"
-            string="Downstream traceability"/-->
-
-        <!--record id="action3" model="ir.actions.act_window">
-            <field name="name">Downstream traceability</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">stock.move</field>
-            <field name="domain">[('id','in',active_ids)]</field>
-            <field name="view_type">tree</field>
-            <field eval="stock_move_tree2" name="view_id"/>
-        </record>
-        <record id="ir_move_traceability_upstream" model="ir.values">
-            <field eval="'tree_but_action'" name="key2"/>
-            <field eval="'stock.move'" name="model"/>
-            <field name="name">Downstream traceability</field>
-            <field eval="'ir.actions.act_window,'+str(action3)" name="value"/>
-            <field eval="True" name="object"/>
-        </record>
-        <record id="action5" model="ir.actions.act_window">
-            <field name="name">Upstream traceability</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">stock.move</field>
-            <field name="domain">[('id','in',active_ids)]</field>
-            <field name="view_type">tree</field>
-            <field eval="stock_move_tree" name="view_id"/>
-        </record>
-        <record id="ir_move_traceability_downstream" model="ir.values">
-            <field eval="'tree_but_action'" name="key2"/>
-            <field eval="'stock.move'" name="model"/>
-            <field name="name">Upstream traceability</field>
-            <field eval="'ir.actions.act_window,'+str(action5)" name="value"/>
-            <field eval="True" name="object"/>
-        </record-->
-
         <record id="view_location_form" model="ir.ui.view">
             <field name="name">stock.location.form</field>
             <field name="model">stock.location</field>
@@ -415,7 +366,6 @@
                     <newline/>
                     <field name="usage"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <!--<field name="account_id" groups="base.group_extended"/>-->
                     <field name="location_id"/>
                     <field name="address_id" context="{'contact_display':'partner'}"/>
                     <field name="icon" groups="base.group_extended"/>
@@ -485,7 +435,7 @@
             <field name="view_id" ref="view_location_tree2"/>
             <field name="context">{'full':1, 'search_default_in_location':1}</field>
         </record>
-        <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_warehouse_config" />
+        <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_warehouse_config" groups="base.group_system"/>
 
         <record id="view_location_tree" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
@@ -545,7 +495,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_warehouse_tree"/>
         </record>
-        <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_warehouse_config"/>
+        <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_warehouse_config" groups="base.group_system"/>
 
         <record id="stock_picking_move_wizard_form" model="ir.ui.view">
             <field name="name">stock.picking.move.wizard.form</field>
@@ -627,7 +577,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
-                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
+                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines}">
                                 <tree colors="grey:scraped == True" string="Stock Moves">
                                     <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
@@ -1596,7 +1546,7 @@
                             <separator colspan="4" string="Move Information"/>
                             <field name="location_id" widget="selection"/>
                             <field name="location_dest_id" widget="selection"/>
-                            <field colspan="4" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, parent.address_id)"/>
+                            <field colspan="4" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, address_id)"/>
                             <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                             <field name="product_uom" widget="selection"/>
                             <field name="product_uos_qty" groups="product.product_uos"/>
@@ -1653,7 +1603,7 @@
                         <filter icon="terp-go-today" string="Today" domain="[('date_planned','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date_planned','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
-                        <filter icon="terp-check" name="received" string="Done" domain="[('state','=','done'))]"/>
+                        <filter icon="terp-check" name="received" string="Done" domain="[('state','=','done')]"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Order" domain="[('backorder_id','!=',False)]" help="Back Order"/>
                         <separator orientation="vertical"/>
@@ -1962,7 +1912,7 @@
         <menuitem
             action="action_stock_journal_form"
             id="menu_action_stock_journal_form"
-            groups="base.group_extended"
+            groups="base.group_extended,base.group_system"
             parent="menu_warehouse_config" />
 
     </data>
diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index 18d8457a4a3..beb24997fb8 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -49,4 +49,3 @@ This module may be useful for different purposes:
     'certificate': '0046505115101',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_location/security/ir.model.access.csv b/addons/stock_location/security/ir.model.access.csv
index 188218b6e26..9bfee8edb8b 100644
--- a/addons/stock_location/security/ir.model.access.csv
+++ b/addons/stock_location/security/ir.model.access.csv
@@ -5,3 +5,4 @@
 "access_stock_location_path_user","stock location path user","model_stock_location_path","stock.group_stock_user",1,0,0,0
 "access_stock_location_path_manager","stock location path manager","model_stock_location_path","stock.group_stock_manager",1,1,1,1
 "access_stock_location_path_partner_manager","stock.location.path partner manager","model_stock_location_path","product.group_product_manager",1,1,1,1
+"access_stock_location_path_purchase_user","stock.location.path purchase user","model_stock_location_path","purchase.group_purchase_user",1,1,1,1
diff --git a/addons/stock_planning/security/ir.model.access.csv b/addons/stock_planning/security/ir.model.access.csv
index a174dbb5e41..d4d543e25c4 100644
--- a/addons/stock_planning/security/ir.model.access.csv
+++ b/addons/stock_planning/security/ir.model.access.csv
@@ -1,4 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_stock_planning","stock.planning","model_stock_planning","stock.group_stock_user",1,1,1,1
-"access_stock_period","stock.period","model_stock_period","stock.group_stock_user",1,1,1,1
-"access_stock_sale_forecast","stock.sale.forecast","model_stock_sale_forecast","stock.group_stock_user",1,1,1,1
+"access_stock_planning_system","stock.planning system","model_stock_planning","base.group_system",1,0,0,0
+"access_stock_planning_manager","stock.planning manager","model_stock_planning","stock.group_stock_manager",1,0,0,0
+"access_stock_planning_user","stock.planning user","model_stock_planning","stock.group_stock_user",1,1,1,1
+"access_stock_period_","stock.period","model_stock_period","base.group_system",1,1,1,1
+"access_stock_sale_forecast_user","stock.sale.forecast user","model_stock_sale_forecast","base.group_sale_salesman",1,1,1,1
+"access_stock_sale_forecast_manager","stock.sale.forecast manager","model_stock_sale_forecast","base.group_sale_manager",1,0,0,0
+"access_stock_sale_forecast_system","stock.sale.forecast system","model_stock_sale_forecast","base.group_system",1,0,0,0
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index b4ea1da0f5a..9b8b6afd506 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -3,7 +3,7 @@
     <data>
         <menuitem id="menu_stock_period_main"
                   name="Stock and Sales Periods"
-                  parent="base.menu_base_config" sequence="20"/>
+                  parent="base.menu_base_config" groups="base.group_system" sequence="20"/>
 
         <!-- Periods tree and form section -->
 
diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py
index d85a943f9bf..44d2edb503c 100644
--- a/addons/subscription/__openerp__.py
+++ b/addons/subscription/__openerp__.py
@@ -28,7 +28,7 @@
     'author': 'OpenERP SA',
     'depends': ['base'],
     'init_xml': [],
-    'update_xml': ['security/ir.model.access.csv', 'subscription_view.xml'],
+    'update_xml': ['security/subcription_security.xml', 'security/ir.model.access.csv', 'subscription_view.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/subscription/security/ir.model.access.csv b/addons/subscription/security/ir.model.access.csv
index 6748e4e8280..33ab0881c52 100644
--- a/addons/subscription/security/ir.model.access.csv
+++ b/addons/subscription/security/ir.model.access.csv
@@ -3,3 +3,8 @@ access_subscription_document,subscription.document,model_subscription_document,b
 access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_system,1,1,1,1
 access_subscription_subscription,subscription.subscription,model_subscription_subscription,base.group_user,1,1,1,1
 access_subscription_subscription_history,subscription.subscription.history,model_subscription_subscription_history,base.group_user,1,1,1,1
+access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_survey_user,1,1,1,1
+access_subscription_subscription_manager,subscription.subscription manager,model_subscription_subscription,base.group_survey_manager,1,0,0,0
+access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_survey_user,1,1,1,1
+access_subscription_subscription_system,subscription.subscription system,model_subscription_subscription,base.group_system,1,0,0,0
+access_subscription_document_user,subscription.document user,model_subscription_document,base.group_survey_user,1,1,1,1
diff --git a/addons/subscription/security/subcription_security.xml b/addons/subscription/security/subcription_security.xml
new file mode 100644
index 00000000000..86f0e2c6069
--- /dev/null
+++ b/addons/subscription/security/subcription_security.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+
+   	<record model="res.groups" id="base.group_survey_manager">
+        	<field name="name">Tools / Manager</field>
+   		</record>
+   	<record model="res.groups" id="base.group_survey_user">
+        	<field name="name">Tools / User</field>
+   	</record>
+
+</data>
+</openerp>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index b66fc808420..3ea4396c7d9 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -193,7 +193,7 @@
             <field name="search_view_id" ref="view_subscription_document_filter" />
         </record>
         <menuitem name="Configuration" parent="base.menu_tools"
-              id="base.menu_lunch_survey_root" sequence="20" />
+              id="base.menu_lunch_survey_root" sequence="20" groups="base.group_system" />
         <menuitem id="config_recuuring_event" name="Recurring Events" parent="base.menu_lunch_survey_root" sequence="4"/>
         <menuitem action="action_document_form" id="menu_action_document_form" parent="config_recuuring_event"/>
     </data>
diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index 3d1cb78230f..853370132de 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -36,8 +36,9 @@
                    'survey_data.xml',
                    'wizard/survey_selection.xml',
                    'wizard/survey_answer.xml',
-                   'survey_view.xml',
+                   'security/survey_security.xml',
                    'security/ir.model.access.csv',
+                   'survey_view.xml',
                    'wizard/survey_print_statistics.xml',
                    'wizard/survey_print_answer.xml',
                    'wizard/survey_browse_answer.xml',
diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index 7b925ea1b53..9944a84996d 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -1,24 +1,45 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_survey_type","survey.type","model_survey_type","group_survey_manager",1,1,1,1
-"access_survey_type","survey.type","model_survey_type","group_survey_user",1,1,1,1
-"access_survey_manager","survey","model_survey","group_survey_manager",1,1,1,1
-"access_survey_user","survey","model_survey","group_survey_user",1,1,0,0
-"access_survey_page_manager","survey.page","model_survey_page","group_survey_manager",1,1,1,1
-"access_survey_page_user","survey.page","model_survey_page","group_survey_user",1,0,0,0
-"access_survey_question_manager","survey.question","model_survey_question","group_survey_manager",1,1,1,1
-"access_survey_question_user","survey.question","model_survey_question","group_survey_user",1,0,0,0
-"access_survey_answer_manager","survey.answer","model_survey_answer","group_survey_manager",1,1,1,1
-"access_survey_answer_user","survey.answer","model_survey_answer","group_survey_user",1,0,0,0
-"access_survey_response_manager","survey.response","model_survey_response","group_survey_manager",1,1,1,1
-"access_survey_response_user","survey.response","model_survey_response","group_survey_user",1,1,1,1
-"access_survey_response_answer_manager","survey.response.answer","model_survey_response_answer","group_survey_manager",1,1,1,1
-"access_survey_response_answer_user","survey.response.answer","model_survey_response_answer","group_survey_user",1,1,1,1
-"access_survey_history","survey.history","model_survey_history","group_survey_user",1,1,1,0
-"access_survey_question_column_heading","survey.question.column.heading","model_survey_question_column_heading","group_survey_manager",1,1,1,1
-"access_survey_question_column_heading","survey.question.column.heading","model_survey_question_column_heading","group_survey_user",1,0,0,0
-"access_survey_request","survey.request","model_survey_request","group_survey_manager",1,1,1,1
-"access_survey_request","survey.request","model_survey_request","group_survey_user",1,0,0,0
-"access_survey_tbl_column_heading","survey.tbl.column.heading","model_survey_tbl_column_heading","group_survey_manager",1,1,1,1
-"access_survey_tbl_column_heading","survey.tbl.column.heading","model_survey_tbl_column_heading","group_survey_user",1,1,1,1
-"access_survey_response_line","survey.response.line","model_survey_response_line","group_survey_manager",1,1,1,1
-"access_survey_response_line","survey.response.line","model_survey_response_line","group_survey_user",1,1,1,1
+"access_survey_type_manager","survey.type manager","model_survey_type","base.group_survey_manager",1,1,1,1
+"access_survey_type_user","survey.type user","model_survey_type","base.group_survey_user",1,1,1,1
+"access_survey_manager","survey","model_survey","base.group_survey_manager",1,0,0,0
+"access_survey_system","survey","model_survey","base.group_system",1,0,0,0
+"access_survey_user","survey","model_survey","base.group_survey_user",1,1,1,1
+"access_survey_page_manager","survey.page manager","model_survey_page","base.group_survey_manager",1,0,0,0
+"access_survey_page_system","survey.page system","model_survey_page","base.group_system",1,0,0,0
+"access_survey_page_user","survey.page user","model_survey_page","base.group_survey_user",1,1,1,1
+"access_survey_question_manager","survey.question manager","model_survey_question","base.group_survey_manager",1,1,1,1
+"access_survey_question_user","survey.question user","model_survey_question","base.group_survey_user",1,1,1,1
+"access_survey_answer_manager","survey.answer manager","model_survey_answer","base.group_survey_manager",1,1,1,1
+"access_survey_answer_user","survey.answer user","model_survey_answer","base.group_survey_user",1,1,1,1
+"access_survey_response_manager","survey.response manager","model_survey_response","base.group_survey_manager",1,1,1,1
+"access_survey_response_user","survey.response user","model_survey_response","base.group_survey_user",1,1,1,1
+"access_survey_response_answer_manager","survey.response.answer manager","model_survey_response_answer","base.group_survey_manager",1,1,1,1
+"access_survey_response_answer_user","survey.response.answer user","model_survey_response_answer","base.group_survey_user",1,1,1,1
+"access_survey_history_user","survey.history.user","model_survey_history","base.group_survey_user",1,1,1,1
+"access_survey_question_column_heading_manager","survey.question.column.heading manager","model_survey_question_column_heading","base.group_survey_manager",1,1,1,1
+"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_survey_user",1,0,0,0
+"access_survey_request_manager","survey.request manager","model_survey_request","base.group_survey_manager",1,0,0,0
+"access_survey_request_user","survey.request user","model_survey_request","base.group_survey_user",1,1,1,1
+"access_survey_request_system","survey.request system","model_survey_request","base.group_system",1,0,0,0
+"access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_survey_manager",1,1,1,1
+"access_survey_tbl_column_heading_user","survey.tbl.column.heading user","model_survey_tbl_column_heading","base.group_survey_user",1,1,1,1
+"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_survey_manager",1,1,1,1
+"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_survey_user",1,1,1,1
+"access_survey_type","survey.type","model_survey_type","base.group_hr_manager",1,1,1,1
+"access_survey","survey","model_survey","base.group_hr_manager",1,1,1,1
+"access_survey_history_manager","survey.history","model_survey_history","base.group_hr_manager",1,1,1,1
+"access_survey_page","survey.page","model_survey_page","base.group_hr_manager",1,1,1,1
+"access_survey_question","survey.question","model_survey_question","base.group_hr_manager",1,1,1,1
+"access_survey_question_column_heading","survey.question.column.heading","model_survey_question_column_heading","base.group_hr_manager",1,1,1,1
+"access_survey_answer","survey.answer","model_survey_answer","base.group_hr_manager",1,1,1,1
+"access_survey_response","survey.response","model_survey_response","base.group_hr_manager",1,1,1,1
+"access_survey_response_line","survey.response.line","model_survey_response_line","base.group_hr_manager",1,1,1,1
+"access_survey_tbl_column_heading","survey.tbl.column.heading","model_survey_tbl_column_heading","base.group_hr_manager",1,1,1,1
+"access_survey_response_answer","survey.response.answer","model_survey_response_answer","base.group_hr_manager",1,1,1,1
+"access_survey_res_users","res.users","base.model_res_users","base.group_hr_manager",1,1,1,1
+"access_survey_request","survey.request","model_survey_request","base.group_hr_manager",1,1,1,1
+"access_survey_history_survey_manager","survey.history manager","model_survey_history","base.group_survey_manager",1,0,0,0
+"access_survey_type_system","survey.type system","model_survey_type","base.group_system",1,0,0,0
+"access_survey_question_system","survey.question system","model_survey_question","base.group_system",1,0,0,0
+"access_survey_history_system","survey.history.system","model_survey_history","base.group_system",1,0,0,0
+"access_survey_answer_system","survey.answer system","model_survey_answer","base.group_system",1,0,0,0
diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml
new file mode 100644
index 00000000000..8c50d72496c
--- /dev/null
+++ b/addons/survey/security/survey_security.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+
+    <record id="base.group_sale_salesman" model="res.groups">
+        <field name="name">Sales / User</field>
+    </record>
+    <record id="base.group_hr_manager" model="res.groups">
+        <field name="name">Human Resources / Manager</field>
+    </record>
+    <record id="base.group_hr_user" model="res.groups">
+        <field name="name">Human Resources / User</field>
+    </record>
+   	<record model="res.groups" id="base.group_survey_manager">
+        	<field name="name">Tools / Manager</field>
+   		</record>
+   	<record model="res.groups" id="base.group_survey_user">
+        	<field name="name">Tools / User</field>
+   	</record>
+
+</data>
+</openerp>
diff --git a/addons/survey/survey_data.xml b/addons/survey/survey_data.xml
index e58448b3a81..dfc63a51294 100644
--- a/addons/survey/survey_data.xml
+++ b/addons/survey/survey_data.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
-   	    <record model="res.groups" id="group_survey_manager">
-        	<field name="name">Survey / Manager</field>
-   		</record>
-   	    <record model="res.groups" id="group_survey_user">
-        	<field name="name">Survey / User</field>
-   		</record>
+<!--   	    <record model="res.groups" id="base.group_survey_manager">-->
+<!--        	<field name="name">Tools / Manager</field>-->
+<!--   		</record>-->
+<!--   	    <record model="res.groups" id="base.group_survey_user">-->
+<!--        	<field name="name">Tools / User</field>-->
+<!--   		</record>-->
    	</data>
 </openerp>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 2da132de509..32070672cbf 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -4,13 +4,13 @@
 
             <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"/>
             <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools"
-                        groups="group_survey_manager,group_survey_user" sequence="2"/>
+                        groups="base.group_survey_manager,base.group_survey_user,base.group_system" sequence="2"/>
             <menuitem name="Define Surveys" id="menu_define_survey"
-                 groups="group_survey_manager"
+                 groups="base.group_survey_manager,base.group_survey_user,base.group_system"
                  parent="menu_surveys" />
-            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="group_survey_manager,group_survey_user"/>
+            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_survey_manager,base.group_survey_user,base.group_system"/>
             <menuitem name="Reporting" parent="base.menu_tools"
-                id="base.menu_lunch_reporting" groups="group_survey_manager" sequence="6"/>
+                id="base.menu_lunch_reporting" groups="base.group_survey_manager" sequence="6"/>
             <menuitem name="Surveys" id="menu_reporting" parent="base.menu_lunch_reporting" sequence="2"/>
         <!--
             Survey
@@ -291,7 +291,7 @@
 
         <menuitem name="Surveys" id="menu_survey_form"
             action="action_survey_form1" parent="menu_define_survey"
-            groups="group_survey_manager"/>
+            groups="base.group_survey_manager,base.group_survey_user,base.group_system"/>
 
         <!--
             Survey Pages
@@ -491,7 +491,7 @@
 
         <menuitem name="Pages" id="menu_survey_page_form1"
             action="action_survey_page_form" parent='menu_define_survey'
-            groups="group_survey_manager"/>
+            groups="base.group_survey_manager,base.group_survey_user,base.group_system"/>
 
         <record model="ir.ui.view" id="survey_page_wizard_test1">
             <field name="name">survey_page_wizard_test</field>
@@ -1116,7 +1116,7 @@
 
         <menuitem name="Survey Requests" id="menu_survey_type_form1"
             action="action_survey_request_tree" parent='menu_answer_surveys'
-            groups="group_survey_manager"/>
+            groups="base.group_survey_manager,base.group_survey_user,base.group_system"/>
 
         <!--
             Survey Type
@@ -1191,7 +1191,7 @@
 
         <menuitem name="Answer a Survey" id="menu_run_survey_form" sequence="2"
             action="action_view_survey_name" parent="menu_answer_surveys"
-            groups="group_survey_manager,group_survey_user" icon="STOCK_INDEX"/>
+            groups="base.group_survey_manager,base.group_survey_user,base.group_system" icon="STOCK_INDEX"/>
 
     </data>
 </openerp>
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index f08d4d7185b..1a0da339483 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -35,7 +35,7 @@
 
 		<menuitem name="Browse Answers" id="menu_browse_survey_response"
 			action="action_browse_survey_response" parent="menu_reporting"
-			groups="group_survey_manager" icon="STOCK_PRINT_PREVIEW"/>
+			groups="base.group_survey_manager" icon="STOCK_PRINT_PREVIEW"/>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/survey/wizard/survey_print.xml b/addons/survey/wizard/survey_print.xml
index 8f8793e6b1e..719eaa309e8 100644
--- a/addons/survey/wizard/survey_print.xml
+++ b/addons/survey/wizard/survey_print.xml
@@ -37,7 +37,7 @@
 
         <menuitem name="Surveys" id="menu_print_survey_form" sequence="1"
             action="action_view_survey_print" parent="menu_reporting"
-            groups="group_survey_manager" icon="STOCK_PRINT"/>
+            groups="base.group_survey_manager" icon="STOCK_PRINT"/>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/survey/wizard/survey_print_answer.xml b/addons/survey/wizard/survey_print_answer.xml
index 1e34fc1029f..e7a05dff6c4 100644
--- a/addons/survey/wizard/survey_print_answer.xml
+++ b/addons/survey/wizard/survey_print_answer.xml
@@ -37,7 +37,7 @@
 		</record>
 
 		<menuitem name="Surveys Answers" action="action_view_survey_print_answer" id="menu_print_survey_answer"
-			parent="menu_reporting" icon="STOCK_PRINT" groups="group_survey_manager"/>
+			parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_survey_manager"/>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/survey/wizard/survey_print_statistics.xml b/addons/survey/wizard/survey_print_statistics.xml
index 5659b82e896..abb11336b90 100644
--- a/addons/survey/wizard/survey_print_statistics.xml
+++ b/addons/survey/wizard/survey_print_statistics.xml
@@ -31,7 +31,7 @@
 		</record>
 
 		<menuitem name="Surveys Statistics" action="action_view_survey_print_statistics" id="menu_print_survey_statistics"
-			parent="menu_reporting" icon="STOCK_PRINT" groups="group_survey_manager"/>
+			parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_survey_manager"/>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py
index bccd2fc5c3f..72f227ddcd7 100644
--- a/addons/wiki/__openerp__.py
+++ b/addons/wiki/__openerp__.py
@@ -41,6 +41,7 @@ keep track for the wiki groups, pages, and history
         'wiki_view.xml',
         'data/wiki_quickstart.xml',
         'data/wiki_main.xml',
+        'security/wiki_security.xml',
         'security/ir.model.access.csv'
     ],
     'demo_xml': [],
diff --git a/addons/wiki/security/ir.model.access.csv b/addons/wiki/security/ir.model.access.csv
index a54122e0231..96545498ffc 100644
--- a/addons/wiki/security/ir.model.access.csv
+++ b/addons/wiki/security/ir.model.access.csv
@@ -4,3 +4,5 @@
 "wiki_wiki","wiki.wiki","model_wiki_wiki","base.group_user",1,1,1,1
 "wiki_groups","wiki.groups","model_wiki_groups","base.group_system",1,1,1,1
 "wiki_wiki_history","wiki.wiki.history","model_wiki_wiki_history","base.group_user",1,0,1,0
+"access_wiki_wiki_sale_manager","wiki.wiki.manager","model_wiki_wiki","base.group_sale_manager",1,1,1,1
+"wiki_wiki_user","wiki.wiki user","model_wiki_wiki","base.group_document_user",1,1,1,1
diff --git a/addons/wiki/security/wiki_security.xml b/addons/wiki/security/wiki_security.xml
new file mode 100644
index 00000000000..934d7a607ee
--- /dev/null
+++ b/addons/wiki/security/wiki_security.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+
+    <record id="base.group_sale_manager" model="res.groups">
+        <field name="name">Sales / Manager</field>
+    </record>
+    <record id="base.group_sale_salesman" model="res.groups">
+        <field name="name">Sales / User</field>
+    </record>
+    <record id="base.group_document_user" model="res.groups">
+        <field name="name">Knowledge / User</field>
+    </record>
+
+</data>
+</openerp>
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 6e6d608855a..d21b8f9e9cd 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -6,7 +6,7 @@
 
        <menuitem name="Configuration"
            id="knowledge.menu_document_configuration"
-           parent="knowledge.menu_document" sequence="50" />
+           parent="knowledge.menu_document" sequence="50" groups="base.group_system" />
 
        <menuitem name="Wiki" id="menu_wiki_configuration"
            parent="knowledge.menu_document_configuration" sequence="2" />