diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py index 1d91ab823db..8861a59c368 100644 --- a/openerp/addons/base/ir/ir_actions.py +++ b/openerp/addons/base/ir/ir_actions.py @@ -210,10 +210,6 @@ class act_window(osv.osv): res[act.id] = str(field_get) return res - def _get_help_status(self, cr, uid, ids, name, arg, context=None): - activate_tips = self.pool.get('res.users').browse(cr, uid, uid).menu_tips - return dict([(id, activate_tips) for id in ids]) - _columns = { 'name': fields.char('Action Name', size=64, translate=True), 'type': fields.char('Action Type', size=32, required=True), @@ -251,8 +247,6 @@ class act_window(osv.osv): 'help': fields.text('Action description', help='Optional help text for the users with a description of the target view, such as its usage and purpose.', translate=True), - 'display_menu_tip':fields.function(_get_help_status, type='boolean', string='Display Menu Tips', - help='It gives the status if the tip has to be displayed or not when a user executes an action'), 'multi': fields.boolean('Action on Multiple Doc.', help="If set to true, the action will not be displayed on the right toolbar of a form view"), } diff --git a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml index 334dbc93199..97fa2b50c3a 100644 --- a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml +++ b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml @@ -94,32 +94,20 @@ form
-
-
- - - - - - - - - - - - - + + + + + + +
+
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index e22b5addf48..97ca6ec32dc 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -231,7 +231,6 @@ class users(osv.osv): help="The user's timezone, used to output proper date and time values inside printed reports. " "It is important to set a value for this field. You should use the same timezone " "that is otherwise used to pick and render date and time values: your computer's timezone."), - 'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"), 'date': fields.datetime('Latest Connection', readonly=True), } @@ -336,11 +335,10 @@ class users(osv.osv): 'company_id': _get_company, 'company_ids': _get_companies, 'groups_id': _get_group, - 'menu_tips': False } # User can write to a few of her own fields (but not her groups for example) - SELF_WRITEABLE_FIELDS = ['menu_tips','password', 'signature', 'action_id', 'company_id', 'user_email', 'name', 'avatar', 'avatar_big'] + SELF_WRITEABLE_FIELDS = ['password', 'signature', 'action_id', 'company_id', 'user_email', 'name', 'avatar', 'avatar_big'] def write(self, cr, uid, ids, values, context=None): if not hasattr(ids, '__iter__'): diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index 98ee6d5a1dc..4f8fb9f94fd 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -85,14 +85,15 @@
- + - @@ -103,7 +104,6 @@ - @@ -191,18 +191,18 @@
- - -
-

- -

-

- -

+ +
+
- +

+ + () +

+ +