diff options
| author | Yogesh (OpenERP) <ysa@tinyerp.com> | 2011-10-12 10:39:18 +0530 |
|---|---|---|
| committer | Yogesh (OpenERP) <ysa@tinyerp.com> | 2011-10-12 10:39:18 +0530 |
| commit | c6d4bea1c2e9198f07eab560677c2dd52408cf2a (patch) | |
| tree | 444a59b2bd04b1699897514a7b0f6fb7b7992337 /addons/web/static/src/xml/base.xml | |
| parent | 80e785734759262d99d0b4f17d3dfebd5d91b526 (diff) | |
| parent | 048cfa7804759c6b3fb952983451165fb319bc80 (diff) | |
[MERGE] Merge with trunk upto revision no 1218.
bzr revid: ysa@tinyerp.com-20111012050918-c83f2y42ocshk6e6
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 6091d0ec212..7b4baae58d0 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -539,7 +539,7 @@ <td t-foreach="fields_view" t-as="field" t-if="!field.attrs.modifiers.tree_invisible" t-att-data-id="record.id" - t-att-style="!field_index ? 'background-position: ' + 19*level + 'px; padding-left: ' + 19*level + 'px' : undefined" + t-att-style="color_for(record) + (!field_index ? 'background-position: ' + 19*level + 'px; padding-left: ' + 19*level + 'px;' : '')" t-att-class="!field_index and has_children ? 'treeview-tr' : 'treeview-td'"> <span t-if="!field.attrs.modifiers.invisible"> <t t-esc="render(record[field.attrs.name], fields[field.attrs.name])" /> @@ -887,7 +887,7 @@ <td t-attf-class="oe_form_frame_cell oe_form_selection #{widget.selection.element_class}"> <t t-raw="widget.selection.render()"/> </td> - <td class="oe_form_frame_cell oe_form_many2one #{widget.selection.element_class}" nowrap="true"> + <td t-attf-class="oe_form_frame_cell oe_form_many2one #{widget.m2o.element_class}" nowrap="true" style="display: none"> <t t-raw="widget.m2o.render()"/> </td> </tr> |