diff --git a/agreement/models/res_config_settings.py b/agreement/models/res_config_settings.py
index b1ff8e04..c84dca13 100644
--- a/agreement/models/res_config_settings.py
+++ b/agreement/models/res_config_settings.py
@@ -11,3 +11,5 @@ class ResConfigSettings(models.TransientModel):
         string='Manage maintenance agreements and contracts')
     module_agreement_mrp = fields.Boolean(
         string='Link your manufacturing orders to an agreement.')
+    module_agreement_stock = fields.Boolean(
+        string='Link your pickings to an agreement.')
diff --git a/agreement/views/res_config_settings.xml b/agreement/views/res_config_settings.xml
index 335a891c..67209cde 100644
--- a/agreement/views/res_config_settings.xml
+++ b/agreement/views/res_config_settings.xml
@@ -59,6 +59,19 @@
                             </div>
                         </div>
                     </div>
+                    <div class="row mt16 o_settings_container">
+                        <div class="col-xs-12 col-md-6 o_setting_box">
+                            <div class="o_setting_left_pane">
+                                <field name="module_agreement_stock"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label string="Stock"/>
+                                <div class="text-muted">
+                                    Link your pickings to an agreement
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </xpath>
         </field>
diff --git a/agreement_mrp/readme/INSTALL.rst b/agreement_mrp/readme/INSTALL.rst
deleted file mode 100644
index c85327b9..00000000
--- a/agreement_mrp/readme/INSTALL.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-To install Field Service and have the mapping features,
-you need to install agreement and mrp
-
-Please refer to the installation instructions available at:
-https://github.com/OCA/contract/agreement_mrp
diff --git a/agreement_mrp/readme/ROADMAP.rst b/agreement_mrp/readme/ROADMAP.rst
index 339c72be..7e6402cf 100644
--- a/agreement_mrp/readme/ROADMAP.rst
+++ b/agreement_mrp/readme/ROADMAP.rst
@@ -1,2 +1,2 @@
-The roadmap of the Field Service application is documented on
-`Github <https://github.com/OCA/contract/issues/221>`_.
+The roadmap of the Agreement application is documented on
+`Github <https://github.com/OCA/contract/issues>`_.
diff --git a/agreement_mrp/views/agreement_view.xml b/agreement_mrp/views/agreement_view.xml
index f357ee6d..659b140f 100644
--- a/agreement_mrp/views/agreement_view.xml
+++ b/agreement_mrp/views/agreement_view.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record model="ir.actions.act_window" id="action_mrp_production_agreement_specific">
+    <record model="ir.actions.act_window"
+            id="action_mrp_production_agreement_specific">
         <field name="name">Manufacture Orders</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">mrp.production</field>
@@ -9,8 +10,8 @@
         <field name="view_mode">tree,form</field>
         <field name="domain">[('agreement_id', '=', active_id)]</field>
         <field name="help" type="html">
-          <p class="oe_view_nocontent_create">
-            Create MOs
+            <p class="oe_view_nocontent_create">
+                Create MOs
             </p>
         </field>
     </record>
@@ -21,9 +22,15 @@
         <field name="inherit_id" ref="agreement.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" type="action" attrs="{'invisible': [('mo_count', '=', 0)]}" class="oe_stat_button" icon="fa-wrench">
+                <button name="%(action_mrp_production_agreement_specific)d"
+                        type="action"
+                        attrs="{'invisible': [('mo_count', '=', 0)]}"
+                        class="oe_stat_button" icon="fa-wrench">
                     <div class="o_field_widget o_stat_info">
-                        <span class="o_stat_value"><field name="mo_count" widget="statinfo" nolabel="1"/></span>
+                        <span class="o_stat_value">
+                            <field name="mo_count" widget="statinfo"
+                                   nolabel="1"/>
+                        </span>
                         <span class="o_stat_text">MOs</span>
                     </div>
                 </button>
diff --git a/agreement_mrp/views/mrp_view.xml b/agreement_mrp/views/mrp_view.xml
index 5c2f3e78..6e15544f 100644
--- a/agreement_mrp/views/mrp_view.xml
+++ b/agreement_mrp/views/mrp_view.xml
@@ -8,11 +8,12 @@
         <field name="arch" type="xml">
             <xpath expr="//field[@name='bom_id']" position="after">
                 <field name="agreement_id"/>
-                <field name="serviceprofile_id" domain="[('agreement_id', '=', agreement_id)]"/>
+                <field name="serviceprofile_id"
+                       domain="[('agreement_id', '=', agreement_id)]"/>
             </xpath>
         </field>
     </record>
-    
+
     <!-- Inherit mrp production search view-->
     <record id="view_mrp_production_filter_agreement" model="ir.ui.view">
         <field name="name">mrp.production.select.agreement</field>
@@ -20,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="[]" context="{'group_by':'serviceprofile_id'}"/>
+                <filter string="Service Profile" domain="[]"
+                        context="{'group_by':'serviceprofile_id'}"/>
             </xpath>
         </field>
     </record>
diff --git a/agreement_stock/README.rst b/agreement_stock/README.rst
new file mode 100644
index 00000000..21cd7854
--- /dev/null
+++ b/agreement_stock/README.rst
@@ -0,0 +1,21 @@
+**This file is going to be generated by oca-gen-addon-readme.**
+
+*Manual changes will be overwritten.*
+
+Please provide content in the ``readme`` directory:
+
+* **DESCRIPTION.rst** (required)
+* INSTALL.rst (optional)
+* CONFIGURE.rst (optional)
+* **USAGE.rst** (optional, highly recommended)
+* DEVELOP.rst (optional)
+* ROADMAP.rst (optional)
+* HISTORY.rst (optional, recommended)
+* **CONTRIBUTORS.rst** (optional, highly recommended)
+* CREDITS.rst (optional)
+
+Content of this README will also be drawn from the addon manifest,
+from keys such as name, authors, maintainers, development_status,
+and license.
+
+A good, one sentence summary in the manifest is also highly recommended.
diff --git a/agreement_stock/__init__.py b/agreement_stock/__init__.py
new file mode 100644
index 00000000..631bd489
--- /dev/null
+++ b/agreement_stock/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/agreement_stock/__manifest__.py b/agreement_stock/__manifest__.py
new file mode 100644
index 00000000..cd691d71
--- /dev/null
+++ b/agreement_stock/__manifest__.py
@@ -0,0 +1,27 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'Agreement - Stock',
+    'summary': 'Link picking to an agreement',
+    'version': '11.0.0.0.1',
+    'category': 'Contract',
+    'author': 'Open Source Integrators, '
+              'Odoo Community Association (OCA)',
+    'website': 'https://github.com/OCA/contract',
+    'depends': [
+        'agreement',
+        'stock',
+    ],
+    'data': [
+        'views/agreement_view.xml',
+        'views/stock_view.xml',
+    ],
+    'installable': True,
+    'license': 'AGPL-3',
+    'development_status': 'Beta',
+    'maintainers': [
+        'smangukiya',
+        'max3903',
+    ],
+}
diff --git a/agreement_stock/models/__init__.py b/agreement_stock/models/__init__.py
new file mode 100644
index 00000000..03159e36
--- /dev/null
+++ b/agreement_stock/models/__init__.py
@@ -0,0 +1,7 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import (
+    stock,
+    agreement,
+)
diff --git a/agreement_stock/models/agreement.py b/agreement_stock/models/agreement.py
new file mode 100644
index 00000000..677762d6
--- /dev/null
+++ b/agreement_stock/models/agreement.py
@@ -0,0 +1,43 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class Agreement(models.Model):
+    _inherit = "agreement"
+
+    picking_count = fields.Integer('# Pickings',
+                                   compute='_compute_picking_count')
+    move_count = fields.Integer('# Moves', compute='_compute_move_count')
+    lot_count = fields.Integer('# Lots/Serials', compute='_compute_lot_count')
+
+    @api.multi
+    def _compute_picking_count(self):
+        data = self.env['stock.picking'].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.picking_count = count_data.get(agreement.id, 0)
+
+    @api.multi
+    def _compute_move_count(self):
+        data = self.env['stock.move'].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.move_count = count_data.get(agreement.id, 0)
+
+    @api.multi
+    def _compute_lot_count(self):
+        data = self.env['stock.production.lot'].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.lot_count = count_data.get(agreement.id, 0)
diff --git a/agreement_stock/models/stock.py b/agreement_stock/models/stock.py
new file mode 100644
index 00000000..f0c7122f
--- /dev/null
+++ b/agreement_stock/models/stock.py
@@ -0,0 +1,27 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class StockPicking(models.Model):
+    _inherit = "stock.picking"
+
+    agreement_id = fields.Many2one('agreement', 'Agreement')
+
+
+class StockMove(models.Model):
+    _inherit = "stock.move"
+
+    agreement_id = fields.Many2one('agreement',
+                                   related='picking_id.agreement_id',
+                                   string='Agreement',
+                                   store=True)
+
+
+class StockProductionLot(models.Model):
+    _inherit = "stock.production.lot"
+
+    agreement_id = fields.Many2one('agreement', 'Agreement')
+    serviceprofile_id = fields.Many2one('agreement.serviceprofile',
+                                        'Service Profile')
diff --git a/agreement_stock/readme/CONTRIBUTORS.rst b/agreement_stock/readme/CONTRIBUTORS.rst
new file mode 100644
index 00000000..a76235f8
--- /dev/null
+++ b/agreement_stock/readme/CONTRIBUTORS.rst
@@ -0,0 +1 @@
+* Sandip Mangukiya <smangukiya@opensourceintegrators.com>
diff --git a/agreement_stock/readme/CREDITS.rst b/agreement_stock/readme/CREDITS.rst
new file mode 100644
index 00000000..0eff0acf
--- /dev/null
+++ b/agreement_stock/readme/CREDITS.rst
@@ -0,0 +1,3 @@
+The development of this module has been financially supported by:
+
+* Open Source Integrators <https://opensourceintegrators.com>
diff --git a/agreement_stock/readme/DESCRIPTION.rst b/agreement_stock/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..53cc62cf
--- /dev/null
+++ b/agreement_stock/readme/DESCRIPTION.rst
@@ -0,0 +1,5 @@
+Odoo Agreement App does not provide an easy way to access stock transfers related to an agreement.
+Some organizations needs to have a quick access to stock transfers to track the performance of an agreement.
+
+This module allows you to link a transfer to an agreement and
+adds a smart button on the agreement to look at the list of related transfers.
diff --git a/agreement_stock/readme/ROADMAP.rst b/agreement_stock/readme/ROADMAP.rst
new file mode 100644
index 00000000..7e6402cf
--- /dev/null
+++ b/agreement_stock/readme/ROADMAP.rst
@@ -0,0 +1,2 @@
+The roadmap of the Agreement application is documented on
+`Github <https://github.com/OCA/contract/issues>`_.
diff --git a/agreement_stock/readme/USAGE.rst b/agreement_stock/readme/USAGE.rst
new file mode 100644
index 00000000..697f9a5d
--- /dev/null
+++ b/agreement_stock/readme/USAGE.rst
@@ -0,0 +1,10 @@
+To use this module, you need to:
+
+* Go to Inventory > Transfers
+* Select or create a transfer and set the agreement
+* Select or create a lot/serial number and set the agreement
+* Go to Agreement > Agreements
+* Open the previous agreement
+* Click on the smart button "Transfers" to see the list of related transfers
+* Click on the smart button "Stock Moves" to see the list of related stock moves
+* Click on the smart button "Lot/SN #" to see the list of related lot/serial numbers
\ No newline at end of file
diff --git a/agreement_stock/static/description/icon.png b/agreement_stock/static/description/icon.png
new file mode 100644
index 00000000..23ce9313
Binary files /dev/null and b/agreement_stock/static/description/icon.png differ
diff --git a/agreement_stock/static/description/index.html b/agreement_stock/static/description/index.html
new file mode 100644
index 00000000..a798df62
--- /dev/null
+++ b/agreement_stock/static/description/index.html
@@ -0,0 +1,458 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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.14: http://docutils.sourceforge.net/" />
+<title>Agreement - MRP</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="agreement-mrp">
+<h1 class="title">Agreement - MRP</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/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>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>
+<p>This module allows you to link a manufacturing order to an agreement and
+adds a smart button on the agreement to look at the list of related MOs.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#installation" id="id1">Installation</a></li>
+<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="id3">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id4">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id5">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id6">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id7">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="id8">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="id9">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="installation">
+<h1><a class="toc-backref" href="#id1">Installation</a></h1>
+<p>To install Field Service and have the mapping features,
+you need to install agreement and mrp</p>
+<p>Please refer to the installation instructions available at:
+<a class="reference external" href="https://github.com/OCA/contract/agreement_mrp">https://github.com/OCA/contract/agreement_mrp</a></p>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id2">Usage</a></h1>
+<p>To use this module, you need to:</p>
+<ul class="simple">
+<li>Go to Manufacturing &gt; Manufacturing Orders</li>
+<li>Select or create a manufacturing order and set the agreement</li>
+<li>Go to Agreement &gt; Agreements</li>
+<li>Open the previous agreement and click on the smart button “Manufacturing Orders” to see the list of related MO</li>
+</ul>
+</div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#id3">Known issues / Roadmap</a></h1>
+<p>The roadmap of the Field Service application is documented on
+<a class="reference external" href="https://github.com/OCA/contract/issues/221">Github</a>.</p>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id4">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/contract/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/contract/issues/new?body=module:%20agreement_mrp%0Aversion:%2011.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">
+<h1><a class="toc-backref" href="#id5">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id6">Authors</a></h2>
+<ul class="simple">
+<li>Open Source Integrators</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id7">Contributors</a></h2>
+<ul class="simple">
+<li>Sandip Mangukiya &lt;<a class="reference external" href="mailto:smangukiya&#64;opensourceintegrators.com">smangukiya&#64;opensourceintegrators.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#id8">Other credits</a></h2>
+<p>The development of this module has been financially supported by:</p>
+<ul class="simple">
+<li>Open Source Integrators &lt;<a class="reference external" href="https://opensourceintegrators.com">https://opensourceintegrators.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id9">Maintainers</a></h2>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<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>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>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>
+</div>
+</body>
+</html>
diff --git a/agreement_stock/views/agreement_view.xml b/agreement_stock/views/agreement_view.xml
new file mode 100644
index 00000000..359876b5
--- /dev/null
+++ b/agreement_stock/views/agreement_view.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record model="ir.actions.act_window"
+            id="action_stock_picking_agreement_specific">
+        <field name="name">Pickings</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">stock.picking</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('agreement_id', '=', active_id)]</field>
+        <field name="help" type="html">
+            <p class="oe_view_nocontent_create">
+                Create Pickings
+            </p>
+        </field>
+    </record>
+    <record model="ir.actions.act_window"
+            id="action_stock_move_agreement_specific">
+        <field name="name">Moves</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">stock.move</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('agreement_id', '=', active_id)]</field>
+        <field name="help" type="html">
+            <p class="oe_view_nocontent_create">
+                Create Moves
+            </p>
+        </field>
+    </record>
+    <record model="ir.actions.act_window"
+            id="action_stock_production_lot_agreement_specific">
+        <field name="name">Lots/Serials</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">stock.production.lot</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('agreement_id', '=', active_id)]</field>
+        <field name="help" type="html">
+            <p class="oe_view_nocontent_create">
+                Create Lot/Serial
+            </p>
+        </field>
+    </record>
+
+    <record id="partner_agreement_form_view_stock" model="ir.ui.view">
+        <field name="name">agreement.form.stock</field>
+        <field name="model">agreement</field>
+        <field name="inherit_id" ref="agreement.partner_agreement_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@name='button_box']" position="inside">
+                <button name="%(action_stock_picking_agreement_specific)d"
+                        type="action"
+                        attrs="{'invisible': [('picking_count', '=', 0)]}"
+                        class="oe_stat_button" icon="fa-truck">
+                    <div class="o_field_widget o_stat_info">
+                        <span class="o_stat_value">
+                            <field name="picking_count" widget="statinfo"
+                                   nolabel="1"/>
+                        </span>
+                        <span class="o_stat_text">Pickings</span>
+                    </div>
+                </button>
+                <button name="%(action_stock_move_agreement_specific)d"
+                        type="action"
+                        attrs="{'invisible': [('move_count', '=', 0)]}"
+                        class="oe_stat_button" icon="fa-arrows-v">
+                    <div class="o_field_widget o_stat_info">
+                        <span class="o_stat_value">
+                            <field name="move_count" widget="statinfo"
+                                   nolabel="1"/>
+                        </span>
+                        <span class="o_stat_text">Moves</span>
+                    </div>
+                </button>
+                <button name="%(action_stock_production_lot_agreement_specific)d"
+                        type="action"
+                        attrs="{'invisible': [('lot_count', '=', 0)]}"
+                        class="oe_stat_button" icon="fa-arrows">
+                    <div class="o_field_widget o_stat_info">
+                        <span class="o_stat_value">
+                            <field name="lot_count" widget="statinfo"
+                                   nolabel="1"/>
+                        </span>
+                        <span class="o_stat_text">Lots/Serials</span>
+                    </div>
+                </button>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/agreement_stock/views/stock_view.xml b/agreement_stock/views/stock_view.xml
new file mode 100644
index 00000000..3f1707bf
--- /dev/null
+++ b/agreement_stock/views/stock_view.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="stock_picking_form_view_agreement" model="ir.ui.view">
+        <field name="name">stock.picking.form.agreement</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.view_picking_form"/>
+        <field name="arch" type="xml">
+            <field name="origin" position="before">
+                <field name="agreement_id"/>
+            </field>
+        </field>
+    </record>
+
+    <record id="view_move_form_agreement" model="ir.ui.view">
+        <field name="name">stock.move.form.agreement</field>
+        <field name="model">stock.move</field>
+        <field name="inherit_id" ref="stock.view_move_form"/>
+        <field name="arch" type="xml">
+            <field name="origin" position="before">
+                <field name="agreement_id"/>
+            </field>
+        </field>
+    </record>
+
+    <record id="view_production_lot_form_agreement" model="ir.ui.view">
+        <field name="name">stock.production.lot.form.agreement</field>
+        <field name="model">stock.production.lot</field>
+        <field name="inherit_id" ref="stock.view_production_lot_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='main_group']" position="inside">
+                <group>
+                    <field name="agreement_id"/>
+                    <field name="serviceprofile_id"
+                           domain="[('agreement_id', '=', agreement_id)]"/>
+                </group>
+            </xpath>
+        </field>
+    </record>
+
+    <!-- Inherit stock lot search view-->
+    <record id="search_product_lot_filter_agreement" model="ir.ui.view">
+        <field name="name">stock.production.lot.select.agreement</field>
+        <field name="model">stock.production.lot</field>
+        <field name="inherit_id" ref="stock.search_product_lot_filter"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group" position="inside">
+                <filter string="Service Profile" domain="[]"
+                        context="{'group_by':'serviceprofile_id'}"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>