[MERGE] from trunk

bzr revid: xmo@openerp.com-20130909095042-zf9p1qybf4f2b7gu

diff --cc openerp/addons/base/ir/ir_ui_view.py
Simple merge

diff --cc openerp/tools/convert.py
index a1f0deb,3334649..5e16ae4
--- 1/openerp/tools/convert.py
--- 2/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@@ -858,21 -859,21 +858,22 @@@ form: module.record_id""" % (xml_id,
              'model': 'ir.ui.view',
          }
          for att in ['forcecreate', 'context']:
 -            if att in el.attrib:
 +            if att in el.keys():
                  record_attrs[att] = el.attrib.pop(att)
  
 -        record.attrib.update(record_attrs)
 +        Field = builder.E.field
          name = el.get('name', tpl_id)
 -        record.append(etree.fromstring('<field name="name">%s</field>' % name))
 -        record.append(etree.fromstring('<field name="type">qweb</field>'))
 -        record.append(etree.fromstring('<field name="arch" type="xml"/>'))
 -        record[-1].append(el)
 -        for key in ('inherit_id','inherit_option_id'):
 -            if el.get(key):
 -                record.append(etree.fromstring('<field name="%s" ref="%s"/>' % (key, el.get(key))))
 -                el.attrib.pop(key, None)
 +
 +        record = etree.Element('record', attrib=record_attrs)
 +        record.append(Field(name, name='name'))
 +        record.append(Field("qweb", name='type'))
 +        record.append(Field(el, name="arch", type="xml"))
 +        for field_name in ('inherit_id','inherit_option_id'):
 +            if el.get(field_name):
 +                record.append(Field(
 +                    field_name, el.attrib.pop(field_name, None)))
- 
+         if el.get('page'):
+             record.append(etree.Element('field', name="page", eval="True"))
          return self._tag_record(cr, record, data_node)
  
      def id_get(self, cr, id_str):

diff --cc openerp/tools/qweb.py
Simple merge