From fd471c70963b06cd157ee3a87c644788599aa9da Mon Sep 17 00:00:00 2001 From: jbw Date: Tue, 6 Jul 2021 09:13:41 +0000 Subject: [PATCH] [FIX] account: fix partner mapping with notes on reconcile models On reconcile models, a rule can be set to map a partner to a bstline if the bstline "Notes" matches a regex. This "Notes" field is actually the "narration" field inherited from move. In commit 0f3c7f153e8bd20f83b7d1df031634996d36935b this field is converted from Text to Html. This breaks the regex match. The fix converts back the field value to text for the regex check. closes odoo/odoo#73618 Task: 2427089 X-original-commit: 8e9616034678a627f92740487f20cf66e60c0f30 Signed-off-by: Laurent Smet Signed-off-by: jbw-odoo --- addons/account/models/account_reconcile_model.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/account/models/account_reconcile_model.py b/addons/account/models/account_reconcile_model.py index 79e4b762a7b..29dcc0ce3db 100644 --- a/addons/account/models/account_reconcile_model.py +++ b/addons/account/models/account_reconcile_model.py @@ -9,6 +9,7 @@ from math import copysign import itertools from collections import defaultdict from dateutil.relativedelta import relativedelta +import html2text class AccountReconcileModelPartnerMapping(models.Model): _name = 'account.reconcile.model.partner.mapping' @@ -756,7 +757,7 @@ class AccountReconcileModel(models.Model): for partner_mapping in self.partner_mapping_line_ids: match_payment_ref = re.match(partner_mapping.payment_ref_regex, st_line.payment_ref) if partner_mapping.payment_ref_regex else True - match_narration = re.match(partner_mapping.narration_regex, st_line.narration or '') if partner_mapping.narration_regex else True + match_narration = re.match(partner_mapping.narration_regex, html2text.html2text(st_line.narration or '').rstrip()) if partner_mapping.narration_regex else True if match_payment_ref and match_narration: return partner_mapping.partner_id