diff --git a/CHANGELOG b/CHANGELOG
index 41da3fec21..11502d1a47 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+* Add country of origin
+
 Version 6.0.0 - 2021-05-03
 * Bug fixes (see mercurial logs for details)
 
diff --git a/product.py b/product.py
index 70b48f9020..d32d6d7efe 100644
--- a/product.py
+++ b/product.py
@@ -55,13 +55,19 @@ class Category(metaclass=PoolMeta):
             return self.parent.customs
         return self.customs
 
-    def get_tariff_code(self, pattern):
+    def get_tariff_codes(self, pattern):
         if not self.tariff_codes_parent:
             for link in self.tariff_codes:
                 if link.tariff_code.match(pattern):
-                    return link.tariff_code
+                    yield link.tariff_code
         else:
-            return self.parent.get_tariff_code(pattern)
+            yield from self.parent.get_tariff_codes(pattern)
+
+    def get_tariff_code(self, pattern):
+        try:
+            return next(self.get_tariff_codes(pattern))
+        except StopIteration:
+            pass
 
     @classmethod
     def view_attributes(cls):
@@ -105,6 +111,12 @@ class Template(metaclass=PoolMeta):
                 | Eval('tariff_codes_category', False)),
             },
         depends=['type', 'tariff_codes_category'])
+    country_of_origin = fields.Many2One(
+        'country.country', "Country",
+        states={
+            'invisible': Eval('type') == 'service',
+            },
+        depends=['type'])
 
     @classmethod
     def __register__(cls, module_name):
@@ -131,13 +143,19 @@ class Template(metaclass=PoolMeta):
     def default_tariff_codes_category(cls):
         return False
 
-    def get_tariff_code(self, pattern):
+    def get_tariff_codes(self, pattern):
         if not self.tariff_codes_category:
             for link in self.tariff_codes:
                 if link.tariff_code.match(pattern):
-                    return link.tariff_code
+                    yield link.tariff_code
         else:
-            return self.customs_category.get_tariff_code(pattern)
+            yield from self.customs_category.get_tariff_codes(pattern)
+
+    def get_tariff_code(self, pattern):
+        try:
+            return next(self.get_tariff_codes(pattern))
+        except StopIteration:
+            pass
 
     @classmethod
     def view_attributes(cls):
@@ -182,3 +200,9 @@ class Product_TariffCode(sequence_ordered(), ModelSQL, ModelView):
 
 class Product(metaclass=PoolMeta):
     __name__ = 'product.product'
+
+    def get_tariff_codes(self, pattern):
+        yield from self.template.get_tariff_codes(pattern)
+
+    def get_tariff_code(self, pattern):
+        return self.template.get_tariff_code(pattern)
diff --git a/view/template_form.xml b/view/template_form.xml
index 018a5f82fb..25603e3e37 100644
--- a/view/template_form.xml
+++ b/view/template_form.xml
@@ -6,7 +6,9 @@ this repository contains the full copyright notices and license terms. -->
         <page string="Customs" id="customs">
             <label name="customs_category"/>
             <field name="customs_category"/>
-            <newline/>
+            <label name="country_of_origin"/>
+            <field name="country_of_origin"/>
+
             <label name="tariff_codes_category"/>
             <field name="tariff_codes_category"/>
             <field name="tariff_codes" colspan="4"