diff --git a/setup/shipment_advice_cash_on_delivery/odoo/addons/shipment_advice_cash_on_delivery b/setup/shipment_advice_cash_on_delivery/odoo/addons/shipment_advice_cash_on_delivery
new file mode 120000
index 00000000..74408cf6
--- /dev/null
+++ b/setup/shipment_advice_cash_on_delivery/odoo/addons/shipment_advice_cash_on_delivery
@@ -0,0 +1 @@
+../../../../shipment_advice_cash_on_delivery
\ No newline at end of file
diff --git a/setup/shipment_advice_cash_on_delivery/setup.py b/setup/shipment_advice_cash_on_delivery/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/shipment_advice_cash_on_delivery/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/shipment_advice/README.rst b/shipment_advice/README.rst
index ba716da9..bc5fce3d 100644
--- a/shipment_advice/README.rst
+++ b/shipment_advice/README.rst
@@ -61,7 +61,8 @@ Contributors
 * Simone Orsi <simahawk@gmail.com>
 * `Trobz <https://trobz.com>`_:
   * Dung Tran <dungtd@trobz.com>
-
+  * Tuan Tran <anhtuan@trobz.com>
+  * Tri Doan <tridm@trobz.com>
 Design
 ~~~~~~
 
diff --git a/shipment_advice/__manifest__.py b/shipment_advice/__manifest__.py
index 7d94b631..ec561187 100644
--- a/shipment_advice/__manifest__.py
+++ b/shipment_advice/__manifest__.py
@@ -21,6 +21,7 @@
         "data/ir_sequence.xml",
         "data/queue_job_channel.xml",
         "data/queue_job_function.xml",
+        "report/reports.xml",
         "views/res_config_settings.xml",
         "views/shipment_advice.xml",
         "views/stock_picking.xml",
diff --git a/shipment_advice/models/shipment_advice.py b/shipment_advice/models/shipment_advice.py
index 0dd792a5..05666911 100644
--- a/shipment_advice/models/shipment_advice.py
+++ b/shipment_advice/models/shipment_advice.py
@@ -528,3 +528,11 @@ def button_open_receptions_in_progress(self):
         action["views"][tree_view_index] = (view_tree.id, "tree")
         action["domain"] = [("id", "in", self.planned_picking_ids.ids)]
         return action
+
+    def print_all_deliveryslip(self):
+        pickings = self.mapped("loaded_picking_ids").filtered(
+            lambda p: p.picking_type_code == "outgoing" and p.state != "cancel"
+        )
+        if pickings:
+            return self.env.ref("stock.action_report_delivery").report_action(pickings)
+        return {}
diff --git a/shipment_advice/readme/CONTRIBUTORS.rst b/shipment_advice/readme/CONTRIBUTORS.rst
index 09f87c8c..a504ee7f 100644
--- a/shipment_advice/readme/CONTRIBUTORS.rst
+++ b/shipment_advice/readme/CONTRIBUTORS.rst
@@ -3,7 +3,8 @@
 * Simone Orsi <simahawk@gmail.com>
 * `Trobz <https://trobz.com>`_:
   * Dung Tran <dungtd@trobz.com>
-
+  * Tuan Tran <anhtuan@trobz.com>
+  * Tri Doan <tridm@trobz.com>
 Design
 ~~~~~~
 
diff --git a/shipment_advice/tests/test_shipment_advice.py b/shipment_advice/tests/test_shipment_advice.py
index 01791f45..f7eb16d2 100644
--- a/shipment_advice/tests/test_shipment_advice.py
+++ b/shipment_advice/tests/test_shipment_advice.py
@@ -93,6 +93,17 @@ def test_shipment_advice_done_full(self):
             )
         )
         self.assertEqual(picking.state, "done")
+        # Print deliveryslip
+        action = self.shipment_advice_out.with_context(
+            discard_logo_check=True
+        ).print_all_deliveryslip()
+        self.assertEqual(action.get("type"), "ir.actions.report")
+        self.assertEqual(action.get("report_name"), "stock.report_deliveryslip")
+        self.assertEqual(action.get("report_type"), "qweb-pdf")
+        self.assertEqual(
+            action.get("context").get("active_ids"),
+            picking.ids,
+        )
 
     def test_shipment_advice_done_backorder_policy_disabled(self):
         """Validating a shipment with no backorder policy should let partial
diff --git a/shipment_advice/views/shipment_advice.xml b/shipment_advice/views/shipment_advice.xml
index 0f1a0683..6a4d10ea 100644
--- a/shipment_advice/views/shipment_advice.xml
+++ b/shipment_advice/views/shipment_advice.xml
@@ -60,6 +60,20 @@
                         class="btn-secondary"
                         states="cancel"
                     />
+                    <button
+                        name="%(action_report_shipment_advice)d"
+                        type="action"
+                        string="Print Shipment Advice"
+                        class="btn-secondary"
+                        states="in_progress,done"
+                    />
+                    <button
+                        name="print_all_deliveryslip"
+                        type="object"
+                        string="Print Delivery Slip"
+                        class="btn-secondary"
+                        states="in_progress,done"
+                    />
                     <field
                         name="state"
                         widget="statusbar"
@@ -364,4 +378,13 @@
         parent="stock.menu_stock_warehouse_mgmt"
         action="shipment_advice_action"
     />
+    <!-- Shipment Advice - Print Delivery Slip -->
+    <record id="action_print_batch_delivery_slip" model="ir.actions.server">
+        <field name="name">Print Delivery Slip</field>
+        <field name="model_id" ref="shipment_advice.model_shipment_advice" />
+        <field name="binding_model_id" ref="shipment_advice.model_shipment_advice" />
+        <field name="state">code</field>
+        <field name="code">action = records.print_all_deliveryslip()
+        </field>
+    </record>
 </odoo>
diff --git a/shipment_advice_cash_on_delivery/README.rst b/shipment_advice_cash_on_delivery/README.rst
new file mode 100644
index 00000000..d1088f35
--- /dev/null
+++ b/shipment_advice_cash_on_delivery/README.rst
@@ -0,0 +1,85 @@
+================================
+Shipment Advice Cash on Delivery
+================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:c84344ebd4687e9ba6c09fda8cc3c7fa7f29dffa453ddc4b37a4f589a0a29d1e
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |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%2Fstock--logistics--transport-lightgray.png?logo=github
+    :target: https://github.com/OCA/stock-logistics-transport/tree/16.0/shipment_advice_cash_on_delivery
+    :alt: OCA/stock-logistics-transport
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/stock-logistics-transport-16-0/stock-logistics-transport-16-0-shipment_advice_cash_on_delivery
+    :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/stock-logistics-transport&target_branch=16.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+Allows users to print cash on delivery invoices from a shipment advice
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+Nothing to do
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/stock-logistics-transport/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/stock-logistics-transport/issues/new?body=module:%20shipment_advice_cash_on_delivery%0Aversion:%2016.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
+~~~~~~~
+
+* BCIM
+* ACSONE SA/NV
+* Camptocamp
+
+Contributors
+~~~~~~~~~~~~
+
+* Jacques-Etienne Baudoux <je@bcim.be>
+* Souheil Bejaoui <souheil.bejaoui@acsone.eu>
+* Tuan Tran <anhtuan@trobz.com>
+
+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/stock-logistics-transport <https://github.com/OCA/stock-logistics-transport/tree/16.0/shipment_advice_cash_on_delivery>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/shipment_advice_cash_on_delivery/__init__.py b/shipment_advice_cash_on_delivery/__init__.py
new file mode 100644
index 00000000..0650744f
--- /dev/null
+++ b/shipment_advice_cash_on_delivery/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/shipment_advice_cash_on_delivery/__manifest__.py b/shipment_advice_cash_on_delivery/__manifest__.py
new file mode 100644
index 00000000..3682b6fe
--- /dev/null
+++ b/shipment_advice_cash_on_delivery/__manifest__.py
@@ -0,0 +1,18 @@
+# Copyright 2018 Jacques-Etienne Baudoux (BCIM) <je@bcim.be>
+# Copyright 2023 ACSONE SA/NV
+# Copyright 2024 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Shipment Advice Cash on Delivery",
+    "summary": """This module allows users to print cash on delivery invoices
+    from a shipment advice""",
+    "version": "16.0.1.0.0",
+    "license": "AGPL-3",
+    "author": "BCIM, ACSONE SA/NV, Camptocamp, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/stock-logistics-transport",
+    "depends": ["shipment_advice", "partner_invoicing_mode_cash_on_delivery"],
+    "data": [
+        "views/shipment_advice.xml",
+    ],
+}
diff --git a/shipment_advice_cash_on_delivery/models/__init__.py b/shipment_advice_cash_on_delivery/models/__init__.py
new file mode 100644
index 00000000..8d483a25
--- /dev/null
+++ b/shipment_advice_cash_on_delivery/models/__init__.py
@@ -0,0 +1 @@
+from . import shipment_advice
diff --git a/shipment_advice_cash_on_delivery/models/shipment_advice.py b/shipment_advice_cash_on_delivery/models/shipment_advice.py
new file mode 100644
index 00000000..95ad40e1
--- /dev/null
+++ b/shipment_advice_cash_on_delivery/models/shipment_advice.py
@@ -0,0 +1,20 @@
+# Copyright 2018 Jacques-Etienne Baudoux (BCIM) <je@bcim.be>
+# Copyright 2023 ACSONE SA/NV
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import models
+
+
+class ShipmentAdvice(models.Model):
+    _inherit = "shipment.advice"
+
+    def print_cash_on_delivery_invoices(self):
+        done_shipment_advices = self.filtered(lambda s: s.state == "done")
+        cod_invoices = done_shipment_advices.mapped("loaded_picking_ids").mapped(
+            "cash_on_delivery_invoice_ids"
+        )
+        if cod_invoices:
+            return self.env.ref(
+                "account.account_invoices_without_payment"
+            ).report_action(cod_invoices)
+        return {}
diff --git a/shipment_advice_cash_on_delivery/readme/CONFIGURE.rst b/shipment_advice_cash_on_delivery/readme/CONFIGURE.rst
new file mode 100644
index 00000000..b1534b16
--- /dev/null
+++ b/shipment_advice_cash_on_delivery/readme/CONFIGURE.rst
@@ -0,0 +1 @@
+Nothing to do
diff --git a/shipment_advice_cash_on_delivery/readme/CONTRIBUTORS.rst b/shipment_advice_cash_on_delivery/readme/CONTRIBUTORS.rst
new file mode 100644
index 00000000..bc6a98d5
--- /dev/null
+++ b/shipment_advice_cash_on_delivery/readme/CONTRIBUTORS.rst
@@ -0,0 +1,4 @@
+* Jacques-Etienne Baudoux <je@bcim.be>
+* Souheil Bejaoui <souheil.bejaoui@acsone.eu>
+* Tuan Tran <anhtuan@trobz.com>
+* Tri Doan <tridm@trobz.com>
diff --git a/shipment_advice_cash_on_delivery/readme/DESCRIPTION.rst b/shipment_advice_cash_on_delivery/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..2db93d89
--- /dev/null
+++ b/shipment_advice_cash_on_delivery/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+Allows users to print cash on delivery invoices from a shipment advice
diff --git a/shipment_advice_cash_on_delivery/static/description/index.html b/shipment_advice_cash_on_delivery/static/description/index.html
new file mode 100644
index 00000000..e3c92f66
--- /dev/null
+++ b/shipment_advice_cash_on_delivery/static/description/index.html
@@ -0,0 +1,430 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!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>Shipment Advice Cash on Delivery</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+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: grey; } /* 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 {
+  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="shipment-advice-cash-on-delivery">
+<h1 class="title">Shipment Advice Cash on Delivery</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:c84344ebd4687e9ba6c09fda8cc3c7fa7f29dffa453ddc4b37a4f589a0a29d1e
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<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/stock-logistics-transport/tree/16.0/shipment_advice_cash_on_delivery"><img alt="OCA/stock-logistics-transport" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--transport-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/stock-logistics-transport-16-0/stock-logistics-transport-16-0-shipment_advice_cash_on_delivery"><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/stock-logistics-transport&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>Allows users to print cash on delivery invoices from a shipment advice</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#configuration" id="toc-entry-1">Configuration</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-2">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-3">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-4">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-5">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-6">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
+<p>Nothing to do</p>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/stock-logistics-transport/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/stock-logistics-transport/issues/new?body=module:%20shipment_advice_cash_on_delivery%0Aversion:%2016.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-3">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
+<ul class="simple">
+<li>BCIM</li>
+<li>ACSONE SA/NV</li>
+<li>Camptocamp</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
+<ul class="simple">
+<li>Jacques-Etienne Baudoux &lt;<a class="reference external" href="mailto:je&#64;bcim.be">je&#64;bcim.be</a>&gt;</li>
+<li>Souheil Bejaoui &lt;<a class="reference external" href="mailto:souheil.bejaoui&#64;acsone.eu">souheil.bejaoui&#64;acsone.eu</a>&gt;</li>
+<li>Tuan Tran &lt;<a class="reference external" href="mailto:anhtuan&#64;trobz.com">anhtuan&#64;trobz.com</a>&gt;</li>
+</ul>
+</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/stock-logistics-transport/tree/16.0/shipment_advice_cash_on_delivery">OCA/stock-logistics-transport</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/shipment_advice_cash_on_delivery/tests/__init__.py b/shipment_advice_cash_on_delivery/tests/__init__.py
new file mode 100644
index 00000000..90b81209
--- /dev/null
+++ b/shipment_advice_cash_on_delivery/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_shipment_advice_cash_on_delivery
diff --git a/shipment_advice_cash_on_delivery/tests/test_shipment_advice_cash_on_delivery.py b/shipment_advice_cash_on_delivery/tests/test_shipment_advice_cash_on_delivery.py
new file mode 100644
index 00000000..09a3af3a
--- /dev/null
+++ b/shipment_advice_cash_on_delivery/tests/test_shipment_advice_cash_on_delivery.py
@@ -0,0 +1,233 @@
+# Copyright 2024 Jacques-Etienne Baudoux (BCIM) <je@bcim.be>
+# Copyright 2024 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import Command
+
+from odoo.addons.base.tests.common import DISABLED_MAIL_CONTEXT
+from odoo.addons.queue_job.tests.common import trap_jobs
+from odoo.addons.shipment_advice.tests.common import Common
+
+
+class TestShipmentAdviceCashOnDelivery(Common):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.env = cls.env["base"].with_context(**DISABLED_MAIL_CONTEXT).env
+        cls.uom_kg = cls.env.ref("uom.product_uom_kgm")
+        cls.product = cls.env["product.product"].create(
+            {
+                "name": "Product COD",
+                "type": "product",
+            }
+        )
+        cls.warehouse = cls.env.ref("stock.warehouse0")
+        cls.company = cls.env.ref("base.main_company")
+        cls.manual_in = cls.env.ref("account.account_payment_method_manual_in")
+        cls.journal_c1 = cls.env["account.journal"].create(
+            {
+                "name": "J1",
+                "code": "J1",
+                "type": "bank",
+                "company_id": cls.company.id,
+                "bank_acc_number": "123456",
+            }
+        )
+
+        cls.payment_mode_normal = cls.env.ref(
+            "account_payment_mode.payment_mode_inbound_dd1"
+        )
+        cls.payment_mode_cod = cls.env["account.payment.mode"].create(
+            {
+                "name": "COD",
+                "bank_account_link": "variable",
+                "payment_method_id": cls.manual_in.id,
+                "company_id": cls.company.id,
+                "fixed_journal_id": cls.journal_c1.id,
+                "variable_journal_ids": [(6, 0, [cls.journal_c1.id])],
+                "cash_on_delivery": True,
+            }
+        )
+        cls.partner_standard = cls.env["res.partner"].create(
+            {"name": "partner_standard", "invoicing_mode": "standard"}
+        )
+        cls.partner_at_shipping = cls.env["res.partner"].create(
+            {"name": "partner_at_shipping", "invoicing_mode": "at_shipping"}
+        )
+        cls.company = cls.env.user.company_id
+        cls.default_pricelist = (
+            cls.env["product.pricelist"]
+            .with_company(cls.company)
+            .create(
+                {
+                    "name": "default_pricelist",
+                    "currency_id": cls.company.currency_id.id,
+                }
+            )
+        )
+        cls.env["stock.quant"]._update_available_quantity(
+            cls.product, cls.warehouse.lot_stock_id, 3
+        )
+
+    def _create_and_process_sale_order(self, dict_val):
+        # Create and confirm sale order
+        so = self.env["sale.order"].create(dict_val)
+        so.action_confirm()
+        pick = so.picking_ids
+
+        # Process shipment advice & picking
+        shipment_advice = self.env["shipment.advice"].create(
+            {"shipment_type": "outgoing"}
+        )
+        self._plan_records_in_shipment(shipment_advice, pick)
+        self._in_progress_shipment_advice(shipment_advice)
+        wiz = self._load_records_in_shipment(shipment_advice, pick)
+        self.assertEqual(wiz.picking_ids, pick)
+        self.assertFalse(wiz.move_line_ids)
+        pick.move_ids.write({"quantity_done": 1})
+        with trap_jobs() as trap:
+            pick._action_done()
+            if trap.jobs_count() > 0:
+                trap.assert_enqueued_job(
+                    pick._invoicing_at_shipping,
+                )
+                trap.perform_enqueued_jobs()
+        shipment_advice.action_done()
+        self.assertEqual(shipment_advice.state, "done")
+
+        return pick, shipment_advice
+
+    def _check_picking_shipment(self, pick, shipment, partner):
+        self.assertEqual(len(pick.cash_on_delivery_invoice_ids), 1)
+        cod_invoice = pick.cash_on_delivery_invoice_ids[0]
+        self.assertEqual(cod_invoice.invoice_partner_display_name, partner.name)
+        action = shipment.with_context(
+            discard_logo_check=True
+        ).print_cash_on_delivery_invoices()
+        self.assertEqual(action.get("type"), "ir.actions.report")
+        self.assertEqual(action.get("report_name"), "account.report_invoice")
+        self.assertEqual(action.get("report_type"), "qweb-pdf")
+        self.assertEqual(
+            action.get("context").get("active_ids"),
+            pick.cash_on_delivery_invoice_ids.ids,
+        )
+
+    def test01(self):
+        """
+        Create 1 SO with payment mode cash on delivery for partner without
+        invoicing at shipping
+        => Should be listed in picking.cash_on_delivery_invoice_ids
+        """
+        pick, shipment = self._create_and_process_sale_order(
+            {
+                "partner_id": self.partner_standard.id,
+                "partner_invoice_id": self.partner_standard.id,
+                "partner_shipping_id": self.partner_standard.id,
+                "order_line": [
+                    Command.create(
+                        {
+                            "name": self.product.name,
+                            "product_id": self.product.id,
+                            "product_uom_qty": 1,
+                            "product_uom": self.product.uom_id.id,
+                            "price_unit": self.product.list_price,
+                        },
+                    ),
+                ],
+                "pricelist_id": self.default_pricelist.id,
+                "picking_policy": "direct",
+                "payment_mode_id": self.payment_mode_cod.id,
+            }
+        )
+
+        self._check_picking_shipment(pick, shipment, self.partner_standard)
+
+    def test02(self):
+        """
+        Create 1 SO with payment mode cash on delivery for partner with
+        invoicing at shipping
+        => Should be listed in picking.cash_on_delivery_invoice_ids
+        """
+        pick, shipment = self._create_and_process_sale_order(
+            {
+                "partner_id": self.partner_at_shipping.id,
+                "partner_invoice_id": self.partner_at_shipping.id,
+                "partner_shipping_id": self.partner_at_shipping.id,
+                "order_line": [
+                    Command.create(
+                        {
+                            "name": self.product.name,
+                            "product_id": self.product.id,
+                            "product_uom_qty": 1,
+                            "product_uom": self.product.uom_id.id,
+                            "price_unit": self.product.list_price,
+                        },
+                    ),
+                ],
+                "pricelist_id": self.default_pricelist.id,
+                "picking_policy": "direct",
+                "payment_mode_id": self.payment_mode_cod.id,
+            }
+        )
+
+        self._check_picking_shipment(pick, shipment, self.partner_at_shipping)
+
+    def test03(self):
+        """
+        Create 1 SO without payment mode cash on delivery for partner with
+        invoicing at shipping
+        => Should NOT be listed in picking.cash_on_delivery_invoice_ids
+        """
+        pick, dummy = self._create_and_process_sale_order(
+            {
+                "partner_id": self.partner_at_shipping.id,
+                "partner_invoice_id": self.partner_at_shipping.id,
+                "partner_shipping_id": self.partner_at_shipping.id,
+                "order_line": [
+                    Command.create(
+                        {
+                            "name": self.product.name,
+                            "product_id": self.product.id,
+                            "product_uom_qty": 2,
+                            "product_uom": self.product.uom_id.id,
+                            "price_unit": self.product.list_price,
+                        },
+                    ),
+                ],
+                "pricelist_id": self.default_pricelist.id,
+                "picking_policy": "direct",
+                "payment_mode_id": self.payment_mode_normal.id,
+            }
+        )
+
+        self.assertEqual(len(pick.cash_on_delivery_invoice_ids), 0)
+
+    def test04(self):
+        """
+        Create 1 SO without payment mode cash on delivery for partner without
+        invoicing at shipping
+        => Should NOT be listed in picking.cash_on_delivery_invoice_ids
+        """
+        pick, dummy = self._create_and_process_sale_order(
+            {
+                "partner_id": self.partner_standard.id,
+                "partner_invoice_id": self.partner_standard.id,
+                "partner_shipping_id": self.partner_standard.id,
+                "order_line": [
+                    Command.create(
+                        {
+                            "name": self.product.name,
+                            "product_id": self.product.id,
+                            "product_uom_qty": 2,
+                            "product_uom": self.product.uom_id.id,
+                            "price_unit": self.product.list_price,
+                        },
+                    ),
+                ],
+                "pricelist_id": self.default_pricelist.id,
+                "picking_policy": "direct",
+                "payment_mode_id": self.payment_mode_normal.id,
+            }
+        )
+
+        self.assertEqual(len(pick.cash_on_delivery_invoice_ids), 0)
diff --git a/shipment_advice_cash_on_delivery/views/shipment_advice.xml b/shipment_advice_cash_on_delivery/views/shipment_advice.xml
new file mode 100644
index 00000000..50f9a241
--- /dev/null
+++ b/shipment_advice_cash_on_delivery/views/shipment_advice.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <!-- Shipment Advice - Print Cash Invoices -->
+    <record id="action_print_batch_delivery_slip" model="ir.actions.server">
+        <field name="name">Print COD Invoice</field>
+        <field name="model_id" ref="shipment_advice.model_shipment_advice" />
+        <field name="binding_model_id" ref="shipment_advice.model_shipment_advice" />
+        <field name="state">code</field>
+        <field name="code">action = records.print_cash_on_delivery_invoices()
+        </field>
+    </record>
+
+    <record id="shipment_advice_view_form_inherit" model="ir.ui.view">
+        <field name="name">shipment.advice.view.form.inherit</field>
+        <field name="model">shipment.advice</field>
+        <field name="inherit_id" ref="shipment_advice.shipment_advice_view_form" />
+        <field name="arch" type="xml">
+            <header position="inside">
+                <button
+                    name="print_cash_on_delivery_invoices"
+                    type="object"
+                    string="Print COD Invoice"
+                    class="btn-secondary"
+                    states="in_progress,done"
+                />
+            </header>
+        </field>
+    </record>
+
+</odoo>
diff --git a/test-requirements.txt b/test-requirements.txt
index 4aadb0af..73389cb8 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1 +1,3 @@
+openupgradelib
 vcrpy-unittest
+odoo-addon-partner-invoicing-mode-cash-on-delivery @ git+https://github.com/OCA/account-invoicing@refs/pull/1736/head#subdirectory=setup/partner_invoicing_mode_cash_on_delivery