[BOT] post-merge updates

README.md

@@ -57,6 +57,7 @@ addon | version | maintainers | summary
 [sale_order_qty_change_no_recompute](sale_order_qty_change_no_recompute/) | 17.0.1.0.0 | [![victoralmau](https://github.com/victoralmau.png?size=30px)](https://github.com/victoralmau) | Prevent recompute if only quantity has changed in sale order line
 [sale_order_revision](sale_order_revision/) | 17.0.1.0.0 |  | Keep track of revised quotations
 [sale_order_type](sale_order_type/) | 17.0.1.0.2 |  | Sale Order Type
+[sale_order_type_confirm_message](sale_order_type_confirm_message/) | 17.0.1.0.0 |  | Confirmation requirement when validating sale
 [sale_partner_incoterm](sale_partner_incoterm/) | 17.0.1.0.0 |  | Set the customer preferred incoterm on each sales order
 [sale_partner_selectable_option](sale_partner_selectable_option/) | 17.0.1.0.0 | [![victoralmau](https://github.com/victoralmau.png?size=30px)](https://github.com/victoralmau) | Sale Partner Selectable Option
 [sale_procurement_group_by_line](sale_procurement_group_by_line/) | 17.0.1.0.0 |  | Base module for multiple procurement group by Sale order

sale_order_type_confirm_message/README.rst

@@ -7,7 +7,7 @@ Sale Order Type Confirm Message
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:cde4ce5b80daab597a13812115071dba91e2de486f2fe35145103ff172256c36
+   !! source digest: sha256:fa2aefff308908b9c873cc35624a3cb2cfbce78116b6d95a1c8586d4ec94643e
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -51,15 +51,14 @@ Usage
 
 To use this module, you need to:
 
--  Create a sales order type with the checkbox "Has Confirmation
-   Message" activated, and assign a message in the "Confirmation
-   Message" field.
--  Once the user tries to validate a sales quotation that has a
-   confirmation message in it's sales order type, a warning popup will
-   be shown.
--  If the user selects the Confirm button, this sales quotation will be
-   confirmed as usual. If the user selects the Cancel button, the popup
-   will be closed and he will go back to the quotation.
+- Create a sales order type with the checkbox "Has Confirmation Message"
+  activated, and assign a message in the "Confirmation Message" field.
+- Once the user tries to validate a sales quotation that has a
+  confirmation message in it's sales order type, a warning popup will be
+  shown.
+- If the user selects the Confirm button, this sales quotation will be
+  confirmed as usual. If the user selects the Cancel button, the popup
+  will be closed and he will go back to the quotation.
 
 Bug Tracker
 ===========
@@ -82,10 +81,10 @@ Authors
 Contributors
 ------------
 
--  Manuel Regidor [email protected]
--  Alberto Martínez [email protected]
--  Valentin Vinagre [email protected]
--  Harald Panten [email protected]
+- Manuel Regidor [email protected]
+- Alberto Martínez [email protected]
+- Valentin Vinagre [email protected]
+- Harald Panten [email protected]
 
 Maintainers
 -----------

sale_order_type_confirm_message/static/description/index.html

@@ -367,7 +367,7 @@ <h1 class="title">Sale Order Type Confirm Message</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:cde4ce5b80daab597a13812115071dba91e2de486f2fe35145103ff172256c36
+!! source digest: sha256:fa2aefff308908b9c873cc35624a3cb2cfbce78116b6d95a1c8586d4ec94643e
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/sale-workflow/tree/17.0/sale_order_type_confirm_message"><img alt="OCA/sale-workflow" src="https://img.shields.io/badge/github-OCA%2Fsale--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/sale-workflow-17-0/sale-workflow-17-0-sale_order_type_confirm_message"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/sale-workflow&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module includes a validation step when confirming a sale order.</p>
@@ -400,12 +400,11 @@ <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
 <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
 <p>To use this module, you need to:</p>
 <ul class="simple">
-<li>Create a sales order type with the checkbox “Has Confirmation
-Message” activated, and assign a message in the “Confirmation
-Message” field.</li>
+<li>Create a sales order type with the checkbox “Has Confirmation Message”
+activated, and assign a message in the “Confirmation Message” field.</li>
 <li>Once the user tries to validate a sales quotation that has a
-confirmation message in it’s sales order type, a warning popup will
-be shown.</li>
+confirmation message in it’s sales order type, a warning popup will be
+shown.</li>
 <li>If the user selects the Confirm button, this sales quotation will be
 confirmed as usual. If the user selects the Cancel button, the popup
 will be closed and he will go back to the quotation.</li>

setup/_metapackage/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "odoo-addons-oca-sale-workflow"
-version = "17.0.20241219.0"
+version = "17.0.20241219.1"
 dependencies = [
     "odoo-addon-partner_sale_pivot>=17.0dev,<17.1dev",
     "odoo-addon-portal_sale_personal_data_only>=17.0dev,<17.1dev",
@@ -38,6 +38,7 @@ dependencies = [
     "odoo-addon-sale_order_qty_change_no_recompute>=17.0dev,<17.1dev",
     "odoo-addon-sale_order_revision>=17.0dev,<17.1dev",
     "odoo-addon-sale_order_type>=17.0dev,<17.1dev",
+    "odoo-addon-sale_order_type_confirm_message>=17.0dev,<17.1dev",
     "odoo-addon-sale_partner_incoterm>=17.0dev,<17.1dev",
     "odoo-addon-sale_partner_selectable_option>=17.0dev,<17.1dev",
     "odoo-addon-sale_procurement_group_by_line>=17.0dev,<17.1dev",