diff --git a/CHANGELOG b/CHANGELOG index d13fb71450..18adb1b202 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +* Allow services to be deactivated + Version 5.2.0 - 2019-05-06 * Bug fixes (see mercurial logs for details) * Use ir.calendar.day diff --git a/service.py b/service.py index 0132f6307a..93e8a47e36 100644 --- a/service.py +++ b/service.py @@ -1,12 +1,12 @@ # This file is part of Tryton. The COPYRIGHT file at the top level of # this repository contains the full copyright notices and license terms. -from trytond.model import ModelSQL, ModelView, fields +from trytond.model import ModelSQL, ModelView, DeactivableMixin, fields from trytond.pyson import Eval __all__ = ['Service'] -class Service(ModelSQL, ModelView): +class Service(DeactivableMixin, ModelSQL, ModelView): "Subscription Service" __name__ = 'sale.subscription.service' diff --git a/view/service_form.xml b/view/service_form.xml index 513de7dc66..991031d5bf 100644 --- a/view/service_form.xml +++ b/view/service_form.xml @@ -3,7 +3,9 @@ this repository contains the full copyright notices and license terms. -->