Merge lp:~therp-nl/therp-backports/server61-lp1021378-fix_record_rule_create_timing into lp:therp-backports/server-6.1

Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 4291
Proposed branch: lp:~therp-nl/therp-backports/server61-lp1021378-fix_record_rule_create_timing
Merge into: lp:therp-backports/server-6.1
Diff against target: 19 lines (+1/-1)
1 file modified
openerp/osv/orm.py (+1/-1)
To merge this branch: bzr merge lp:~therp-nl/therp-backports/server61-lp1021378-fix_record_rule_create_timing
Reviewer Review Type Date Requested Status
Therp Pending
Review via email: mp+131215@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/osv/orm.py'
2--- openerp/osv/orm.py 2012-10-15 11:27:49 +0000
3+++ openerp/osv/orm.py 2012-10-24 15:32:26 +0000
4@@ -4190,7 +4190,6 @@
5 upd1 += ",%s,(now() at time zone 'UTC')"
6 upd2.append(user)
7 cr.execute('insert into "'+self._table+'" (id'+upd0+") values ("+str(id_new)+upd1+')', tuple(upd2))
8- self.check_access_rule(cr, user, [id_new], 'create', context=context)
9 upd_todo.sort(lambda x, y: self._columns[x].priority-self._columns[y].priority)
10
11 if self._parent_store and not context.get('defer_parent_store_computation'):
12@@ -4243,6 +4242,7 @@
13 self.name_get(cr, user, [id_new], context=context)[0][1] + \
14 "' " + _("created.")
15 self.log(cr, user, id_new, message, True, context=context)
16+ self.check_access_rule(cr, user, [id_new], 'create', context=context)
17 wf_service = netsvc.LocalService("workflow")
18 wf_service.trg_create(user, self._name, id_new, cr)
19 return id_new

Subscribers

People subscribed via source and target branches

to all changes: