From 19df6b040ec5df2d798fdd61b293ddf20cf40bba Mon Sep 17 00:00:00 2001
From: Jordi Ballester Alomar <jordi.ballester@eficent.com>
Date: Wed, 28 Nov 2018 10:35:19 +0100
Subject: [PATCH] [quality_control_issue][IMP] add activities to QC issues and
 problems

---
 quality_control_issue/models/qc_issue.py        |  2 +-
 quality_control_issue/models/qc_problem.py      |  2 +-
 quality_control_issue/views/qc_issue_view.xml   | 13 +++++++++++++
 quality_control_issue/views/qc_problem_view.xml | 13 +++++++++++++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/quality_control_issue/models/qc_issue.py b/quality_control_issue/models/qc_issue.py
index 65f3a95b6..bfc9f8bfc 100644
--- a/quality_control_issue/models/qc_issue.py
+++ b/quality_control_issue/models/qc_issue.py
@@ -10,7 +10,7 @@ import odoo.addons.decimal_precision as dp
 class QualityControlIssue(models.Model):
     _name = "qc.issue"
     _description = "Quality Control Issue"
-    _inherit = "mail.thread"
+    _inherit = ['mail.thread', 'mail.activity.mixin']
 
     @api.multi
     def _compute_stock_scrap_qty(self):
diff --git a/quality_control_issue/models/qc_problem.py b/quality_control_issue/models/qc_problem.py
index f24c90d36..a41e6222a 100644
--- a/quality_control_issue/models/qc_problem.py
+++ b/quality_control_issue/models/qc_problem.py
@@ -15,7 +15,7 @@ AVAILABLE_PRIORITIES = [
 class QcProblem(models.Model):
     _name = "qc.problem"
     _description = "Quality Control Problem Tracking"
-    _inherit = "mail.thread"
+    _inherit = ['mail.thread', 'mail.activity.mixin']
 
     def _get_default_stage_id(self):
         """ Gives default stage_id """
diff --git a/quality_control_issue/views/qc_issue_view.xml b/quality_control_issue/views/qc_issue_view.xml
index e98095974..8d2fd8cb0 100644
--- a/quality_control_issue/views/qc_issue_view.xml
+++ b/quality_control_issue/views/qc_issue_view.xml
@@ -87,6 +87,7 @@
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_follower_ids" widget="mail_followers" />
+                    <field name="activity_ids" widget="mail_activity"/>
                     <field name="message_ids" widget="mail_thread" />
                 </div>
             </form>
@@ -154,6 +155,18 @@
                 <field name="location_id"/>
                 <filter string="My inspections"
                         domain="[('inspector_id', '=', uid)]"/>
+                <separator/>
+                <filter string="My Activities" name="activities_my"
+                    domain="[('activity_ids.user_id', '=', uid)]"/>
+                <separator/>
+                <filter string="Late 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"/>
+                <filter string="Today Activities" name="activities_today"
+                    domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
+                <filter string="Future Activities" name="activities_upcoming_all"
+                    domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
+                    ]"/>
                 <group expand="0" string="Group By...">
                     <filter string="Stage" domain="[]"
                             context="{'group_by':'stage_id'}"/>
diff --git a/quality_control_issue/views/qc_problem_view.xml b/quality_control_issue/views/qc_problem_view.xml
index 87ba46b67..eb0e521ca 100644
--- a/quality_control_issue/views/qc_problem_view.xml
+++ b/quality_control_issue/views/qc_problem_view.xml
@@ -48,6 +48,7 @@
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_follower_ids" widget="mail_followers" />
+                    <field name="activity_ids" widget="mail_activity"/>
                     <field name="message_ids" widget="mail_thread" />
                 </div>
             </form>
@@ -107,6 +108,18 @@
                 <field name="qc_team_id"/>
                 <field name="stage_id"/>
                 <field name="problem_group_id"/>
+                <separator/>
+                <filter string="My Activities" name="activities_my"
+                    domain="[('activity_ids.user_id', '=', uid)]"/>
+                <separator/>
+                <filter string="Late 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"/>
+                <filter string="Today Activities" name="activities_today"
+                    domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
+                <filter string="Future Activities" name="activities_upcoming_all"
+                    domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
+                    ]"/>
                 <group expand="0" string="Group By...">
                     <filter string="Stage" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="Problem Group" domain="[]" context="{'group_by': 'problem_group_id'}"/>