diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index cb0117d1975..56e75a3c036 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -151,33 +151,3 @@
"access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1
"access_report_account_receivable_user","report.account.receivable.user","model_report_account_receivable","account.group_account_user",1,1,1,1
"access_account_sequence_fiscal_year_invoice","account.sequence.fiscalyear invoice","model_account_sequence_fiscalyear","account.group_account_invoice",1,1,1,1
-"access_account_invoice","account.invoice","model_account_invoice","project.group_project_finance_user",1,1,0,0
-"access_account_bank_statement","account.bank.statement","model_account_bank_statement","project.group_project_finance_user",1,1,0,0
-"access_account_move_line","account.move.line","model_account_move_line","project.group_project_finance_user",1,1,0,0
-"access_account_move","account.move","model_account_move","project.group_project_finance_user",1,1,0,0
-"access_account_analytic_line","account.analytic.line","model_account_analytic_line","project.group_project_finance_user",1,1,0,0
-"access_account_move_line","account.move.line","model_account_move_line","project.group_project_finance_user",1,1,0,0
-"access_account_subscription","account.subscription","model_account_subscription","project.group_project_finance_user",1,1,0,0
-"access_account_period","account.period","model_account_period","project.group_project_finance_user",1,1,0,0
-"access_account_analytic_journal","account.analytic.journal","model_account_analytic_journal","project.group_project_finance_user",1,1,0,0
-"access_account_invoice_report","account.invoice.report","model_account_invoice_report","project.group_project_finance_user",1,1,0,0
-"access_account_entries_report","account.entries.report","model_account_entries_report","project.group_project_finance_user",1,1,0,0
-"access_analytic_entries_report","analytic.entries.report","model_analytic_entries_report","project.group_project_finance_user",1,1,0,0
-"access_account_journal_view","account.journal.view","model_account_journal_view","project.group_project_finance_user",1,1,0,0
-"access_account_account_type","account.account.type","model_account_account_type","project.group_project_finance_user",1,1,0,0
-"access_account_tax_code","account.tax.code","model_account_tax_code","project.group_project_finance_user",1,1,0,0
-"access_account_fiscalyear","account.fiscalyear","model_account_fiscalyear","project.group_project_finance_user",1,1,0,0
-"access_account_account","account.account","model_account_account","project.group_project_finance_user",1,1,0,0
-"access_account_journal","account.journal","model_account_journal","project.group_project_finance_user",1,1,0,0
-"access_account_tax","account.tax","model_account_tax","project.group_project_finance_user",1,1,0,0
-"access_account_fiscal_position","account.fiscal.position","model_account_fiscal_position","project.group_project_finance_user",1,1,0,0
-"access_account_chart_template","account.chart.template","model_account_chart_template","project.group_project_finance_user",1,1,0,0
-"access_account_account_template","account.account.template","model_account_account_template","project.group_project_finance_user",1,1,0,0
-"access_account_tax_template","account.tax.template","model_account_tax_template","project.group_project_finance_user",1,1,0,0
-"access_account_tax_code_template","account.tax.code.template","model_account_tax_code_template","project.group_project_finance_user",1,1,0,0
-"access_account_fiscal_position_template","account.fiscal.position.template","model_account_fiscal_position_template","project.group_project_finance_user",1,1,0,0
-"access_account_analytic_journal","account.analytic.journal","model_account_analytic_journal","project.group_project_finance_user",1,1,0,0
-"access_account_model","account.model","model_account_model","project.group_project_finance_user",1,1,0,0
-"access_account_payment_term","account.payment.term","model_account_payment_term","project.group_project_finance_user",1,1,0,0
-"access_res_currency","res.currency","base.model_res_currency","project.group_project_finance_user",1,1,0,0
-"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","project.group_project_finance_user",1,1,0,0
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 78018a4031b..64580ea42ff 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -20,6 +20,7 @@
['|',('user_id','=',user.id),('user_id','=',False)]
+
All Leads
@@ -34,6 +35,6 @@
-
+
diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml
index c740114789a..d183f7370dc 100644
--- a/addons/hr/board_hr_view.xml
+++ b/addons/hr/board_hr_view.xml
@@ -32,6 +32,8 @@
menu
-
+
+
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 96d8483160f..78582fd9c74 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -323,8 +323,8 @@
-
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index 03532d70f73..8051d9cd4c3 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -7,4 +7,4 @@
"access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
"access_hr_analytic_timesheet_system_user","hr.analytic.timesheet.system.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
"access_hr_timesheet_sheet_sheet_day","hr.timesheet.sheet.sheet.day.user","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0
-"access_model_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","project.group_project_finance_user",1,1,0,0
+"access_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","project.group_project_finance_user",1,1,0,0
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6b801aac440..cda4109c32e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -548,6 +548,7 @@
+
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 82257b557f2..f0074ad885c 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -5,7 +5,7 @@
"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",0,0,0,0
"access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,0
"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
@@ -38,6 +38,5 @@
"access_project_vs_hours_project_financial_user","project.vs.hours.project.financial.user","model_project_vs_hours","group_project_finance_user",1,0,0,0
"access_project_project","project.project","model_project_project","group_project_finance_user",1,0,0,0
"access_project_task","project.task","model_project_task","group_project_finance_user",1,0,0,0
-"access_account_analytic_line","account.analytic.line","account.model_account_analytic_line","group_project_finance_user",1,0,0,0
"access_report_project_task_user","report.project.task.user","model_report_project_task_user","group_project_finance_user",1,0,0,0
"access_project_task_type","project.task.type","model_project_task_type","group_project_finance_user",1,0,0,0
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 82479947e2e..a4b12db853d 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -48,18 +48,20 @@
- Projects According to User
+ Projects According to User or Members
- [('members','in',[user.id])]
+ ['|',('members','in',[user.id]),('user_id','=',user.id)]
- Projects According to Members
+ Projects According to Members or Users
+
+
- [('members','in',[user.id])]
+ ['|',('members','in',[user.id]),('user_id','=',user.id)]
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index ff8bf0801f1..2351869e003 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -126,7 +126,7 @@
-
+
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index c4315743630..298aa857716 100755
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -27,3 +27,5 @@
"access_project_issue_version","project.issue.version","model_project_issue_version","project.group_project_finance_user",1,0,0,0
"access_crm_case_categ","crm.case.categ","crm.model_crm_case_categ","project.group_project_finance_user",1,0,0,0
"access_resource_calendar","resource.calendar","resource.model_resource_calendar","project.group_project_finance_user",1,0,0,0
+"access_resource_resource","resource.resource","resource.model_resource_resource","project.group_project_manager",1,1,1,1
+"access_resource_resource","resource.resource","resource.model_resource_resource","project.group_project_user",1,0,0,0
diff --git a/addons/project_issue/security/project_issue_security.xml b/addons/project_issue/security/project_issue_security.xml
index a73eca5a43c..504767a1ef5 100644
--- a/addons/project_issue/security/project_issue_security.xml
+++ b/addons/project_issue/security/project_issue_security.xml
@@ -4,15 +4,15 @@
Project / Support Manager
-
+
- Issues according to Users
+ Issues according to Users or Members
- [('project_id.members','in',[user.id])]
+ ['|',('members','in',[user.id]),('user_id','=',user.id)]
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 61834abbe66..65cd4ff2690 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -33,7 +33,9 @@
+ parent="base.menu_main_pm" sequence="5"
+ groups="project.group_project_finance_user"/>
+
diff --git a/addons/project_timesheet/security/ir.model.access.csv b/addons/project_timesheet/security/ir.model.access.csv
index 3bc7efae8c5..aebf7a54c27 100644
--- a/addons/project_timesheet/security/ir.model.access.csv
+++ b/addons/project_timesheet/security/ir.model.access.csv
@@ -7,3 +7,33 @@
"access_project_timesheet_project_financial_user","hr_timesheet_sheet.sheet.project.financial.user","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_finance_user",1,1,1,0
"access_report_timesheet_task_user_financial_user","report.timesheet.task.user.financial.user","model_report_timesheet_task_user","project.group_project_finance_user",1,0,0,0
"access_hr_analytic_timesheet","hr.analytic.timesheet","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_finance_user",1,1,0,0
+"access_account_invoice","account.invoice","account.model_account_invoice","project.group_project_finance_user",1,1,0,0
+"access_account_bank_statement","account.bank.statement","account.model_account_bank_statement","project.group_project_finance_user",1,1,0,0
+"access_account_move_line","account.move.line","account.model_account_move_line","project.group_project_finance_user",1,1,0,0
+"access_account_move","account.move","account.model_account_move","project.group_project_finance_user",1,1,0,0
+"access_account_analytic_line","account.analytic.line","account.model_account_analytic_line","project.group_project_finance_user",1,1,0,0
+"access_account_move_line","account.move.line","account.model_account_move_line","project.group_project_finance_user",1,1,0,0
+"access_account_subscription","account.subscription","account.model_account_subscription","project.group_project_finance_user",1,1,0,0
+"access_account_period","account.period","account.model_account_period","project.group_project_finance_user",1,1,0,0
+"access_account_analytic_journal","account.analytic.journal","account.model_account_analytic_journal","project.group_project_finance_user",1,1,0,0
+"access_account_invoice_report","account.invoice.report","account.model_account_invoice_report","project.group_project_finance_user",1,1,0,0
+"access_account_entries_report","account.entries.report","account.model_account_entries_report","project.group_project_finance_user",1,1,0,0
+"access_analytic_entries_report","analytic.entries.report","account.model_analytic_entries_report","project.group_project_finance_user",1,1,0,0
+"access_account_journal_view","account.journal.view","account.model_account_journal_view","project.group_project_finance_user",1,1,0,0
+"access_account_account_type","account.account.type","account.model_account_account_type","project.group_project_finance_user",1,1,0,0
+"access_account_tax_code","account.tax.code","account.model_account_tax_code","project.group_project_finance_user",1,1,0,0
+"access_account_fiscalyear","account.fiscalyear","account.model_account_fiscalyear","project.group_project_finance_user",1,1,0,0
+"access_account_account","account.account","account.model_account_account","project.group_project_finance_user",1,1,0,0
+"access_account_journal","account.journal","account.model_account_journal","project.group_project_finance_user",1,1,0,0
+"access_account_tax","account.tax","account.model_account_tax","project.group_project_finance_user",1,1,0,0
+"access_account_fiscal_position","account.fiscal.position","account.model_account_fiscal_position","project.group_project_finance_user",1,1,0,0
+"access_account_chart_template","account.chart.template","account.model_account_chart_template","project.group_project_finance_user",1,1,0,0
+"access_account_account_template","account.account.template","account.model_account_account_template","project.group_project_finance_user",1,1,0,0
+"access_account_tax_template","account.tax.template","account.model_account_tax_template","project.group_project_finance_user",1,1,0,0
+"access_account_tax_code_template","account.tax.code.template","account.model_account_tax_code_template","project.group_project_finance_user",1,1,0,0
+"access_account_fiscal_position_template","account.fiscal.position.template","account.model_account_fiscal_position_template","project.group_project_finance_user",1,1,0,0
+"access_account_analytic_journal","account.analytic.journal","account.model_account_analytic_journal","project.group_project_finance_user",1,1,0,0
+"access_account_model","account.model","account.model_account_model","project.group_project_finance_user",1,1,0,0
+"access_account_payment_term","account.payment.term","account.model_account_payment_term","project.group_project_finance_user",1,1,0,0
+"access_res_currency","res.currency","base.model_res_currency","project.group_project_finance_user",1,1,0,0
+"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","project.group_project_finance_user",1,1,0,0