diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index 6116d6b19ac..1b68e1930da 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -685,7 +685,6 @@ class view(osv.osv):
     # view used as templates
 
     def read_template(self, cr, uid, id_, context=None):
-        import pprint
         try:
             id_ = int(id_)
         except ValueError:
diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index deed121604f..a4a38cbfe18 100644
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -846,9 +846,10 @@ form: module.record_id""" % (xml_id,)
         if '.' in tpl_id:
             module, tpl_id = tpl_id.split('.', 1)
         # set the full template name for qweb <module>.<id>
-        el.attrib['t-name'] = '%s.%s' % (module, tpl_id)
+        if (not el.get('inherit_id', False)) and (not el.get('inherit_option_id', False)):
+            el.attrib['t-name'] = '%s.%s' % (module, tpl_id)
+        el.tag = 'data'
         el.attrib.pop('id', None)
-        el.tag = 't'
 
         record = etree.Element('record')
         record_attrs = {
@@ -864,6 +865,10 @@ form: module.record_id""" % (xml_id,)
         record.append(etree.fromstring('<field name="type">qweb</field>'))
         record.append(etree.fromstring('<field name="arch" type="xml"/>'))
         record[-1].append(el)
+        for field in ('inherit_id','inherit_option_id'):
+            if el.get(key, False):
+                record.append(etree.fromstring('<field name="%s" ref="%s"/>' % (key, el.get('key'))))
+                el.attrib.pop(key, None)
         return self._tag_record(cr, record, data_node)
 
     def id_get(self, cr, id_str):
diff --git a/openerp/tools/qweb.py b/openerp/tools/qweb.py
index ce5958370c7..543cc01fc90 100644
--- a/openerp/tools/qweb.py
+++ b/openerp/tools/qweb.py
@@ -93,7 +93,7 @@ class QWebXml(object):
         else:
             dom = xml.dom.minidom.parse(x)
         for n in dom.documentElement.childNodes:
-            if n.nodeName == "t":
+            if n.getAttribute('t-name'):
                 self._t[str(n.getAttribute("t-name"))] = n
 
     def get_template(self, name):