From b9f715fd41a2734df8abae73e8337d4754950555 Mon Sep 17 00:00:00 2001 From: Benjamin Willig Date: Wed, 17 Jun 2020 11:59:00 +0200 Subject: [PATCH 01/29] [ADD] product_pricelist_assortment --- product_pricelist_assortment/__init__.py | 1 + product_pricelist_assortment/__manifest__.py | 21 ++++ product_pricelist_assortment/data/ir_cron.xml | 22 ++++ .../models/__init__.py | 3 + .../models/product_pricelist.py | 40 ++++++ .../product_pricelist_assortment_item.py | 90 ++++++++++++++ .../models/product_pricelist_item.py | 16 +++ .../readme/CONTRIBUTORS.rst | 3 + .../readme/DESCRIPTION.RST | 1 + .../product_pricelist_assortment_item.xml | 30 +++++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../tests/__init__.py | 1 + .../tests/test_pricelist_assortment.py | 116 ++++++++++++++++++ .../views/product_pricelist.xml | 52 ++++++++ .../product_pricelist_assortment_item.xml | 96 +++++++++++++++ .../views/product_pricelist_item.xml | 18 +++ 16 files changed, 510 insertions(+) create mode 100644 product_pricelist_assortment/__init__.py create mode 100644 product_pricelist_assortment/__manifest__.py create mode 100644 product_pricelist_assortment/data/ir_cron.xml create mode 100644 product_pricelist_assortment/models/__init__.py create mode 100644 product_pricelist_assortment/models/product_pricelist.py create mode 100644 product_pricelist_assortment/models/product_pricelist_assortment_item.py create mode 100644 product_pricelist_assortment/models/product_pricelist_item.py create mode 100644 product_pricelist_assortment/readme/CONTRIBUTORS.rst create mode 100644 product_pricelist_assortment/readme/DESCRIPTION.RST create mode 100644 product_pricelist_assortment/security/product_pricelist_assortment_item.xml create mode 100644 product_pricelist_assortment/static/description/icon.png create mode 100644 product_pricelist_assortment/tests/__init__.py create mode 100644 product_pricelist_assortment/tests/test_pricelist_assortment.py create mode 100644 product_pricelist_assortment/views/product_pricelist.xml create mode 100644 product_pricelist_assortment/views/product_pricelist_assortment_item.xml create mode 100644 product_pricelist_assortment/views/product_pricelist_item.xml diff --git a/product_pricelist_assortment/__init__.py b/product_pricelist_assortment/__init__.py new file mode 100644 index 00000000000..0650744f6bc --- /dev/null +++ b/product_pricelist_assortment/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/product_pricelist_assortment/__manifest__.py b/product_pricelist_assortment/__manifest__.py new file mode 100644 index 00000000000..7561c88d630 --- /dev/null +++ b/product_pricelist_assortment/__manifest__.py @@ -0,0 +1,21 @@ +# Copyright 2020 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Product Pricelist Assortment", + "summary": """ + Product assortment and pricelist""", + "version": "13.0.1.0.0", + "license": "AGPL-3", + "author": "ACSONE SA/NV, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/product-attribute", + "depends": ["product_assortment"], + "data": [ + "security/product_pricelist_assortment_item.xml", + "data/ir_cron.xml", + "views/product_pricelist.xml", + "views/product_pricelist_assortment_item.xml", + "views/product_pricelist_item.xml", + ], + "demo": [], +} diff --git a/product_pricelist_assortment/data/ir_cron.xml b/product_pricelist_assortment/data/ir_cron.xml new file mode 100644 index 00000000000..38b0c814251 --- /dev/null +++ b/product_pricelist_assortment/data/ir_cron.xml @@ -0,0 +1,22 @@ + + + + + Pricelist Assortment - Launch update + + + + code + 10 + minutes + -1 + + model.cron_assortment_update() + + + diff --git a/product_pricelist_assortment/models/__init__.py b/product_pricelist_assortment/models/__init__.py new file mode 100644 index 00000000000..c2ed8b83fbd --- /dev/null +++ b/product_pricelist_assortment/models/__init__.py @@ -0,0 +1,3 @@ +from . import product_pricelist +from . import product_pricelist_assortment_item +from . import product_pricelist_item diff --git a/product_pricelist_assortment/models/product_pricelist.py b/product_pricelist_assortment/models/product_pricelist.py new file mode 100644 index 00000000000..fb213aff589 --- /dev/null +++ b/product_pricelist_assortment/models/product_pricelist.py @@ -0,0 +1,40 @@ +# Copyright 2020 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import api, fields, models + + +class ProductPricelist(models.Model): + + _inherit = "product.pricelist" + + item_assortment_ids = fields.One2many( + comodel_name="product.pricelist.assortment.item", + inverse_name="pricelist_id", + string="Assortment items", + ) + + def action_launch_assortment_update(self): + """ + Action to execute update of assortment items + :return: dict + """ + for item_assortment in self.mapped("item_assortment_ids"): + item_assortment._update_assortment_items() + return True + + @api.model + def _get_pricelist_assortment_to_update(self): + """ + Get every pricelists related to an assortment (and active)! + :return: self recordset + """ + return self.env["product.pricelist"].search( + [("item_assortment_ids", "!=", False)] + ) + + @api.model + def cron_assortment_update(self): + pricelists = self._get_pricelist_assortment_to_update() + pricelists.action_launch_assortment_update() + return True diff --git a/product_pricelist_assortment/models/product_pricelist_assortment_item.py b/product_pricelist_assortment/models/product_pricelist_assortment_item.py new file mode 100644 index 00000000000..795e807f09a --- /dev/null +++ b/product_pricelist_assortment/models/product_pricelist_assortment_item.py @@ -0,0 +1,90 @@ +# Copyright 2019 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +import logging + +from odoo import SUPERUSER_ID, fields, models + +_logger = logging.getLogger(__name__) + + +class ProductPricelistAssortmentItem(models.Model): + + _name = "product.pricelist.assortment.item" + _description = "Product Pricelist Assortment Item" + _inherit = "product.pricelist.item" + + name = fields.Char(related="assortment_filter_id.name", readonly=True,) + assortment_filter_id = fields.Many2one( + comodel_name="ir.filters", + domain=[("is_assortment", "=", True)], + string="Assortment", + ondelete="restrict", + required=True, + ) + pricelist_item_ids = fields.One2many( + comodel_name="product.pricelist.item", + inverse_name="assortment_item_id", + help="Pricelist items created automatically", + ) + + def _get_pricelist_item_values(self): + """ + Get a list of values to create new product.pricelist.item + :return: list of dict + """ + self.ensure_one() + products = self._get_product_from_assortment() + list_values = [] + # fields to ignore to create pricelist item + blacklist = models.MAGIC_COLUMNS + [self.CONCURRENCY_CHECK_FIELD] + blacklist.extend(["assortment_filter_id", "pricelist_item_ids"]) + default_values = { + k: self._fields.get(k).convert_to_write(self[k], self) + for k in self._fields.keys() + if k not in blacklist + } + for product in products: + values = default_values.copy() + values.update( + { + "pricelist_id": self.pricelist_id.id, + "assortment_item_id": self.id, + "applied_on": "0_product_variant", + "product_id": product.id, + } + ) + list_values.append(values) + return list_values + + def _get_product_from_assortment(self): + domain = self.assortment_filter_id._get_eval_domain() + products = self.env[self.assortment_filter_id.model_id].search(domain) + return products + + def _get_related_items(self): + return self.mapped("pricelist_item_ids") + + def _update_assortment_items(self): + """ + Update the pricelist with current assortment: + - Prepare values for new assorment items; + - Delete previous items. + - Create new assortments items; + + :return: bool + """ + self.ensure_one() + if not self.assortment_filter_id.active: + _logger.info( + "The assortment item %s is ignored because the " + "related assortment/filter is not active", + self.display_name, + ) + return False + + items_values = self._get_pricelist_item_values() + old_items = self._get_related_items() + old_items.unlink() + self.env["product.pricelist.item"].with_user(SUPERUSER_ID).create(items_values) + return True diff --git a/product_pricelist_assortment/models/product_pricelist_item.py b/product_pricelist_assortment/models/product_pricelist_item.py new file mode 100644 index 00000000000..eae8eaeb134 --- /dev/null +++ b/product_pricelist_assortment/models/product_pricelist_item.py @@ -0,0 +1,16 @@ +# Copyright 2020 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import fields, models + + +class ProductPricelistItem(models.Model): + + _inherit = "product.pricelist.item" + + assortment_item_id = fields.Many2one( + comodel_name="product.pricelist.assortment.item", + string="Assortment item", + readonly=True, + ondelete="cascade", + ) diff --git a/product_pricelist_assortment/readme/CONTRIBUTORS.rst b/product_pricelist_assortment/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000000..235ceab049c --- /dev/null +++ b/product_pricelist_assortment/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* Denis Roussel +* Cédric Pigeon +* François Honoré diff --git a/product_pricelist_assortment/readme/DESCRIPTION.RST b/product_pricelist_assortment/readme/DESCRIPTION.RST new file mode 100644 index 00000000000..1599c43e63f --- /dev/null +++ b/product_pricelist_assortment/readme/DESCRIPTION.RST @@ -0,0 +1 @@ +Creates dynamic pricelist items based on product assortments. diff --git a/product_pricelist_assortment/security/product_pricelist_assortment_item.xml b/product_pricelist_assortment/security/product_pricelist_assortment_item.xml new file mode 100644 index 00000000000..438b709b3c3 --- /dev/null +++ b/product_pricelist_assortment/security/product_pricelist_assortment_item.xml @@ -0,0 +1,30 @@ + + + + + product.pricelist.assortment user + + + + + + + + + product.pricelist.assortment pricelist manager + + + + + + + + + product.pricelist.assortment.item company rule + + ['|', ('company_id','=',user.company_id.id), ('company_id','=',False)] + + diff --git a/product_pricelist_assortment/static/description/icon.png b/product_pricelist_assortment/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/product_pricelist_assortment/tests/__init__.py b/product_pricelist_assortment/tests/__init__.py new file mode 100644 index 00000000000..a0e4136b406 --- /dev/null +++ b/product_pricelist_assortment/tests/__init__.py @@ -0,0 +1 @@ +from . import test_pricelist_assortment diff --git a/product_pricelist_assortment/tests/test_pricelist_assortment.py b/product_pricelist_assortment/tests/test_pricelist_assortment.py new file mode 100644 index 00000000000..84e285378e1 --- /dev/null +++ b/product_pricelist_assortment/tests/test_pricelist_assortment.py @@ -0,0 +1,116 @@ +# Copyright 2020 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from uuid import uuid4 + +from odoo.tests.common import SavepointCase + + +class TestPricelistAssortment(SavepointCase): + @classmethod + def setUpClass(cls): + super(TestPricelistAssortment, cls).setUpClass() + cls.Pricelist = cls.env["product.pricelist"] + cls.PricelistItem = cls.env["product.pricelist.assortment.item"] + cls.Product = cls.env["product.product"] + cls.Assortment = cls.env["ir.filters"] + cls.default_codes = [str(uuid4()) for x in range(0, 10)] + cls.precision = 2 + cls.assortment = cls._create_assortment(cls) + cls.products_assortment = cls._create_products_assortment(cls) + + def _create_assortment(self): + """ + Create a new assortment + :return: ir.filters recordset + """ + values = { + "name": str(uuid4()), + "model_id": "product.product", + "domain": [("default_code", "in", self.default_codes)], + "user_id": False, + "is_assortment": True, + } + return self.Assortment.create(values) + + def _create_products_assortment(self): + """ + Create some product.product matching with assortment. + :return: product.product recordset + """ + products = self.Product.browse() + for default_code in self.default_codes: + values = { + "name": str(uuid4()), + "default_code": default_code, + } + products |= self.Product.create(values) + return products + + def _get_pricelist_values(self): + """ + Get values to create a new pricelist + :return: dict + """ + fields_list = self.Pricelist.fields_get().keys() + values = self.Pricelist.default_get(fields_list) + values.update({"name": str(uuid4()), "active": True, "item_ids": [(0, 0, {})]}) + return values + + def _add_assortment_item_fixed_price(self, pricelist): + """ + - Add a new item assortment + - Check if action_launch_assortment_update is correct + - Check if the given product price is correct (concerned by assortment) + - Check if a normal product still correct + :param pricelist: product.pricelist recordset + :return: bool + """ + item_global = pricelist.item_ids.filtered(lambda i: i.applied_on == "3_global") + normal_price = 111.111 + assortment_price = 526.369 + item_global.write({"compute_price": "fixed", "fixed_price": normal_price}) + item_values = { + "assortment_filter_id": self.assortment.id, + "compute_price": "fixed", + "fixed_price": assortment_price, + "pricelist_id": pricelist.id, + } + assortment_item = self.PricelistItem.create(item_values) + existing_items = pricelist.item_ids + pricelist.action_launch_assortment_update() + new_items = pricelist.item_ids - existing_items + self.assertEquals(len(pricelist.item_assortment_ids), 1) + # Check items created + ensure_product_in = self.products_assortment + self.assertTrue(bool(new_items)) + for item in new_items: + self.assertIn(item.product_id, ensure_product_in) + ensure_product_in -= item.product_id + self.assertEquals(item.assortment_item_id, assortment_item) + products_assortment = self.products_assortment.with_context( + pricelist=pricelist.id + ) + self.assertTrue(bool(products_assortment)) + for product in products_assortment: + self.assertAlmostEquals( + product.price, assortment_price, places=self.precision + ) + normal_product = self.Product.search( + [("id", "not in", self.products_assortment.ids)], limit=1 + ).with_context(pricelist=pricelist.id) + self.assertAlmostEquals( + normal_product.price, normal_price, places=self.precision + ) + return True + + def test_pricelist_assortment(self): + """ + Check if prices are correctly returned for a product into an + assortment. + :return: + """ + pricelist_values = self._get_pricelist_values() + pricelist = self.Pricelist.create(pricelist_values) + self._add_assortment_item_fixed_price(pricelist) + return diff --git a/product_pricelist_assortment/views/product_pricelist.xml b/product_pricelist_assortment/views/product_pricelist.xml new file mode 100644 index 00000000000..388c816fd42 --- /dev/null +++ b/product_pricelist_assortment/views/product_pricelist.xml @@ -0,0 +1,52 @@ + + + + + product.pricelist.form (in product_pricelist_assortment) + product.pricelist + + + + + [('assortment_item_id', '=', False)] + + + + + + +