From ff9c587b736f1511ae4cc938eac3088b56fc825c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 13 Sep 2023 14:00:02 +0200 Subject: [PATCH 1/4] [MOV] mass_mailing: split data / demo into sub files Purpose is to ease tracking of data and demo through versions by avoiding the usage of huge file. Instead split data and demo / main model. Task-2702607 Part-of: odoo/odoo#135299 --- addons/mass_mailing/__manifest__.py | 8 +- ...list_data.xml => mailing_list_contact.xml} | 0 .../mass_mailing/data/mass_mailing_data.xml | 0 .../mass_mailing/data/mass_mailing_demo.xml | 296 ------------------ .../demo/mailing_contact_subscription.xml | 21 ++ .../demo/mailing_list_contact.xml | 41 +++ addons/mass_mailing/demo/mailing_mailing.xml | 102 ++++++ addons/mass_mailing/demo/mailing_trace.xml | 132 ++++++++ addons/mass_mailing/demo/utm.xml | 15 + 9 files changed, 317 insertions(+), 298 deletions(-) rename addons/mass_mailing/data/{mailing_list_data.xml => mailing_list_contact.xml} (100%) delete mode 100644 addons/mass_mailing/data/mass_mailing_data.xml delete mode 100644 addons/mass_mailing/data/mass_mailing_demo.xml create mode 100644 addons/mass_mailing/demo/mailing_contact_subscription.xml create mode 100644 addons/mass_mailing/demo/mailing_list_contact.xml create mode 100644 addons/mass_mailing/demo/mailing_mailing.xml create mode 100644 addons/mass_mailing/demo/mailing_trace.xml create mode 100644 addons/mass_mailing/demo/utm.xml diff --git a/addons/mass_mailing/__manifest__.py b/addons/mass_mailing/__manifest__.py index 55f7e5452b8..aafa65b2c73 100644 --- a/addons/mass_mailing/__manifest__.py +++ b/addons/mass_mailing/__manifest__.py @@ -27,7 +27,7 @@ 'data/ir_cron_data.xml', 'data/ir_module_data.xml', 'data/mailing_data_templates.xml', - 'data/mailing_list_data.xml', + 'data/mailing_list_contact.xml', 'data/res_users_data.xml', 'wizard/mail_compose_message_views.xml', 'wizard/mailing_contact_import_views.xml', @@ -79,7 +79,11 @@ 'views/snippets/s_title.xml', ], 'demo': [ - 'data/mass_mailing_demo.xml', + 'demo/utm.xml', + 'demo/mailing_list_contact.xml', + 'demo/mailing_contact_subscription.xml', + 'demo/mailing_mailing.xml', + 'demo/mailing_trace.xml', ], 'application': True, 'assets': { diff --git a/addons/mass_mailing/data/mailing_list_data.xml b/addons/mass_mailing/data/mailing_list_contact.xml similarity index 100% rename from addons/mass_mailing/data/mailing_list_data.xml rename to addons/mass_mailing/data/mailing_list_contact.xml diff --git a/addons/mass_mailing/data/mass_mailing_data.xml b/addons/mass_mailing/data/mass_mailing_data.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml deleted file mode 100644 index b9fadfee298..00000000000 --- a/addons/mass_mailing/data/mass_mailing_demo.xml +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - bWlncmF0aW9uIHRlc3Q= - SampleDoc.doc - - - - - Imported Contacts - - - - - Aristide Antario - alexandre.antario@example.com - - - - Beverly Bridge - beverly.bridge@example.com - - - - Carol Cartridge - carol.cartridge@example.com - - - - David Dawson - david.dawson@example.com - - - Elsa Ericson - elsa.ericson@example.com - 5 - - - - Franz Faubourg - franz.faubourg@example.com - - - - - - - - True - - - - - True - - - - - elsa.ericson@example.com - - - - - Newsletter 1 - - - Newsletter - - - - - - - Newsletter 1 - Monthly Newsletter - done - - info@yourcompany.example.com - - - - - - new - Info <info@yourcompany.example.com> - -
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

- Great stories have personality. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assist with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience. -
Great stories are for everyone even when only written for just one person. If you try to write with a wide general audience in mind, your story will ring false and be bland. No one will be interested. Write for one person. If it’s genuine for the one, it’s genuine for the rest. -

-
-
-
-
-
-
-
-
-
-
- Unsubscribe | - - Contact -
-
-
-
-

- 2018 All Rights Reserved -

-
-
-
-
-
-
-
-
-
-
-
- Powered by Odoo -
-
-
-
- - - - - - - - - 1111000@odoo.com - res.partner - - billy.fox45@example.com - reply - - - - - - - - 1111001@odoo.com - res.partner - - kim.snyder96@example.com - reply - - - - - - - - 1111002@odoo.com - res.partner - - edith.sanchez68@example.com - open - - - - - - - 1111003@odoo.com - res.partner - - theodore.gardner36@example.com - open - - - - - - - 1111004@odoo.com - res.partner - - sandra.neal80@example.com - sent - - - - - - 1111005@odoo.com - res.partner - - julie.richards84@example.com - error - - - - - 1111006@odoo.com - res.partner - - travis.mendoza24@example.com - bounce - - - - - - 1111007@odoo.com - res.partner - - travis.mendoza24@example.com - bounce - - - - - - - 100.01.02.03 - BE - - - - - 100.01.02.03 - BE - - - - - 100.01.02.04 - BE - - - - - 100.01.02.04 - BE - - - - - 100.01.02.05 - BE - - - - - diff --git a/addons/mass_mailing/demo/mailing_contact_subscription.xml b/addons/mass_mailing/demo/mailing_contact_subscription.xml new file mode 100644 index 00000000000..cd62a387234 --- /dev/null +++ b/addons/mass_mailing/demo/mailing_contact_subscription.xml @@ -0,0 +1,21 @@ + + + + + + + + True + + + + + True + + + + + elsa.ericson@example.com + + + diff --git a/addons/mass_mailing/demo/mailing_list_contact.xml b/addons/mass_mailing/demo/mailing_list_contact.xml new file mode 100644 index 00000000000..18d16c85cf4 --- /dev/null +++ b/addons/mass_mailing/demo/mailing_list_contact.xml @@ -0,0 +1,41 @@ + + + + + + Imported Contacts + + + + + Aristide Antario + alexandre.antario@example.com + + + + Beverly Bridge + beverly.bridge@example.com + + + + Carol Cartridge + carol.cartridge@example.com + + + + David Dawson + david.dawson@example.com + + + Elsa Ericson + elsa.ericson@example.com + 5 + + + + Franz Faubourg + franz.faubourg@example.com + + + + diff --git a/addons/mass_mailing/demo/mailing_mailing.xml b/addons/mass_mailing/demo/mailing_mailing.xml new file mode 100644 index 00000000000..5bfad119f40 --- /dev/null +++ b/addons/mass_mailing/demo/mailing_mailing.xml @@ -0,0 +1,102 @@ + + + + + bWlncmF0aW9uIHRlc3Q= + SampleDoc.doc + + + + Newsletter 1 + Monthly Newsletter + done + + info@yourcompany.example.com + + + + + + new + Info <info@yourcompany.example.com> + +
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+ Great stories have personality. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assist with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience. +
Great stories are for everyone even when only written for just one person. If you try to write with a wide general audience in mind, your story will ring false and be bland. No one will be interested. Write for one person. If it’s genuine for the one, it’s genuine for the rest. +

+
+
+
+
+
+
+
+
+
+
+ Unsubscribe | + + Contact +
+
+
+
+

+ 2018 All Rights Reserved +

+
+
+
+
+
+
+
+
+
+
+
+ Powered by Odoo +
+
+
+
+ + + + + + + diff --git a/addons/mass_mailing/demo/mailing_trace.xml b/addons/mass_mailing/demo/mailing_trace.xml new file mode 100644 index 00000000000..141973388cd --- /dev/null +++ b/addons/mass_mailing/demo/mailing_trace.xml @@ -0,0 +1,132 @@ + + + + + + 1111000@odoo.com + res.partner + + billy.fox45@example.com + reply + + + + + + + + 1111001@odoo.com + res.partner + + kim.snyder96@example.com + reply + + + + + + + + 1111002@odoo.com + res.partner + + edith.sanchez68@example.com + open + + + + + + + 1111003@odoo.com + res.partner + + theodore.gardner36@example.com + open + + + + + + + 1111004@odoo.com + res.partner + + sandra.neal80@example.com + sent + + + + + + 1111005@odoo.com + res.partner + + julie.richards84@example.com + error + + + + + 1111006@odoo.com + res.partner + + travis.mendoza24@example.com + bounce + + + + + + 1111007@odoo.com + res.partner + + travis.mendoza24@example.com + bounce + + + + + + + 100.01.02.03 + BE + + + + + 100.01.02.03 + BE + + + + + 100.01.02.04 + BE + + + + + 100.01.02.04 + BE + + + + + 100.01.02.05 + BE + + + + + diff --git a/addons/mass_mailing/demo/utm.xml b/addons/mass_mailing/demo/utm.xml new file mode 100644 index 00000000000..acdd572998b --- /dev/null +++ b/addons/mass_mailing/demo/utm.xml @@ -0,0 +1,15 @@ + + + + + + Newsletter 1 + + + Newsletter + + + + + + From ac18b2917721abeff3b2e6f7122be5bd1d6e65ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 13 Sep 2023 14:18:33 +0200 Subject: [PATCH 2/4] [MOV] mass_mailing_sms: split data / demo into sub files Purpose is to ease tracking of data and demo through versions by avoiding the usage of huge file. Instead split data and demo / main model. Task-2702607 Part-of: odoo/odoo#135299 --- addons/mass_mailing_sms/__manifest__.py | 9 +++--- .../data/{utm_data.xml => utm.xml} | 0 .../mailing_list_contact.xml} | 0 .../mass_mailing_sms/demo/mailing_mailing.xml | 31 +++++++++++++++++++ .../mailing_trace.xml} | 29 ----------------- .../{data/utm_demo.xml => demo/utm.xml} | 3 ++ 6 files changed, 39 insertions(+), 33 deletions(-) rename addons/mass_mailing_sms/data/{utm_data.xml => utm.xml} (100%) rename addons/mass_mailing_sms/{data/mailing_list_demo.xml => demo/mailing_list_contact.xml} (100%) create mode 100644 addons/mass_mailing_sms/demo/mailing_mailing.xml rename addons/mass_mailing_sms/{data/mailing_demo.xml => demo/mailing_trace.xml} (82%) rename addons/mass_mailing_sms/{data/utm_demo.xml => demo/utm.xml} (80%) diff --git a/addons/mass_mailing_sms/__manifest__.py b/addons/mass_mailing_sms/__manifest__.py index 83e20c94581..5e9bed73d4c 100644 --- a/addons/mass_mailing_sms/__manifest__.py +++ b/addons/mass_mailing_sms/__manifest__.py @@ -13,7 +13,7 @@ 'sms', ], 'data': [ - 'data/utm_data.xml', + 'data/utm.xml', 'security/ir.model.access.csv', 'report/mailing_trace_report_views.xml', 'views/mailing_list_views.xml', @@ -27,9 +27,10 @@ 'wizard/mailing_sms_test_views.xml', ], 'demo': [ - 'data/utm_demo.xml', - 'data/mailing_list_demo.xml', - 'data/mailing_demo.xml', + 'demo/utm.xml', + 'demo/mailing_list_contact.xml', + 'demo/mailing_mailing.xml', + 'demo/mailing_trace.xml', ], 'assets': { 'web.assets_tests': [ diff --git a/addons/mass_mailing_sms/data/utm_data.xml b/addons/mass_mailing_sms/data/utm.xml similarity index 100% rename from addons/mass_mailing_sms/data/utm_data.xml rename to addons/mass_mailing_sms/data/utm.xml diff --git a/addons/mass_mailing_sms/data/mailing_list_demo.xml b/addons/mass_mailing_sms/demo/mailing_list_contact.xml similarity index 100% rename from addons/mass_mailing_sms/data/mailing_list_demo.xml rename to addons/mass_mailing_sms/demo/mailing_list_contact.xml diff --git a/addons/mass_mailing_sms/demo/mailing_mailing.xml b/addons/mass_mailing_sms/demo/mailing_mailing.xml new file mode 100644 index 00000000000..e751720982d --- /dev/null +++ b/addons/mass_mailing_sms/demo/mailing_mailing.xml @@ -0,0 +1,31 @@ + + + + XMas Promo + XMas Promo + sms + done + + + + + + This week-end, incredible promotion for XMas! See http://sms.example.com! + + + + + + Extra Promo + sms + done + + + + + + + Extra promotion for you! + + + diff --git a/addons/mass_mailing_sms/data/mailing_demo.xml b/addons/mass_mailing_sms/demo/mailing_trace.xml similarity index 82% rename from addons/mass_mailing_sms/data/mailing_demo.xml rename to addons/mass_mailing_sms/demo/mailing_trace.xml index 66f01a4cdbf..1ad2a83ae1f 100644 --- a/addons/mass_mailing_sms/data/mailing_demo.xml +++ b/addons/mass_mailing_sms/demo/mailing_trace.xml @@ -1,19 +1,5 @@ - - XMas Promo - XMas Promo - sms - done - - - - - - This week-end, incredible promotion for XMas! See http://sms.example.com! - - - @@ -121,21 +107,6 @@ - - Mailing Extra Promo - - - Extra Promo - sms - done - - - - - - - Extra promotion for you! - diff --git a/addons/mass_mailing_sms/data/utm_demo.xml b/addons/mass_mailing_sms/demo/utm.xml similarity index 80% rename from addons/mass_mailing_sms/data/utm_demo.xml rename to addons/mass_mailing_sms/demo/utm.xml index 4fddf06f497..449599cb3e5 100644 --- a/addons/mass_mailing_sms/data/utm_demo.xml +++ b/addons/mass_mailing_sms/demo/utm.xml @@ -10,4 +10,7 @@ + + Mailing Extra Promo + From e114822875c11c008b3fc06f99c100cdf76fcf8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 13 Sep 2023 14:45:31 +0200 Subject: [PATCH 3/4] [MOV] mass_mailing(_*): rename demo files Just update file naming according to model / guidelines. Task-2702607 Part-of: odoo/odoo#135299 --- addons/mass_mailing_crm/__manifest__.py | 2 +- .../{data/mass_mailing_demo.xml => demo/mailing_mailing.xml} | 0 addons/mass_mailing_sale/__manifest__.py | 2 +- .../{data/mass_mailing_demo.xml => demo/mailing_mailing.xml} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename addons/mass_mailing_crm/{data/mass_mailing_demo.xml => demo/mailing_mailing.xml} (100%) rename addons/mass_mailing_sale/{data/mass_mailing_demo.xml => demo/mailing_mailing.xml} (100%) diff --git a/addons/mass_mailing_crm/__manifest__.py b/addons/mass_mailing_crm/__manifest__.py index 2ee1e7119ec..a812b287953 100644 --- a/addons/mass_mailing_crm/__manifest__.py +++ b/addons/mass_mailing_crm/__manifest__.py @@ -12,7 +12,7 @@ 'views/mailing_mailing_views.xml', ], 'demo': [ - 'data/mass_mailing_demo.xml', + 'demo/mailing_mailing.xml', ], 'auto_install': True, 'license': 'LGPL-3', diff --git a/addons/mass_mailing_crm/data/mass_mailing_demo.xml b/addons/mass_mailing_crm/demo/mailing_mailing.xml similarity index 100% rename from addons/mass_mailing_crm/data/mass_mailing_demo.xml rename to addons/mass_mailing_crm/demo/mailing_mailing.xml diff --git a/addons/mass_mailing_sale/__manifest__.py b/addons/mass_mailing_sale/__manifest__.py index 084490a16be..46fddd7c76b 100644 --- a/addons/mass_mailing_sale/__manifest__.py +++ b/addons/mass_mailing_sale/__manifest__.py @@ -12,7 +12,7 @@ 'views/mailing_mailing_views.xml', ], 'demo': [ - 'data/mass_mailing_demo.xml', + 'demo/mailing_mailing.xml', ], 'auto_install': True, 'license': 'LGPL-3', diff --git a/addons/mass_mailing_sale/data/mass_mailing_demo.xml b/addons/mass_mailing_sale/demo/mailing_mailing.xml similarity index 100% rename from addons/mass_mailing_sale/data/mass_mailing_demo.xml rename to addons/mass_mailing_sale/demo/mailing_mailing.xml From 1f7c5150869832d4348b79eab1c46737fcca2e04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 13 Sep 2023 13:53:29 +0200 Subject: [PATCH 4/4] [IMP] mass_mailing(_sms): make data subscription a real record Make real subscription records for contact / list link, in order to have values for inner model fields and ease their management / update / removal. It is better than relying on m2m commands. Also harmonize some xml ids names to ease future changes. Task-2702607 Part-of: odoo/odoo#135299 --- addons/mass_mailing/__manifest__.py | 3 +- .../data/mailing_contact_subscription.xml | 9 +++++ .../data/mailing_list_contact.xml | 4 +-- .../demo/mailing_contact_subscription.xml | 33 ++++++++++++++++--- .../demo/mailing_list_contact.xml | 11 ++++--- addons/mass_mailing_sms/__manifest__.py | 3 +- .../demo/mailing_contact_subscription.xml | 23 +++++++++++++ .../demo/mailing_list_contact.xml | 10 +++--- 8 files changed, 78 insertions(+), 18 deletions(-) create mode 100644 addons/mass_mailing/data/mailing_contact_subscription.xml create mode 100644 addons/mass_mailing_sms/demo/mailing_contact_subscription.xml diff --git a/addons/mass_mailing/__manifest__.py b/addons/mass_mailing/__manifest__.py index aafa65b2c73..69465997bcc 100644 --- a/addons/mass_mailing/__manifest__.py +++ b/addons/mass_mailing/__manifest__.py @@ -4,7 +4,7 @@ { 'name': 'Email Marketing', 'summary': 'Design, send and track emails', - 'version': '2.6', + 'version': '2.7', 'sequence': 60, 'website': 'https://www.odoo.com/app/email-marketing', 'category': 'Marketing/Email Marketing', @@ -28,6 +28,7 @@ 'data/ir_module_data.xml', 'data/mailing_data_templates.xml', 'data/mailing_list_contact.xml', + 'data/mailing_contact_subscription.xml', 'data/res_users_data.xml', 'wizard/mail_compose_message_views.xml', 'wizard/mailing_contact_import_views.xml', diff --git a/addons/mass_mailing/data/mailing_contact_subscription.xml b/addons/mass_mailing/data/mailing_contact_subscription.xml new file mode 100644 index 00000000000..8c6302d421b --- /dev/null +++ b/addons/mass_mailing/data/mailing_contact_subscription.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/addons/mass_mailing/data/mailing_list_contact.xml b/addons/mass_mailing/data/mailing_list_contact.xml index 645ac7e3ced..6cadf031483 100644 --- a/addons/mass_mailing/data/mailing_list_contact.xml +++ b/addons/mass_mailing/data/mailing_list_contact.xml @@ -4,10 +4,10 @@ Newsletter - + - + diff --git a/addons/mass_mailing/demo/mailing_contact_subscription.xml b/addons/mass_mailing/demo/mailing_contact_subscription.xml index cd62a387234..d15cf6b1bd4 100644 --- a/addons/mass_mailing/demo/mailing_contact_subscription.xml +++ b/addons/mass_mailing/demo/mailing_contact_subscription.xml @@ -1,20 +1,45 @@ - - + + + + + + + + + + + + + + True - + + + + + True + + + + + + + + + - + elsa.ericson@example.com diff --git a/addons/mass_mailing/demo/mailing_list_contact.xml b/addons/mass_mailing/demo/mailing_list_contact.xml index 18d16c85cf4..8e788cf2f63 100644 --- a/addons/mass_mailing/demo/mailing_list_contact.xml +++ b/addons/mass_mailing/demo/mailing_list_contact.xml @@ -10,32 +10,33 @@ Aristide Antario alexandre.antario@example.com - + Beverly Bridge beverly.bridge@example.com - + Carol Cartridge carol.cartridge@example.com - + David Dawson david.dawson@example.com + Elsa Ericson elsa.ericson@example.com 5 - + Franz Faubourg franz.faubourg@example.com - + diff --git a/addons/mass_mailing_sms/__manifest__.py b/addons/mass_mailing_sms/__manifest__.py index 5e9bed73d4c..818721509d4 100644 --- a/addons/mass_mailing_sms/__manifest__.py +++ b/addons/mass_mailing_sms/__manifest__.py @@ -4,7 +4,7 @@ { 'name': 'SMS Marketing', 'summary': 'Design, send and track SMS', - 'version': '1.0', + 'version': '1.1', 'category': 'Marketing/Email Marketing', 'sequence': 245, 'depends': [ @@ -29,6 +29,7 @@ 'demo': [ 'demo/utm.xml', 'demo/mailing_list_contact.xml', + 'demo/mailing_contact_subscription.xml', 'demo/mailing_mailing.xml', 'demo/mailing_trace.xml', ], diff --git a/addons/mass_mailing_sms/demo/mailing_contact_subscription.xml b/addons/mass_mailing_sms/demo/mailing_contact_subscription.xml new file mode 100644 index 00000000000..f0671cee8cc --- /dev/null +++ b/addons/mass_mailing_sms/demo/mailing_contact_subscription.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/mass_mailing_sms/demo/mailing_list_contact.xml b/addons/mass_mailing_sms/demo/mailing_list_contact.xml index 885acd75990..e303c0cef93 100644 --- a/addons/mass_mailing_sms/demo/mailing_list_contact.xml +++ b/addons/mass_mailing_sms/demo/mailing_list_contact.xml @@ -8,27 +8,27 @@ Hubert Farnsworth +32456001100 hubert.farnsworth@example.com - + Philip Fry +32456001111 philip.fry@example.com - + Turanga Leela +32456001122 - + John Zoidberg +32456001133 - + Zapp Brannigan dummy - +