From 561ae286f90fc2650816db24cf0423602ea8ebbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Wed, 21 Feb 2018 16:51:38 +0100
Subject: [PATCH] [MOV] hr_expense: split data to separate mail data from other
 data

It is simpler to have data split by main model or application like we
already do for models and views. It allows to easily have an overview
of data a module holds.

As we will work on mail related data like adding activities or tweaking
subtypes and templates, having them all in a single file and not lost
between other data helps finding and working with it.

This commit only moves code. No functional change should occur.
---
 addons/hr_expense/__manifest__.py          |  1 +
 addons/hr_expense/data/hr_expense_data.xml | 59 --------------------
 addons/hr_expense/data/mail_data.xml       | 63 ++++++++++++++++++++++
 3 files changed, 64 insertions(+), 59 deletions(-)
 create mode 100644 addons/hr_expense/data/mail_data.xml

diff --git a/addons/hr_expense/__manifest__.py b/addons/hr_expense/__manifest__.py
index 46af9f9b4fa..09096c0ec21 100644
--- a/addons/hr_expense/__manifest__.py
+++ b/addons/hr_expense/__manifest__.py
@@ -30,6 +30,7 @@ This module also uses analytic accounting and is compatible with the invoice on
     'data': [
         'security/hr_expense_security.xml',
         'security/ir.model.access.csv',
+        'data/mail_data.xml',
         'data/hr_expense_data.xml',
         'data/hr_expense_sequence.xml',
         'wizard/hr_expense_refuse_reason_views.xml',
diff --git a/addons/hr_expense/data/hr_expense_data.xml b/addons/hr_expense/data/hr_expense_data.xml
index b0c358d8511..ff184837ccc 100644
--- a/addons/hr_expense/data/hr_expense_data.xml
+++ b/addons/hr_expense/data/hr_expense_data.xml
@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
-
-        <!--default alias for leads-->
-        <record id="mail_alias_expense" model="mail.alias">
-            <field name="alias_name">expense</field>
-            <field name="alias_model_id" ref="model_hr_expense"/>
-            <field name="alias_user_id" ref="base.user_root"/>
-            <field name="alias_contact">employees</field>
-        </record>
-
         <!-- Master Data for expense created by email -->
         <record id="product_product_fixed_cost" model="product.product">
             <field name="name">Expenses</field>
@@ -20,55 +11,5 @@
             <field name="categ_id" ref="product.cat_expense"/>
             <field name="can_be_expensed" eval="True"/>
         </record>
-
-        <!-- Expense-related subtypes for messaging / Chatter -->
-        <record id="mt_expense_approved" model="mail.message.subtype">
-            <field name="name">Approved</field>
-            <field name="res_model">hr.expense.sheet</field>
-            <field name="default" eval="True"/>
-            <field name="description">Expense report approved</field>
-        </record>
-        <record id="mt_expense_refused" model="mail.message.subtype">
-            <field name="name">Refused</field>
-            <field name="res_model">hr.expense.sheet</field>
-            <field name="default" eval="True"/>
-            <field name="description">Expense report refused</field>
-        </record>
-        <record id="mt_expense_confirmed" model="mail.message.subtype">
-            <field name="name">Submitted</field>
-            <field name="res_model">hr.expense.sheet</field>
-            <field name="description">Expense report submitted, waiting approval</field>
-            <field name="default" eval="True"/>
-        </record>
-        <record id="mt_expense_paid" model="mail.message.subtype">
-            <field name="name">Paid</field>
-            <field name="res_model">hr.expense.sheet</field>
-            <field name="description">Expense report paid</field>
-            <field name="default" eval="False"/>
-        </record>
-        <record id="mt_expense_responsible" model="mail.message.subtype">
-            <field name="name">Responsible</field>
-            <field name="res_model">hr.expense.sheet</field>
-            <field name="description">Changes of responsible</field>
-            <field name="default" eval="True"/>
-        </record>
-        <!-- Department (Parent) related subtypes for messaging / Chatter -->
-        <record id="mt_department_expense_confirmed" model="mail.message.subtype">
-            <field name="name">Expenses To Approve</field>
-            <field name="res_model">hr.department</field>
-            <field name="default" eval="False"/>
-            <field name="parent_id" eval="ref('mt_expense_confirmed')"/>
-            <field name="relation_field">department_id</field>
-            <field name="sequence" eval="10"/>
-        </record>
-
-        <!-- Email Templates -->
-        <template id="hr_expense_template_refuse_reason">
-            <p>Your Expense <t t-if="is_sheet">Report </t><t t-esc="name"/> has been refused</p>
-            <ul class="o_timeline_tracking_value_list">
-                <li>Reason : <t t-esc="reason"/></li>
-            </ul>
-        </template>
-
     </data>
 </odoo>
diff --git a/addons/hr_expense/data/mail_data.xml b/addons/hr_expense/data/mail_data.xml
new file mode 100644
index 00000000000..57b22e33f55
--- /dev/null
+++ b/addons/hr_expense/data/mail_data.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+
+        <!--default alias for leads-->
+        <record id="mail_alias_expense" model="mail.alias">
+            <field name="alias_name">expense</field>
+            <field name="alias_model_id" ref="model_hr_expense"/>
+            <field name="alias_user_id" ref="base.user_root"/>
+            <field name="alias_contact">employees</field>
+        </record>
+
+        <!-- Expense-related subtypes for messaging / Chatter -->
+        <record id="mt_expense_approved" model="mail.message.subtype">
+            <field name="name">Approved</field>
+            <field name="res_model">hr.expense.sheet</field>
+            <field name="default" eval="True"/>
+            <field name="description">Expense report approved</field>
+        </record>
+        <record id="mt_expense_refused" model="mail.message.subtype">
+            <field name="name">Refused</field>
+            <field name="res_model">hr.expense.sheet</field>
+            <field name="default" eval="True"/>
+            <field name="description">Expense report refused</field>
+        </record>
+        <record id="mt_expense_confirmed" model="mail.message.subtype">
+            <field name="name">Submitted</field>
+            <field name="res_model">hr.expense.sheet</field>
+            <field name="description">Expense report submitted, waiting approval</field>
+            <field name="default" eval="True"/>
+        </record>
+        <record id="mt_expense_paid" model="mail.message.subtype">
+            <field name="name">Paid</field>
+            <field name="res_model">hr.expense.sheet</field>
+            <field name="description">Expense report paid</field>
+            <field name="default" eval="False"/>
+        </record>
+        <record id="mt_expense_responsible" model="mail.message.subtype">
+            <field name="name">Responsible</field>
+            <field name="res_model">hr.expense.sheet</field>
+            <field name="description">Changes of responsible</field>
+            <field name="default" eval="True"/>
+        </record>
+        <!-- Department (Parent) related subtypes for messaging / Chatter -->
+        <record id="mt_department_expense_confirmed" model="mail.message.subtype">
+            <field name="name">Expenses To Approve</field>
+            <field name="res_model">hr.department</field>
+            <field name="default" eval="False"/>
+            <field name="parent_id" eval="ref('mt_expense_confirmed')"/>
+            <field name="relation_field">department_id</field>
+            <field name="sequence" eval="10"/>
+        </record>
+
+        <!-- Email Templates -->
+        <template id="hr_expense_template_refuse_reason">
+            <p>Your Expense <t t-if="is_sheet">Report </t><t t-esc="name"/> has been refused</p>
+            <ul class="o_timeline_tracking_value_list">
+                <li>Reason : <t t-esc="reason"/></li>
+            </ul>
+        </template>
+
+    </data>
+</odoo>