diff --git a/stock_picking_comment_template/README.rst b/stock_picking_comment_template/README.rst
new file mode 100644
index 0000000..6374861
--- /dev/null
+++ b/stock_picking_comment_template/README.rst
@@ -0,0 +1,91 @@
+================
+Picking Comments
+================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:b4c1050e3bfc1d6d26e6fd0e4fcaaae071cf15a5dce5a1b1a01a83b5fed00720
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |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--reporting-lightgray.png?logo=github
+    :target: https://github.com/OCA/stock-logistics-reporting/tree/17.0/stock_picking_comment_template
+    :alt: OCA/stock-logistics-reporting
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/stock-logistics-reporting-17-0/stock-logistics-reporting-17-0-stock_picking_comment_template
+    :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-reporting&target_branch=17.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+Adds comments on stock picking. The comments can be added/edited from
+Inventory -> Configuration -> Document Comments
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/stock-logistics-reporting/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-reporting/issues/new?body=module:%20stock_picking_comment_template%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
+-------
+
+* C2i Change 2 improve
+
+Contributors
+------------
+
+-  `C2i Change 2 improve <http://www.c2i.es>`__:
+
+   -  Eduardo Magdalena <emagdalena@c2i.es>
+
+-  `NextERP Romania <https://www.nexterp.ro>`__:
+
+   -  Fekete Mihai <feketemihai@nexterp.ro>
+
+-  `Sygel <http://www.sygel.es>`__:
+
+   -  Valentín Vinagre <valentin.vinagre@sygel.es>
+   -  Roger Sans <roger.sans@sygel.es>
+
+Do not contact contributors directly about support or help with
+technical issues.
+
+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-reporting <https://github.com/OCA/stock-logistics-reporting/tree/17.0/stock_picking_comment_template>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/stock_picking_comment_template/__init__.py b/stock_picking_comment_template/__init__.py
new file mode 100644
index 0000000..83e553a
--- /dev/null
+++ b/stock_picking_comment_template/__init__.py
@@ -0,0 +1,3 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/stock_picking_comment_template/__manifest__.py b/stock_picking_comment_template/__manifest__.py
new file mode 100644
index 0000000..bb76b57
--- /dev/null
+++ b/stock_picking_comment_template/__manifest__.py
@@ -0,0 +1,21 @@
+# Copyright 2019 C2i Change 2 improve - Eduardo Magdalena <emagdalena@c2i.es>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Picking Comments",
+    "summary": "Comments texts templates on Picking documents",
+    "version": "17.0.1.0.0",
+    "category": "Warehouse Management",
+    "website": "https://github.com/OCA/stock-logistics-reporting",
+    "author": "C2i Change 2 improve," "Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "depends": ["stock", "base_comment_template"],
+    "data": [
+        "views/base_comment_template_view.xml",
+        "views/report_delivery_document.xml",
+        "views/report_picking.xml",
+        "views/stock_picking_view.xml",
+        "security/ir.model.access.csv",
+    ],
+    "installable": True,
+}
diff --git a/stock_picking_comment_template/i18n/de.po b/stock_picking_comment_template/i18n/de.po
new file mode 100644
index 0000000..dcc83bf
--- /dev/null
+++ b/stock_picking_comment_template/i18n/de.po
@@ -0,0 +1,91 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* stock_picking_comment_template
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2021-03-18 09:07+0000\n"
+"Last-Translator: André Volksdorf <volksdorf@smartpage.de>\n"
+"Language-Team: none\n"
+"Language: de\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.3.2\n"
+
+#. module: stock_picking_comment_template
+#: model:ir.model.fields,field_description:stock_picking_comment_template.field_stock_picking__comment_template_ids
+msgid "Comment Template"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model_terms:ir.ui.view,arch_db:stock_picking_comment_template.stock_picking_form_add_comment
+msgid "Comments"
+msgstr "Textbausteine"
+
+#. module: stock_picking_comment_template
+#: model:ir.model.fields,field_description:stock_picking_comment_template.field_stock_picking__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model:ir.ui.menu,name:stock_picking_comment_template.menu_base_comment_template_picking
+msgid "Document Comments"
+msgstr "Textbausteine"
+
+#. module: stock_picking_comment_template
+#: model:ir.model.fields,field_description:stock_picking_comment_template.field_stock_picking__id
+msgid "ID"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model:ir.model.fields,field_description:stock_picking_comment_template.field_stock_picking____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model:ir.actions.act_window,name:stock_picking_comment_template.action_stock_picking_comment_template
+msgid "Stock Picking Comment Templates"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model:ir.model,name:stock_picking_comment_template.model_stock_picking
+msgid "Transfer"
+msgstr ""
+
+#~ msgid "Bottom Comment"
+#~ msgstr "Suffix-Textbaustein"
+
+#~ msgid "Bottom Comment Template"
+#~ msgstr "Suffix-Textbausteinvorlage"
+
+#~ msgid "Bottom Comments"
+#~ msgstr "Suffix-Textbausteine"
+
+#~ msgid "Contact"
+#~ msgstr "Partner"
+
+#~ msgid "Load a template"
+#~ msgstr "Textbausteinvorlage laden"
+
+#~ msgid ""
+#~ "The comments will be displayed on the printed document. You can load a "
+#~ "predefined template, write your own text or load a template and then "
+#~ "modify it only for this document."
+#~ msgstr ""
+#~ "Diese Textbausteine werden auf Dokumentbelegen gedruckt. Es kann eine "
+#~ "bereits existierende Vorlage geladen, ein neuer eigenständiger Text "
+#~ "geschrieben oder eine Vorlage nach dem Laden nur für dieses Dokument "
+#~ "angepasst werden."
+
+#~ msgid "Top Comment"
+#~ msgstr "Präfix-Textbaustein"
+
+#~ msgid "Top Comment Template"
+#~ msgstr "Präfix-Textbausteinvorlage"
+
+#~ msgid "Top Comments"
+#~ msgstr "Präfix-Textbausteine"
diff --git a/stock_picking_comment_template/i18n/it.po b/stock_picking_comment_template/i18n/it.po
new file mode 100644
index 0000000..fddbad1
--- /dev/null
+++ b/stock_picking_comment_template/i18n/it.po
@@ -0,0 +1,55 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* stock_picking_comment_template
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Automatically generated\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"
+
+#. module: stock_picking_comment_template
+#: model:ir.model.fields,field_description:stock_picking_comment_template.field_stock_picking__comment_template_ids
+msgid "Comment Template"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model_terms:ir.ui.view,arch_db:stock_picking_comment_template.stock_picking_form_add_comment
+msgid "Comments"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model:ir.model.fields,field_description:stock_picking_comment_template.field_stock_picking__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model:ir.ui.menu,name:stock_picking_comment_template.menu_base_comment_template_picking
+msgid "Document Comments"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model:ir.model.fields,field_description:stock_picking_comment_template.field_stock_picking__id
+msgid "ID"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model:ir.model.fields,field_description:stock_picking_comment_template.field_stock_picking____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model:ir.actions.act_window,name:stock_picking_comment_template.action_stock_picking_comment_template
+msgid "Stock Picking Comment Templates"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model:ir.model,name:stock_picking_comment_template.model_stock_picking
+msgid "Transfer"
+msgstr ""
diff --git a/stock_picking_comment_template/i18n/ja.po b/stock_picking_comment_template/i18n/ja.po
new file mode 100644
index 0000000..ca4a545
--- /dev/null
+++ b/stock_picking_comment_template/i18n/ja.po
@@ -0,0 +1,93 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* stock_picking_comment_template
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-07-05 04:43+0000\n"
+"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
+"Language-Team: none\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 3.7.1\n"
+
+#. module: stock_picking_comment_template
+#: model:ir.model.fields,field_description:stock_picking_comment_template.field_stock_picking__comment_template_ids
+msgid "Comment Template"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model_terms:ir.ui.view,arch_db:stock_picking_comment_template.stock_picking_form_add_comment
+msgid "Comments"
+msgstr "コメント"
+
+#. module: stock_picking_comment_template
+#: model:ir.model.fields,field_description:stock_picking_comment_template.field_stock_picking__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model:ir.ui.menu,name:stock_picking_comment_template.menu_base_comment_template_picking
+msgid "Document Comments"
+msgstr "ドキュメントコメント"
+
+#. module: stock_picking_comment_template
+#: model:ir.model.fields,field_description:stock_picking_comment_template.field_stock_picking__id
+msgid "ID"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model:ir.model.fields,field_description:stock_picking_comment_template.field_stock_picking____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model:ir.actions.act_window,name:stock_picking_comment_template.action_stock_picking_comment_template
+msgid "Stock Picking Comment Templates"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model:ir.model,name:stock_picking_comment_template.model_stock_picking
+msgid "Transfer"
+msgstr "運送"
+
+#~ msgid "Bottom Comment"
+#~ msgstr "下部コメント"
+
+#~ msgid "Bottom Comment Template"
+#~ msgstr "下部コメントテンプレート"
+
+#~ msgid "Bottom Comments"
+#~ msgstr "下部コメント"
+
+#~ msgid "Contact"
+#~ msgstr "連絡先"
+
+#~ msgid "Load a template"
+#~ msgstr "テンプレートをロード"
+
+#, fuzzy
+#~ msgid "Picking conditions template"
+#~ msgstr "条件テンプレート"
+
+#~ msgid ""
+#~ "The comments will be displayed on the printed document. You can load a "
+#~ "predefined template, write your own text or load a template and then "
+#~ "modify it only for this document."
+#~ msgstr ""
+#~ "コメントは印刷されるドキュメントに表示されます。直接テキストを入力するか、"
+#~ "既存のテンプレートをロードして内容を修正するなどしてください。"
+
+#~ msgid "Top Comment"
+#~ msgstr "上部コメント"
+
+#~ msgid "Top Comment Template"
+#~ msgstr "上部コメントテンプレート"
+
+#~ msgid "Top Comments"
+#~ msgstr "上部コメント"
diff --git a/stock_picking_comment_template/i18n/stock_picking_comment_template.pot b/stock_picking_comment_template/i18n/stock_picking_comment_template.pot
new file mode 100644
index 0000000..2d99cc3
--- /dev/null
+++ b/stock_picking_comment_template/i18n/stock_picking_comment_template.pot
@@ -0,0 +1,54 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* stock_picking_comment_template
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.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: stock_picking_comment_template
+#: model:ir.model.fields,field_description:stock_picking_comment_template.field_stock_picking__comment_template_ids
+msgid "Comment Template"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model_terms:ir.ui.view,arch_db:stock_picking_comment_template.stock_picking_form_add_comment
+msgid "Comments"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model:ir.model.fields,field_description:stock_picking_comment_template.field_stock_picking__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model:ir.ui.menu,name:stock_picking_comment_template.menu_base_comment_template_picking
+msgid "Document Comments"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model:ir.model.fields,field_description:stock_picking_comment_template.field_stock_picking__id
+msgid "ID"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model:ir.model.fields,field_description:stock_picking_comment_template.field_stock_picking____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model:ir.actions.act_window,name:stock_picking_comment_template.action_stock_picking_comment_template
+msgid "Stock Picking Comment Templates"
+msgstr ""
+
+#. module: stock_picking_comment_template
+#: model:ir.model,name:stock_picking_comment_template.model_stock_picking
+msgid "Transfer"
+msgstr ""
diff --git a/stock_picking_comment_template/models/__init__.py b/stock_picking_comment_template/models/__init__.py
new file mode 100644
index 0000000..ae4c272
--- /dev/null
+++ b/stock_picking_comment_template/models/__init__.py
@@ -0,0 +1 @@
+from . import stock_picking
diff --git a/stock_picking_comment_template/models/stock_picking.py b/stock_picking_comment_template/models/stock_picking.py
new file mode 100644
index 0000000..ff30df1
--- /dev/null
+++ b/stock_picking_comment_template/models/stock_picking.py
@@ -0,0 +1,9 @@
+# Copyright 2019 C2i Change 2 improve - Eduardo Magdalena <emagdalena@c2i.es>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import models
+
+
+class StockPicking(models.Model):
+    _inherit = ["stock.picking", "comment.template"]
+    _name = "stock.picking"
diff --git a/stock_picking_comment_template/pyproject.toml b/stock_picking_comment_template/pyproject.toml
new file mode 100644
index 0000000..4231d0c
--- /dev/null
+++ b/stock_picking_comment_template/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/stock_picking_comment_template/readme/CONTRIBUTORS.md b/stock_picking_comment_template/readme/CONTRIBUTORS.md
new file mode 100644
index 0000000..b428165
--- /dev/null
+++ b/stock_picking_comment_template/readme/CONTRIBUTORS.md
@@ -0,0 +1,12 @@
+- [C2i Change 2 improve](http://www.c2i.es):
+  - Eduardo Magdalena \<<emagdalena@c2i.es>\>
+
+- [NextERP Romania](https://www.nexterp.ro):
+  - Fekete Mihai \<<feketemihai@nexterp.ro>\>
+
+- [Sygel](http://www.sygel.es):
+  - Valentín Vinagre \<<valentin.vinagre@sygel.es>\>
+  - Roger Sans \<<roger.sans@sygel.es>\>
+
+Do not contact contributors directly about support or help with
+technical issues.
diff --git a/stock_picking_comment_template/readme/DESCRIPTION.md b/stock_picking_comment_template/readme/DESCRIPTION.md
new file mode 100644
index 0000000..9886051
--- /dev/null
+++ b/stock_picking_comment_template/readme/DESCRIPTION.md
@@ -0,0 +1,2 @@
+Adds comments on stock picking. The comments can be added/edited from
+Inventory -\> Configuration -\> Document Comments
diff --git a/stock_picking_comment_template/security/ir.model.access.csv b/stock_picking_comment_template/security/ir.model.access.csv
new file mode 100644
index 0000000..ba945d5
--- /dev/null
+++ b/stock_picking_comment_template/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_base_comment_template_stock_user,access_base_comment_template stock_user,base_comment_template.model_base_comment_template,stock.group_stock_user,1,0,0,0
+access_base_comment_template_stock_manager,access_base_comment_template stock_manager,base_comment_template.model_base_comment_template,stock.group_stock_manager,1,1,1,1
diff --git a/stock_picking_comment_template/static/description/icon.png b/stock_picking_comment_template/static/description/icon.png
new file mode 100644
index 0000000..3a0328b
Binary files /dev/null and b/stock_picking_comment_template/static/description/icon.png differ
diff --git a/stock_picking_comment_template/static/description/index.html b/stock_picking_comment_template/static/description/index.html
new file mode 100644
index 0000000..a6ed8c9
--- /dev/null
+++ b/stock_picking_comment_template/static/description/index.html
@@ -0,0 +1,438 @@
+<!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>Picking Comments</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="picking-comments">
+<h1 class="title">Picking Comments</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:b4c1050e3bfc1d6d26e6fd0e4fcaaae071cf15a5dce5a1b1a01a83b5fed00720
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<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-reporting/tree/17.0/stock_picking_comment_template"><img alt="OCA/stock-logistics-reporting" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--reporting-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/stock-logistics-reporting-17-0/stock-logistics-reporting-17-0-stock_picking_comment_template"><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-reporting&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>Adds comments on stock picking. The comments can be added/edited from
+Inventory -&gt; Configuration -&gt; Document Comments</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/stock-logistics-reporting/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-reporting/issues/new?body=module:%20stock_picking_comment_template%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>C2i Change 2 improve</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
+<ul class="simple">
+<li><a class="reference external" href="http://www.c2i.es">C2i Change 2 improve</a>:<ul>
+<li>Eduardo Magdalena &lt;<a class="reference external" href="mailto:emagdalena&#64;c2i.es">emagdalena&#64;c2i.es</a>&gt;</li>
+</ul>
+</li>
+<li><a class="reference external" href="https://www.nexterp.ro">NextERP Romania</a>:<ul>
+<li>Fekete Mihai &lt;<a class="reference external" href="mailto:feketemihai&#64;nexterp.ro">feketemihai&#64;nexterp.ro</a>&gt;</li>
+</ul>
+</li>
+<li><a class="reference external" href="http://www.sygel.es">Sygel</a>:<ul>
+<li>Valentín Vinagre &lt;<a class="reference external" href="mailto:valentin.vinagre&#64;sygel.es">valentin.vinagre&#64;sygel.es</a>&gt;</li>
+<li>Roger Sans &lt;<a class="reference external" href="mailto:roger.sans&#64;sygel.es">roger.sans&#64;sygel.es</a>&gt;</li>
+</ul>
+</li>
+</ul>
+<p>Do not contact contributors directly about support or help with
+technical issues.</p>
+</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/stock-logistics-reporting/tree/17.0/stock_picking_comment_template">OCA/stock-logistics-reporting</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/stock_picking_comment_template/tests/__init__.py b/stock_picking_comment_template/tests/__init__.py
new file mode 100644
index 0000000..e93f797
--- /dev/null
+++ b/stock_picking_comment_template/tests/__init__.py
@@ -0,0 +1,3 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from . import test_stock_picking_report
diff --git a/stock_picking_comment_template/tests/test_stock_picking_report.py b/stock_picking_comment_template/tests/test_stock_picking_report.py
new file mode 100644
index 0000000..fc61919
--- /dev/null
+++ b/stock_picking_comment_template/tests/test_stock_picking_report.py
@@ -0,0 +1,57 @@
+# Copyright 2019 C2i Change 2 improve - Eduardo Magdalena <emagdalena@c2i.es>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo.tests.common import TransactionCase
+
+
+class TestStockPickingReport(TransactionCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.company = cls.env.ref("base.main_company")
+        cls.base_comment_model = cls.env["base.comment.template"]
+        # Create comment related to sale model
+        cls.picking_obj = cls.env.ref("stock.model_stock_picking")
+        cls.before_comment = cls._create_comment(cls, "before_lines")
+        cls.after_comment = cls._create_comment(cls, "after_lines")
+        # Create partner
+        cls.partner = cls.env["res.partner"].create({"name": "Partner Test"})
+        cls.partner.base_comment_template_ids = [
+            (4, cls.before_comment.id),
+            (4, cls.after_comment.id),
+        ]
+        cls.picking_model = cls.env["stock.picking"]
+        cls.picking = cls.picking_model.create(
+            {
+                "partner_id": cls.partner.id,
+                "location_id": cls.env.ref("stock.stock_location_stock").id,
+                "location_dest_id": cls.env.ref("stock.stock_location_customers").id,
+                "picking_type_id": cls.env.ref("stock.picking_type_out").id,
+            }
+        )
+
+    def _create_comment(self, position):
+        return self.base_comment_model.create(
+            {
+                "name": "Comment " + position,
+                "company_id": self.company.id,
+                "position": position,
+                "text": "Text " + position,
+                "models": "stock.picking",
+                "model_ids": [(6, 0, self.picking_obj.ids)],
+            }
+        )
+
+    def test_comments_in_deliveryslip(self):
+        res = self.env["ir.actions.report"]._render_qweb_html(
+            "stock.report_deliveryslip", self.picking.ids
+        )
+        self.assertRegex(str(res[0]), self.before_comment.text)
+        self.assertRegex(str(res[0]), self.after_comment.text)
+
+    def test_comments_in_report_picking(self):
+        res = self.env["ir.actions.report"]._render_qweb_html(
+            "stock.report_picking", self.picking.ids
+        )
+        self.assertRegex(str(res[0]), self.before_comment.text)
+        self.assertRegex(str(res[0]), self.after_comment.text)
diff --git a/stock_picking_comment_template/views/base_comment_template_view.xml b/stock_picking_comment_template/views/base_comment_template_view.xml
new file mode 100644
index 0000000..f60d68d
--- /dev/null
+++ b/stock_picking_comment_template/views/base_comment_template_view.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record model="ir.actions.act_window" id="action_stock_picking_comment_template">
+        <field name="name">Stock Picking Comment Templates</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">base.comment.template</field>
+        <field name="view_mode">tree,form</field>
+        <field
+            name="domain"
+            eval="[('model_ids', 'in', [ref('stock.model_stock_picking')])]"
+        />
+        <field
+            name="view_id"
+            ref="base_comment_template.view_base_comment_template_tree"
+        />
+    </record>
+
+    <menuitem
+        name="Document Comments"
+        id="menu_base_comment_template_picking"
+        action="stock_picking_comment_template.action_stock_picking_comment_template"
+        parent="stock.menu_stock_config_settings"
+    />
+
+</odoo>
diff --git a/stock_picking_comment_template/views/report_delivery_document.xml b/stock_picking_comment_template/views/report_delivery_document.xml
new file mode 100644
index 0000000..3db082a
--- /dev/null
+++ b/stock_picking_comment_template/views/report_delivery_document.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <template
+        id="report_delivery_document_comments"
+        inherit_id="stock.report_delivery_document"
+    >
+        <xpath expr="//table[hasclass('table-sm')]" position="before">
+            <t
+                t-foreach="o.comment_template_ids.filtered(lambda x: x.position == 'before_lines')"
+                t-as="comment_template_top"
+            >
+                <div t-raw="o.render_comment(comment_template_top)" />
+            </t>
+        </xpath>
+        <xpath expr="//div[hasclass('page')]" position="inside">
+            <t
+                t-foreach="o.comment_template_ids.filtered(lambda x: x.position == 'after_lines')"
+                t-as="comment_template_bottom"
+            >
+                <div t-raw="o.render_comment(comment_template_bottom)" />
+            </t>
+        </xpath>
+    </template>
+
+</odoo>
diff --git a/stock_picking_comment_template/views/report_picking.xml b/stock_picking_comment_template/views/report_picking.xml
new file mode 100644
index 0000000..060c39b
--- /dev/null
+++ b/stock_picking_comment_template/views/report_picking.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <template id="report_picking_document_comments" inherit_id="stock.report_picking">
+        <xpath expr="//table[hasclass('table-sm')]" position="before">
+            <t
+                t-foreach="o.comment_template_ids.filtered(lambda x: x.position == 'before_lines')"
+                t-as="comment_template_top"
+            >
+                <div t-raw="o.render_comment(comment_template_top)" />
+            </t>
+        </xpath>
+        <xpath expr="//p[@t-field='o.note']" position="after">
+            <t
+                t-foreach="o.comment_template_ids.filtered(lambda x: x.position == 'after_lines')"
+                t-as="comment_template_bottom"
+            >
+                <div t-raw="o.render_comment(comment_template_bottom)" />
+            </t>
+        </xpath>
+    </template>
+
+</odoo>
diff --git a/stock_picking_comment_template/views/stock_picking_view.xml b/stock_picking_comment_template/views/stock_picking_view.xml
new file mode 100644
index 0000000..4b997c8
--- /dev/null
+++ b/stock_picking_comment_template/views/stock_picking_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record model="ir.ui.view" id="stock_picking_form_add_comment">
+      <field name="name">comment_template.stock.picking.form</field>
+      <field name="model">stock.picking</field>
+      <field name="inherit_id" ref="stock.view_picking_form" />
+      <field name="arch" type="xml">
+        <xpath expr="//notebook" position="inside">
+            <page string="Comments" name="comments">
+                <field name="comment_template_ids" />
+            </page>
+        </xpath>
+      </field>
+    </record>
+
+</odoo>