From 2c026223097617ff53ef26f19d6c59bf364cc18f Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 11 Dec 2024 08:51:48 +0000 Subject: [PATCH] [BOT] post-merge updates --- README.md | 1 + delivery_carrier_manual_price/README.rst | 2 +- .../static/description/index.html | 13 ++++++++----- setup/_metapackage/VERSION.txt | 2 +- setup/_metapackage/setup.py | 1 + 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 59680d4e17..5ae103ec16 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ addon | version | maintainers | summary [delivery_carrier_agency](delivery_carrier_agency/) | 16.0.1.0.0 | | Add a model for Carrier Agencies [delivery_carrier_deposit](delivery_carrier_deposit/) | 16.0.1.0.0 | | Create deposit slips [delivery_carrier_info](delivery_carrier_info/) | 16.0.1.0.0 | | Add code on carrier +[delivery_carrier_manual_price](delivery_carrier_manual_price/) | 16.0.1.0.0 | | Allow setting manual shipping cost in sale order. [delivery_carrier_manual_weight](delivery_carrier_manual_weight/) | 16.0.1.0.0 | | Allow setting weight and shipping weight in stock transfers manually based on carrier. [delivery_carrier_max_weight_constraint](delivery_carrier_max_weight_constraint/) | 16.0.1.0.1 | | Constrain package maximum weight [delivery_carrier_package_measure_required](delivery_carrier_package_measure_required/) | 16.0.1.0.0 | | Allow the configuration of which package measurements are required on a delivery carrier basis. diff --git a/delivery_carrier_manual_price/README.rst b/delivery_carrier_manual_price/README.rst index 209f7e7783..cebb1bcea9 100644 --- a/delivery_carrier_manual_price/README.rst +++ b/delivery_carrier_manual_price/README.rst @@ -7,7 +7,7 @@ Delivery Carrier Manual Price !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:608ecbf041689e42589bbb1b2ef567ad875bce40970e796ba23594c9169ae942 + !! source digest: sha256:5b488314bd3e6c4c8e0a336fff25c0c66b4f38f04681faa1e69d0633a2d52304 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/delivery_carrier_manual_price/static/description/index.html b/delivery_carrier_manual_price/static/description/index.html index a1aee7ce84..76eeca5ec6 100644 --- a/delivery_carrier_manual_price/static/description/index.html +++ b/delivery_carrier_manual_price/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,7 +367,7 @@

Delivery Carrier Manual Price

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:608ecbf041689e42589bbb1b2ef567ad875bce40970e796ba23594c9169ae942 +!! source digest: sha256:5b488314bd3e6c4c8e0a336fff25c0c66b4f38f04681faa1e69d0633a2d52304 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Beta License: AGPL-3 OCA/delivery-carrier Translate me on Weblate Try me on Runboat

This module adds a flag in Shipping Methods to allow to set their cost manually @@ -415,7 +416,9 @@

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.

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt index c3c3e93443..a631d2dded 100644 --- a/setup/_metapackage/VERSION.txt +++ b/setup/_metapackage/VERSION.txt @@ -1 +1 @@ -16.0.20241029.0 \ No newline at end of file +16.0.20241211.0 \ No newline at end of file diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py index e8348cead2..ab95d0fc26 100644 --- a/setup/_metapackage/setup.py +++ b/setup/_metapackage/setup.py @@ -16,6 +16,7 @@ 'odoo-addon-delivery_carrier_agency>=16.0dev,<16.1dev', 'odoo-addon-delivery_carrier_deposit>=16.0dev,<16.1dev', 'odoo-addon-delivery_carrier_info>=16.0dev,<16.1dev', + 'odoo-addon-delivery_carrier_manual_price>=16.0dev,<16.1dev', 'odoo-addon-delivery_carrier_manual_weight>=16.0dev,<16.1dev', 'odoo-addon-delivery_carrier_max_weight_constraint>=16.0dev,<16.1dev', 'odoo-addon-delivery_carrier_package_measure_required>=16.0dev,<16.1dev',