summaryrefslogtreecommitdiff
path: root/addons/web/static/src/xml/base.xml
diff options
context:
space:
mode:
authorAntony Lesuisse <al@openerp.com>2012-09-30 17:40:22 +0200
committerAntony Lesuisse <al@openerp.com>2012-09-30 17:40:22 +0200
commit0e0c64b9c4c2a2bb4d95914edd6006dc6e091164 (patch)
tree2e32a15dc14ba07effec5603bcc71f72d559683f /addons/web/static/src/xml/base.xml
parent0aeb750b95aa8fc7fbd144687428d2e63dc45529 (diff)
parent884fc88106b96b94759937fb2152ff48b94eb7aa (diff)
[MERGE] tree view: honor string attribute on fields trunk-bug-1026960-vja
bzr revid: al@openerp.com-20120930154022-fgg3wi2cjup00kaz
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
-rw-r--r--addons/web/static/src/xml/base.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 88be06216ce..fdf39633186 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -577,7 +577,7 @@
<tr>
<th t-foreach="fields_view" t-as="field"
t-if="!field.attrs.modifiers.tree_invisible">
- <t t-esc="fields[field.attrs.name].string" />
+ <t t-esc="field_value.attrs.string || fields[field.attrs.name].string" />
</th>
</tr>
</thead>