From 516619f5fb9ab697c2c58561739573c0be23e9f4 Mon Sep 17 00:00:00 2001 From: Alessandro Uffreduzzi Date: Wed, 15 May 2024 14:19:41 +0200 Subject: [PATCH 1/5] [IMP] sale_coupon_reward_fixed_price: add hook for other modules --- sale_coupon_reward_fixed_price/models/sale_order.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sale_coupon_reward_fixed_price/models/sale_order.py b/sale_coupon_reward_fixed_price/models/sale_order.py index bbbc7f637..65a4e046b 100644 --- a/sale_coupon_reward_fixed_price/models/sale_order.py +++ b/sale_coupon_reward_fixed_price/models/sale_order.py @@ -76,9 +76,7 @@ def _set_reward_fixed_price_for_lines(self, program): price_unit = program.price_unit lines = self._get_paid_order_lines() if program.discount_apply_on == "cheapest_product": - line = self._get_cheapest_line() - if line: - line.price_unit = price_unit + lines = self._get_cheapest_line() elif program.discount_apply_on in ["specific_products", "on_order"]: if program.discount_apply_on == "specific_products": # We should not exclude reward line that offer this product @@ -102,15 +100,13 @@ def _set_reward_fixed_price_for_lines(self, program): lambda x: x.product_id in (program.discount_specific_product_ids | free_product_lines), ) - for line in lines: - line.price_unit = price_unit elif program.discount_apply_on == "domain_product": # for compatibility with `sale_promotion_domain_product_discount` module lines = (self.order_line - self._get_reward_lines()).filtered( lambda line: program._get_valid_products(line.product_id), ) - for line in lines: - line.price_unit = price_unit + lines.write({"price_unit": price_unit}) + return lines def _get_reward_line_values(self, program): """ From 484ccf04305c53ad221953d1f0bf6b981297bb0a Mon Sep 17 00:00:00 2001 From: Alessandro Uffreduzzi Date: Wed, 15 May 2024 14:20:16 +0200 Subject: [PATCH 2/5] [IMP] sale_coupon_domain_product_reward_fixed_price: add hook for other modules --- .../models/sale_order.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sale_coupon_domain_product_reward_fixed_price/models/sale_order.py b/sale_coupon_domain_product_reward_fixed_price/models/sale_order.py index 6d4204faa..704293cfe 100644 --- a/sale_coupon_domain_product_reward_fixed_price/models/sale_order.py +++ b/sale_coupon_domain_product_reward_fixed_price/models/sale_order.py @@ -16,5 +16,6 @@ def _set_reward_fixed_price_for_lines(self, program): lambda line: program._get_valid_products(line.product_id), ) lines.write({"price_unit": program.price_unit}) + return lines else: - super()._set_reward_fixed_price_for_lines(program) + return super()._set_reward_fixed_price_for_lines(program) From 852614551b97f5d9a9f99dd4ad4442b23276e4bb Mon Sep 17 00:00:00 2001 From: Alessandro Uffreduzzi Date: Wed, 15 May 2024 14:20:48 +0200 Subject: [PATCH 3/5] [ADD] sale_coupon_reward_fixed_price_order_line_link: new bridge module --- .../README.rst | 99 ++++ .../__init__.py | 1 + .../__manifest__.py | 20 + .../models/__init__.py | 1 + .../models/sale_order.py | 13 + .../readme/CONTRIBUTORS.rst | 4 + .../readme/DESCRIPTION.rst | 2 + .../readme/USAGE.rst | 1 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 431 ++++++++++++++++++ .../tests/__init__.py | 1 + .../tests/test_promotion_discount_in_field.py | 38 ++ ..._coupon_reward_fixed_price_order_line_link | 1 + .../setup.py | 6 + 14 files changed, 618 insertions(+) create mode 100644 sale_coupon_reward_fixed_price_order_line_link/README.rst create mode 100644 sale_coupon_reward_fixed_price_order_line_link/__init__.py create mode 100644 sale_coupon_reward_fixed_price_order_line_link/__manifest__.py create mode 100644 sale_coupon_reward_fixed_price_order_line_link/models/__init__.py create mode 100644 sale_coupon_reward_fixed_price_order_line_link/models/sale_order.py create mode 100644 sale_coupon_reward_fixed_price_order_line_link/readme/CONTRIBUTORS.rst create mode 100644 sale_coupon_reward_fixed_price_order_line_link/readme/DESCRIPTION.rst create mode 100644 sale_coupon_reward_fixed_price_order_line_link/readme/USAGE.rst create mode 100755 sale_coupon_reward_fixed_price_order_line_link/static/description/icon.png create mode 100644 sale_coupon_reward_fixed_price_order_line_link/static/description/index.html create mode 100644 sale_coupon_reward_fixed_price_order_line_link/tests/__init__.py create mode 100644 sale_coupon_reward_fixed_price_order_line_link/tests/test_promotion_discount_in_field.py create mode 120000 setup/sale_coupon_reward_fixed_price_order_line_link/odoo/addons/sale_coupon_reward_fixed_price_order_line_link create mode 100644 setup/sale_coupon_reward_fixed_price_order_line_link/setup.py diff --git a/sale_coupon_reward_fixed_price_order_line_link/README.rst b/sale_coupon_reward_fixed_price_order_line_link/README.rst new file mode 100644 index 000000000..123033c2e --- /dev/null +++ b/sale_coupon_reward_fixed_price_order_line_link/README.rst @@ -0,0 +1,99 @@ +========================================= +Coupon Reward Fixed Price Order Line Link +========================================= + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:56eca0c2aaa35a8a510a9d5f3102c17dbdfdfef8d20a7b998c016f87d8290341 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsale--promotion-lightgray.png?logo=github + :target: https://github.com/OCA/sale-promotion/tree/14.0/sale_coupon_reward_fixed_price_order_line_link + :alt: OCA/sale-promotion +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/sale-promotion-14-0/sale-promotion-14-0-sale_coupon_reward_fixed_price_order_line_link + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/sale-promotion&target_branch=14.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +Bridge module between Sale Coupon Order Line Link and +Sale Coupon Reward Fixed Price + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +No action necessary, module works out of the box. + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* PyTech SRL + +Contributors +~~~~~~~~~~~~ + + +* `PyTech SRL `__: + + * Alessandro Uffreduzzi + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +.. |maintainer-aleuffre| image:: https://github.com/aleuffre.png?size=40px + :target: https://github.com/aleuffre + :alt: aleuffre +.. |maintainer-renda-dev| image:: https://github.com/renda-dev.png?size=40px + :target: https://github.com/renda-dev + :alt: renda-dev +.. |maintainer-PicchiSeba| image:: https://github.com/PicchiSeba.png?size=40px + :target: https://github.com/PicchiSeba + :alt: PicchiSeba + +Current `maintainers `__: + +|maintainer-aleuffre| |maintainer-renda-dev| |maintainer-PicchiSeba| + +This module is part of the `OCA/sale-promotion `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sale_coupon_reward_fixed_price_order_line_link/__init__.py b/sale_coupon_reward_fixed_price_order_line_link/__init__.py new file mode 100644 index 000000000..0650744f6 --- /dev/null +++ b/sale_coupon_reward_fixed_price_order_line_link/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/sale_coupon_reward_fixed_price_order_line_link/__manifest__.py b/sale_coupon_reward_fixed_price_order_line_link/__manifest__.py new file mode 100644 index 000000000..343c8e0bf --- /dev/null +++ b/sale_coupon_reward_fixed_price_order_line_link/__manifest__.py @@ -0,0 +1,20 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + "name": "Coupon Reward Fixed Price Order Line Link", + "version": "14.0.1.0.0", + "summary": "Bridge module to track promotions on SOL " "with the discount in field", + "author": "PyTech SRL, Odoo Community Association (OCA)", + "maintainers": ["aleuffre", "renda-dev", "PicchiSeba"], + "license": "AGPL-3", + "category": "Sales Management", + "website": "https://github.com/OCA/sale-promotion", + "depends": [ + "sale_coupon_order_line_link", + "sale_coupon_reward_fixed_price", + ], + "demo": [], + "data": [], + "installable": True, + "application": False, +} diff --git a/sale_coupon_reward_fixed_price_order_line_link/models/__init__.py b/sale_coupon_reward_fixed_price_order_line_link/models/__init__.py new file mode 100644 index 000000000..6aacb7531 --- /dev/null +++ b/sale_coupon_reward_fixed_price_order_line_link/models/__init__.py @@ -0,0 +1 @@ +from . import sale_order diff --git a/sale_coupon_reward_fixed_price_order_line_link/models/sale_order.py b/sale_coupon_reward_fixed_price_order_line_link/models/sale_order.py new file mode 100644 index 000000000..1cd889e06 --- /dev/null +++ b/sale_coupon_reward_fixed_price_order_line_link/models/sale_order.py @@ -0,0 +1,13 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import models + + +class SaleOrder(models.Model): + _inherit = "sale.order" + + def _set_reward_fixed_price_for_lines(self, program): + lines = super()._set_reward_fixed_price_for_lines(program) + if lines: + lines.write({"coupon_program_id": program.id}) + return lines diff --git a/sale_coupon_reward_fixed_price_order_line_link/readme/CONTRIBUTORS.rst b/sale_coupon_reward_fixed_price_order_line_link/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..c61dbfcd9 --- /dev/null +++ b/sale_coupon_reward_fixed_price_order_line_link/readme/CONTRIBUTORS.rst @@ -0,0 +1,4 @@ + +* `PyTech SRL `__: + + * Alessandro Uffreduzzi diff --git a/sale_coupon_reward_fixed_price_order_line_link/readme/DESCRIPTION.rst b/sale_coupon_reward_fixed_price_order_line_link/readme/DESCRIPTION.rst new file mode 100644 index 000000000..de4fee7be --- /dev/null +++ b/sale_coupon_reward_fixed_price_order_line_link/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +Bridge module between Sale Coupon Order Line Link and +Sale Coupon Reward Fixed Price diff --git a/sale_coupon_reward_fixed_price_order_line_link/readme/USAGE.rst b/sale_coupon_reward_fixed_price_order_line_link/readme/USAGE.rst new file mode 100644 index 000000000..69c962d56 --- /dev/null +++ b/sale_coupon_reward_fixed_price_order_line_link/readme/USAGE.rst @@ -0,0 +1 @@ +No action necessary, module works out of the box. diff --git a/sale_coupon_reward_fixed_price_order_line_link/static/description/icon.png b/sale_coupon_reward_fixed_price_order_line_link/static/description/icon.png new file mode 100755 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/sale_coupon_reward_fixed_price_order_line_link/static/description/index.html b/sale_coupon_reward_fixed_price_order_line_link/static/description/index.html new file mode 100644 index 000000000..eb13f2c8b --- /dev/null +++ b/sale_coupon_reward_fixed_price_order_line_link/static/description/index.html @@ -0,0 +1,431 @@ + + + + + +Coupon Reward Fixed Price Order Line Link + + + + + + diff --git a/sale_coupon_reward_fixed_price_order_line_link/tests/__init__.py b/sale_coupon_reward_fixed_price_order_line_link/tests/__init__.py new file mode 100644 index 000000000..3df23b3e0 --- /dev/null +++ b/sale_coupon_reward_fixed_price_order_line_link/tests/__init__.py @@ -0,0 +1 @@ +from . import test_promotion_discount_in_field diff --git a/sale_coupon_reward_fixed_price_order_line_link/tests/test_promotion_discount_in_field.py b/sale_coupon_reward_fixed_price_order_line_link/tests/test_promotion_discount_in_field.py new file mode 100644 index 000000000..fad0a497f --- /dev/null +++ b/sale_coupon_reward_fixed_price_order_line_link/tests/test_promotion_discount_in_field.py @@ -0,0 +1,38 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo.tests.common import SavepointCase + + +class TestSaleCouponRewardFixedPriceOrderLineLink(SavepointCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.product = cls.env.ref("product.product_product_25_product_template") + cls.partner = cls.env.ref("base.res_partner_3") + cls.order = cls.env["sale.order"].create( + { + "partner_id": cls.partner.id, + "order_line": [(0, 0, {"product_id": cls.product.id})], + } + ) + + cls.coupon = cls.env["coupon.program"].create( + { + "name": "10%", + "promo_code_usage": "no_code_needed", + "reward_type": "fixed_price", + "program_type": "promotion_program", + "discount_type": "percentage", + "discount_percentage": 10.0, + "discount_apply_on": "cheapest_product", + } + ) + + def test_program_reward_fixed_price_specific_product(self): + """ + Test that when adding a coupon of reward type "discount_line" + the coupon program is correctly tracked on the SOL + """ + self.assertFalse(self.order.order_line.coupon_program_id) + self.order.recompute_coupon_lines() + self.assertTrue(self.order.order_line.coupon_program_id) diff --git a/setup/sale_coupon_reward_fixed_price_order_line_link/odoo/addons/sale_coupon_reward_fixed_price_order_line_link b/setup/sale_coupon_reward_fixed_price_order_line_link/odoo/addons/sale_coupon_reward_fixed_price_order_line_link new file mode 120000 index 000000000..ae5eae5dd --- /dev/null +++ b/setup/sale_coupon_reward_fixed_price_order_line_link/odoo/addons/sale_coupon_reward_fixed_price_order_line_link @@ -0,0 +1 @@ +../../../../sale_coupon_reward_fixed_price_order_line_link \ No newline at end of file diff --git a/setup/sale_coupon_reward_fixed_price_order_line_link/setup.py b/setup/sale_coupon_reward_fixed_price_order_line_link/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/sale_coupon_reward_fixed_price_order_line_link/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 7f275ac306325569e9c94b6a68c77c6f4be510b6 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Fri, 7 Jun 2024 14:22:12 +0000 Subject: [PATCH 4/5] [UPD] Update sale_coupon_reward_fixed_price_order_line_link.pot --- ...pon_reward_fixed_price_order_line_link.pot | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 sale_coupon_reward_fixed_price_order_line_link/i18n/sale_coupon_reward_fixed_price_order_line_link.pot diff --git a/sale_coupon_reward_fixed_price_order_line_link/i18n/sale_coupon_reward_fixed_price_order_line_link.pot b/sale_coupon_reward_fixed_price_order_line_link/i18n/sale_coupon_reward_fixed_price_order_line_link.pot new file mode 100644 index 000000000..f5441be11 --- /dev/null +++ b/sale_coupon_reward_fixed_price_order_line_link/i18n/sale_coupon_reward_fixed_price_order_line_link.pot @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_coupon_reward_fixed_price_order_line_link +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: sale_coupon_reward_fixed_price_order_line_link +#: model:ir.model.fields,field_description:sale_coupon_reward_fixed_price_order_line_link.field_sale_order__display_name +msgid "Display Name" +msgstr "" + +#. module: sale_coupon_reward_fixed_price_order_line_link +#: model:ir.model.fields,field_description:sale_coupon_reward_fixed_price_order_line_link.field_sale_order__id +msgid "ID" +msgstr "" + +#. module: sale_coupon_reward_fixed_price_order_line_link +#: model:ir.model.fields,field_description:sale_coupon_reward_fixed_price_order_line_link.field_sale_order____last_update +msgid "Last Modified on" +msgstr "" + +#. module: sale_coupon_reward_fixed_price_order_line_link +#: model:ir.model,name:sale_coupon_reward_fixed_price_order_line_link.model_sale_order +msgid "Sales Order" +msgstr "" From ec1c125f00a7266fcdb6265fb38120f2dbb82a80 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 7 Jun 2024 14:25:23 +0000 Subject: [PATCH 5/5] [BOT] post-merge updates --- README.md | 1 + setup/_metapackage/VERSION.txt | 2 +- setup/_metapackage/setup.py | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a23dee096..d99f554ac 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,7 @@ addon | version | maintainers | summary [sale_coupon_product_exclude](sale_coupon_product_exclude/) | 14.0.1.0.0 | | Apply a discount to the order, excluding products matching the domain [sale_coupon_reward_add_product](sale_coupon_reward_add_product/) | 14.0.1.0.0 | [![jcoux](https://github.com/jcoux.png?size=30px)](https://github.com/jcoux) [![ivantodorovich](https://github.com/ivantodorovich.png?size=30px)](https://github.com/ivantodorovich) | Sale Coupon Automatic free product as normal [sale_coupon_reward_fixed_price](sale_coupon_reward_fixed_price/) | 14.0.1.1.0 | | Apply fixed price for domain matching products +[sale_coupon_reward_fixed_price_order_line_link](sale_coupon_reward_fixed_price_order_line_link/) | 14.0.1.0.0 | [![aleuffre](https://github.com/aleuffre.png?size=30px)](https://github.com/aleuffre) [![renda-dev](https://github.com/renda-dev.png?size=30px)](https://github.com/renda-dev) [![PicchiSeba](https://github.com/PicchiSeba.png?size=30px)](https://github.com/PicchiSeba) | Bridge module to track promotions on SOL with the discount in field [sale_promotion_discount_in_field](sale_promotion_discount_in_field/) | 14.0.1.1.0 | [![CetmixGitDrone](https://github.com/CetmixGitDrone.png?size=30px)](https://github.com/CetmixGitDrone) [![Volodiay622](https://github.com/Volodiay622.png?size=30px)](https://github.com/Volodiay622) | Put promotion discount into discount field [//]: # (end addons) diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt index 61f619470..bd4023d01 100644 --- a/setup/_metapackage/VERSION.txt +++ b/setup/_metapackage/VERSION.txt @@ -1 +1 @@ -14.0.20230728.0 \ No newline at end of file +14.0.20240607.0 \ No newline at end of file diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py index d88127976..836902fad 100644 --- a/setup/_metapackage/setup.py +++ b/setup/_metapackage/setup.py @@ -23,6 +23,7 @@ 'odoo14-addon-sale_coupon_product_exclude', 'odoo14-addon-sale_coupon_reward_add_product', 'odoo14-addon-sale_coupon_reward_fixed_price', + 'odoo14-addon-sale_coupon_reward_fixed_price_order_line_link', 'odoo14-addon-sale_promotion_discount_in_field', ], classifiers=[