From cc4104a0d8a8d490f24401696f8a53c4bb7bf551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 12 Sep 2020 18:32:14 +0200 Subject: [PATCH] Allow payment journal to be deactivated issue9575 review327971002 --- CHANGELOG | 1 + payment.py | 5 +++-- view/payment_journal_form.xml | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 9e63367f0f..280dcd1853 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +* Allow payment journal to be deactivated * Allow going back to processing state * Add aggregated information on Payment groups diff --git a/payment.py b/payment.py index 7e49316e0f..6b7f4783c0 100644 --- a/payment.py +++ b/payment.py @@ -7,7 +7,8 @@ from itertools import groupby from sql.aggregate import Sum, Count from trytond.i18n import gettext -from trytond.model import Workflow, ModelView, ModelSQL, fields +from trytond.model import ( + Workflow, ModelView, ModelSQL, DeactivableMixin, fields) from trytond.model.exceptions import AccessError from trytond.pyson import Eval, If from trytond.rpc import RPC @@ -25,7 +26,7 @@ KINDS = [ ] -class Journal(ModelSQL, ModelView): +class Journal(DeactivableMixin, ModelSQL, ModelView): 'Payment Journal' __name__ = 'account.payment.journal' name = fields.Char('Name', required=True) diff --git a/view/payment_journal_form.xml b/view/payment_journal_form.xml index c5683aeb75..d07fe1cffe 100644 --- a/view/payment_journal_form.xml +++ b/view/payment_journal_form.xml @@ -4,6 +4,9 @@ this repository contains the full copyright notices and license terms. -->