diff options
| author | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2012-01-24 14:50:26 +0530 |
|---|---|---|
| committer | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2012-01-24 14:50:26 +0530 |
| commit | 2063f02b5ea8417875078f79ee4a08b3b525ab37 (patch) | |
| tree | 708854ad10dbf30243a349d1c18816316310ad2d /addons/web/static/src/js/view_editor.js | |
| parent | 2ffb3404fc818f3253cd09e930222344a9699aab (diff) | |
| parent | a0bc35050e1769769df0f2a03dbb33d31b1dc47d (diff) | |
[Merge]merge with main branch.
bzr revid: vme@tinyerp.com-20120124092026-blodtisdbl1ysssd
Diffstat (limited to 'addons/web/static/src/js/view_editor.js')
| -rw-r--r-- | addons/web/static/src/js/view_editor.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 6ff2eb74afa..a2a927fa86d 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -808,7 +808,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ 'widget' : {'name':'widget', 'string': 'widget', 'type': 'selection'}, 'colors' : {'name':'colors', 'string': 'Colors', 'type': 'char'}, 'editable' : {'name':'editable', 'string': 'Editable', 'type': 'selection', 'selection': [["",""],["top","Top"],["bottom", "Bottom"]]}, - 'groups' : {'name':'groups', 'string': 'Groups', 'type': 'seleciton_multi'} + 'groups' : {'name':'groups', 'string': 'Groups', 'type': 'selection_multi'} }; var arch_val = self.get_object_by_id(this.one_object.clicked_tr_id,this.one_object['main_object'], []); this.edit_node_dialog.$element.append('<table id="rec_table" style="width:400px" class="oe_forms"></table>'); @@ -1134,7 +1134,7 @@ var _ICONS = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD', ]; openerp.web.ViewEditor.property_widget = new openerp.web.Registry({ 'boolean' : 'openerp.web.ViewEditor.FieldBoolean', - 'seleciton_multi' : 'openerp.web.ViewEditor.FieldSelectMulti', + 'selection_multi' : 'openerp.web.ViewEditor.FieldSelectMulti', 'selection' : 'openerp.web.ViewEditor.FieldSelect', 'char' : 'openerp.web.ViewEditor.FieldChar', 'float' : 'openerp.web.ViewEditor.FieldFloat' |