From c816feb80d7ca65a2236cf0f745f5fd1651bc677 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Fri, 7 Oct 2022 13:01:12 +0200 Subject: [PATCH 1/2] [IMP] account_payment_partner: Make payment mode editable on journal item This field was editable in previous version before invoice > move refactoring, and it's logic to allow to change payment mode once the invoice has been posted without the need of resetting it to draft. Thus, the field has been changed to computed writable field, taking care of the consequences at model level (compute) and view level (add the field in views + proper attrs). This commits adds tracking=True to the payment mode field as well to be aware when and who the payment mode is changed in the invoice, no matter if directly changed in draft, or through the change on the journal item. TT39850 --- .../models/account_move.py | 1 + .../models/account_move_line.py | 18 ++++++++++++- .../tests/test_account_payment_partner.py | 4 +++ .../views/account_move_line.xml | 27 ++++++++++++++++++- 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/account_payment_partner/models/account_move.py b/account_payment_partner/models/account_move.py index 3e36db944..70ec9e8ea 100644 --- a/account_payment_partner/models/account_move.py +++ b/account_payment_partner/models/account_move.py @@ -22,6 +22,7 @@ class AccountMove(models.Model): ondelete="restrict", readonly=False, check_company=True, + tracking=True, ) bank_account_required = fields.Boolean( related="payment_mode_id.payment_method_id.bank_account_required", readonly=True diff --git a/account_payment_partner/models/account_move_line.py b/account_payment_partner/models/account_move_line.py index a49a1be58..0fb81d617 100644 --- a/account_payment_partner/models/account_move_line.py +++ b/account_payment_partner/models/account_move_line.py @@ -13,9 +13,10 @@ class AccountMoveLine(models.Model): store=True, ondelete="restrict", index=True, + readonly=False, ) - @api.depends("move_id.payment_mode_id") + @api.depends("move_id", "move_id.payment_mode_id") def _compute_payment_mode(self): for line in self: if line.move_id.is_invoice() and line.account_type in ( @@ -25,3 +26,18 @@ class AccountMoveLine(models.Model): line.payment_mode_id = line.move_id.payment_mode_id else: line.payment_mode_id = False + + def write(self, vals): + """Propagate up to the move the payment mode if applies.""" + if "payment_mode_id" in vals: + for record in self: + move = ( + self.env["account.move"].browse(vals.get("move_id", 0)) + or record.move_id + ) + if ( + move.payment_mode_id.id != vals["payment_mode_id"] + and move.is_invoice() + ): + move.payment_mode_id = vals["payment_mode_id"] + return super().write(vals) diff --git a/account_payment_partner/tests/test_account_payment_partner.py b/account_payment_partner/tests/test_account_payment_partner.py index 55e4794d5..19ccb1ee2 100644 --- a/account_payment_partner/tests/test_account_payment_partner.py +++ b/account_payment_partner/tests/test_account_payment_partner.py @@ -254,6 +254,10 @@ class TestAccountPaymentPartner(TransactionCase): lambda l: l.account_id.account_type == "liability_payable" ) self.assertEqual(invoice.payment_mode_id, aml[0].payment_mode_id) + # Test payment mode change on aml + mode = self.supplier_payment_mode.copy() + aml.payment_mode_id = mode + self.assertEqual(invoice.payment_mode_id, mode) def test_invoice_create_out_invoice(self): invoice = self._create_invoice( diff --git a/account_payment_partner/views/account_move_line.xml b/account_payment_partner/views/account_move_line.xml index 959b9429e..f14a261e9 100644 --- a/account_payment_partner/views/account_move_line.xml +++ b/account_payment_partner/views/account_move_line.xml @@ -11,9 +11,34 @@ - + + + + + account.move.line.tree - Add payment mode + account.move.line + + + + + + + + + From 2b4bc079c2342b254c357069636b3a7404d80a1e Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Wed, 18 Jan 2023 10:02:31 +0100 Subject: [PATCH 2/2] [IMP] account_payment_partner: Make payment mode editable on entry Complement of 998f8df6aa254266c015fab144ba290e1a386cf0 Extend the editability to the journal entry (account.move), taking as criteria if there's no reconciliation made, which is the definitory one. It includes test for this new feature, both the mode propagation and the editability check. TT39850 --- account_payment_partner/models/account_move.py | 16 ++++++++++++++++ .../tests/test_account_payment_partner.py | 4 ++++ .../views/account_move_view.xml | 3 ++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/account_payment_partner/models/account_move.py b/account_payment_partner/models/account_move.py index 70ec9e8ea..c6b4ac2e1 100644 --- a/account_payment_partner/models/account_move.py +++ b/account_payment_partner/models/account_move.py @@ -33,6 +33,10 @@ class AccountMove(models.Model): ondelete="restrict", readonly=False, ) + has_reconciled_items = fields.Boolean( + help="Technical field for supporting the editability of the payment mode", + compute="_compute_has_reconciled_items", + ) @api.depends("move_type") def _compute_payment_mode_filter_type_domain(self): @@ -94,6 +98,18 @@ class AccountMove(models.Model): continue return res + @api.depends("line_ids.matched_credit_ids", "line_ids.matched_debit_ids") + def _compute_has_reconciled_items(self): + for record in self: + lines_to_consider = record.line_ids.filtered( + lambda x: x.account_id.account_type + in ("asset_receivable", "liability_payable") + ) + record.has_reconciled_items = bool( + lines_to_consider.matched_credit_ids + + lines_to_consider.matched_debit_ids + ) + def _reverse_moves(self, default_values_list=None, cancel=False): if not default_values_list: default_values_list = [{} for _ in self] diff --git a/account_payment_partner/tests/test_account_payment_partner.py b/account_payment_partner/tests/test_account_payment_partner.py index 19ccb1ee2..517746b27 100644 --- a/account_payment_partner/tests/test_account_payment_partner.py +++ b/account_payment_partner/tests/test_account_payment_partner.py @@ -258,6 +258,10 @@ class TestAccountPaymentPartner(TransactionCase): mode = self.supplier_payment_mode.copy() aml.payment_mode_id = mode self.assertEqual(invoice.payment_mode_id, mode) + # Test payment mode editability on account move + self.assertFalse(invoice.has_reconciled_items) + invoice.payment_mode_id = self.supplier_payment_mode + self.assertEqual(aml.payment_mode_id, self.supplier_payment_mode) def test_invoice_create_out_invoice(self): invoice = self._create_invoice( diff --git a/account_payment_partner/views/account_move_view.xml b/account_payment_partner/views/account_move_view.xml index 65dd32214..f4e60fc01 100644 --- a/account_payment_partner/views/account_move_view.xml +++ b/account_payment_partner/views/account_move_view.xml @@ -28,8 +28,9 @@ name="payment_mode_id" domain="[('payment_type', '=', payment_mode_filter_type_domain), ('company_id', '=', company_id)]" widget="selection" - attrs="{'readonly': [('state', '!=', 'draft')], 'invisible': [('move_type', 'not in', ('out_invoice','out_refund','in_invoice','in_refund'))]}" + attrs="{'readonly': [('has_reconciled_items', '=', True)], 'invisible': [('move_type', 'not in', ('out_invoice','out_refund','in_invoice','in_refund'))]}" /> +