From 430cfa76f55167ec376ea886095fe3d20f484547 Mon Sep 17 00:00:00 2001 From: Kevin Baptiste Date: Mon, 27 Apr 2020 06:50:59 +0000 Subject: [PATCH] [IMP] project: hide Archive button on delete wizard ... when all the projects are already archived. closes odoo/odoo#48728 Taskid: 2228556 Signed-off-by: Yannick Tivisse (yti) --- addons/project/wizard/project_delete_wizard.py | 8 ++++++-- addons/project/wizard/project_delete_wizard_views.xml | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/addons/project/wizard/project_delete_wizard.py b/addons/project/wizard/project_delete_wizard.py index 3dcc512a843..7289de88687 100644 --- a/addons/project/wizard/project_delete_wizard.py +++ b/addons/project/wizard/project_delete_wizard.py @@ -10,6 +10,11 @@ class ProjectDelete(models.TransientModel): project_ids = fields.Many2many('project.project', string='Projects') task_count = fields.Integer(compute='_compute_task_count') + projects_archived = fields.Boolean(compute='_compute_projects_archived') + + def _compute_projects_archived(self): + for wizard in self.with_context(active_test=False): + wizard.projects_archived = all([not p.active for p in wizard.project_ids]) def _compute_task_count(self): for wizard in self: @@ -17,8 +22,7 @@ class ProjectDelete(models.TransientModel): def action_archive(self): self.project_ids.write({'active': False}) - return self.env.ref('project.open_view_project_all').read()[0] def confirm_delete(self): self.with_context(active_test=False).project_ids.unlink() - return self.env.ref('project.open_view_project_all').read()[0] + return self.env.ref('project.open_view_project_all_config').read()[0] diff --git a/addons/project/wizard/project_delete_wizard_views.xml b/addons/project/wizard/project_delete_wizard_views.xml index 5947b26ab60..34e1d15bc03 100644 --- a/addons/project/wizard/project_delete_wizard_views.xml +++ b/addons/project/wizard/project_delete_wizard_views.xml @@ -7,6 +7,7 @@
+ You cannot delete a project containing tasks. You can either archive it or first delete all of its tasks. @@ -14,7 +15,7 @@ Are you sure you want to delete this project ?
-