[MERGE] upstream

bzr revid: fme@openerp.com-20131030082046-13kxszts8g0ky4wr

1 files changed, 9 insertions, 11 deletions

diff --git a/addons/note/note.py b/addons/note/note.py
index eb9a6397d18..95fe8f97cdf 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+from openerp import SUPERUSER_ID
 from openerp.osv import osv, fields
 from openerp.tools import html2plaintext
 
@@ -188,18 +189,15 @@ class res_users(osv.Model):
     _inherit = ['res.users']
     def create(self, cr, uid, data, context=None):
         user_id = super(res_users, self).create(cr, uid, data, context=context)
-        user = self.browse(cr, uid, uid, context=context)
-        note_obj = self.pool.get('note.stage')
-        data_obj = self.pool.get('ir.model.data')
-        model_id = data_obj.get_object_reference(cr, uid, 'base', 'group_user') #Employee Group
-        group_id = model_id and model_id[1] or False
-        if group_id in [x.id for x in user.groups_id]:
-            for note_xml_id in ['note_stage_00','note_stage_01','note_stage_02','note_stage_03','note_stage_04']:
+        note_obj = self.pool['note.stage']
+        data_obj = self.pool['ir.model.data']
+        is_employee = self.has_group(cr, user_id, 'base.group_user')
+        if is_employee:
+            for n in range(5):
+                xmlid = 'note_stage_%02d' % (n,)
                 try:
-                    data_id = data_obj._get_id(cr, uid, 'note', note_xml_id)
+                    _model, stage_id = data_obj.get_object_reference(cr, SUPERUSER_ID, 'note', xmlid)
                 except ValueError:
                     continue
-                stage_id  = data_obj.browse(cr, uid, data_id, context=context).res_id
-                note_obj.copy(cr, uid, stage_id, default = { 
-                                        'user_id': user_id}, context=context)
+                note_obj.copy(cr, SUPERUSER_ID, stage_id, default={'user_id': user_id}, context=context)
         return user_id