summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Pinckaers <fp@openerp.com>2016-12-09 13:37:12 +0100
committerFabien Pinckaers <fp@openerp.com>2016-12-09 13:37:12 +0100
commiteff9045741d4dcc036db2fe943c96f2522968b41 (patch)
tree73372121748bcd5080ea095c14d06c1b9b224904
parentb17029cf5dd13c3560da49336d4f1e6d9ca12256 (diff)
[iMP] mass_mailing: adding color or kanban views
-rw-r--r--addons/mass_mailing/models/mass_mailing.py2
-rw-r--r--addons/mass_mailing/views/mass_mailing_views.xml1
2 files changed, 2 insertions, 1 deletions
diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 723bb9f292d..c62a9eef847 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -324,7 +324,7 @@ class MassMailing(models.Model):
clicks_ratio = fields.Integer(compute="_compute_clicks_ratio", string="Number of Clicks")
state = fields.Selection([('draft', 'Draft'), ('in_queue', 'In Queue'), ('sending', 'Sending'), ('done', 'Sent')],
string='Status', required=True, copy=False, default='draft')
- color = fields.Integer(related='mass_mailing_campaign_id.color', string='Color Index')
+ color = fields.Integer(string='Color Index')
# mailing options
reply_to_mode = fields.Selection(
[('thread', 'Followers of leads/applicants'), ('email', 'Specified Email Address')],
diff --git a/addons/mass_mailing/views/mass_mailing_views.xml b/addons/mass_mailing/views/mass_mailing_views.xml
index 30bb16a1455..3522af1b76e 100644
--- a/addons/mass_mailing/views/mass_mailing_views.xml
+++ b/addons/mass_mailing/views/mass_mailing_views.xml
@@ -417,6 +417,7 @@
<span class="fa fa-bars fa-lg"/>
</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+ <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
<t t-if="widget.deletable">
<li><a type="delete">Delete</a></li>
</t>