From 1f9da64b0d72f69764da5a35ca1670fa54829211 Mon Sep 17 00:00:00 2001 From: diga Date: Sat, 7 May 2022 15:32:56 +0500 Subject: [PATCH 01/17] [14.0][ADD] sale_coupon_criteria_order_based --- sale_coupon_criteria_order_based/README.rst | 87 ++++ sale_coupon_criteria_order_based/__init__.py | 1 + .../__manifest__.py | 16 + .../i18n/sale_coupon_criteria_order_based.pot | 74 +++ .../models/__init__.py | 3 + .../models/coupon_coupon.py | 14 + .../models/coupon_program.py | 59 +++ .../models/coupon_rule.py | 13 + .../readme/CONTRIBUTORS.rst | 2 + .../readme/DESCRIPTION.rst | 4 + .../readme/USAGE.rst | 5 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 432 ++++++++++++++++++ .../tests/__init__.py | 1 + .../test_sale_coupon_criteria_order_based.py | 79 ++++ .../views/coupon_program_view.xml | 20 + 16 files changed, 810 insertions(+) create mode 100644 sale_coupon_criteria_order_based/README.rst create mode 100644 sale_coupon_criteria_order_based/__init__.py create mode 100644 sale_coupon_criteria_order_based/__manifest__.py create mode 100644 sale_coupon_criteria_order_based/i18n/sale_coupon_criteria_order_based.pot create mode 100644 sale_coupon_criteria_order_based/models/__init__.py create mode 100644 sale_coupon_criteria_order_based/models/coupon_coupon.py create mode 100644 sale_coupon_criteria_order_based/models/coupon_program.py create mode 100644 sale_coupon_criteria_order_based/models/coupon_rule.py create mode 100644 sale_coupon_criteria_order_based/readme/CONTRIBUTORS.rst create mode 100644 sale_coupon_criteria_order_based/readme/DESCRIPTION.rst create mode 100644 sale_coupon_criteria_order_based/readme/USAGE.rst create mode 100644 sale_coupon_criteria_order_based/static/description/icon.png create mode 100644 sale_coupon_criteria_order_based/static/description/index.html create mode 100644 sale_coupon_criteria_order_based/tests/__init__.py create mode 100644 sale_coupon_criteria_order_based/tests/test_sale_coupon_criteria_order_based.py create mode 100644 sale_coupon_criteria_order_based/views/coupon_program_view.xml diff --git a/sale_coupon_criteria_order_based/README.rst b/sale_coupon_criteria_order_based/README.rst new file mode 100644 index 000000000..cc7c3cefb --- /dev/null +++ b/sale_coupon_criteria_order_based/README.rst @@ -0,0 +1,87 @@ +======================================== +Sales Coupon based on Sales Order values +======================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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_criteria_order_based + :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_criteria_order_based + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/296/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module add and option to configure your coupon conditions based on +the Sales Order values. + +Example: "If Sales Team is 'Europe' apply the following discount' + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +Open or create a new Promotion Program in the **Sales/Products/Promotion Programs** menu. + +In *Conditions* section the following new option is available: + +* **Based on Order** configure an order-based domain to apply the promotion + +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 smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Ooops404 +* Cetmix + +Contributors +~~~~~~~~~~~~ + +* Ooops404 +* Cetmix + +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. + +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_criteria_order_based/__init__.py b/sale_coupon_criteria_order_based/__init__.py new file mode 100644 index 000000000..0650744f6 --- /dev/null +++ b/sale_coupon_criteria_order_based/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/sale_coupon_criteria_order_based/__manifest__.py b/sale_coupon_criteria_order_based/__manifest__.py new file mode 100644 index 000000000..cee062078 --- /dev/null +++ b/sale_coupon_criteria_order_based/__manifest__.py @@ -0,0 +1,16 @@ +# Copyright 2022 Ooops404 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + "name": "Sales Coupon based on Sales Order values", + "version": "14.0.1.0.0", + "summary": "Allows to set a sales order related domain for coupon", + "author": "Ooops404, Cetmix, Odoo Community Association (OCA)", + "contributors": "Ooops404, Cetmix", + "license": "AGPL-3", + "category": "Sale", + "website": "https://github.com/OCA/sale-promotion", + "depends": ["sale_coupon"], + "external_dependencies": {}, + "data": ["views/coupon_program_view.xml"], +} diff --git a/sale_coupon_criteria_order_based/i18n/sale_coupon_criteria_order_based.pot b/sale_coupon_criteria_order_based/i18n/sale_coupon_criteria_order_based.pot new file mode 100644 index 000000000..35c0e0fbd --- /dev/null +++ b/sale_coupon_criteria_order_based/i18n/sale_coupon_criteria_order_based.pot @@ -0,0 +1,74 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_coupon_criteria_order_based +# +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_criteria_order_based +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_program__rule_order_domain +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_rule__rule_order_domain +msgid "Based on Order" +msgstr "" + +#. module: sale_coupon_criteria_order_based +#: model:ir.model,name:sale_coupon_criteria_order_based.model_coupon_coupon +msgid "Coupon" +msgstr "" + +#. module: sale_coupon_criteria_order_based +#: model:ir.model,name:sale_coupon_criteria_order_based.model_coupon_program +msgid "Coupon Program" +msgstr "" + +#. module: sale_coupon_criteria_order_based +#: model:ir.model,name:sale_coupon_criteria_order_based.model_coupon_rule +msgid "Coupon Rule" +msgstr "" + +#. module: sale_coupon_criteria_order_based +#: model:ir.model.fields,help:sale_coupon_criteria_order_based.field_coupon_program__rule_order_domain +#: model:ir.model.fields,help:sale_coupon_criteria_order_based.field_coupon_rule__rule_order_domain +msgid "Coupon program will work for the order with selected domain only" +msgstr "" + +#. module: sale_coupon_criteria_order_based +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_coupon__display_name +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_program__display_name +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_rule__display_name +msgid "Display Name" +msgstr "" + +#. module: sale_coupon_criteria_order_based +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_coupon__id +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_program__id +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_rule__id +msgid "ID" +msgstr "" + +#. module: sale_coupon_criteria_order_based +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_coupon____last_update +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_program____last_update +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_rule____last_update +msgid "Last Modified on" +msgstr "" + +#. module: sale_coupon_criteria_order_based +#: model_terms:ir.ui.view,arch_db:sale_coupon_criteria_order_based.coupon_program_view_promo_program_form +msgid "Select order" +msgstr "" + +#. module: sale_coupon_criteria_order_based +#: code:addons/sale_coupon_criteria_order_based/models/coupon_coupon.py:0 +#: code:addons/sale_coupon_criteria_order_based/models/coupon_program.py:0 +#, python-format +msgid "The order doesn't have access to this reward." +msgstr "" diff --git a/sale_coupon_criteria_order_based/models/__init__.py b/sale_coupon_criteria_order_based/models/__init__.py new file mode 100644 index 000000000..1f966a6a5 --- /dev/null +++ b/sale_coupon_criteria_order_based/models/__init__.py @@ -0,0 +1,3 @@ +from . import coupon_rule +from . import coupon_program +from . import coupon_coupon diff --git a/sale_coupon_criteria_order_based/models/coupon_coupon.py b/sale_coupon_criteria_order_based/models/coupon_coupon.py new file mode 100644 index 000000000..e62b408b0 --- /dev/null +++ b/sale_coupon_criteria_order_based/models/coupon_coupon.py @@ -0,0 +1,14 @@ +# Copyright 2022 Ooops404 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import _, models + + +class CouponCoupon(models.Model): + _inherit = "coupon.coupon" + + def _check_coupon_code(self, order): + message = super()._check_coupon_code(order) + if not self.program_id._is_valid_order(order): + message = {"error": _("The order doesn't have access to this reward.")} + return message diff --git a/sale_coupon_criteria_order_based/models/coupon_program.py b/sale_coupon_criteria_order_based/models/coupon_program.py new file mode 100644 index 000000000..961a95f46 --- /dev/null +++ b/sale_coupon_criteria_order_based/models/coupon_program.py @@ -0,0 +1,59 @@ +# Copyright 2022 Ooops404 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +import ast + +from odoo import _, api, fields, models + + +class CouponProgram(models.Model): + _inherit = "coupon.program" + + rule_order_domain = fields.Char( + string="Based on Order", + help="Coupon program will work for the order with selected domain only", + ) + + def _is_valid_order(self, order): + """ + Check that we can apply the coupon for current order + """ + if self.rule_order_domain and self.rule_order_domain != "[]": + domain = ast.literal_eval(self.rule_order_domain) + return bool(order.filtered_domain(domain)) + else: + return True + + def _check_promo_code(self, order, coupon_code): + message = super()._check_promo_code(order, coupon_code) + if not self._is_valid_order(order): + message = {"error": _("The order doesn't have access to this reward.")} + return message + + @api.model + def _filter_programs_from_common_rules(self, order, next_order=False): + programs = super()._filter_programs_from_common_rules( + order, next_order=next_order + ) + + # Order requirement should not be checked if the coupon got generated by + # a promotion program + # (the requirement should have only be checked to generate the coupon) + if not next_order and programs: + programs = programs._filter_programs_on_order(order) + + programs_curr_order = programs.filtered( + lambda p: p.promo_applicability == "on_current_order" + ) + programs = programs.filtered(lambda p: p.promo_applicability == "on_next_order") + if programs_curr_order: + # Checking if rewards are in the SO should not be performed for + # rewards on_next_order + programs += programs_curr_order._filter_not_ordered_reward_programs(order) + return programs + + def _filter_programs_on_order(self, order): + """ + Filter all programs by order based domain + """ + return self.filtered(lambda program: program._is_valid_order(order)) diff --git a/sale_coupon_criteria_order_based/models/coupon_rule.py b/sale_coupon_criteria_order_based/models/coupon_rule.py new file mode 100644 index 000000000..491bb82a0 --- /dev/null +++ b/sale_coupon_criteria_order_based/models/coupon_rule.py @@ -0,0 +1,13 @@ +# Copyright 2022 Ooops404 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class CouponRule(models.Model): + _inherit = "coupon.rule" + + rule_order_domain = fields.Char( + string="Based on Order", + help="Coupon program will work for the order with selected domain only", + ) diff --git a/sale_coupon_criteria_order_based/readme/CONTRIBUTORS.rst b/sale_coupon_criteria_order_based/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..a3385a623 --- /dev/null +++ b/sale_coupon_criteria_order_based/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* Ooops404 +* Cetmix diff --git a/sale_coupon_criteria_order_based/readme/DESCRIPTION.rst b/sale_coupon_criteria_order_based/readme/DESCRIPTION.rst new file mode 100644 index 000000000..0c8f8843d --- /dev/null +++ b/sale_coupon_criteria_order_based/readme/DESCRIPTION.rst @@ -0,0 +1,4 @@ +This module add and option to configure your coupon conditions based on +the Sales Order values. + +Example: "If Sales Team is 'Europe' apply the following discount' diff --git a/sale_coupon_criteria_order_based/readme/USAGE.rst b/sale_coupon_criteria_order_based/readme/USAGE.rst new file mode 100644 index 000000000..b519f4bcf --- /dev/null +++ b/sale_coupon_criteria_order_based/readme/USAGE.rst @@ -0,0 +1,5 @@ +Open or create a new Promotion Program in the **Sales/Products/Promotion Programs** menu. + +In *Conditions* section the following new option is available: + +* **Based on Order** configure an order-based domain to apply the promotion diff --git a/sale_coupon_criteria_order_based/static/description/icon.png b/sale_coupon_criteria_order_based/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/sale_coupon_criteria_order_based/static/description/index.html b/sale_coupon_criteria_order_based/static/description/index.html new file mode 100644 index 000000000..2053213c8 --- /dev/null +++ b/sale_coupon_criteria_order_based/static/description/index.html @@ -0,0 +1,432 @@ + + + + + + +Sales Coupon based on Sales Order values + + + +
+

Sales Coupon based on Sales Order values

+ + +

Beta License: AGPL-3 OCA/sale-promotion Translate me on Weblate Try me on Runbot

+

This module add and option to configure your coupon conditions based on +the Sales Order values.

+

Example: “If Sales Team is ‘Europe’ apply the following discount’

+

Table of contents

+ +
+

Usage

+

Open or create a new Promotion Program in the Sales/Products/Promotion Programs menu.

+

In Conditions section the following new option is available:

+
    +
  • Based on Order configure an order-based domain to apply the promotion
    • +
+
+
+

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 smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Ooops404
    • +
  • Cetmix
    • +
+
+ +
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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.

+

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_criteria_order_based/tests/__init__.py b/sale_coupon_criteria_order_based/tests/__init__.py new file mode 100644 index 000000000..1c5acf048 --- /dev/null +++ b/sale_coupon_criteria_order_based/tests/__init__.py @@ -0,0 +1 @@ +from . import test_sale_coupon_criteria_order_based diff --git a/sale_coupon_criteria_order_based/tests/test_sale_coupon_criteria_order_based.py b/sale_coupon_criteria_order_based/tests/test_sale_coupon_criteria_order_based.py new file mode 100644 index 000000000..367c4b783 --- /dev/null +++ b/sale_coupon_criteria_order_based/tests/test_sale_coupon_criteria_order_based.py @@ -0,0 +1,79 @@ +# Copyright 2022 Ooops404 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo.addons.sale_coupon.tests.common import TestSaleCouponCommon + + +class TestSaleCouponCriteriaOrderBased(TestSaleCouponCommon): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True)) + + def test_program_rules_order_based(self): + """ + Check program rules based on order domain + """ + partner_test = self.env["res.partner"].create( + { + "name": "Test", + "email": "test@example.com", + } + ) + user_test = ( + self.env["res.users"] + .with_context(no_reset_password=True) + .create( + { + "login": "test", + "password": "test", + "partner_id": partner_test.id, + "groups_id": [(6, 0, [self.env.ref("base.group_user").id])], + } + ) + ) + # Update program order domain. The program should be applied for order + # if Salesperson of the order is 'Test' user + self.immediate_promotion_program.write( + {"rule_order_domain": "[('user_id.id', '=', %s)]" % (user_test.id)} + ) + order = self.empty_order + order.write( + { + "order_line": [ + ( + 0, + False, + { + "product_id": self.product_A.id, + "name": "1 Product A", + "product_uom": self.uom_unit.id, + "product_uom_qty": 1.0, + }, + ), + ( + 0, + False, + { + "product_id": self.product_B.id, + "name": "2 Product B", + "product_uom": self.uom_unit.id, + "product_uom_qty": 1.0, + }, + ), + ] + } + ) + order.recompute_coupon_lines() + self.assertEqual( + len(order.order_line.ids), + 2, + "The promo offer shouldn't have been applied.", + ) + order.user_id = user_test.id + order.recompute_coupon_lines() + self.assertEqual( + len(order.order_line.ids), + 3, + "The promo offer should have been applied.", + ) diff --git a/sale_coupon_criteria_order_based/views/coupon_program_view.xml b/sale_coupon_criteria_order_based/views/coupon_program_view.xml new file mode 100644 index 000000000..f21fe4239 --- /dev/null +++ b/sale_coupon_criteria_order_based/views/coupon_program_view.xml @@ -0,0 +1,20 @@ + + + + + coupon.program.view.form + coupon.program + + + + + + + + + From fee4658a87e62d3ba3412a665c141ac21615cf72 Mon Sep 17 00:00:00 2001 From: Francesco Foresti Date: Tue, 31 May 2022 08:06:30 +0000 Subject: [PATCH 02/17] Added translation using Weblate (Italian) --- sale_coupon_criteria_order_based/i18n/it.po | 75 +++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 sale_coupon_criteria_order_based/i18n/it.po diff --git a/sale_coupon_criteria_order_based/i18n/it.po b/sale_coupon_criteria_order_based/i18n/it.po new file mode 100644 index 000000000..375657d08 --- /dev/null +++ b/sale_coupon_criteria_order_based/i18n/it.po @@ -0,0 +1,75 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_coupon_criteria_order_based +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. module: sale_coupon_criteria_order_based +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_program__rule_order_domain +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_rule__rule_order_domain +msgid "Based on Order" +msgstr "" + +#. module: sale_coupon_criteria_order_based +#: model:ir.model,name:sale_coupon_criteria_order_based.model_coupon_coupon +msgid "Coupon" +msgstr "" + +#. module: sale_coupon_criteria_order_based +#: model:ir.model,name:sale_coupon_criteria_order_based.model_coupon_program +msgid "Coupon Program" +msgstr "" + +#. module: sale_coupon_criteria_order_based +#: model:ir.model,name:sale_coupon_criteria_order_based.model_coupon_rule +msgid "Coupon Rule" +msgstr "" + +#. module: sale_coupon_criteria_order_based +#: model:ir.model.fields,help:sale_coupon_criteria_order_based.field_coupon_program__rule_order_domain +#: model:ir.model.fields,help:sale_coupon_criteria_order_based.field_coupon_rule__rule_order_domain +msgid "Coupon program will work for the order with selected domain only" +msgstr "" + +#. module: sale_coupon_criteria_order_based +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_coupon__display_name +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_program__display_name +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_rule__display_name +msgid "Display Name" +msgstr "" + +#. module: sale_coupon_criteria_order_based +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_coupon__id +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_program__id +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_rule__id +msgid "ID" +msgstr "" + +#. module: sale_coupon_criteria_order_based +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_coupon____last_update +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_program____last_update +#: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_rule____last_update +msgid "Last Modified on" +msgstr "" + +#. module: sale_coupon_criteria_order_based +#: model_terms:ir.ui.view,arch_db:sale_coupon_criteria_order_based.coupon_program_view_promo_program_form +msgid "Select order" +msgstr "" + +#. module: sale_coupon_criteria_order_based +#: code:addons/sale_coupon_criteria_order_based/models/coupon_coupon.py:0 +#: code:addons/sale_coupon_criteria_order_based/models/coupon_program.py:0 +#, python-format +msgid "The order doesn't have access to this reward." +msgstr "" From 6dac66958fc65ed0f038e0d524d796990aad46c8 Mon Sep 17 00:00:00 2001 From: Francesco Foresti Date: Tue, 31 May 2022 08:08:27 +0000 Subject: [PATCH 03/17] Translated using Weblate (Italian) Currently translated at 100.0% (10 of 10 strings) Translation: sale-promotion-14.0/sale-promotion-14.0-sale_coupon_criteria_order_based Translate-URL: https://translation.odoo-community.org/projects/sale-promotion-14-0/sale-promotion-14-0-sale_coupon_criteria_order_based/it/ --- sale_coupon_criteria_order_based/i18n/it.po | 23 ++++++++++++--------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/sale_coupon_criteria_order_based/i18n/it.po b/sale_coupon_criteria_order_based/i18n/it.po index 375657d08..c7e0e8f35 100644 --- a/sale_coupon_criteria_order_based/i18n/it.po +++ b/sale_coupon_criteria_order_based/i18n/it.po @@ -6,70 +6,73 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2022-05-31 11:05+0000\n" +"Last-Translator: Francesco Foresti \n" "Language-Team: none\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" #. module: sale_coupon_criteria_order_based #: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_program__rule_order_domain #: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_rule__rule_order_domain msgid "Based on Order" -msgstr "" +msgstr "Basato su Ordine" #. module: sale_coupon_criteria_order_based #: model:ir.model,name:sale_coupon_criteria_order_based.model_coupon_coupon msgid "Coupon" -msgstr "" +msgstr "Coupon" #. module: sale_coupon_criteria_order_based #: model:ir.model,name:sale_coupon_criteria_order_based.model_coupon_program msgid "Coupon Program" -msgstr "" +msgstr "Programma Coupon" #. module: sale_coupon_criteria_order_based #: model:ir.model,name:sale_coupon_criteria_order_based.model_coupon_rule msgid "Coupon Rule" -msgstr "" +msgstr "Regola Coupon" #. module: sale_coupon_criteria_order_based #: model:ir.model.fields,help:sale_coupon_criteria_order_based.field_coupon_program__rule_order_domain #: model:ir.model.fields,help:sale_coupon_criteria_order_based.field_coupon_rule__rule_order_domain msgid "Coupon program will work for the order with selected domain only" msgstr "" +"Questo coupon sarà applicabile solo per gli ordini con il dominio selezionato" #. module: sale_coupon_criteria_order_based #: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_coupon__display_name #: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_program__display_name #: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_rule__display_name msgid "Display Name" -msgstr "" +msgstr "Nome visualizzato" #. module: sale_coupon_criteria_order_based #: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_coupon__id #: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_program__id #: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_rule__id msgid "ID" -msgstr "" +msgstr "ID" #. module: sale_coupon_criteria_order_based #: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_coupon____last_update #: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_program____last_update #: model:ir.model.fields,field_description:sale_coupon_criteria_order_based.field_coupon_rule____last_update msgid "Last Modified on" -msgstr "" +msgstr "Ultima modifica il" #. module: sale_coupon_criteria_order_based #: model_terms:ir.ui.view,arch_db:sale_coupon_criteria_order_based.coupon_program_view_promo_program_form msgid "Select order" -msgstr "" +msgstr "Seleziona ordini" #. module: sale_coupon_criteria_order_based #: code:addons/sale_coupon_criteria_order_based/models/coupon_coupon.py:0 #: code:addons/sale_coupon_criteria_order_based/models/coupon_program.py:0 #, python-format msgid "The order doesn't have access to this reward." -msgstr "" +msgstr "L'ordine non ha accesso a questa ricompensa." From 9c94b9a9df23a5ba6af3560053e944b77d82f5c6 Mon Sep 17 00:00:00 2001 From: pilarvargas-tecnativa Date: Mon, 20 Feb 2023 12:15:55 +0100 Subject: [PATCH 04/17] [MIG] sale_coupon_criteria_order_based: Migration to version 15.0 TT38306 --- sale_coupon_criteria_order_based/README.rst | 17 ++++++++++------- .../__manifest__.py | 3 +-- .../models/coupon_coupon.py | 5 +++-- .../readme/CONTRIBUTORS.rst | 3 +++ .../readme/DESCRIPTION.rst | 2 +- .../static/description/index.html | 12 ++++++++---- 6 files changed, 26 insertions(+), 16 deletions(-) diff --git a/sale_coupon_criteria_order_based/README.rst b/sale_coupon_criteria_order_based/README.rst index cc7c3cefb..50f042b40 100644 --- a/sale_coupon_criteria_order_based/README.rst +++ b/sale_coupon_criteria_order_based/README.rst @@ -14,14 +14,14 @@ Sales Coupon based on Sales Order values :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_criteria_order_based + :target: https://github.com/OCA/sale-promotion/tree/15.0/sale_coupon_criteria_order_based :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_criteria_order_based + :target: https://translation.odoo-community.org/projects/sale-promotion-15-0/sale-promotion-15-0-sale_coupon_criteria_order_based :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/296/14.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/sale-promotion&target_branch=15.0 + :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -50,7 +50,7 @@ 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 smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -68,6 +68,9 @@ Contributors * Ooops404 * Cetmix +* `Tecnativa `_ + + * Pilar Vargas Maintainers ~~~~~~~~~~~ @@ -82,6 +85,6 @@ 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. -This module is part of the `OCA/sale-promotion `_ project on GitHub. +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_criteria_order_based/__manifest__.py b/sale_coupon_criteria_order_based/__manifest__.py index cee062078..9ccb5949d 100644 --- a/sale_coupon_criteria_order_based/__manifest__.py +++ b/sale_coupon_criteria_order_based/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Sales Coupon based on Sales Order values", - "version": "14.0.1.0.0", + "version": "15.0.1.0.0", "summary": "Allows to set a sales order related domain for coupon", "author": "Ooops404, Cetmix, Odoo Community Association (OCA)", "contributors": "Ooops404, Cetmix", @@ -11,6 +11,5 @@ "category": "Sale", "website": "https://github.com/OCA/sale-promotion", "depends": ["sale_coupon"], - "external_dependencies": {}, "data": ["views/coupon_program_view.xml"], } diff --git a/sale_coupon_criteria_order_based/models/coupon_coupon.py b/sale_coupon_criteria_order_based/models/coupon_coupon.py index e62b408b0..a956fa4a3 100644 --- a/sale_coupon_criteria_order_based/models/coupon_coupon.py +++ b/sale_coupon_criteria_order_based/models/coupon_coupon.py @@ -7,8 +7,9 @@ class CouponCoupon(models.Model): _inherit = "coupon.coupon" - def _check_coupon_code(self, order): - message = super()._check_coupon_code(order) + def _check_coupon_code(self, order_date, partner_id, **kwargs): + message = super()._check_coupon_code(order_date, partner_id, **kwargs) + order = kwargs.get("order") if not self.program_id._is_valid_order(order): message = {"error": _("The order doesn't have access to this reward.")} return message diff --git a/sale_coupon_criteria_order_based/readme/CONTRIBUTORS.rst b/sale_coupon_criteria_order_based/readme/CONTRIBUTORS.rst index a3385a623..2397ba569 100644 --- a/sale_coupon_criteria_order_based/readme/CONTRIBUTORS.rst +++ b/sale_coupon_criteria_order_based/readme/CONTRIBUTORS.rst @@ -1,2 +1,5 @@ * Ooops404 * Cetmix +* `Tecnativa `_ + + * Pilar Vargas diff --git a/sale_coupon_criteria_order_based/readme/DESCRIPTION.rst b/sale_coupon_criteria_order_based/readme/DESCRIPTION.rst index 0c8f8843d..458019a5f 100644 --- a/sale_coupon_criteria_order_based/readme/DESCRIPTION.rst +++ b/sale_coupon_criteria_order_based/readme/DESCRIPTION.rst @@ -1,4 +1,4 @@ -This module add and option to configure your coupon conditions based on +This module adds an option to configure your coupon conditions based on the Sales Order values. Example: "If Sales Team is 'Europe' apply the following discount' diff --git a/sale_coupon_criteria_order_based/static/description/index.html b/sale_coupon_criteria_order_based/static/description/index.html index 2053213c8..5a0e81b19 100644 --- a/sale_coupon_criteria_order_based/static/description/index.html +++ b/sale_coupon_criteria_order_based/static/description/index.html @@ -3,7 +3,7 @@ - + Sales Coupon based on Sales Order values