diff --git a/trytond/ir/action.py b/trytond/ir/action.py index f8c060f6d7..fb8563ec88 100644 --- a/trytond/ir/action.py +++ b/trytond/ir/action.py @@ -339,15 +339,11 @@ class ActionURL(OSV): _sequence = 'ir_action_id_seq' _description = __doc__ _inherits = {'ir.action': 'action'} - url = fields.text('Action Url',required=True) - target = fields.selection([ - ('new', 'New Window'), - ('self', 'This Window'), - ], 'Action Target', required=True) + url = fields.Char('Action Url', size=None, required=True) action = fields.many2one('ir.action', 'Action', required=True) def default_type(self, cursor, user, context=None): - return 'ir.action.act_url' + return 'ir.action.url' def default_target(self, cursor, user, context=None): return 'new' diff --git a/trytond/ir/action.xml b/trytond/ir/action.xml index b1c8b93d56..fa715c50ad 100644 --- a/trytond/ir/action.xml +++ b/trytond/ir/action.xml @@ -278,5 +278,53 @@ + + + ir.action.url + form + + + + + ir.action.url + tree + + + + + + + ]]> + + + + URLs + ir.action.act_window + ir.action.url + form + + + + + + + + + + + + diff --git a/trytond/tools/convert.py b/trytond/tools/convert.py index ba491fdcdc..a181836c0a 100644 --- a/trytond/tools/convert.py +++ b/trytond/tools/convert.py @@ -97,6 +97,8 @@ class MenuitemTagHandler: values['icon'] = 'terp-graph' elif view_mode and view_mode.startswith('calendar'): values['icon'] = 'terp-calendar' + elif action_type == 'ir.action.url': + values['icon'] = 'STOCK_JUMP_TO' else: values['icon'] = 'STOCK_NEW'