diff --git a/odoo/addons/base/ir/ir_actions.py b/odoo/addons/base/ir/ir_actions.py index 646615cb593..862d288ac5b 100644 --- a/odoo/addons/base/ir/ir_actions.py +++ b/odoo/addons/base/ir/ir_actions.py @@ -34,6 +34,7 @@ class IrActions(models.Model): binding_model_id = fields.Many2one('ir.model', ondelete='cascade', help="Setting a value makes this action available in the sidebar for the given model.") binding_type = fields.Selection([('action', 'Action'), + ('action_form_only', "Form-only"), ('report', 'Report')], required=True, default='action') diff --git a/odoo/models.py b/odoo/models.py index 1b0207e9eb9..202887a31be 100644 --- a/odoo/models.py +++ b/odoo/models.py @@ -1391,6 +1391,9 @@ class BaseModel(MetaModel('DummyModel', (object,), {'_register': False})): resaction = [action for action in bindings['action'] if view_type == 'tree' or not action.get('multi')] + resrelate = [] + if view_type == 'form': + resrelate = bindings['action_form_only'] for res in itertools.chain(resreport, resaction): res['string'] = res['name'] @@ -1398,6 +1401,7 @@ class BaseModel(MetaModel('DummyModel', (object,), {'_register': False})): result['toolbar'] = { 'print': resreport, 'action': resaction, + 'relate': resrelate, } return result diff --git a/odoo/tools/convert.py b/odoo/tools/convert.py index 59e87d6ee32..97fb2be7330 100644 --- a/odoo/tools/convert.py +++ b/odoo/tools/convert.py @@ -427,11 +427,14 @@ form: module.record_id""" % (xml_id,) if rec.get('target'): res['target'] = rec.get('target','') + if rec.get('multi'): + res['multi'] = safe_eval(rec.get('multi', 'False')) if src_model: res['binding_model_id'] = self.env['ir.model']._get(src_model).id res['binding_type'] = 'report' if rec.get('key2') == 'client_print_multi' else 'action' - if rec.get('multi'): - res['multi'] = safe_eval(rec.get('multi', 'False')) + if rec.get('key2') in (None, 'client_action_relate'): + if not res.get('multi'): + res['binding_type'] = 'action_form_only' id = self.env['ir.model.data']._update('ir.actions.act_window', self.module, res, xml_id, noupdate=self.isnoupdate(data_node), mode=self.mode) self.idref[xml_id] = int(id)