summaryrefslogtreecommitdiff
path: root/addons/note/models
diff options
context:
space:
mode:
Diffstat (limited to 'addons/note/models')
-rw-r--r--addons/note/models/__init__.py1
-rw-r--r--addons/note/models/note.py31
-rw-r--r--addons/note/models/res_users.py26
3 files changed, 33 insertions, 25 deletions
diff --git a/addons/note/models/__init__.py b/addons/note/models/__init__.py
index 8afd58169b8..b8a4c579959 100644
--- a/addons/note/models/__init__.py
+++ b/addons/note/models/__init__.py
@@ -2,3 +2,4 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
import note
+import res_users
diff --git a/addons/note/models/note.py b/addons/note/models/note.py
index 0818d03d471..8ac934cb1c0 100644
--- a/addons/note/models/note.py
+++ b/addons/note/models/note.py
@@ -78,16 +78,16 @@ class note_note(osv.osv):
return result
_columns = {
- 'name': fields.function(_get_note_first_line,
- string='Note Summary',
+ 'name': fields.function(_get_note_first_line,
+ string='Note Summary',
type='text', store=True),
'user_id': fields.many2one('res.users', 'Owner'),
'memo': fields.html('Note Content'),
'sequence': fields.integer('Sequence'),
- 'stage_id': fields.function(_get_stage_per_user,
- fnct_inv=_set_stage_per_user,
- string='Stage',
- type='many2one',
+ 'stage_id': fields.function(_get_stage_per_user,
+ fnct_inv=_set_stage_per_user,
+ string='Stage',
+ type='many2one',
relation='note.stage'),
'stage_ids': fields.many2many('note.stage','note_stage_rel','note_id','stage_id','Stages of Users'),
'open': fields.boolean('Active', track_visibility='onchange'),
@@ -165,22 +165,3 @@ class note_note(osv.osv):
'actions': [{'url': new_action, 'title': _('New Note')}]
}
return res
-
-
-class res_users(osv.Model):
- _name = 'res.users'
- _inherit = ['res.users']
- def create(self, cr, uid, data, context=None):
- user_id = super(res_users, self).create(cr, uid, data, context=context)
- 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:
- _model, stage_id = data_obj.get_object_reference(cr, SUPERUSER_ID, 'note', xmlid)
- except ValueError:
- continue
- note_obj.copy(cr, SUPERUSER_ID, stage_id, default={'user_id': user_id}, context=context)
- return user_id
diff --git a/addons/note/models/res_users.py b/addons/note/models/res_users.py
new file mode 100644
index 00000000000..006a2b77fd1
--- /dev/null
+++ b/addons/note/models/res_users.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from openerp.osv import osv
+from openerp import SUPERUSER_ID
+
+
+class res_users(osv.Model):
+
+ _name = 'res.users'
+ _inherit = ['res.users']
+
+ def create(self, cr, uid, data, context=None):
+ user_id = super(res_users, self).create(cr, uid, data, context=context)
+ 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:
+ _model, stage_id = data_obj.get_object_reference(cr, SUPERUSER_ID, 'note', xmlid)
+ except ValueError:
+ continue
+ note_obj.copy(cr, SUPERUSER_ID, stage_id, default={'user_id': user_id}, context=context)
+ return user_id