From a136ac38ddeea3272a7c04fc409ca803cf0bc831 Mon Sep 17 00:00:00 2001 From: Ashish Hirpara Date: Thu, 16 Jun 2022 16:04:27 +0530 Subject: [PATCH 01/28] [14.0][ADD] sale_order_general_discount_triple: initial commit --- sale_order_general_discount_triple/README.rst | 0 .../__init__.py | 1 + .../__manifest__.py | 17 ++++++ .../models/__init__.py | 3 + .../models/res_config_settings.py | 17 ++++++ .../models/sale_order.py | 18 ++++++ .../models/sale_order_line.py | 54 ++++++++++++++++++ .../readme/CONTRIBUTORS.rst | 3 + .../readme/DESCRIPTION.rst | 1 + .../readme/HISTORY.rst | 4 ++ .../readme/USAGE.rst | 5 ++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../tests/__init__.py | 1 + .../tests/test_module.py | 27 +++++++++ .../views/res_config_settings.xml | 26 +++++++++ 15 files changed, 177 insertions(+) create mode 100644 sale_order_general_discount_triple/README.rst create mode 100644 sale_order_general_discount_triple/__init__.py create mode 100644 sale_order_general_discount_triple/__manifest__.py create mode 100644 sale_order_general_discount_triple/models/__init__.py create mode 100644 sale_order_general_discount_triple/models/res_config_settings.py create mode 100644 sale_order_general_discount_triple/models/sale_order.py create mode 100644 sale_order_general_discount_triple/models/sale_order_line.py create mode 100644 sale_order_general_discount_triple/readme/CONTRIBUTORS.rst create mode 100644 sale_order_general_discount_triple/readme/DESCRIPTION.rst create mode 100644 sale_order_general_discount_triple/readme/HISTORY.rst create mode 100644 sale_order_general_discount_triple/readme/USAGE.rst create mode 100644 sale_order_general_discount_triple/static/description/icon.png create mode 100644 sale_order_general_discount_triple/tests/__init__.py create mode 100644 sale_order_general_discount_triple/tests/test_module.py create mode 100644 sale_order_general_discount_triple/views/res_config_settings.xml diff --git a/sale_order_general_discount_triple/README.rst b/sale_order_general_discount_triple/README.rst new file mode 100644 index 00000000000..e69de29bb2d diff --git a/sale_order_general_discount_triple/__init__.py b/sale_order_general_discount_triple/__init__.py new file mode 100644 index 00000000000..0650744f6bc --- /dev/null +++ b/sale_order_general_discount_triple/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/sale_order_general_discount_triple/__manifest__.py b/sale_order_general_discount_triple/__manifest__.py new file mode 100644 index 00000000000..34b5fb20636 --- /dev/null +++ b/sale_order_general_discount_triple/__manifest__.py @@ -0,0 +1,17 @@ +# Copyright 2022 Ooops - Ashish Hirpara +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +{ + "name": "Sale Order General Discount Triple", + "summary": "General discount per sale order with triple", + "version": "14.0.1.0.0", + "category": "Sales", + "website": "https://github.com/OCA/sale-workflow", + "author": "Ashish Hirpara, Ooops, Odoo Community Association (OCA)", + "license": "AGPL-3", + "maintainers": ["ashishhirapara"], + "installable": True, + "depends": ["sale", "sale_order_general_discount", "sale_triple_discount"], + "data": [ + "views/res_config_settings.xml", + ], +} diff --git a/sale_order_general_discount_triple/models/__init__.py b/sale_order_general_discount_triple/models/__init__.py new file mode 100644 index 00000000000..fbc5ca3c89b --- /dev/null +++ b/sale_order_general_discount_triple/models/__init__.py @@ -0,0 +1,3 @@ +from . import res_config_settings +from . import sale_order_line +from . import sale_order diff --git a/sale_order_general_discount_triple/models/res_config_settings.py b/sale_order_general_discount_triple/models/res_config_settings.py new file mode 100644 index 00000000000..b0c2db3a13f --- /dev/null +++ b/sale_order_general_discount_triple/models/res_config_settings.py @@ -0,0 +1,17 @@ +from odoo import fields, models + + +class ResConfigSettings(models.TransientModel): + _inherit = "res.config.settings" + + general_discount = fields.Selection( + [ + ("discount", "Discount"), + ("discount2", "Discount 2"), + ("discount3", "Discount 3"), + ], + "General Discount", + required=True, + default="discount", + config_parameter="sale_order_general_discount_triple.general_discount", + ) diff --git a/sale_order_general_discount_triple/models/sale_order.py b/sale_order_general_discount_triple/models/sale_order.py new file mode 100644 index 00000000000..cc28eecbd7b --- /dev/null +++ b/sale_order_general_discount_triple/models/sale_order.py @@ -0,0 +1,18 @@ +from odoo import api, models + + +class SaleOrder(models.Model): + _inherit = "sale.order" + + @api.onchange("general_discount") + def onchange_general_discount(self): + general_discount = ( + self.env["ir.config_parameter"] + .sudo() + .get_param( + "sale_order_general_discount_triple.general_discount", "discount" + ) + ) + if general_discount: + for record in self: + record.order_line.write({general_discount: record.general_discount}) diff --git a/sale_order_general_discount_triple/models/sale_order_line.py b/sale_order_general_discount_triple/models/sale_order_line.py new file mode 100644 index 00000000000..8310e304049 --- /dev/null +++ b/sale_order_general_discount_triple/models/sale_order_line.py @@ -0,0 +1,54 @@ +from odoo import api, fields, models + + +class SaleOrderLine(models.Model): + _inherit = "sale.order.line" + + discount = fields.Float( + string="Discount (%)", + digits="Discount", + compute=False, + store=True, + readonly=False, + default=0.0, + ) + + @api.model + def default_get(self, fields): + vals = super(SaleOrderLine, self).default_get(fields) + general_discount = ( + self.env["ir.config_parameter"] + .sudo() + .get_param( + "sale_order_general_discount_triple.general_discount", "discount" + ) + ) + value = vals.get("discount") or 0.0 + vals.update( + { + "discount": 0.0, + "discount2": 0.0, + "discount3": 0.0, + } + ) + + vals.update( + { + general_discount: value, + } + ) + return vals + + @api.model + def create(self, vals): + sale_order = self.env["sale.order"].browse(vals["order_id"]) + general_discount = ( + self.env["ir.config_parameter"] + .sudo() + .get_param( + "sale_order_general_discount_triple.general_discount", "discount" + ) + ) + if general_discount: + vals[general_discount] = sale_order.general_discount + return super().create(vals) diff --git a/sale_order_general_discount_triple/readme/CONTRIBUTORS.rst b/sale_order_general_discount_triple/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000000..38c73cf0c0c --- /dev/null +++ b/sale_order_general_discount_triple/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Ooops `_: + + * Ashish Hirpara diff --git a/sale_order_general_discount_triple/readme/DESCRIPTION.rst b/sale_order_general_discount_triple/readme/DESCRIPTION.rst new file mode 100644 index 00000000000..86476a58891 --- /dev/null +++ b/sale_order_general_discount_triple/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +A bridge between Sale Order General Discount(https://github.com/OCA/sale-workflow/tree/14.0/sale_order_general_discoun) and Sale Triple Discount(https://github.com/OCA/sale-workflow/tree/14.0/sale_triple_discount) module to set the general discount on any of the 3 discount field on sale order lines. diff --git a/sale_order_general_discount_triple/readme/HISTORY.rst b/sale_order_general_discount_triple/readme/HISTORY.rst new file mode 100644 index 00000000000..f838e0c680d --- /dev/null +++ b/sale_order_general_discount_triple/readme/HISTORY.rst @@ -0,0 +1,4 @@ +14.0.1.0.0 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +* Initial release diff --git a/sale_order_general_discount_triple/readme/USAGE.rst b/sale_order_general_discount_triple/readme/USAGE.rst new file mode 100644 index 00000000000..1ed19107019 --- /dev/null +++ b/sale_order_general_discount_triple/readme/USAGE.rst @@ -0,0 +1,5 @@ +To use features of this module, you need to: + +#. Go to Settings > General Settings > Pricing +#. Under pricing section, select your prefered Discount type from 'General Discount' field. +#. The selected discount type among the 3 discounts will be automatically parsed on sale order line while using 'Discount %' text field. diff --git a/sale_order_general_discount_triple/static/description/icon.png b/sale_order_general_discount_triple/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_order_general_discount_triple/tests/__init__.py b/sale_order_general_discount_triple/tests/__init__.py new file mode 100644 index 00000000000..d9b96c4fa5a --- /dev/null +++ b/sale_order_general_discount_triple/tests/__init__.py @@ -0,0 +1 @@ +from . import test_module diff --git a/sale_order_general_discount_triple/tests/test_module.py b/sale_order_general_discount_triple/tests/test_module.py new file mode 100644 index 00000000000..6db9dd53f73 --- /dev/null +++ b/sale_order_general_discount_triple/tests/test_module.py @@ -0,0 +1,27 @@ +from odoo.tests.common import Form, TransactionCase + + +class TestModule(TransactionCase): + def test_action_result(self): + setting_obj = self.env["res.config.settings"] + sale_order_obj = self.env["sale.order"] + partner_obj = self.env["res.partner"] + product_obj = self.env["product.product"] + + product_form = Form(product_obj) + product_form.name = "Test Product" + product = product_form.save() + + partner_form = Form(partner_obj) + partner_form.name = "Test Partner" + partner = partner_form.save() + setting_form = Form(setting_obj) + setting_form.general_discount = "discount2" + setting_form.save().set_values() + + with Form(sale_order_obj) as sale_order: + sale_order.partner_id = partner + sale_order.general_discount = 5 + with sale_order.order_line.new() as line: + line.product_id = product + self.assertEqual(sale_order.general_discount, 5) diff --git a/sale_order_general_discount_triple/views/res_config_settings.xml b/sale_order_general_discount_triple/views/res_config_settings.xml new file mode 100644 index 00000000000..aa0233aca65 --- /dev/null +++ b/sale_order_general_discount_triple/views/res_config_settings.xml @@ -0,0 +1,26 @@ + + + + + res.config.settings.form.view + res.config.settings + + + +
+
+
+
+
+
+ + + + + From c21108df3c01e80e714ad7c0c038207ec0446a86 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Thu, 23 Jun 2022 17:14:02 +0000 Subject: [PATCH 02/28] [UPD] Update sale_order_general_discount_triple.pot --- .../sale_order_general_discount_triple.pot | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 sale_order_general_discount_triple/i18n/sale_order_general_discount_triple.pot diff --git a/sale_order_general_discount_triple/i18n/sale_order_general_discount_triple.pot b/sale_order_general_discount_triple/i18n/sale_order_general_discount_triple.pot new file mode 100644 index 00000000000..051b3a54ba4 --- /dev/null +++ b/sale_order_general_discount_triple/i18n/sale_order_general_discount_triple.pot @@ -0,0 +1,76 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_order_general_discount_triple +# +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_order_general_discount_triple +#: model:ir.model,name:sale_order_general_discount_triple.model_res_config_settings +msgid "Config Settings" +msgstr "" + +#. module: sale_order_general_discount_triple +#: model:ir.model.fields.selection,name:sale_order_general_discount_triple.selection__res_config_settings__general_discount__discount +msgid "Discount" +msgstr "" + +#. module: sale_order_general_discount_triple +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order_line__discount +msgid "Discount (%)" +msgstr "" + +#. module: sale_order_general_discount_triple +#: model:ir.model.fields.selection,name:sale_order_general_discount_triple.selection__res_config_settings__general_discount__discount2 +msgid "Discount 2" +msgstr "" + +#. module: sale_order_general_discount_triple +#: model:ir.model.fields.selection,name:sale_order_general_discount_triple.selection__res_config_settings__general_discount__discount3 +msgid "Discount 3" +msgstr "" + +#. module: sale_order_general_discount_triple +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_res_config_settings__display_name +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order__display_name +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order_line__display_name +msgid "Display Name" +msgstr "" + +#. module: sale_order_general_discount_triple +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_res_config_settings__general_discount +#: model_terms:ir.ui.view,arch_db:sale_order_general_discount_triple.res_config_settings_form_view +msgid "General Discount" +msgstr "" + +#. module: sale_order_general_discount_triple +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_res_config_settings__id +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order__id +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order_line__id +msgid "ID" +msgstr "" + +#. module: sale_order_general_discount_triple +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_res_config_settings____last_update +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order____last_update +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order_line____last_update +msgid "Last Modified on" +msgstr "" + +#. module: sale_order_general_discount_triple +#: model:ir.model,name:sale_order_general_discount_triple.model_sale_order +msgid "Sales Order" +msgstr "" + +#. module: sale_order_general_discount_triple +#: model:ir.model,name:sale_order_general_discount_triple.model_sale_order_line +msgid "Sales Order Line" +msgstr "" From 7eb5cbbe6a2d9ad1f7637ee9cac24f39058efbd1 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 23 Jun 2022 17:25:59 +0000 Subject: [PATCH 03/28] [UPD] README.rst --- sale_order_general_discount_triple/README.rst | 101 ++++ .../static/description/index.html | 448 ++++++++++++++++++ 2 files changed, 549 insertions(+) create mode 100644 sale_order_general_discount_triple/static/description/index.html diff --git a/sale_order_general_discount_triple/README.rst b/sale_order_general_discount_triple/README.rst index e69de29bb2d..8fd7a866913 100644 --- a/sale_order_general_discount_triple/README.rst +++ b/sale_order_general_discount_triple/README.rst @@ -0,0 +1,101 @@ +================================== +Sale Order General Discount Triple +================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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--workflow-lightgray.png?logo=github + :target: https://github.com/OCA/sale-workflow/tree/14.0/sale_order_general_discount_triple + :alt: OCA/sale-workflow +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/sale-workflow-14-0/sale-workflow-14-0-sale_order_general_discount_triple + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/167/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +A bridge between Sale Order General Discount(https://github.com/OCA/sale-workflow/tree/14.0/sale_order_general_discoun) and Sale Triple Discount(https://github.com/OCA/sale-workflow/tree/14.0/sale_triple_discount) module to set the general discount on any of the 3 discount field on sale order lines. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +To use features of this module, you need to: + +#. Go to Settings > General Settings > Pricing +#. Under pricing section, select your prefered Discount type from 'General Discount' field. +#. The selected discount type among the 3 discounts will be automatically parsed on sale order line while using 'Discount %' text field. + +Changelog +========= + +14.0.1.0.0 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +* Initial release + +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 +~~~~~~~ + +* Ashish Hirpara +* Ooops + +Contributors +~~~~~~~~~~~~ + +* `Ooops `_: + + * Ashish Hirpara + +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-ashishhirapara| image:: https://github.com/ashishhirapara.png?size=40px + :target: https://github.com/ashishhirapara + :alt: ashishhirapara + +Current `maintainer `__: + +|maintainer-ashishhirapara| + +This module is part of the `OCA/sale-workflow `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sale_order_general_discount_triple/static/description/index.html b/sale_order_general_discount_triple/static/description/index.html new file mode 100644 index 00000000000..636de83afc1 --- /dev/null +++ b/sale_order_general_discount_triple/static/description/index.html @@ -0,0 +1,448 @@ + + + + + + +Sale Order General Discount Triple + + + +
+

Sale Order General Discount Triple

+ + +

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

+

A bridge between Sale Order General Discount(https://github.com/OCA/sale-workflow/tree/14.0/sale_order_general_discoun) and Sale Triple Discount(https://github.com/OCA/sale-workflow/tree/14.0/sale_triple_discount) module to set the general discount on any of the 3 discount field on sale order lines.

+

Table of contents

+ +
+

Usage

+

To use features of this module, you need to:

+
    +
  1. Go to Settings > General Settings > Pricing
    2. +
  2. Under pricing section, select your prefered Discount type from ‘General Discount’ field.
    3. +
  3. The selected discount type among the 3 discounts will be automatically parsed on sale order line while using ‘Discount %’ text field.
    4. +
+
+
+

Changelog

+
+

14.0.1.0.0

+
    +
  • Initial release
    • +
+
+
+
+

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

+
    +
  • Ashish Hirpara
    • +
  • Ooops
    • +
+
+
+

Contributors

+
    +
  • Ooops:
      +
    • Ashish Hirpara
      • +
    +
    • +
+
+
+

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.

+

Current maintainer:

+

ashishhirapara

+

This module is part of the OCA/sale-workflow project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + From f593af563786ee127474765e426b350626920ea3 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 23 Jun 2022 17:25:59 +0000 Subject: [PATCH 04/28] sale_order_general_discount_triple 14.0.1.0.1 --- sale_order_general_discount_triple/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sale_order_general_discount_triple/__manifest__.py b/sale_order_general_discount_triple/__manifest__.py index 34b5fb20636..12ba05ecbd9 100644 --- a/sale_order_general_discount_triple/__manifest__.py +++ b/sale_order_general_discount_triple/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Sale Order General Discount Triple", "summary": "General discount per sale order with triple", - "version": "14.0.1.0.0", + "version": "14.0.1.0.1", "category": "Sales", "website": "https://github.com/OCA/sale-workflow", "author": "Ashish Hirpara, Ooops, Odoo Community Association (OCA)", From 3a73126314410c09521d964d5fb1ce9cc7e141e1 Mon Sep 17 00:00:00 2001 From: Francesco Foresti Date: Fri, 24 Jun 2022 07:54:04 +0000 Subject: [PATCH 05/28] Added translation using Weblate (Italian) --- sale_order_general_discount_triple/i18n/it.po | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 sale_order_general_discount_triple/i18n/it.po diff --git a/sale_order_general_discount_triple/i18n/it.po b/sale_order_general_discount_triple/i18n/it.po new file mode 100644 index 00000000000..7380f041b29 --- /dev/null +++ b/sale_order_general_discount_triple/i18n/it.po @@ -0,0 +1,77 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_order_general_discount_triple +# +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_order_general_discount_triple +#: model:ir.model,name:sale_order_general_discount_triple.model_res_config_settings +msgid "Config Settings" +msgstr "" + +#. module: sale_order_general_discount_triple +#: model:ir.model.fields.selection,name:sale_order_general_discount_triple.selection__res_config_settings__general_discount__discount +msgid "Discount" +msgstr "" + +#. module: sale_order_general_discount_triple +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order_line__discount +msgid "Discount (%)" +msgstr "" + +#. module: sale_order_general_discount_triple +#: model:ir.model.fields.selection,name:sale_order_general_discount_triple.selection__res_config_settings__general_discount__discount2 +msgid "Discount 2" +msgstr "" + +#. module: sale_order_general_discount_triple +#: model:ir.model.fields.selection,name:sale_order_general_discount_triple.selection__res_config_settings__general_discount__discount3 +msgid "Discount 3" +msgstr "" + +#. module: sale_order_general_discount_triple +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_res_config_settings__display_name +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order__display_name +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order_line__display_name +msgid "Display Name" +msgstr "" + +#. module: sale_order_general_discount_triple +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_res_config_settings__general_discount +#: model_terms:ir.ui.view,arch_db:sale_order_general_discount_triple.res_config_settings_form_view +msgid "General Discount" +msgstr "" + +#. module: sale_order_general_discount_triple +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_res_config_settings__id +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order__id +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order_line__id +msgid "ID" +msgstr "" + +#. module: sale_order_general_discount_triple +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_res_config_settings____last_update +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order____last_update +#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order_line____last_update +msgid "Last Modified on" +msgstr "" + +#. module: sale_order_general_discount_triple +#: model:ir.model,name:sale_order_general_discount_triple.model_sale_order +msgid "Sales Order" +msgstr "" + +#. module: sale_order_general_discount_triple +#: model:ir.model,name:sale_order_general_discount_triple.model_sale_order_line +msgid "Sales Order Line" +msgstr "" From 00687ba8017c87901aece5f253819b4806472244 Mon Sep 17 00:00:00 2001 From: Francesco Foresti Date: Fri, 24 Jun 2022 07:57:24 +0000 Subject: [PATCH 06/28] Translated using Weblate (Italian) Currently translated at 100.0% (11 of 11 strings) Translation: sale-workflow-14.0/sale-workflow-14.0-sale_order_general_discount_triple Translate-URL: https://translation.odoo-community.org/projects/sale-workflow-14-0/sale-workflow-14-0-sale_order_general_discount_triple/it/ --- sale_order_general_discount_triple/i18n/it.po | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/sale_order_general_discount_triple/i18n/it.po b/sale_order_general_discount_triple/i18n/it.po index 7380f041b29..b81ba623074 100644 --- a/sale_order_general_discount_triple/i18n/it.po +++ b/sale_order_general_discount_triple/i18n/it.po @@ -6,72 +6,74 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2022-06-24 10: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_order_general_discount_triple #: model:ir.model,name:sale_order_general_discount_triple.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Impostazioni configurazione" #. module: sale_order_general_discount_triple #: model:ir.model.fields.selection,name:sale_order_general_discount_triple.selection__res_config_settings__general_discount__discount msgid "Discount" -msgstr "" +msgstr "Sconto" #. module: sale_order_general_discount_triple #: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order_line__discount msgid "Discount (%)" -msgstr "" +msgstr "Sconto (%)" #. module: sale_order_general_discount_triple #: model:ir.model.fields.selection,name:sale_order_general_discount_triple.selection__res_config_settings__general_discount__discount2 msgid "Discount 2" -msgstr "" +msgstr "Sconto 2" #. module: sale_order_general_discount_triple #: model:ir.model.fields.selection,name:sale_order_general_discount_triple.selection__res_config_settings__general_discount__discount3 msgid "Discount 3" -msgstr "" +msgstr "Sconto 3" #. module: sale_order_general_discount_triple #: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_res_config_settings__display_name #: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order__display_name #: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order_line__display_name msgid "Display Name" -msgstr "" +msgstr "Nome visualizzato" #. module: sale_order_general_discount_triple #: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_res_config_settings__general_discount #: model_terms:ir.ui.view,arch_db:sale_order_general_discount_triple.res_config_settings_form_view msgid "General Discount" -msgstr "" +msgstr "Sconto Generale" #. module: sale_order_general_discount_triple #: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_res_config_settings__id #: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order__id #: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order_line__id msgid "ID" -msgstr "" +msgstr "ID" #. module: sale_order_general_discount_triple #: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_res_config_settings____last_update #: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order____last_update #: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order_line____last_update msgid "Last Modified on" -msgstr "" +msgstr "Ultima modifica il" #. module: sale_order_general_discount_triple #: model:ir.model,name:sale_order_general_discount_triple.model_sale_order msgid "Sales Order" -msgstr "" +msgstr "Ordine di vendita" #. module: sale_order_general_discount_triple #: model:ir.model,name:sale_order_general_discount_triple.model_sale_order_line msgid "Sales Order Line" -msgstr "" +msgstr "Riga ordine di vendita" From a671405b606dac3ff0eb592a213581536b6d2ff9 Mon Sep 17 00:00:00 2001 From: Ashish Hirpara Date: Fri, 15 Jul 2022 16:02:33 +0530 Subject: [PATCH 07/28] sale_order_general_discount_triple: fix onchange Use `update` instead of `write` to avoid caching issue --- sale_order_general_discount_triple/models/sale_order.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sale_order_general_discount_triple/models/sale_order.py b/sale_order_general_discount_triple/models/sale_order.py index cc28eecbd7b..da3397be6cd 100644 --- a/sale_order_general_discount_triple/models/sale_order.py +++ b/sale_order_general_discount_triple/models/sale_order.py @@ -15,4 +15,4 @@ def onchange_general_discount(self): ) if general_discount: for record in self: - record.order_line.write({general_discount: record.general_discount}) + record.order_line.update({general_discount: record.general_discount}) From d163639f7764f14e2599405e2657c36354dd2a69 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 11 Aug 2022 16:37:21 +0000 Subject: [PATCH 08/28] sale_order_general_discount_triple 14.0.1.0.2 --- sale_order_general_discount_triple/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sale_order_general_discount_triple/__manifest__.py b/sale_order_general_discount_triple/__manifest__.py index 12ba05ecbd9..9343ca9fb75 100644 --- a/sale_order_general_discount_triple/__manifest__.py +++ b/sale_order_general_discount_triple/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Sale Order General Discount Triple", "summary": "General discount per sale order with triple", - "version": "14.0.1.0.1", + "version": "14.0.1.0.2", "category": "Sales", "website": "https://github.com/OCA/sale-workflow", "author": "Ashish Hirpara, Ooops, Odoo Community Association (OCA)", From d933eb1468cf769f2f20db6e4abda54d83019524 Mon Sep 17 00:00:00 2001 From: RabbitJon-S73 Date: Thu, 2 Feb 2023 16:51:37 +0100 Subject: [PATCH 09/28] [MIG] sale_order_general_discount_triple: Migration to 16.0 --- .../__manifest__.py | 2 +- .../models/res_config_settings.py | 1 - .../models/sale_order_line.py | 2 +- .../views/res_config_settings.xml | 39 +++++++++---------- 4 files changed, 20 insertions(+), 24 deletions(-) diff --git a/sale_order_general_discount_triple/__manifest__.py b/sale_order_general_discount_triple/__manifest__.py index 9343ca9fb75..490dc6bbbac 100644 --- a/sale_order_general_discount_triple/__manifest__.py +++ b/sale_order_general_discount_triple/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Sale Order General Discount Triple", "summary": "General discount per sale order with triple", - "version": "14.0.1.0.2", + "version": "16.0.1.0.0", "category": "Sales", "website": "https://github.com/OCA/sale-workflow", "author": "Ashish Hirpara, Ooops, Odoo Community Association (OCA)", diff --git a/sale_order_general_discount_triple/models/res_config_settings.py b/sale_order_general_discount_triple/models/res_config_settings.py index b0c2db3a13f..39afa20007f 100644 --- a/sale_order_general_discount_triple/models/res_config_settings.py +++ b/sale_order_general_discount_triple/models/res_config_settings.py @@ -10,7 +10,6 @@ class ResConfigSettings(models.TransientModel): ("discount2", "Discount 2"), ("discount3", "Discount 3"), ], - "General Discount", required=True, default="discount", config_parameter="sale_order_general_discount_triple.general_discount", diff --git a/sale_order_general_discount_triple/models/sale_order_line.py b/sale_order_general_discount_triple/models/sale_order_line.py index 8310e304049..f3d31d6c605 100644 --- a/sale_order_general_discount_triple/models/sale_order_line.py +++ b/sale_order_general_discount_triple/models/sale_order_line.py @@ -15,7 +15,7 @@ class SaleOrderLine(models.Model): @api.model def default_get(self, fields): - vals = super(SaleOrderLine, self).default_get(fields) + vals = super().default_get(fields) general_discount = ( self.env["ir.config_parameter"] .sudo() diff --git a/sale_order_general_discount_triple/views/res_config_settings.xml b/sale_order_general_discount_triple/views/res_config_settings.xml index aa0233aca65..10ef1a11791 100644 --- a/sale_order_general_discount_triple/views/res_config_settings.xml +++ b/sale_order_general_discount_triple/views/res_config_settings.xml @@ -1,26 +1,23 @@ - - - res.config.settings.form.view - res.config.settings - - - -
-
-
-
+ + res.config.settings.form.view + res.config.settings + + + +
+
+
+
- - - - +
+ + + From 3429bfb75ca8c0f2db9c1339d401bad4872935fb Mon Sep 17 00:00:00 2001 From: oca-ci Date: Mon, 26 Jun 2023 11:17:59 +0000 Subject: [PATCH 10/28] [UPD] Update sale_order_general_discount_triple.pot --- .../sale_order_general_discount_triple.pot | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/sale_order_general_discount_triple/i18n/sale_order_general_discount_triple.pot b/sale_order_general_discount_triple/i18n/sale_order_general_discount_triple.pot index 051b3a54ba4..6f4e5c17245 100644 --- a/sale_order_general_discount_triple/i18n/sale_order_general_discount_triple.pot +++ b/sale_order_general_discount_triple/i18n/sale_order_general_discount_triple.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -38,33 +38,11 @@ msgstr "" msgid "Discount 3" msgstr "" -#. module: sale_order_general_discount_triple -#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_res_config_settings__display_name -#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order__display_name -#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order_line__display_name -msgid "Display Name" -msgstr "" - #. module: sale_order_general_discount_triple #: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_res_config_settings__general_discount -#: model_terms:ir.ui.view,arch_db:sale_order_general_discount_triple.res_config_settings_form_view msgid "General Discount" msgstr "" -#. module: sale_order_general_discount_triple -#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_res_config_settings__id -#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order__id -#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order_line__id -msgid "ID" -msgstr "" - -#. module: sale_order_general_discount_triple -#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_res_config_settings____last_update -#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order____last_update -#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order_line____last_update -msgid "Last Modified on" -msgstr "" - #. module: sale_order_general_discount_triple #: model:ir.model,name:sale_order_general_discount_triple.model_sale_order msgid "Sales Order" From 0d64667efca5e769da83ab6e08169efa8649ca85 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 26 Jun 2023 11:24:51 +0000 Subject: [PATCH 11/28] [UPD] README.rst --- sale_order_general_discount_triple/README.rst | 10 +++++----- .../static/description/index.html | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sale_order_general_discount_triple/README.rst b/sale_order_general_discount_triple/README.rst index 8fd7a866913..56240f30a45 100644 --- a/sale_order_general_discount_triple/README.rst +++ b/sale_order_general_discount_triple/README.rst @@ -14,13 +14,13 @@ Sale Order General Discount Triple :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--workflow-lightgray.png?logo=github - :target: https://github.com/OCA/sale-workflow/tree/14.0/sale_order_general_discount_triple + :target: https://github.com/OCA/sale-workflow/tree/16.0/sale_order_general_discount_triple :alt: OCA/sale-workflow .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/sale-workflow-14-0/sale-workflow-14-0-sale_order_general_discount_triple + :target: https://translation.odoo-community.org/projects/sale-workflow-16-0/sale-workflow-16-0-sale_order_general_discount_triple :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/167/14.0 + :target: https://runbot.odoo-community.org/runbot/167/16.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -55,7 +55,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. @@ -96,6 +96,6 @@ Current `maintainer `__: |maintainer-ashishhirapara| -This module is part of the `OCA/sale-workflow `_ project on GitHub. +This module is part of the `OCA/sale-workflow `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sale_order_general_discount_triple/static/description/index.html b/sale_order_general_discount_triple/static/description/index.html index 636de83afc1..f739733aed5 100644 --- a/sale_order_general_discount_triple/static/description/index.html +++ b/sale_order_general_discount_triple/static/description/index.html @@ -367,7 +367,7 @@

Sale Order General Discount Triple

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

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

+

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

A bridge between Sale Order General Discount(https://github.com/OCA/sale-workflow/tree/14.0/sale_order_general_discoun) and Sale Triple Discount(https://github.com/OCA/sale-workflow/tree/14.0/sale_triple_discount) module to set the general discount on any of the 3 discount field on sale order lines.

Table of contents

@@ -409,7 +409,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.

@@ -439,7 +439,7 @@

Maintainers

promote its widespread use.

Current maintainer:

ashishhirapara

-

This module is part of the OCA/sale-workflow project on GitHub.

+

This module is part of the OCA/sale-workflow project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

From c102b5c6ed3fd0301ad082ecd9a60ddeb5c3aeba Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 26 Jun 2023 15:11:20 +0000 Subject: [PATCH 12/28] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: sale-workflow-16.0/sale-workflow-16.0-sale_order_general_discount_triple Translate-URL: https://translation.odoo-community.org/projects/sale-workflow-16-0/sale-workflow-16-0-sale_order_general_discount_triple/ --- sale_order_general_discount_triple/i18n/it.po | 31 ++++++------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/sale_order_general_discount_triple/i18n/it.po b/sale_order_general_discount_triple/i18n/it.po index b81ba623074..291a5e1de10 100644 --- a/sale_order_general_discount_triple/i18n/it.po +++ b/sale_order_general_discount_triple/i18n/it.po @@ -41,33 +41,11 @@ msgstr "Sconto 2" msgid "Discount 3" msgstr "Sconto 3" -#. module: sale_order_general_discount_triple -#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_res_config_settings__display_name -#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order__display_name -#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order_line__display_name -msgid "Display Name" -msgstr "Nome visualizzato" - #. module: sale_order_general_discount_triple #: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_res_config_settings__general_discount -#: model_terms:ir.ui.view,arch_db:sale_order_general_discount_triple.res_config_settings_form_view msgid "General Discount" msgstr "Sconto Generale" -#. module: sale_order_general_discount_triple -#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_res_config_settings__id -#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order__id -#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order_line__id -msgid "ID" -msgstr "ID" - -#. module: sale_order_general_discount_triple -#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_res_config_settings____last_update -#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order____last_update -#: model:ir.model.fields,field_description:sale_order_general_discount_triple.field_sale_order_line____last_update -msgid "Last Modified on" -msgstr "Ultima modifica il" - #. module: sale_order_general_discount_triple #: model:ir.model,name:sale_order_general_discount_triple.model_sale_order msgid "Sales Order" @@ -77,3 +55,12 @@ msgstr "Ordine di vendita" #: model:ir.model,name:sale_order_general_discount_triple.model_sale_order_line msgid "Sales Order Line" msgstr "Riga ordine di vendita" + +#~ msgid "Display Name" +#~ msgstr "Nome visualizzato" + +#~ msgid "ID" +#~ msgstr "ID" + +#~ msgid "Last Modified on" +#~ msgstr "Ultima modifica il" From c5328e8bbd15db010e9e0223eef00300e96d0741 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Tue, 8 Aug 2023 10:20:36 +0200 Subject: [PATCH 13/28] [REM] sale_order_general_discount_triple: Disable due to breaking change Changing the field `discount` to a not computed one is breaking standard flows, provoking all sorts of errors when this module is installed, so we disable for now the module while not finding other option that will be reported to original migrators. --- sale_order_general_discount_triple/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sale_order_general_discount_triple/__manifest__.py b/sale_order_general_discount_triple/__manifest__.py index 490dc6bbbac..71f895b511c 100644 --- a/sale_order_general_discount_triple/__manifest__.py +++ b/sale_order_general_discount_triple/__manifest__.py @@ -9,7 +9,7 @@ "author": "Ashish Hirpara, Ooops, Odoo Community Association (OCA)", "license": "AGPL-3", "maintainers": ["ashishhirapara"], - "installable": True, + "installable": False, "depends": ["sale", "sale_order_general_discount", "sale_triple_discount"], "data": [ "views/res_config_settings.xml", From 95998ec8e8cb7e2dc5ddc9e407481b111692ace9 Mon Sep 17 00:00:00 2001 From: RabbitJon-S73 Date: Fri, 8 Sep 2023 08:40:04 +0200 Subject: [PATCH 14/28] [IMP] sale_order_general_discount_triple: style --- sale_order_general_discount_triple/README.rst | 13 ++-- .../static/description/index.html | 64 +++++++++++-------- 2 files changed, 46 insertions(+), 31 deletions(-) diff --git a/sale_order_general_discount_triple/README.rst b/sale_order_general_discount_triple/README.rst index 56240f30a45..ff101421e68 100644 --- a/sale_order_general_discount_triple/README.rst +++ b/sale_order_general_discount_triple/README.rst @@ -2,10 +2,13 @@ Sale Order General Discount Triple ================================== -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:2ea003f4e214a0c05084a09ccb35315736f696747292a3888e933eebe62bdfa7 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -19,9 +22,9 @@ Sale Order General Discount Triple .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png :target: https://translation.odoo-community.org/projects/sale-workflow-16-0/sale-workflow-16-0-sale_order_general_discount_triple :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/167/16.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/sale-workflow&target_branch=16.0 + :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -54,7 +57,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 +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. diff --git a/sale_order_general_discount_triple/static/description/index.html b/sale_order_general_discount_triple/static/description/index.html index f739733aed5..2dbfcce79b2 100644 --- a/sale_order_general_discount_triple/static/description/index.html +++ b/sale_order_general_discount_triple/static/description/index.html @@ -1,20 +1,20 @@ - + - + Sale Order General Discount Triple