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

[Stefan Rijnhart (Opener)]

This branch fixes a bug that prevents base_record_module to produce an xml data file for a model containing a fields.selection with integer type keys (account.account.type is a good test case).

[Olivier Dony (Odoo) (odo-openerp)]

Looks good to me.

(need to double-check if it still merges cleanly with the recent/pending changes to audit_trail, but should be easy enough)

review: Approve

[Olivier Dony (Odoo) (odo-openerp)]

Just merged, thanks a lot for the fix!

=== modified file 'base_module_record/base_module_record.py'
--- base_module_record/base_module_record.py	2011-06-15 15:31:51 +0000
+++ base_module_record/base_module_record.py	2011-09-29 10:21:16 +0000
@@ -104,7 +104,8 @@
         for key,val in data.items():
             if not (val or (fields[key]['type']=='boolean')):
                 continue
-            if fields[key]['type'] in ('integer','float'):
+            if (fields[key]['type'] in ('integer','float') or
+                fields[key]['type'] == 'selection' and isinstance(val, int)):
                 field = doc.createElement('field')
                 field.setAttribute("name", key)
                 field.setAttribute("eval", val and str(val) or 'False' )