diff --git a/mypy.ini b/mypy.ini
index 900be4b..53e114f 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -5,13 +5,8 @@
 exclude = .*/migrations/.*
 
 # Ignore missing imports from Odoo modules
+[mypy-odoo.*]
 ignore_missing_imports = True
 
 [mypy-odoo]
 ignore_missing_imports = True
-
-[mypy-odoo.*]
-ignore_missing_imports = True
-
-[mypy-odoo.addons.*]
-ignore_missing_imports = True
diff --git a/website_sale_aplicoop/__manifest__.py b/website_sale_aplicoop/__manifest__.py
index ac9b0dd..5069ddc 100644
--- a/website_sale_aplicoop/__manifest__.py
+++ b/website_sale_aplicoop/__manifest__.py
@@ -3,7 +3,7 @@
 
 {  # noqa: B018
     "name": "Website Sale - Aplicoop",
-    "version": "18.0.1.7.0",
+    "version": "18.0.1.6.0",
     "category": "Website/Sale",
     "summary": "Modern replacement of legacy Aplicoop - Collaborative consumption group orders",
     "author": "Odoo Community Association (OCA), Criptomart",
@@ -17,7 +17,7 @@
         "stock",
         "account",
         "product_get_price_helper",
-        "product_origin_char",
+        "product_origin",
     ],
     "data": [
         # Datos: Grupos propios
diff --git a/website_sale_aplicoop/views/website_templates.xml b/website_sale_aplicoop/views/website_templates.xml
index b609928..0273cf3 100644
--- a/website_sale_aplicoop/views/website_templates.xml
+++ b/website_sale_aplicoop/views/website_templates.xml
@@ -1142,7 +1142,7 @@
                             </p>
                         </t>
                         <t
-                                t-if="product.origin_text"
+                                t-if="product.country_id or product.state_id"
                             >
                             <p
                                     class="product-origin mb-2"
@@ -1153,8 +1153,21 @@
                                             aria-hidden="true"
                                         />
                                     <t
-                                            t-out="product.origin_text"
-                                        />
+                                            t-if="product.state_id"
+                                        >
+                                        <t
+                                                t-out="product.state_id.name"
+                                            /><t
+                                                t-if="product.country_id"
+                                            >, </t>
+                                    </t>
+                                    <t
+                                            t-if="product.country_id"
+                                        >
+                                        <t
+                                                t-out="product.country_id.name"
+                                            />
+                                    </t>
                                 </small>
                             </p>
                         </t>