diff --git a/stock_orderpoint_generator/README.rst b/stock_orderpoint_generator/README.rst
index 134185358..4eff89ae1 100644
--- a/stock_orderpoint_generator/README.rst
+++ b/stock_orderpoint_generator/README.rst
@@ -14,13 +14,13 @@ Order point generator
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github
-    :target: https://github.com/OCA/stock-logistics-warehouse/tree/11.0/stock_orderpoint_generator
+    :target: https://github.com/OCA/stock-logistics-warehouse/tree/12.0/stock_orderpoint_generator
     :alt: OCA/stock-logistics-warehouse
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-11-0/stock-logistics-warehouse-11-0-stock_orderpoint_generator
+    :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-12-0/stock-logistics-warehouse-12-0-stock_orderpoint_generator
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/153/11.0
+    :target: https://runbot.odoo-community.org/runbot/153/12.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -80,7 +80,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/stock-logistics-warehouse/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/stock-logistics-warehouse/issues/new?body=module:%20stock_orderpoint_generator%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_orderpoint_generator%0Aversion:%2012.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.
 
@@ -118,6 +118,6 @@ 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.
 
-This module is part of the `OCA/stock-logistics-warehouse <https://github.com/OCA/stock-logistics-warehouse/tree/11.0/stock_orderpoint_generator>`_ project on GitHub.
+This module is part of the `OCA/stock-logistics-warehouse <https://github.com/OCA/stock-logistics-warehouse/tree/12.0/stock_orderpoint_generator>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/stock_orderpoint_generator/__manifest__.py b/stock_orderpoint_generator/__manifest__.py
index 5f17e47ec..8c060ed6e 100644
--- a/stock_orderpoint_generator/__manifest__.py
+++ b/stock_orderpoint_generator/__manifest__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Order point generator',
     'summary': 'Mass configuration of stock order points',
-    'version': '11.0.2.0.0',
+    'version': '12.0.1.0.0',
     'author': "Camptocamp, "
               "Tecnativa, "
               "Odoo Community Association (OCA)",
diff --git a/stock_orderpoint_generator/models/orderpoint_template.py b/stock_orderpoint_generator/models/orderpoint_template.py
index b8be41337..0d0b1f7b7 100644
--- a/stock_orderpoint_generator/models/orderpoint_template.py
+++ b/stock_orderpoint_generator/models/orderpoint_template.py
@@ -36,12 +36,8 @@ class OrderpointTemplate(models.Model):
         help="Auto compute minimum quantity "
              "per product for a given a date range",
     )
-    auto_min_date_start = fields.Datetime(
-        string="From",
-    )
-    auto_min_date_end = fields.Datetime(
-        string="To",
-    )
+    auto_min_date_start = fields.Datetime()
+    auto_min_date_end = fields.Datetime()
     auto_min_qty_criteria = fields.Selection(
         selection=[
             ('max', 'Maximum'),
@@ -50,7 +46,6 @@ class OrderpointTemplate(models.Model):
             ('min', 'Minimum'),
         ],
         default='max',
-        string="Criteria",
         help="Select a criteria to auto compute the minimum",
     )
     auto_max_qty = fields.Boolean(
@@ -65,15 +60,10 @@ class OrderpointTemplate(models.Model):
             ('avg', 'Average'),
             ('min', 'Minimum'),
         ],
-        string="Criteria",
         help="Select a criteria to auto compute the maximum",
     )
-    auto_max_date_start = fields.Datetime(
-        string="From",
-    )
-    auto_max_date_end = fields.Datetime(
-        string="To",
-    )
+    auto_max_date_start = fields.Datetime()
+    auto_max_date_end = fields.Datetime()
     auto_generate = fields.Boolean(
         string='Create Rules Automatically',
         help="When checked, the 'Reordering Rule Templates Generator' "
diff --git a/stock_orderpoint_generator/static/description/index.html b/stock_orderpoint_generator/static/description/index.html
index 4203e2984..e31458441 100644
--- a/stock_orderpoint_generator/static/description/index.html
+++ b/stock_orderpoint_generator/static/description/index.html
@@ -367,7 +367,7 @@ ul.auto-toc {
 !! 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/stock-logistics-warehouse/tree/11.0/stock_orderpoint_generator"><img alt="OCA/stock-logistics-warehouse" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-11-0/stock-logistics-warehouse-11-0-stock_orderpoint_generator"><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/153/11.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<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/stock-logistics-warehouse/tree/12.0/stock_orderpoint_generator"><img alt="OCA/stock-logistics-warehouse" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-12-0/stock-logistics-warehouse-12-0-stock_orderpoint_generator"><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/153/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>Add a wizard to configure reordering rules for multiple products in one go,
 and allow to automatically update reordering rules from rule templates.</p>
 <p><strong>Table of contents</strong></p>
@@ -427,7 +427,7 @@ feature on products that have Automatic Reordering Rules Templates.</p>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/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/stock-logistics-warehouse/issues/new?body=module:%20stock_orderpoint_generator%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_orderpoint_generator%0Aversion:%2012.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">
@@ -460,7 +460,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <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>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/11.0/stock_orderpoint_generator">OCA/stock-logistics-warehouse</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/12.0/stock_orderpoint_generator">OCA/stock-logistics-warehouse</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>
diff --git a/stock_orderpoint_generator/views/orderpoint_template_views.xml b/stock_orderpoint_generator/views/orderpoint_template_views.xml
index dd7bf9996..6560e1b47 100644
--- a/stock_orderpoint_generator/views/orderpoint_template_views.xml
+++ b/stock_orderpoint_generator/views/orderpoint_template_views.xml
@@ -30,8 +30,8 @@
                 <field name="location_id" groups="stock.group_stock_multi_locations"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <group expand="0" string="Group By">
-                    <filter string="Warehouse" domain="[]"  context="{'group_by':'warehouse_id'}"/>
-                    <filter string="Location" domain="[]" context="{'group_by':'location_id'}"/>
+                    <filter string="Warehouse" name="warehouse" domain="[]"  context="{'group_by':'warehouse_id'}"/>
+                    <filter string="Location" name="location" domain="[]" context="{'group_by':'location_id'}"/>
                 </group>
             </search>
         </field>
@@ -77,14 +77,14 @@
                             </div>
                         </group>
                         <group name="auto_minimum" string="Auto Minimum Criteria" attrs="{'invisible': [('auto_min_qty','=', False)]}">
-                            <field name="auto_min_qty_criteria" attrs="{'required': [('auto_min_qty','!=', False)]}"/>
-                            <field name="auto_min_date_start" attrs="{'required': [('auto_min_qty','!=', False)]}"/>
-                            <field name="auto_min_date_end" attrs="{'required': [('auto_min_qty','!=', False)]}"/>
+                            <field name="auto_min_qty_criteria" string="Criteria" attrs="{'required': [('auto_min_qty','!=', False)]}"/>
+                            <field name="auto_min_date_start" string="From" attrs="{'required': [('auto_min_qty','!=', False)]}"/>
+                            <field name="auto_min_date_end" string="To" attrs="{'required': [('auto_min_qty','!=', False)]}"/>
                         </group>
                         <group name="auto_maximum" string="Auto Maximum Criteria" attrs="{'invisible': [('auto_max_qty','=', False)]}">
-                            <field name="auto_max_qty_criteria" attrs="{'required': [('auto_max_qty','!=', False)]}"/>
-                            <field name="auto_max_date_start" attrs="{'required': [('auto_max_qty','!=', False)]}"/>
-                            <field name="auto_max_date_end" attrs="{'required': [('auto_max_qty','!=', False)]}"/>
+                            <field name="auto_max_qty_criteria" string="Criteria" attrs="{'required': [('auto_max_qty','!=', False)]}"/>
+                            <field name="auto_max_date_start" string="From" attrs="{'required': [('auto_max_qty','!=', False)]}"/>
+                            <field name="auto_max_date_end" string="To" attrs="{'required': [('auto_max_qty','!=', False)]}"/>
                         </group>
                     </group>
                     <notebook attrs="{'invisible': [('auto_generate', '=', False)]}">
diff --git a/stock_orderpoint_generator/wizard/orderpoint_generator_view.xml b/stock_orderpoint_generator/wizard/orderpoint_generator_view.xml
index 903952589..405e054a4 100644
--- a/stock_orderpoint_generator/wizard/orderpoint_generator_view.xml
+++ b/stock_orderpoint_generator/wizard/orderpoint_generator_view.xml
@@ -6,7 +6,7 @@
         <field name="model">stock.warehouse.orderpoint.generator</field>
         <field name="arch" type="xml">
             <form string="Reordering Rules Generator">
-                <label string="This wizard will apply the following orderpoint to selected product(s)"/>
+                <label for="orderpoint_template" string="This wizard will apply the following orderpoint to selected product(s)"/>
                 <group string="Templates" colspan="4">
                     <field name="orderpoint_template_id" colspan="4"/>
                 </group>