diff --git a/mrp_production_quant_manual_assign/__manifest__.py b/mrp_production_quant_manual_assign/__manifest__.py
index 468acf169..ef1e32721 100644
--- a/mrp_production_quant_manual_assign/__manifest__.py
+++ b/mrp_production_quant_manual_assign/__manifest__.py
@@ -4,7 +4,7 @@
 
 {
     "name": "Production - Manual Quant Assignment",
-    "version": "15.0.1.0.0",
+    "version": "16.0.1.0.0",
     "category": "Manufacturing",
     "license": "AGPL-3",
     "author": "Quartile Limited, ForgeFlow, Odoo Community Association (OCA)",
diff --git a/mrp_production_quant_manual_assign/views/mrp_production_views.xml b/mrp_production_quant_manual_assign/views/mrp_production_views.xml
index e47c88923..a3574ff0f 100644
--- a/mrp_production_quant_manual_assign/views/mrp_production_views.xml
+++ b/mrp_production_quant_manual_assign/views/mrp_production_views.xml
@@ -6,8 +6,8 @@
         <field name="inherit_id" ref="mrp.mrp_production_form_view" />
         <field name="arch" type="xml">
             <xpath
-                expr="//field[@name='move_raw_ids']//field[@name='reserved_availability']"
-                position="after"
+                expr="//field[@name='move_raw_ids']//button[@name='action_show_details']"
+                position="before"
             >
                 <button
                     name="%(stock_quant_manual_assign.assign_manual_quants_action)d"
diff --git a/mrp_production_quant_manual_assign/wizards/assign_manual_quants.py b/mrp_production_quant_manual_assign/wizards/assign_manual_quants.py
index 2f126695c..3dbbf2989 100644
--- a/mrp_production_quant_manual_assign/wizards/assign_manual_quants.py
+++ b/mrp_production_quant_manual_assign/wizards/assign_manual_quants.py
@@ -19,8 +19,8 @@ class AssignManualQuants(models.TransientModel):
         return False
 
     @api.model
-    def default_get(self, fields):
-        res = super(AssignManualQuants, self).default_get(fields)
+    def default_get(self, fields_list):
+        res = super().default_get(fields_list)
         move = self.env["stock.move"].browse(self.env.context["active_id"])
         res.update({"is_production_single_lot": self._is_production_single_lot(move)})
         return res
@@ -42,7 +42,7 @@ class AssignManualQuants(models.TransientModel):
         return line
 
     def assign_quants(self):
-        res = super(AssignManualQuants, self).assign_quants()
+        res = super().assign_quants()
         move = self.move_id
         if self._is_production_single_lot(move):
             precision_digits = self.env["decimal.precision"].precision_get(
@@ -53,8 +53,10 @@ class AssignManualQuants(models.TransientModel):
             ).mapped("lot_id")
             for ml in move.move_line_ids:
                 if ml.lot_id in lots_to_consume:
-                    ml.qty_done = ml.product_qty
-                elif float_is_zero(ml.product_qty, precision_digits=precision_digits):
+                    ml.qty_done = ml.reserved_uom_qty
+                elif float_is_zero(
+                    ml.reserved_uom_qty, precision_digits=precision_digits
+                ):
                     ml.unlink()
                 else:
                     ml.qty_done = 0.0
@@ -65,7 +67,4 @@ class AssignManualQuantsLines(models.TransientModel):
     _inherit = "assign.manual.quants.lines"
 
     to_consume_now = fields.Boolean()
-    qty_done = fields.Float(
-        digits="Product Unit of Measure",
-        readonly=True,
-    )
+    qty_done = fields.Float(digits="Product Unit of Measure", readonly=True)
diff --git a/setup/mrp_production_quant_manual_assign/odoo/addons/mrp_production_quant_manual_assign b/setup/mrp_production_quant_manual_assign/odoo/addons/mrp_production_quant_manual_assign
new file mode 120000
index 000000000..38b495d57
--- /dev/null
+++ b/setup/mrp_production_quant_manual_assign/odoo/addons/mrp_production_quant_manual_assign
@@ -0,0 +1 @@
+../../../../mrp_production_quant_manual_assign
\ No newline at end of file
diff --git a/setup/mrp_production_quant_manual_assign/setup.py b/setup/mrp_production_quant_manual_assign/setup.py
new file mode 100644
index 000000000..28c57bb64
--- /dev/null
+++ b/setup/mrp_production_quant_manual_assign/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)