diff --git a/hs_code_link/README.rst b/hs_code_link/README.rst
new file mode 100644
index 0000000..049dc49
--- /dev/null
+++ b/hs_code_link/README.rst
@@ -0,0 +1,46 @@
+============
+HS Code Link
+============
+
+Odoo added a field char field `hs_code` in the delivery module.
+It results in a duplicate field from `product_harmonized_system` and it can be
+seen twice in the `product.template` form view.
+
+The goal of this module is to hide Odoo's field in the form and make it related
+to the OCA's one if it is used elsewhere.
+
+Installation
+============
+
+This module is set as auto_install if the following modules are installed:
+
+* product_harmonized_system
+* delivery
+
+Credits
+=======
+
+Images
+------
+
+* Odoo Community Association: `Icon <https://odoo-community.org/logo.png>`_.
+
+Contributors
+------------
+
+* Denis Leemann <denis.leemann@camptocamp.com>
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+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.
+
+To contribute to this module, please visit https://odoo-community.org.
diff --git a/hs_code_link/__init__.py b/hs_code_link/__init__.py
new file mode 100644
index 0000000..0650744
--- /dev/null
+++ b/hs_code_link/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/hs_code_link/__manifest__.py b/hs_code_link/__manifest__.py
new file mode 100644
index 0000000..dbd3662
--- /dev/null
+++ b/hs_code_link/__manifest__.py
@@ -0,0 +1,14 @@
+# Copyright 2017 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+{
+    "name": "HS Code Link",
+    "version": "13.0.1.0.0",
+    "depends": ["product_harmonized_system", "delivery"],
+    "author": "Camptocamp SA, Odoo Community Association (OCA)",
+    "website": "http://www.camptocamp.com",
+    "license": "AGPL-3",
+    "category": "Reporting",
+    "data": ["views/product_views.xml"],
+    "installable": True,
+    "auto_install": True,
+}
diff --git a/hs_code_link/i18n/hs_code_link.pot b/hs_code_link/i18n/hs_code_link.pot
new file mode 100644
index 0000000..a40034d
--- /dev/null
+++ b/hs_code_link/i18n/hs_code_link.pot
@@ -0,0 +1,20 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* hs_code_link
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 13.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: hs_code_link
+#: model:ir.model,name:hs_code_link.model_product_template
+msgid "Product Template"
+msgstr ""
+
diff --git a/hs_code_link/models/__init__.py b/hs_code_link/models/__init__.py
new file mode 100644
index 0000000..9649db7
--- /dev/null
+++ b/hs_code_link/models/__init__.py
@@ -0,0 +1 @@
+from . import product
diff --git a/hs_code_link/models/product.py b/hs_code_link/models/product.py
new file mode 100644
index 0000000..d000495
--- /dev/null
+++ b/hs_code_link/models/product.py
@@ -0,0 +1,10 @@
+# Copyright 2017 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class ProductTemplate(models.Model):
+    _inherit = "product.template"
+
+    hs_code = fields.Char(related="hs_code_id.hs_code", readonly=True, store=True)
diff --git a/hs_code_link/readme/CONTRIBUTORS.rst b/hs_code_link/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000..fcb7aaa
--- /dev/null
+++ b/hs_code_link/readme/CONTRIBUTORS.rst
@@ -0,0 +1 @@
+* Denis Leemann <denis.leemann@camptocamp.com>
diff --git a/hs_code_link/readme/DESCRIPTION.rst b/hs_code_link/readme/DESCRIPTION.rst
new file mode 100644
index 0000000..eb305df
--- /dev/null
+++ b/hs_code_link/readme/DESCRIPTION.rst
@@ -0,0 +1,6 @@
+Odoo added a field char field `hs_code` in the delivery module.
+It results in a duplicate field from `product_harmonized_system` and it can be
+seen twice in the `product.template` form view.
+
+The goal of this module is to hide Odoo's field in the form and make it related
+to the OCA's one if it is used elsewhere.
diff --git a/hs_code_link/readme/INSTALL.rst b/hs_code_link/readme/INSTALL.rst
new file mode 100644
index 0000000..b7ee54c
--- /dev/null
+++ b/hs_code_link/readme/INSTALL.rst
@@ -0,0 +1,4 @@
+This module is set as auto_install if the following modules are installed:
+
+* product_harmonized_system
+* delivery
diff --git a/hs_code_link/static/description/icon.png b/hs_code_link/static/description/icon.png
new file mode 100644
index 0000000..3a0328b
Binary files /dev/null and b/hs_code_link/static/description/icon.png differ
diff --git a/hs_code_link/views/product_views.xml b/hs_code_link/views/product_views.xml
new file mode 100644
index 0000000..4cf13f0
--- /dev/null
+++ b/hs_code_link/views/product_views.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_template_hide_hs" model="ir.ui.view">
+        <field name="name">product.template.hs.hidden</field>
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="delivery.product_template_hs_code" />
+        <field name="arch" type="xml">
+            <field name="hs_code" position="attributes">
+                <attribute name="invisible">True</attribute>
+            </field>
+        </field>
+    </record>
+</odoo>