From 07eb4dc3f996435567bb20de722acd4e3db11eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 26 Aug 2024 19:01:42 +0200 Subject: [PATCH] Simplify PYSON expression of order point fields --- modules/stock_supply/order_point.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/stock_supply/order_point.py b/modules/stock_supply/order_point.py index 213b0bedfd..f0966f2ed8 100644 --- a/modules/stock_supply/order_point.py +++ b/modules/stock_supply/order_point.py @@ -6,7 +6,7 @@ from sql import Null from trytond.i18n import gettext from trytond.model import ModelSQL, ModelView, fields from trytond.pool import Pool -from trytond.pyson import Equal, Eval, If, In, Not +from trytond.pyson import Eval, If from trytond.transaction import Transaction from .exceptions import OrderPointValidationError @@ -25,8 +25,10 @@ class OrderPoint(ModelSQL, ModelView): domain=[ ('type', '=', 'goods'), ('consumable', '=', False), - ('purchasable', 'in', If(Equal(Eval('type'), 'purchase'), - [True], [True, False])), + ('purchasable', 'in', + If(Eval('type') == 'purchase', + [True], + [True, False])), ], context={ 'company': Eval('company', -1), @@ -43,7 +45,7 @@ class OrderPoint(ModelSQL, ModelView): 'stock.location', 'Provisioning Location', domain=[('type', 'in', ['storage', 'view'])], states={ - 'invisible': Not(Equal(Eval('type'), 'internal')), + 'invisible': Eval('type') != 'internal', 'required': ((Eval('type') == 'internal') & (Eval('min_quantity', None) != None)), # noqa: E711 })