diff options
| author | Thibault Delavallée <tde@openerp.com> | 2014-05-12 16:39:45 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2014-05-12 16:39:45 +0200 |
| commit | 46235aa78c04240f7abcf0e62ff92aad997700a2 (patch) | |
| tree | 25d0fe6a3eac3d822f56b63878ff9552406fafd9 /addons/mass_mailing/data | |
| parent | cce820565d9b85786d528b17670031bb112f1e64 (diff) | |
| parent | 9d9cfd585f56bf64126e7316ea60ea5131a02059 (diff) | |
[MERGE] Sync with turnk
Diffstat (limited to 'addons/mass_mailing/data')
| -rw-r--r-- | addons/mass_mailing/data/mass_mailing_data.xml | 5 | ||||
| -rw-r--r-- | addons/mass_mailing/data/mass_mailing_demo.xml | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/addons/mass_mailing/data/mass_mailing_data.xml b/addons/mass_mailing/data/mass_mailing_data.xml index 6bd1df79a72..7137bfcf29b 100644 --- a/addons/mass_mailing/data/mass_mailing_data.xml +++ b/addons/mass_mailing/data/mass_mailing_data.xml @@ -33,5 +33,10 @@ <field name="sequence">30</field> </record> + <!-- Create mailing lists --> + <record id="mass_mail_list_1" model="mail.mass_mailing.list"> + <field name="name">Newsletter</field> + </record> + </data> </openerp>
\ No newline at end of file diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml index 569feec9c88..d5a84419f93 100644 --- a/addons/mass_mailing/data/mass_mailing_demo.xml +++ b/addons/mass_mailing/data/mass_mailing_demo.xml @@ -9,7 +9,7 @@ </record> <!-- Create mailing lists --> - <record id="mass_mail_list_1" model="mail.mass_mailing.list"> + <record id="mass_mail_list_2" model="mail.mass_mailing.list"> <field name="name">Imported Contacts</field> </record> @@ -17,17 +17,17 @@ <record id="mass_mail_contact_1" model="mail.mass_mailing.contact"> <field name="name">Aristide Antario</field> <field name="email">aa@example.com</field> - <field name="list_id" ref="mass_mailing.mass_mail_list_1"/> + <field name="list_id" ref="mass_mailing.mass_mail_list_2"/> </record> <record id="mass_mail_contact_2" model="mail.mass_mailing.contact"> <field name="name">Beverly Bridge</field> <field name="email">bb@example.com</field> - <field name="list_id" ref="mass_mailing.mass_mail_list_1"/> + <field name="list_id" ref="mass_mailing.mass_mail_list_2"/> </record> <record id="mass_mail_contact_3" model="mail.mass_mailing.contact"> <field name="name">Carol Cartridge</field> <field name="email">cc@example.com</field> - <field name="list_id" ref="mass_mailing.mass_mail_list_1"/> + <field name="list_id" ref="mass_mailing.mass_mail_list_2"/> <field name="opt_out" eval="True"/> </record> |