diff --git a/delivery_postlogistics_server_env/README.rst b/delivery_postlogistics_server_env/README.rst
new file mode 100644
index 0000000000..2aa9e1d9fb
--- /dev/null
+++ b/delivery_postlogistics_server_env/README.rst
@@ -0,0 +1,95 @@
+=========================================
+Delivery Postlogistics Server Environment
+=========================================
+
+..
+ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ !! This file is generated by oca-gen-addon-readme !!
+ !! changes will be overwritten. !!
+ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ !! source digest: sha256:be8b2949916065268a947cb93cea97b941db44695906958a3517b2621193d0c2
+ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
+ :target: https://odoo-community.org/page/development-status
+ :alt: Alpha
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+ :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+ :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github
+ :target: https://github.com/OCA/delivery-carrier/tree/18.0/delivery_postlogistics_server_env
+ :alt: OCA/delivery-carrier
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+ :target: https://translation.odoo-community.org/projects/delivery-carrier-18-0/delivery-carrier-18-0-delivery_postlogistics_server_env
+ :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+ :target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=18.0
+ :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+Adds OCA Server Environment features to Delivery Postlogistics.
+
+.. IMPORTANT::
+ This is an alpha version, the data model and design can change at any time without warning.
+ Only for development or testing purpose, do not use in production.
+ `More details on development status <https://odoo-community.org/page/development-status>`_
+
+**Table of contents**
+
+.. contents::
+ :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/delivery-carrier/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_postlogistics_server_env%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+-------
+
+* Camptocamp
+
+Contributors
+------------
+
+- Thierry Ducrest <thierry.ducrest@camptocamp.com>
+
+- `Trobz <https://trobz.com>`__:
+
+ - Jack Le <anlh@trobz.com>
+
+- `Heliconia Solutions Pvt. Ltd. <https://www.heliconia.io>`__
+
+ - Bhavesh Heliconia
+
+Other credits
+-------------
+
+The migration of this module from 14.0 to 16.0 was financially supported
+by Camptocamp
+
+Maintainers
+-----------
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+ :alt: Odoo Community Association
+ :target: https://odoo-community.org
+
+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.
+
+This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/18.0/delivery_postlogistics_server_env>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/delivery_postlogistics_server_env/__init__.py b/delivery_postlogistics_server_env/__init__.py
new file mode 100644
index 0000000000..0650744f6b
--- /dev/null
+++ b/delivery_postlogistics_server_env/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/delivery_postlogistics_server_env/__manifest__.py b/delivery_postlogistics_server_env/__manifest__.py
new file mode 100644
index 0000000000..357dc8ca4c
--- /dev/null
+++ b/delivery_postlogistics_server_env/__manifest__.py
@@ -0,0 +1,15 @@
+# Copyright 2021 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+{
+ "name": "Delivery Postlogistics Server Environment",
+ "summary": "Server Environment layer for Delivery Postlogistics",
+ "version": "18.0.1.0.0",
+ "category": "Operations/Inventory/Delivery",
+ "author": "Camptocamp, Odoo Community Association (OCA)",
+ "license": "AGPL-3",
+ "depends": ["delivery_postlogistics", "server_environment"],
+ "website": "https://github.com/OCA/delivery-carrier",
+ "installable": True,
+ "auto_install": True,
+ "development_status": "Alpha",
+}
diff --git a/delivery_postlogistics_server_env/i18n/delivery_postlogistics_server_env.pot b/delivery_postlogistics_server_env/i18n/delivery_postlogistics_server_env.pot
new file mode 100644
index 0000000000..88ca409bee
--- /dev/null
+++ b/delivery_postlogistics_server_env/i18n/delivery_postlogistics_server_env.pot
@@ -0,0 +1,24 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * delivery_postlogistics_server_env
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: delivery_postlogistics_server_env
+#: model:ir.model.fields,field_description:delivery_postlogistics_server_env.field_delivery_carrier__server_env_defaults
+msgid "Server Env Defaults"
+msgstr ""
+
+#. module: delivery_postlogistics_server_env
+#: model:ir.model,name:delivery_postlogistics_server_env.model_delivery_carrier
+msgid "Shipping Methods"
+msgstr ""
diff --git a/delivery_postlogistics_server_env/i18n/es.po b/delivery_postlogistics_server_env/i18n/es.po
new file mode 100644
index 0000000000..744efdc7bb
--- /dev/null
+++ b/delivery_postlogistics_server_env/i18n/es.po
@@ -0,0 +1,27 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * delivery_postlogistics_server_env
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2023-08-03 15:09+0000\n"
+"Last-Translator: Ivorra78 <informatica@totmaterial.es>\n"
+"Language-Team: none\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. module: delivery_postlogistics_server_env
+#: model:ir.model.fields,field_description:delivery_postlogistics_server_env.field_delivery_carrier__server_env_defaults
+msgid "Server Env Defaults"
+msgstr "Valores por defecto del entorno de servidor"
+
+#. module: delivery_postlogistics_server_env
+#: model:ir.model,name:delivery_postlogistics_server_env.model_delivery_carrier
+msgid "Shipping Methods"
+msgstr "Métodos de envío"
diff --git a/delivery_postlogistics_server_env/i18n/it.po b/delivery_postlogistics_server_env/i18n/it.po
new file mode 100644
index 0000000000..099c0f9cfe
--- /dev/null
+++ b/delivery_postlogistics_server_env/i18n/it.po
@@ -0,0 +1,27 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * delivery_postlogistics_server_env
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2024-05-08 07:43+0000\n"
+"Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. module: delivery_postlogistics_server_env
+#: model:ir.model.fields,field_description:delivery_postlogistics_server_env.field_delivery_carrier__server_env_defaults
+msgid "Server Env Defaults"
+msgstr "Server ambiente predefinito"
+
+#. module: delivery_postlogistics_server_env
+#: model:ir.model,name:delivery_postlogistics_server_env.model_delivery_carrier
+msgid "Shipping Methods"
+msgstr "Metodi di spedizione"
diff --git a/delivery_postlogistics_server_env/i18n/pt_BR.po b/delivery_postlogistics_server_env/i18n/pt_BR.po
new file mode 100644
index 0000000000..c0129260b0
--- /dev/null
+++ b/delivery_postlogistics_server_env/i18n/pt_BR.po
@@ -0,0 +1,28 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * delivery_postlogistics_server_env
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2024-07-05 19:47+0000\n"
+"Last-Translator: rodrigosottomaiormacedo "
+"<sottomaiormacedotec@sottomaiormacedo.tech>\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. module: delivery_postlogistics_server_env
+#: model:ir.model.fields,field_description:delivery_postlogistics_server_env.field_delivery_carrier__server_env_defaults
+msgid "Server Env Defaults"
+msgstr "Padrões de ambiente do servidor"
+
+#. module: delivery_postlogistics_server_env
+#: model:ir.model,name:delivery_postlogistics_server_env.model_delivery_carrier
+msgid "Shipping Methods"
+msgstr "Métodos de Envio"
diff --git a/delivery_postlogistics_server_env/models/__init__.py b/delivery_postlogistics_server_env/models/__init__.py
new file mode 100644
index 0000000000..0a1fe29fbd
--- /dev/null
+++ b/delivery_postlogistics_server_env/models/__init__.py
@@ -0,0 +1 @@
+from . import delivery_carrier
diff --git a/delivery_postlogistics_server_env/models/delivery_carrier.py b/delivery_postlogistics_server_env/models/delivery_carrier.py
new file mode 100644
index 0000000000..2deee57d3a
--- /dev/null
+++ b/delivery_postlogistics_server_env/models/delivery_carrier.py
@@ -0,0 +1,19 @@
+# Copyright 2021 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class DeliveryCarrier(models.Model):
+ _name = "delivery.carrier"
+ _inherit = ["delivery.carrier", "server.env.mixin"]
+
+ @property
+ def _server_env_fields(self):
+ base_fields = super()._server_env_fields
+ auth_fields = {
+ "postlogistics_client_id": {},
+ "postlogistics_client_secret": {},
+ }
+ auth_fields.update(base_fields)
+ return auth_fields
diff --git a/delivery_postlogistics_server_env/pyproject.toml b/delivery_postlogistics_server_env/pyproject.toml
new file mode 100644
index 0000000000..4231d0cccb
--- /dev/null
+++ b/delivery_postlogistics_server_env/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/delivery_postlogistics_server_env/readme/CONTRIBUTORS.md b/delivery_postlogistics_server_env/readme/CONTRIBUTORS.md
new file mode 100644
index 0000000000..d2cddc9a97
--- /dev/null
+++ b/delivery_postlogistics_server_env/readme/CONTRIBUTORS.md
@@ -0,0 +1,7 @@
+- Thierry Ducrest \<<thierry.ducrest@camptocamp.com>\>
+
+- [Trobz](https://trobz.com):
+ - Jack Le \<<anlh@trobz.com>\>
+
+- [Heliconia Solutions Pvt. Ltd.](https://www.heliconia.io)
+ - Bhavesh Heliconia
diff --git a/delivery_postlogistics_server_env/readme/CREDITS.md b/delivery_postlogistics_server_env/readme/CREDITS.md
new file mode 100644
index 0000000000..44a6233517
--- /dev/null
+++ b/delivery_postlogistics_server_env/readme/CREDITS.md
@@ -0,0 +1,2 @@
+The migration of this module from 14.0 to 16.0 was financially supported
+by Camptocamp
diff --git a/delivery_postlogistics_server_env/readme/DESCRIPTION.md b/delivery_postlogistics_server_env/readme/DESCRIPTION.md
new file mode 100644
index 0000000000..b8ac8963e5
--- /dev/null
+++ b/delivery_postlogistics_server_env/readme/DESCRIPTION.md
@@ -0,0 +1 @@
+Adds OCA Server Environment features to Delivery Postlogistics.
diff --git a/delivery_postlogistics_server_env/static/description/icon.png b/delivery_postlogistics_server_env/static/description/icon.png
new file mode 100644
index 0000000000..3a0328b516
Binary files /dev/null and b/delivery_postlogistics_server_env/static/description/icon.png differ
diff --git a/delivery_postlogistics_server_env/static/description/index.html b/delivery_postlogistics_server_env/static/description/index.html
new file mode 100644
index 0000000000..0daa17f220
--- /dev/null
+++ b/delivery_postlogistics_server_env/static/description/index.html
@@ -0,0 +1,443 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
+<title>Delivery Postlogistics Server Environment</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+: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.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+ border: 0 }
+
+table.borderless td, table.borderless th {
+ /* Override padding for "table.docutils td" with "! important".
+ The right padding separates the table cells. */
+ padding: 0 0.5em 0 0 ! important }
+
+.first {
+ /* Override more specific margin styles with "! important". */
+ margin-top: 0 ! important }
+
+.last, .with-subtitle {
+ margin-bottom: 0 ! important }
+
+.hidden {
+ display: none }
+
+.subscript {
+ vertical-align: sub;
+ font-size: smaller }
+
+.superscript {
+ vertical-align: super;
+ font-size: smaller }
+
+a.toc-backref {
+ text-decoration: none ;
+ color: black }
+
+blockquote.epigraph {
+ margin: 2em 5em ; }
+
+dl.docutils dd {
+ margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+ overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+ font-weight: bold }
+*/
+
+div.abstract {
+ margin: 2em 5em }
+
+div.abstract p.topic-title {
+ font-weight: bold ;
+ text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+ margin: 2em ;
+ border: medium outset ;
+ padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+ font-weight: bold ;
+ font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+ color: red ;
+ font-weight: bold ;
+ font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+ compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+ margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+ margin-top: 0.5em }
+*/
+
+div.dedication {
+ margin: 2em 5em ;
+ text-align: center ;
+ font-style: italic }
+
+div.dedication p.topic-title {
+ font-weight: bold ;
+ font-style: normal }
+
+div.figure {
+ margin-left: 2em ;
+ margin-right: 2em }
+
+div.footer, div.header {
+ clear: both;
+ font-size: smaller }
+
+div.line-block {
+ display: block ;
+ margin-top: 1em ;
+ margin-bottom: 1em }
+
+div.line-block div.line-block {
+ margin-top: 0 ;
+ margin-bottom: 0 ;
+ margin-left: 1.5em }
+
+div.sidebar {
+ margin: 0 0 0.5em 1em ;
+ border: medium outset ;
+ padding: 1em ;
+ background-color: #ffffee ;
+ width: 40% ;
+ float: right ;
+ clear: right }
+
+div.sidebar p.rubric {
+ font-family: sans-serif ;
+ font-size: medium }
+
+div.system-messages {
+ margin: 5em }
+
+div.system-messages h1 {
+ color: red }
+
+div.system-message {
+ border: medium outset ;
+ padding: 1em }
+
+div.system-message p.system-message-title {
+ color: red ;
+ font-weight: bold }
+
+div.topic {
+ margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+ margin-top: 0.4em }
+
+h1.title {
+ text-align: center }
+
+h2.subtitle {
+ text-align: center }
+
+hr.docutils {
+ width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+ clear: left ;
+ float: left ;
+ margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+ clear: right ;
+ float: right ;
+ margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+table.align-center {
+ margin-left: auto;
+ margin-right: auto;
+}
+
+.align-left {
+ text-align: left }
+
+.align-center {
+ clear: both ;
+ text-align: center }
+
+.align-right {
+ text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+ text-align: inherit }
+
+/* div.align-center * { */
+/* text-align: left } */
+
+.align-top {
+ vertical-align: top }
+
+.align-middle {
+ vertical-align: middle }
+
+.align-bottom {
+ vertical-align: bottom }
+
+ol.simple, ul.simple {
+ margin-bottom: 1em }
+
+ol.arabic {
+ list-style: decimal }
+
+ol.loweralpha {
+ list-style: lower-alpha }
+
+ol.upperalpha {
+ list-style: upper-alpha }
+
+ol.lowerroman {
+ list-style: lower-roman }
+
+ol.upperroman {
+ list-style: upper-roman }
+
+p.attribution {
+ text-align: right ;
+ margin-left: 50% }
+
+p.caption {
+ font-style: italic }
+
+p.credits {
+ font-style: italic ;
+ font-size: smaller }
+
+p.label {
+ white-space: nowrap }
+
+p.rubric {
+ font-weight: bold ;
+ font-size: larger ;
+ color: maroon ;
+ text-align: center }
+
+p.sidebar-title {
+ font-family: sans-serif ;
+ font-weight: bold ;
+ font-size: larger }
+
+p.sidebar-subtitle {
+ font-family: sans-serif ;
+ font-weight: bold }
+
+p.topic-title {
+ font-weight: bold }
+
+pre.address {
+ margin-bottom: 0 ;
+ margin-top: 0 ;
+ font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+ margin-left: 2em ;
+ margin-right: 2em }
+
+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 }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+ font-family: sans-serif ;
+ font-style: oblique }
+
+span.classifier-delimiter {
+ font-family: sans-serif ;
+ font-weight: bold }
+
+span.interpreted {
+ font-family: sans-serif }
+
+span.option {
+ white-space: nowrap }
+
+span.pre {
+ white-space: pre }
+
+span.problematic, pre.problematic {
+ color: red }
+
+span.section-subtitle {
+ /* font-size relative to parent (h1..h6 element) */
+ font-size: 80% }
+
+table.citation {
+ border-left: solid 1px gray;
+ margin-left: 1px }
+
+table.docinfo {
+ margin: 2em 4em }
+
+table.docutils {
+ margin-top: 0.5em ;
+ margin-bottom: 0.5em }
+
+table.footnote {
+ border-left: solid 1px black;
+ margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+ padding-left: 0.5em ;
+ padding-right: 0.5em ;
+ vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+ font-weight: bold ;
+ text-align: left ;
+ white-space: nowrap ;
+ padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+ border: 0px;
+ border-top: 2px solid;
+ border-bottom: 2px solid;
+ border-collapse: collapse;
+}
+table.docutils.booktabs * {
+ border: 0px;
+}
+table.docutils.booktabs th {
+ border-bottom: thin solid;
+ text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+ font-size: 100% }
+
+ul.auto-toc {
+ list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="delivery-postlogistics-server-environment">
+<h1 class="title">Delivery Postlogistics Server Environment</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten. !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:be8b2949916065268a947cb93cea97b941db44695906958a3517b2621193d0c2
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.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_postlogistics_server_env"><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_postlogistics_server_env"><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&target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>Adds OCA Server Environment features to Delivery Postlogistics.</p>
+<div class="admonition important">
+<p class="first admonition-title">Important</p>
+<p class="last">This is an alpha version, the data model and design can change at any time without warning.
+Only for development or testing purpose, do not use in production.
+<a class="reference external" href="https://odoo-community.org/page/development-status">More details on development status</a></p>
+</div>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-4">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-5">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-6">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/delivery-carrier/issues">GitHub Issues</a>.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_postlogistics_server_env%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>Camptocamp</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
+<ul class="simple">
+<li>Thierry Ducrest <<a class="reference external" href="mailto:thierry.ducrest@camptocamp.com">thierry.ducrest@camptocamp.com</a>></li>
+<li><a class="reference external" href="https://trobz.com">Trobz</a>:<ul>
+<li>Jack Le <<a class="reference external" href="mailto:anlh@trobz.com">anlh@trobz.com</a>></li>
+</ul>
+</li>
+<li><a class="reference external" href="https://www.heliconia.io">Heliconia Solutions Pvt. Ltd.</a><ul>
+<li>Bhavesh Heliconia</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-5">Other credits</a></h2>
+<p>The migration of this module from 14.0 to 16.0 was financially supported
+by Camptocamp</p>
+</div>
+<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>
+<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>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/delivery-carrier/tree/18.0/delivery_postlogistics_server_env">OCA/delivery-carrier</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/delivery_postlogistics_server_env/tests/__init__.py b/delivery_postlogistics_server_env/tests/__init__.py
new file mode 100644
index 0000000000..816e2cf122
--- /dev/null
+++ b/delivery_postlogistics_server_env/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_delivery_postlogistics_server_env
diff --git a/delivery_postlogistics_server_env/tests/test_delivery_postlogistics_server_env.py b/delivery_postlogistics_server_env/tests/test_delivery_postlogistics_server_env.py
new file mode 100644
index 0000000000..5ab5e9da7f
--- /dev/null
+++ b/delivery_postlogistics_server_env/tests/test_delivery_postlogistics_server_env.py
@@ -0,0 +1,41 @@
+# Copyright 2021 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo.tests import TransactionCase
+
+
+class TestDeliveryCarrier(TransactionCase):
+ @classmethod
+ def setUpClass(cls):
+ super().setUpClass()
+
+ # Create a delivery product
+ cls.delivery_product = cls.env["product.product"].create(
+ {
+ "name": "Test Delivery Product",
+ "type": "service",
+ }
+ )
+
+ # Create the delivery carrier with the required product_id
+ cls.carrier = cls.env["delivery.carrier"].create(
+ {
+ "name": "Test Carrier",
+ "product_id": cls.delivery_product.id, # Ensure product_id is set
+ "delivery_type": "fixed",
+ }
+ )
+
+ def test_server_env_fields(self):
+ expected_fields = {"postlogistics_client_id", "postlogistics_client_secret"}
+ carrier_fields = self.carrier._server_env_fields
+
+ for field in expected_fields:
+ self.assertIn(
+ field, carrier_fields, f"Field {field} is missing in _server_env_fields"
+ )
+
+ self.assertTrue(
+ isinstance(carrier_fields, dict),
+ "_server_env_fields should return a dictionary",
+ )
diff --git a/stock_picking_delivery_link/README.rst b/stock_picking_delivery_link/README.rst
index 16d317c727..8612fd3915 100644
--- a/stock_picking_delivery_link/README.rst
+++ b/stock_picking_delivery_link/README.rst
@@ -28,8 +28,9 @@ Stock Picking Delivery Link
|badge1| |badge2| |badge3| |badge4| |badge5|
-This module adds a link to the delivery (and its carrier) on all intermediate
-operations (from a pick or a pack in a pick/pack/ship setup for instance).
+This module adds a link to the delivery (and its carrier) on all
+intermediate operations (from a pick or a pack in a pick/pack/ship setup
+for instance).
**Table of contents**
@@ -50,19 +51,19 @@ Credits
=======
Authors
-~~~~~~~
+-------
* Camptocamp
Contributors
-~~~~~~~~~~~~
+------------
-* Sébastien Alix <sebastien.alix@camptocamp.com>
-* Fernando La Chica - GreenIce <fernandolachica@gmail.com>
-* Hughes Damry <hughes.damry@acsone.eu>
+- Sébastien Alix <sebastien.alix@camptocamp.com>
+- Fernando La Chica - GreenIce <fernandolachica@gmail.com>
+- Hughes Damry <hughes.damry@acsone.eu>
Maintainers
-~~~~~~~~~~~
+-----------
This module is maintained by the OCA.
diff --git a/stock_picking_delivery_link/readme/CONTRIBUTORS.md b/stock_picking_delivery_link/readme/CONTRIBUTORS.md
new file mode 100644
index 0000000000..7377222787
--- /dev/null
+++ b/stock_picking_delivery_link/readme/CONTRIBUTORS.md
@@ -0,0 +1,3 @@
+- Sébastien Alix \<<sebastien.alix@camptocamp.com>\>
+- Fernando La Chica - GreenIce \<<fernandolachica@gmail.com>\>
+- Hughes Damry \<<hughes.damry@acsone.eu>\>
diff --git a/stock_picking_delivery_link/readme/CONTRIBUTORS.rst b/stock_picking_delivery_link/readme/CONTRIBUTORS.rst
deleted file mode 100644
index baeded9586..0000000000
--- a/stock_picking_delivery_link/readme/CONTRIBUTORS.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-* Sébastien Alix <sebastien.alix@camptocamp.com>
-* Fernando La Chica - GreenIce <fernandolachica@gmail.com>
-* Hughes Damry <hughes.damry@acsone.eu>
diff --git a/stock_picking_delivery_link/readme/DESCRIPTION.md b/stock_picking_delivery_link/readme/DESCRIPTION.md
new file mode 100644
index 0000000000..f50bd34439
--- /dev/null
+++ b/stock_picking_delivery_link/readme/DESCRIPTION.md
@@ -0,0 +1,3 @@
+This module adds a link to the delivery (and its carrier) on all
+intermediate operations (from a pick or a pack in a pick/pack/ship setup
+for instance).
diff --git a/stock_picking_delivery_link/readme/DESCRIPTION.rst b/stock_picking_delivery_link/readme/DESCRIPTION.rst
deleted file mode 100644
index af4845027b..0000000000
--- a/stock_picking_delivery_link/readme/DESCRIPTION.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-This module adds a link to the delivery (and its carrier) on all intermediate
-operations (from a pick or a pack in a pick/pack/ship setup for instance).
diff --git a/stock_picking_delivery_link/static/description/index.html b/stock_picking_delivery_link/static/description/index.html
index cbf696c0e6..ea62d56ff9 100644
--- a/stock_picking_delivery_link/static/description/index.html
+++ b/stock_picking_delivery_link/static/description/index.html
@@ -370,8 +370,9 @@ <h1 class="title">Stock Picking Delivery Link</h1>
!! source digest: sha256:a456d45b58816c1eb3a146c98ab72cfd5fa1cc68042bfc9972e66d9d3a4667a9
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/stock_picking_delivery_link"><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-stock_picking_delivery_link"><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&target_branch=18.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 link to the delivery (and its carrier) on all intermediate
-operations (from a pick or a pack in a pick/pack/ship setup for instance).</p>
+<p>This module adds a link to the delivery (and its carrier) on all
+intermediate operations (from a pick or a pack in a pick/pack/ship setup
+for instance).</p>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
diff --git a/test-requirements.txt b/test-requirements.txt
index 4ad8e0ecea..624eb28d22 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1 +1,2 @@
-odoo-test-helper
+odoo-addon-delivery_postlogistics @ git+https://github.com/OCA/delivery-carrier.git@refs/pull/974/head#subdirectory=delivery_postlogistics
+odoo-addon-delivery_carrier_package_info @ git+https://github.com/OCA/delivery-carrier.git@refs/pull/983/head#subdirectory=delivery_carrier_package_info