summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Duckerts-Antoine <dam@odoo.com>2018-01-03 15:50:42 +0100
committerThibault Delavallée <tde@odoo.com>2018-05-22 12:29:08 +0200
commite7ecdb8c46c13a55e66c4875c72f7b343e23fc60 (patch)
treeaab3ea93a9537331c4a3557839e25a2bc05d3d31
parentf7cda99d209c7d8178ed48e33692eb12577d6a4e (diff)
[MOV] mail: move crons into their own data file
Purpose is to avoid mixing various data types in the same generic mail_data file. We already have 2 crons and the upcoming moderation feature will add some more. Let us put them in their file to ease the finding. This commit is linked to task ID 29521.
-rw-r--r--addons/mail/__manifest__.py1
-rw-r--r--addons/mail/data/ir_cron_data.xml30
-rw-r--r--addons/mail/data/mail_data.xml26
3 files changed, 31 insertions, 26 deletions
diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index ea2182a95e0..5bdfbc3ae61 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -24,6 +24,7 @@
'data/mail_data.xml',
'data/mail_channel_data.xml',
'data/mail_activity_data.xml',
+ 'data/ir_cron_data.xml',
'security/mail_security.xml',
'security/ir.model.access.csv',
'views/mail_alias_views.xml',
diff --git a/addons/mail/data/ir_cron_data.xml b/addons/mail/data/ir_cron_data.xml
new file mode 100644
index 00000000000..8b742a7c02d
--- /dev/null
+++ b/addons/mail/data/ir_cron_data.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+ <data noupdate="1">
+ <record forcecreate="True" id="ir_cron_mail_scheduler_action" model="ir.cron">
+ <field name="name">Mail: Email Queue Manager</field>
+ <field name="model_id" ref="model_mail_mail"/>
+ <field name="state">code</field>
+ <field name="code">model.process_email_queue()</field>
+ <field name="user_id" ref="base.user_root"/>
+ <field name="interval_number">1</field>
+ <field name="interval_type">hours</field>
+ <field name="numbercall">-1</field>
+ <field eval="False" name="doall"/>
+ </record>
+
+ <record id="ir_cron_module_update_notification" model="ir.cron">
+ <field name="name">Publisher: Update Notification</field>
+ <field name="model_id" ref="model_publisher_warranty_contract"/>
+ <field name="state">code</field>
+ <field name="code">model.update_notification(None)</field>
+ <field name="user_id" ref="base.user_root" />
+ <field name="interval_number">1</field>
+ <field name="interval_type">weeks</field>
+ <field name="numbercall">-1</field>
+ <field name="nextcall" eval="(DateTime.now() + timedelta(days=7)).strftime('%Y-%m-%d %H:%M:%S')" />
+ <field eval="False" name="doall" />
+ <field name="priority">1000</field>
+ </record>
+ </data>
+</odoo> \ No newline at end of file
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index d528ff42619..11f0117066f 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -1,32 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <record forcecreate="True" id="ir_cron_mail_scheduler_action" model="ir.cron">
- <field name="name">Mail: Email Queue Manager</field>
- <field name="model_id" ref="model_mail_mail"/>
- <field name="state">code</field>
- <field name="code">model.process_email_queue()</field>
- <field name="user_id" ref="base.user_root"/>
- <field name="interval_number">1</field>
- <field name="interval_type">hours</field>
- <field name="numbercall">-1</field>
- <field eval="False" name="doall"/>
- </record>
-
- <record id="ir_cron_module_update_notification" model="ir.cron">
- <field name="name">Publisher: Update Notification</field>
- <field name="model_id" ref="model_publisher_warranty_contract"/>
- <field name="state">code</field>
- <field name="code">model.update_notification(None)</field>
- <field name="user_id" ref="base.user_root" />
- <field name="interval_number">1</field>
- <field name="interval_type">weeks</field>
- <field name="numbercall">-1</field>
- <field name="nextcall" eval="(DateTime.now() + timedelta(days=7)).strftime('%Y-%m-%d %H:%M:%S')" />
- <field eval="False" name="doall" />
- <field name="priority">1000</field>
- </record>
-
<!-- Admin should not receive emails at creation -->
<record id="base.user_root" model="res.users">
<field name="notification_type">inbox</field>