diff --git a/addons/mass_mailing/views/utm_campaign_views.xml b/addons/mass_mailing/views/utm_campaign_views.xml index 7dc5303581b..ab9a0504f12 100644 --- a/addons/mass_mailing/views/utm_campaign_views.xml +++ b/addons/mass_mailing/views/utm_campaign_views.xml @@ -101,7 +101,7 @@ Campaigns are the perfect tool to track results across multiple mailings.

- [('is_website', '=', False)] + [('is_auto_campaign', '=', False)] Sale - + Christmas Special - + Email Campaign - Services - + Email Campaign - Products - + diff --git a/addons/utm/models/utm.py b/addons/utm/models/utm.py index a670539d330..e32640bd785 100644 --- a/addons/utm/models/utm.py +++ b/addons/utm/models/utm.py @@ -44,7 +44,7 @@ class UtmCampaign(models.Model): 'utm.tag', 'utm_tag_rel', 'tag_id', 'campaign_id', string='Tags') - is_website = fields.Boolean(default=False, help="Allows us to filter relevant Campaign") + is_auto_campaign = fields.Boolean(default=False, string="Automatically Generated Campaign", help="Allows us to filter relevant Campaigns") color = fields.Integer(string='Color Index') @api.model diff --git a/addons/utm/models/utm_mixin.py b/addons/utm/models/utm_mixin.py index b74d33857d6..67b96b1881b 100644 --- a/addons/utm/models/utm_mixin.py +++ b/addons/utm/models/utm_mixin.py @@ -37,8 +37,8 @@ class UtmMixin(models.AbstractModel): Model = self.env[field.comodel_name] records = Model.search([('name', '=', value)], limit=1) if not records: - if 'is_website' in records._fields: - records = Model.create({'name': value, 'is_website': True}) + if 'is_auto_campaign' in records._fields: + records = Model.create({'name': value, 'is_auto_campaign': True}) else: records = Model.create({'name': value}) value = records.id diff --git a/addons/utm/views/utm_campaign_views.xml b/addons/utm/views/utm_campaign_views.xml index 7ff38c11e76..740d5c19440 100644 --- a/addons/utm/views/utm_campaign_views.xml +++ b/addons/utm/views/utm_campaign_views.xml @@ -8,6 +8,7 @@ + diff --git a/addons/utm/views/utm_views.xml b/addons/utm/views/utm_views.xml index 97a1680da53..94c4db7852c 100644 --- a/addons/utm/views/utm_views.xml +++ b/addons/utm/views/utm_views.xml @@ -15,7 +15,7 @@ Campaigns utm.campaign - kanban,tree,form + tree,kanban,form

Create a campaign diff --git a/addons/website_links/static/src/js/website_links.js b/addons/website_links/static/src/js/website_links.js index f1701005a78..6c9bec28421 100644 --- a/addons/website_links/static/src/js/website_links.js +++ b/addons/website_links/static/src/js/website_links.js @@ -85,7 +85,7 @@ var SelectBox = publicWidget.Widget.extend({ name: name }; if (this.obj === "utm.campaign"){ - args.is_website = true; + args.is_auto_campaign = true; } return this._rpc({ model: this.obj,