From 432c01c07688e131ab249ec475482a60f1b79b1e Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Wed, 23 Sep 2015 12:38:02 +0200
Subject: [PATCH] [IMP] project: count the project tasks correctly
Also, we should be able to set a customer on a project, whatever the access rights,
for example, if we're managing services by using internal projects.
---
addons/project/project.py | 5 ++---
addons/project/project_view.xml | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/addons/project/project.py b/addons/project/project.py
index c55a718a3a3e..bfd4d1d679a7 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -109,8 +109,7 @@ class project(osv.osv):
context = {}
res={}
for project in self.browse(cr, uid, ids, context=context):
- tasks_undefined_stage = self.pool['project.task'].search_count(cr, uid, [('stage_id', '=', None), ('project_id', '=', project.id)], context=context)
- res[project.id] = len(project.task_ids) + int(tasks_undefined_stage)
+ res[project.id] = len(project.task_ids)
return res
def _get_alias_models(self, cr, uid, context=None):
""" Overriden in project_issue to offer more options """
@@ -164,7 +163,7 @@ class project(osv.osv):
'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
'task_count': fields.function(_task_count, type='integer', string="Tasks",),
'task_ids': fields.one2many('project.task', 'project_id',
- domain=[('stage_id.fold', '=', False)]),
+ domain=['|', ('stage_id.fold', '=', False), ('stage_id', '=', False)]),
'color': fields.integer('Color Index'),
'user_id': fields.many2one('res.users', 'Project Manager'),
'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True,
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 46aa452adfd9..82873478a611 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -112,7 +112,7 @@
<page string="Settings">
<group>
<field name="privacy_visibility" widget="radio"/>
- <field name="partner_id" on_change="onchange_partner_id(partner_id)" string="Customer" attrs="{'invisible': [('privacy_visibility', '!=', 'portal')]}"/>
+ <field name="partner_id" on_change="onchange_partner_id(partner_id)" string="Customer"/>
<field name="user_id" string="Project Manager"
attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"
context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'project.group_project_manager']}"
--
GitLab