diff --git a/mrp_subcontracting_purchase_link/__manifest__.py b/mrp_subcontracting_purchase_link/__manifest__.py
index b3eb1817b..ee03e5ed9 100644
--- a/mrp_subcontracting_purchase_link/__manifest__.py
+++ b/mrp_subcontracting_purchase_link/__manifest__.py
@@ -2,7 +2,7 @@
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 {
     "name": "Link Purchase Order to Subcontract Productions",
-    "version": "12.0.1.0.0",
+    "version": "14.0.1.0.0",
     "category": "Manufacturing",
     "license": "LGPL-3",
     "author": "Quartile Limited, Odoo Community Association (OCA)",
diff --git a/mrp_subcontracting_purchase_link/models/purchase_order.py b/mrp_subcontracting_purchase_link/models/purchase_order.py
index 1d07e2d8d..e7e9e4e81 100644
--- a/mrp_subcontracting_purchase_link/models/purchase_order.py
+++ b/mrp_subcontracting_purchase_link/models/purchase_order.py
@@ -1,7 +1,7 @@
 # Copyright 2020 Quartile Limited
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
-from odoo import api, fields, models
+from odoo import fields, models
 
 
 class PurchaseOrder(models.Model):
@@ -17,7 +17,6 @@ class PurchaseOrder(models.Model):
         compute="_compute_subcontract_production_count"
     )
 
-    @api.multi
     def action_view_mrp(self):
         productions = self.subcontract_production_ids
         action = self.env.ref("mrp.mrp_production_action").read()[0]
@@ -32,7 +31,6 @@ class PurchaseOrder(models.Model):
             action = {"type": "ir.actions.act_window_close"}
         return action
 
-    @api.multi
     def _compute_subcontract_production_count(self):
         for order in self:
             order.subcontract_production_count = len(order.subcontract_production_ids)
diff --git a/mrp_subcontracting_purchase_link/views/mrp_production_views.xml b/mrp_subcontracting_purchase_link/views/mrp_production_views.xml
index 6edf033e0..4e4761a3a 100644
--- a/mrp_subcontracting_purchase_link/views/mrp_production_views.xml
+++ b/mrp_subcontracting_purchase_link/views/mrp_production_views.xml
@@ -5,9 +5,9 @@
         <field name="model">mrp.production</field>
         <field name="inherit_id" ref="mrp.mrp_production_form_view" />
         <field name="arch" type="xml">
-            <field name="availability" position="after">
+            <xpath expr="//field[@name='company_id']" position="after">
                 <field name="purchase_order_id" groups="purchase.group_purchase_user" />
-            </field>
+            </xpath>
         </field>
     </record>
 </odoo>
diff --git a/setup/mrp_subcontracting_purchase_link/odoo/addons/mrp_subcontracting_purchase_link b/setup/mrp_subcontracting_purchase_link/odoo/addons/mrp_subcontracting_purchase_link
new file mode 120000
index 000000000..41f80b1ef
--- /dev/null
+++ b/setup/mrp_subcontracting_purchase_link/odoo/addons/mrp_subcontracting_purchase_link
@@ -0,0 +1 @@
+../../../../mrp_subcontracting_purchase_link
\ No newline at end of file
diff --git a/setup/mrp_subcontracting_purchase_link/setup.py b/setup/mrp_subcontracting_purchase_link/setup.py
new file mode 100644
index 000000000..28c57bb64
--- /dev/null
+++ b/setup/mrp_subcontracting_purchase_link/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)