From 08a789b72b9aa39389220ca5247e17dce2d73678 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <jairo.llopis@tecnativa.com>
Date: Fri, 6 Mar 2020 12:04:49 +0000
Subject: [PATCH] [IMP] agreement,agreement_legal: support activities

- The `agreement` model now features mail and activities from its base module.
- The `agreement_legal` module doesn't need to add mail support now.
- Add activities to form views.

@Tecnativa TT22477
---
 agreement/__manifest__.py     |  2 +-
 agreement/models/agreement.py |  1 +
 agreement/views/agreement.xml | 59 ++++++++++++++++++++---------------
 3 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/agreement/__manifest__.py b/agreement/__manifest__.py
index 73036e378..420ee6325 100644
--- a/agreement/__manifest__.py
+++ b/agreement/__manifest__.py
@@ -11,7 +11,7 @@
               'Odoo Community Association (OCA)',
     'website': 'https://github.com/oca/contract',
     'license': 'AGPL-3',
-    'depends': ['base'],
+    'depends': ['mail'],
     'data': [
         'security/ir.model.access.csv',
         'security/agreement_security.xml',
diff --git a/agreement/models/agreement.py b/agreement/models/agreement.py
index 68bb8e171..6ea9e0f53 100644
--- a/agreement/models/agreement.py
+++ b/agreement/models/agreement.py
@@ -8,6 +8,7 @@ from odoo import models, fields
 class Agreement(models.Model):
     _name = 'agreement'
     _description = 'Agreement'
+    _inherit = ["mail.thread", "mail.activity.mixin"]
 
     code = fields.Char(required=True, copy=False)
     name = fields.Char(required=True)
diff --git a/agreement/views/agreement.xml b/agreement/views/agreement.xml
index 8754247cb..4acd404d5 100644
--- a/agreement/views/agreement.xml
+++ b/agreement/views/agreement.xml
@@ -12,33 +12,40 @@
     <field name="model">agreement</field>
     <field name="arch" type="xml">
         <form string="Agreement">
-            <div class="oe_button_box" name="button_box">
-                <button name="toggle_active" type="object"
-                    class="oe_stat_button" icon="fa-archive">
-                    <field name="active" widget="boolean_button"
-                        options='{"terminology": "archive"}'/>
-                </button>
+            <sheet>
+                <div class="oe_button_box" name="button_box">
+                    <button name="toggle_active" type="object"
+                        class="oe_stat_button" icon="fa-archive">
+                        <field name="active" widget="boolean_button"
+                            options='{"terminology": "archive"}'/>
+                    </button>
+                </div>
+                <group name="main">
+                    <group name="left">
+                        <field name="agreement_type_id"
+                            groups="agreement.group_use_agreement_type"/>
+                        <field name="is_template" groups="agreement.group_use_agreement_template"/>
+                        <field name="partner_id"
+                            attrs="{'required': [('is_template', '=', False)]}"/>
+                        <field name="name"/>
+                        <field name="signature_date"/>
+                    </group>
+                    <group name="right">
+                        <field name="start_date"/>
+                        <field name="end_date"/>
+                        <field name="code"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                    </group>
+                </group>
+                <notebook>
+                    <page name="config" string="Configuration" attrs="{'invisible': True}"/>
+                </notebook>
+            </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>
-            <group name="main">
-                <group name="left">
-                    <field name="agreement_type_id"
-                           groups="agreement.group_use_agreement_type"/>
-                    <field name="is_template" groups="agreement.group_use_agreement_template"/>
-                    <field name="partner_id"
-                           attrs="{'required': [('is_template', '=', False)]}"/>
-                    <field name="name"/>
-                    <field name="signature_date"/>
-                </group>
-                <group name="right">
-                    <field name="start_date"/>
-                    <field name="end_date"/>
-                    <field name="code"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                </group>
-            </group>
-          <notebook>
-            <page name="config" string="Configuration" attrs="{'invisible': True}"/>
-          </notebook>
         </form>
     </field>
 </record>