From 808dc5b90ef1aecba1fede76a3f457a26979ea0e Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Tue, 1 Mar 2022 15:03:18 +0100 Subject: [PATCH 1/3] base_view_inheritance_extension: wrap import --- base_view_inheritance_extension/models/ir_ui_view.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/base_view_inheritance_extension/models/ir_ui_view.py b/base_view_inheritance_extension/models/ir_ui_view.py index bd43e426e..1f5235db6 100644 --- a/base_view_inheritance_extension/models/ir_ui_view.py +++ b/base_view_inheritance_extension/models/ir_ui_view.py @@ -3,11 +3,16 @@ # Copyright 2021 Camptocamp SA (https://www.camptocamp.com). # Copyright 2023 Tecnativa - Carlos Dauden # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). - import ast +import logging import re -import astor +try: + import astor +except ImportError as err: # pragma: no cover + _logger = logging.getLogger(__name__) + _logger.debug(err) + from lxml import etree from odoo import api, models From 444feb8523bf9ea4a38f8899fbd120ee68e4d28c Mon Sep 17 00:00:00 2001 From: Alessio Renda Date: Wed, 15 May 2024 16:53:07 +0200 Subject: [PATCH 2/3] [FIX] base_view_inheritance_extension: parse old value --- base_view_inheritance_extension/models/ir_ui_view.py | 1 + 1 file changed, 1 insertion(+) diff --git a/base_view_inheritance_extension/models/ir_ui_view.py b/base_view_inheritance_extension/models/ir_ui_view.py index 1f5235db6..09cf6e2ca 100644 --- a/base_view_inheritance_extension/models/ir_ui_view.py +++ b/base_view_inheritance_extension/models/ir_ui_view.py @@ -181,6 +181,7 @@ class IrUiView(models.Model): else: new_value = str(expression.AND([old_domain, new_domain])) new_value = self.str2var_domain_text(new_value) + old_value = "".join(old_value.splitlines()) else: # We must ensure that the domain definition has not line breaks because # in update mode the domain cause an invalid syntax error From 3be0b9218bbce0c4957059764acd792d5c4d230f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Alix?= Date: Wed, 6 Nov 2024 09:53:46 +0100 Subject: [PATCH 3/3] oca-port: blacklist PR(s) 1937, 2216, 2457 for base_view_inheritance_extension --- .../blacklist/base_view_inheritance_extension.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .oca/oca-port/blacklist/base_view_inheritance_extension.json diff --git a/.oca/oca-port/blacklist/base_view_inheritance_extension.json b/.oca/oca-port/blacklist/base_view_inheritance_extension.json new file mode 100644 index 000000000..1681c688f --- /dev/null +++ b/.oca/oca-port/blacklist/base_view_inheritance_extension.json @@ -0,0 +1,7 @@ +{ + "pull_requests": { + "OCA/server-tools#1937": "requirements.txt update (not relevant)", + "OCA/server-tools#2216": "requirements.txt update (not relevant)", + "OCA/server-tools#2457": "(auto) Nothing to port from PR #2457" + } +}