diff --git a/mrp_repair_calendar_view/README.rst b/mrp_repair_calendar_view/README.rst
new file mode 100644
index 000000000..2cdb3ae93
--- /dev/null
+++ b/mrp_repair_calendar_view/README.rst
@@ -0,0 +1,56 @@
+.. image:: https://img.shields.io/badge/licence-LGPL--3-blue.svg
+   :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
+   :alt: License: LGPL-3
+
+=================
+MRP Calendar View
+=================
+
+This Module adds a calendar view for the repair orders
+
+Usage
+=====
+
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/129/10.0
+
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/manufacture/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.
+
+Credits
+=======
+
+Images
+------
+
+* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
+
+Contributors
+------------
+
+* Nicola Malcontenti <nicola.malcontenti@agilebg.com>
+* Alessio Gerace <alessio.gerace@agilebg.com>
+* Alex Comba <alex.comba@agilebg.com>
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+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.
+
+To contribute to this module, please visit https://odoo-community.org.
diff --git a/mrp_repair_calendar_view/__init__.py b/mrp_repair_calendar_view/__init__.py
new file mode 100644
index 000000000..1821b76a9
--- /dev/null
+++ b/mrp_repair_calendar_view/__init__.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016  Agile Business Group
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+
+
+from . import models
diff --git a/mrp_repair_calendar_view/__manifest__.py b/mrp_repair_calendar_view/__manifest__.py
new file mode 100644
index 000000000..a10475a43
--- /dev/null
+++ b/mrp_repair_calendar_view/__manifest__.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016  Agile Business Group
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+
+
+{
+    'name': 'MRP Repair Calendar View',
+    'version': '10.0.1.0.0',
+    'category': 'Manufacturing',
+    'author': "Agile Business Group, Odoo Community Association (OCA)",
+    'website': 'http://www.agilebg.com',
+    'license': 'LGPL-3',
+    'depends': ['mrp_repair'],
+    'data': ['views/mrp_repair_view.xml'],
+    'installable': True,
+}
diff --git a/mrp_repair_calendar_view/i18n/it.po b/mrp_repair_calendar_view/i18n/it.po
new file mode 100644
index 000000000..03dcfb1bc
--- /dev/null
+++ b/mrp_repair_calendar_view/i18n/it.po
@@ -0,0 +1,47 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* mrp_repair_calendar_view
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-04-07 08:27+0000\n"
+"PO-Revision-Date: 2017-04-07 08:27+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: mrp_repair_calendar_view
+#: model:ir.model.fields,help:mrp_repair_calendar_view.field_mrp_repair_date_repair
+msgid "Date of the repair, this field and user_id defines the calendar"
+msgstr "Data della riparazione, questo campo e user_id definiscono il calendario"
+
+#. module: mrp_repair_calendar_view
+#: model:ir.model.fields,help:mrp_repair_calendar_view.field_mrp_repair_user_id
+msgid "Person in charge for the repair"
+msgstr "Persona responsabile della riparazione"
+
+#. module: mrp_repair_calendar_view
+#: model:ir.model.fields,field_description:mrp_repair_calendar_view.field_mrp_repair_date_repair
+msgid "Repair Date"
+msgstr "Data riparazione"
+
+#. module: mrp_repair_calendar_view
+#: model:ir.model,name:mrp_repair_calendar_view.model_mrp_repair
+msgid "Repair Order"
+msgstr "Ordine di riparazione"
+
+#. module: mrp_repair_calendar_view
+#: model:ir.ui.view,arch_db:mrp_repair_calendar_view.view_repair_order_calendar
+msgid "Repair Orders Calendar"
+msgstr "Calendario ordini di riparazione"
+
+#. module: mrp_repair_calendar_view
+#: model:ir.model.fields,field_description:mrp_repair_calendar_view.field_mrp_repair_user_id
+msgid "Responsible"
+msgstr "Responsabile"
+
diff --git a/mrp_repair_calendar_view/models/__init__.py b/mrp_repair_calendar_view/models/__init__.py
new file mode 100644
index 000000000..bef547b33
--- /dev/null
+++ b/mrp_repair_calendar_view/models/__init__.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016  Agile Business Group
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+
+
+from . import mrp_repair
diff --git a/mrp_repair_calendar_view/models/mrp_repair.py b/mrp_repair_calendar_view/models/mrp_repair.py
new file mode 100644
index 000000000..3ee25f06b
--- /dev/null
+++ b/mrp_repair_calendar_view/models/mrp_repair.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016  Agile Business Group
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+
+from odoo import fields, models
+
+
+class mrp_repair(models.Model):
+    _inherit = 'mrp.repair'
+
+    user_id = fields.Many2one('res.users', 'User',
+                              default=lambda self: self.env.user,
+                              help="Person in charge for the repair")
+    date_repair = fields.Datetime('Repair Date', default=fields.Datetime.now,
+                                  copy=False,
+                                  help="Date of the repair, this field "
+                                  "and user_id defines the calendar")
diff --git a/mrp_repair_calendar_view/static/description/icon.png b/mrp_repair_calendar_view/static/description/icon.png
new file mode 100644
index 000000000..3a0328b51
Binary files /dev/null and b/mrp_repair_calendar_view/static/description/icon.png differ
diff --git a/mrp_repair_calendar_view/views/mrp_repair_view.xml b/mrp_repair_calendar_view/views/mrp_repair_view.xml
new file mode 100644
index 000000000..cb3c740cf
--- /dev/null
+++ b/mrp_repair_calendar_view/views/mrp_repair_view.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_repair_order_calendar_form" model="ir.ui.view">
+        <field name="name">mrp.repair.calendar.form</field>
+        <field name="model">mrp.repair</field>
+        <field name="inherit_id" ref="mrp_repair.view_repair_order_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='guarantee_limit']" position="after">
+                <field name="date_repair"/>
+            </xpath>
+            <xpath expr="//field[@name='partner_id']" position="after">
+                <field name="user_id"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_repair_order_calendar" model="ir.ui.view">
+        <field name="name">Repair Orders Calendar</field>
+        <field name="model">mrp.repair</field>
+        <field name="arch" type="xml">
+            <calendar string="Repair Orders Calendar" date_start="date_repair" color="user_id">
+                <field name="product_id"/>
+                <field name="partner_id"/>
+            </calendar>
+        </field>
+    </record>
+
+    <record id="mrp_repair.action_repair_order_tree" model="ir.actions.act_window">
+        <field name="view_mode">calendar,tree,form</field>
+    </record>
+
+</odoo>