[MERGE] from website-al

bzr revid: chm@openerp.com-20130805083938-xquerxe417mmvh73

openerp/addons/base/ir/ir_ui_view.py

@@ -714,7 +714,7 @@ class view(osv.osv):
         return r['arch']
 
     def distribute_branding(self, e, branding=None, xpath=None, count=None):
-        if e.attrib.get('t-ignore'):
+        if e.attrib.get('t-ignore') or e.tag in ('head',):
             # TODO: find a better name and check if we have a string to boolean helper
             return
         branding_copy = ['data-oe-model','data-oe-id','data-oe-field','data-oe-xpath']
@@ -726,7 +726,7 @@ class view(osv.osv):
         if e.attrib.get('data-oe-model'):
             # if a branded tag containg branded tag distribute to the childs
             child_text = "".join([etree.tostring(x, encoding='utf-8') for x in e])
-            if re.search('(data-oe-model=|t-esc=|t-raw=|t-field=|t-call=|t-ignore=)',child_text) or e.tag == "t" or 't-raw' in e.attrib:
+            if re.search('( data-oe-model=| t-esc=| t-raw=| t-field=| t-call=| t-ignore=)',child_text) or e.tag == "t" or 't-raw' in e.attrib:
                 for i in branding_copy:
                     if e.attrib.get(i):
                         branding_dist[i] = e.attrib.get(i)

openerp/tools/qweb.py

@@ -278,10 +278,11 @@ class QWebXml(object):
 
     def render_tag_field(self, e, t_att, g_att, v):
         """ eg: <span t-record="browse_record(res.partner, 1)" t-field="phone">+1 555 555 8069</span>"""
-        record = v[t_att["record"]]
+
+        record, field = t_att["field"].rsplit('.', 1)
+        record = self.eval_object(record, v)
 
         inner = ""
-        field = t_att["field"]
         field_type = record._model._all_columns.get(field).column._type
         try:
             if field_type == 'many2one':