From 61f2e0b637b99d56f2ea58a211d316d37a0ff900 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Tue, 17 Sep 2024 07:47:05 +0000 Subject: [PATCH] [BOT] post-merge updates --- README.md | 1 + sale_order_general_discount/README.rst | 17 +++++++---------- .../static/description/index.html | 19 +++++++++++-------- setup/_metapackage/pyproject.toml | 3 ++- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 2caddfeebe5..ecc782098e0 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ addon | version | maintainers | summary [sale_manual_delivery](sale_manual_delivery/) | 17.0.1.0.0 | | Create manually your deliveries [sale_order_archive](sale_order_archive/) | 17.0.1.0.0 | | Archive Sale Orders [sale_order_carrier_auto_assign](sale_order_carrier_auto_assign/) | 17.0.1.0.0 | | Auto assign delivery carrier on sale order confirmation +[sale_order_general_discount](sale_order_general_discount/) | 17.0.1.0.0 | | General discount per sale order [sale_order_invoicing_finished_task](sale_order_invoicing_finished_task/) | 17.0.1.0.0 | | Control invoice order lines if their related task has been set to invoiceable [sale_order_line_date](sale_order_line_date/) | 17.0.1.0.0 | | Adds a commitment date to each sale order line. [sale_order_line_menu](sale_order_line_menu/) | 17.0.1.0.0 | | Adds a Sale Order Lines Menu diff --git a/sale_order_general_discount/README.rst b/sale_order_general_discount/README.rst index d35955091de..2456cf24345 100644 --- a/sale_order_general_discount/README.rst +++ b/sale_order_general_discount/README.rst @@ -2,12 +2,12 @@ Sale Order General Discount =========================== -.. +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:89f2734d9d25935234ea2f721345d3f6a1af054221cdd63037677b6dd8325706 + !! source digest: sha256:a4eeadfa3e2fc4ad9f54244dc002a32d12938c91207c4f729001730ca727a156 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png @@ -17,13 +17,13 @@ Sale Order General Discount :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/16.0/sale_order_general_discount + :target: https://github.com/OCA/sale-workflow/tree/17.0/sale_order_general_discount :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-16-0/sale-workflow-16-0-sale_order_general_discount + :target: https://translation.odoo-community.org/projects/sale-workflow-17-0/sale-workflow-17-0-sale_order_general_discount :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-workflow&target_branch=16.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/sale-workflow&target_branch=17.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -63,7 +63,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 to smash it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -85,9 +85,6 @@ Contributors * Raf Ven * Sudhir Arya -* `Studio73 `_ - - * Miguel Gandia Maintainers ~~~~~~~~~~~ @@ -102,6 +99,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-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/static/description/index.html b/sale_order_general_discount/static/description/index.html index e8aad811d74..baa03fd4432 100644 --- a/sale_order_general_discount/static/description/index.html +++ b/sale_order_general_discount/static/description/index.html @@ -8,10 +8,11 @@ /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ +:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. +Despite the name, some widely supported CSS2 features are used. See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. @@ -274,7 +275,7 @@ margin-left: 2em ; margin-right: 2em } -pre.code .ln { color: grey; } /* line numbers */ +pre.code .ln { color: gray; } /* line numbers */ pre.code, code { background-color: #eeeeee } pre.code .comment, code .comment { color: #5C6576 } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } @@ -300,7 +301,7 @@ span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { @@ -366,9 +367,9 @@

Sale Order General Discount

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:89f2734d9d25935234ea2f721345d3f6a1af054221cdd63037677b6dd8325706 +!! source digest: sha256:a4eeadfa3e2fc4ad9f54244dc002a32d12938c91207c4f729001730ca727a156 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Production/Stable License: AGPL-3 OCA/sale-workflow Translate me on Weblate Try me on Runboat

+

Production/Stable License: AGPL-3 OCA/sale-workflow Translate me on Weblate Try me on Runboat

This module allows to set a general discount in a sales order. This general discount is set to each line order in the standard discount field.

@@ -414,7 +415,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 to smash it by providing a detailed and welcomed -feedback.

+feedback.

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

@@ -440,11 +441,13 @@

Contributors

Maintainers

This module is maintained by the OCA.

-Odoo Community Association + +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-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/setup/_metapackage/pyproject.toml b/setup/_metapackage/pyproject.toml index 6e006aa7747..fc8725a89d4 100644 --- a/setup/_metapackage/pyproject.toml +++ b/setup/_metapackage/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "odoo-addons-oca-sale-workflow" -version = "17.0.20240913.0" +version = "17.0.20240917.0" dependencies = [ "odoo-addon-partner_sale_pivot>=17.0dev,<17.1dev", "odoo-addon-product_form_sale_link>=17.0dev,<17.1dev", @@ -21,6 +21,7 @@ dependencies = [ "odoo-addon-sale_manual_delivery>=17.0dev,<17.1dev", "odoo-addon-sale_order_archive>=17.0dev,<17.1dev", "odoo-addon-sale_order_carrier_auto_assign>=17.0dev,<17.1dev", + "odoo-addon-sale_order_general_discount>=17.0dev,<17.1dev", "odoo-addon-sale_order_invoicing_finished_task>=17.0dev,<17.1dev", "odoo-addon-sale_order_line_date>=17.0dev,<17.1dev", "odoo-addon-sale_order_line_menu>=17.0dev,<17.1dev",