diff --git a/addons/project/project.py b/addons/project/project.py index c55a718a3a3e92bfb2c5c5b7fc739ff84d464d47..bfd4d1d679a780b468ed267ec20d12d4e9e0ee18 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 46aa452adfd9a30c894428ae116f6bd72e25efc9..82873478a61172a11aae7fb43b4c4eb815ad682e 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']}"