mirror of https://github.com/OCA/social.git
[mail_activity_done] set activities as inactive when they have been completed.
parent
f4a81b46c8
commit
ba905c51ba
|
@ -2,7 +2,7 @@
|
||||||
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
|
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
|
||||||
{
|
{
|
||||||
"name": "Mail Activity Done",
|
"name": "Mail Activity Done",
|
||||||
"version": "12.0.1.2.0",
|
"version": "12.0.2.0.0",
|
||||||
"author": "Eficent,"
|
"author": "Eficent,"
|
||||||
"Odoo Community Association (OCA)",
|
"Odoo Community Association (OCA)",
|
||||||
"license": "LGPL-3",
|
"license": "LGPL-3",
|
||||||
|
|
|
@ -39,6 +39,7 @@ def post_load_hook():
|
||||||
for activity in self:
|
for activity in self:
|
||||||
record = self.env[activity.res_model].browse(activity.res_id)
|
record = self.env[activity.res_model].browse(activity.res_id)
|
||||||
activity.done = True
|
activity.done = True
|
||||||
|
activity.active = False
|
||||||
activity.date_done = fields.Date.today()
|
activity.date_done = fields.Date.today()
|
||||||
record.message_post_with_view(
|
record.message_post_with_view(
|
||||||
'mail.message_activity_done',
|
'mail.message_activity_done',
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
# Copyright 2019 Eficent <http://www.eficent.com>
|
||||||
|
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
|
||||||
|
|
||||||
|
|
||||||
|
def migrate(cr, version):
|
||||||
|
if not version:
|
||||||
|
return
|
||||||
|
cr.execute("""
|
||||||
|
UPDATE mail_activity SET
|
||||||
|
active = False
|
||||||
|
WHERE done=True;
|
||||||
|
""")
|
|
@ -7,6 +7,7 @@ class MailActivity(models.Model):
|
||||||
|
|
||||||
_inherit = 'mail.activity'
|
_inherit = 'mail.activity'
|
||||||
|
|
||||||
|
active = fields.Boolean(default=True)
|
||||||
done = fields.Boolean(default=False)
|
done = fields.Boolean(default=False)
|
||||||
state = fields.Selection(selection_add=[
|
state = fields.Selection(selection_add=[
|
||||||
('done', 'Done')], compute='_compute_state')
|
('done', 'Done')], compute='_compute_state')
|
||||||
|
@ -19,3 +20,11 @@ class MailActivity(models.Model):
|
||||||
super(MailActivity, self)._compute_state()
|
super(MailActivity, self)._compute_state()
|
||||||
for record in self.filtered(lambda activity: activity.done):
|
for record in self.filtered(lambda activity: activity.done):
|
||||||
record.state = 'done'
|
record.state = 'done'
|
||||||
|
|
||||||
|
|
||||||
|
class MailActivityMixin(models.AbstractModel):
|
||||||
|
|
||||||
|
_inherit = 'mail.activity.mixin'
|
||||||
|
activity_ids = fields.One2many(
|
||||||
|
domain=lambda self: [('res_model', '=', self._name),
|
||||||
|
('active', '=', True)])
|
||||||
|
|
|
@ -27,19 +27,18 @@
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="res_model_id" position="after">
|
<field name="res_model_id" position="after">
|
||||||
<field name="done"/>
|
<field name="done"/>
|
||||||
<filter string="Open Activities" name="activities_open"
|
<field name="active"/>
|
||||||
domain="[('done', '!=', True)]"/>
|
|
||||||
<filter string="Completed Activities" name="activities_completed"
|
<filter string="Completed Activities" name="activities_completed"
|
||||||
domain="[('done', '=', True)]"/>
|
domain="[('active', '=', False), ('state', '=', 'done')]"/>
|
||||||
</field>
|
</field>
|
||||||
<filter name="activities_overdue" position="attributes">
|
<filter name="activities_overdue" position="attributes">
|
||||||
<attribute name="domain">[('date_deadline', '<', context_today().strftime('%Y-%m-%d')), ('done', '!=', True)]</attribute>
|
<attribute name="domain">[('date_deadline', '<', context_today().strftime('%Y-%m-%d'))]</attribute>
|
||||||
</filter>
|
</filter>
|
||||||
<filter name="activities_today" position="attributes">
|
<filter name="activities_today" position="attributes">
|
||||||
<attribute name="domain">[('date_deadline', '=', context_today().strftime('%Y-%m-%d')), ('done', '!=', True)]</attribute>
|
<attribute name="domain">[('date_deadline', '=', context_today().strftime('%Y-%m-%d'))]</attribute>
|
||||||
</filter>
|
</filter>
|
||||||
<filter name="activities_upcoming_all" position="attributes">
|
<filter name="activities_upcoming_all" position="attributes">
|
||||||
<attribute name="domain">[('date_deadline', '>', context_today().strftime('%Y-%m-%d')), ('done', '!=', True)]</attribute>
|
<attribute name="domain">[('date_deadline', '>', context_today().strftime('%Y-%m-%d'))]</attribute>
|
||||||
</filter>
|
</filter>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
@ -51,18 +50,18 @@
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<filter name="activities_my" position="after">
|
<filter name="activities_my" position="after">
|
||||||
<filter string="Open Activities" name="activities_open"
|
<filter string="Open Activities" name="activities_open"
|
||||||
domain="[('activity_ids.done', '!=', True)]"/>
|
domain="[('activity_ids.active', '=', True)]"/>
|
||||||
<filter string="Completed Activities" name="activities_completed"
|
<filter string="Completed Activities" name="activities_completed"
|
||||||
domain="[('activity_ids.done', '=', True)]"/>
|
domain="[('activity_ids.active', '=', False), ('activity_ids.state', '=', 'done')]"/>
|
||||||
</filter>
|
</filter>
|
||||||
<filter name="activities_overdue" position="attributes">
|
<filter name="activities_overdue" position="attributes">
|
||||||
<attribute name="domain">[('activity_ids.date_deadline', '<', context_today().strftime('%Y-%m-%d')), ('activity_ids.done', '!=', True)]</attribute>
|
<attribute name="domain">[('activity_ids.date_deadline', '<', context_today().strftime('%Y-%m-%d'))]</attribute>
|
||||||
</filter>
|
</filter>
|
||||||
<filter name="activities_today" position="attributes">
|
<filter name="activities_today" position="attributes">
|
||||||
<attribute name="domain">[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d')), ('activity_ids.done', '!=', True)]</attribute>
|
<attribute name="domain">[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]</attribute>
|
||||||
</filter>
|
</filter>
|
||||||
<filter name="activities_upcoming_all" position="attributes">
|
<filter name="activities_upcoming_all" position="attributes">
|
||||||
<attribute name="domain">[('activity_ids.date_deadline', '>', context_today().strftime('%Y-%m-%d')), ('activity_ids.done', '!=', True)]</attribute>
|
<attribute name="domain">[('activity_ids.date_deadline', '>', context_today().strftime('%Y-%m-%d'))]</attribute>
|
||||||
</filter>
|
</filter>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
Loading…
Reference in New Issue