diff --git a/agreement_mrp/README.rst b/agreement_mrp/README.rst
index e9bd57b97..d49d5127a 100644
--- a/agreement_mrp/README.rst
+++ b/agreement_mrp/README.rst
@@ -14,13 +14,13 @@ Agreement - MRP
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcontract-lightgray.png?logo=github
-    :target: https://github.com/OCA/contract/tree/11.0/agreement_mrp
+    :target: https://github.com/OCA/contract/tree/12.0/agreement_mrp
     :alt: OCA/contract
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/contract-11-0/contract-11-0-agreement_mrp
+    :target: https://translation.odoo-community.org/projects/contract-12-0/contract-12-0-agreement_mrp
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/110/11.0
+    :target: https://runbot.odoo-community.org/runbot/110/12.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -75,6 +75,7 @@ Contributors
 ~~~~~~~~~~~~
 
 * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -107,6 +108,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-smangukiya| |maintainer-max3903| 
 
-This module is part of the `OCA/contract <https://github.com/OCA/contract/tree/11.0/agreement_mrp>`_ project on GitHub.
+This module is part of the `OCA/contract <https://github.com/OCA/contract/tree/12.0/agreement_mrp>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/agreement_mrp/__manifest__.py b/agreement_mrp/__manifest__.py
index 1dc9802e2..274920524 100644
--- a/agreement_mrp/__manifest__.py
+++ b/agreement_mrp/__manifest__.py
@@ -4,13 +4,13 @@
 {
     'name': 'Agreement - MRP',
     'summary': 'Link manufacturing orders to an agreement',
-    'version': '11.0.0.0.1',
+    'version': '12.0.1.0.0',
     'category': 'Contract',
     'author': 'Open Source Integrators, '
               'Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/contract',
     'depends': [
-        'agreement',
+        'agreement_serviceprofile',
         'mrp',
     ],
     'data': [
diff --git a/agreement_mrp/models/agreement.py b/agreement_mrp/models/agreement.py
index 09425d2bf..3e41c9606 100644
--- a/agreement_mrp/models/agreement.py
+++ b/agreement_mrp/models/agreement.py
@@ -11,10 +11,6 @@ class Agreement(models.Model):
 
     @api.multi
     def _compute_mo_count(self):
-        data = self.env['mrp.production'].read_group(
-            [('agreement_id', 'in', self.ids)],
-            ['agreement_id'], ['agreement_id'])
-        count_data = dict((item['agreement_id'][0],
-                           item['agreement_id_count']) for item in data)
-        for agreement in self:
-            agreement.mo_count = count_data.get(agreement.id, 0)
+        for ag_rec in self:
+            ag_rec.mo_count = self.env['mrp.production'].search_count(
+                [('agreement_id', 'in', ag_rec.ids)])
diff --git a/agreement_mrp/readme/CONTRIBUTORS.rst b/agreement_mrp/readme/CONTRIBUTORS.rst
index a76235f8a..373b2a6a2 100644
--- a/agreement_mrp/readme/CONTRIBUTORS.rst
+++ b/agreement_mrp/readme/CONTRIBUTORS.rst
@@ -1 +1,2 @@
 * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
diff --git a/agreement_mrp/static/description/index.html b/agreement_mrp/static/description/index.html
index b57ce74f8..6cb0cdc89 100644
--- a/agreement_mrp/static/description/index.html
+++ b/agreement_mrp/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/contract/tree/11.0/agreement_mrp"><img alt="OCA/contract" src="https://img.shields.io/badge/github-OCA%2Fcontract-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/contract-11-0/contract-11-0-agreement_mrp"><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/110/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/contract/tree/12.0/agreement_mrp"><img alt="OCA/contract" src="https://img.shields.io/badge/github-OCA%2Fcontract-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/contract-11-0/contract-11-0-agreement_mrp"><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/110/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>Odoo Agreement App does not provide an easy way to access manufacturing orders
 related to an agreement. Some organizations needs to have a quick access to the
 production orders to track the performance of an agreement.</p>
@@ -441,7 +441,7 @@ mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</p>
 <p><a class="reference external" href="https://github.com/smangukiya"><img alt="smangukiya" src="https://github.com/smangukiya.png?size=40px" /></a> <a class="reference external" href="https://github.com/max3903"><img alt="max3903" src="https://github.com/max3903.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/contract/tree/11.0/agreement_mrp">OCA/contract</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/contract/tree/12.0/agreement_mrp">OCA/contract</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/agreement_mrp/views/agreement_view.xml b/agreement_mrp/views/agreement_view.xml
index 95e632f5c..55bfa1017 100644
--- a/agreement_mrp/views/agreement_view.xml
+++ b/agreement_mrp/views/agreement_view.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record model="ir.actions.act_window"
-            id="action_mrp_production_agreement_specific">
+    <record id="action_mrp_production_agreement_specific"
+            model="ir.actions.act_window">
         <field name="name">Manufacture Orders</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">mrp.production</field>
@@ -19,7 +19,8 @@
     <record id="partner_agreement_form_view" model="ir.ui.view">
         <field name="name">agreement.form.mrp</field>
         <field name="model">agreement</field>
-        <field name="inherit_id" ref="agreement.partner_agreement_form_view"/>
+        <field name="inherit_id"
+               ref="agreement_legal.partner_agreement_form_view"/>
         <field name="arch" type="xml">
             <xpath expr="//div[@name='button_box']" position="inside">
                 <button name="%(action_mrp_production_agreement_specific)d"
diff --git a/agreement_mrp/views/mrp_view.xml b/agreement_mrp/views/mrp_view.xml
index 6e15544f9..32f42ff25 100644
--- a/agreement_mrp/views/mrp_view.xml
+++ b/agreement_mrp/views/mrp_view.xml
@@ -21,7 +21,8 @@
         <field name="inherit_id" ref="mrp.view_mrp_production_filter"/>
         <field name="arch" type="xml">
             <xpath expr="//group" position="inside">
-                <filter string="Service Profile" domain="[]"
+                <filter string="Service Profile" name="serviceprofile_id"
+                        domain="[]"
                         context="{'group_by':'serviceprofile_id'}"/>
             </xpath>
         </field>