Skip to content

Commit a8a3e62

Browse files
OCA-git-botOCA-git-bot
committed
[BOT] post-merge updates
1 parent f8172b1 commit a8a3e62

File tree

4 files changed

+35
-20
lines changed

4 files changed

+35
-20
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ addon | version | maintainers | summary
6262
[delivery_roulier](delivery_roulier/) | 18.0.1.0.0 | <a href='https://github.com/florian-dacosta'><img src='https://github.com/florian-dacosta.png' width='32' height='32' style='border-radius:50%;' alt='florian-dacosta'/></a> <a href='https://github.com/hparfr'><img src='https://github.com/hparfr.png' width='32' height='32' style='border-radius:50%;' alt='hparfr'/></a> | Integration of multiple carriers
6363
[delivery_schenker](delivery_schenker/) | 18.0.1.0.0 | | Delivery Carrier implementation for DB Schenker API
6464
[delivery_state](delivery_state/) | 18.0.1.1.0 | | Provides fields to be able to contemplate the tracking statesand also adds a global fields
65+
[delivery_ups_oca](delivery_ups_oca/) | 18.0.1.0.0 | | Integrate UPS webservice
6566
[partner_delivery_info](partner_delivery_info/) | 18.0.1.0.0 | | Send delivery notice to the shipper from any operation.
6667
[partner_delivery_schedule](partner_delivery_schedule/) | 18.0.1.0.1 | | Set on partners a schedule for delivery goods
6768
[partner_delivery_zone](partner_delivery_zone/) | 18.0.1.0.0 | | Enables partner delivery zones for physical products

‎delivery_ups_oca/README.rst‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
.. image:: https://odoo-community.org/readme-banner-image
2+
:target: https://odoo-community.org/get-involved?utm_source=readme
3+
:alt: Odoo Community Association
4+
15
================
26
Delivery UPS OCA
37
================
@@ -7,13 +11,13 @@ Delivery UPS OCA
711
!! This file is generated by oca-gen-addon-readme !!
812
!! changes will be overwritten. !!
913
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:5c5c1b09dfe20724c425c5b6c39f037b475f251b53e312baa365316b53fad92d
14+
!! source digest: sha256:a822b00c048a67361ef9e4de24e3d5f6ba436b9cd140e4b3ac4c87585d999b73
1115
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1216
1317
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
1418
:target: https://odoo-community.org/page/development-status
1519
:alt: Beta
16-
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
20+
.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
1721
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
1822
:alt: License: AGPL-3
1923
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github

‎delivery_ups_oca/static/description/index.html‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
<head>
44
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
55
<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
6-
<title>Delivery UPS OCA</title>
6+
<title>README.rst</title>
77
<style type="text/css">
88

99
/*
1010
:Author: David Goodger (goodger@python.org)
11-
: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 $
1212
:Copyright: This stylesheet has been placed in the public domain.
1313
1414
Default cascading style sheet for the HTML output of Docutils.
15+
Despite the name, some widely supported CSS2 features are used.
1516
1617
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
1718
customize this style sheet.
@@ -274,7 +275,7 @@
274275
margin-left: 2em ;
275276
margin-right: 2em }
276277

277-
pre.code .ln { color: grey; } /* line numbers */
278+
pre.code .ln { color: gray; } /* line numbers */
278279
pre.code, code { background-color: #eeeeee }
279280
pre.code .comment, code .comment { color: #5C6576 }
280281
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@
300301
span.pre {
301302
white-space: pre }
302303

303-
span.problematic {
304+
span.problematic, pre.problematic {
304305
color: red }
305306

306307
span.section-subtitle {
@@ -359,16 +360,21 @@
359360
</style>
360361
</head>
361362
<body>
362-
<div class="document" id="delivery-ups-oca">
363-
<h1 class="title">Delivery UPS OCA</h1>
363+
<div class="document">
364364

365+
366+
<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
367+
<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
368+
</a>
369+
<div class="section" id="delivery-ups-oca">
370+
<h1>Delivery UPS OCA</h1>
365371
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
366372
!! This file is generated by oca-gen-addon-readme !!
367373
!! changes will be overwritten. !!
368374
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
369-
!! source digest: sha256:5c5c1b09dfe20724c425c5b6c39f037b475f251b53e312baa365316b53fad92d
375+
!! source digest: sha256:a822b00c048a67361ef9e4de24e3d5f6ba436b9cd140e4b3ac4c87585d999b73
370376
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
371-
<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_ups_oca"><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_ups_oca"><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>
377+
<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/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/delivery-carrier/tree/18.0/delivery_ups_oca"><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_ups_oca"><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>
372378
<p>This module adds <a class="reference external" href="https://ups.com">UPS</a> to the available carriers.</p>
373379
<p>It allows you to register shippings, generate labels, get rates from
374380
order, read shipping states and cancel shipments using UPS webservice,
@@ -393,7 +399,7 @@ <h1 class="title">Delivery UPS OCA</h1>
393399
</ul>
394400
</div>
395401
<div class="section" id="configuration">
396-
<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
402+
<h2><a class="toc-backref" href="#toc-entry-1">Configuration</a></h2>
397403
<p>To configure this module, you need to:</p>
398404
<ol class="arabic simple">
399405
<li>Add a Shipping Method with Provider <tt class="docutils literal">UPS</tt> and fill in your UPS
@@ -413,7 +419,7 @@ <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
413419
using the webservice.</p>
414420
</div>
415421
<div class="section" id="usage">
416-
<h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
422+
<h2><a class="toc-backref" href="#toc-entry-2">Usage</a></h2>
417423
<p>You have to set the created shipping method in the delivery order to
418424
ship:</p>
419425
<ul class="simple">
@@ -429,32 +435,32 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
429435
</ul>
430436
</div>
431437
<div class="section" id="known-issues-roadmap">
432-
<h1><a class="toc-backref" href="#toc-entry-3">Known issues / Roadmap</a></h1>
438+
<h2><a class="toc-backref" href="#toc-entry-3">Known issues / Roadmap</a></h2>
433439
<ul class="simple">
434440
<li>Support international forms</li>
435441
<li>Support package service options</li>
436442
</ul>
437443
</div>
438444
<div class="section" id="bug-tracker">
439-
<h1><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h1>
445+
<h2><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h2>
440446
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/delivery-carrier/issues">GitHub Issues</a>.
441447
In case of trouble, please check there if your issue has already been reported.
442448
If you spotted it first, help us to smash it by providing a detailed and welcomed
443449
<a class="reference external" href="https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_ups_oca%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
444450
<p>Do not contact contributors directly about support or help with technical issues.</p>
445451
</div>
446452
<div class="section" id="credits">
447-
<h1><a class="toc-backref" href="#toc-entry-5">Credits</a></h1>
453+
<h2><a class="toc-backref" href="#toc-entry-5">Credits</a></h2>
448454
<div class="section" id="authors">
449-
<h2><a class="toc-backref" href="#toc-entry-6">Authors</a></h2>
455+
<h3><a class="toc-backref" href="#toc-entry-6">Authors</a></h3>
450456
<ul class="simple">
451457
<li>Hunki Enterprises BV</li>
452458
<li>Tecnativa</li>
453459
<li>ForgeFlow</li>
454460
</ul>
455461
</div>
456462
<div class="section" id="contributors">
457-
<h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
463+
<h3><a class="toc-backref" href="#toc-entry-7">Contributors</a></h3>
458464
<ul class="simple">
459465
<li>Holger Brunn &lt;<a class="reference external" href="mailto:mail&#64;hunki-enterprises.nl">mail&#64;hunki-enterprises.nl</a>&gt;
460466
(<a class="reference external" href="https://hunki-enterprises.nl">https://hunki-enterprises.nl</a>)</li>
@@ -474,9 +480,11 @@ <h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
474480
</ul>
475481
</div>
476482
<div class="section" id="maintainers">
477-
<h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
483+
<h3><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h3>
478484
<p>This module is maintained by the OCA.</p>
479-
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
485+
<a class="reference external image-reference" href="https://odoo-community.org">
486+
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
487+
</a>
480488
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
481489
mission is to support the collaborative development of Odoo features and
482490
promote its widespread use.</p>
@@ -485,5 +493,6 @@ <h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
485493
</div>
486494
</div>
487495
</div>
496+
</div>
488497
</body>
489498
</html>

‎setup/_metapackage/pyproject.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "odoo-addons-oca-delivery-carrier"
3-
version = "18.0.20260119.2"
3+
version = "18.0.20260204.0"
44
dependencies = [
55
"odoo-addon-carrier_account_environment==18.0.*",
66
"odoo-addon-delivery_auto_refresh==18.0.*",
@@ -41,6 +41,7 @@ dependencies = [
4141
"odoo-addon-delivery_roulier==18.0.*",
4242
"odoo-addon-delivery_schenker==18.0.*",
4343
"odoo-addon-delivery_state==18.0.*",
44+
"odoo-addon-delivery_ups_oca==18.0.*",
4445
"odoo-addon-partner_delivery_info==18.0.*",
4546
"odoo-addon-partner_delivery_schedule==18.0.*",
4647
"odoo-addon-partner_delivery_zone==18.0.*",

0 commit comments

Comments
 (0)