summaryrefslogtreecommitdiff
path: root/addons/calendar/data
diff options
context:
space:
mode:
authorJérome Maes <jem@openerp.com>2016-06-15 11:38:44 +0200
committerJérome Maes <jem@openerp.com>2016-07-14 14:04:33 +0200
commit6bc14c9142baedd98d8833c7cf77d1ee174e3f7f (patch)
tree6a71b77b58006dde08adb4fbd05fd2ce6e2a25a0 /addons/calendar/data
parentfe42986ee2f886527d6cebc702903d039b15f509 (diff)
[MIG] calendar: migration to new API
Migration of all python code, mostly withtout chagnes. And adapting xml files to guidelines. On calendar.py, some changes have been perform to make the migration works : - `_compute` method has been split into `_compute_dates`, `_compute_attendee` and `_compute_display_time`. - remove unused method `onchange_partner_ids`, `check_partners_email` - make `compute_rule_string` use a cache record instead of a value dict to avoid crashes - remove `new_invitation_token` method, and make it a default value on attendee creation - add a default value on `day` field, otherwise the "Please select a proper day of the month" exception is raised during the onchange
Diffstat (limited to 'addons/calendar/data')
-rw-r--r--addons/calendar/data/calendar_cron.xml4
-rw-r--r--addons/calendar/data/calendar_data.xml68
-rw-r--r--addons/calendar/data/calendar_demo.xml91
3 files changed, 80 insertions, 83 deletions
diff --git a/addons/calendar/data/calendar_cron.xml b/addons/calendar/data/calendar_cron.xml
index 313a0211fa4..09cda419a54 100644
--- a/addons/calendar/data/calendar_cron.xml
+++ b/addons/calendar/data/calendar_cron.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<openerp>
+<odoo>
<data noupdate="1">
<!-- Scheduler for Event Alarm-->
<record forcecreate="True" id="ir_cron_scheduler_alarm" model="ir.cron">
@@ -15,4 +15,4 @@
<!--<field eval="'(False,)'" name="args" />-->
</record>
</data>
-</openerp> \ No newline at end of file
+</odoo> \ No newline at end of file
diff --git a/addons/calendar/data/calendar_data.xml b/addons/calendar/data/calendar_data.xml
index d02c1028745..31ac6432015 100644
--- a/addons/calendar/data/calendar_data.xml
+++ b/addons/calendar/data/calendar_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
-<openerp>
+<odoo>
<data noupdate="1">
-
+
<!-- Expense-related subtypes for messaging / Chatter -->
<record id="calendar.subtype_invitation" model="mail.message.subtype">
<field name="name">Invitation</field>
@@ -9,66 +9,66 @@
<field name="description" eval="False"/>
<field name="default" eval="False"/>
</record>
- <record model="calendar.alarm" id="alarm_notif_1">
+ <record id="alarm_notif_1" model="calendar.alarm">
<field name="name">15 Minute(s)</field>
<field name="duration" eval="15" />
<field name="interval">minutes</field>
- <field name="type">notification</field>
- </record>
- <record model="calendar.alarm" id="alarm_notif_2">
+ <field name="type">notification</field>
+ </record>
+ <record id="alarm_notif_2" model="calendar.alarm">
<field name="name">30 Minute(s)</field>
<field name="duration" eval="30" />
<field name="interval">minutes</field>
- <field name="type">notification</field>
- </record>
- <record model="calendar.alarm" id="alarm_notif_3">
+ <field name="type">notification</field>
+ </record>
+ <record id="alarm_notif_3" model="calendar.alarm">
<field name="name">1 Hour(s)</field>
<field name="duration" eval="1" />
<field name="interval">hours</field>
- <field name="type">notification</field>
- </record>
- <record model="calendar.alarm" id="alarm_notif_4">
+ <field name="type">notification</field>
+ </record>
+ <record id="alarm_notif_4" model="calendar.alarm">
<field name="name">2 Hour(s)</field>
<field name="duration" eval="2" />
<field name="interval">hours</field>
- <field name="type">notification</field>
- </record>
- <record model="calendar.alarm" id="alarm_notif_5">
+ <field name="type">notification</field>
+ </record>
+ <record id="alarm_notif_5" model="calendar.alarm">
<field name="name">1 Day(s)</field>
<field name="duration" eval="1" />
<field name="interval">days</field>
- <field name="type">notification</field>
- </record>
- <record model="calendar.alarm" id="alarm_mail_1">
+ <field name="type">notification</field>
+ </record>
+ <record id="alarm_mail_1" model="calendar.alarm">
<field name="name">2~3 Hour(s) mail</field>
<field name="duration" eval="3" />
<field name="interval">hours</field>
- <field name="type">email</field>
- </record>
- <record model="calendar.alarm" id="alarm_mail_2">
+ <field name="type">email</field>
+ </record>
+ <record id="alarm_mail_2" model="calendar.alarm">
<field name="name">5~6 Hour(s) mail</field>
<field name="duration" eval="6" />
<field name="interval">hours</field>
- <field name="type">email</field>
- </record>
-
- <record model="calendar.event.type" id="categ_meet1">
+ <field name="type">email</field>
+ </record>
+
+ <record id="categ_meet1" model="calendar.event.type">
<field name="name">Customer Meeting</field>
</record>
- <record model="calendar.event.type" id="categ_meet2">
+ <record id="categ_meet2" model="calendar.event.type">
<field name="name">Internal Meeting</field>
</record>
- <record model="calendar.event.type" id="categ_meet3">
+ <record id="categ_meet3" model="calendar.event.type">
<field name="name">Off-site Meeting</field>
</record>
- <record model="calendar.event.type" id="categ_meet4">
+ <record id="categ_meet4" model="calendar.event.type">
<field name="name">Open Discussion</field>
</record>
- <record model="calendar.event.type" id="categ_meet5">
+ <record id="categ_meet5" model="calendar.event.type">
<field name="name">Feedback Meeting</field>
</record>
@@ -114,7 +114,7 @@
<p style="font-size: 20px; text-align: center;">Invitation to <strong>${object.event_id.name}</strong></p>
<p>
<strong>Dear ${object.cn}</strong>,<br />
- ${object.event_id.user_id.partner_id.name} invited you for the ${object.event_id.name} meeting of ${object.event_id.user_id.company_id.name}.</p>
+ ${object.event_id.user_id.partner_id.name} invited you for the ${object.event_id.name} meeting of ${object.event_id.user_id.company_id.name}.</p>
<table style="margin-top: 20px;"><tr>
<td>
<div style="border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;background:#a24689;padding-top: 4px;">
@@ -162,7 +162,7 @@
</table>
</div>]]></field>
</record>
-
+
<record id="calendar_template_meeting_changedate" model="mail.template">
<field name="name">Calendar: Date updated</field>
<field name="email_from">${object.event_id.user_id.email or ''}</field>
@@ -206,7 +206,7 @@
<p>
<strong>Dear ${object.cn}</strong>,<br />
The date of the meeting has been upated. The meeting ${object.event_id.name} created by ${object.event_id.user_id.partner_id.name} is now scheduled for ${object.event_id.get_display_time_tz(tz=object.partner_id.tz)}.
- </p>
+ </p>
<table style="margin-top: 20px;"><tr>
<td>
<div style="border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;background:#a24689;padding-top: 4px;">
@@ -298,7 +298,7 @@
<p>
<strong>Dear ${object.cn}</strong>,<br />
This is a reminder for the below event :
- </p>
+ </p>
<table style="margin-top: 20px;"><tr>
<td>
<div style="border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;background:#a24689;padding-top: 4px;">
@@ -347,4 +347,4 @@
</div>]]></field>
</record>
</data>
-</openerp>
+</odoo>
diff --git a/addons/calendar/data/calendar_demo.xml b/addons/calendar/data/calendar_demo.xml
index ac91e7e7680..08ca1ec137e 100644
--- a/addons/calendar/data/calendar_demo.xml
+++ b/addons/calendar/data/calendar_demo.xml
@@ -1,113 +1,110 @@
<?xml version="1.0"?>
-<openerp>
+<odoo>
<data noupdate="1">
- <!--
- ((((((((((( Demo Cases )))))))))))
- -->
- <!--For Meetings -->
- <record id="cal_contact_1" model="calendar.contacts">
- <field eval="1" name="active"/>
+ <record id="cal_contact_1" model="calendar.contacts">
+ <field name="active" eval="True"/>
<field name="user_id" ref="base.user_root"/>
- <field name="partner_id" ref="base.res_partner_1"/>
+ <field name="partner_id" ref="base.res_partner_1"/>
</record>
+
<record id="cal_contact_2" model="calendar.contacts">
- <field eval="1" name="active"/>
+ <field name="active" eval="True"/>
<field name="user_id" ref="base.user_root"/>
- <field name="partner_id" ref="base.partner_demo"/>
+ <field name="partner_id" ref="base.partner_demo"/>
</record>
<record id="calendar_event_1" model="calendar.event">
- <field eval="1" name="active"/>
+ <field name="active" eval="True"/>
<field name="user_id" ref="base.user_root"/>
<field name="partner_ids" eval="[(6,0,[ref('base.res_partner_1')])]"/>
<field name="name">Follow-up for Project proposal</field>
<field name="description">Meeting to discuss project plan and hash out the details of implementation.</field>
- <field eval="time.strftime('%Y-%m-03 10:20:00')" name="start"/>
+ <field name="start" eval="time.strftime('%Y-%m-03 10:20:00')"/>
<field name="categ_ids" eval="[(6,0,[ref('categ_meet1')])]"/>
- <field eval="time.strftime('%Y-%m-03 16:30:00')" name="stop"/>
- <field eval="6.3" name="duration"/>
- <field eval="0" name="allday"/>
+ <field name="stop" eval="time.strftime('%Y-%m-03 16:30:00')"/>
+ <field name="duration" eval="6.3"/>
+ <field name="allday" eval="False"/>
<field name="state">open</field>
</record>
<record id="calendar_event_2" model="calendar.event">
- <field eval="1" name="active"/>
+ <field name="active" eval="True"/>
<field name="user_id" ref="base.user_demo"/>
<field name="partner_ids" eval="[(6,0,[ref('base.partner_root'),ref('base.res_partner_4'),ref('base.res_partner_3')])]"/>
<field name="name">Initial discussion</field>
<field name="description">Discussion with partner for product.</field>
<field name="categ_ids" eval="[(6,0,[ref('categ_meet3')])]"/>
- <field eval="time.strftime('%Y-%m-05 12:00:00')" name="start"/>
- <field eval="time.strftime('%Y-%m-05 19:00:00')" name="stop"/>
- <field eval="0" name="allday"/>
- <field eval="7.0" name="duration"/>
+ <field name="start" eval="time.strftime('%Y-%m-05 12:00:00')"/>
+ <field name="stop" eval="time.strftime('%Y-%m-05 19:00:00')"/>
+ <field name="allday" eval="False"/>
+ <field name="duration" eval="7.0"/>
<field name="state">draft</field>
</record>
<record id="calendar_event_3" model="calendar.event">
- <field eval="1" name="active"/>
+ <field name="active" eval="True"/>
<field name="partner_ids" eval="[(6,0,[ref('base.partner_root')])]"/>
<field name="name">Pricing Discussion</field>
<field name="description">Internal meeting for discussion for new pricing for product and services.</field>
<field name="categ_ids" eval="[(6,0,[ref('categ_meet1'), ref('categ_meet2')])]"/>
- <field eval="time.strftime('%Y-%m-12 15:55:05')" name="start"/>
- <field eval="time.strftime('%Y-%m-12 18:55:05')" name="stop"/>
- <field eval="3.0" name="duration"/>
- <field eval="0" name="allday"/>
+ <field name="start" eval="time.strftime('%Y-%m-12 15:55:05')"/>
+ <field name="stop" eval="time.strftime('%Y-%m-12 18:55:05')"/>
+ <field name="duration" eval="3.0"/>
+ <field name="allday" eval="False"/>
<field name="state">open</field>
</record>
<record id="calendar_event_4" model="calendar.event">
- <field eval="1" name="active"/>
+ <field name="active" eval="True"/>
<field name="user_id" ref="base.user_demo"/>
<field name="partner_ids" eval="[(6,0,[ref('base.partner_demo'),ref('base.res_partner_1')])]"/>
<field name="name">Requirements review</field>
<field name="categ_ids" eval="[(6,0,[ref('categ_meet3')])]"/>
- <field eval="time.strftime('%Y-%m-20 8:00:00')" name="start"/>
- <field eval="time.strftime('%Y-%m-20 10:30:00')" name="stop"/>
- <field eval="2.5" name="duration"/>
- <field eval="0" name="allday"/>
+ <field name="start" eval="time.strftime('%Y-%m-20 8:00:00')"/>
+ <field name="stop" eval="time.strftime('%Y-%m-20 10:30:00')"/>
+ <field name="duration" eval="2.5"/>
+ <field name="allday" eval="False"/>
<field name="state">open</field>
</record>
<record id="calendar_event_5" model="calendar.event">
- <field eval="1" name="active"/>
+ <field name="active" eval="True"/>
<field name="partner_ids" eval="[(6,0,[ref('base.partner_root'),ref('base.res_partner_12')])]"/>
<field name="name">Changes in Designing</field>
<field name="categ_ids" eval="[(6,0,[ref('categ_meet1')])]"/>
- <field eval="time.strftime('%Y-%m-22')" name="start"/>
- <field eval="time.strftime('%Y-%m-22')" name="stop"/>
- <field eval="1" name="allday"/>
+ <field name="start" eval="time.strftime('%Y-%m-22')"/>
+ <field name="stop" eval="time.strftime('%Y-%m-22')"/>
+ <field name="allday" eval="True"/>
<field name="state">open</field>
</record>
<record id="calendar_event_6" model="calendar.event">
- <field eval="1" name="active"/>
- <field name="user_id" ref="base.user_demo"/>
+ <field name="active" eval="True"/>
+ <field name="user_id" ref="base.user_demo"/>
<field name="partner_ids" eval="[(6,0,[ref('base.partner_root'),ref('base.res_partner_4'),ref('base.res_partner_1'),ref('base.res_partner_12')])]"/>
<field name="name">Presentation for new Services</field>
<field name="categ_ids" eval="[(6,0,[ref('categ_meet1'), ref('categ_meet2')])]"/>
- <field eval="time.strftime('%Y-%m-18 2:00:00')" name="start"/>
- <field eval="time.strftime('%Y-%m-18 10:30:00')" name="stop"/>
- <field eval="8.5" name="duration"/>
- <field eval="0" name="allday"/>
+ <field name="start" eval="time.strftime('%Y-%m-18 2:00:00')"/>
+ <field name="stop" eval="time.strftime('%Y-%m-18 10:30:00')"/>
+ <field name="duration" eval="8.5"/>
+ <field name="allday" eval="False"/>
<field name="state">draft</field>
</record>
<record id="calendar_event_7" model="calendar.event">
- <field eval="1" name="active"/>
- <field name="user_id" ref="base.user_demo"/>
+ <field name="active" eval="True"/>
+ <field name="user_id" ref="base.user_demo"/>
<field name="partner_ids" eval="[(6,0,[ref('base.res_partner_4')])]"/>
<field name="name">Presentation of the new Calendar</field>
<field name="categ_ids" eval="[(6,0,[ref('categ_meet1'), ref('categ_meet2')])]"/>
- <field eval="time.strftime('%Y-%m-16')" name="start"/>
- <field eval="time.strftime('%Y-%m-16')" name="stop"/>
- <field eval="8.5" name="duration"/>
- <field eval="1" name="allday"/>
+ <field name="start" eval="time.strftime('%Y-%m-16')"/>
+ <field name="stop" eval="time.strftime('%Y-%m-16')"/>
+ <field name="duration" eval="8.5"/>
+ <field name="allday" eval="True"/>
<field name="state">draft</field>
</record>
</data>
-</openerp>
+</odoo>