diff --git a/CHANGELOG b/CHANGELOG index e60324c28b..d2cafbfb53 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +* Make price list deactivable + Version 5.2.0 - 2019-05-06 * Bug fixes (see mercurial logs for details) diff --git a/price_list.py b/price_list.py index 54c1b3572f..431e9002b8 100644 --- a/price_list.py +++ b/price_list.py @@ -6,7 +6,7 @@ from simpleeval import simple_eval from trytond.i18n import gettext from trytond.model import ModelView, ModelSQL, MatchMixin, fields, \ - sequence_ordered + DeactivableMixin, sequence_ordered from trytond.tools import decistmt from trytond.pyson import If, Eval from trytond.transaction import Transaction @@ -17,7 +17,7 @@ from .exceptions import FormulaError __all__ = ['PriceList', 'PriceListLine'] -class PriceList(ModelSQL, ModelView): +class PriceList(DeactivableMixin, ModelSQL, ModelView): 'Price List' __name__ = 'product.price_list' diff --git a/view/price_list_form.xml b/view/price_list_form.xml index ff7812512a..05470df002 100644 --- a/view/price_list_form.xml +++ b/view/price_list_form.xml @@ -4,10 +4,16 @@ this repository contains the full copyright notices and license terms. -->