diff --git a/purchase_order_secondary_unit/__manifest__.py b/purchase_order_secondary_unit/__manifest__.py
index 52756311d06..b1e44a7b24a 100644
--- a/purchase_order_secondary_unit/__manifest__.py
+++ b/purchase_order_secondary_unit/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Purchase Order Secondary Unit",
     "summary": "Purchase product in a secondary unit",
-    "version": "15.0.1.1.0",
+    "version": "16.0.1.1.0",
     "development_status": "Beta",
     "category": "Purchase",
     "website": "https://github.com/OCA/purchase-workflow",
diff --git a/purchase_order_secondary_unit/models/purchase_order.py b/purchase_order_secondary_unit/models/purchase_order.py
index 3dfb4331466..27ac164ca8b 100644
--- a/purchase_order_secondary_unit/models/purchase_order.py
+++ b/purchase_order_secondary_unit/models/purchase_order.py
@@ -17,8 +17,6 @@ class PurchaseOrderLine(models.Model):
 
     @api.depends("secondary_uom_qty", "secondary_uom_id")
     def _compute_product_qty(self):
-        if hasattr(super(), "_compute_product_qty"):
-            return super()._compute_product_qty()
         return self._compute_helper_target_field_qty()
 
     @api.onchange("product_uom")
diff --git a/purchase_order_secondary_unit/views/product_views.xml b/purchase_order_secondary_unit/views/product_views.xml
index d9f7dd00000..039e3e17e0a 100644
--- a/purchase_order_secondary_unit/views/product_views.xml
+++ b/purchase_order_secondary_unit/views/product_views.xml
@@ -6,10 +6,14 @@
         <field name="name">Product template Secondary Unit</field>
         <field name="model">product.template</field>
         <field name="inherit_id" ref="product.product_template_form_view" />
-        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
         <field name="arch" type="xml">
             <field name="uom_po_id" position="after">
-                <field name="purchase_secondary_uom_id" options="{'no_create': True}" />
+                <t groups="uom.group_uom">
+                    <field
+                        name="purchase_secondary_uom_id"
+                        options="{'no_create': True}"
+                    />
+                </t>
             </field>
         </field>
     </record>
diff --git a/purchase_order_secondary_unit/views/purchase_order_views.xml b/purchase_order_secondary_unit/views/purchase_order_views.xml
index f97aefa1b25..4d7ed109f74 100644
--- a/purchase_order_secondary_unit/views/purchase_order_views.xml
+++ b/purchase_order_secondary_unit/views/purchase_order_views.xml
@@ -6,26 +6,27 @@
         <field name="name">Purchase Order Secondary Unit</field>
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.purchase_order_form" />
-        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
         <field name="arch" type="xml">
             <xpath
                 expr="//field[@name='order_line']/form//field[@name='product_qty']"
                 position="before"
             >
+            <t groups="uom.group_uom">
                 <field
-                    name="secondary_uom_qty"
-                    class="oe_inline oe_no_button"
-                    attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"
-                />
+                        name="secondary_uom_qty"
+                        class="oe_inline oe_no_button"
+                        attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"
+                    />
                 <field
-                    name="secondary_uom_id"
-                    class="oe_inline"
-                    domain="['|', ('product_id', '=', product_id),
+                        name="secondary_uom_id"
+                        class="oe_inline"
+                        domain="['|', ('product_id', '=', product_id),
                                 '&amp;', ('product_tmpl_id.product_variant_ids', 'in', [product_id]),
                                          ('product_id', '=', False)]"
-                    options="{'no_create': True}"
-                    attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"
-                />
+                        options="{'no_create': True}"
+                        attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"
+                    />
+                </t>
             </xpath>
             <xpath
                 expr="//field[@name='order_line']/tree//field[@name='product_qty']"
diff --git a/setup/purchase_order_secondary_unit/odoo/addons/purchase_order_secondary_unit b/setup/purchase_order_secondary_unit/odoo/addons/purchase_order_secondary_unit
new file mode 120000
index 00000000000..1bc72038dc6
--- /dev/null
+++ b/setup/purchase_order_secondary_unit/odoo/addons/purchase_order_secondary_unit
@@ -0,0 +1 @@
+../../../../purchase_order_secondary_unit
\ No newline at end of file
diff --git a/setup/purchase_order_secondary_unit/setup.py b/setup/purchase_order_secondary_unit/setup.py
new file mode 100644
index 00000000000..28c57bb6403
--- /dev/null
+++ b/setup/purchase_order_secondary_unit/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)