diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml index 0b909d2c5c0..af5925829dd 100644 --- a/addons/analytic/analytic_view.xml +++ b/addons/analytic/analytic_view.xml @@ -20,7 +20,7 @@ - + diff --git a/addons/project/project.py b/addons/project/project.py index 51d254756f4..3bda5ad128e 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -170,8 +170,8 @@ class project(osv.osv): 'priority': fields.integer('Sequence', help="Gives the sequence order when displaying the list of projects"), 'warn_manager': fields.boolean('Notify Manager', help="If you check this field, the project manager will receive an email each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), - 'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', - help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), + #'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', + # help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'tasks': fields.one2many('project.task', 'project_id', "Task Activities"), 'planned_hours': fields.function(_progress_rate, multi="progress", string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.", store = { @@ -1236,6 +1236,8 @@ class account_analytic_account(osv.osv): _columns = { 'use_tasks': fields.boolean('Tasks Management'), 'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'), + 'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', + states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), } # _defaults = { # 'use_tasks': True, diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 2835c5f542f..737a4c01b02 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -80,8 +80,9 @@ - - + + + @@ -585,6 +586,7 @@ + @@ -619,6 +621,9 @@ + + +