diff --git a/addons/hr_timesheet/views/project_views.xml b/addons/hr_timesheet/views/project_views.xml index 738e10145f8..c8a061b5ad0 100644 --- a/addons/hr_timesheet/views/project_views.xml +++ b/addons/hr_timesheet/views/project_views.xml @@ -175,6 +175,9 @@ + + record.analytic_account_id.raw_value and !record.allow_timesheets.raw_value + diff --git a/addons/project/models/project.py b/addons/project/models/project.py index b615467e909..679a63930f2 100644 --- a/addons/project/models/project.py +++ b/addons/project/models/project.py @@ -376,6 +376,13 @@ class Project(models.Model): action = self.env['ir.actions.act_window'].for_xml_id('project', 'act_project_project_2_project_task_all') return dict(action, context=ctx) + def action_view_account_analytic_line(self): + """ return the action to see all the analytic lines of the project's analytic account """ + action = self.env.ref('analytic.account_analytic_line_action').read()[0] + action['context'] = {'default_account_id': self.analytic_account_id.id} + action['domain'] = [('account_id', '=', self.analytic_account_id.id)] + return action + @api.multi def action_view_all_rating(self): """ return the action to see all the rating of the project, and activate default filters """ diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml index 9b8840ce0b6..da0d1921500 100644 --- a/addons/project/views/project_views.xml +++ b/addons/project/views/project_views.xml @@ -304,6 +304,7 @@ +
@@ -360,6 +361,11 @@
+ +
+ Profitability +
+