From 0811c20d9c72e7c4cff3b645466041c1ef332f45 Mon Sep 17 00:00:00 2001
From: Ravi Gadhia <rga@odoo.com>
Date: Tue, 29 Nov 2016 16:06:08 +0100
Subject: [PATCH] [IMP] mail: partner: add support of activities support on
 res.partner model

---
 addons/delivery/views/partner_view.xml   |  2 +-
 addons/mail/models/res_partner.py        |  2 +-
 addons/mail/views/res_partner_views.xml  | 15 ++++++++-------
 addons/stock/views/res_partner_views.xml |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/addons/delivery/views/partner_view.xml b/addons/delivery/views/partner_view.xml
index 173ca43c95f..5a66d2cfaba 100644
--- a/addons/delivery/views/partner_view.xml
+++ b/addons/delivery/views/partner_view.xml
@@ -4,7 +4,7 @@
         <record id="view_partner_property_form" model="ir.ui.view">
             <field name="name">res.partner.carrier.property.form.inherit</field>
             <field name="model">res.partner</field>
-            <field name="inherit_id" ref="mail.view_emails_partner_info_form" />
+            <field name="inherit_id" ref="mail.res_partner_view_form_inherit_mail" />
             <field name="arch" type="xml">
                 <field name="opt_out" position="after">
                     <field name="property_delivery_carrier_id"/>
diff --git a/addons/mail/models/res_partner.py b/addons/mail/models/res_partner.py
index c75752416be..3bdec9313db 100644
--- a/addons/mail/models/res_partner.py
+++ b/addons/mail/models/res_partner.py
@@ -14,7 +14,7 @@ class Partner(models.Model):
     """ Update partner to add a field about notification preferences. Add a generic opt-out field that can be used
        to restrict usage of automatic email templates. """
     _name = "res.partner"
-    _inherit = ['res.partner', 'mail.thread']
+    _inherit = ['res.partner', 'mail.thread', 'mail.activity.mixin']
     _mail_flat_thread = False
     _mail_mass_mailing = _('Customers')
 
diff --git a/addons/mail/views/res_partner_views.xml b/addons/mail/views/res_partner_views.xml
index b2cfa6ef131..bc3dd7faebe 100644
--- a/addons/mail/views/res_partner_views.xml
+++ b/addons/mail/views/res_partner_views.xml
@@ -2,8 +2,8 @@
 <odoo>
     <data>
 
-        <record id="view_emails_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.emails.info.inherit</field>
+        <record id="res_partner_view_form_inherit_mail" model="ir.ui.view">
+            <field name="name">res.partner.view.form.inherit.mail</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
@@ -15,14 +15,15 @@
                 <xpath expr="//sheet" position="after">
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers"/>
-                        <field name="message_ids" widget="mail_thread" options='{"thread_level": 1}'/>
+                        <field name="activity_ids" widget="mail_activity"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </xpath>
             </field>
         </record>
 
-       <record model="ir.ui.view" id="res_partner_opt_out_search">
-            <field name="name">res.partner.opt_out.search</field>
+       <record id="res_partner_view_search_inherit_mail" model="ir.ui.view">
+            <field name="name">res.partner.view.search.inherit.mail</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_res_partner_filter"/>
             <field name="arch" type="xml">
@@ -36,11 +37,11 @@
                                 domain="[('activity_ids.user_id', '=', uid)]"/>
                         <filter string="Today Activities" name="activities_today"
                                 domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
-                        <filter string="This Week Activities" name="activities_week"
+                        <filter string="Upcoming Activities (7 days)" name="activities_week"
                                 domain="['&amp;', ('activity_ids.date_deadline', '&gt;=', context_today().strftime('%Y-%m-%d')),
                                          ('activity_ids.date_deadline', '&lt;=', (context_today()+datetime.timedelta(days=7)).strftime('%Y-%m-%d'))
                                 ]"/>
-                        <filter string="Overdue Activities" name="overdue_activity"
+                        <filter string="Overdue Activities" name="activities_overdue"
                                 domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                                 help="Show all records which has next action date is before today"/>
                         <separator/>
diff --git a/addons/stock/views/res_partner_views.xml b/addons/stock/views/res_partner_views.xml
index 1ca1fe5d82a..e0b7e4954de 100644
--- a/addons/stock/views/res_partner_views.xml
+++ b/addons/stock/views/res_partner_views.xml
@@ -8,7 +8,7 @@
     <record id="view_partner_stock_form" model="ir.ui.view">
         <field name="name">res.partner.stock.property.form.inherit</field>
         <field name="model">res.partner</field>
-        <field name="inherit_id" ref="mail.view_emails_partner_info_form"/>
+        <field name="inherit_id" ref="mail.res_partner_view_form_inherit_mail"/>
         <field name="arch" type="xml">
             <xpath expr="//group[@name='container_row_2']" position="after">
                 <group name="container_row_stock" groups="base.group_no_one">