summaryrefslogtreecommitdiff
path: root/addons/utm
diff options
context:
space:
mode:
authorDebauche Stéphane <std@odoo.com>2019-11-13 13:43:47 +0000
committerDebauche Stéphane <std@odoo.com>2019-11-14 07:37:16 +0000
commit8453b7fb90b375c255c5fd6294a9b50fdb823256 (patch)
treef223e5c7d3b4a9bd78cc96980b9400148f62b5c8 /addons/utm
parente788c040f63e1cfb0026339871c94fbdf8d7bc9a (diff)
[IMP]: mass_mailing: improve some views
- In the campaign form view, when you click on "SMS", the filter has changed ``My Mailing`` -> ``My SMS Marketing`` - In the campaign form view, display the Mail/SMS subject instead of the SMS name - In UTM, move the campaign from the data to the demo data Task #2082296 closes odoo/odoo#40205 Related: odoo/enterprise#6685 Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Diffstat (limited to 'addons/utm')
-rw-r--r--addons/utm/__manifest__.py4
-rw-r--r--addons/utm/data/utm_data.xml22
-rw-r--r--addons/utm/data/utm_demo.xml26
3 files changed, 29 insertions, 23 deletions
diff --git a/addons/utm/__manifest__.py b/addons/utm/__manifest__.py
index ca7e9f9707e..e4174107018 100644
--- a/addons/utm/__manifest__.py
+++ b/addons/utm/__manifest__.py
@@ -16,6 +16,8 @@ Enable management of UTM trackers: campaign, medium, source.
'views/utm_views.xml',
'security/ir.model.access.csv',
],
- 'demo': [],
+ 'demo': [
+ 'data/utm_demo.xml',
+ ],
'auto_install': False,
}
diff --git a/addons/utm/data/utm_data.xml b/addons/utm/data/utm_data.xml
index 1f63451a71c..0b9a5fb62d7 100644
--- a/addons/utm/data/utm_data.xml
+++ b/addons/utm/data/utm_data.xml
@@ -18,28 +18,6 @@
<field name="sequence">30</field>
</record>
- <!-- UTM Campain -->
- <record model="utm.campaign" id="utm_campaign_fall_drive">
- <field name="name">Sale</field>
- <field name="stage_id" ref="utm.default_utm_stage"/>
- <field name="is_website" eval="True"/>
- </record>
- <record model="utm.campaign" id="utm_campaign_christmas_special">
- <field name="name">Christmas Special</field>
- <field name="stage_id" ref="utm.default_utm_stage"/>
- <field name="is_website" eval="True"/>
- </record>
- <record model="utm.campaign" id="utm_campaign_email_campaign_services">
- <field name="name">Email Campaign - Services</field>
- <field name="stage_id" ref="utm.default_utm_stage"/>
- <field name="is_website" eval="True"/>
- </record>
- <record model="utm.campaign" id="utm_campaign_email_campaign_products">
- <field name="name">Email Campaign - Products</field>
- <field name="stage_id" ref="utm.default_utm_stage"/>
- <field name="is_website" eval="True"/>
- </record>
-
<!-- UTM Source -->
<record model="utm.source" id="utm_source_search_engine">
<field name="name">Search engine</field>
diff --git a/addons/utm/data/utm_demo.xml b/addons/utm/data/utm_demo.xml
new file mode 100644
index 00000000000..e4e44578fe0
--- /dev/null
+++ b/addons/utm/data/utm_demo.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<odoo>
+<data>
+ <!-- UTM Campaigns -->
+ <record model="utm.campaign" id="utm_campaign_fall_drive">
+ <field name="name">Sale</field>
+ <field name="stage_id" ref="utm.default_utm_stage"/>
+ <field name="is_website" eval="True"/>
+ </record>
+ <record model="utm.campaign" id="utm_campaign_christmas_special">
+ <field name="name">Christmas Special</field>
+ <field name="stage_id" ref="utm.default_utm_stage"/>
+ <field name="is_website" eval="True"/>
+ </record>
+ <record model="utm.campaign" id="utm_campaign_email_campaign_services">
+ <field name="name">Email Campaign - Services</field>
+ <field name="stage_id" ref="utm.default_utm_stage"/>
+ <field name="is_website" eval="True"/>
+ </record>
+ <record model="utm.campaign" id="utm_campaign_email_campaign_products">
+ <field name="name">Email Campaign - Products</field>
+ <field name="stage_id" ref="utm.default_utm_stage"/>
+ <field name="is_website" eval="True"/>
+ </record>
+</data>
+</odoo>