diff options
| author | Xavier Morel <xmo@openerp.com> | 2014-05-14 15:13:04 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2014-05-14 15:13:04 +0200 |
| commit | f4d78ae738e474abd4e77dc8fc6cdf8a668a5d72 (patch) | |
| tree | a02d0dedc047ff296517530b50a33556e5d4f6c7 /addons/mass_mailing/data | |
| parent | 9d9cfd585f56bf64126e7316ea60ea5131a02059 (diff) | |
| parent | 4f5cc00420c6af5430ac921e89f217dcedaa1b8f (diff) | |
Merge branch 'server-trunk'
Conflicts:
addons/mass_mailing/controllers/main.py
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, 4 insertions, 9 deletions
diff --git a/addons/mass_mailing/data/mass_mailing_data.xml b/addons/mass_mailing/data/mass_mailing_data.xml index 7137bfcf29b..6bd1df79a72 100644 --- a/addons/mass_mailing/data/mass_mailing_data.xml +++ b/addons/mass_mailing/data/mass_mailing_data.xml @@ -33,10 +33,5 @@ <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 d5a84419f93..569feec9c88 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_2" model="mail.mass_mailing.list"> + <record id="mass_mail_list_1" 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_2"/> + <field name="list_id" ref="mass_mailing.mass_mail_list_1"/> </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_2"/> + <field name="list_id" ref="mass_mailing.mass_mail_list_1"/> </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_2"/> + <field name="list_id" ref="mass_mailing.mass_mail_list_1"/> <field name="opt_out" eval="True"/> </record> |