diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-05-09 13:55:27 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-05-09 13:55:27 +0200 |
| commit | eeae2b80ea9e679a86ca7c8982e679b9ee9c9023 (patch) | |
| tree | fff56bc907eb6874dc7a9b78382bd9837441b918 /odoo | |
| parent | 7b67a1474b4f8df411804cebf8ebd7afa193d0dd (diff) | |
| parent | b793e23ae53b5f1edab8c98bbed7ac5f5f921280 (diff) | |
[MERGE] forward port branch 11.0 up to b793e23ae53
Diffstat (limited to 'odoo')
| -rw-r--r-- | odoo/addons/base/models/ir_actions.py | 1 | ||||
| -rw-r--r-- | odoo/models.py | 4 | ||||
| -rw-r--r-- | odoo/tools/convert.py | 7 |
3 files changed, 10 insertions, 2 deletions
diff --git a/odoo/addons/base/models/ir_actions.py b/odoo/addons/base/models/ir_actions.py index f9ec9413e2f..5559429709d 100644 --- a/odoo/addons/base/models/ir_actions.py +++ b/odoo/addons/base/models/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 3d074b3679a..6b93f68972e 100644 --- a/odoo/models.py +++ b/odoo/models.py @@ -1392,6 +1392,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'] @@ -1399,6 +1402,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 9a46a88f175..16dd569239f 100644 --- a/odoo/tools/convert.py +++ b/odoo/tools/convert.py @@ -426,11 +426,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) |