diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2012-09-25 16:11:40 +0200 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2012-09-25 16:11:40 +0200 |
| commit | ce3485c51c087fe134fe05c8f3e3ccc98e34b37c (patch) | |
| tree | 312d55eb5b87c795a839ffdaf441db68d569ce28 /addons/web/static/src/xml/base.xml | |
| parent | 4d65e16e60ac552474cb4b7037e14584544cc211 (diff) | |
| parent | f58465f925fff57be131a7840a6c81ade1706f12 (diff) | |
[MERGE] from trunk
bzr revid: fva@openerp.com-20120924150127-uky1tz5g8ecnvqs2
bzr revid: fva@openerp.com-20120925141140-oe20lwnxjzmdqctx
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 fd1d03faf7e..f0b9d624607 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -630,7 +630,7 @@ <input type="checkbox" class="oe_list_record_selector"/> </th> <t t-foreach="columns" t-as="column"> - <th t-if="!column.meta and column.invisible !== '1'" t-att-data-id="column.id" + <th t-if="!column.meta and column.invisible !== '1' and !column.reorderable" t-att-data-id="column.id" t-attf-class="oe_list_header_#{column.widget or column.type} #{((options.sortable and column.tag !== 'button') ? 'oe_sortable' : null)}"> <t t-if="column.tag !== 'button'"><t t-esc="column.string"/></t> </th> @@ -685,7 +685,7 @@ <t t-foreach="columns" t-as="column"> <t t-set="number" t-value="column.type === 'integer' or column.type == 'float'"/> <t t-set="modifiers" t-value="column.modifiers_for(asData)"/> - <td t-if="!column.meta and column.invisible !== '1'" t-att-title="column.help" + <td t-if="!column.meta and column.invisible !== '1' and !column.reorderable" t-att-title="column.help" t-attf-class="oe_list_field_cell oe_list_field_#{column.widget or column.type} #{number ? 'oe_number' : ''} #{column.tag === 'button' ? 'oe-button' : ''} #{modifiers.readonly ? 'oe_readonly' : ''} #{modifiers.required ? 'oe_required' : ''}" t-att-data-field="column.id" ><t t-raw="render_cell(record, column)"/></td> |