shopinvader · shopinvader-git-bot · Mar 21, 2024 · Mar 20, 2024 · Mar 20, 2024 · Mar 20, 2024
diff --git a/shopinvader_api_wishlist/README.rst b/shopinvader_api_wishlist/README.rst
@@ -7,7 +7,7 @@ Shopinvader Wishlist
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:116b285cc0a03e1c416dfffba3d21a6ed22025dad3d0e7082ec5a39fa6251f2c
+   !! source digest: sha256:7dc1f734fdf37e07a8fb33f8eb21c83bc0954558788be81ba2e22b56f580f951
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/shopinvader_api_wishlist/__manifest__.py b/shopinvader_api_wishlist/__manifest__.py
@@ -22,7 +22,7 @@
     "demo": [],
     "data": [
         "security/groups.xml",
-        "security/acl_product_set_add.xml",
+        "security/acl_sale_product_set_wizard.xml",
         "security/rule+acl_product_set.xml",
         "security/rule+acl_product_set_line.xml",
     ],

diff --git a/shopinvader_api_wishlist/dependencies.py b/shopinvader_api_wishlist/dependencies.py
@@ -92,7 +92,7 @@ def _add_to_cart(
         uuid = rqst.uuid if rqst else None
         cart = self.env["sale.order"]._find_open_cart(self.partner.id, uuid)
         product_set = self._get(record_id)
-        wizard = self.env["product.set.add"].create(
+        wizard = self.env["sale.product.set.wizard"].create(
             {
                 "order_id": cart.id,
                 "product_set_id": product_set.id,
@@ -111,7 +111,7 @@ def _add_items_to_cart(
         lines = product_set.set_line_ids.filtered(
             lambda l, product_ids=product_ids: l.product_id.id in product_ids
         )
-        wizard = self.env["product.set.add"].create(
+        wizard = self.env["sale.product.set.wizard"].create(
             {
                 "order_id": cart.id,
                 "product_set_id": product_set.id,

diff --git a/...wishlist/security/acl_product_set_add.xml → .../security/acl_sale_product_set_wizard.xml b/...wishlist/security/acl_product_set_add.xml → .../security/acl_sale_product_set_wizard.xml
@@ -3,9 +3,9 @@
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
 
-    <record model="ir.model.access" id="shopinvader_product_set_add_access">
-        <field name="name">product.set.add shopinvader user read access</field>
-        <field name="model_id" ref="sale_product_set.model_product_set_add" />
+    <record model="ir.model.access" id="shopinvader_sale_product_set_wizard_access">
+        <field name="name">sale.product.set.wizard shopinvader user read access</field>
+        <field name="model_id" ref="sale_product_set.model_sale_product_set_wizard" />
         <field name="group_id" ref="shopinvader_wishlist_user_group" />
         <field name="perm_read" eval="1" />
         <field name="perm_create" eval="1" />

diff --git a/shopinvader_api_wishlist/static/description/index.html b/shopinvader_api_wishlist/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Shopinvader Wishlist</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:116b285cc0a03e1c416dfffba3d21a6ed22025dad3d0e7082ec5a39fa6251f2c
+!! source digest: sha256:7dc1f734fdf37e07a8fb33f8eb21c83bc0954558788be81ba2e22b56f580f951
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/odoo-shopinvader/tree/16.0/shopinvader_api_wishlist"><img alt="shopinvader/odoo-shopinvader" src="https://img.shields.io/badge/github-shopinvader%2Fodoo--shopinvader-lightgray.png?logo=github" /></a></p>
 <p>Expose wishlist features for Shopinvader websites.</p>

diff --git a/shopinvader_api_wishlist/wizard/__init__.py b/shopinvader_api_wishlist/wizard/__init__.py
@@ -1 +1 @@
-from . import product_set_add
+from . import sale_product_set_wizard
diff --git a/...er_api_wishlist/wizard/product_set_add.py → ...ishlist/wizard/sale_product_set_wizard.py b/...er_api_wishlist/wizard/product_set_add.py → ...ishlist/wizard/sale_product_set_wizard.py
@@ -3,8 +3,8 @@
 from odoo import models
 
 
-class ProductSetAdd(models.TransientModel):
-    _inherit = "product.set.add"
+class SaleProductSetWizard(models.TransientModel):
+    _inherit = "sale.product.set.wizard"
 
     def prepare_sale_order_line_data(self, set_line, max_sequence=0):
         # check if user is in the group of shopinvader_wishlist_user_group
@@ -14,6 +14,6 @@ def prepare_sale_order_line_data(self, set_line, max_sequence=0):
             "shopinvader_api_wishlist.shopinvader_wishlist_user_group"
         ):
             self_super = self.sudo()
-        return super(ProductSetAdd, self_super).prepare_sale_order_line_data(
+        return super(SaleProductSetWizard, self_super).prepare_sale_order_line_data(
             set_line, max_sequence
         )
diff --git a/shopinvader_product_stock_assortment/__manifest__.py b/shopinvader_product_stock_assortment/__manifest__.py
@@ -11,6 +11,6 @@
     "author": "ACSONE SA/NV",
     "license": "AGPL-3",
     "installable": False,
-    "depends": ["shopinvader_product_stock", "shopinvader_assortment"],
-    "auto_install": True,
+    # "depends": ["shopinvader_product_stock", "shopinvader_assortment"],  no more exists
+    # "auto_install": True,
 }
diff --git a/shopinvader_restapi/tests/test_invoice.py b/shopinvader_restapi/tests/test_invoice.py
@@ -21,6 +21,7 @@ def setUpClass(cls):
         cls.bank_journal_euro = cls.journal_obj.create(
             {"name": "Bank", "type": "bank", "code": "BNK627"}
         )
+        cls.payment_method_line_manual_in.journal_id = cls.bank_journal_euro
         cls.invoice_obj = cls.env["account.move"]
         cls.invoice = cls._confirm_and_invoice_sale(cls, cls.sale)
         cls.non_sale_invoice = cls.invoice.copy()

diff --git a/shopinvader_restapi/tests/test_sale.py b/shopinvader_restapi/tests/test_sale.py
@@ -26,6 +26,7 @@ def setUpClass(cls):
         cls.bank_journal_euro = cls.journal_obj.create(
             {"name": "Bank", "type": "bank", "code": "BNK6278"}
         )
+        cls.payment_method_line_manual_in.journal_id = cls.bank_journal_euro
 
     def setUp(self, *args, **kwargs):
         super().setUp(*args, **kwargs)

diff --git a/shopinvader_wishlist/services/wishlist.py b/shopinvader_wishlist/services/wishlist.py
@@ -314,7 +314,7 @@ def _get_base_search_domain(self):
         return self._default_domain_for_partner_records()
 
     def _get_add_to_cart_wizard(self, record, cart):
-        return self.env["product.set.add"].create(
+        return self.env["sale.product.set.wizard"].create(
             {
                 "order_id": cart.id,
                 "product_set_id": record.id,

diff --git a/shopinvader_wishlist/wizard/__init__.py b/shopinvader_wishlist/wizard/__init__.py
@@ -1 +1 @@
-from . import product_set_add
+from . import sale_product_set_wizard
diff --git a/...nvader_wishlist/wizard/product_set_add.py → ...ishlist/wizard/sale_product_set_wizard.py b/...nvader_wishlist/wizard/product_set_add.py → ...ishlist/wizard/sale_product_set_wizard.py
@@ -6,7 +6,7 @@
 
 
 class ProductSetAdd(models.TransientModel):
-    _inherit = "product.set.add"
+    _inherit = "sale.product.set.wizard"
 
     shopinvader_backend_id = fields.Many2one(
         related="product_set_id.shopinvader_backend_id"