diff --git a/delivery_carrier_agency/README.rst b/delivery_carrier_agency/README.rst
new file mode 100644
index 0000000000..6e07771f61
--- /dev/null
+++ b/delivery_carrier_agency/README.rst
@@ -0,0 +1,83 @@
+=======================
+Delivery Carrier Agency
+=======================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:155c94c31233b8200c26d782174022e62c7ce0e6a10cd43d629f7a2d1e9cb307
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |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/17.0/delivery_carrier_agency
+    :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-17-0/delivery-carrier-17-0-delivery_carrier_agency
+    :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=17.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+Add carrier agency concept A delivery carrier may have one or mutliple
+agencies. The module does not add any logic around these agencies, it
+will be done in dedicated carrier modules if necessary. For instance,
+when generating label, sometimes, some information may depend on the
+agency that will receive the package, which may depend on the warehouse
+
+**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_carrier_agency%0Aversion:%2017.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
+-------
+
+* Akretion
+
+Contributors
+------------
+
+- Florian da Costa <florian.dacosta@akretion.com>
+- `Heliconia Solutions Pvt. Ltd. <https://www.heliconia.io>`__
+
+  - Bhavesh Heliconia
+
+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/17.0/delivery_carrier_agency>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/delivery_carrier_agency/__init__.py b/delivery_carrier_agency/__init__.py
new file mode 100644
index 0000000000..0650744f6b
--- /dev/null
+++ b/delivery_carrier_agency/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/delivery_carrier_agency/__manifest__.py b/delivery_carrier_agency/__manifest__.py
new file mode 100644
index 0000000000..038855d477
--- /dev/null
+++ b/delivery_carrier_agency/__manifest__.py
@@ -0,0 +1,23 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+
+{
+    "name": "Delivery Carrier Agency",
+    "summary": "Add a model for Carrier Agencies",
+    "version": "17.0.1.0.0",
+    "category": "Delivery",
+    "website": "https://github.com/OCA/delivery-carrier",
+    "author": "Akretion,Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "application": False,
+    "installable": True,
+    "depends": [
+        "stock_delivery",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "views/delivery_carrier_agency_view.xml",
+    ],
+    "demo": [],
+    "qweb": [],
+}
diff --git a/delivery_carrier_agency/i18n/delivery_carrier_agency.pot b/delivery_carrier_agency/i18n/delivery_carrier_agency.pot
new file mode 100644
index 0000000000..f66cd6d9a1
--- /dev/null
+++ b/delivery_carrier_agency/i18n/delivery_carrier_agency.pot
@@ -0,0 +1,109 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* delivery_carrier_agency
+#
+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_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__partner_id
+msgid "Address"
+msgstr ""
+
+#. module: delivery_carrier_agency
+#: model:ir.actions.act_window,name:delivery_carrier_agency.action_carrier_agency
+#: model:ir.model,name:delivery_carrier_agency.model_delivery_carrier_agency
+#: model:ir.ui.menu,name:delivery_carrier_agency.carrier_agency_menu
+msgid "Carrier Agency"
+msgstr ""
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__carrier_ids
+msgid "Carriers"
+msgstr ""
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__delivery_type
+msgid "Delivery Type"
+msgstr ""
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__external_reference
+msgid "External Reference"
+msgstr ""
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__id
+msgid "ID"
+msgstr ""
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__name
+msgid "Name"
+msgstr ""
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,help:delivery_carrier_agency.field_delivery_carrier_agency__external_reference
+msgid "Reference or code supplied by the carrier"
+msgstr ""
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,help:delivery_carrier_agency.field_delivery_carrier_agency__carrier_ids
+msgid ""
+"This field may be used to link an account to specific delivery methods It "
+"may be usefull to find an account with more precision than with only the "
+"delivery type"
+msgstr ""
+
+#. module: delivery_carrier_agency
+#: model:ir.model,name:delivery_carrier_agency.model_stock_picking
+msgid "Transfer"
+msgstr ""
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__warehouse_ids
+msgid "Warehouses"
+msgstr ""
diff --git a/delivery_carrier_agency/i18n/es.po b/delivery_carrier_agency/i18n/es.po
new file mode 100644
index 0000000000..0679bf4392
--- /dev/null
+++ b/delivery_carrier_agency/i18n/es.po
@@ -0,0 +1,115 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* delivery_carrier_agency
+#
+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_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__partner_id
+msgid "Address"
+msgstr "Dirección"
+
+#. module: delivery_carrier_agency
+#: model:ir.actions.act_window,name:delivery_carrier_agency.action_carrier_agency
+#: model:ir.model,name:delivery_carrier_agency.model_delivery_carrier_agency
+#: model:ir.ui.menu,name:delivery_carrier_agency.carrier_agency_menu
+msgid "Carrier Agency"
+msgstr "Agencia de transportes"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__carrier_ids
+msgid "Carriers"
+msgstr "Transportistas"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__create_uid
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__create_date
+msgid "Created on"
+msgstr "Creado el"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__delivery_type
+msgid "Delivery Type"
+msgstr "Tipo de entrega"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__display_name
+msgid "Display Name"
+msgstr "Mostrar Nombre"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__external_reference
+msgid "External Reference"
+msgstr "Referencia Externa"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__id
+msgid "ID"
+msgstr "ID (identificación)"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency____last_update
+msgid "Last Modified on"
+msgstr "Última Modificación el"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__write_uid
+msgid "Last Updated by"
+msgstr "Actualizado por última vez por"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__write_date
+msgid "Last Updated on"
+msgstr "Actualizado por última vez el"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__name
+msgid "Name"
+msgstr "Nombre"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,help:delivery_carrier_agency.field_delivery_carrier_agency__external_reference
+msgid "Reference or code supplied by the carrier"
+msgstr "Referencia o código facilitado por el transportista"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__sequence
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,help:delivery_carrier_agency.field_delivery_carrier_agency__carrier_ids
+msgid ""
+"This field may be used to link an account to specific delivery methods It "
+"may be usefull to find an account with more precision than with only the "
+"delivery type"
+msgstr ""
+"Este campo puede utilizarse para vincular una cuenta a métodos de entrega "
+"específicos Puede ser útil para encontrar una cuenta con más precisión que "
+"con sólo el tipo de entrega"
+
+#. module: delivery_carrier_agency
+#: model:ir.model,name:delivery_carrier_agency.model_stock_picking
+msgid "Transfer"
+msgstr "Transferencia"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__warehouse_ids
+msgid "Warehouses"
+msgstr "Almacenes"
diff --git a/delivery_carrier_agency/i18n/it.po b/delivery_carrier_agency/i18n/it.po
new file mode 100644
index 0000000000..35154cc0a6
--- /dev/null
+++ b/delivery_carrier_agency/i18n/it.po
@@ -0,0 +1,115 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* delivery_carrier_agency
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2024-08-21 16:06+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 5.6.2\n"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__partner_id
+msgid "Address"
+msgstr "Indirizzo"
+
+#. module: delivery_carrier_agency
+#: model:ir.actions.act_window,name:delivery_carrier_agency.action_carrier_agency
+#: model:ir.model,name:delivery_carrier_agency.model_delivery_carrier_agency
+#: model:ir.ui.menu,name:delivery_carrier_agency.carrier_agency_menu
+msgid "Carrier Agency"
+msgstr "Agenzia corriere"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__carrier_ids
+msgid "Carriers"
+msgstr "Corrieri"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__create_uid
+msgid "Created by"
+msgstr "Creato da"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__create_date
+msgid "Created on"
+msgstr "Creato il"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__delivery_type
+msgid "Delivery Type"
+msgstr "Tipo consegna"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__display_name
+msgid "Display Name"
+msgstr "Nome visualizzato"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__external_reference
+msgid "External Reference"
+msgstr "Riferimento esterno"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__id
+msgid "ID"
+msgstr "ID"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency____last_update
+msgid "Last Modified on"
+msgstr "Ultima modifica il"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__write_uid
+msgid "Last Updated by"
+msgstr "Ultimo aggiornamento di"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__write_date
+msgid "Last Updated on"
+msgstr "Ultimo aggiornamento il"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__name
+msgid "Name"
+msgstr "Nome"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,help:delivery_carrier_agency.field_delivery_carrier_agency__external_reference
+msgid "Reference or code supplied by the carrier"
+msgstr "Riferimento o codice fornito dal corriere"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__sequence
+msgid "Sequence"
+msgstr "Sequenza"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,help:delivery_carrier_agency.field_delivery_carrier_agency__carrier_ids
+msgid ""
+"This field may be used to link an account to specific delivery methods It "
+"may be usefull to find an account with more precision than with only the "
+"delivery type"
+msgstr ""
+"Questo campo può essere utilizzato per collegare un conto a metodi di "
+"consegna specifici. Può essere utile per trovare un conto con più precisione "
+"che con il solo tipo di consegna"
+
+#. module: delivery_carrier_agency
+#: model:ir.model,name:delivery_carrier_agency.model_stock_picking
+msgid "Transfer"
+msgstr "Trasferimento"
+
+#. module: delivery_carrier_agency
+#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__warehouse_ids
+msgid "Warehouses"
+msgstr "Magazzini"
diff --git a/delivery_carrier_agency/models/__init__.py b/delivery_carrier_agency/models/__init__.py
new file mode 100644
index 0000000000..792558576a
--- /dev/null
+++ b/delivery_carrier_agency/models/__init__.py
@@ -0,0 +1,2 @@
+from . import delivery_carrier_agency
+from . import stock_picking
diff --git a/delivery_carrier_agency/models/delivery_carrier_agency.py b/delivery_carrier_agency/models/delivery_carrier_agency.py
new file mode 100644
index 0000000000..2e5c25d6b9
--- /dev/null
+++ b/delivery_carrier_agency/models/delivery_carrier_agency.py
@@ -0,0 +1,33 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class DeliveryCarrierAgency(models.Model):
+    _name = "delivery.carrier.agency"
+    _description = "Carrier Agency"
+    _order = "sequence, id"
+
+    name = fields.Char(required=True)
+    external_reference = fields.Char(help="Reference or code supplied by the carrier")
+    delivery_type = fields.Selection(
+        selection=lambda self: self.env["delivery.carrier"]
+        ._fields["delivery_type"]
+        .selection,
+        required=True,
+    )
+    carrier_ids = fields.Many2many(
+        "delivery.carrier",
+        "delivery_carrier_agency_rel",
+        "agency_id",
+        "carrier_id",
+        string="Carriers",
+        help=(
+            "This field may be used to link an account to specific delivery methods"
+            " It may be usefull to find an account with more precision than with "
+            "only the delivery type"
+        ),
+    )
+    partner_id = fields.Many2one("res.partner", string="Address")
+    warehouse_ids = fields.Many2many("stock.warehouse", string="Warehouses")
+    sequence = fields.Integer()
diff --git a/delivery_carrier_agency/models/stock_picking.py b/delivery_carrier_agency/models/stock_picking.py
new file mode 100644
index 0000000000..0ac7d58290
--- /dev/null
+++ b/delivery_carrier_agency/models/stock_picking.py
@@ -0,0 +1,25 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class StockPicking(models.Model):
+    _inherit = "stock.picking"
+
+    def _get_domain_agency(self):
+        self.ensure_one()
+        wh = self.location_id.warehouse_id
+        return [
+            ("delivery_type", "=", self.carrier_id.delivery_type),
+            "|",
+            ("warehouse_ids", "=", False),
+            ("warehouse_ids", "in", wh.ids),
+            "|",
+            ("carrier_ids", "in", [self.carrier_id.id]),
+            ("carrier_ids", "=", False),
+        ]
+
+    def _get_carrier_agency(self):
+        self.ensure_one()
+        domain = self._get_domain_agency()
+        return self.env["delivery.carrier.agency"].search(domain, limit=1)
diff --git a/delivery_carrier_agency/pyproject.toml b/delivery_carrier_agency/pyproject.toml
new file mode 100644
index 0000000000..4231d0cccb
--- /dev/null
+++ b/delivery_carrier_agency/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/delivery_carrier_agency/readme/CONTRIBUTORS.md b/delivery_carrier_agency/readme/CONTRIBUTORS.md
new file mode 100644
index 0000000000..fea5238215
--- /dev/null
+++ b/delivery_carrier_agency/readme/CONTRIBUTORS.md
@@ -0,0 +1,3 @@
+- Florian da Costa \<<florian.dacosta@akretion.com>\>
+- [Heliconia Solutions Pvt. Ltd.](https://www.heliconia.io)
+  - Bhavesh Heliconia
diff --git a/delivery_carrier_agency/readme/DESCRIPTION.md b/delivery_carrier_agency/readme/DESCRIPTION.md
new file mode 100644
index 0000000000..2766df4e27
--- /dev/null
+++ b/delivery_carrier_agency/readme/DESCRIPTION.md
@@ -0,0 +1,5 @@
+Add carrier agency concept A delivery carrier may have one or mutliple
+agencies. The module does not add any logic around these agencies, it
+will be done in dedicated carrier modules if necessary. For instance,
+when generating label, sometimes, some information may depend on the
+agency that will receive the package, which may depend on the warehouse
diff --git a/delivery_carrier_agency/security/ir.model.access.csv b/delivery_carrier_agency/security/ir.model.access.csv
new file mode 100644
index 0000000000..c7a477a71c
--- /dev/null
+++ b/delivery_carrier_agency/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_delivery_carrier_agency_wh_user,delivery.carrier.agency.wh.user,model_delivery_carrier_agency,stock.group_stock_user,1,0,0,0
+access_delivery_carrier_agency_wh_manager,delivery.carrier.agency.wh.manager,model_delivery_carrier_agency,stock.group_stock_manager,1,1,1,1
diff --git a/delivery_carrier_agency/static/description/icon.png b/delivery_carrier_agency/static/description/icon.png
new file mode 100644
index 0000000000..3a0328b516
Binary files /dev/null and b/delivery_carrier_agency/static/description/icon.png differ
diff --git a/delivery_carrier_agency/static/description/index.html b/delivery_carrier_agency/static/description/index.html
new file mode 100644
index 0000000000..7ff4895b04
--- /dev/null
+++ b/delivery_carrier_agency/static/description/index.html
@@ -0,0 +1,431 @@
+<!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 Carrier Agency</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-carrier-agency">
+<h1 class="title">Delivery Carrier Agency</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:155c94c31233b8200c26d782174022e62c7ce0e6a10cd43d629f7a2d1e9cb307
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<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_agency"><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_agency"><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>Add carrier agency concept A delivery carrier may have one or mutliple
+agencies. The module does not add any logic around these agencies, it
+will be done in dedicated carrier modules if necessary. For instance,
+when generating label, sometimes, some information may depend on the
+agency that will receive the package, which may depend on the warehouse</p>
+<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="#maintainers" id="toc-entry-5">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_carrier_agency%0Aversion:%2017.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>Akretion</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
+<ul class="simple">
+<li>Florian da Costa &lt;<a class="reference external" href="mailto:florian.dacosta&#64;akretion.com">florian.dacosta&#64;akretion.com</a>&gt;</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="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">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/17.0/delivery_carrier_agency">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_carrier_agency/tests/__init__.py b/delivery_carrier_agency/tests/__init__.py
new file mode 100644
index 0000000000..1f4362b716
--- /dev/null
+++ b/delivery_carrier_agency/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_carrier_agency
diff --git a/delivery_carrier_agency/tests/test_carrier_agency.py b/delivery_carrier_agency/tests/test_carrier_agency.py
new file mode 100644
index 0000000000..4a8717159c
--- /dev/null
+++ b/delivery_carrier_agency/tests/test_carrier_agency.py
@@ -0,0 +1,43 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo.addons.base.tests.common import BaseCommon
+
+
+class TestCarrierAgency(BaseCommon):
+    def test_get_carrier_agency(self):
+        """Test finding the correct account for a picking"""
+        chicago_wh = self.env.ref("stock.stock_warehouse_shop0")
+        san_fransico_wh = self.env.ref("stock.warehouse0")
+        agency_chicago = self.env["delivery.carrier.agency"].create(
+            {
+                "name": "Normal Carrier Chicago agency",
+                "delivery_type": "base_on_rule",
+                "warehouse_ids": [(6, 0, chicago_wh.ids)],
+            }
+        )
+        agency_san_fransisco = self.env["delivery.carrier.agency"].create(
+            {
+                "name": "Normal Carrier San Fransisco agency",
+                "delivery_type": "base_on_rule",
+                "warehouse_ids": [(6, 0, san_fransico_wh.ids)],
+            }
+        )
+        san_fransisco_picking = self.env["stock.picking"].new(
+            dict(
+                carrier_id=self.env.ref("delivery.delivery_carrier").id,
+                company_id=self.env.user.company_id.id,
+                location_id=san_fransico_wh.lot_stock_id.id,
+            )
+        )
+        agency = san_fransisco_picking._get_carrier_agency()
+        self.assertEqual(agency, agency_san_fransisco)
+
+        chicago_picking = self.env["stock.picking"].new(
+            dict(
+                carrier_id=self.env.ref("delivery.delivery_carrier").id,
+                company_id=self.env.user.company_id.id,
+                location_id=chicago_wh.lot_stock_id.id,
+            )
+        )
+        agency = chicago_picking._get_carrier_agency()
+        self.assertEqual(agency, agency_chicago)
diff --git a/delivery_carrier_agency/views/delivery_carrier_agency_view.xml b/delivery_carrier_agency/views/delivery_carrier_agency_view.xml
new file mode 100644
index 0000000000..70a4075d1e
--- /dev/null
+++ b/delivery_carrier_agency/views/delivery_carrier_agency_view.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="carrier_agency_view_tree" model="ir.ui.view">
+        <field name="model">delivery.carrier.agency</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="sequence" widget="handle" optional="show" />
+                <field name="name" />
+                <field name="external_reference" />
+                <field name="partner_id" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_delivery_carrier_agency_form" model="ir.ui.view">
+        <field name="name">delivery_base.delivery.carrier.agency.form</field>
+        <field name="model">delivery.carrier.agency</field>
+        <field name="arch" type="xml">
+            <form class="oe_form_nomargin o_note_form_view">
+                <sheet>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="name" />
+                        </h1>
+                    </div>
+                    <group>
+                        <field name="external_reference" />
+                        <field name="partner_id" />
+                        <field name="delivery_type" />
+                        <field
+                            name="carrier_ids"
+                            widget="many2many_tags"
+                            invisible="not delivery_type"
+                            domain="[('delivery_type', '=', delivery_type)]"
+                        />
+                        <field name="warehouse_ids" widget="many2many_tags" />
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_carrier_agency" model="ir.actions.act_window">
+        <field name="name">Carrier Agency</field>
+        <field name="res_model">delivery.carrier.agency</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <menuitem
+        id="carrier_agency_menu"
+        parent="stock.menu_delivery"
+        sequence="10"
+        action="action_carrier_agency"
+    />
+
+</odoo>