From 7565180fcc2739ecb9bc6db9fd97d0c92a991133 Mon Sep 17 00:00:00 2001 From: oca-git-bot Date: Thu, 31 Mar 2022 17:36:58 +0200 Subject: [PATCH] [IMP] update dotfiles [ci skip] --- base_import_match/models/base.py | 2 +- base_import_match/models/base_import.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base_import_match/models/base.py b/base_import_match/models/base.py index 327818c9..e6ab2086 100644 --- a/base_import_match/models/base.py +++ b/base_import_match/models/base.py @@ -47,7 +47,7 @@ class Base(models.AbstractModel): # To generate externals IDS. match.export_data(fields) ext_id = match.get_external_id() - row["id"] = ext_id[match.id] if match else row.get("id", u"") + row["id"] = ext_id[match.id] if match else row.get("id", "") # Store the modified row, in the same order as fields newdata.append(tuple(row[f] for f in clean_fields)) # We will import the patched data to get updates on matches diff --git a/base_import_match/models/base_import.py b/base_import_match/models/base_import.py index 16f4e6a5..874a1722 100644 --- a/base_import_match/models/base_import.py +++ b/base_import_match/models/base_import.py @@ -42,7 +42,7 @@ class BaseImportMatch(models.Model): def _compute_name(self): """Automatic self-descriptive name for the setting records.""" for one in self: - one.name = u"{}: {}".format( + one.name = "{}: {}".format( one.model_id.display_name, " + ".join(one.field_ids.mapped("display_name")), ) @@ -163,7 +163,7 @@ class BaseImportMatchField(models.Model): def name_get(self): result = [] for one in self: - pattern = u"{name} ({cond})" if one.conditional else u"{name}" + pattern = "{name} ({cond})" if one.conditional else "{name}" name = pattern.format( name=one.field_id.name, cond=one.imported_value,