From 891aa6f4b011542c0ff0a08362cd34e449691d12 Mon Sep 17 00:00:00 2001
From: FernandoRomera
Date: Tue, 6 Aug 2024 09:40:10 +0200
Subject: [PATCH] [MIG] base_product_merge: Migration to 17.0
---
base_product_merge/__manifest__.py | 2 +-
base_product_merge/tests/test_base_product_merge.py | 2 +-
base_product_merge/wizard/base_product_merge_view.xml | 10 ++++------
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/base_product_merge/__manifest__.py b/base_product_merge/__manifest__.py
index 50e78e415..7dbdfaee5 100644
--- a/base_product_merge/__manifest__.py
+++ b/base_product_merge/__manifest__.py
@@ -4,7 +4,7 @@
{
"name": "Base Products Merge",
"summary": "Merge duplicate products",
- "version": "16.0.1.0.0",
+ "version": "17.0.1.0.0",
"license": "AGPL-3",
"website": "https://github.com/OCA/stock-logistics-warehouse",
"author": "ForgeFlow, " "Odoo Community Association (OCA)",
diff --git a/base_product_merge/tests/test_base_product_merge.py b/base_product_merge/tests/test_base_product_merge.py
index da45fd77b..cdd3e7f4f 100644
--- a/base_product_merge/tests/test_base_product_merge.py
+++ b/base_product_merge/tests/test_base_product_merge.py
@@ -7,7 +7,7 @@ from odoo.tests.common import TransactionCase
class TestBaseProductMerge(TransactionCase):
@classmethod
def setUpClass(cls):
- super(TestBaseProductMerge, cls).setUpClass()
+ super().setUpClass()
cls.product_model = cls.env["product.product"]
cls.base_product_merge_model = cls.env["base.product.merge"]
diff --git a/base_product_merge/wizard/base_product_merge_view.xml b/base_product_merge/wizard/base_product_merge_view.xml
index e87fac147..2fc454efb 100644
--- a/base_product_merge/wizard/base_product_merge_view.xml
+++ b/base_product_merge/wizard/base_product_merge_view.xml
@@ -15,12 +15,12 @@
products from this list to avoid merging them.
-
+
-
+