[BOT] post-merge updates

README.md

@@ -40,6 +40,7 @@ addon | version | maintainers | summary
 [sale_force_whole_invoiceability](sale_force_whole_invoiceability/) | 17.0.1.0.0 |  | Sale Force Whole Invoiceability
 [sale_invoice_policy](sale_invoice_policy/) | 17.0.1.0.0 |  | Sales Management: let the user choose the invoice policy on the order
 [sale_manual_delivery](sale_manual_delivery/) | 17.0.1.0.0 |  | Create manually your deliveries
+[sale_multi_template_application](sale_multi_template_application/) | 17.0.1.0.0 |  | Sale multi template application
 [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_multi_template_application/README.rst

@@ -7,7 +7,7 @@ Sale multi template application
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:333fe55af0b7c235786aba0f66d75dfd763960781b34f0701bf3548783f2793e
+   !! source digest: sha256:3439323a6c943bdba07b62a2ce3eafdc3af3503f214f42b0ad99d2d601bb36bb
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -43,18 +43,18 @@ linked to a possible partial template.
 Configuration
 =============
 
--  Go to *Sales > Configuration > Quotation Templates*.
--  Create at least two quotation templates and add some lines to each
-   template.
+- Go to *Sales > Configuration > Quotation Templates*.
+- Create at least two quotation templates and add some lines to each
+  template.
 
 Usage
 =====
 
--  Go to *Sales > Orders > Quotations*.
--  Create a new sales order.
--  Select the first quotation template.
--  Select the second quotation template, and the order lines from the
-   first template are retained.
+- Go to *Sales > Orders > Quotations*.
+- Create a new sales order.
+- Select the first quotation template.
+- Select the second quotation template, and the order lines from the
+  first template are retained.
 
 Bug Tracker
 ===========
@@ -77,10 +77,10 @@ Authors
 Contributors
 ------------
 
--  `Tecnativa <https://www.tecnativa.com>`__:
+- `Tecnativa <https://www.tecnativa.com>`__:
 
-   -  Pedro M. Baeza
-   -  Carlos López
+  - Pedro M. Baeza
+  - Carlos López
 
 Maintainers
 -----------

sale_multi_template_application/static/description/index.html

@@ -367,7 +367,7 @@ <h1 class="title">Sale multi template application</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:333fe55af0b7c235786aba0f66d75dfd763960781b34f0701bf3548783f2793e
+!! source digest: sha256:3439323a6c943bdba07b62a2ce3eafdc3af3503f214f42b0ad99d2d601bb36bb
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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_multi_template_application"><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_multi_template_application"><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 allows multiple templates to be applied to the same sales

setup/_metapackage/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "odoo-addons-oca-sale-workflow"
-version = "17.0.20241206.0"
+version = "17.0.20241219.0"
 dependencies = [
     "odoo-addon-partner_sale_pivot>=17.0dev,<17.1dev",
     "odoo-addon-portal_sale_personal_data_only>=17.0dev,<17.1dev",
@@ -21,6 +21,7 @@ dependencies = [
     "odoo-addon-sale_force_whole_invoiceability>=17.0dev,<17.1dev",
     "odoo-addon-sale_invoice_policy>=17.0dev,<17.1dev",
     "odoo-addon-sale_manual_delivery>=17.0dev,<17.1dev",
+    "odoo-addon-sale_multi_template_application>=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",