summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2013-01-24 11:46:25 +0100
committerOlivier Dony <odo@openerp.com>2013-01-24 11:46:25 +0100
commitbd8a29b5cccd04c2c46b11512f99894d8a3e3080 (patch)
tree5df715a3a3d5ad45c627a730450c9cd73fa0c66d
parent688bb77d95b3708bb05ddc18dac363cd2c0d98d3 (diff)
[FIX] note: stages should not block user deletion + incomplete fields.function declaration for current_partner_id
bzr revid: odo@openerp.com-20130124104625-5aqn1ch5kdz9cgak
-rw-r--r--addons/note/note.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/note/note.py b/addons/note/note.py
index 7de91e4703a..2d95b15107a 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -29,7 +29,7 @@ class note_stage(osv.osv):
_columns = {
'name': fields.char('Stage Name', translate=True, required=True),
'sequence': fields.integer('Sequence', help="Used to order the note stages"),
- 'user_id': fields.many2one('res.users', 'Owner', help="Owner of the note stage.", required=True),
+ 'user_id': fields.many2one('res.users', 'Owner', help="Owner of the note stage.", required=True, ondelete='cascade'),
'fold': fields.boolean('Folded by Default'),
}
_order = 'sequence asc'
@@ -112,7 +112,7 @@ class note_note(osv.osv):
'date_done': fields.date('Date done'),
'color': fields.integer('Color Index'),
'tag_ids' : fields.many2many('note.tag','note_tags_rel','note_id','tag_id','Tags'),
- 'current_partner_id' : fields.function(_get_my_current_partner),
+ 'current_partner_id' : fields.function(_get_my_current_partner, type="many2one", relation='res.partner', string="Owner"),
}
_defaults = {
'open' : 1,