From 80a7fe6bbb89d3484a55e9f913f0c4246e0bd94b Mon Sep 17 00:00:00 2001
From: hparfr <raphael.reverdy@akretion.com>
Date: Wed, 29 Mar 2023 18:30:44 +0200
Subject: [PATCH 01/18] pattern_import_export: no data is success

---
 pattern_import_export/models/pattern_file.py  | 5 +++++
 pattern_import_export/readme/CONTRIBUTORS.rst | 1 +
 2 files changed, 6 insertions(+)

diff --git a/pattern_import_export/models/pattern_file.py b/pattern_import_export/models/pattern_file.py
index ccbe4879..ab6e6912 100644
--- a/pattern_import_export/models/pattern_file.py
+++ b/pattern_import_export/models/pattern_file.py
@@ -170,6 +170,11 @@ def split_in_chunk(self):
                 previous_idx = idx
             if items:
                 self._create_chunk(start_idx, idx, items)
+            else:
+                # document has an header and no data lines
+                # valid document. So create a dummy chunk
+                # to have progression and status
+                self._create_chunk(-1, -1, [])
         except Exception as e:
             self.state = "failed"
             self.info = _("Failed to create the chunk: %s") % e
diff --git a/pattern_import_export/readme/CONTRIBUTORS.rst b/pattern_import_export/readme/CONTRIBUTORS.rst
index bd541f8a..f720d113 100644
--- a/pattern_import_export/readme/CONTRIBUTORS.rst
+++ b/pattern_import_export/readme/CONTRIBUTORS.rst
@@ -2,3 +2,4 @@
 * Sébastien Beau <sebastien.beau@akretion.com>
 * François Honoré (ACSONE SA/NV) <francois.honore@acsone.eu>
 * Kevin Khao <kevin.khao@akretion.com>
+* Raphaël Reverdy <raphael.reverdy@akretion.com>

From a28a6be5fbb6896c8f5f5f59604068a2e097f2b7 Mon Sep 17 00:00:00 2001
From: hparfr <raphael.reverdy@akretion.com>
Date: Mon, 3 Apr 2023 17:38:15 +0200
Subject: [PATCH 02/18] pattern_import_export: add order by

no need to scroll down the page
---
 pattern_import_export/models/pattern_file.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pattern_import_export/models/pattern_file.py b/pattern_import_export/models/pattern_file.py
index ab6e6912..8fe2f8b9 100644
--- a/pattern_import_export/models/pattern_file.py
+++ b/pattern_import_export/models/pattern_file.py
@@ -12,6 +12,7 @@ class PatternFile(models.Model):
     _name = "pattern.file"
     _inherits = {"ir.attachment": "attachment_id"}
     _description = "Attachment with pattern file metadata"
+    _order = "id desc"
 
     attachment_id = fields.Many2one("ir.attachment", required=True, ondelete="cascade")
     state = fields.Selection(

From 699a1f9ad94cca8bcd3042bd5b4bb81815689020 Mon Sep 17 00:00:00 2001
From: hparfr <raphael.reverdy@akretion.com>
Date: Fri, 7 Apr 2023 08:57:41 +0200
Subject: [PATCH 03/18] pattern_import_export: improve ux

Add a button to start a new import from
pattern.file view
---
 pattern_import_export/views/pattern_file.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pattern_import_export/views/pattern_file.xml b/pattern_import_export/views/pattern_file.xml
index 001e3acf..5b722e8d 100644
--- a/pattern_import_export/views/pattern_file.xml
+++ b/pattern_import_export/views/pattern_file.xml
@@ -25,6 +25,13 @@
         <field name="arch" type="xml">
             <form string="pattern_file_form" create="false">
                 <header>
+                    <button
+                        name="%(import_pattern_wizard_action)d"
+                        string="New Import"
+                        class="oe_highlight"
+                        type="action"
+                        context="{'default_pattern_config_id': pattern_config_id, 'hide_pattern_config_id': True}"
+                    />
                     <button
                         name="split_in_chunk"
                         string="Re-launch Import"

From e04eff377e309b3f36951c52d177c53d8a1499f7 Mon Sep 17 00:00:00 2001
From: shopinvader-git-bot <shopinvader-git-bot@shopinvader.com>
Date: Fri, 13 Oct 2023 09:37:05 +0000
Subject: [PATCH 04/18] [UPD] README.rst

---
 pattern_import_export/README.rst                    | 1 +
 pattern_import_export/static/description/index.html | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pattern_import_export/README.rst b/pattern_import_export/README.rst
index 61b8e7bb..9db6526f 100644
--- a/pattern_import_export/README.rst
+++ b/pattern_import_export/README.rst
@@ -199,6 +199,7 @@ Contributors
 * Sébastien Beau <sebastien.beau@akretion.com>
 * François Honoré (ACSONE SA/NV) <francois.honore@acsone.eu>
 * Kevin Khao <kevin.khao@akretion.com>
+* Raphaël Reverdy <raphael.reverdy@akretion.com>
 
 Maintainers
 ~~~~~~~~~~~
diff --git a/pattern_import_export/static/description/index.html b/pattern_import_export/static/description/index.html
index 634d6361..c1a7faa7 100644
--- a/pattern_import_export/static/description/index.html
+++ b/pattern_import_export/static/description/index.html
@@ -627,6 +627,7 @@ <h1>Contributors</h1>
 <li>Sébastien Beau &lt;<a class="reference external" href="mailto:sebastien.beau&#64;akretion.com">sebastien.beau&#64;akretion.com</a>&gt;</li>
 <li>François Honoré (ACSONE SA/NV) &lt;<a class="reference external" href="mailto:francois.honore&#64;acsone.eu">francois.honore&#64;acsone.eu</a>&gt;</li>
 <li>Kevin Khao &lt;<a class="reference external" href="mailto:kevin.khao&#64;akretion.com">kevin.khao&#64;akretion.com</a>&gt;</li>
+<li>Raphaël Reverdy &lt;<a class="reference external" href="mailto:raphael.reverdy&#64;akretion.com">raphael.reverdy&#64;akretion.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">

From 47aea420fbe8141b3acefc5f881ff8754096a18c Mon Sep 17 00:00:00 2001
From: shopinvader-git-bot <shopinvader-git-bot@shopinvader.com>
Date: Fri, 13 Oct 2023 09:37:05 +0000
Subject: [PATCH 05/18] pattern_import_export 14.0.2.6.0

---
 pattern_import_export/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pattern_import_export/__manifest__.py b/pattern_import_export/__manifest__.py
index f004cf9b..7a6603ce 100644
--- a/pattern_import_export/__manifest__.py
+++ b/pattern_import_export/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Pattern Import Export",
     "summary": "Pattern for import or export",
-    "version": "14.0.2.5.1",
+    "version": "14.0.2.6.0",
     "category": "Extra Tools",
     "author": "Akretion",
     "website": "https://github.com/Shopinvader/pattern-import-export",

From 1e81589c8d03265a129ad65b699bc4e8e211caa8 Mon Sep 17 00:00:00 2001
From: shopinvader-git-bot <shopinvader-git-bot@shopinvader.com>
Date: Fri, 13 Oct 2023 11:41:00 +0000
Subject: [PATCH 06/18] pattern_import_export 14.0.2.7.0

---
 pattern_import_export/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pattern_import_export/__manifest__.py b/pattern_import_export/__manifest__.py
index 7a6603ce..6ab5b073 100644
--- a/pattern_import_export/__manifest__.py
+++ b/pattern_import_export/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Pattern Import Export",
     "summary": "Pattern for import or export",
-    "version": "14.0.2.6.0",
+    "version": "14.0.2.7.0",
     "category": "Extra Tools",
     "author": "Akretion",
     "website": "https://github.com/Shopinvader/pattern-import-export",

From c57cf10516da82d2b67b03956149227e7bf8403c Mon Sep 17 00:00:00 2001
From: shopinvader-git-bot <shopinvader-git-bot@shopinvader.com>
Date: Thu, 21 Dec 2023 09:07:32 +0000
Subject: [PATCH 07/18] [UPD] README.rst

---
 pattern_import_export/README.rst              |  9 +++++---
 .../static/description/index.html             | 22 ++++++++++---------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/pattern_import_export/README.rst b/pattern_import_export/README.rst
index 9db6526f..93088064 100644
--- a/pattern_import_export/README.rst
+++ b/pattern_import_export/README.rst
@@ -2,10 +2,13 @@
 Pattern Import Export
 =====================
 
-.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:1d0435b3d5c600c08f64b1cab35bef10122bf3bdd927445ea3b54000a0f718f2
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
@@ -17,7 +20,7 @@ Pattern Import Export
     :target: https://github.com/shopinvader/pattern-import-export/tree/14.0/pattern_import_export
     :alt: shopinvader/pattern-import-export
 
-|badge1| |badge2| |badge3| 
+|badge1| |badge2| |badge3|
 
 Overview
 ~~~~~~~~
@@ -179,7 +182,7 @@ Bug Tracker
 
 Bugs are tracked on `GitHub Issues <https://github.com/shopinvader/pattern-import-export/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
-If you spotted it first, help us smashing it by providing a detailed and welcomed
+If you spotted it first, help us to smash it by providing a detailed and welcomed
 `feedback <https://github.com/shopinvader/pattern-import-export/issues/new?body=module:%20pattern_import_export%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
diff --git a/pattern_import_export/static/description/index.html b/pattern_import_export/static/description/index.html
index c1a7faa7..c1c76ed8 100644
--- a/pattern_import_export/static/description/index.html
+++ b/pattern_import_export/static/description/index.html
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
 <title>Pattern Import Export</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
 
-See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
 */
 
@@ -366,8 +366,10 @@ <h1 class="title">Pattern Import Export</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:1d0435b3d5c600c08f64b1cab35bef10122bf3bdd927445ea3b54000a0f718f2
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/shopinvader/pattern-import-export/tree/14.0/pattern_import_export"><img alt="shopinvader/pattern-import-export" src="https://img.shields.io/badge/github-shopinvader%2Fpattern--import--export-lightgray.png?logo=github" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/shopinvader/pattern-import-export/tree/14.0/pattern_import_export"><img alt="shopinvader/pattern-import-export" src="https://img.shields.io/badge/github-shopinvader%2Fpattern--import--export-lightgray.png?logo=github" /></a></p>
 <div class="section" id="overview">
 <h1>Overview</h1>
 <p>This module extends the import/export capabilities of Odoo.</p>
@@ -385,19 +387,19 @@ <h2>Features</h2>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
-<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
-<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
+<li><a class="reference internal" href="#configuration" id="toc-entry-1">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="toc-entry-2">Usage</a></li>
 </ul>
 </div>
 <div class="section" id="configuration">
-<h3><a class="toc-backref" href="#id1">Configuration</a></h3>
+<h3><a class="toc-backref" href="#toc-entry-1">Configuration</a></h3>
 <ul class="simple">
 <li>Install another module that supports a specific file type</li>
 <li>Use the Patterns menu to configure your import/export formats</li>
 </ul>
 </div>
 <div class="section" id="usage">
-<h3><a class="toc-backref" href="#id2">Usage</a></h3>
+<h3><a class="toc-backref" href="#toc-entry-2">Usage</a></h3>
 </div>
 </div>
 </div>
@@ -605,7 +607,7 @@ <h3>Known issues / Roadmap</h3>
 <h3>Bug Tracker</h3>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/shopinvader/pattern-import-export/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
-If you spotted it first, help us smashing it by providing a detailed and welcomed
+If you spotted it first, help us to smash it by providing a detailed and welcomed
 <a class="reference external" href="https://github.com/shopinvader/pattern-import-export/issues/new?body=module:%20pattern_import_export%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>

From e41318937ebc6b1dc43f034440194aa7c3815b5c Mon Sep 17 00:00:00 2001
From: hparfr <raphael.reverdy@akretion.com>
Date: Thu, 21 Dec 2023 11:03:13 +0100
Subject: [PATCH 08/18] pre-commit

---
 pattern_import_export/migrations/12.0.4.0.0/post-migrate.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pattern_import_export/migrations/12.0.4.0.0/post-migrate.py b/pattern_import_export/migrations/12.0.4.0.0/post-migrate.py
index 49b2bfa8..d94b3896 100644
--- a/pattern_import_export/migrations/12.0.4.0.0/post-migrate.py
+++ b/pattern_import_export/migrations/12.0.4.0.0/post-migrate.py
@@ -42,9 +42,7 @@ def migrate(env, version):
              {p[flush_step]},
              id
         FROM ir_exports WHERE is_pattern IS TRUE
-        """.format(
-            p=params
-        )
+        """.format(p=params)
     )
 
     env.cr.execute(

From 9da7aab46930112389e935d83dbb7f1015d37f9d Mon Sep 17 00:00:00 2001
From: hparfr <raphael.reverdy@akretion.com>
Date: Thu, 21 Dec 2023 11:50:32 +0100
Subject: [PATCH 09/18] [IMP] pattern_import_export: pre-commit stuff

---
 pattern_import_export/demo/demo.xml            | 3 +++
 pattern_import_export/models/pattern_chunk.py  | 4 +++-
 pattern_import_export/models/pattern_config.py | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pattern_import_export/demo/demo.xml b/pattern_import_export/demo/demo.xml
index 5297c3ef..3adea117 100644
--- a/pattern_import_export/demo/demo.xml
+++ b/pattern_import_export/demo/demo.xml
@@ -8,6 +8,7 @@
             <field name="name">US, FR, BE</field>
             <field name="domain">[("code", "in", ["US", "FR", "BE"])]</field>
             <field name="model_id">res.country</field>
+            <field name="user_id" />
         </record>
         <record id="demo_filter_countries_2" model="ir.filters">
             <field name="name">European countries</field>
@@ -15,11 +16,13 @@
                 name="domain"
             >[("code", "in", ["UK", "FR", "BE", "ES", "DE"])]</field>
             <field name="model_id">res.country</field>
+            <field name="user_id" />
         </record>
         <record id="demo_filter_companies" model="ir.filters">
             <field name="name">Ignore one</field>
             <field name="domain">[("name", "!=", "Ignored company")]</field>
             <field name="model_id">res.company</field>
+            <field name="user_id" />
         </record>
 
         <!--Exports-->
diff --git a/pattern_import_export/models/pattern_chunk.py b/pattern_import_export/models/pattern_chunk.py
index 23c0947b..c1664cb4 100644
--- a/pattern_import_export/models/pattern_chunk.py
+++ b/pattern_import_export/models/pattern_chunk.py
@@ -39,7 +39,9 @@ def run_import(self):
                 pattern_config={
                     "model": model,
                     "record_ids": [],
-                    "purge_one2many": self.pattern_file_id.pattern_config_id.purge_one2many,
+                    "purge_one2many": (
+                        self.pattern_file_id.pattern_config_id.purge_one2many
+                    ),
                 }
             )
             .env[model]
diff --git a/pattern_import_export/models/pattern_config.py b/pattern_import_export/models/pattern_config.py
index 74d025f3..7fd5b02d 100644
--- a/pattern_import_export/models/pattern_config.py
+++ b/pattern_import_export/models/pattern_config.py
@@ -71,7 +71,9 @@ def _compute_pattern_file_counts(self):
             for state in ("failed", "pending", "done"):
                 field_name = "count_pattern_file_" + state
                 count = len(
-                    rec.pattern_file_ids.filtered(lambda r: r.state == state).ids
+                    rec.pattern_file_ids.filtered(
+                        lambda r, state=state: r.state == state
+                    ).ids
                 )
                 setattr(rec, field_name, count)
 

From 539a59636b9236f8056e865efbb805620ddd4916 Mon Sep 17 00:00:00 2001
From: hparfr <raphael.reverdy@akretion.com>
Date: Mon, 3 Apr 2023 17:39:35 +0200
Subject: [PATCH 10/18] pattern_import_export: search key with a domain

allow to define multiple columns as primary key
with depth > 1
---
 pattern_import_export/models/base.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pattern_import_export/models/base.py b/pattern_import_export/models/base.py
index eaa60702..fe2f164f 100644
--- a/pattern_import_export/models/base.py
+++ b/pattern_import_export/models/base.py
@@ -103,15 +103,22 @@ def _clean_identifier_key(self, res, ident_keys):
                 res[key.replace(IDENTIFIER_SUFFIX, "")] = res.pop(key)
 
     def _convert_value_to_domain(self, field_name, value):
+        # fieldname may be None
+        # todo: rename field_name to prefix
         if isinstance(value, dict):
             domain = []
+            subdom = []
             for key, val in value.items():
                 if key == ".id":
                     # .id is internal db id, so we rename it
                     key = "id"
-                domain.append(("{}.{}".format(field_name, key), "=", val))
+                # field_name may be None
+                # then key = value directly
+                dom_key = f"{field_name}.{key}" if field_name else key
+                subdom += self._convert_value_to_domain(dom_key, val)
+            domain = subdom
         else:
-            domain = [(field_name, "=", value)]
+            domain = [[field_name, "=", value]]
         return domain
 
     def _get_domain_from_identifier_key(self, res):
@@ -120,9 +127,7 @@ def _get_domain_from_identifier_key(self, res):
         for key in list(res.keys()):
             if key.endswith(IDENTIFIER_SUFFIX):
                 field_name = key.replace(IDENTIFIER_SUFFIX, "")
-                domain = expression.AND(
-                    [domain, self._convert_value_to_domain(field_name, res[key])]
-                )
+                domain += self._convert_value_to_domain(field_name, res[key])
                 ident_keys.append(key)
         return domain, ident_keys
 

From a5bc4c80d8ea0503951763257bbab6fb7f4ceabe Mon Sep 17 00:00:00 2001
From: hparfr <raphael.reverdy@akretion.com>
Date: Mon, 3 Apr 2023 17:40:48 +0200
Subject: [PATCH 11/18] pattern_import_export: allow to reference fk with
 multiple cols

---
 pattern_import_export/models/ir_fields.py | 25 ++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/pattern_import_export/models/ir_fields.py b/pattern_import_export/models/ir_fields.py
index 4add32ca..d46c4cee 100644
--- a/pattern_import_export/models/ir_fields.py
+++ b/pattern_import_export/models/ir_fields.py
@@ -127,7 +127,30 @@ def _str_to_many2many(self, model, field, value):
     def _str_to_many2one(self, model, field, value):
         if isinstance(value, dict):
             # odoo expect a list with one item
-            value = [value]
+            if len(value) == 1:
+                one_value = [value]
+                return super()._str_to_many2one(model, field, one_value)
+            else:
+                domain = model._convert_value_to_domain(None, value)
+                tosearch = field._related_comodel_name
+                record = self.env[tosearch].search(domain)
+                if len(record) > 1:
+                    # TODO improve here
+                    raise self._format_import_error(
+                        ValueError,
+                        _("%s Too many records found for %s in field '%s'"),
+                        (_(record._description), domain, tosearch),
+                    )
+                if len(record) == 0:
+                    raise self._format_import_error(
+                        ValueError,
+                        _("%s No matching record found for %s in field '%s'"),
+                        (_(record._description), domain, tosearch),
+                    )
+
+                # call core function to be sure not to miss something
+                an_id, donotcare, w2 = self.db_id_for(model, field, ".id", record.id)
+                return an_id, [] + w2
         return super()._str_to_many2one(model, field, value)
 
     @api.model

From 0f4d10a4a776dd49532b1a3c04e305c983aa40e0 Mon Sep 17 00:00:00 2001
From: hparfr <raphael.reverdy@akretion.com>
Date: Fri, 14 Apr 2023 13:21:33 +0200
Subject: [PATCH 12/18] pattern_import_export: add test

convert_value_to_domain,
pk with multiple values,
fk with multiple values
---
 pattern_import_export/tests/test_converter.py | 57 ++++++++++++++
 .../tests/test_pattern_import.py              | 78 +++++++++++++++++++
 2 files changed, 135 insertions(+)

diff --git a/pattern_import_export/tests/test_converter.py b/pattern_import_export/tests/test_converter.py
index a1b79f77..81530c1d 100644
--- a/pattern_import_export/tests/test_converter.py
+++ b/pattern_import_export/tests/test_converter.py
@@ -49,3 +49,60 @@ def test_string_domain_is_ignored(self):
         self._patch_search("res.country.state")
         self.converter.db_id_for(model, field, "name", "Rio de Janeiro")
         self.assertEqual(self.search_domain, [[("name", "=", "Rio de Janeiro")]])
+
+    def test_convert_value_to_domain(self):
+        field_name = None
+        value = {
+            "partner_id": {
+                "name": "abcdef",
+                "phone": "06707507",
+                "country_id": {
+                    "code": "FR",
+                    "name": "France",
+                },
+                "user_id": {
+                    "name": "Someone",
+                    "false": False,
+                    "true": True,
+                    "none": None,
+                },
+            },
+            "direct_value": "some string",
+            "another_partner_id": {"name": "abcdef", "phone": "0000000"},
+        }
+        expected = [
+            ["partner_id.name", "=", "abcdef"],
+            ["partner_id.phone", "=", "06707507"],
+            ["partner_id.country_id.code", "=", "FR"],
+            ["partner_id.country_id.name", "=", "France"],
+            ["partner_id.user_id.name", "=", "Someone"],
+            ["partner_id.user_id.false", "=", False],
+            ["partner_id.user_id.true", "=", True],
+            ["partner_id.user_id.none", "=", None],
+            ["direct_value", "=", "some string"],
+            ["another_partner_id.name", "=", "abcdef"],
+            ["another_partner_id.phone", "=", "0000000"],
+        ]
+
+        result = self.env["res.partner"]._convert_value_to_domain(field_name, value)
+        for expectation in expected:
+            self.assertIn(expectation, result)
+        self.assertEqual(len(expected), len(result))
+
+        # now test with a field_name
+        expected2 = [
+            ["partner_id.name", "=", "abcdef"],
+            ["partner_id.phone", "=", "06707507"],
+            ["partner_id.country_id.code", "=", "FR"],
+            ["partner_id.country_id.name", "=", "France"],
+            ["partner_id.user_id.name", "=", "Someone"],
+            ["partner_id.user_id.false", "=", False],
+            ["partner_id.user_id.true", "=", True],
+            ["partner_id.user_id.none", "=", None],
+        ]
+        result2 = self.env["res.partner"]._convert_value_to_domain(
+            "partner_id", value["partner_id"]
+        )
+        for expectation in expected2:
+            self.assertIn(expectation, result2)
+        self.assertEqual(len(expected2), len(result2))
diff --git a/pattern_import_export/tests/test_pattern_import.py b/pattern_import_export/tests/test_pattern_import.py
index f36f721d..2198780e 100644
--- a/pattern_import_export/tests/test_pattern_import.py
+++ b/pattern_import_export/tests/test_pattern_import.py
@@ -13,6 +13,7 @@ class TestPatternImport(PatternCommon, SavepointCase):
     def setUpClass(cls):
         super().setUpClass()
         cls.pattern_config_m2m.export_format = "json"
+        cls.pattern_config_o2m.export_format = "json"
         cls.pattern_config.export_format = "json"
 
     def run_pattern_file(self, pattern_file):
@@ -229,6 +230,44 @@ def test_update_with_key(self):
         self.assertFalse(records)
         self.assertEqual(unique_name, self.user3.name)
 
+    def test_update_with_muli_cols_pkey(self):
+        """ensure we identify the row to update
+        based on multiple columns with
+        different depths
+        """
+        unique_name = str(uuid4())
+        data = [
+            {
+                "partner_id#key|email": self.user3.partner_id.email,
+                "partner_id#key|name": self.user3.partner_id.name,
+                "partner_id#key|country_id|code": self.user3.partner_id.country_id.code,
+                "name": unique_name,
+            }
+        ]
+        pattern_file = self.create_pattern(self.pattern_config_m2m, "import", data)
+        records = self.run_pattern_file(pattern_file)
+        self.assertFalse(records)
+        self.assertEqual(unique_name, self.user3.name)
+
+        # same test with ambigus key
+        # the record should not be updated because the key
+        # returns more than 1 record
+        ambigus = self.user3.search(
+            [["country_id.code", "=", self.user3.partner_id.country_id.code]]
+        )
+        self.assertTrue(len(ambigus) > 1, "Verify conditions")
+        unique_name_2 = str(uuid4())
+        data = [
+            {
+                "partner_id#key|country_id|code": self.user3.partner_id.country_id.code,
+                "name": unique_name_2,
+            }
+        ]
+        pattern_file = self.create_pattern(self.pattern_config_m2m, "import", data)
+        records = self.run_pattern_file(pattern_file)
+        self.assertFalse(records)
+        self.assertEqual(unique_name, self.user3.name, "Ensure value not updated")
+
     def test_update_o2m_with_key(self):
         unique_name = str(uuid4())
         contact_1_name = str(uuid4())
@@ -273,6 +312,45 @@ def test_update_o2m_with_key_only_one_record(self):
         self.run_pattern_file(pattern_file)
         self.assertEqual(unique_name, self.partner_1.name)
 
+    def test_update_o2m_with_sub_keys(self):
+        unique_name = str(uuid4())
+
+        # state_ie_27,ie,"Antrim","AM"
+        # there is multiple state with code = AM
+        # in demo data, but only one with Currency = euro
+
+        # ensure we picked a reference to only one record
+        only_one_rec = self.env["res.country"].search(
+            [["state_ids.code", "=", "AM"], ["currency_id.symbol", "=", "€"]]
+        )
+        self.assertEqual(len(only_one_rec), 1, "Ensure data for test valid")
+        previous_country = self.partner_1.country_id
+        new_country = only_one_rec
+        data = [
+            {
+                "email#key": self.partner_1.email,
+                "phone#key": self.partner_1.phone,
+                "name": unique_name,
+                "country_id|currency_id|symbol": "€",
+                "country_id|state_ids|code": "AM",
+                "title|name": "Professor",
+            }
+        ]
+        pattern_file = self.create_pattern(self.pattern_config_o2m, "import", data)
+        self.run_pattern_file(pattern_file)
+        self.assertNotEqual(previous_country.id, new_country.id)
+        self.assertEqual(
+            unique_name, self.partner_1.name, "direct field has been updated"
+        )
+        self.assertEqual(
+            new_country.id,
+            self.partner_1.country_id.id,
+            "relation field has been updated",
+        )
+        self.assertEqual(
+            "Professor", self.partner_1.title.name, "relation field has been updated"
+        )
+
     @mute_logger("odoo.sql_db")
     def test_wrong_import(self):
         data = [{"login#key": self.user3.login, "name": ""}]

From d457a8699003b98da18c86609ebb23ba9dc51dbb Mon Sep 17 00:00:00 2001
From: Hpar <raphael.reverdy@akretion.com>
Date: Fri, 13 Oct 2023 12:47:41 +0000
Subject: [PATCH 13/18] pattner_import_export: improve documentation

---
 pattern_import_export/readme/USAGE.rst | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pattern_import_export/readme/USAGE.rst b/pattern_import_export/readme/USAGE.rst
index 1200e758..5f3880c8 100644
--- a/pattern_import_export/readme/USAGE.rst
+++ b/pattern_import_export/readme/USAGE.rst
@@ -23,16 +23,29 @@ You have two options:
 
 * Open the tree view of any model and tick some record selection boxes (for this step, these don't matter, we only just want to show the sidebar).
 * In the sidebar, click on the "Import with Pattern" button
-* Select the pattern that you used to generate the export, upload your file and click import.
+* Select a pattern, upload your file and click import.
 * A "Pattern file" is created, and its job along with it. Depending on the success or failure of the job, you
   will receive a red/green notification on your window. You can check the details in the appropriate Import/Export menu.
 
 Or:
 
 * Access the Import wizard through the Import/Export menu
-* Select the Pattern that you want to use
+* Select a pattern
 * Click on the "Import" button
 
+
+Import syntax
+-------------
+
+One of the strength of pattern_import_export module is the ability to
+reference records by natural keys (business keys) instead of technical keys (xmlid or database id).
+
+One or more columns can be the natural key of the record to find and update or to create a new record.
+Each column in the natural key has to be suffixed by "#key".
+
+One or more columns can be used as foreign keys can be accessed with "|" syntax.  (for instance on partner: country_id|code )
+
+
 Example
 -------
 

From 91b2a95cfef15ac403be5d0829e8de99ed1f2042 Mon Sep 17 00:00:00 2001
From: shopinvader-git-bot <shopinvader-git-bot@shopinvader.com>
Date: Thu, 21 Dec 2023 11:17:45 +0000
Subject: [PATCH 14/18] [BOT] post-merge updates

---
 pattern_import_export/README.rst              | 19 ++++++++++++++++---
 pattern_import_export/__manifest__.py         |  2 +-
 .../static/description/index.html             | 14 +++++++++++---
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/pattern_import_export/README.rst b/pattern_import_export/README.rst
index 93088064..e423e0b9 100644
--- a/pattern_import_export/README.rst
+++ b/pattern_import_export/README.rst
@@ -7,7 +7,7 @@ Pattern Import Export
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:1d0435b3d5c600c08f64b1cab35bef10122bf3bdd927445ea3b54000a0f718f2
+   !! source digest: sha256:3705d1bfe3c899c7c2037cad5305a0a6f080ddd8ca1d03bc732613a481115d2e
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -82,16 +82,29 @@ You have two options:
 
 * Open the tree view of any model and tick some record selection boxes (for this step, these don't matter, we only just want to show the sidebar).
 * In the sidebar, click on the "Import with Pattern" button
-* Select the pattern that you used to generate the export, upload your file and click import.
+* Select a pattern, upload your file and click import.
 * A "Pattern file" is created, and its job along with it. Depending on the success or failure of the job, you
   will receive a red/green notification on your window. You can check the details in the appropriate Import/Export menu.
 
 Or:
 
 * Access the Import wizard through the Import/Export menu
-* Select the Pattern that you want to use
+* Select a pattern
 * Click on the "Import" button
 
+
+Import syntax
+-------------
+
+One of the strength of pattern_import_export module is the ability to
+reference records by natural keys (business keys) instead of technical keys (xmlid or database id).
+
+One or more columns can be the natural key of the record to find and update or to create a new record.
+Each column in the natural key has to be suffixed by "#key".
+
+One or more columns can be used as foreign keys can be accessed with "|" syntax.  (for instance on partner: country_id|code )
+
+
 Example
 -------
 
diff --git a/pattern_import_export/__manifest__.py b/pattern_import_export/__manifest__.py
index 6ab5b073..06c02640 100644
--- a/pattern_import_export/__manifest__.py
+++ b/pattern_import_export/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Pattern Import Export",
     "summary": "Pattern for import or export",
-    "version": "14.0.2.7.0",
+    "version": "14.0.2.8.0",
     "category": "Extra Tools",
     "author": "Akretion",
     "website": "https://github.com/Shopinvader/pattern-import-export",
diff --git a/pattern_import_export/static/description/index.html b/pattern_import_export/static/description/index.html
index c1c76ed8..56a4b5a6 100644
--- a/pattern_import_export/static/description/index.html
+++ b/pattern_import_export/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Pattern Import Export</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:1d0435b3d5c600c08f64b1cab35bef10122bf3bdd927445ea3b54000a0f718f2
+!! source digest: sha256:3705d1bfe3c899c7c2037cad5305a0a6f080ddd8ca1d03bc732613a481115d2e
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/shopinvader/pattern-import-export/tree/14.0/pattern_import_export"><img alt="shopinvader/pattern-import-export" src="https://img.shields.io/badge/github-shopinvader%2Fpattern--import--export-lightgray.png?logo=github" /></a></p>
 <div class="section" id="overview">
@@ -427,17 +427,25 @@ <h2>Importing</h2>
 <ul class="simple">
 <li>Open the tree view of any model and tick some record selection boxes (for this step, these don’t matter, we only just want to show the sidebar).</li>
 <li>In the sidebar, click on the “Import with Pattern” button</li>
-<li>Select the pattern that you used to generate the export, upload your file and click import.</li>
+<li>Select a pattern, upload your file and click import.</li>
 <li>A “Pattern file” is created, and its job along with it. Depending on the success or failure of the job, you
 will receive a red/green notification on your window. You can check the details in the appropriate Import/Export menu.</li>
 </ul>
 <p>Or:</p>
 <ul class="simple">
 <li>Access the Import wizard through the Import/Export menu</li>
-<li>Select the Pattern that you want to use</li>
+<li>Select a pattern</li>
 <li>Click on the “Import” button</li>
 </ul>
 </div>
+<div class="section" id="import-syntax">
+<h2>Import syntax</h2>
+<p>One of the strength of pattern_import_export module is the ability to
+reference records by natural keys (business keys) instead of technical keys (xmlid or database id).</p>
+<p>One or more columns can be the natural key of the record to find and update or to create a new record.
+Each column in the natural key has to be suffixed by “#key”.</p>
+<p>One or more columns can be used as foreign keys can be accessed with “|” syntax.  (for instance on partner: country_id|code )</p>
+</div>
 <div class="section" id="example">
 <h2>Example</h2>
 <p>Here is an example of a simple update on <tt class="docutils literal">product.product</tt>:

From 0ac36ee764f6e229cae9ba1de5d082bc8bfac14a Mon Sep 17 00:00:00 2001
From: hparfr <raphael.reverdy@akretion.com>
Date: Tue, 19 Dec 2023 17:46:01 +0100
Subject: [PATCH 15/18] pattern_import_export: migration to v16

---
 pattern_import_export/__manifest__.py         |  4 +--
 pattern_import_export/models/ir_actions.py    |  7 ++--
 pattern_import_export/models/ir_fields.py     |  6 ++--
 pattern_import_export/tests/common.py         |  2 +-
 .../tests/test_pattern_import.py              | 34 +++++++++----------
 .../views/pattern_config.xml                  | 25 ++++++++------
 pattern_import_export_xlsx/__manifest__.py    |  4 +--
 .../tests/test_pattern_import.py              |  2 +-
 8 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/pattern_import_export/__manifest__.py b/pattern_import_export/__manifest__.py
index 06c02640..a6a6b066 100644
--- a/pattern_import_export/__manifest__.py
+++ b/pattern_import_export/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Pattern Import Export",
     "summary": "Pattern for import or export",
-    "version": "14.0.2.8.0",
+    "version": "16.0.1.0.0",
     "category": "Extra Tools",
     "author": "Akretion",
     "website": "https://github.com/Shopinvader/pattern-import-export",
@@ -30,5 +30,5 @@
         "data/queue_job_function_data.xml",
     ],
     "demo": ["demo/demo.xml"],
-    "installable": False,
+    "installable": True,
 }
diff --git a/pattern_import_export/models/ir_actions.py b/pattern_import_export/models/ir_actions.py
index c9d16815..64037d65 100644
--- a/pattern_import_export/models/ir_actions.py
+++ b/pattern_import_export/models/ir_actions.py
@@ -23,8 +23,11 @@ def get_bindings(self, model_name):
         # when we append the action in res["action"] it's added in the dict
         # and as the dict is mutuable the value is cached is updated
         # so we need to be careful to not add it again and again
+        if res == {}:
+            res["action"] = []
         if self.env.user.has_group("pattern_import_export.group_pattern_user"):
             for xml_id in xml_ids:
-                if xml_id not in [act.get("xml_id") for act in res["action"]]:
-                    res["action"].append(self.env.ref(xml_id).sudo().read()[0])
+                patimpex = self.env.ref(xml_id)
+                if patimpex.id not in [act.get("id") for act in res["action"]]:
+                    res["action"].append({"id": patimpex.id, "name": patimpex.name})
         return res
diff --git a/pattern_import_export/models/ir_fields.py b/pattern_import_export/models/ir_fields.py
index d46c4cee..971cf97c 100644
--- a/pattern_import_export/models/ir_fields.py
+++ b/pattern_import_export/models/ir_fields.py
@@ -4,7 +4,7 @@
 
 import ast
 
-from odoo import _, api, models
+from odoo import _, api, Command, models
 from odoo.osv import expression
 
 from odoo.addons.base.models import ir_fields
@@ -110,9 +110,9 @@ def _list_to_many2many(self, model, field, value):
                 warnings.extend(ws)
 
         if self._context.get("update_many2many"):
-            return [ir_fields.LINK_TO(id) for id in ids], warnings
+            return [Command.link(id) for id in ids], warnings
         else:
-            return [ir_fields.REPLACE_WITH(ids)], warnings
+            return [Command.set(ids)], warnings
 
     @api.model
     def _str_to_many2many(self, model, field, value):
diff --git a/pattern_import_export/tests/common.py b/pattern_import_export/tests/common.py
index f9b52e24..2abae7df 100644
--- a/pattern_import_export/tests/common.py
+++ b/pattern_import_export/tests/common.py
@@ -22,7 +22,7 @@ def setUpClass(cls):
             context=dict(
                 cls.env.context,
                 tracking_disable=True,
-                test_queue_job_no_delay=True,
+                queue_job__no_delay=True,
             )
         )
         cls.partner_1 = cls.env.ref("base.res_partner_1")
diff --git a/pattern_import_export/tests/test_pattern_import.py b/pattern_import_export/tests/test_pattern_import.py
index 2198780e..137b28bf 100644
--- a/pattern_import_export/tests/test_pattern_import.py
+++ b/pattern_import_export/tests/test_pattern_import.py
@@ -46,7 +46,7 @@ def test_update_with_external_id(self):
         @return:
         """
         unique_name = str(uuid4())
-        data = [{"id": self.user3.get_xml_id().get(self.user3.id), "name": unique_name}]
+        data = [{"id": self.user3.get_external_id().get(self.user3.id), "name": unique_name}]
         pattern_file = self.create_pattern(self.pattern_config_m2m, "import", data)
         records = self.run_pattern_file(pattern_file)
         self.assertFalse(records)
@@ -132,11 +132,11 @@ def test_update_o2m_with_external_id(self):
         partner3_name = str(uuid4())
         data = [
             {
-                "id": self.partner_1.get_xml_id().get(self.partner_1.id),
+                "id": self.partner_1.get_external_id().get(self.partner_1.id),
                 "name": unique_name,
-                "child_ids|1|id": self.partner_2.get_xml_id().get(self.partner_2.id),
+                "child_ids|1|id": self.partner_2.get_external_id().get(self.partner_2.id),
                 "child_ids|1|name": partner2_name,
-                "child_ids|2|id": self.partner_3.get_xml_id().get(self.partner_3.id),
+                "child_ids|2|id": self.partner_3.get_external_id().get(self.partner_3.id),
                 "child_ids|2|name": partner3_name,
             }
         ]
@@ -164,38 +164,38 @@ def test_update_o2m_m2m_with_external_id(self):
         user2_name = str(uuid4())
         data = [
             {
-                "id": self.partner_1.get_xml_id().get(self.partner_1.id),
+                "id": self.partner_1.get_external_id().get(self.partner_1.id),
                 "name": unique_name,
-                "category_id|1|id": self.partner_cat1.get_xml_id().get(
+                "category_id|1|id": self.partner_cat1.get_external_id().get(
                     self.partner_cat1.id
                 ),
-                "category_id|2|id": self.partner_cat2.get_xml_id().get(
+                "category_id|2|id": self.partner_cat2.get_external_id().get(
                     self.partner_cat2.id
                 ),
-                "country_id|id": self.country_be.get_xml_id().get(self.country_be.id),
-                "child_ids|1|id": self.partner_2.get_xml_id().get(self.partner_2.id),
+                "country_id|id": self.country_be.get_external_id().get(self.country_be.id),
+                "child_ids|1|id": self.partner_2.get_external_id().get(self.partner_2.id),
                 "child_ids|1|name": user1_name,
-                "child_ids|1|industry_id|id": self.industry1.get_xml_id().get(
+                "child_ids|1|industry_id|id": self.industry1.get_external_id().get(
                     self.industry1.id
                 ),
-                "child_ids|1|country_id|id": self.country_be.get_xml_id().get(
+                "child_ids|1|country_id|id": self.country_be.get_external_id().get(
                     self.country_be.id
                 ),
-                "child_ids|1|category_id|1|id": self.partner_cat1.get_xml_id().get(
+                "child_ids|1|category_id|1|id": self.partner_cat1.get_external_id().get(
                     self.partner_cat1.id
                 ),
-                "child_ids|1|category_id|2|id": self.partner_cat2.get_xml_id().get(
+                "child_ids|1|category_id|2|id": self.partner_cat2.get_external_id().get(
                     self.partner_cat2.id
                 ),
-                "child_ids|2|id": self.partner_3.get_xml_id().get(self.partner_3.id),
+                "child_ids|2|id": self.partner_3.get_external_id().get(self.partner_3.id),
                 "child_ids|2|name": user2_name,
-                "child_ids|2|industry_id|id": self.industry2.get_xml_id().get(
+                "child_ids|2|industry_id|id": self.industry2.get_external_id().get(
                     self.industry2.id
                 ),
-                "child_ids|2|country_id|id": self.country_us.get_xml_id().get(
+                "child_ids|2|country_id|id": self.country_us.get_external_id().get(
                     self.country_us.id
                 ),
-                "child_ids|2|category_id|1|id": self.partner_cat2.get_xml_id().get(
+                "child_ids|2|category_id|1|id": self.partner_cat2.get_external_id().get(
                     self.partner_cat2.id
                 ),
             }
diff --git a/pattern_import_export/views/pattern_config.xml b/pattern_import_export/views/pattern_config.xml
index 9be0cf06..49dbc3dc 100644
--- a/pattern_import_export/views/pattern_config.xml
+++ b/pattern_import_export/views/pattern_config.xml
@@ -20,7 +20,7 @@
         <field name="mode">primary</field>
         <field name="inherit_id" ref="base_export_manager.ir_exports_form_view" />
         <field name="arch" type="xml">
-            <xpath expr="//form/group[1]" position="before">
+            <xpath expr="//form/sheet[1]" position="before">
                 <header>
                     <button
                         name="%(import_pattern_wizard_action)d"
@@ -36,6 +36,8 @@
                         type="object"
                     />
                 </header>
+            </xpath>
+            <xpath expr="//form/sheet[1]" position="inside">
                 <div class="oe_button_box" name="button_box">
                     <button
                         name="button_open_pattern_file_failed"
@@ -92,16 +94,19 @@
 
             </xpath>
 
-            <xpath expr="//form/group[1]" position="after">
-                <group name="general_info">
-                    <field name="export_format" required="True" />
-                    <field name="pattern_file" filename="pattern_file_name" />
-                    <field name="pattern_file_name" invisible="1" />
-                    <field name="id" invisible="1" />
-                    <field name="header_format" />
-                </group>
+            <xpath expr="//form/sheet/notebook[1]/page" position="after">
+                <page string="general info">
+                    <group name="general_info">
+                        <field name="export_format" required="True" />
+                        <field name="pattern_file" filename="pattern_file_name" />
+                        <field name="pattern_file_name" invisible="1" />
+                        <field name="id" invisible="1" />
+                        <field name="header_format" />
+                    </group>
+                </page>
             </xpath>
-             <xpath expr="//form/group[@name='general_info']" position="after">
+
+            <xpath expr="//form//group[@name='general_info']" position="after">
                 <notebook>
                     <page string="Export Fields" name="export_fields" />
                     <page string="Configuration" name="config">
diff --git a/pattern_import_export_xlsx/__manifest__.py b/pattern_import_export_xlsx/__manifest__.py
index f36f1fb4..3c93a00b 100644
--- a/pattern_import_export_xlsx/__manifest__.py
+++ b/pattern_import_export_xlsx/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Pattern Import Export XLSX",
     "summary": "Pattern for import or export from to XLSX files",
-    "version": "14.0.2.1.0",
+    "version": "16.0.1.0.0",
     "category": "Extra Tools",
     "author": "Akretion",
     "website": "https://github.com/Shopinvader/pattern-import-export",
@@ -12,5 +12,5 @@
     "external_dependencies": {"python": ["openpyxl"]},
     "demo": ["demo/demo.xml"],
     "data": ["views/pattern_config.xml"],
-    "installable": False,
+    "installable": True,
 }
diff --git a/pattern_import_export_xlsx/tests/test_pattern_import.py b/pattern_import_export_xlsx/tests/test_pattern_import.py
index c2ecc8a7..dd682672 100644
--- a/pattern_import_export_xlsx/tests/test_pattern_import.py
+++ b/pattern_import_export_xlsx/tests/test_pattern_import.py
@@ -27,7 +27,7 @@ def setUpClass(cls):
         super().setUpClass()
         cls.env = cls.env(
             context=dict(
-                cls.env.context, test_queue_job_no_delay=True  # no jobs thanks
+                cls.env.context, queue_job__no_delay=True  # no jobs thanks
             )
         )
         cls.pattern_config_partner = cls.env["pattern.config"].create(

From e77efc17902df0d2fe0473fd875b7bbf5bd06250 Mon Sep 17 00:00:00 2001
From: hparfr <raphael.reverdy@akretion.com>
Date: Thu, 21 Dec 2023 14:08:09 +0100
Subject: [PATCH 16/18] pattern_import_export: pre-commit stuff

---
 .../pattern_import_export/odoo/addons/pattern_import_export | 1 +
 setup/pattern_import_export/setup.py                        | 6 ++++++
 .../odoo/addons/pattern_import_export_xlsx                  | 1 +
 setup/pattern_import_export_xlsx/setup.py                   | 6 ++++++
 4 files changed, 14 insertions(+)
 create mode 120000 setup/pattern_import_export/odoo/addons/pattern_import_export
 create mode 100644 setup/pattern_import_export/setup.py
 create mode 120000 setup/pattern_import_export_xlsx/odoo/addons/pattern_import_export_xlsx
 create mode 100644 setup/pattern_import_export_xlsx/setup.py

diff --git a/setup/pattern_import_export/odoo/addons/pattern_import_export b/setup/pattern_import_export/odoo/addons/pattern_import_export
new file mode 120000
index 00000000..ff7fa719
--- /dev/null
+++ b/setup/pattern_import_export/odoo/addons/pattern_import_export
@@ -0,0 +1 @@
+../../../../pattern_import_export
\ No newline at end of file
diff --git a/setup/pattern_import_export/setup.py b/setup/pattern_import_export/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/pattern_import_export/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/pattern_import_export_xlsx/odoo/addons/pattern_import_export_xlsx b/setup/pattern_import_export_xlsx/odoo/addons/pattern_import_export_xlsx
new file mode 120000
index 00000000..fb75380c
--- /dev/null
+++ b/setup/pattern_import_export_xlsx/odoo/addons/pattern_import_export_xlsx
@@ -0,0 +1 @@
+../../../../pattern_import_export_xlsx
\ No newline at end of file
diff --git a/setup/pattern_import_export_xlsx/setup.py b/setup/pattern_import_export_xlsx/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/pattern_import_export_xlsx/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From 4e69e240b704791e6e4db9a8104b4fde7aa9f112 Mon Sep 17 00:00:00 2001
From: hparfr <raphael.reverdy@akretion.com>
Date: Thu, 21 Dec 2023 14:46:33 +0100
Subject: [PATCH 17/18] pattern_import_export: pre-commit stuff

add strict to zip()
and yield from instead of yield in loop
---
 .pre-commit-config.yaml                       |   2 -
 pattern_import_export/README.rst              |   6 +-
 pattern_import_export/demo/demo.xml           | 206 +++++++++---------
 .../migrations/12.0.4.0.0/post-migrate.py     |  18 +-
 .../models/ir_exports_line.py                 |  10 +-
 pattern_import_export/models/ir_fields.py     |  10 +-
 .../models/pattern_config.py                  |  12 +-
 pattern_import_export/models/pattern_file.py  |   7 +-
 .../static/description/index.html             |   7 +-
 pattern_import_export/tests/common.py         |   3 +-
 .../tests/test_pattern_export.py              |  10 +-
 .../tests/test_pattern_import.py              |  28 ++-
 pattern_import_export/views/pattern_chunk.xml |   2 +-
 pattern_import_export_xlsx/README.rst         |  15 +-
 pattern_import_export_xlsx/demo/demo.xml      |  30 +--
 .../models/pattern_file.py                    |   2 +-
 .../static/description/index.html             |  37 ++--
 pattern_import_export_xlsx/tests/common.py    |   7 +-
 .../tests/test_pattern_export.py              |   8 +-
 .../tests/test_pattern_import.py              |   5 +-
 requirements.txt                              |   1 +
 21 files changed, 212 insertions(+), 214 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9afc6921..4d12a08c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,11 +1,9 @@
 exclude: |
   (?x)
   # NOT INSTALLABLE ADDONS
-  ^pattern_import_export/|
   ^pattern_import_export_csv/|
   ^pattern_import_export_custom_header/|
   ^pattern_import_export_synchronize/|
-  ^pattern_import_export_xlsx/|
   # END NOT INSTALLABLE ADDONS
   # Files and folders generated by bots, to avoid loops
   ^setup/|/static/description/index\.html$|
diff --git a/pattern_import_export/README.rst b/pattern_import_export/README.rst
index e423e0b9..73a61b2b 100644
--- a/pattern_import_export/README.rst
+++ b/pattern_import_export/README.rst
@@ -17,7 +17,7 @@ Pattern Import Export
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-shopinvader%2Fpattern--import--export-lightgray.png?logo=github
-    :target: https://github.com/shopinvader/pattern-import-export/tree/14.0/pattern_import_export
+    :target: https://github.com/shopinvader/pattern-import-export/tree/16.0/pattern_import_export
     :alt: shopinvader/pattern-import-export
 
 |badge1| |badge2| |badge3|
@@ -196,7 +196,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/shopinvader/pattern-import-export/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/shopinvader/pattern-import-export/issues/new?body=module:%20pattern_import_export%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/shopinvader/pattern-import-export/issues/new?body=module:%20pattern_import_export%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -220,6 +220,6 @@ Contributors
 Maintainers
 ~~~~~~~~~~~
 
-This module is part of the `shopinvader/pattern-import-export <https://github.com/shopinvader/pattern-import-export/tree/14.0/pattern_import_export>`_ project on GitHub.
+This module is part of the `shopinvader/pattern-import-export <https://github.com/shopinvader/pattern-import-export/tree/16.0/pattern_import_export>`_ project on GitHub.
 
 You are welcome to contribute.
diff --git a/pattern_import_export/demo/demo.xml b/pattern_import_export/demo/demo.xml
index 3adea117..15c522cb 100644
--- a/pattern_import_export/demo/demo.xml
+++ b/pattern_import_export/demo/demo.xml
@@ -1,111 +1,107 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- pylint:disable=dangerous-filter-wo-user -->
 <!--TODO recheck repercussions of this-->
-<odoo>
-    <data noupdate="1">
-        <!-- Filters -->
-        <record id="demo_filter_countries_1" model="ir.filters">
-            <field name="name">US, FR, BE</field>
-            <field name="domain">[("code", "in", ["US", "FR", "BE"])]</field>
-            <field name="model_id">res.country</field>
-            <field name="user_id" />
-        </record>
-        <record id="demo_filter_countries_2" model="ir.filters">
-            <field name="name">European countries</field>
-            <field
-                name="domain"
-            >[("code", "in", ["UK", "FR", "BE", "ES", "DE"])]</field>
-            <field name="model_id">res.country</field>
-            <field name="user_id" />
-        </record>
-        <record id="demo_filter_companies" model="ir.filters">
-            <field name="name">Ignore one</field>
-            <field name="domain">[("name", "!=", "Ignored company")]</field>
-            <field name="model_id">res.company</field>
-            <field name="user_id" />
-        </record>
+<odoo noupdate="1">
+    <!-- Filters -->
+    <record id="demo_filter_countries_1" model="ir.filters">
+        <field name="name">US, FR, BE</field>
+        <field name="domain">[("code", "in", ["US", "FR", "BE"])]</field>
+        <field name="model_id">res.country</field>
+        <field name="user_id" />
+    </record>
+    <record id="demo_filter_countries_2" model="ir.filters">
+        <field name="name">European countries</field>
+        <field name="domain">[("code", "in", ["UK", "FR", "BE", "ES", "DE"])]</field>
+        <field name="model_id">res.country</field>
+        <field name="user_id" />
+    </record>
+    <record id="demo_filter_companies" model="ir.filters">
+        <field name="name">Ignore one</field>
+        <field name="domain">[("name", "!=", "Ignored company")]</field>
+        <field name="model_id">res.company</field>
+        <field name="user_id" />
+    </record>
 
-        <!--Exports-->
-        <record id="demo_export" model="ir.exports">
-            <field name="name">Partner</field>
-            <field name="resource">res.partner</field>
-        </record>
-        <record id="demo_export_m2m" model="ir.exports">
-            <field name="name">Users list - M2M</field>
-            <field name="resource">res.users</field>
-        </record>
-        <record id="demo_export_o2m" model="ir.exports">
-            <field name="name">Partner with contact</field>
-            <field name="resource">res.partner</field>
-        </record>
-        <record id="demo_pattern_config" model="pattern.config">
-            <field name="export_id" ref="pattern_import_export.demo_export" />
-        </record>
-        <record id="demo_pattern_config_m2m" model="pattern.config">
-            <field name="export_id" ref="pattern_import_export.demo_export_m2m" />
-        </record>
-        <record id="demo_pattern_config_o2m" model="pattern.config">
-            <field name="export_id" ref="pattern_import_export.demo_export_o2m" />
-        </record>
+    <!--Exports-->
+    <record id="demo_export" model="ir.exports">
+        <field name="name">Partner</field>
+        <field name="resource">res.partner</field>
+    </record>
+    <record id="demo_export_m2m" model="ir.exports">
+        <field name="name">Users list - M2M</field>
+        <field name="resource">res.users</field>
+    </record>
+    <record id="demo_export_o2m" model="ir.exports">
+        <field name="name">Partner with contact</field>
+        <field name="resource">res.partner</field>
+    </record>
+    <record id="demo_pattern_config" model="pattern.config">
+        <field name="export_id" ref="pattern_import_export.demo_export" />
+    </record>
+    <record id="demo_pattern_config_m2m" model="pattern.config">
+        <field name="export_id" ref="pattern_import_export.demo_export_m2m" />
+    </record>
+    <record id="demo_pattern_config_o2m" model="pattern.config">
+        <field name="export_id" ref="pattern_import_export.demo_export_o2m" />
+    </record>
 
-        <!--Export lines-->
-        <record id="demo_export_line_1" model="ir.exports.line">
-            <field name="name">id</field>
-            <field name="export_id" ref="pattern_import_export.demo_export" />
-        </record>
-        <record id="demo_export_line_2" model="ir.exports.line">
-            <field name="name">name</field>
-            <field name="export_id" ref="pattern_import_export.demo_export" />
-        </record>
-        <record id="demo_export_line_3" model="ir.exports.line">
-            <field name="name">street</field>
-            <field name="export_id" ref="pattern_import_export.demo_export" />
-        </record>
-        <record id="demo_export_line_4" model="ir.exports.line">
-            <field name="name">country_id/code</field>
-            <field name="export_id" ref="pattern_import_export.demo_export" />
-            <field name="tab_filter_id" ref="demo_filter_countries_1" />
-            <field name="add_select_tab" eval="True" />
-        </record>
-        <record id="demo_export_line_5" model="ir.exports.line">
-            <field name="name">category_id/name</field>
-            <field name="export_id" ref="pattern_import_export.demo_export" />
-            <field name="add_select_tab" eval="True" />
-        </record>
-        <record id="demo_export_m2m_line_1" model="ir.exports.line">
-            <field name="name">id</field>
-            <field name="export_id" ref="pattern_import_export.demo_export_m2m" />
-        </record>
-        <record id="demo_export_m2m_line_2" model="ir.exports.line">
-            <field name="name">name</field>
-            <field name="export_id" ref="pattern_import_export.demo_export_m2m" />
-        </record>
-        <record id="demo_export_m2m_line_3" model="ir.exports.line">
-            <field name="name">company_ids/name</field>
-            <field name="number_occurence">1</field>
-            <field name="export_id" ref="pattern_import_export.demo_export_m2m" />
-            <field name="add_select_tab" eval="True" />
-            <field name="tab_filter_id" ref="demo_filter_companies" />
-        </record>
-        <record id="demo_export_o2m_line_1" model="ir.exports.line">
-            <field name="name">id</field>
-            <field name="export_id" ref="pattern_import_export.demo_export_o2m" />
-        </record>
-        <record id="demo_export_o2m_line_2" model="ir.exports.line">
-            <field name="name">name</field>
-            <field name="export_id" ref="pattern_import_export.demo_export_o2m" />
-        </record>
-        <record id="demo_export_o2m_line_3" model="ir.exports.line">
-            <field name="name">child_ids</field>
-            <field name="number_occurence">3</field>
-            <field name="export_id" ref="pattern_import_export.demo_export_o2m" />
-            <field name="sub_pattern_config_id" ref="demo_pattern_config" />
-        </record>
-        <record id="demo_export_o2m_line_4" model="ir.exports.line">
-            <field name="name">country_id/code</field>
-            <field name="export_id" ref="pattern_import_export.demo_export_o2m" />
-            <field name="tab_filter_id" ref="demo_filter_countries_1" />
-            <field name="add_select_tab" eval="True" />
-        </record>
-    </data>
+    <!--Export lines-->
+    <record id="demo_export_line_1" model="ir.exports.line">
+        <field name="name">id</field>
+        <field name="export_id" ref="pattern_import_export.demo_export" />
+    </record>
+    <record id="demo_export_line_2" model="ir.exports.line">
+        <field name="name">name</field>
+        <field name="export_id" ref="pattern_import_export.demo_export" />
+    </record>
+    <record id="demo_export_line_3" model="ir.exports.line">
+        <field name="name">street</field>
+        <field name="export_id" ref="pattern_import_export.demo_export" />
+    </record>
+    <record id="demo_export_line_4" model="ir.exports.line">
+        <field name="name">country_id/code</field>
+        <field name="export_id" ref="pattern_import_export.demo_export" />
+        <field name="tab_filter_id" ref="demo_filter_countries_1" />
+        <field name="add_select_tab" eval="True" />
+    </record>
+    <record id="demo_export_line_5" model="ir.exports.line">
+        <field name="name">category_id/name</field>
+        <field name="export_id" ref="pattern_import_export.demo_export" />
+        <field name="add_select_tab" eval="True" />
+    </record>
+    <record id="demo_export_m2m_line_1" model="ir.exports.line">
+        <field name="name">id</field>
+        <field name="export_id" ref="pattern_import_export.demo_export_m2m" />
+    </record>
+    <record id="demo_export_m2m_line_2" model="ir.exports.line">
+        <field name="name">name</field>
+        <field name="export_id" ref="pattern_import_export.demo_export_m2m" />
+    </record>
+    <record id="demo_export_m2m_line_3" model="ir.exports.line">
+        <field name="name">company_ids/name</field>
+        <field name="number_occurence">1</field>
+        <field name="export_id" ref="pattern_import_export.demo_export_m2m" />
+        <field name="add_select_tab" eval="True" />
+        <field name="tab_filter_id" ref="demo_filter_companies" />
+    </record>
+    <record id="demo_export_o2m_line_1" model="ir.exports.line">
+        <field name="name">id</field>
+        <field name="export_id" ref="pattern_import_export.demo_export_o2m" />
+    </record>
+    <record id="demo_export_o2m_line_2" model="ir.exports.line">
+        <field name="name">name</field>
+        <field name="export_id" ref="pattern_import_export.demo_export_o2m" />
+    </record>
+    <record id="demo_export_o2m_line_3" model="ir.exports.line">
+        <field name="name">child_ids</field>
+        <field name="number_occurence">3</field>
+        <field name="export_id" ref="pattern_import_export.demo_export_o2m" />
+        <field name="sub_pattern_config_id" ref="demo_pattern_config" />
+    </record>
+    <record id="demo_export_o2m_line_4" model="ir.exports.line">
+        <field name="name">country_id/code</field>
+        <field name="export_id" ref="pattern_import_export.demo_export_o2m" />
+        <field name="tab_filter_id" ref="demo_filter_countries_1" />
+        <field name="add_select_tab" eval="True" />
+    </record>
 </odoo>
diff --git a/pattern_import_export/migrations/12.0.4.0.0/post-migrate.py b/pattern_import_export/migrations/12.0.4.0.0/post-migrate.py
index d94b3896..9f5c4db3 100644
--- a/pattern_import_export/migrations/12.0.4.0.0/post-migrate.py
+++ b/pattern_import_export/migrations/12.0.4.0.0/post-migrate.py
@@ -16,12 +16,12 @@ def migrate(env, version):
         ("export_format", "NULL"),
     ]:
         if openupgrade.column_exists(env.cr, "ir_exports", field):
-            params[field] = '"{}"'.format(field)
+            params[field] = f'"{field}"'
         else:
             params[field] = default_value
 
     env.cr.execute(
-        """
+        f"""
         INSERT INTO pattern_config (
              use_description,
              pattern_file,
@@ -34,15 +34,15 @@ def migrate(env, version):
         )
         SELECT
              use_description,
-             {p[pattern_file]},
-             {p[pattern_file_name]},
-             {p[pattern_last_generation_date]},
-             {p[export_format]},
-             {p[partial_commit]},
-             {p[flush_step]},
+             {params["pattern_file"]},
+             {params["pattern_file_name"]},
+             {params["pattern_last_generation_date"]},
+             {params["export_format"]},
+             {params["partial_commit"]},
+             {params["flush_step"]},
              id
         FROM ir_exports WHERE is_pattern IS TRUE
-        """.format(p=params)
+        """
     )
 
     env.cr.execute(
diff --git a/pattern_import_export/models/ir_exports_line.py b/pattern_import_export/models/ir_exports_line.py
index 3ba735b8..3475b9bd 100644
--- a/pattern_import_export/models/ir_exports_line.py
+++ b/pattern_import_export/models/ir_exports_line.py
@@ -88,7 +88,7 @@ def _compute_required_fields(self):
                     level += 1
                     hidden_fields.remove("add_select_tab")
                 for idx in range(2, level + 1):
-                    required.append("field{}_id".format(idx))
+                    required.append(f"field{idx}_id")
                 if ftype in ["one2many", "many2many"]:
                     required.append("number_occurence")
                 if ftype in "one2many":
@@ -162,7 +162,7 @@ def _compute_related_level_field(self):
     def _build_header(self, level, use_description):
         base_header = []
         for idx in range(1, level + 1):
-            field = self["field{}_id".format(idx)]
+            field = self[f"field{idx}_id"]
             if use_description:
                 base_header.append(field.field_description)
             else:
@@ -191,7 +191,7 @@ def _get_header(self, use_description=False):
                     header += IDENTIFIER_SUFFIX
                 headers.append(header)
             else:
-                last_relation_field = record["field{}_id".format(record.level)]
+                last_relation_field = record[f"field{record.level}_id"]
                 if last_relation_field.ttype == "many2one":
                     headers.append(
                         record._build_header(record.level + 1, use_description)
@@ -213,7 +213,7 @@ def _get_header(self, use_description=False):
                                 ]
                             )
                     else:
-                        field = record["field{}_id".format(record.level + 1)]
+                        field = record[f"field{record.level + 1}_id"]
                         if use_description:
                             field_name = field.field_description
                         else:
@@ -238,7 +238,7 @@ def _format_tab_records(self, permitted_records):
     def _get_tab_name(self):
         tab_filter = self.tab_filter_id
         if tab_filter:
-            name = "({}) {}".format(str(tab_filter.id), tab_filter.name)
+            name = f"({str(tab_filter.id)}) {tab_filter.name}"
         else:
             name = self.field1_id.field_description
         if len(name) > 31:
diff --git a/pattern_import_export/models/ir_fields.py b/pattern_import_export/models/ir_fields.py
index 971cf97c..971042bd 100644
--- a/pattern_import_export/models/ir_fields.py
+++ b/pattern_import_export/models/ir_fields.py
@@ -4,11 +4,9 @@
 
 import ast
 
-from odoo import _, api, Command, models
+from odoo import Command, _, api, models
 from odoo.osv import expression
 
-from odoo.addons.base.models import ir_fields
-
 from .common import IDENTIFIER_SUFFIX
 
 
@@ -29,9 +27,7 @@ def fn_with_key_support(record, log):
                 cleanned[field] = vals
             converted = fn(cleanned, log)
             for field in keyfields:
-                converted["{}{}".format(field, IDENTIFIER_SUFFIX)] = converted.pop(
-                    field
-                )
+                converted[f"{field}{IDENTIFIER_SUFFIX}"] = converted.pop(field)
             return converted
 
         return fn_with_key_support
@@ -155,7 +151,7 @@ def _str_to_many2one(self, model, field, value):
 
     @api.model
     def _str_to_boolean(self, model, field, value):
-        if isinstance(value, (int, float)):
+        if isinstance(value, (int | float)):
             return bool(value), []
         if isinstance(value, bool):
             return value, []
diff --git a/pattern_import_export/models/pattern_config.py b/pattern_import_export/models/pattern_config.py
index 7fd5b02d..bb78cf20 100644
--- a/pattern_import_export/models/pattern_config.py
+++ b/pattern_import_export/models/pattern_config.py
@@ -115,9 +115,13 @@ def _get_output_headers(self):
         headers = []
         if self.header_format == "description_and_tech":
             headers.append(
-                dict(zip(tech_header, self._get_header(use_description=True)))
+                dict(
+                    zip(
+                        tech_header, self._get_header(use_description=True), strict=True
+                    )
+                )
             )
-        headers.append(dict(zip(tech_header, tech_header)))
+        headers.append(dict(zip(tech_header, tech_header, strict=True)))
         return headers
 
     def _get_header(self, use_description=False):
@@ -225,7 +229,7 @@ def _export_with_record(self, records):
         pattern_file_exports = self.env["pattern.file"]
         all_data = self._generate_with_records(records)
         if all_data and self.env.context.get("export_as_attachment", True):
-            for export, attachment_data in zip(self, all_data):
+            for export, attachment_data in zip(self, all_data, strict=True):
                 pattern_file_exports |= export._create_pattern_file_export(
                     attachment_data
                 )
@@ -238,7 +242,7 @@ def _create_pattern_file_export(self, attachment_datas):
         @return: ir.attachment recordset
         """
         self.ensure_one()
-        name = "{name}.{format}".format(name=self.name, format=self.export_format)
+        name = f"{self.name}.{self.export_format}"
         return self.env["pattern.file"].create(
             {
                 "name": name,
diff --git a/pattern_import_export/models/pattern_file.py b/pattern_import_export/models/pattern_file.py
index 8fe2f8b9..df6dd9a5 100644
--- a/pattern_import_export/models/pattern_file.py
+++ b/pattern_import_export/models/pattern_file.py
@@ -62,9 +62,7 @@ def _notify_user(self):
         if self.state == "failed":
             self.env.user.notify_danger(
                 message=_(
-                    "{} job has failed. \nFor more details: {}".format(
-                        import_or_export, details
-                    )
+                    f"{import_or_export} job has failed. \nFor more details: {details}"
                 ),
                 sticky=True,
             )
@@ -126,8 +124,7 @@ def _parse_data(self):
 
     def _parse_data_json(self, data):
         items = json.loads(data.decode("utf-8"))
-        for idx, item in enumerate(items):
-            yield idx + 1, item
+        yield from enumerate(items, start=1)
 
     def _prepare_chunk(self, start_idx, stop_idx, data):
         return {
diff --git a/pattern_import_export/static/description/index.html b/pattern_import_export/static/description/index.html
index 56a4b5a6..f972ef49 100644
--- a/pattern_import_export/static/description/index.html
+++ b/pattern_import_export/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -369,7 +368,7 @@ <h1 class="title">Pattern Import Export</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:3705d1bfe3c899c7c2037cad5305a0a6f080ddd8ca1d03bc732613a481115d2e
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/shopinvader/pattern-import-export/tree/14.0/pattern_import_export"><img alt="shopinvader/pattern-import-export" src="https://img.shields.io/badge/github-shopinvader%2Fpattern--import--export-lightgray.png?logo=github" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/shopinvader/pattern-import-export/tree/16.0/pattern_import_export"><img alt="shopinvader/pattern-import-export" src="https://img.shields.io/badge/github-shopinvader%2Fpattern--import--export-lightgray.png?logo=github" /></a></p>
 <div class="section" id="overview">
 <h1>Overview</h1>
 <p>This module extends the import/export capabilities of Odoo.</p>
@@ -616,7 +615,7 @@ <h3>Bug Tracker</h3>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/shopinvader/pattern-import-export/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/shopinvader/pattern-import-export/issues/new?body=module:%20pattern_import_export%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/shopinvader/pattern-import-export/issues/new?body=module:%20pattern_import_export%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -642,7 +641,7 @@ <h1>Contributors</h1>
 </div>
 <div class="section" id="maintainers">
 <h1>Maintainers</h1>
-<p>This module is part of the <a class="reference external" href="https://github.com/shopinvader/pattern-import-export/tree/14.0/pattern_import_export">shopinvader/pattern-import-export</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/shopinvader/pattern-import-export/tree/16.0/pattern_import_export">shopinvader/pattern-import-export</a> project on GitHub.</p>
 <p>You are welcome to contribute.</p>
 </div>
 </div>
diff --git a/pattern_import_export/tests/common.py b/pattern_import_export/tests/common.py
index 2abae7df..a8b38b45 100644
--- a/pattern_import_export/tests/common.py
+++ b/pattern_import_export/tests/common.py
@@ -3,8 +3,7 @@
 import json
 from base64 import b64encode
 from contextlib import contextmanager
-
-from mock import Mock
+from unittest.mock import Mock
 
 from odoo.tests import new_test_user
 
diff --git a/pattern_import_export/tests/test_pattern_export.py b/pattern_import_export/tests/test_pattern_export.py
index 619af867..8f669d8d 100644
--- a/pattern_import_export/tests/test_pattern_export.py
+++ b/pattern_import_export/tests/test_pattern_export.py
@@ -168,7 +168,7 @@ def test_get_data_to_export1(self):
                 "category_id|1|name": "Consulting Services",
             },
         ]
-        for result, expected_result in zip(results, expected_results):
+        for result, expected_result in zip(results, expected_results, strict=True):
             self.assertDictEqual(expected_result, result)
 
     def test_get_data_to_export2(self):
@@ -185,7 +185,7 @@ def test_get_data_to_export2(self):
             }
         ]
         results = self._get_data(self.pattern_config_m2m, self.env.user)
-        for result, expected_result in zip(results, expected_results):
+        for result, expected_result in zip(results, expected_results, strict=True):
             self.assertDictEqual(expected_result, result)
 
     def test_get_data_to_export3(self):
@@ -208,7 +208,7 @@ def test_get_data_to_export3(self):
             }
         ]
         results = self._get_data(self.pattern_config_m2m, self.env.user)
-        for result, expected_result in zip(results, expected_results):
+        for result, expected_result in zip(results, expected_results, strict=True):
             self.assertDictEqual(expected_result, result)
 
     def test_get_data_to_export4(self):
@@ -283,7 +283,7 @@ def test_get_data_to_export4(self):
             },
         ]
         results = self._get_data(self.pattern_config_o2m, self.partners)
-        for result, expected_result in zip(results, expected_results):
+        for result, expected_result in zip(results, expected_results, strict=True):
             self.assertDictEqual(expected_result, result)
 
     def test_get_data_to_export5(self):
@@ -360,7 +360,7 @@ def test_get_data_to_export5(self):
         ]
 
         results = self._get_data(self.pattern_config_o2m, self.partners)
-        for result, expected_result in zip(results, expected_results):
+        for result, expected_result in zip(results, expected_results, strict=True):
             self.assertDictEqual(expected_result, result)
 
     def test_get_data_to_export_is_key1(self):
diff --git a/pattern_import_export/tests/test_pattern_import.py b/pattern_import_export/tests/test_pattern_import.py
index 137b28bf..0f7ac5a4 100644
--- a/pattern_import_export/tests/test_pattern_import.py
+++ b/pattern_import_export/tests/test_pattern_import.py
@@ -46,7 +46,9 @@ def test_update_with_external_id(self):
         @return:
         """
         unique_name = str(uuid4())
-        data = [{"id": self.user3.get_external_id().get(self.user3.id), "name": unique_name}]
+        data = [
+            {"id": self.user3.get_external_id().get(self.user3.id), "name": unique_name}
+        ]
         pattern_file = self.create_pattern(self.pattern_config_m2m, "import", data)
         records = self.run_pattern_file(pattern_file)
         self.assertFalse(records)
@@ -134,9 +136,13 @@ def test_update_o2m_with_external_id(self):
             {
                 "id": self.partner_1.get_external_id().get(self.partner_1.id),
                 "name": unique_name,
-                "child_ids|1|id": self.partner_2.get_external_id().get(self.partner_2.id),
+                "child_ids|1|id": self.partner_2.get_external_id().get(
+                    self.partner_2.id
+                ),
                 "child_ids|1|name": partner2_name,
-                "child_ids|2|id": self.partner_3.get_external_id().get(self.partner_3.id),
+                "child_ids|2|id": self.partner_3.get_external_id().get(
+                    self.partner_3.id
+                ),
                 "child_ids|2|name": partner3_name,
             }
         ]
@@ -172,8 +178,12 @@ def test_update_o2m_m2m_with_external_id(self):
                 "category_id|2|id": self.partner_cat2.get_external_id().get(
                     self.partner_cat2.id
                 ),
-                "country_id|id": self.country_be.get_external_id().get(self.country_be.id),
-                "child_ids|1|id": self.partner_2.get_external_id().get(self.partner_2.id),
+                "country_id|id": self.country_be.get_external_id().get(
+                    self.country_be.id
+                ),
+                "child_ids|1|id": self.partner_2.get_external_id().get(
+                    self.partner_2.id
+                ),
                 "child_ids|1|name": user1_name,
                 "child_ids|1|industry_id|id": self.industry1.get_external_id().get(
                     self.industry1.id
@@ -187,7 +197,9 @@ def test_update_o2m_m2m_with_external_id(self):
                 "child_ids|1|category_id|2|id": self.partner_cat2.get_external_id().get(
                     self.partner_cat2.id
                 ),
-                "child_ids|2|id": self.partner_3.get_external_id().get(self.partner_3.id),
+                "child_ids|2|id": self.partner_3.get_external_id().get(
+                    self.partner_3.id
+                ),
                 "child_ids|2|name": user2_name,
                 "child_ids|2|industry_id|id": self.industry2.get_external_id().get(
                     self.industry2.id
@@ -535,9 +547,9 @@ def test_update_m2m_with_a_lot_of_item(self):
         unique_name = str(uuid4())
         data = {"name": unique_name}
         for idx in range(1, 15):
-            categ_name = "partner_categ_{}".format(idx)
+            categ_name = f"partner_categ_{idx}"
             self.env["res.partner.category"].create({"name": categ_name})
-            data["category_id|{}|name".format(idx)] = categ_name
+            data[f"category_id|{idx}|name"] = categ_name
         pattern_file = self.create_pattern(self.pattern_config, "import", [data])
         partner = self.run_pattern_file(pattern_file)
         self.assertEqual(len(partner), 1)
diff --git a/pattern_import_export/views/pattern_chunk.xml b/pattern_import_export/views/pattern_chunk.xml
index d9dbbd30..adcef8c1 100644
--- a/pattern_import_export/views/pattern_chunk.xml
+++ b/pattern_import_export/views/pattern_chunk.xml
@@ -4,7 +4,7 @@
 <record id="pattern_chunk_view_tree" model="ir.ui.view">
     <field name="model">pattern.chunk</field>
     <field name="arch" type="xml">
-        <tree string="Chunk">
+        <tree>
             <field name="start_idx" />
             <field name="stop_idx" />
             <field name="nbr_error" />
diff --git a/pattern_import_export_xlsx/README.rst b/pattern_import_export_xlsx/README.rst
index a2f60497..0d1098a0 100644
--- a/pattern_import_export_xlsx/README.rst
+++ b/pattern_import_export_xlsx/README.rst
@@ -2,10 +2,13 @@
 Pattern Import Export XLSX
 ==========================
 
-.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:765af9f3618d96f0b10e46bac93b32cfa4bd9797da2ffb802b50bd428936d6fd
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
@@ -14,10 +17,10 @@ Pattern Import Export XLSX
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-shopinvader%2Fpattern--import--export-lightgray.png?logo=github
-    :target: https://github.com/shopinvader/pattern-import-export/tree/14.0/pattern_import_export_xlsx
+    :target: https://github.com/shopinvader/pattern-import-export/tree/16.0/pattern_import_export_xlsx
     :alt: shopinvader/pattern-import-export
 
-|badge1| |badge2| |badge3| 
+|badge1| |badge2| |badge3|
 
 This module allows to create patterns for import or export from or to excel files.
 
@@ -31,8 +34,8 @@ Bug Tracker
 
 Bugs are tracked on `GitHub Issues <https://github.com/shopinvader/pattern-import-export/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
-If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/shopinvader/pattern-import-export/issues/new?body=module:%20pattern_import_export_xlsx%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/shopinvader/pattern-import-export/issues/new?body=module:%20pattern_import_export_xlsx%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -55,6 +58,6 @@ Contributors
 Maintainers
 ~~~~~~~~~~~
 
-This module is part of the `shopinvader/pattern-import-export <https://github.com/shopinvader/pattern-import-export/tree/14.0/pattern_import_export_xlsx>`_ project on GitHub.
+This module is part of the `shopinvader/pattern-import-export <https://github.com/shopinvader/pattern-import-export/tree/16.0/pattern_import_export_xlsx>`_ project on GitHub.
 
 You are welcome to contribute.
diff --git a/pattern_import_export_xlsx/demo/demo.xml b/pattern_import_export_xlsx/demo/demo.xml
index 001b0fc7..f3da57c5 100644
--- a/pattern_import_export_xlsx/demo/demo.xml
+++ b/pattern_import_export_xlsx/demo/demo.xml
@@ -1,21 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data noupdate="1">
-        <!--Exports-->
-        <record id="pattern_import_export.demo_pattern_config" model="pattern.config">
-            <field name="export_format">xlsx</field>
-        </record>
-        <record
-            id="pattern_import_export.demo_pattern_config_m2m"
-            model="pattern.config"
-        >
-            <field name="export_format">xlsx</field>
-        </record>
-        <record
-            id="pattern_import_export.demo_pattern_config_o2m"
-            model="pattern.config"
-        >
-            <field name="export_format">xlsx</field>
-        </record>
-    </data>
+<odoo noupdate="1">
+    <!--Exports-->
+    <record id="pattern_import_export.demo_pattern_config" model="pattern.config">
+        <field name="export_format">xlsx</field>
+    </record>
+    <record id="pattern_import_export.demo_pattern_config_m2m" model="pattern.config">
+        <field name="export_format">xlsx</field>
+    </record>
+    <record id="pattern_import_export.demo_pattern_config_o2m" model="pattern.config">
+        <field name="export_format">xlsx</field>
+    </record>
 </odoo>
diff --git a/pattern_import_export_xlsx/models/pattern_file.py b/pattern_import_export_xlsx/models/pattern_file.py
index 680528ea..f4d5e5e6 100644
--- a/pattern_import_export_xlsx/models/pattern_file.py
+++ b/pattern_import_export_xlsx/models/pattern_file.py
@@ -51,7 +51,7 @@ def _parse_data_xlsx(self, data):
                 vals = [x.value for x in row]
                 if any(vals):
                     count_empty = 0
-                    item = dict(zip(headers, vals))
+                    item = dict(zip(headers, vals, strict=True))
                     # we remove column without header
                     item.pop(None, "")
                     # the position return is the row number
diff --git a/pattern_import_export_xlsx/static/description/index.html b/pattern_import_export_xlsx/static/description/index.html
index 9ae7c4f6..d31bddc0 100644
--- a/pattern_import_export_xlsx/static/description/index.html
+++ b/pattern_import_export_xlsx/static/description/index.html
@@ -1,20 +1,19 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
 <title>Pattern Import Export XLSX</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
 
-See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
 */
 
@@ -366,39 +365,41 @@ <h1 class="title">Pattern Import Export XLSX</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:765af9f3618d96f0b10e46bac93b32cfa4bd9797da2ffb802b50bd428936d6fd
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/shopinvader/pattern-import-export/tree/14.0/pattern_import_export_xlsx"><img alt="shopinvader/pattern-import-export" src="https://img.shields.io/badge/github-shopinvader%2Fpattern--import--export-lightgray.png?logo=github" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/shopinvader/pattern-import-export/tree/16.0/pattern_import_export_xlsx"><img alt="shopinvader/pattern-import-export" src="https://img.shields.io/badge/github-shopinvader%2Fpattern--import--export-lightgray.png?logo=github" /></a></p>
 <p>This module allows to create patterns for import or export from or to excel files.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
-<li><a class="reference internal" href="#bug-tracker" id="id1">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id2">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id3">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id4">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id5">Maintainers</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-4">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/shopinvader/pattern-import-export/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
-If you spotted it first, help us smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/shopinvader/pattern-import-export/issues/new?body=module:%20pattern_import_export_xlsx%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/shopinvader/pattern-import-export/issues/new?body=module:%20pattern_import_export_xlsx%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#id2">Credits</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#id3">Authors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
 <ul class="simple">
 <li>Akretion</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id4">Contributors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
 <ul class="simple">
 <li>Chafique Delli &lt;<a class="reference external" href="mailto:chafique.delli&#64;akretion.com">chafique.delli&#64;akretion.com</a>&gt;</li>
 <li>Sébastien Beau &lt;<a class="reference external" href="mailto:sebastien.beau&#64;akretion.com">sebastien.beau&#64;akretion.com</a>&gt;</li>
@@ -407,8 +408,8 @@ <h2><a class="toc-backref" href="#id4">Contributors</a></h2>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id5">Maintainers</a></h2>
-<p>This module is part of the <a class="reference external" href="https://github.com/shopinvader/pattern-import-export/tree/14.0/pattern_import_export_xlsx">shopinvader/pattern-import-export</a> project on GitHub.</p>
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/shopinvader/pattern-import-export/tree/16.0/pattern_import_export_xlsx">shopinvader/pattern-import-export</a> project on GitHub.</p>
 <p>You are welcome to contribute.</p>
 </div>
 </div>
diff --git a/pattern_import_export_xlsx/tests/common.py b/pattern_import_export_xlsx/tests/common.py
index 709ae162..be7a4466 100644
--- a/pattern_import_export_xlsx/tests/common.py
+++ b/pattern_import_export_xlsx/tests/common.py
@@ -20,7 +20,7 @@ def _set_up_tab_names(cls):
             attr_name_tab = "tab_name_" + el
             attr_name_filter = "filter_" + el
             filter_id = getattr(cls, attr_name_filter)
-            attr_val_tab = "({}) {}".format(filter_id.id, filter_id.name)
+            attr_val_tab = f"({filter_id.id}) {filter_id.name}"
             setattr(cls, attr_name_tab, attr_val_tab)
 
     @classmethod
@@ -39,8 +39,7 @@ def _read_worksheet(self, pattern_config, records=None, sheet_name=None):
             sheet = wb.worksheets[0]
         else:
             sheet = wb[sheet_name]
-        for idx, row in enumerate(sheet.rows):
-            yield idx, row
+        yield from enumerate(sheet.rows)
 
     def _get_header(self, pattern_config, use_description=False, sheet_name=None):
         if use_description:
@@ -58,7 +57,7 @@ def _get_data(self, pattern_config, records=None, sheet_name=None):
             if idx == 0:
                 headers = vals
             elif any(vals):
-                data.append(dict(zip(headers, vals)))
+                data.append(dict(zip(headers, vals, strict=True)))
             else:
                 break
         return data
diff --git a/pattern_import_export_xlsx/tests/test_pattern_export.py b/pattern_import_export_xlsx/tests/test_pattern_export.py
index 23c6a129..ad8e2d4a 100644
--- a/pattern_import_export_xlsx/tests/test_pattern_export.py
+++ b/pattern_import_export_xlsx/tests/test_pattern_export.py
@@ -79,7 +79,7 @@ def test_export_validators_simple(self):
         sheet_base = wb["Partner"]
         self.assertEqual(
             sheet_base.data_validations.dataValidation[0].formula1,
-            "='{}'!$A$2:$A$1003".format(self.tab_name_countries_1),
+            f"='{self.tab_name_countries_1}'!$A$2:$A$1003",
         )
         self.assertEqual(
             str(sheet_base.data_validations.dataValidation[0].cells), "D2:D1003"
@@ -97,7 +97,7 @@ def test_export_validators_simple_with_subpattern(self):
         sheet_base = wb["Partner with contact"]
         self.assertEqual(
             sheet_base.data_validations.dataValidation[0].formula1,
-            "='{}'!$A$2:$A$1003".format(self.tab_name_countries_1),
+            f"='{self.tab_name_countries_1}'!$A$2:$A$1003",
         )
         self.assertEqual(
             str(sheet_base.data_validations.dataValidation[0].cells),
@@ -121,7 +121,7 @@ def test_export_validators_many2many(self):
         validation = validation[0]
         self.assertEqual(
             validation.formula1,
-            "='{}'!$A$2:$A$1003".format(self.tab_name_ignore_one),
+            f"='{self.tab_name_ignore_one}'!$A$2:$A$1003",
         )
         cells_validated = {str(x) for x in validation.cells.ranges}
         self.assertEqual(cells_validated, {"C2:C1003", "D2:D1003", "E2:E1003"})
@@ -142,7 +142,7 @@ def test_export_m2m_validators(self):
         sheet_base = wb["Users list - M2M"]
         self.assertEqual(
             sheet_base.data_validations.dataValidation[0].formula1,
-            "='{}'!$A$2:$A$1003".format(self.tab_name_ignore_one),
+            f"='{self.tab_name_ignore_one}'!$A$2:$A$1003",
         )
         self.assertEqual(
             str(sheet_base.data_validations.dataValidation[0].cells), "C2:C1003"
diff --git a/pattern_import_export_xlsx/tests/test_pattern_import.py b/pattern_import_export_xlsx/tests/test_pattern_import.py
index dd682672..6fbf98dd 100644
--- a/pattern_import_export_xlsx/tests/test_pattern_import.py
+++ b/pattern_import_export_xlsx/tests/test_pattern_import.py
@@ -4,12 +4,12 @@
 import base64
 from io import BytesIO
 from os import path
+from unittest.mock import Mock
 
 # TODO FIXME somehow Travis complains that openpyxl isn't there,
 # the warning shows only here and not in any other import of openpyxl?
 # pylint: disable=missing-manifest-dependency
 import openpyxl
-from mock import Mock
 
 from odoo.tests import SavepointCase
 from odoo.tools import mute_logger
@@ -27,7 +27,8 @@ def setUpClass(cls):
         super().setUpClass()
         cls.env = cls.env(
             context=dict(
-                cls.env.context, queue_job__no_delay=True  # no jobs thanks
+                cls.env.context,
+                queue_job__no_delay=True,  # no jobs thanks
             )
         )
         cls.pattern_config_partner = cls.env["pattern.config"].create(
diff --git a/requirements.txt b/requirements.txt
index 9cd16292..bf999635 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,2 @@
 # generated from manifests external_dependencies
+openpyxl

From fc8844d9d5295871a42680bbee84d5432b340300 Mon Sep 17 00:00:00 2001
From: hparfr <raphael.reverdy@akretion.com>
Date: Tue, 19 Dec 2023 17:46:15 +0100
Subject: [PATCH 18/18] pattern_import_export: dirty fix do not merge

TODO: manage translation
TODO: manage commit after each record?
---
 pattern_import_export/models/base.py  | 11 +++++++++--
 pattern_import_export/models/patch.py |  5 +++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pattern_import_export/models/base.py b/pattern_import_export/models/base.py
index fe2f164f..6f07477f 100644
--- a/pattern_import_export/models/base.py
+++ b/pattern_import_export/models/base.py
@@ -237,6 +237,12 @@ def _extract_records(self, fields_, data, log=lambda a: None, limit=FLOAT_INF):
                 yield self._pattern_format2json(row), {"rows": {"from": idx, "to": idx}}
 
                 # WARNING: complex code
+                # This feature has been inactivated for v16
+                # it's not something easy to do
+                # and need to be carefully done
+                #
+                # it's about allowing to import working lines
+                # and reporting lines in error
                 # As we are in an generator the following code is executed
                 # after the "for id, xid, record, info in converted:" in model.py:1090
                 # the idea is to call the flush manually for the last line
@@ -248,8 +254,9 @@ def _extract_records(self, fields_, data, log=lambda a: None, limit=FLOAT_INF):
                 # in V15 we should propose a refactor of load method
                 if data[-1][0] == idx:
                     self._context["import_flush"]()
-                    self._cr.execute("RELEASE SAVEPOINT model_load")
-                    self._cr.execute("SAVEPOINT model_load")
+                    # https://github.com/odoo/odoo/pull/76243
+                    # self._cr.execute("RELEASE SAVEPOINT model_load")
+                    # self._cr.execute("SAVEPOINT model_load")
         else:
             yield from super()._extract_records(fields_, data, log=log, limit=limit)
 
diff --git a/pattern_import_export/models/patch.py b/pattern_import_export/models/patch.py
index 17f91b98..b1d3fc9b 100644
--- a/pattern_import_export/models/patch.py
+++ b/pattern_import_export/models/patch.py
@@ -22,8 +22,9 @@ def _convert_records(self, records, log=lambda a: None):
     :rtype: list((int|None, str|None, dict))
     """
     field_names = {name: field.string for name, field in self._fields.items()}
-    if self.env.lang:
-        field_names.update(self.env["ir.translation"].get_field_string(self._name))
+    #    if self.env.lang:
+    #        field._get_stored_translations
+    #        field_names.update(self.env["ir.translation"].get_field_string(self._name))
 
     convert = self.env["ir.fields.converter"].for_model(self)