[FIX]: Fixed problem of context not passed properly in creating record by !record...

[odoo/odoo.git] / openerp / tools / convert.py

diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index 79906a0..7d6a982 100644 (file)
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -45,7 +45,6 @@ import openerp.loglevels as loglevels
 import openerp.pooler as pooler
 from config import config
 from translate import _
-from yaml_import import convert_yaml_import
 
 # List of etree._Element subclasses that we choose to ignore when parsing XML.
 from misc import SKIPPED_ELEMENT_TYPES
@@ -315,7 +314,8 @@ form: module.record_id""" % (xml_id,)
         for dest,f in (('name','string'),('model','model'),('report_name','name')):
             res[dest] = rec.get(f,'').encode('utf8')
             assert res[dest], "Attribute %s of report is empty !" % (f,)
-        for field,dest in (('rml','report_rml'),('file','report_rml'),('xml','report_xml'),('xsl','report_xsl'),('attachment','attachment'),('attachment_use','attachment_use')):
+        for field,dest in (('rml','report_rml'),('file','report_rml'),('xml','report_xml'),('xsl','report_xsl'),
+                           ('attachment','attachment'),('attachment_use','attachment_use'), ('usage','usage')):
             if rec.get(field):
                 res[dest] = rec.get(field).encode('utf8')
         if rec.get('auto'):
@@ -884,16 +884,16 @@ form: module.record_id""" % (xml_id,)
 
         for n in de.findall('./data'):
             for rec in n:
-                    if rec.tag in self._tags:
-                        try:
-                            self._tags[rec.tag](self.cr, rec, n)
-                        except:
-                            self.__logger.error('Parse error in %s:%d: \n%s',
-                                                rec.getroottree().docinfo.URL,
-                                                rec.sourceline,
-                                                etree.tostring(rec).strip(), exc_info=True)
-                            self.cr.rollback()
-                            raise
+                if rec.tag in self._tags:
+                    try:
+                        self._tags[rec.tag](self.cr, rec, n)
+                    except:
+                        self.__logger.error('Parse error in %s:%d: \n%s',
+                                            rec.getroottree().docinfo.URL,
+                                            rec.sourceline,
+                                            etree.tostring(rec).strip(), exc_info=True)
+                        self.cr.rollback()
+                        raise
         return True
 
     def __init__(self, cr, module, idref, mode, report=None, noupdate=False):