summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Delavallée <tde@odoo.com>2017-11-17 12:58:40 +0100
committerThibault Delavallée <tde@odoo.com>2018-02-21 16:46:53 +0100
commit0e595ee81a64c5d63cff535c560a77e5da1eaa41 (patch)
treec251ecefdd676c9fc094d0f7f528ab416037d33d
parent634a688653bcb90996b03fdb7b2a013487986234 (diff)
[MOV] hr_holidays: 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.
-rw-r--r--addons/hr_holidays/__manifest__.py1
-rw-r--r--addons/hr_holidays/data/hr_holidays_data.xml128
-rw-r--r--addons/hr_holidays/data/mail_data.xml132
3 files changed, 133 insertions, 128 deletions
diff --git a/addons/hr_holidays/__manifest__.py b/addons/hr_holidays/__manifest__.py
index ed14ca78a0c..a1908e6aaf8 100644
--- a/addons/hr_holidays/__manifest__.py
+++ b/addons/hr_holidays/__manifest__.py
@@ -28,6 +28,7 @@ A synchronization with an internal agenda (Meetings of the CRM module) is also p
'data': [
'data/report_paperformat.xml',
'data/hr_holidays_data.xml',
+ 'data/mail_data.xml',
'security/hr_holidays_security.xml',
'security/ir.model.access.csv',
diff --git a/addons/hr_holidays/data/hr_holidays_data.xml b/addons/hr_holidays/data/hr_holidays_data.xml
index 7213fdd66a4..a08a0eddb3d 100644
--- a/addons/hr_holidays/data/hr_holidays_data.xml
+++ b/addons/hr_holidays/data/hr_holidays_data.xml
@@ -33,133 +33,5 @@
<field name="limit" eval="True"/>
<field name="color_name">brown</field>
</record>
-
- <!-- Holidays-related subtypes for messaging / Chatter -->
- <record id="mt_leave_confirmed" model="mail.message.subtype">
- <field name="name">Confirmed</field>
- <field name="res_model">hr.leave</field>
- <field name="description">Request created and waiting confirmation</field>
- </record>
-
- <record id="mt_leave_first_validated" model="mail.message.subtype">
- <field name="name">Waiting Second Validation</field>
- <field name="res_model">hr.leave</field>
- <field name="default" eval="False"/>
- <field name="description">Request validated, waiting second validation</field>
- </record>
-
- <record id="mt_leave_approved" model="mail.message.subtype">
- <field name="name">Approved</field>
- <field name="res_model">hr.leave</field>
- <field name="description">Request approved</field>
- </record>
-
- <record id="mt_leave_refused" model="mail.message.subtype">
- <field name="name">Refused</field>
- <field name="res_model">hr.leave</field>
- <field name="default" eval="False"/>
- <field name="description">Request refused</field>
- </record>
-
- <!-- Allocation-related subtypes for messaging / Chatter -->
- <record id="mt_leave_allocation_confirmed" model="mail.message.subtype">
- <field name="name">Confirmed</field>
- <field name="res_model">hr.leave.allocation</field>
- <field name="description">Request created and waiting confirmation</field>
- </record>
-
- <record id="mt_leave_allocation_first_validated" model="mail.message.subtype">
- <field name="name">Waiting Second Validation</field>
- <field name="res_model">hr.leave.allocation</field>
- <field name="default" eval="False"/>
- <field name="description">Request validated, waiting second validation</field>
- </record>
-
- <record id="mt_leave_allocation_approved" model="mail.message.subtype">
- <field name="name">Approved</field>
- <field name="res_model">hr.leave.allocation</field>
- <field name="description">Request approved</field>
- </record>
-
- <record id="mt_leave_allocation_refused" model="mail.message.subtype">
- <field name="name">Refused</field>
- <field name="res_model">hr.leave.allocation</field>
- <field name="default" eval="False"/>
- <field name="description">Request refused</field>
- </record>
-
- <!-- Department related subtypes for messaging / Chatter -->
- <record id="mt_department_leave_confirmed" model="mail.message.subtype">
- <field name="name">Leaves Confirmed</field>
- <field name="res_model">hr.department</field>
- <field name="default" eval="True"/>
- <field name="parent_id" eval="ref('mt_leave_confirmed')"/>
- <field name="relation_field">department_id</field>
- <field name="sequence" eval="6"/>
- </record>
-
- <record id="mt_department_leave_first_validated" model="mail.message.subtype">
- <field name="name">Leaves First Approval</field>
- <field name="res_model">hr.department</field>
- <field name="default" eval="False"/>
- <field name="parent_id" eval="ref('mt_leave_first_validated')"/>
- <field name="relation_field">department_id</field>
- <field name="sequence" eval="7"/>
- </record>
-
- <record id="mt_department_leave_approved" model="mail.message.subtype">
- <field name="name">Leaves Approved</field>
- <field name="res_model">hr.department</field>
- <field name="default" eval="False"/>
- <field name="parent_id" eval="ref('mt_leave_approved')"/>
- <field name="relation_field">department_id</field>
- <field name="sequence" eval="8"/>
- </record>
-
- <record id="mt_department_leave_refused" model="mail.message.subtype">
- <field name="name">Leaves Refused</field>
- <field name="res_model">hr.department</field>
- <field name="default" eval="False"/>
- <field name="parent_id" eval="ref('mt_leave_refused')"/>
- <field name="relation_field">department_id</field>
- <field name="sequence" eval="9"/>
- </record>
-
- <record id="mt_department_leave_allocation_confirmed" model="mail.message.subtype">
- <field name="name">Allocations Confirmed</field>
- <field name="res_model">hr.department</field>
- <field name="default" eval="True"/>
- <field name="parent_id" eval="ref('mt_leave_allocation_confirmed')"/>
- <field name="relation_field">department_id</field>
- <field name="sequence" eval="6"/>
- </record>
-
- <record id="mt_department_leave_allocation_first_validated" model="mail.message.subtype">
- <field name="name">Allocations First Approval</field>
- <field name="res_model">hr.department</field>
- <field name="default" eval="False"/>
- <field name="parent_id" eval="ref('mt_leave_allocation_first_validated')"/>
- <field name="relation_field">department_id</field>
- <field name="sequence" eval="7"/>
- </record>
-
- <record id="mt_department_leave_allocation_approved" model="mail.message.subtype">
- <field name="name">Allocation Approved</field>
- <field name="res_model">hr.department</field>
- <field name="default" eval="False"/>
- <field name="parent_id" eval="ref('mt_leave_allocation_approved')"/>
- <field name="relation_field">department_id</field>
- <field name="sequence" eval="8"/>
- </record>
-
- <record id="mt_department_leave_allocation_refused" model="mail.message.subtype">
- <field name="name">Allocation Refused</field>
- <field name="res_model">hr.department</field>
- <field name="default" eval="False"/>
- <field name="parent_id" eval="ref('mt_leave_allocation_refused')"/>
- <field name="relation_field">department_id</field>
- <field name="sequence" eval="9"/>
- </record>
-
</data>
</odoo>
diff --git a/addons/hr_holidays/data/mail_data.xml b/addons/hr_holidays/data/mail_data.xml
new file mode 100644
index 00000000000..57c92f06581
--- /dev/null
+++ b/addons/hr_holidays/data/mail_data.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+ <data noupdate="1">
+ <!-- Holidays-related subtypes for messaging / Chatter -->
+ <record id="mt_leave_confirmed" model="mail.message.subtype">
+ <field name="name">Confirmed</field>
+ <field name="res_model">hr.leave</field>
+ <field name="description">Request created and waiting confirmation</field>
+ </record>
+
+ <record id="mt_leave_first_validated" model="mail.message.subtype">
+ <field name="name">Waiting Second Validation</field>
+ <field name="res_model">hr.leave</field>
+ <field name="default" eval="False"/>
+ <field name="description">Request validated, waiting second validation</field>
+ </record>
+
+ <record id="mt_leave_approved" model="mail.message.subtype">
+ <field name="name">Approved</field>
+ <field name="res_model">hr.leave</field>
+ <field name="description">Request approved</field>
+ </record>
+
+ <record id="mt_leave_refused" model="mail.message.subtype">
+ <field name="name">Refused</field>
+ <field name="res_model">hr.leave</field>
+ <field name="default" eval="False"/>
+ <field name="description">Request refused</field>
+ </record>
+
+ <!-- Allocation-related subtypes for messaging / Chatter -->
+ <record id="mt_leave_allocation_confirmed" model="mail.message.subtype">
+ <field name="name">Confirmed</field>
+ <field name="res_model">hr.leave.allocation</field>
+ <field name="description">Request created and waiting confirmation</field>
+ </record>
+
+ <record id="mt_leave_allocation_first_validated" model="mail.message.subtype">
+ <field name="name">Waiting Second Validation</field>
+ <field name="res_model">hr.leave.allocation</field>
+ <field name="default" eval="False"/>
+ <field name="description">Request validated, waiting second validation</field>
+ </record>
+
+ <record id="mt_leave_allocation_approved" model="mail.message.subtype">
+ <field name="name">Approved</field>
+ <field name="res_model">hr.leave.allocation</field>
+ <field name="description">Request approved</field>
+ </record>
+
+ <record id="mt_leave_allocation_refused" model="mail.message.subtype">
+ <field name="name">Refused</field>
+ <field name="res_model">hr.leave.allocation</field>
+ <field name="default" eval="False"/>
+ <field name="description">Request refused</field>
+ </record>
+
+ <!-- Department related subtypes for messaging / Chatter -->
+ <record id="mt_department_leave_confirmed" model="mail.message.subtype">
+ <field name="name">Leaves Confirmed</field>
+ <field name="res_model">hr.department</field>
+ <field name="default" eval="True"/>
+ <field name="parent_id" eval="ref('mt_leave_confirmed')"/>
+ <field name="relation_field">department_id</field>
+ <field name="sequence" eval="6"/>
+ </record>
+
+ <record id="mt_department_leave_first_validated" model="mail.message.subtype">
+ <field name="name">Leaves First Approval</field>
+ <field name="res_model">hr.department</field>
+ <field name="default" eval="False"/>
+ <field name="parent_id" eval="ref('mt_leave_first_validated')"/>
+ <field name="relation_field">department_id</field>
+ <field name="sequence" eval="7"/>
+ </record>
+
+ <record id="mt_department_leave_approved" model="mail.message.subtype">
+ <field name="name">Leaves Approved</field>
+ <field name="res_model">hr.department</field>
+ <field name="default" eval="False"/>
+ <field name="parent_id" eval="ref('mt_leave_approved')"/>
+ <field name="relation_field">department_id</field>
+ <field name="sequence" eval="8"/>
+ </record>
+
+ <record id="mt_department_leave_refused" model="mail.message.subtype">
+ <field name="name">Leaves Refused</field>
+ <field name="res_model">hr.department</field>
+ <field name="default" eval="False"/>
+ <field name="parent_id" eval="ref('mt_leave_refused')"/>
+ <field name="relation_field">department_id</field>
+ <field name="sequence" eval="9"/>
+ </record>
+
+ <record id="mt_department_leave_allocation_confirmed" model="mail.message.subtype">
+ <field name="name">Allocations Confirmed</field>
+ <field name="res_model">hr.department</field>
+ <field name="default" eval="True"/>
+ <field name="parent_id" eval="ref('mt_leave_allocation_confirmed')"/>
+ <field name="relation_field">department_id</field>
+ <field name="sequence" eval="6"/>
+ </record>
+
+ <record id="mt_department_leave_allocation_first_validated" model="mail.message.subtype">
+ <field name="name">Allocations First Approval</field>
+ <field name="res_model">hr.department</field>
+ <field name="default" eval="False"/>
+ <field name="parent_id" eval="ref('mt_leave_allocation_first_validated')"/>
+ <field name="relation_field">department_id</field>
+ <field name="sequence" eval="7"/>
+ </record>
+
+ <record id="mt_department_leave_allocation_approved" model="mail.message.subtype">
+ <field name="name">Allocation Approved</field>
+ <field name="res_model">hr.department</field>
+ <field name="default" eval="False"/>
+ <field name="parent_id" eval="ref('mt_leave_allocation_approved')"/>
+ <field name="relation_field">department_id</field>
+ <field name="sequence" eval="8"/>
+ </record>
+
+ <record id="mt_department_leave_allocation_refused" model="mail.message.subtype">
+ <field name="name">Allocation Refused</field>
+ <field name="res_model">hr.department</field>
+ <field name="default" eval="False"/>
+ <field name="parent_id" eval="ref('mt_leave_allocation_refused')"/>
+ <field name="relation_field">department_id</field>
+ <field name="sequence" eval="9"/>
+ </record>
+
+ </data>
+</odoo> \ No newline at end of file