[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20120815195652-839w3fyumomq0ubf

1 files changed, 2 insertions, 5 deletions

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 5aa34c173c5..81550f476b6 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -256,7 +256,7 @@ class project_issue(base_stage, osv.osv):
         'inactivity_days': fields.function(_compute_day, string='Days since last action', \
                                 multi='compute_day', type="integer", help="Difference in days between last action and current date"),
         'color': fields.integer('Color Index'),
-        'user_email': fields.related('user_id', 'user_email', type='char', string='User Email', readonly=True),
+        'user_email': fields.related('user_id', 'email', type='char', string='User Email', readonly=True),
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
         'progress': fields.function(_hours_get, string='Progress (%)', multi='hours', group_operator="avg", help="Computed as: Time Spent / Total Time.",
@@ -267,9 +267,6 @@ class project_issue(base_stage, osv.osv):
             }),
     }
 
-    def on_change_project(self, cr, uid, ids, project_id, context=None):
-        return {}
-
     _defaults = {
         'active': 1,
         'partner_id': lambda s, cr, uid, c: s._get_default_partner(cr, uid, c),
@@ -496,7 +493,7 @@ class project_issue(base_stage, osv.osv):
                 key = maps.get(res.group(1).lower())
                 update_vals[key] = res.group(2).lower()
 
-        return super(project_issue, self).message_update(cr, uid, ids, update_vals=update_vals, context=context)
+        return super(project_issue, self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context)
 
     # -------------------------------------------------------
     # OpenChatter methods and notifications