diff options
| author | Yogesh (OpenERP) <ysa@tinyerp.com> | 2011-08-12 10:22:22 +0530 |
|---|---|---|
| committer | Yogesh (OpenERP) <ysa@tinyerp.com> | 2011-08-12 10:22:22 +0530 |
| commit | 2c80de89cf26e456151db4588d4c8cc91c0b2995 (patch) | |
| tree | 696a2a01bd50b942b19def47c07b89cc93fbee7e /addons/base/static/src/xml/base.xml | |
| parent | 8f00fb00c9374331e172e060d57dba9677388312 (diff) | |
| parent | a94ac45ed761c632f4f8ecd4c6b8fdbf7549efcf (diff) | |
[MeRGE] Merge with trunk upto revision no 802.
bzr revid: ysa@tinyerp.com-20110812045222-993fbrjuzma3jywe
Diffstat (limited to 'addons/base/static/src/xml/base.xml')
| -rw-r--r-- | addons/base/static/src/xml/base.xml | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index 4e581e8c175..f9ec63dd69c 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -1114,11 +1114,17 @@ </t> <t t-name="SelectCreatePopup.search.buttons"> <button type="button" class="oe_selectcreatepopup-search-select" disabled="disabled">Select</button> - <button type="button" class="oe_selectcreatepopup-search-close">Close</button> + <button type="button" class="oe_selectcreatepopup-search-close">Cancel</button> </t> <t t-name="SelectCreatePopup.form.buttons"> - <button type="button" class="oe_selectcreatepopup-form-save">Save</button> - <button type="button" class="oe_selectcreatepopup-form-close">Close</button> + <t t-if="widget.options.disable_multiple_selection"> + <button type="button" class="oe_selectcreatepopup-form-save">Save</button> + </t> + <t t-if="! widget.options.disable_multiple_selection"> + <button type="button" class="oe_selectcreatepopup-form-save-new">Save & New</button> + <button type="button" class="oe_selectcreatepopup-form-save">Save & Close</button> + </t> + <button type="button" class="oe_selectcreatepopup-form-close">Cancel</button> </t> <t t-name="FormOpenPopup"> <div t-att-id="element_id"> @@ -1127,7 +1133,7 @@ </t> <t t-name="FormOpenPopup.form.buttons"> <button type="button" class="oe_formopenpopup-form-save">Save</button> - <button type="button" class="oe_formopenpopup-form-close">Close</button> + <button type="button" class="oe_formopenpopup-form-close">Cancel</button> </t> <t t-name="ListView.row.frame" t-extend="WidgetFrame"> <t t-jquery="tr"> |