Skip to content

Commit 347401c

Browse files
OCA-git-botOCA-git-bot
committed
[BOT] post-merge updates
1 parent 434c23d commit 347401c

File tree

8 files changed

+15
-11
lines changed

8 files changed

+15
-11
lines changed

‎README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ addon | version | maintainers | summary
4242
[delivery_dropoff_site](delivery_dropoff_site/) | 16.0.1.0.0 | | Send goods to sites in which customers come pick up package
4343
[delivery_estimated_package_quantity_by_weight](delivery_estimated_package_quantity_by_weight/) | 16.0.1.0.0 | | Compute the amount of packages a picking out should have depending on the weight of the products and the limit fixed by the carrier
4444
[delivery_multi_destination](delivery_multi_destination/) | 16.0.1.0.0 | | Multiple destinations for the same delivery method
45-
[delivery_package_fee](delivery_package_fee/) | 16.0.1.1.1 | | Add fees on delivered packages on shipping methods
45+
[delivery_package_fee](delivery_package_fee/) | 16.0.1.2.0 | | Add fees on delivered packages on shipping methods
4646
[delivery_package_number](delivery_package_number/) | 16.0.2.2.0 | | Set or compute number of packages for a picking
4747
[delivery_package_type_number_parcels](delivery_package_type_number_parcels/) | 16.0.1.0.2 | | Number of parcels in a package type
4848
[delivery_postlogistics](delivery_postlogistics/) | 16.0.1.1.0 | | Print PostLogistics shipping labels using the Barcode web service
@@ -51,6 +51,7 @@ addon | version | maintainers | summary
5151
[delivery_purchase](delivery_purchase/) | 16.0.1.1.0 | | Delivery costs in purchases
5252
[delivery_roulier](delivery_roulier/) | 16.0.2.1.1 | [![florian-dacosta](https://github.com/florian-dacosta.png?size=30px)](https://github.com/florian-dacosta) [![hparfr](https://github.com/hparfr.png?size=30px)](https://github.com/hparfr) | Integration of multiple carriers
5353
[delivery_roulier_dpd_fr](delivery_roulier_dpd_fr/) | 16.0.1.0.0 | [![florian-dacosta](https://github.com/florian-dacosta.png?size=30px)](https://github.com/florian-dacosta) | Generate Labels for DPD
54+
[delivery_roulier_geodis_fr](delivery_roulier_geodis_fr/) | 16.0.1.1.0 | [![florian-dacosta](https://github.com/florian-dacosta.png?size=30px)](https://github.com/florian-dacosta) | Generate Label for Geodis logistic
5455
[delivery_roulier_laposte_fr](delivery_roulier_laposte_fr/) | 16.0.1.0.0 | [![florian-dacosta](https://github.com/florian-dacosta.png?size=30px)](https://github.com/florian-dacosta) | Generate Label for La Poste/Colissimo
5556
[delivery_roulier_option](delivery_roulier_option/) | 16.0.1.0.0 | [![florian-dacosta](https://github.com/florian-dacosta.png?size=30px)](https://github.com/florian-dacosta) | Add options to roulier modules
5657
[delivery_schenker](delivery_schenker/) | 16.0.1.0.0 | | Delivery Carrier implementation for DB Schenker API

‎delivery_package_fee/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Delivery Package Fees
77
!! This file is generated by oca-gen-addon-readme !!
88
!! changes will be overwritten. !!
99
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:5f78ab8e9f5f47f7bcc802c2f61beb7d1e46738b50f9bda041ad07ede875e5de
10+
!! source digest: sha256:d3aeae2414f8d4da77cf125fba2b5bd72a588e0acc823e4229980687455ebf2c
1111
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1212
1313
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

‎delivery_package_fee/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"name": "Delivery Package Fees",
55
"summary": "Add fees on delivered packages on shipping methods",
6-
"version": "16.0.1.1.1",
6+
"version": "16.0.1.2.0",
77
"category": "Delivery",
88
"website": "https://github.com/OCA/delivery-carrier",
99
"author": "Camptocamp, Odoo Community Association (OCA)",

‎delivery_package_fee/static/description/index.html

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
32
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
43
<head>
@@ -9,10 +8,11 @@
98

109
/*
1110
:Author: David Goodger (goodger@python.org)
12-
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
11+
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
1312
:Copyright: This stylesheet has been placed in the public domain.
1413
1514
Default cascading style sheet for the HTML output of Docutils.
15+
Despite the name, some widely supported CSS2 features are used.
1616
1717
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
1818
customize this style sheet.
@@ -275,7 +275,7 @@
275275
margin-left: 2em ;
276276
margin-right: 2em }
277277

278-
pre.code .ln { color: grey; } /* line numbers */
278+
pre.code .ln { color: gray; } /* line numbers */
279279
pre.code, code { background-color: #eeeeee }
280280
pre.code .comment, code .comment { color: #5C6576 }
281281
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +301,7 @@
301301
span.pre {
302302
white-space: pre }
303303

304-
span.problematic {
304+
span.problematic, pre.problematic {
305305
color: red }
306306

307307
span.section-subtitle {
@@ -367,7 +367,7 @@ <h1 class="title">Delivery Package Fees</h1>
367367
!! This file is generated by oca-gen-addon-readme !!
368368
!! changes will be overwritten. !!
369369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370-
!! source digest: sha256:5f78ab8e9f5f47f7bcc802c2f61beb7d1e46738b50f9bda041ad07ede875e5de
370+
!! source digest: sha256:d3aeae2414f8d4da77cf125fba2b5bd72a588e0acc823e4229980687455ebf2c
371371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
372372
<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/16.0/delivery_package_fee"><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-16-0/delivery-carrier-16-0-delivery_package_fee"><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=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
373373
<p>Add delivery fees on Sales Orders based on the delivered packages.</p>
@@ -434,7 +434,9 @@ <h2><a class="toc-backref" href="#toc-entry-6">Other credits</a></h2>
434434
<div class="section" id="maintainers">
435435
<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
436436
<p>This module is maintained by the OCA.</p>
437-
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
437+
<a class="reference external image-reference" href="https://odoo-community.org">
438+
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
439+
</a>
438440
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
439441
mission is to support the collaborative development of Odoo features and
440442
promote its widespread use.</p>

‎delivery_roulier_geodis_fr/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{
44
"name": "Delivery Carrier Geodis (fr)",
5-
"version": "16.0.1.0.0",
5+
"version": "16.0.1.1.0",
66
"author": "Akretion, Odoo Community Association (OCA)",
77
"summary": "Generate Label for Geodis logistic",
88
"maintainers": ["florian-dacosta"],

‎delivery_roulier_geodis_fr/static/description/icon.png

10 KB
Loading

‎setup/_metapackage/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.0.20250312.0
1+
16.0.20250313.0

‎setup/_metapackage/setup.py

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
'odoo-addon-delivery_purchase>=16.0dev,<16.1dev',
3939
'odoo-addon-delivery_roulier>=16.0dev,<16.1dev',
4040
'odoo-addon-delivery_roulier_dpd_fr>=16.0dev,<16.1dev',
41+
'odoo-addon-delivery_roulier_geodis_fr>=16.0dev,<16.1dev',
4142
'odoo-addon-delivery_roulier_laposte_fr>=16.0dev,<16.1dev',
4243
'odoo-addon-delivery_roulier_option>=16.0dev,<16.1dev',
4344
'odoo-addon-delivery_schenker>=16.0dev,<16.1dev',

0 commit comments

Comments
 (0)