From 5ea5007bfc44e19157ee8f59790b3b3c83d91e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 21 Jul 2020 14:32:09 +0200 Subject: [PATCH] Allow keyword action for all models issue9450 review325681002 --- CHANGELOG | 1 + trytond/ir/action.py | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index dac0c39d78..7b0034e443 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +* Allow keyword action for all models * Add sortable_values in tools * Remove default colors on graph and calendar * Add model, record and records attributes on Wizard diff --git a/trytond/ir/action.py b/trytond/ir/action.py index 823703b67f..96e8252dc0 100644 --- a/trytond/ir/action.py +++ b/trytond/ir/action.py @@ -204,7 +204,7 @@ class ActionKeyword(ModelSQL, ModelView): def models_get(): pool = Pool() Model = pool.get('ir.model') - return [(m.model, m.name) for m in Model.search([])] + return [(None, '')] + [(m.model, m.name) for m in Model.search([])] @classmethod def delete(cls, keywords): @@ -246,7 +246,10 @@ class ActionKeyword(ModelSQL, ModelView): clause = [ ('keyword', '=', keyword), - ('model', '=', model + ',-1'), + ['OR', + ('model', '=', model + ',-1'), + ('model', '=', None), + ], ] if model_id >= 0: clause = ['OR',