diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-09-26 19:37:29 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-09-26 19:37:29 +0200 |
| commit | 5f08d82bcd7fa0eaed7c0b0f35c7221c5e0b657a (patch) | |
| tree | 1d1be253f568f18ffd0f7b2bd67577b77afaa3bd /addons/project | |
| parent | 7b13888c8e258a05a8044b7566b949071a911eab (diff) | |
| parent | fd122aec52166a2d19fe80579dbf9c98c6ab41fa (diff) | |
[MERGE] forward port branch 11.0 up to fd122aec521
Diffstat (limited to 'addons/project')
| -rw-r--r-- | addons/project/models/project.py | 5 | ||||
| -rw-r--r-- | addons/project/views/project_views.xml | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/addons/project/models/project.py b/addons/project/models/project.py index abfee026479..896e972f6d5 100644 --- a/addons/project/models/project.py +++ b/addons/project/models/project.py @@ -271,7 +271,9 @@ class Project(models.Model): def map_tasks(self, new_project_id): """ copy and map tasks from old to new project """ tasks = self.env['project.task'] - for task in self.tasks: + # We want to copy archived task, but do not propagate an active_test context key + task_ids = self.env['project.task'].with_context(active_test=False).search([('project_id', '=', self.id)]).ids + for task in self.env['project.task'].browse(task_ids): # preserve task name and stage, normally altered during copy defaults = {'stage_id': task.stage_id.id, 'name': task.name} @@ -283,7 +285,6 @@ class Project(models.Model): def copy(self, default=None): if default is None: default = {} - self = self.with_context(active_test=False) if not default.get('name'): default['name'] = _("%s (copy)") % (self.name) project = super(Project, self).copy(default) diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml index 8d85df10b3d..7b524b9513a 100644 --- a/addons/project/views/project_views.xml +++ b/addons/project/views/project_views.xml @@ -731,7 +731,7 @@ <field name="name">Project's tasks</field> <field name="view_type">form</field> <field name="view_mode">tree,form,calendar,graph,kanban</field> - <field name="domain">[('project_id', 'child_of', [active_id])]</field> + <field name="domain">[('project_id', '=', active_id)]</field> <field name="context">{'project_id':active_id}</field> </record> |