Browse Source
Merge pull request #370 from Eficent/11.0-fix-mail_activity_done
[11.0][FIX] mail_activity_done: Future Activities filter doesn't break
pull/374/head
Jordi Ballester Alomar
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
3 additions and
3 deletions
-
mail_activity_done/__manifest__.py
-
mail_activity_done/models/mail_activity.py
-
mail_activity_done/views/mail_activity_views.xml
|
|
@ -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": "11.0.1.0.0", |
|
|
|
|
|
|
|
|
"version": "11.0.1.1.0", |
|
|
"author": "Eficent," |
|
|
"author": "Eficent," |
|
|
"Odoo Community Association (OCA)", |
|
|
"Odoo Community Association (OCA)", |
|
|
"license": "LGPL-3", |
|
|
"license": "LGPL-3", |
|
|
|
|
|
@ -14,7 +14,7 @@ class MailActivity(models.Model): |
|
|
'Completed Date', index=True, readonly=True, |
|
|
'Completed Date', index=True, readonly=True, |
|
|
) |
|
|
) |
|
|
|
|
|
|
|
|
@api.depends('done') |
|
|
|
|
|
|
|
|
@api.depends('date_deadline', 'done') |
|
|
def _compute_state(self): |
|
|
def _compute_state(self): |
|
|
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): |
|
|
|
|
|
@ -39,7 +39,7 @@ |
|
|
<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')), ('done', '!=', True)]</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')), ('done', '!=', True)]</attribute> |
|
|
|
|
|
|
|
|
<attribute name="domain">[('date_deadline', '>', context_today().strftime('%Y-%m-%d')), ('done', '!=', True)]</attribute> |
|
|
</filter> |
|
|
</filter> |
|
|
</field> |
|
|
</field> |
|
|
</record> |
|
|
</record> |
|
|
|
