diff options
| author | Harry (OpenERP) <hmo@tinyerp.com> | 2010-10-27 11:08:19 +0530 |
|---|---|---|
| committer | Harry (OpenERP) <hmo@tinyerp.com> | 2010-10-27 11:08:19 +0530 |
| commit | cbc52ce4586bfc9bf280c3baa4d454c8605e00a0 (patch) | |
| tree | 124f3d9bfa46387dcbbc6b8255fbdadec9fdc816 /addons/project | |
| parent | bbbcdbdbdbf76cfcecac5450d577ff17ab3fa18c (diff) | |
| parent | 15e29993bac22d4bd15457bdf78ec89071cab3a3 (diff) | |
[MERGE] merged from openobject-addons branch
bzr revid: hmo@tinyerp.com-20101027053819-if1wltlbyizl4n5r
Diffstat (limited to 'addons/project')
| -rw-r--r-- | addons/project/project.py | 5 | ||||
| -rw-r--r-- | addons/project/project_view.xml | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/addons/project/project.py b/addons/project/project.py index 294c711eaac..6c9f66dd009 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -483,7 +483,10 @@ class task(osv.osv): def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): users_obj = self.pool.get('res.users') - obj_tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id + + # read uom as admin to avoid access rights issues, e.g. for portal/share users, + # this should be safe (no context passed to avoid side-effects) + obj_tm = users_obj.browse(cr, 1, uid).company_id.project_time_mode_id tm = obj_tm and obj_tm.name or 'Hours' res = super(task, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 8cf262237da..01b5999cdcd 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -85,7 +85,7 @@ <label string="ID: %%(task_id)s"/> <label string="Status: %%(state)s"/> <label string="Date Start: %%(date_start)s"/> - <label string="Date Stop: %%(date_stop)s"/> + <label string="Date Stop: %%(date)s"/> </group> </page> <page string="Tasks Stages" groups="base.group_extended"> |
