diff --git a/addons/mrp/__manifest__.py b/addons/mrp/__manifest__.py
index 2be559a112e..9da53684c4f 100644
--- a/addons/mrp/__manifest__.py
+++ b/addons/mrp/__manifest__.py
@@ -15,6 +15,7 @@
         'security/mrp_security.xml',
         'security/ir.model.access.csv',
         'data/digest_data.xml',
+        'data/mail_templates.xml',
         'data/mrp_data.xml',
         'wizard/change_production_qty_views.xml',
         'wizard/mrp_workcenter_block_view.xml',
@@ -36,7 +37,7 @@
         'views/mrp_unbuild_views.xml',
         'views/ir_attachment_view.xml',
         'views/res_config_settings_views.xml',
-        'views/mrp_templates.xml',
+        'views/assets.xml',
         'views/stock_scrap_views.xml',
         'report/report_deliveryslip.xml',
         'report/mrp_report_views_main.xml',
diff --git a/addons/mrp/data/mail_templates.xml b/addons/mrp/data/mail_templates.xml
new file mode 100644
index 00000000000..bcce9792c8a
--- /dev/null
+++ b/addons/mrp/data/mail_templates.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="exception_on_mo">
+        <div class="alert alert-warning" role="alert">
+            Exception(s) occurred on the manufacturing order(s):
+            <a href="#" data-oe-model="mrp.production" t-att-data-oe-id="production_order.id"><t t-esc="production_order.name"/></a>.
+            Manual actions may be needed.
+            <div class="mt16">
+                <p>Exception(s):</p>
+                <ul t-foreach="order_exceptions.items()" t-as="order_exception">
+                    <li>
+                        <t t-set="move_raw_id" t-value="order_exception[0]"/>
+                        <t t-set="exception" t-value="order_exception[1]"/>
+                        <t t-set="order" t-value="exception[0]"/>
+                        <t t-set="new_qty" t-value="exception[1][0]"/>
+                        <t t-set="old_qty" t-value="exception[1][1]"/>
+                            <a href="#" data-oe-model="mrp.production" t-att-data-oe-id="production_order.id"><t t-esc="production_order.name"/></a>:
+                            <t t-esc="new_qty"/> <t t-esc="move_raw_id.product_uom.name"/> of <t t-esc="move_raw_id.product_id.name"/>
+                            <t t-if="cancel">
+                                cancelled
+                            </t>
+                            <t t-if="not cancel">
+                                ordered instead of <t t-esc="old_qty"/> <t t-esc="move_raw_id.product_uom.name"/>
+                            </t>
+                      </li>
+                </ul>
+            </div>
+            <div class="mt16" t-if="not cancel and impacted_pickings">
+                <p>Impacted Transfer(s):</p>
+                <ul t-foreach="impacted_pickings" t-as="picking">
+                    <li><a href="#" data-oe-model="stock.picking" t-att-data-oe-id="picking.id"><t t-esc="picking.name"/></a></li>
+                </ul>
+            </div>
+        </div>
+    </template>
+
+    <template id="production_message">
+        <t t-if="move.move_id.raw_material_production_id">
+            <t t-set="message">Consumed</t>
+        </t>
+        <t t-if="move.move_id.production_id">
+            <t t-set="message">Produced</t>
+        </t>
+        <strong><t t-esc="message"/> quantity has been updated.</strong>
+    </template>
+
+    <template id="track_production_move_template">
+        <div>
+            <t t-call="mrp.production_message"/>
+            <t t-call="stock.message_body"/>
+        </div>
+    </template>
+</odoo>
diff --git a/addons/mrp/report/mrp_production_templates.xml b/addons/mrp/report/mrp_production_templates.xml
index 650123b8e35..42a4f61bdc4 100644
--- a/addons/mrp/report/mrp_production_templates.xml
+++ b/addons/mrp/report/mrp_production_templates.xml
@@ -184,21 +184,4 @@
         </div>
     </t>
 </template>
-
-<template id="production_message">
-    <t t-if="move.move_id.raw_material_production_id">
-        <t t-set="message">Consumed</t>
-    </t>
-    <t t-if="move.move_id.production_id">
-        <t t-set="message">Produced</t>
-    </t>
-    <strong><t t-esc="message"/> quantity has been updated.</strong>
-</template>
-
-<template id="track_production_move_template">
-    <div>
-        <t t-call="mrp.production_message"/>
-        <t t-call="stock.message_body"/>
-    </div>
-</template>
 </odoo>
diff --git a/addons/mrp/views/mrp_templates.xml b/addons/mrp/views/assets.xml
similarity index 54%
rename from addons/mrp/views/mrp_templates.xml
rename to addons/mrp/views/assets.xml
index 713b71cfbc6..e3e70ccfad1 100644
--- a/addons/mrp/views/mrp_templates.xml
+++ b/addons/mrp/views/assets.xml
@@ -31,39 +31,4 @@
             <script type="text/javascript" src="/mrp/static/tests/mrp_document_kanban_tests.js"/>
         </xpath>
     </template>
-
-    <template id="exception_on_mo">
-        <div class="alert alert-warning" role="alert">
-            Exception(s) occurred on the manufacturing order(s):
-            <a href="#" data-oe-model="mrp.production" t-att-data-oe-id="production_order.id"><t t-esc="production_order.name"/></a>.
-            Manual actions may be needed.
-            <div class="mt16">
-                <p>Exception(s):</p>
-                <ul t-foreach="order_exceptions.items()" t-as="order_exception">
-                    <li>
-                        <t t-set="move_raw_id" t-value="order_exception[0]"/>
-                        <t t-set="exception" t-value="order_exception[1]"/>
-                        <t t-set="order" t-value="exception[0]"/>
-                        <t t-set="new_qty" t-value="exception[1][0]"/>
-                        <t t-set="old_qty" t-value="exception[1][1]"/>
-                            <a href="#" data-oe-model="mrp.production" t-att-data-oe-id="production_order.id"><t t-esc="production_order.name"/></a>:
-                            <t t-esc="new_qty"/> <t t-esc="move_raw_id.product_uom.name"/> of <t t-esc="move_raw_id.product_id.name"/>
-                            <t t-if="cancel">
-                                cancelled
-                            </t>
-                            <t t-if="not cancel">
-                                ordered instead of <t t-esc="old_qty"/> <t t-esc="move_raw_id.product_uom.name"/>
-                            </t>
-                      </li>
-                </ul>
-            </div>
-            <div class="mt16" t-if="not cancel and impacted_pickings">
-                <p>Impacted Transfer(s):</p>
-                <ul t-foreach="impacted_pickings" t-as="picking">
-                    <li><a href="#" data-oe-model="stock.picking" t-att-data-oe-id="picking.id"><t t-esc="picking.name"/></a></li>
-                </ul>
-            </div>
-        </div>
-    </template>
-
 </odoo>
diff --git a/addons/repair/__manifest__.py b/addons/repair/__manifest__.py
index 8f41900a0ef..86ca0cf3fa4 100644
--- a/addons/repair/__manifest__.py
+++ b/addons/repair/__manifest__.py
@@ -31,7 +31,7 @@ The following topics are covered by this module:
         'report/repair_reports.xml',
         'report/repair_templates_repair_order.xml',
         'data/ir_sequence_data.xml',
-        'data/repair_data.xml',
+        'data/mail_template_data.xml',
     ],
     'demo': ['data/repair_demo.xml'],
     'test': [],
diff --git a/addons/repair/data/repair_data.xml b/addons/repair/data/mail_template_data.xml
similarity index 100%
rename from addons/repair/data/repair_data.xml
rename to addons/repair/data/mail_template_data.xml