diff --git a/setup/stock_barcodes_gs1_secondary_unit/odoo/addons/stock_barcodes_gs1_secondary_unit b/setup/stock_barcodes_gs1_secondary_unit/odoo/addons/stock_barcodes_gs1_secondary_unit
new file mode 120000
index 000000000000..c4a2bbb0f901
--- /dev/null
+++ b/setup/stock_barcodes_gs1_secondary_unit/odoo/addons/stock_barcodes_gs1_secondary_unit
@@ -0,0 +1 @@
+../../../../stock_barcodes_gs1_secondary_unit
\ No newline at end of file
diff --git a/setup/stock_barcodes_gs1_secondary_unit/setup.py b/setup/stock_barcodes_gs1_secondary_unit/setup.py
new file mode 100644
index 000000000000..28c57bb64031
--- /dev/null
+++ b/setup/stock_barcodes_gs1_secondary_unit/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/stock_barcodes_gs1_secondary_unit/README.rst b/stock_barcodes_gs1_secondary_unit/README.rst
index d24f225b02ab..51db419e4336 100644
--- a/stock_barcodes_gs1_secondary_unit/README.rst
+++ b/stock_barcodes_gs1_secondary_unit/README.rst
@@ -14,14 +14,14 @@ Stock Barcodes GS1 Secondary Unit
     :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--barcode-lightgray.png?logo=github
-    :target: https://github.com/OCA/stock-logistics-barcode/tree/13.0/stock_barcodes_gs1_secondary_unit
+    :target: https://github.com/OCA/stock-logistics-barcode/tree/15.0/stock_barcodes_gs1_secondary_unit
     :alt: OCA/stock-logistics-barcode
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/stock-logistics-barcode-13-0/stock-logistics-barcode-13-0-stock_barcodes_gs1_secondary_unit
+    :target: https://translation.odoo-community.org/projects/stock-logistics-barcode-15-0/stock-logistics-barcode-15-0-stock_barcodes_gs1_secondary_unit
     :alt: Translate me on Weblate
-.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/150/13.0
-    :alt: Try me on Runbot
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/stock-logistics-barcode&target_branch=15.0
+    :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
@@ -44,7 +44,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/stock-logistics-barcode/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-barcode/issues/new?body=module:%20stock_barcodes_gs1_secondary_unit%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/stock-logistics-barcode/issues/new?body=module:%20stock_barcodes_gs1_secondary_unit%0Aversion:%2015.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.
 
@@ -77,6 +77,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-barcode <https://github.com/OCA/stock-logistics-barcode/tree/13.0/stock_barcodes_gs1_secondary_unit>`_ project on GitHub.
+This module is part of the `OCA/stock-logistics-barcode <https://github.com/OCA/stock-logistics-barcode/tree/15.0/stock_barcodes_gs1_secondary_unit>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/stock_barcodes_gs1_secondary_unit/__manifest__.py b/stock_barcodes_gs1_secondary_unit/__manifest__.py
index f5b3146017d4..7d6481400e3b 100644
--- a/stock_barcodes_gs1_secondary_unit/__manifest__.py
+++ b/stock_barcodes_gs1_secondary_unit/__manifest__.py
@@ -4,7 +4,7 @@
     "name": "Stock Barcodes GS1 Secondary Unit",
     "summary": "It provides read package from GS1 barcode stored "
     "into secondary unit data.",
-    "version": "13.0.1.0.0",
+    "version": "15.0.1.0.0",
     "author": "Tecnativa, " "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/stock-logistics-barcode",
     "license": "AGPL-3",
@@ -12,7 +12,6 @@
     "depends": ["stock_barcodes_gs1", "stock_secondary_unit"],
     "data": [
         "views/product_views.xml",
-        "wizard/stock_barcodes_read_inventory_views.xml",
         "wizard/stock_barcodes_read_picking_views.xml",
     ],
     "installable": True,
diff --git a/stock_barcodes_gs1_secondary_unit/models/product_second_unit.py b/stock_barcodes_gs1_secondary_unit/models/product_second_unit.py
index ff657b0a3e49..74e738415c7f 100644
--- a/stock_barcodes_gs1_secondary_unit/models/product_second_unit.py
+++ b/stock_barcodes_gs1_secondary_unit/models/product_second_unit.py
@@ -7,7 +7,6 @@ class ProductSecondaryUnit(models.Model):
     _inherit = "product.secondary.unit"
 
     barcode = fields.Char(
-        string="Barcode",
         copy=False,
         help="International Article Number used for product identification.",
     )
diff --git a/stock_barcodes_gs1_secondary_unit/static/description/index.html b/stock_barcodes_gs1_secondary_unit/static/description/index.html
index a94c4617c315..fb2c28be9720 100644
--- a/stock_barcodes_gs1_secondary_unit/static/description/index.html
+++ b/stock_barcodes_gs1_secondary_unit/static/description/index.html
@@ -3,7 +3,7 @@
 <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/" />
+<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
 <title>Stock Barcodes GS1 Secondary Unit</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Stock Barcodes GS1 Secondary Unit</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/stock-logistics-barcode/tree/13.0/stock_barcodes_gs1_secondary_unit"><img alt="OCA/stock-logistics-barcode" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--barcode-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/stock-logistics-barcode-13-0/stock-logistics-barcode-13-0-stock_barcodes_gs1_secondary_unit"><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/150/13.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-barcode/tree/15.0/stock_barcodes_gs1_secondary_unit"><img alt="OCA/stock-logistics-barcode" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--barcode-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/stock-logistics-barcode-15-0/stock-logistics-barcode-15-0-stock_barcodes_gs1_secondary_unit"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runboat.odoo-community.org/webui/builds.html?repo=OCA/stock-logistics-barcode&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module extends barcode reader GS1 interface module to allow to read
 package barcodes from secondary units model.</p>
 <p><strong>Table of contents</strong></p>
@@ -392,7 +392,7 @@ <h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/stock-logistics-barcode/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-barcode/issues/new?body=module:%20stock_barcodes_gs1_secondary_unit%0Aversion:%2013.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-barcode/issues/new?body=module:%20stock_barcodes_gs1_secondary_unit%0Aversion:%2015.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">
@@ -419,7 +419,7 @@ <h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
 <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-barcode/tree/13.0/stock_barcodes_gs1_secondary_unit">OCA/stock-logistics-barcode</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-barcode/tree/15.0/stock_barcodes_gs1_secondary_unit">OCA/stock-logistics-barcode</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_barcodes_gs1_secondary_unit/views/product_views.xml b/stock_barcodes_gs1_secondary_unit/views/product_views.xml
index 64eb30a99aff..3d6c9d317bdb 100644
--- a/stock_barcodes_gs1_secondary_unit/views/product_views.xml
+++ b/stock_barcodes_gs1_secondary_unit/views/product_views.xml
@@ -2,11 +2,37 @@
 <!-- Copyright 2018 Tecnativa - Sergio Teruel
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
-    <record id="product_secondary_unit_view_tree" model="ir.ui.view">
-        <field name="model">product.secondary.unit</field>
+    <record id="product_template_only_form_view" model="ir.ui.view">
+        <field name="model">product.template</field>
         <field
             name="inherit_id"
-            ref="product_secondary_unit.product_secondary_unit_view_tree"
+            ref="product_secondary_unit.product_template_only_form_view"
+        />
+        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
+        <field name="arch" type="xml">
+            <field name="factor" position="after">
+                <field name="barcode" />
+            </field>
+        </field>
+    </record>
+    <record id="product_normal_form_view" model="ir.ui.view">
+        <field name="model">product.product</field>
+        <field
+            name="inherit_id"
+            ref="product_secondary_unit.product_normal_form_view"
+        />
+        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
+        <field name="arch" type="xml">
+            <field name="factor" position="after">
+                <field name="barcode" />
+            </field>
+        </field>
+    </record>
+    <record id="product_variant_easy_edit_view" model="ir.ui.view">
+        <field name="model">product.product</field>
+        <field
+            name="inherit_id"
+            ref="product_secondary_unit.product_variant_easy_edit_view"
         />
         <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
         <field name="arch" type="xml">
diff --git a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py
index 0997b1843187..a41679f5239f 100644
--- a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py
+++ b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read.py
@@ -69,8 +69,9 @@ def process_barcode_package(self, package_barcode, processed):
 
     @api.onchange("product_id")
     def onchange_product_id(self):
-        super().onchange_product_id()
+        res = super().onchange_product_id()
         self.secondary_uom_id = self.product_id.stock_secondary_uom_id
+        return res
 
     def _set_focus_on_qty_input(self, field_name="product_qty"):
         if self.secondary_uom_id:
@@ -78,7 +79,8 @@ def _set_focus_on_qty_input(self, field_name="product_qty"):
         return super()._set_focus_on_qty_input(field_name=field_name)
 
     def action_clean_values(self):
-        super().action_clean_values()
+        res = super().action_clean_values()
         self.secondary_uom_id = False
         self.secondary_uom_qty = 0.0
         self.secondary_single_qty = 0.0
+        return res
diff --git a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_inventory_views.xml b/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_inventory_views.xml
deleted file mode 100644
index 1766015d6aa5..000000000000
--- a/stock_barcodes_gs1_secondary_unit/wizard/stock_barcodes_read_inventory_views.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<odoo>
-    <record id="view_stock_barcodes_read_inventory_form" model="ir.ui.view">
-        <field name="model">wiz.stock.barcodes.read.inventory</field>
-        <field
-            name="inherit_id"
-            ref="stock_barcodes.view_stock_barcodes_read_inventory_form"
-        />
-        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
-        <field name="arch" type="xml">
-            <div name="total_qty_header" position="before">
-                <div class="col text-center pr-0">
-                    <field name="product_tmpl_id" invisible="1" />
-                    <field
-                        name="secondary_uom_id"
-                        options="{'no_create': True}"
-                        domain="[('product_tmpl_id', '=', product_tmpl_id)]"
-                        force_save="1"
-                        placeholder="Secondary uom"
-                    />
-                </div>
-                <div class="col text-center">
-                    <div>
-                        <field name="product_uom_id" readonly="1" />
-                    </div>
-                </div>
-            </div>
-            <div name="total_qty_field" position="before">
-                <div class="col text-center pr-0">
-                    <div>
-                    </div>
-                    <field
-                        name="secondary_uom_qty"
-                        force_save="1"
-                        widget="numeric_step"
-                        options="{'auto_select': True}"
-                    />
-                </div>
-                <div class="col text-center px-0">
-                    <field
-                        name="secondary_single_qty"
-                        force_save="1"
-                        widget="numeric_step"
-                        options="{'auto_select': True}"
-                    />
-                </div>
-            </div>
-        </field>
-    </record>
-</odoo>