Merge PR #1409 into 16.0

Signed-off-by lmignon
shopinvader · Oct 13, 2023 · 82026e3 · 82026e3
2 parents 84917cf + 4a66156
commit 82026e3
Show file tree

Hide file tree

Showing 13 changed files with 48 additions and 72 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -51,7 +51,6 @@ exclude: |
   ^shopinvader_pos/|
   ^shopinvader_price_per_qty/|
   ^shopinvader_product_attribute_set/|
-  ^shopinvader_product_brand_tag/|
   ^shopinvader_product_manufactured_for/|
   ^shopinvader_product_media/|
   ^shopinvader_product_new/|

diff --git a/setup/shopinvader_product_brand_tag/odoo/addons/shopinvader_product_brand_tag b/setup/shopinvader_product_brand_tag/odoo/addons/shopinvader_product_brand_tag
@@ -0,0 +1 @@
+../../../../shopinvader_product_brand_tag
diff --git a/setup/shopinvader_product_brand_tag/setup.py b/setup/shopinvader_product_brand_tag/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/shopinvader_product_brand_tag/__init__.py b/shopinvader_product_brand_tag/__init__.py
@@ -1 +0,0 @@
-from . import models

diff --git a/shopinvader_product_brand_tag/__manifest__.py b/shopinvader_product_brand_tag/__manifest__.py
@@ -5,15 +5,13 @@
 {
     "name": "Shopvinvader Product Brand Tag",
     "summary": "Index Product Brand Tags in Shopinvader",
-    "version": "14.0.1.0.0",
+    "version": "16.0.1.0.0",
     "category": "e-Commerce",
     "website": "https://github.com/shopinvader/odoo-shopinvader",
-    "author": "Camptocamp",
+    "author": "Camptocamp,ACSONE SA/NV",
     "license": "AGPL-3",
     "depends": ["shopinvader_product_brand", "product_brand_tag"],
-    "data": [
-        "data/ir_export_product_brand.xml",
-        "data/ir_export_product.xml",
-    ],
-    "installable": False,
+    "installable": True,
+    "external_dependencies": {"python": ["extendable_pydantic>=1.2.0"]},
+    "development_status": "Alpha",
 }
diff --git a/shopinvader_product_brand_tag/data/ir_export_product.xml b/shopinvader_product_brand_tag/data/ir_export_product.xml
diff --git a/shopinvader_product_brand_tag/data/ir_export_product_brand.xml b/shopinvader_product_brand_tag/data/ir_export_product_brand.xml
diff --git a/shopinvader_product_brand_tag/models/__init__.py b/shopinvader_product_brand_tag/models/__init__.py
diff --git a/shopinvader_product_brand_tag/models/shopinvader_brand.py b/shopinvader_product_brand_tag/models/shopinvader_brand.py
diff --git a/shopinvader_product_brand_tag/readme/CONTRIBUTORS.rst b/shopinvader_product_brand_tag/readme/CONTRIBUTORS.rst
@@ -1,3 +1,4 @@
 * `Camptocamp <https://www.camptocamp.com>`_
 
      * Iván Todorovich <[email protected]>
+* Marie Lejeune <[email protected]>
diff --git a/shopinvader_product_brand_tag/schemas/__init__.py b/shopinvader_product_brand_tag/schemas/__init__.py
@@ -0,0 +1,2 @@
+from .brand import ProductBrand
+from .brand_tag import ProductBrandTag
diff --git a/shopinvader_product_brand_tag/schemas/brand.py b/shopinvader_product_brand_tag/schemas/brand.py
@@ -0,0 +1,20 @@
+# Copyright 2023 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo.addons.shopinvader_product_brand.schemas import (
+    ProductBrand as BaseProductBrand,
+)
+
+from . import ProductBrandTag
+
+
+class ProductBrand(BaseProductBrand):
+    tags: list[ProductBrandTag] = []
+
+    @classmethod
+    def from_product_brand(cls, odoo_rec):
+        obj = super().from_product_brand(odoo_rec)
+        obj.tags = [
+            ProductBrandTag.from_product_brand_tag(tag) for tag in odoo_rec.tag_ids
+        ]
+        return obj
diff --git a/shopinvader_product_brand_tag/schemas/brand_tag.py b/shopinvader_product_brand_tag/schemas/brand_tag.py
@@ -0,0 +1,13 @@
+# Copyright 2023 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from extendable_pydantic import StrictExtendableBaseModel
+
+
+class ProductBrandTag(StrictExtendableBaseModel):
+    id: int
+    name: str
+
+    @classmethod
+    def from_product_brand_tag(cls, odoo_rec):
+        return cls.model_construct(id=odoo_rec.id, name=odoo_rec.name)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		from .brand import ProductBrand
		from .brand_tag import ProductBrandTag