summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>2013-05-16 14:13:06 +0200
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>2013-05-16 14:13:06 +0200
commitb6a4e2fc5f157cbf7b4295caee7f6f9a2f48b16e (patch)
tree898a4484dba5ce9eed3bf87f1757eb55cc14bfd7
parent7f6ee29de8ad55cbf95c5e15dec2353c3dc2a3d9 (diff)
parent231103feebb4d233e26abbc8b3019c923b8a5ae3 (diff)
[FIX] project: do not hide tasks from template project in the project kanban and if we open those tasks from the project template
bzr revid: qdp-launchpad@openerp.com-20130516121306-3d24o7z9y8odmvqh
-rw-r--r--addons/project/project.py6
-rw-r--r--addons/project/project_view.xml2
2 files changed, 6 insertions, 2 deletions
diff --git a/addons/project/project.py b/addons/project/project.py
index a5e540c8be7..fecba3c7afd 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -198,8 +198,12 @@ class project(osv.osv):
return res
def _task_count(self, cr, uid, ids, field_name, arg, context=None):
+ if context is None:
+ context = {}
res = dict.fromkeys(ids, 0)
- task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)])
+ ctx = context.copy()
+ ctx['active_test'] = False
+ task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)], context=ctx)
for task in self.pool.get('project.task').browse(cr, uid, task_ids, context):
res[task.project_id.id] += 1
return res
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f0092a1dd33..85e8d513b42 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -50,7 +50,7 @@
<field name="name">Tasks</field>
<field name="res_model">project.task</field>
<field name="view_mode">kanban,tree,form,calendar,gantt,graph</field>
- <field name="context">{'search_default_project_id': [active_id], 'default_project_id': active_id}</field>
+ <field name="context">{'search_default_project_id': [active_id], 'default_project_id': active_id, 'active_test': False}</field>
<field name="search_view_id" ref="view_task_search_form"/>
<field name="help" type="html">
<p class="oe_view_nocontent_create">