From 8f517acdcdcf59702dfb19fc6769f2891ed37fe4 Mon Sep 17 00:00:00 2001
From: Ros <sinvigil@gmail.com>
Date: Thu, 21 Apr 2022 10:46:31 +0200
Subject: [PATCH 1/5] [FIX] Changes required to run on v_15

---
 base_import_async/__manifest__.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/base_import_async/__manifest__.py b/base_import_async/__manifest__.py
index 205960ff84..af6b6918ad 100644
--- a/base_import_async/__manifest__.py
+++ b/base_import_async/__manifest__.py
@@ -11,8 +11,15 @@
     "website": "https://github.com/OCA/queue",
     "category": "Generic Modules",
     "depends": ["base_import", "queue_job"],
-    "data": ["data/queue_job_function_data.xml", "views/base_import_async.xml"],
-    "qweb": ["static/src/xml/import.xml"],
-    "installable": False,
+    "data": ["data/queue_job_function_data.xml"],
+    "assets": {
+        "web.assets_backend": [
+            "base_import_async/static/src/js/import.js",
+        ],
+        'web.assets_qweb': [
+            'base_import_async/static/src/xml/import.xml',
+        ],
+    },
+    "installable": True,
     "development_status": "Production/Stable",
 }

From e059dce6380b1b6f74f190df8da29605288ee5ea Mon Sep 17 00:00:00 2001
From: Ros <sinvigil@gmail.com>
Date: Thu, 21 Apr 2022 10:49:29 +0200
Subject: [PATCH 2/5] [FIX] A checkbox for async import in a standard import
 wizard.

---
 base_import_async/static/src/xml/import.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base_import_async/static/src/xml/import.xml b/base_import_async/static/src/xml/import.xml
index d401157a14..5ad14fc5da 100644
--- a/base_import_async/static/src/xml/import.xml
+++ b/base_import_async/static/src/xml/import.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <templates>
-    <t t-extend="ImportView">
+    <t t-extend="ImportView.side_panel">
         <t t-jquery="#oe_import_has_header" t-operation="before">
             <div
                 title="When checked, the import will be executed as a background job,

From e75d2081cbd99ef91fa5400ab7b405ac372665e9 Mon Sep 17 00:00:00 2001
From: Ros <sinvigil@gmail.com>
Date: Thu, 21 Apr 2022 10:53:26 +0200
Subject: [PATCH 3/5] [FIX] Standard import execution.

---
 base_import_async/models/base_import_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base_import_async/models/base_import_import.py b/base_import_async/models/base_import_import.py
index de08c5efb1..d0b827a759 100644
--- a/base_import_async/models/base_import_import.py
+++ b/base_import_async/models/base_import_import.py
@@ -35,7 +35,7 @@ class BaseImportImport(models.TransientModel):
     def do(self, fields, columns, options, dryrun=False):
         if dryrun or not options.get(OPT_USE_QUEUE):
             # normal import
-            return super().do(fields, columns, options, dryrun=dryrun)
+            return super().execute_import(fields, columns, options, dryrun=dryrun)
 
         # asynchronous import
         try:

From 3ec4cc91798c8f3a34ab31a56e90f3c1a1d7370d Mon Sep 17 00:00:00 2001
From: Ros <sinvigil@gmail.com>
Date: Thu, 21 Apr 2022 12:41:00 +0200
Subject: [PATCH 4/5] [FIX] return of "installable": False

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

diff --git a/base_import_async/__manifest__.py b/base_import_async/__manifest__.py
index af6b6918ad..c4168c936a 100644
--- a/base_import_async/__manifest__.py
+++ b/base_import_async/__manifest__.py
@@ -20,6 +20,6 @@
             'base_import_async/static/src/xml/import.xml',
         ],
     },
-    "installable": True,
+    "installable": False,
     "development_status": "Production/Stable",
 }

From d246617db805c98b540b1c33416d7e61cb679115 Mon Sep 17 00:00:00 2001
From: Ros <sinvigil@gmail.com>
Date: Thu, 5 May 2022 12:32:49 +0200
Subject: [PATCH 5/5] [FIX] rename def do to execute_import

---
 base_import_async/models/base_import_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base_import_async/models/base_import_import.py b/base_import_async/models/base_import_import.py
index d0b827a759..a23ef1c736 100644
--- a/base_import_async/models/base_import_import.py
+++ b/base_import_async/models/base_import_import.py
@@ -32,7 +32,7 @@
 class BaseImportImport(models.TransientModel):
     _inherit = "base_import.import"
 
-    def do(self, fields, columns, options, dryrun=False):
+    def execute_import(self, fields, columns, options, dryrun=False):
         if dryrun or not options.get(OPT_USE_QUEUE):
             # normal import
             return super().execute_import(fields, columns, options, dryrun=dryrun)