From 11a1c91c5593f7ce89f6965affcd021158f303ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 17 Mar 2014 15:32:31 +0100 Subject: [REF] mass_mailing: moved files in models/data/views directories. bzr revid: tde@openerp.com-20140317143231-4jp3egoqvolenwxs --- addons/mass_mailing/data/mail_data.xml | 12 ++ addons/mass_mailing/data/mass_mailing_data.xml | 23 +++ addons/mass_mailing/data/mass_mailing_demo.xml | 206 +++++++++++++++++++++++++ 3 files changed, 241 insertions(+) create mode 100644 addons/mass_mailing/data/mail_data.xml create mode 100644 addons/mass_mailing/data/mass_mailing_data.xml create mode 100644 addons/mass_mailing/data/mass_mailing_demo.xml (limited to 'addons/mass_mailing/data') diff --git a/addons/mass_mailing/data/mail_data.xml b/addons/mass_mailing/data/mail_data.xml new file mode 100644 index 00000000000..a1a0e404fe3 --- /dev/null +++ b/addons/mass_mailing/data/mail_data.xml @@ -0,0 +1,12 @@ + + + + + + + mail.bounce.alias + bounce + + + + diff --git a/addons/mass_mailing/data/mass_mailing_data.xml b/addons/mass_mailing/data/mass_mailing_data.xml new file mode 100644 index 00000000000..6982aac566f --- /dev/null +++ b/addons/mass_mailing/data/mass_mailing_data.xml @@ -0,0 +1,23 @@ + + + + + + + Open Marketing Menu + reload + + + + + open + + + + + Manage Mass Mailing Campaigns + + + + + \ 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 new file mode 100644 index 00000000000..3b440aab84c --- /dev/null +++ b/addons/mass_mailing/data/mass_mailing_demo.xml @@ -0,0 +1,206 @@ + + + + + + + Partner Newsletter 1 + + + ${object.id} + ]]> + + + + + + + + + + + + + + +
+

A Punchy Headline

+
+

+ +

A Small Subtitle for ${object.name}

+ +

+ +

Choose a vibrant image and write an inspiring paragraph about it. It does not have to be long, but it should reinforce your image.

+
+ +
+ + + + + + + + + + + +
+

Feature One

+ +

Choose a vibrant image and write an inspiring paragraph about it. It does not have to be long, but it should reinforce your image.

+ 		+

Feature Two

+ +

Choose a vibrant image and write an inspiring paragraph about it. It does not have to be long, but it should reinforce your image.

+
+
]]> + + + + Partner Newsletter 2 + + + ${object.id} + ]]> + + + + + + + + +
+
+

Sell Online. Easily.

+ +

Write one sentence to convince visitor about your message.

+
+
+ +
+ + + + + + +
+
+
+
+
+ +
+ + + + + + + + + + + + + +
+

Feature One

+ +

Choose a vibrant image and write an inspiring paragraph about it. It does not have to be long, but it should reinforce your image.

+ 		+

Feature Two

+ +

Choose a vibrant image and write an inspiring paragraph about it. It does not have to be long, but it should reinforce your image.

+ 		+

Feature Three

+ +

Choose a vibrant image and write an inspiring paragraph about it. It does not have to be long, but it should reinforce your image.

+
+
]]> + + + + + Imported Contacts + mail.mass_mailing.contact + + + Customers + res.partner + + [('customer', '=', True)] + + + + + Aristide Antario + aa@example.com + + + + Beverly Bridge + bb@example.com + + + + Carol Cartridge + cc@example.com + + + + + + + Partners Newsletter + + + + + First Newsletter + done + + + + + + Second Newsletter + test + + + + + + + + 1111000@OpenERP.com + + + + + + 1111001@OpenERP.com + + + + + + 1111002@OpenERP.com + + + + + 1111003@OpenERP.com + + + + 1111004@OpenERP.com + + + + + -- cgit v1.2.3 From 030941e19279b367455bb45c150a0d0fa00f5849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 17 Mar 2014 17:57:13 +0100 Subject: [DEMO] mass_mailing: updated demo data, sent field new on mail mail stats updated bzr revid: tde@openerp.com-20140317165713-gh87h9nvfvecm5y0 --- addons/mass_mailing/data/mass_mailing_demo.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'addons/mass_mailing/data') diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml index 3b440aab84c..071877a8af8 100644 --- a/addons/mass_mailing/data/mass_mailing_demo.xml +++ b/addons/mass_mailing/data/mass_mailing_demo.xml @@ -178,18 +178,21 @@ 1111000@OpenERP.com + 1111001@OpenERP.com + 1111002@OpenERP.com + @@ -199,6 +202,7 @@ 1111004@OpenERP.com + -- cgit v1.2.3 From 4583c1829ba36393b0ded29938779a67f2f059d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 18 Mar 2014 17:39:18 +0100 Subject: [DEMO] mass_mailing: updated demo data bzr revid: tde@openerp.com-20140318163918-x1jg382boqdci0l3 --- addons/mass_mailing/data/mass_mailing_demo.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'addons/mass_mailing/data') diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml index 071877a8af8..f5695cd1080 100644 --- a/addons/mass_mailing/data/mass_mailing_demo.xml +++ b/addons/mass_mailing/data/mass_mailing_demo.xml @@ -155,9 +155,15 @@ + + Marketing + + - Partners Newsletter + Newsletter + design + @@ -166,6 +172,7 @@ + Second Newsletter -- cgit v1.2.3 From 89b41b305618f638e71f69a92d6711ca0061d711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 25 Mar 2014 16:42:46 +0100 Subject: [FIX] mass_mailing: fixed demo data, warnings about non existent fields in demo data. bzr revid: tde@openerp.com-20140325154246-6b97omyd4tjse7zo --- addons/mass_mailing/data/mass_mailing_demo.xml | 2 -- 1 file changed, 2 deletions(-) (limited to 'addons/mass_mailing/data') diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml index f5695cd1080..a1dd0ab9dfc 100644 --- a/addons/mass_mailing/data/mass_mailing_demo.xml +++ b/addons/mass_mailing/data/mass_mailing_demo.xml @@ -132,7 +132,6 @@ Customers res.partner - [('customer', '=', True)] @@ -157,7 +156,6 @@ Marketing - Newsletter -- cgit v1.2.3 From dae3551132a30f4c59ecbd2abced1041be10eeb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 27 Mar 2014 14:08:27 +0100 Subject: [IMP] mass_mailing: usability improvements - from mass_mailing, creating or editing a template now goes through a wizard to avoid tweaking too much the email.template view. This allows an easier management of templates and their link with mailings. - moved email.template minimal form view from email_tmeplate to mass_mailing, because it is the sole module to use it. Tweaked it a bit by the way. - removed dead code about actions not used anymore in mass_mailing - empty list help on mail.mass_mailing.list - various small usability fixes bzr revid: tde@openerp.com-20140327130827-h9dy2m6mq10gzg1s --- addons/mass_mailing/data/mass_mailing_demo.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'addons/mass_mailing/data') diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml index a1dd0ab9dfc..d9f6cb1d1bc 100644 --- a/addons/mass_mailing/data/mass_mailing_demo.xml +++ b/addons/mass_mailing/data/mass_mailing_demo.xml @@ -1,7 +1,6 @@ - - + Partner Newsletter 1 -- cgit v1.2.3 From b0488c5974ea9ae84c00e339e238d636fe68c8a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 27 Mar 2014 14:31:44 +0100 Subject: [REM] mass_mailing: removed some demo data bzr revid: tde@openerp.com-20140327133144-sat7kxo7kg6z49io --- addons/mass_mailing/data/mass_mailing_demo.xml | 77 ++++---------------------- 1 file changed, 10 insertions(+), 67 deletions(-) (limited to 'addons/mass_mailing/data') diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml index d9f6cb1d1bc..fd4e6e02ef7 100644 --- a/addons/mass_mailing/data/mass_mailing_demo.xml +++ b/addons/mass_mailing/data/mass_mailing_demo.xml @@ -2,13 +2,21 @@ + + bWlncmF0aW9uIHRlc3Q= + SampleDoc.doc + SampleDoc.doc + + - Partner Newsletter 1 + Partner Newsletter ${object.id} ]]> + + @@ -58,71 +66,6 @@ ]]> - - Partner Newsletter 2 - - - ${object.id} - ]]> - - -
- - - - - -
-
-

Sell Online. Easily.

- -

Write one sentence to convince visitor about your message.

-
-
- -
- - - - - - -
-
-
-
-
- -
- - - - - - - - - - - - - -
-

Feature One

- -

Choose a vibrant image and write an inspiring paragraph about it. It does not have to be long, but it should reinforce your image.

- 		-

Feature Two

- -

Choose a vibrant image and write an inspiring paragraph about it. It does not have to be long, but it should reinforce your image.

- 		-

Feature Three

- -

Choose a vibrant image and write an inspiring paragraph about it. It does not have to be long, but it should reinforce your image.

-
-
]]> - - Imported Contacts @@ -174,7 +117,7 @@ Second Newsletter test - + -- cgit v1.2.3 From f84a23ed5c7e80f2ab3cd64f1292268f4ffac748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 4 Apr 2014 17:34:32 +0200 Subject: [IMP] mass_mailing: campaigns: some refactoring ! - state is now stage_id, many2one towaqrds a newly added stage model, allowing to tune your process of mailign campaigns. Todo: menu to configure stages + access rights. - cleaned campaign kanban view, to be smaller. - added statbuttons in form view of campaigns bzr revid: tde@openerp.com-20140404153432-b171x0frbfepyfkn --- addons/mass_mailing/data/mass_mailing_data.xml | 14 ++++++++++++++ addons/mass_mailing/data/mass_mailing_demo.xml | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'addons/mass_mailing/data') diff --git a/addons/mass_mailing/data/mass_mailing_data.xml b/addons/mass_mailing/data/mass_mailing_data.xml index 6982aac566f..6bd1df79a72 100644 --- a/addons/mass_mailing/data/mass_mailing_data.xml +++ b/addons/mass_mailing/data/mass_mailing_data.xml @@ -19,5 +19,19 @@ + + + Schedule + 10 + + + Design + 20 + + + Sent + 30 + + \ 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 fd4e6e02ef7..4857c235a98 100644 --- a/addons/mass_mailing/data/mass_mailing_demo.xml +++ b/addons/mass_mailing/data/mass_mailing_demo.xml @@ -101,7 +101,7 @@ Newsletter - design + -- cgit v1.2.3 From 3df4eb0f7271cebe95ce6904072420a6cb2d1d9d Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 12 Apr 2014 22:31:29 +0200 Subject: [WIP] Mailing Lists and Contacts cleaned bzr revid: fp@tinyerp.com-20140412203129-5l7w4qr8rf2d1nqo --- addons/mass_mailing/data/mass_mailing_demo.xml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'addons/mass_mailing/data') diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml index 4857c235a98..d6fc5167e45 100644 --- a/addons/mass_mailing/data/mass_mailing_demo.xml +++ b/addons/mass_mailing/data/mass_mailing_demo.xml @@ -69,29 +69,26 @@ Imported Contacts - mail.mass_mailing.contact Customers - res.partner - [('customer', '=', True)] Aristide Antario aa@example.com - + Beverly Bridge bb@example.com - + Carol Cartridge cc@example.com - + @@ -103,13 +100,12 @@ Newsletter - + First Newsletter done - @@ -117,7 +113,6 @@ Second Newsletter test - -- cgit v1.2.3 From 96a750fd03c475cedff0f9053d5710a2aa34473d Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 13 Apr 2014 22:33:09 +0200 Subject: [IMP] Removing featuer bzr revid: fp@tinyerp.com-20140413203309-digp60hsobgv3i57 --- addons/mass_mailing/data/mass_mailing_demo.xml | 1 - 1 file changed, 1 deletion(-) (limited to 'addons/mass_mailing/data') diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml index d6fc5167e45..b35608e6fbc 100644 --- a/addons/mass_mailing/data/mass_mailing_demo.xml +++ b/addons/mass_mailing/data/mass_mailing_demo.xml @@ -14,7 +14,6 @@ ${object.id} ]]> - -- cgit v1.2.3 From 35d51fe71f5687eda07cee124077f6c213646e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 15 Apr 2014 11:58:17 +0200 Subject: [REM] mass_mailing: removed report, a graph view on statistics will be sufficient bzr revid: tde@openerp.com-20140415095817-rx7bokd6qc5rkrhq --- addons/mass_mailing/data/mass_mailing_demo.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'addons/mass_mailing/data') diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml index b35608e6fbc..568528319b2 100644 --- a/addons/mass_mailing/data/mass_mailing_demo.xml +++ b/addons/mass_mailing/data/mass_mailing_demo.xml @@ -105,14 +105,15 @@ First Newsletter done - + + Second Newsletter test - + -- cgit v1.2.3 From 1e643d4ce5dd42abd9ac00c7e7715d4250a81c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 15 Apr 2014 12:28:18 +0200 Subject: [FIX] mass_mailing: fixed demo data: reply_to specified + remove create_date, not allowed bzr revid: tde@openerp.com-20140415102818-zcm9vfc7zalg29f4 --- addons/mass_mailing/data/mass_mailing_demo.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/mass_mailing/data') diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml index 568528319b2..9090296b5d3 100644 --- a/addons/mass_mailing/data/mass_mailing_demo.xml +++ b/addons/mass_mailing/data/mass_mailing_demo.xml @@ -105,16 +105,16 @@ First Newsletter done - + info@yourcompany.example.com Second Newsletter test - + info@yourcompany.example.com -- cgit v1.2.3 From 922e8b610f32acee7ea9a629d5c7da4e9b4708d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 15 Apr 2014 12:43:37 +0200 Subject: [IMP] mass_mailing :improved demo data bzr revid: tde@openerp.com-20140415104337-gokvkpvx36wch132 --- addons/mass_mailing/data/mass_mailing_demo.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/mass_mailing/data') diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml index 9090296b5d3..63b27d9dfd2 100644 --- a/addons/mass_mailing/data/mass_mailing_demo.xml +++ b/addons/mass_mailing/data/mass_mailing_demo.xml @@ -140,6 +140,7 @@ 1111003@OpenERP.com + -- cgit v1.2.3 From 19a2f350fa4c51edcff1abc1386a28cb8c2e03c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 15 Apr 2014 15:51:57 +0200 Subject: [IMP] mass_mailing: cleaned demo data bzr revid: tde@openerp.com-20140415135157-blrw8vcv66nzs6wa --- addons/mass_mailing/data/mass_mailing_demo.xml | 99 ++++++++++++-------------- 1 file changed, 45 insertions(+), 54 deletions(-) (limited to 'addons/mass_mailing/data') diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml index 63b27d9dfd2..f3df196ea13 100644 --- a/addons/mass_mailing/data/mass_mailing_demo.xml +++ b/addons/mass_mailing/data/mass_mailing_demo.xml @@ -8,14 +8,48 @@ SampleDoc.doc - - Partner Newsletter - - - ${object.id} + + + Imported Contacts + + + + + Aristide Antario + aa@example.com + + + + Beverly Bridge + bb@example.com + + + + Carol Cartridge + cc@example.com + + + + + + + Marketing + + + Newsletter + + + + + + + First Newsletter + done + + + res.partner + [('customer', '=', True)] ]]> - - @@ -63,58 +97,15 @@
]]> - - - - - Imported Contacts - - - Customers - - - - - Aristide Antario - aa@example.com - - - - Beverly Bridge - bb@example.com - - - - Carol Cartridge - cc@example.com - - - - - - - Marketing - - - Newsletter - - - - - - - First Newsletter - done - - - - info@yourcompany.example.com + Second Newsletter test - info@yourcompany.example.com + res.partner + [('customer', '=', True)] + ]]> -- cgit v1.2.3 From 7ffffe688916fdc93d6c9b9b2da3227f70a444dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 15 Apr 2014 15:58:46 +0200 Subject: [FIX] mass_mailing: fixed demo data bzr revid: tde@openerp.com-20140415135846-ql9883kwc3skqelo --- addons/mass_mailing/data/mass_mailing_demo.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'addons/mass_mailing/data') diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml index f3df196ea13..569feec9c88 100644 --- a/addons/mass_mailing/data/mass_mailing_demo.xml +++ b/addons/mass_mailing/data/mass_mailing_demo.xml @@ -49,6 +49,7 @@ res.partner [('customer', '=', True)] + email ]]> @@ -105,6 +106,7 @@ res.partner [('customer', '=', True)] + email ]]> -- cgit v1.2.3