summaryrefslogtreecommitdiff
path: root/addons/project/project.py
diff options
context:
space:
mode:
authorRucha (Open ERP) <rpa@tinyerp.com>2011-11-02 10:58:27 +0530
committerRucha (Open ERP) <rpa@tinyerp.com>2011-11-02 10:58:27 +0530
commit2fdecf4717080ea98a514b67dedefc27d76c6727 (patch)
treebb54dd0e81af0bbf999fee1110fecb9e507f51e1 /addons/project/project.py
parent9fe0f6fa83b84d0806359bdc2a3ae31dfb7e997a (diff)
parent3d22bb8b55d48e5ee8226f023555f003288b157a (diff)
[MERGE]: Merge with latest trunk
bzr revid: rpa@tinyerp.com-20111102052827-0bctjrhb4amyg6pl
Diffstat (limited to 'addons/project/project.py')
-rw-r--r--addons/project/project.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/project/project.py b/addons/project/project.py
index 05bed8a9b9a..a5cd8928dfc 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -471,6 +471,7 @@ class task(osv.osv):
'company_id': fields.many2one('res.company', 'Company'),
'id': fields.integer('ID', readonly=True),
'color': fields.integer('Color Index'),
+ 'user_email': fields.related('user_id', 'user_email', type='char', string='User Email', readonly=True),
}
_defaults = {
@@ -484,7 +485,7 @@ class task(osv.osv):
'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'project.task', context=c)
}
- _order = "sequence,priority, date_start, name, id"
+ _order = "priority, sequence, date_start, name, id"
def set_priority(self, cr, uid, ids, priority):
"""Set task priority