From 498dbc548b2d01bcb16a82e3ed510761000b350e Mon Sep 17 00:00:00 2001
From: Pierre Masereel <pim@odoo.com>
Date: Tue, 23 Oct 2018 08:44:29 +0000
Subject: [PATCH] Revert "[FIX] product_form: remove hs code and duplicate
 internal note"

The field hs_code has been removed but will be used in future tasks and
customers have already filled this field.

So we set it back in a sperate module to respect our stable policy.

This reverts commit 2d738f8563212fbdf10924468b1fcd865524e6d7

closes odoo/odoo#28071
---
 addons/delivery_hs_code/__init__.py           |  4 ++++
 addons/delivery_hs_code/__manifest__.py       | 20 +++++++++++++++++++
 addons/delivery_hs_code/models/__init__.py    |  4 ++++
 .../models/product_template.py                | 10 ++++++++++
 .../views/product_template_view.xml           | 15 ++++++++++++++
 5 files changed, 53 insertions(+)
 create mode 100644 addons/delivery_hs_code/__init__.py
 create mode 100644 addons/delivery_hs_code/__manifest__.py
 create mode 100644 addons/delivery_hs_code/models/__init__.py
 create mode 100644 addons/delivery_hs_code/models/product_template.py
 create mode 100644 addons/delivery_hs_code/views/product_template_view.xml

diff --git a/addons/delivery_hs_code/__init__.py b/addons/delivery_hs_code/__init__.py
new file mode 100644
index 00000000000..dc5e6b693d1
--- /dev/null
+++ b/addons/delivery_hs_code/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import models
diff --git a/addons/delivery_hs_code/__manifest__.py b/addons/delivery_hs_code/__manifest__.py
new file mode 100644
index 00000000000..661c330599d
--- /dev/null
+++ b/addons/delivery_hs_code/__manifest__.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+
+{
+    'name': 'Delivery HS Code',
+    'version': '1.0',
+    'category': 'Stock',
+    'description': """
+Set back field hs_code on pruduct template.
+==============================================================
+
+""",
+    'depends': ['delivery'],
+    'data': [
+        'views/product_template_view.xml',
+    ],
+    'installable': True,
+    'auto_install': True,
+}
diff --git a/addons/delivery_hs_code/models/__init__.py b/addons/delivery_hs_code/models/__init__.py
new file mode 100644
index 00000000000..3a8ca74201b
--- /dev/null
+++ b/addons/delivery_hs_code/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import product_template
diff --git a/addons/delivery_hs_code/models/product_template.py b/addons/delivery_hs_code/models/product_template.py
new file mode 100644
index 00000000000..79465b50303
--- /dev/null
+++ b/addons/delivery_hs_code/models/product_template.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models, fields
+
+
+class ProductTemplate(models.Model):
+    _inherit = 'product.template'
+
+    hs_code = fields.Char(string="HS Code", help="Standardized code for international shipping and goods declaration")
diff --git a/addons/delivery_hs_code/views/product_template_view.xml b/addons/delivery_hs_code/views/product_template_view.xml
new file mode 100644
index 00000000000..8ecc08a4be8
--- /dev/null
+++ b/addons/delivery_hs_code/views/product_template_view.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<record model="ir.ui.view" id="product_template_hs_code">
+    <field name="name">product.template.form.hs_code</field>
+    <field name="model">product.template</field>
+    <field name="inherit_id" ref="product.product_template_form_view"/>
+    <field name="arch" type="xml">
+	<xpath expr="//group[@name='group_lots_and_weight']" position="inside">
+            <field name="hs_code"/>
+        </xpath>
+    </field>
+</record>
+
+</odoo>