Merge lp:~openerp-groupes/openobject-server/patch-create-inherits into lp:~openerp-groupes/openobject-server/6.0

Proposed by tfr (Openerp) on 2011-12-07
Status: Needs review
Proposed branch: lp:~openerp-groupes/openobject-server/patch-create-inherits
Merge into: lp:~openerp-groupes/openobject-server/6.0
Diff against target: 12 lines (+1/-1)
1 file modified
bin/osv/orm.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-groupes/openobject-server/patch-create-inherits
Reviewer Review Type Date Requested Status
OpenERP Groupe S 2011-12-07 Pending
Review via email: mp+84791@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

3344. By tfr (Openerp) on 2011-12-07

[clean] print statement

3343. By Thibaut DIRLIK (Logica) on 2011-12-07

[FIX] set the value on child when inherits and redefine some columns

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/osv/orm.py'
2--- bin/osv/orm.py 2011-05-05 12:19:51 +0000
3+++ bin/osv/orm.py 2011-12-07 16:12:49 +0000
4@@ -3562,7 +3562,7 @@
5 (upd0, upd1, upd2) = ('', '', [])
6 upd_todo = []
7 for v in vals.keys():
8- if v in self._inherit_fields:
9+ if v in self._inherit_fields and v not in self._columns:
10 (table, col, col_detail) = self._inherit_fields[v]
11 tocreate[table][v] = vals[v]
12 del vals[v]

Subscribers

People subscribed via source and target branches