From 4a8aee47d338901f66f10681d02e3d3626b7ee63 Mon Sep 17 00:00:00 2001 From: Romain Derie Date: Wed, 25 Nov 2020 15:34:08 +0000 Subject: [PATCH] [FIX] base: ignore user lang when comparing with arch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without this commit, when the compare/reset view feature was reading the arch, it would translate it. 3 issues : - When reading from file (hard reset), it would translate the file version - When reading current arch, it would translate it - When reading compare view arch, it would translate it closes odoo/odoo#62521 X-original-commit: 1aa4d3cb57844c24d8520b6b974bb36526392ecf Signed-off-by: Jérémy Kersten (jke) Signed-off-by: Romain Derie --- odoo/addons/base/models/ir_ui_view.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/odoo/addons/base/models/ir_ui_view.py b/odoo/addons/base/models/ir_ui_view.py index 5b3284de7bd..e2f8fc6616c 100644 --- a/odoo/addons/base/models/ir_ui_view.py +++ b/odoo/addons/base/models/ir_ui_view.py @@ -1879,10 +1879,10 @@ class ResetViewArchWizard(models.TransientModel): diff_to = view.view_id.arch_prev diff_to_name = _("Previous Arch") elif view.reset_mode == 'other_view': - diff_to = view.compare_view_id.arch + diff_to = view.compare_view_id.with_context(lang=None).arch diff_to_name = get_table_name(view.compare_view_id) elif view.reset_mode == 'hard' and view.view_id.arch_fs: - diff_to = view.view_id.with_context(read_arch_from_file=True).arch + diff_to = view.view_id.with_context(read_arch_from_file=True, lang=None).arch diff_to_name = _("File Arch") view.arch_to_compare = diff_to @@ -1891,11 +1891,12 @@ class ResetViewArchWizard(models.TransientModel): view.arch_diff = False view.has_diff = False else: + view_arch = view.view_id.with_context(lang=None).arch view.arch_diff = get_diff( - (view.view_id.arch, get_table_name(view.view_id) if view.reset_mode == 'other_view' else _("Current Arch")), + (view_arch, get_table_name(view.view_id) if view.reset_mode == 'other_view' else _("Current Arch")), (diff_to, diff_to_name), ) - view.has_diff = view.view_id.arch != diff_to + view.has_diff = view_arch != diff_to def reset_view_button(self): self.ensure_one()