diff --git a/product_template_tags/README.rst b/product_template_tags/README.rst
new file mode 100644
index 000000000000..aa2e71af6cf0
--- /dev/null
+++ b/product_template_tags/README.rst
@@ -0,0 +1,101 @@
+=====================
+Product Template Tags
+=====================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |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%2Fproduct--attribute-lightgray.png?logo=github
+    :target: https://github.com/OCA/product-attribute/tree/13.0/product_template_tags
+    :alt: OCA/product-attribute
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/product-attribute-13-0/product-attribute-13-0-product_template_tags
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/135/13.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+This addon allows to add tags on products.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+To configure this module, you need to:
+
+#. Go to the product form view.
+#. Create and edit tags using the form view
+
+Usage
+=====
+
+To use this module, you need to:
+
+#. On the product view, you can add and create tags.
+#. Tags will be shown in the kanban view.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/product-attribute/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/product-attribute/issues/new?body=module:%20product_template_tags%0Aversion:%2013.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
+~~~~~~~
+
+* ACSONE SA/NV
+* Numigi
+
+Contributors
+~~~~~~~~~~~~
+
+* Benjamin Willig <benjamin.willig@acsone.eu>
+* Numigi (tm) and all its contributors (https://bit.ly/numigiens)
+* Patrick Wilson <patrickraymondwilson@gmail.com>
+* Pimolnat Suntian <pimolnats@ecosoft.co.th>
+
+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.
+
+.. |maintainer-patrickrwilson| image:: https://github.com/patrickrwilson.png?size=40px
+    :target: https://github.com/patrickrwilson
+    :alt: patrickrwilson
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-patrickrwilson| 
+
+This module is part of the `OCA/product-attribute <https://github.com/OCA/product-attribute/tree/13.0/product_template_tags>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/product_template_tags/__init__.py b/product_template_tags/__init__.py
new file mode 100644
index 000000000000..0650744f6bc6
--- /dev/null
+++ b/product_template_tags/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/product_template_tags/__manifest__.py b/product_template_tags/__manifest__.py
new file mode 100644
index 000000000000..8180bcf53f02
--- /dev/null
+++ b/product_template_tags/__manifest__.py
@@ -0,0 +1,19 @@
+# Copyright 2017 ACSONE SA/NV
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Product Template Tags",
+    "summary": "This addon allow to add tags on products",
+    "version": "13.0.1.0.0",
+    "license": "AGPL-3",
+    "author": "ACSONE SA/NV, Odoo Community Association (OCA), Numigi",
+    "website": "https://github.com/OCA/product-attribute",
+    "depends": ["product"],
+    "data": [
+        "security/product_template_rule.xml",
+        "security/product_template_tag.xml",
+        "views/product_template.xml",
+        "views/product_template_tag.xml",
+    ],
+    "maintainers": ["patrickrwilson"],
+}
diff --git a/product_template_tags/i18n/de.po b/product_template_tags/i18n/de.po
new file mode 100644
index 000000000000..022839234337
--- /dev/null
+++ b/product_template_tags/i18n/de.po
@@ -0,0 +1,103 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * product_template_tags
+#
+# Translators:
+# Niki Waibel, 2018
+# Rudolf Schnapka <rs@techno-flex.de>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-01-29 08:49+0000\n"
+"PO-Revision-Date: 2018-01-29 08:49+0000\n"
+"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>, 2018\n"
+"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\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"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__products_count
+msgid "# of Products"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__color
+msgid "Color Index"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__company_id
+#: model_terms:ir.ui.view,arch_db:product_template_tags.product_template_tag_search_view
+msgid "Company"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__create_uid
+msgid "Created by"
+msgstr "Angelegt durch"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__create_date
+msgid "Created on"
+msgstr "Angelegt am"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__display_name
+msgid "Display Name"
+msgstr "Anzeigebezeichnung"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__id
+msgid "ID"
+msgstr "ID"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag____last_update
+msgid "Last Modified on"
+msgstr "Zuletzt verändert am"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__write_uid
+msgid "Last Updated by"
+msgstr "Zuletzt aktualisiert durch"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__write_date
+msgid "Last Updated on"
+msgstr "Zuletzt aktualisiert am"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__name
+msgid "Name"
+msgstr "Bezeichnung"
+
+#. module: product_template_tags
+#: model:ir.model,name:product_template_tags.model_product_template_tag
+msgid "Product Tag"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_product__tag_ids
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template__tag_ids
+#: model:ir.ui.menu,name:product_template_tags.product_template_tag_config_menu
+msgid "Product Tags"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model,name:product_template_tags.model_product_template
+msgid "Product Template"
+msgstr "Produktvorlage"
+
+#. module: product_template_tags
+#: model:ir.actions.act_window,name:product_template_tags.product_template_tag_act_window
+msgid "Product Template Tag"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__product_tmpl_ids
+msgid "Products"
+msgstr "Produkte"
diff --git a/product_template_tags/i18n/es.po b/product_template_tags/i18n/es.po
new file mode 100644
index 000000000000..29fa43a849de
--- /dev/null
+++ b/product_template_tags/i18n/es.po
@@ -0,0 +1,102 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * product_template_tags
+#
+# Translators:
+# Pedro M. Baeza <pedro.baeza@gmail.com>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-01-03 02:14+0000\n"
+"PO-Revision-Date: 2018-01-03 02:14+0000\n"
+"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>, 2018\n"
+"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\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"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__products_count
+msgid "# of Products"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__color
+msgid "Color Index"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__company_id
+#: model_terms:ir.ui.view,arch_db:product_template_tags.product_template_tag_search_view
+msgid "Company"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__create_uid
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__create_date
+msgid "Created on"
+msgstr "Creado el"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__display_name
+msgid "Display Name"
+msgstr "Nombre mostrado"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__id
+msgid "ID"
+msgstr "ID"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag____last_update
+msgid "Last Modified on"
+msgstr "Última modificación el"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__write_uid
+msgid "Last Updated by"
+msgstr "Última actualización por"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__write_date
+msgid "Last Updated on"
+msgstr "Última modificación el"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__name
+msgid "Name"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model,name:product_template_tags.model_product_template_tag
+msgid "Product Tag"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_product__tag_ids
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template__tag_ids
+#: model:ir.ui.menu,name:product_template_tags.product_template_tag_config_menu
+msgid "Product Tags"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model,name:product_template_tags.model_product_template
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+#. module: product_template_tags
+#: model:ir.actions.act_window,name:product_template_tags.product_template_tag_act_window
+msgid "Product Template Tag"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__product_tmpl_ids
+msgid "Products"
+msgstr "Productos"
diff --git a/product_template_tags/i18n/fr.po b/product_template_tags/i18n/fr.po
new file mode 100644
index 000000000000..7e9afa447642
--- /dev/null
+++ b/product_template_tags/i18n/fr.po
@@ -0,0 +1,102 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * product_template_tags
+#
+# Translators:
+# OCA Transbot <transbot@odoo-community.org>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-01-27 03:49+0000\n"
+"PO-Revision-Date: 2018-01-27 03:49+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
+"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n"
+"Language: fr\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: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__products_count
+msgid "# of Products"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__color
+msgid "Color Index"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__company_id
+#: model_terms:ir.ui.view,arch_db:product_template_tags.product_template_tag_search_view
+msgid "Company"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__create_uid
+msgid "Created by"
+msgstr "Créé par"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__create_date
+msgid "Created on"
+msgstr "Créé le"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__display_name
+msgid "Display Name"
+msgstr "Nom affiché"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__id
+msgid "ID"
+msgstr "ID"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag____last_update
+msgid "Last Modified on"
+msgstr "Dernière Modification le"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__write_uid
+msgid "Last Updated by"
+msgstr "Dernière mise à jour par"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__write_date
+msgid "Last Updated on"
+msgstr "Dernière mise à jour le"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__name
+msgid "Name"
+msgstr "Nom"
+
+#. module: product_template_tags
+#: model:ir.model,name:product_template_tags.model_product_template_tag
+msgid "Product Tag"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_product__tag_ids
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template__tag_ids
+#: model:ir.ui.menu,name:product_template_tags.product_template_tag_config_menu
+msgid "Product Tags"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model,name:product_template_tags.model_product_template
+msgid "Product Template"
+msgstr "Modèle de produit"
+
+#. module: product_template_tags
+#: model:ir.actions.act_window,name:product_template_tags.product_template_tag_act_window
+msgid "Product Template Tag"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__product_tmpl_ids
+msgid "Products"
+msgstr ""
diff --git a/product_template_tags/i18n/hr.po b/product_template_tags/i18n/hr.po
new file mode 100644
index 000000000000..f2f304846161
--- /dev/null
+++ b/product_template_tags/i18n/hr.po
@@ -0,0 +1,103 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * product_template_tags
+#
+# Translators:
+# Bole <bole@dajmi5.com>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-01-29 08:49+0000\n"
+"PO-Revision-Date: 2018-01-29 08:49+0000\n"
+"Last-Translator: Bole <bole@dajmi5.com>, 2018\n"
+"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n"
+"Language: hr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__products_count
+msgid "# of Products"
+msgstr "# proizvoda"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__color
+msgid "Color Index"
+msgstr "Index boje"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__company_id
+#: model_terms:ir.ui.view,arch_db:product_template_tags.product_template_tag_search_view
+msgid "Company"
+msgstr "Tvrtka"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__create_uid
+msgid "Created by"
+msgstr "Kreirao"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__create_date
+msgid "Created on"
+msgstr "Kreirano"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__display_name
+msgid "Display Name"
+msgstr "Naziv"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__id
+msgid "ID"
+msgstr "ID"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag____last_update
+msgid "Last Modified on"
+msgstr "Zadnje ažurirano"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__write_uid
+msgid "Last Updated by"
+msgstr "Zadnji ažurirao"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__write_date
+msgid "Last Updated on"
+msgstr "Zadnje ažurirano"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__name
+msgid "Name"
+msgstr "naziv"
+
+#. module: product_template_tags
+#: model:ir.model,name:product_template_tags.model_product_template_tag
+msgid "Product Tag"
+msgstr "Oznaka proizvoda"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_product__tag_ids
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template__tag_ids
+#: model:ir.ui.menu,name:product_template_tags.product_template_tag_config_menu
+msgid "Product Tags"
+msgstr "Oznake proizvoda"
+
+#. module: product_template_tags
+#: model:ir.model,name:product_template_tags.model_product_template
+msgid "Product Template"
+msgstr "Predložak proizvoda"
+
+#. module: product_template_tags
+#: model:ir.actions.act_window,name:product_template_tags.product_template_tag_act_window
+msgid "Product Template Tag"
+msgstr "Oznaka predloška proizvoda"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__product_tmpl_ids
+msgid "Products"
+msgstr "Proizvodi"
diff --git a/product_template_tags/i18n/it.po b/product_template_tags/i18n/it.po
new file mode 100644
index 000000000000..69358b3d313d
--- /dev/null
+++ b/product_template_tags/i18n/it.po
@@ -0,0 +1,103 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * product_template_tags
+#
+# Translators:
+# Giuliano Lotta <giuliano.lotta@gmail.com>, 2018
+# Paolo Valier <paolo.valier@hotmail.it>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-01-03 02:14+0000\n"
+"PO-Revision-Date: 2018-01-03 02:14+0000\n"
+"Last-Translator: Paolo Valier <paolo.valier@hotmail.it>, 2018\n"
+"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\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: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__products_count
+msgid "# of Products"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__color
+msgid "Color Index"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__company_id
+#: model_terms:ir.ui.view,arch_db:product_template_tags.product_template_tag_search_view
+msgid "Company"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__create_uid
+msgid "Created by"
+msgstr "Creato da"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__create_date
+msgid "Created on"
+msgstr "Creato il"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__display_name
+msgid "Display Name"
+msgstr "Nome visualizzato"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__id
+msgid "ID"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag____last_update
+msgid "Last Modified on"
+msgstr "Ultima Modifica il"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__write_uid
+msgid "Last Updated by"
+msgstr "Ultimo Aggiornamento di"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__write_date
+msgid "Last Updated on"
+msgstr "Ultimo Aggiornamento il"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__name
+msgid "Name"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model,name:product_template_tags.model_product_template_tag
+msgid "Product Tag"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_product__tag_ids
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template__tag_ids
+#: model:ir.ui.menu,name:product_template_tags.product_template_tag_config_menu
+msgid "Product Tags"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model,name:product_template_tags.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.actions.act_window,name:product_template_tags.product_template_tag_act_window
+msgid "Product Template Tag"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__product_tmpl_ids
+msgid "Products"
+msgstr "Prodotti"
diff --git a/product_template_tags/i18n/nl_NL.po b/product_template_tags/i18n/nl_NL.po
new file mode 100644
index 000000000000..53e96c229b82
--- /dev/null
+++ b/product_template_tags/i18n/nl_NL.po
@@ -0,0 +1,103 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * product_template_tags
+#
+# Translators:
+# Peter Hageman <hageman.p@gmail.com>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-01-03 02:14+0000\n"
+"PO-Revision-Date: 2018-01-03 02:14+0000\n"
+"Last-Translator: Peter Hageman <hageman.p@gmail.com>, 2018\n"
+"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/"
+"teams/23907/nl_NL/)\n"
+"Language: nl_NL\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: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__products_count
+msgid "# of Products"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__color
+msgid "Color Index"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__company_id
+#: model_terms:ir.ui.view,arch_db:product_template_tags.product_template_tag_search_view
+msgid "Company"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__create_uid
+msgid "Created by"
+msgstr "Aangemaakt door"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__create_date
+msgid "Created on"
+msgstr "Aangemaakt op"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__display_name
+msgid "Display Name"
+msgstr "Weergavenaam"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__id
+msgid "ID"
+msgstr "ID"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__write_uid
+msgid "Last Updated by"
+msgstr "Laatst aangepast door"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__write_date
+msgid "Last Updated on"
+msgstr "Laatst aangepast op"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__name
+msgid "Name"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model,name:product_template_tags.model_product_template_tag
+msgid "Product Tag"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_product__tag_ids
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template__tag_ids
+#: model:ir.ui.menu,name:product_template_tags.product_template_tag_config_menu
+msgid "Product Tags"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model,name:product_template_tags.model_product_template
+msgid "Product Template"
+msgstr "Productsjabloon"
+
+#. module: product_template_tags
+#: model:ir.actions.act_window,name:product_template_tags.product_template_tag_act_window
+msgid "Product Template Tag"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__product_tmpl_ids
+msgid "Products"
+msgstr "Producten"
diff --git a/product_template_tags/i18n/product_template_tags.pot b/product_template_tags/i18n/product_template_tags.pot
new file mode 100644
index 000000000000..b3fc1be3f44c
--- /dev/null
+++ b/product_template_tags/i18n/product_template_tags.pot
@@ -0,0 +1,98 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* product_template_tags
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.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: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__products_count
+msgid "# of Products"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__color
+msgid "Color Index"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__company_id
+#: model_terms:ir.ui.view,arch_db:product_template_tags.product_template_tag_search_view
+msgid "Company"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__id
+msgid "ID"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__name
+msgid "Name"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model,name:product_template_tags.model_product_template_tag
+msgid "Product Tag"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_product__tag_ids
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template__tag_ids
+#: model:ir.ui.menu,name:product_template_tags.product_template_tag_config_menu
+msgid "Product Tags"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model,name:product_template_tags.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.actions.act_window,name:product_template_tags.product_template_tag_act_window
+msgid "Product Template Tag"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__product_tmpl_ids
+msgid "Products"
+msgstr ""
+
diff --git a/product_template_tags/i18n/sl.po b/product_template_tags/i18n/sl.po
new file mode 100644
index 000000000000..05a7ed97f5c4
--- /dev/null
+++ b/product_template_tags/i18n/sl.po
@@ -0,0 +1,103 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * product_template_tags
+#
+# Translators:
+# OCA Transbot <transbot@odoo-community.org>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-01-27 03:49+0000\n"
+"PO-Revision-Date: 2018-01-27 03:49+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
+"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n"
+"Language: sl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__products_count
+msgid "# of Products"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__color
+msgid "Color Index"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__company_id
+#: model_terms:ir.ui.view,arch_db:product_template_tags.product_template_tag_search_view
+msgid "Company"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__create_uid
+msgid "Created by"
+msgstr "Ustvaril"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__create_date
+msgid "Created on"
+msgstr "Ustvarjeno"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__display_name
+msgid "Display Name"
+msgstr "Prikazni naziv"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__id
+msgid "ID"
+msgstr "ID"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag____last_update
+msgid "Last Modified on"
+msgstr "Zadnja sprememba"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__write_uid
+msgid "Last Updated by"
+msgstr "Zadnji posodobil"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__write_date
+msgid "Last Updated on"
+msgstr "Zadnja posodobitev"
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__name
+msgid "Name"
+msgstr "Naziv"
+
+#. module: product_template_tags
+#: model:ir.model,name:product_template_tags.model_product_template_tag
+msgid "Product Tag"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_product__tag_ids
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template__tag_ids
+#: model:ir.ui.menu,name:product_template_tags.product_template_tag_config_menu
+msgid "Product Tags"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model,name:product_template_tags.model_product_template
+msgid "Product Template"
+msgstr "Predloga proizvoda"
+
+#. module: product_template_tags
+#: model:ir.actions.act_window,name:product_template_tags.product_template_tag_act_window
+msgid "Product Template Tag"
+msgstr ""
+
+#. module: product_template_tags
+#: model:ir.model.fields,field_description:product_template_tags.field_product_template_tag__product_tmpl_ids
+msgid "Products"
+msgstr ""
diff --git a/product_template_tags/models/__init__.py b/product_template_tags/models/__init__.py
new file mode 100644
index 000000000000..4b28608ef187
--- /dev/null
+++ b/product_template_tags/models/__init__.py
@@ -0,0 +1,2 @@
+from . import product_template
+from . import product_template_tag
diff --git a/product_template_tags/models/product_template.py b/product_template_tags/models/product_template.py
new file mode 100644
index 000000000000..93b68cd3a0b3
--- /dev/null
+++ b/product_template_tags/models/product_template.py
@@ -0,0 +1,17 @@
+# Copyright 2017 ACSONE SA/NV
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class ProductTemplate(models.Model):
+
+    _inherit = "product.template"
+
+    tag_ids = fields.Many2many(
+        comodel_name="product.template.tag",
+        string="Product Tags",
+        relation="product_template_product_tag_rel",
+        column1="product_tmpl_id",
+        column2="tag_id",
+    )
diff --git a/product_template_tags/models/product_template_tag.py b/product_template_tags/models/product_template_tag.py
new file mode 100644
index 000000000000..4b452841ec49
--- /dev/null
+++ b/product_template_tags/models/product_template_tag.py
@@ -0,0 +1,33 @@
+# Copyright 2017 ACSONE SA/NV
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class ProductTemplateTag(models.Model):
+
+    _name = "product.template.tag"
+    _description = "Product Tag"
+
+    name = fields.Char(string="Name", required=True, translate=True)
+    color = fields.Integer(string="Color Index")
+    product_tmpl_ids = fields.Many2many(
+        comodel_name="product.template",
+        string="Products",
+        relation="product_template_product_tag_rel",
+        column1="tag_id",
+        column2="product_tmpl_id",
+    )
+    products_count = fields.Integer(
+        string="# of Products", compute="_compute_products_count", store=True
+    )
+    company_id = fields.Many2one(
+        comodel_name="res.company",
+        string="Company",
+        default=lambda self: self.env.company,
+    )
+
+    @api.depends("product_tmpl_ids")
+    def _compute_products_count(self):
+        for rec in self:
+            rec.products_count = len(rec.product_tmpl_ids)
diff --git a/product_template_tags/readme/CONFIGURE.rst b/product_template_tags/readme/CONFIGURE.rst
new file mode 100644
index 000000000000..318d930cece0
--- /dev/null
+++ b/product_template_tags/readme/CONFIGURE.rst
@@ -0,0 +1,4 @@
+To configure this module, you need to:
+
+#. Go to the product form view.
+#. Create and edit tags using the form view
diff --git a/product_template_tags/readme/CONTRIBUTORS.rst b/product_template_tags/readme/CONTRIBUTORS.rst
new file mode 100644
index 000000000000..c86d824a2534
--- /dev/null
+++ b/product_template_tags/readme/CONTRIBUTORS.rst
@@ -0,0 +1,4 @@
+* Benjamin Willig <benjamin.willig@acsone.eu>
+* Numigi (tm) and all its contributors (https://bit.ly/numigiens)
+* Patrick Wilson <patrickraymondwilson@gmail.com>
+* Pimolnat Suntian <pimolnats@ecosoft.co.th>
diff --git a/product_template_tags/readme/DESCRIPTION.rst b/product_template_tags/readme/DESCRIPTION.rst
new file mode 100644
index 000000000000..c8e855f83a34
--- /dev/null
+++ b/product_template_tags/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This addon allows to add tags on products.
diff --git a/product_template_tags/readme/USAGE.rst b/product_template_tags/readme/USAGE.rst
new file mode 100644
index 000000000000..e8e88d0da4a6
--- /dev/null
+++ b/product_template_tags/readme/USAGE.rst
@@ -0,0 +1,4 @@
+To use this module, you need to:
+
+#. On the product view, you can add and create tags.
+#. Tags will be shown in the kanban view.
diff --git a/product_template_tags/security/product_template_rule.xml b/product_template_tags/security/product_template_rule.xml
new file mode 100644
index 000000000000..5d975001f05e
--- /dev/null
+++ b/product_template_tags/security/product_template_rule.xml
@@ -0,0 +1,14 @@
+<!-- Copyright 2017 ACSONE SA/NV
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+
+<odoo>
+    <record id="product_template_tag_company_user" model="ir.rule">
+        <field name="name">product.template.tag company (in product_template_tags)</field>
+        <field name="model_id" ref="model_product_template_tag"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+        <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
+    </record>
+</odoo>
diff --git a/product_template_tags/security/product_template_tag.xml b/product_template_tags/security/product_template_tag.xml
new file mode 100644
index 000000000000..3c88f27b2da4
--- /dev/null
+++ b/product_template_tags/security/product_template_tag.xml
@@ -0,0 +1,14 @@
+<!-- Copyright 2017 ACSONE SA/NV
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+
+<odoo>
+    <record id="product_template_tag_access_user" model="ir.model.access">
+        <field name="name">product.template.tag access user (in product_template_tags)</field>
+        <field name="model_id" ref="model_product_template_tag"/>
+        <field name="group_id" ref="base.group_user"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+</odoo>
diff --git a/product_template_tags/static/description/icon.png b/product_template_tags/static/description/icon.png
new file mode 100644
index 000000000000..3a0328b516c4
Binary files /dev/null and b/product_template_tags/static/description/icon.png differ
diff --git a/product_template_tags/static/description/index.html b/product_template_tags/static/description/index.html
new file mode 100644
index 000000000000..fb99e92370f0
--- /dev/null
+++ b/product_template_tags/static/description/index.html
@@ -0,0 +1,443 @@
+<?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 0.15.1: http://docutils.sourceforge.net/" />
+<title>Product Template Tags</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/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="product-template-tags">
+<h1 class="title">Product Template Tags</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external" 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" 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" href="https://github.com/OCA/product-attribute/tree/13.0/product_template_tags"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/product-attribute-13-0/product-attribute-13-0-product_template_tags"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/135/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>This addon allows to add tags on products.</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="id1">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id7">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
+<p>To configure this module, you need to:</p>
+<ol class="arabic simple">
+<li>Go to the product form view.</li>
+<li>Create and edit tags using the form view</li>
+</ol>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id2">Usage</a></h1>
+<p>To use this module, you need to:</p>
+<ol class="arabic simple">
+<li>On the product view, you can add and create tags.</li>
+<li>Tags will be shown in the kanban view.</li>
+</ol>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id3">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/product-attribute/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 smashing it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/product-attribute/issues/new?body=module:%20product_template_tags%0Aversion:%2013.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="#id4">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id5">Authors</a></h2>
+<ul class="simple">
+<li>ACSONE SA/NV</li>
+<li>Numigi</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
+<ul class="simple">
+<li>Benjamin Willig &lt;<a class="reference external" href="mailto:benjamin.willig&#64;acsone.eu">benjamin.willig&#64;acsone.eu</a>&gt;</li>
+<li>Numigi (tm) and all its contributors (<a class="reference external" href="https://bit.ly/numigiens">https://bit.ly/numigiens</a>)</li>
+<li>Patrick Wilson &lt;<a class="reference external" href="mailto:patrickraymondwilson&#64;gmail.com">patrickraymondwilson&#64;gmail.com</a>&gt;</li>
+<li>Pimolnat Suntian &lt;<a class="reference external" href="mailto:pimolnats&#64;ecosoft.co.th">pimolnats&#64;ecosoft.co.th</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id7">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>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
+<p><a class="reference external" href="https://github.com/patrickrwilson"><img alt="patrickrwilson" src="https://github.com/patrickrwilson.png?size=40px" /></a></p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/product-attribute/tree/13.0/product_template_tags">OCA/product-attribute</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/product_template_tags/tests/__init__.py b/product_template_tags/tests/__init__.py
new file mode 100644
index 000000000000..11b1950dbb59
--- /dev/null
+++ b/product_template_tags/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright 2017 ACSONE SA/NV
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import test_product_template_tags
diff --git a/product_template_tags/tests/test_product_template_tags.py b/product_template_tags/tests/test_product_template_tags.py
new file mode 100644
index 000000000000..8afe44fd0fe7
--- /dev/null
+++ b/product_template_tags/tests/test_product_template_tags.py
@@ -0,0 +1,18 @@
+# Copyright 2017 ACSONE SA/NV
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo.tests.common import SavepointCase
+
+
+class TestProductTemplateTag(SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.product_tmpl = cls.env["product.template"].create({"name": "Test Product"})
+
+    def test_product_template_tag(self):
+        product_tmpl_tag = self.env["product.template.tag"].create(
+            {"name": "Test Tag", "product_tmpl_ids": [(6, 0, [self.product_tmpl.id])]}
+        )
+        product_tmpl_tag._compute_products_count()
+        self.assertEqual(product_tmpl_tag.products_count, 1)
diff --git a/product_template_tags/views/product_template.xml b/product_template_tags/views/product_template.xml
new file mode 100644
index 000000000000..d889562a2d5c
--- /dev/null
+++ b/product_template_tags/views/product_template.xml
@@ -0,0 +1,47 @@
+<!-- Copyright 2017 ACSONE SA/NV
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+
+<odoo>
+    <record id="product_template_form_view" model="ir.ui.view">
+        <field name="name">product.template.form</field>
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="product.product_template_form_view"/>
+        <field name="arch" type="xml">
+            <group name="group_general" position="inside">
+                <field name="tag_ids"
+                       widget="many2many_tags"
+                       options="{'color_field': 'color'}"/>
+            </group>
+        </field>
+    </record>
+
+    <record id="product_template_kanban_view" model="ir.ui.view">
+        <field name="name">product.template.kanban (in product_template_tags)</field>
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="product.product_template_kanban_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//t[@t-name='kanban-box']//div[hasclass('o_kanban_image')]"
+                   position="before">
+                <div class="o_kanban_tags_section">
+                    <span class="oe_kanban_list_many2many">
+                        <field name="tag_ids"
+                               widget="many2many_tags"
+                               options="{'color_field': 'color'}"/>
+                    </span>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="product_template_search_view" model="ir.ui.view">
+        <field name="name">product.template.search (in product_template_tags)</field>
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="product.product_template_search_view"/>
+        <field name="arch" type="xml">
+            <field name="categ_id" position="after">
+                <field name="tag_ids"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/product_template_tags/views/product_template_tag.xml b/product_template_tags/views/product_template_tag.xml
new file mode 100644
index 000000000000..c9b4123fbafa
--- /dev/null
+++ b/product_template_tags/views/product_template_tag.xml
@@ -0,0 +1,81 @@
+<!-- Copyright 2017 ACSONE SA/NV
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+
+<odoo>
+    <record id="product_template_tag_form_view" model="ir.ui.view">
+        <field name="name">product.template.tag.form (in product_template_tags)</field>
+        <field name="model">product.template.tag</field>
+        <field name="arch" type="xml">
+            <form>
+                <header/>
+                <sheet>
+                    <div class="oe_button_box" name="button_box">
+                        <button name="%(product.product_template_action)d"
+                                type="action"
+                                class="oe_stat_button"
+                                icon="fa-archive"
+                                context="{'search_default_tag_ids': active_id}">
+                            <field name="products_count" widget="statinfo"/>
+                        </button>
+                    </div>
+
+                    <group>
+                        <field name="name"/>
+                        <field name="company_id"
+                               option="{no_create_edit: True}"
+                               groups="base.group_multi_company"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="product_template_tag_search_view" model="ir.ui.view">
+        <field name="name">product.template.tag.search (in product_template_tags)</field>
+        <field name="model">product.template.tag</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="name"/>
+                <field name="company_id"/>
+                <group expand="0">
+                    <filter name="group_by_company" string="Company"
+                            domain="[]" context="{'group_by': 'company_id'}"
+                            groups="base.group_multi_company"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="product_template_tag_tree_view" model="ir.ui.view">
+        <field name="name">product.template.tag.tree (in product_template_tags)</field>
+        <field name="model">product.template.tag</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name"/>
+                <field name="company_id"
+                       widget="selection"
+                       groups="base.group_multi_company"/>
+                <field name="products_count"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="product_template_tag_act_window" model="ir.actions.act_window">
+        <field name="name">Product Template Tag</field>
+        <field name="res_model">product.template.tag</field>
+        <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="product_template_tag_search_view"/>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_empty_folder">
+                Add tags
+            </p>
+        </field>
+    </record>
+
+    <record id="product_template_tag_config_menu" model="ir.ui.menu">
+        <field name="name">Product Tags</field>
+        <field name="parent_id" ref="base.menu_ir_property"/>
+        <field name="sequence" eval="40"/>
+        <field name="action" ref="product_template_tag_act_window"/>
+    </record>
+</odoo>