Skip to content

Commit

Permalink
[BOT] post-merge updates
Browse files Browse the repository at this point in the history
  • Loading branch information
OCA-git-bot committed Jan 24, 2025
1 parent 525aba1 commit acd7e8c
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ addon | version | maintainers | summary
[delivery_carrier_account](delivery_carrier_account/) | 17.0.1.0.0 | | Delivery Carrier Account
[delivery_carrier_info](delivery_carrier_info/) | 17.0.1.0.0 | | Add code on carrier
[delivery_carrier_manual_price](delivery_carrier_manual_price/) | 17.0.1.0.0 | | Allow setting manual shipping cost in sale order.
[delivery_carrier_manual_weight](delivery_carrier_manual_weight/) | 17.0.1.0.0 | | Allow setting weight and shipping weight in stock transfers manually based on carrier.
[delivery_carrier_partner](delivery_carrier_partner/) | 17.0.1.0.0 | | Add a partner in the delivery carrier
[delivery_free_fee_removal](delivery_free_fee_removal/) | 17.0.1.0.0 | | Hide free fee lines on sales orders
[delivery_package_number](delivery_package_number/) | 17.0.1.0.0 | | Set or compute number of packages for a picking
Expand Down
8 changes: 4 additions & 4 deletions delivery_carrier_manual_weight/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Delivery Carrier Manual Weight
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:ebda64e7d4f91aed1f58e703f1305f3fca450004a002b7c0008b4b027aa4ab83
!! source digest: sha256:cb7ec31b8da17884fe4d5613b5dc090c793371ad7f11e667d830d58cb03b4047
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down Expand Up @@ -64,9 +64,9 @@ Authors
Contributors
------------

- Jordi Masvidal <[email protected]>
- Marina Alapont <[email protected]>
- Manuel Regidor <[email protected]>
- Jordi Masvidal <[email protected]>
- Marina Alapont <[email protected]>
- Manuel Regidor <[email protected]>

Maintainers
-----------
Expand Down
13 changes: 8 additions & 5 deletions delivery_carrier_manual_weight/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@

/*
:Author: David Goodger ([email protected])
: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.
Expand Down Expand Up @@ -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 }
Expand All @@ -300,7 +301,7 @@
span.pre {
white-space: pre }

span.problematic {
span.problematic, pre.problematic {
color: red }

span.section-subtitle {
Expand Down Expand Up @@ -366,7 +367,7 @@ <h1 class="title">Delivery Carrier Manual Weight</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:ebda64e7d4f91aed1f58e703f1305f3fca450004a002b7c0008b4b027aa4ab83
!! source digest: sha256:cb7ec31b8da17884fe4d5613b5dc090c793371ad7f11e667d830d58cb03b4047
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/17.0/delivery_carrier_manual_weight"><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-17-0/delivery-carrier-17-0-delivery_carrier_manual_weight"><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=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module adds a flag in Shipping Methods to allow to set manually the
Expand Down Expand Up @@ -417,7 +418,9 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<a class="reference external image-reference" href="https://odoo-community.org">
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
</a>
<p>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.</p>
Expand Down
3 changes: 2 additions & 1 deletion setup/_metapackage/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
[project]
name = "odoo-addons-oca-delivery-carrier"
version = "17.0.20250116.0"
version = "17.0.20250124.0"
dependencies = [
"odoo-addon-base_delivery_carrier_label>=17.0dev,<17.1dev",
"odoo-addon-delivery_carrier_account>=17.0dev,<17.1dev",
"odoo-addon-delivery_carrier_info>=17.0dev,<17.1dev",
"odoo-addon-delivery_carrier_manual_price>=17.0dev,<17.1dev",
"odoo-addon-delivery_carrier_manual_weight>=17.0dev,<17.1dev",
"odoo-addon-delivery_carrier_partner>=17.0dev,<17.1dev",
"odoo-addon-delivery_free_fee_removal>=17.0dev,<17.1dev",
"odoo-addon-delivery_package_number>=17.0dev,<17.1dev",
Expand Down

0 comments on commit acd7e8c

Please sign in to comment.