diff --git a/modules/account_payment_clearing/CHANGELOG b/modules/account_payment_clearing/CHANGELOG index 49d7b24d01..a9c33d296d 100644 --- a/modules/account_payment_clearing/CHANGELOG +++ b/modules/account_payment_clearing/CHANGELOG @@ -1,3 +1,4 @@ +* Ask for the clearing date when the payment group succeeds Version 7.6.0 - 2025-04-28 -------------------------- diff --git a/modules/account_payment_clearing/doc/design.rst b/modules/account_payment_clearing/doc/design.rst index 17b64ba547..208fa16ee7 100644 --- a/modules/account_payment_clearing/doc/design.rst +++ b/modules/account_payment_clearing/doc/design.rst @@ -30,6 +30,9 @@ Succeed Payment The *Succeed Payment* wizard asks for the date to use for the clearing `Account Move ` before succeeding the payment. +.. note:: The wizard is also used to succeed `Payment Group + `. + .. _model-account.payment.journal: Payment Journal diff --git a/modules/account_payment_clearing/payment.py b/modules/account_payment_clearing/payment.py index f694628a55..3458025400 100644 --- a/modules/account_payment_clearing/payment.py +++ b/modules/account_payment_clearing/payment.py @@ -391,6 +391,13 @@ class Group(metaclass=PoolMeta): help="All payments in the group are reconciled."), 'get_reconciled', searcher='search_reconciled') + @classmethod + def __setup__(cls): + super().__setup__() + cls._buttons.update({ + 'succeed_wizard': cls._buttons['succeed'], + }) + @classmethod def get_reconciled(cls, groups, name): pool = Pool() @@ -432,6 +439,12 @@ class Group(metaclass=PoolMeta): group_by=payment.group) return [('id', 'in', query)] + @classmethod + @ModelView.button_action( + 'account_payment_clearing.wizard_payment_group_succeed') + def succeed_wizard(cls, groups): + pass + @classmethod def reconcile_clearing(cls, groups): pool = Pool() diff --git a/modules/account_payment_clearing/payment.xml b/modules/account_payment_clearing/payment.xml index 5642beedf1..bfa5f6391c 100644 --- a/modules/account_payment_clearing/payment.xml +++ b/modules/account_payment_clearing/payment.xml @@ -22,12 +22,30 @@ this repository contains the full copyright notices and license terms. --> payment_list + + account.payment.group + + payment_group_form + + account.payment.group payment_group_list + + account.payment.group + succeed_wizard + Succeed + + + + Succeed Groups + account.payment.succeed + account.payment.group + + Succeed Payments account.payment.succeed diff --git a/modules/account_payment_clearing/view/payment_group_form.xml b/modules/account_payment_clearing/view/payment_group_form.xml new file mode 100644 index 0000000000..16c22272e5 --- /dev/null +++ b/modules/account_payment_clearing/view/payment_group_form.xml @@ -0,0 +1,8 @@ + + + + +