Merge lp:~openerp-community/openobject-addons/stefan-therp_lp696176 into lp:openobject-addons/6.0

Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 4909
Proposed branch: lp:~openerp-community/openobject-addons/stefan-therp_lp696176
Merge into: lp:openobject-addons/6.0
Diff against target: 13 lines (+2/-1)
1 file modified
base_module_record/base_module_record.py (+2/-1)
To merge this branch: bzr merge lp:~openerp-community/openobject-addons/stefan-therp_lp696176
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+63668@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 'base_module_record/base_module_record.py'
2--- base_module_record/base_module_record.py 2011-01-14 00:11:01 +0000
3+++ base_module_record/base_module_record.py 2011-06-07 09:56:11 +0000
4@@ -146,7 +146,8 @@
5 for key,val in data.items():
6 if not (val or (fields[key]['type']=='boolean')):
7 continue
8- if fields[key]['type'] in ('integer','float'):
9+ if (fields[key]['type'] in ('integer','float') or
10+ fields[key]['type'] == 'selection' and isinstance(val, int)):
11 field = doc.createElement('field')
12 field.setAttribute("name", key)
13 field.setAttribute("eval", val and str(val) or 'False' )