[BOT] post-merge updates

Author: OCA-git-bot

README.md

@@ -22,6 +22,7 @@ Available addons
 addon | version | maintainers | summary
 --- | --- | --- | ---
 [delivery_carrier_partner](delivery_carrier_partner/) | 18.0.1.0.0 |  | Add a partner in the delivery carrier
+[delivery_carrier_pricelist](delivery_carrier_pricelist/) | 18.0.1.0.0 |  | Compute delivery method price based on the product's pricelist.
 [delivery_free_fee_removal](delivery_free_fee_removal/) | 18.0.1.0.0 |  | Hide free fee lines on sales orders
 [delivery_package_fee](delivery_package_fee/) | 18.0.1.0.0 |  | Add fees on sales order for delivered packages
 

delivery_carrier_pricelist/README.rst

@@ -7,7 +7,7 @@ Delivery Method Pricelist
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:46327829480191f504758c63b47818cb83ef37454f4d79b19cbed95e7d7f8ed6
+   !! source digest: sha256:5230a38d8dc52abe3418a9ed9ec4994d971b658702c680194b4da1caca534010
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -37,11 +37,11 @@ method's product and the sales order's pricelist.
 
 It supports the following use cases:
 
--  When no "external" provider (e.g. DHL, UPS, ...) is used, a new
-   provider "Based on Product Pricelist" is available.
--  When an external provider is used, a new option in the "Invoice
-   Policy" selection, named "Pricelist Cost", overrides the provider's
-   cost by the pricelist based cost.
+- When no "external" provider (e.g. DHL, UPS, ...) is used, a new
+  provider "Based on Product Pricelist" is available.
+- When an external provider is used, a new option in the "Invoice
+  Policy" selection, named "Pricelist Cost", overrides the provider's
+  cost by the pricelist based cost.
 
 **Table of contents**
 
@@ -69,17 +69,17 @@ Authors
 Contributors
 ------------
 
--  Guewen Baconnier <guewen.baconnier@camptocamp.com>
--  Phuc Tran Thanh <phuc@trobz.com>
--  Chau Le <chaulb@trobz.com>
+- Guewen Baconnier <guewen.baconnier@camptocamp.com>
+- Phuc Tran Thanh <phuc@trobz.com>
+- Chau Le <chaulb@trobz.com>
 
 Other credits
 -------------
 
 The development and migration of this module has been financially
 supported by:
 
--  Camptocamp
+- Camptocamp
 
 Maintainers
 -----------

delivery_carrier_pricelist/static/description/index.html

@@ -367,7 +367,7 @@ <h1 class="title">Delivery Method Pricelist</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:46327829480191f504758c63b47818cb83ef37454f4d79b19cbed95e7d7f8ed6
+!! source digest: sha256:5230a38d8dc52abe3418a9ed9ec4994d971b658702c680194b4da1caca534010
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/delivery-carrier/tree/18.0/delivery_carrier_pricelist"><img alt="OCA/delivery-carrier" src="https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/delivery-carrier-18-0/delivery-carrier-18-0-delivery_carrier_pricelist"><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/delivery-carrier&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Compute the delivery method price based on its related delivery product

setup/_metapackage/pyproject.toml

@@ -1,8 +1,9 @@
 [project]
 name = "odoo-addons-oca-delivery-carrier"
-version = "18.0.20241231.0"
+version = "18.0.20241231.1"
 dependencies = [
     "odoo-addon-delivery_carrier_partner==18.0.*",
+    "odoo-addon-delivery_carrier_pricelist==18.0.*",
     "odoo-addon-delivery_free_fee_removal==18.0.*",
     "odoo-addon-delivery_package_fee==18.0.*",
 ]