From 6c6c3d70906922d1b6e3abbf7745b5691110fcbb Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 26 Jun 2020 13:41:16 +0000 Subject: [PATCH] [FIX] base: reintroduce log method in merge partner wizard Well odoo/odoo#40872 is definitely the gift that keeps on giving, after causing grief with the logging configuration change turns out inlining the method was *also* a terrible idea because it's overridden in `mail` in order to note merges on the destination partner, which I apparently completely missed back then. Task 2285876 closes odoo/odoo#53756 X-original-commit: 41209dababfaebca7bfd3be6ee5a2f41e9bb4ff5 Signed-off-by: Xavier Morel (xmo) --- odoo/addons/base/wizard/base_partner_merge.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/odoo/addons/base/wizard/base_partner_merge.py b/odoo/addons/base/wizard/base_partner_merge.py index fe9dd800bb3..2bd97ff085e 100644 --- a/odoo/addons/base/wizard/base_partner_merge.py +++ b/odoo/addons/base/wizard/base_partner_merge.py @@ -321,11 +321,14 @@ class MergePartnerAutomatic(models.TransientModel): self._update_reference_fields(src_partners, dst_partner) self._update_values(src_partners, dst_partner) - _logger.info('(uid = %s) merged the partners %r with %s', self._uid, src_partners.ids, dst_partner.id) + self._log_merge_operation(src_partners, dst_partner) # delete source partner, since they are merged src_partners.unlink() + def _log_merge_operation(self, src_partners, dst_partner): + _logger.info('(uid = %s) merged the partners %r with %s', self._uid, src_partners.ids, dst_partner.id) + # ---------------------------------------- # Helpers # ----------------------------------------