diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-12-10 13:05:58 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-12-10 13:05:58 +0100 |
| commit | 82a495eed52a9f42e5b88caa52c20a85f8d81ce3 (patch) | |
| tree | 6c5e8cc0247d5fe08d24e9abae38fe353fbebc56 /addons/mail/views | |
| parent | 0bc2ddae784bf80c4c809d8b7f6d642d576f92a1 (diff) | |
| parent | 4022493c0b85f966e499b6c03ac7cce5556f15e6 (diff) | |
[MERGE] forward port of branch saas-7 up to 4022493
Diffstat (limited to 'addons/mail/views')
| -rw-r--r-- | addons/mail/views/mail_channel_views.xml | 5 | ||||
| -rw-r--r-- | addons/mail/views/res_users_views.xml | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/addons/mail/views/mail_channel_views.xml b/addons/mail/views/mail_channel_views.xml index 978ddd07487..59305e1a9ec 100644 --- a/addons/mail/views/mail_channel_views.xml +++ b/addons/mail/views/mail_channel_views.xml @@ -119,7 +119,7 @@ </group> </page> <page string="Members"> - <field name="channel_partner_ids" mode="tree" readonly="1"> + <field name="channel_partner_ids" mode="tree"> <tree string="members"> <field name="name"/> <field name="email"/> @@ -128,6 +128,9 @@ </field> </page> </notebook> + <div class="oe_chatter" groups="base.group_no_one"> + <field name="message_follower_ids" widget="mail_followers"/> + </div> </sheet> </form> </field> diff --git a/addons/mail/views/res_users_views.xml b/addons/mail/views/res_users_views.xml index 23d75a14b49..d76e05d43cb 100644 --- a/addons/mail/views/res_users_views.xml +++ b/addons/mail/views/res_users_views.xml @@ -11,7 +11,6 @@ <data> <field name="email" position="before"> <field name="notify_email" widget="radio" readonly="0"/> - <field name="chatter_needaction_auto"/> </field> </data> </field> |