diff options
| author | Bhumi Thakkar (Open ERP) <bth@tinyerp.com> | 2012-11-23 14:48:06 +0530 |
|---|---|---|
| committer | Bhumi Thakkar (Open ERP) <bth@tinyerp.com> | 2012-11-23 14:48:06 +0530 |
| commit | fce01bb78c1204bbb9ead379c1e28a7b11862446 (patch) | |
| tree | 35e0ba3a4be3b34a48e690e65d8f059a2740b0d8 /addons/web/static/src/xml/base.xml | |
| parent | c1da45fade8c6505302a46d54c4a6a2d5fc04714 (diff) | |
| parent | c52341ad58baef7e142ff6f29e1ddf314dc7ddfc (diff) | |
[MERGE] Merge main trunk and remove conflicts.
bzr revid: jra@tinyerp.com-20121121052637-cw55pw6vktwjp1jy
bzr revid: bth@tinyerp.com-20121123091806-tibbw3oa212wryia
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index ef3c44baf32..88060f56ffc 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -538,8 +538,11 @@ </t> <t t-name="ViewManagerDebug"> <option value="">Debug View#<t t-esc="view.fields_view.view_id"/></option> - <option t-if="view_manager.active_view === 'form'" value="perm_read" data-views="form,page">View Log (perm_read)</option> - <option t-if="view_manager.active_view === 'form'" value="toggle_layout_outline">Toggle Form Layout Outline</option> + <t t-if="view_manager.active_view === 'form'"> + <option value="perm_read">View Log (perm_read)</option> + <option value="toggle_layout_outline">Toggle Form Layout Outline</option> + <option value="set_defaults">Set Defaults</option> + </t> <option value="tests">JS Tests</option> <option value="fields">View Fields</option> <option value="fvg">Fields View Get</option> @@ -1340,6 +1343,11 @@ </tr> <tr style="width:100%"> <td style="width:100%"> + <div class="oe_popup_list_pager"></div> + </td> + </tr> + <tr style="width:100%"> + <td style="width:100%"> <div class="oe_popup_list" style="width:100%"></div> </td> </tr> |