Techsystech
/
server-tools
mirror of https://github.com/OCA/server-tools.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #3109 into 17.0 

Signed-off-by sebalix
pull/3115/merge
OCA-git-bot 2024-11-21 15:39:51 +00:00
parent ef360a882d 3be0b9218b
commit 776fa31fd8
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.oca/oca-port/blacklist/base_view_inheritance_extension.json 100644
View File

@ -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"
}
}

10
base_view_inheritance_extension/models/ir_ui_view.py
View File

@ -3,11 +3,16 @@
# Copyright 2021 Camptocamp SA (https://www.camptocamp.com). # Copyright 2021 Camptocamp SA (https://www.camptocamp.com).
# Copyright 2023 Tecnativa - Carlos Dauden # Copyright 2023 Tecnativa - Carlos Dauden
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
import ast import ast
import logging
import re 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 lxml import etree
from odoo import api, models from odoo import api, models
@ -176,6 +181,7 @@ class IrUiView(models.Model):
else: else:
new_value = str(expression.AND([old_domain, new_domain])) new_value = str(expression.AND([old_domain, new_domain]))
new_value = self.str2var_domain_text(new_value) new_value = self.str2var_domain_text(new_value)
old_value = "".join(old_value.splitlines())
else: else:
# We must ensure that the domain definition has not line breaks because # We must ensure that the domain definition has not line breaks because
# in update mode the domain cause an invalid syntax error # in update mode the domain cause an invalid syntax error