-
@@ -1115,7 +1123,8 @@
+
+
+
+
+
+
+
+ diff --git a/addons/fleet/views/fleet_vehicle_cost_views.xml b/addons/fleet/views/fleet_vehicle_cost_views.xml index 056c1e382b9..7c33302188c 100644 --- a/addons/fleet/views/fleet_vehicle_cost_views.xml +++ b/addons/fleet/views/fleet_vehicle_cost_views.xml @@ -179,7 +179,7 @@
-
-
-
-
-
-
-
diff --git a/addons/hr_holidays/data/mail_activity_type_data.xml b/addons/hr_holidays/data/mail_activity_type_data.xml
index 19858334853..89a5d483f35 100644
--- a/addons/hr_holidays/data/mail_activity_type_data.xml
+++ b/addons/hr_holidays/data/mail_activity_type_data.xml
@@ -6,6 +6,7 @@
-
- ![]()
-
- ![]()
+
+
+
diff --git a/addons/hr_recruitment/views/hr_applicant_views.xml b/addons/hr_recruitment/views/hr_applicant_views.xml
index d38b90fa788..c871581e0b6 100644
--- a/addons/hr_recruitment/views/hr_applicant_views.xml
+++ b/addons/hr_recruitment/views/hr_applicant_views.xml
@@ -407,9 +407,10 @@
+
(
+
+
- of record id ordered by closest date
+ (deadline for ongoing activities, and done date for done activities)
+ 'grouped_activities': dict
+ res_id -> activity_type_id -> aggregated info as:
+ count_by_state dict: mapping state to count (ex.: 'planned': 2)
+ ids list: activity ids for the res_id and activity_type_id
+ reporting_date str: aggregated date of the related activities as
+ oldest deadline of ongoing activities if there are any
+ or most recent date done of completed activities
+ state dict: aggregated state of the related activities
+ user_assigned_ids list: activity responsible id ordered
+ by closest deadline of the related activities
+ attachments_info: dict with information about the attachments
+ {'count': int, 'most_recent_id': int, 'most_recent_name': str}
+ }
+ """
+ user_tz = self.user_id.sudo().tz
+ DocModel = self.env[res_model]
+ Activity = self.env['mail.activity']
+
+ # 1. Retrieve all ongoing and completed activities according to the parameters
+ activity_types = self.env['mail.activity.type'].search([('res_model', 'in', (res_model, False))])
+ fetch_done = fetch_done and activity_types.filtered('keep_done')
+ activity_domain = [('res_model', '=', res_model)]
+ is_filtered = domain or limit or offset
+ if is_filtered:
+ activity_domain.append(('res_id', 'in', DocModel._search(domain or [], offset, limit) if is_filtered else []))
+ all_activities = Activity.with_context(active_test=not fetch_done).search(
+ activity_domain, order='date_done DESC, date_deadline ASC')
+ all_ongoing = all_activities.filtered('active')
+ all_completed = all_activities.filtered(lambda act: not act.active)
+
+ # 2. Get attachment of completed activities
+ if all_completed:
+ attachment_ids = all_completed.attachment_ids.ids
+ attachments_by_id = {
+ a['id']: a
+ for a in self.env['ir.attachment'].search_read([['id', 'in', attachment_ids]], ['create_date', 'name'])
+ } if attachment_ids else {}
+ else:
+ attachments_by_id = {}
+
+ # 3. Group activities per records and activity type
+ grouped_completed = {group: Activity.browse([v.id for v in values])
+ for group, values in groupby(all_completed, key=lambda a: (a.res_id, a.activity_type_id))}
+ grouped_ongoing = {group: Activity.browse([v.id for v in values])
+ for group, values in groupby(all_ongoing, key=lambda a: (a.res_id, a.activity_type_id))}
+
+ # 4. Filter out unreadable records
+ res_id_type_tuples = grouped_ongoing.keys() | grouped_completed.keys()
+ if not is_filtered:
+ filtered = set(DocModel.search([('id', 'in', [r[0] for r in res_id_type_tuples])]).ids)
+ res_id_type_tuples = list(filter(lambda r: r[0] in filtered, res_id_type_tuples))
+
+ # 5. Format data
+ res_id_to_date_done = {}
+ res_id_to_deadline = {}
+ grouped_activities = defaultdict(dict)
+ for res_id_tuple in res_id_type_tuples:
+ res_id, activity_type_id = res_id_tuple
+ ongoing = grouped_ongoing.get(res_id_tuple, Activity)
+ completed = grouped_completed.get(res_id_tuple, Activity)
+ activities = ongoing | completed
+
+ # As completed is sorted on date_done DESC, we take here the max date_done
+ date_done = completed and completed[0].date_done
+ # As ongoing is sorted on date_deadline ASC, we take here the min date_deadline
+ date_deadline = ongoing and ongoing[0].date_deadline
+ if date_deadline and (res_id not in res_id_to_deadline or date_deadline < res_id_to_deadline[res_id]):
+ res_id_to_deadline[res_id] = date_deadline
+ if date_done and (res_id not in res_id_to_date_done or date_done > res_id_to_date_done[res_id]):
+ res_id_to_date_done[res_id] = date_done
+ # As ongoing is sorted on date_deadline, we get assignees on activity with oldest deadline first
+ user_assigned_ids = ongoing.user_id.ids
+ attachments = [attachments_by_id[attach.id] for attach in completed.attachment_ids]
+ grouped_activities[res_id][activity_type_id.id] = {
+ 'count_by_state': dict(Counter(
+ self._compute_state_from_date(act.date_deadline, user_tz) if act.active else 'done'
+ for act in activities)),
+ 'ids': activities.ids,
+ 'reporting_date': ongoing and date_deadline or date_done or None,
+ 'state': self._compute_state_from_date(date_deadline, user_tz) if ongoing else 'done',
+ 'user_assigned_ids': user_assigned_ids,
+ }
+ if attachments:
+ most_recent_attachment = max(attachments, key=lambda a: (a['create_date'], a['id']))
+ grouped_activities[res_id][activity_type_id.id]['attachments_info'] = {
+ 'most_recent_id': most_recent_attachment['id'],
+ 'most_recent_name': most_recent_attachment['name'],
+ 'count': len(attachments),
+ }
+
+ # Get record ids ordered by oldest deadline (urgent one first)
+ ongoing_res_ids = sorted(res_id_to_deadline, key=lambda item: res_id_to_deadline[item])
+ # Get record ids with only completed activities ordered by date done reversed (most recently done first)
+ completed_res_ids = [
+ res_id for res_id in sorted(
+ res_id_to_date_done, key=lambda item: res_id_to_date_done[item], reverse=True
+ ) if res_id not in res_id_to_deadline
+ ]
return {
- 'activity_types': activity_type_infos,
- 'activity_res_ids': sorted(res_id_to_deadline, key=lambda item: res_id_to_deadline[item]),
- 'grouped_activities': activity_data,
+ 'activity_res_ids': ongoing_res_ids + completed_res_ids,
+ 'activity_types': [
+ {
+ 'id': activity_type.id,
+ 'keep_done': activity_type.keep_done,
+ 'name': activity_type.name,
+ 'template_ids': [
+ {'id': mail_template_id.id, 'name': mail_template_id.name}
+ for mail_template_id in activity_type.mail_template_ids
+ ],
+ }
+ for activity_type in activity_types
+ ],
+ 'grouped_activities': grouped_activities,
}
# ----------------------------------------------------------------------
diff --git a/addons/mail/models/mail_activity_mixin.py b/addons/mail/models/mail_activity_mixin.py
index 4350af7ec57..aeb1f543ba5 100644
--- a/addons/mail/models/mail_activity_mixin.py
+++ b/addons/mail/models/mail_activity_mixin.py
@@ -62,7 +62,7 @@ class MailActivityMixin(models.AbstractModel):
'Today: Activity date is today\nPlanned: Future activities.')
activity_user_id = fields.Many2one(
'res.users', 'Responsible User',
- related='activity_ids.user_id', readonly=False,
+ compute='_compute_activity_user_id', readonly=True,
search='_search_activity_user_id',
groups="base.group_user")
activity_type_id = fields.Many2one(
@@ -111,6 +111,11 @@ class MailActivityMixin(models.AbstractModel):
record.activity_exception_decoration = exception_activity_type_id and exception_activity_type_id.decoration_type
record.activity_exception_icon = exception_activity_type_id and exception_activity_type_id.icon
+ @api.depends('activity_ids.user_id')
+ def _compute_activity_user_id(self):
+ for record in self:
+ record.activity_user_id = record.activity_ids[0].user_id if record.activity_ids else False
+
def _search_activity_exception_decoration(self, operator, operand):
return [('activity_ids.activity_type_id.decoration_type', operator, operand)]
@@ -204,7 +209,7 @@ class MailActivityMixin(models.AbstractModel):
@api.model
def _search_activity_user_id(self, operator, operand):
- return [('activity_ids.user_id', operator, operand)]
+ return [('activity_ids', 'any', [('active', 'in', [True, False]), ('user_id', operator, operand)])]
@api.model
def _search_activity_type_id(self, operator, operand):
diff --git a/addons/mail/models/mail_activity_type.py b/addons/mail/models/mail_activity_type.py
index 83dedf74bbd..91a33204ec1 100644
--- a/addons/mail/models/mail_activity_type.py
+++ b/addons/mail/models/mail_activity_type.py
@@ -71,6 +71,7 @@ class MailActivityType(models.Model):
mail_template_ids = fields.Many2many('mail.template', string='Email templates')
default_user_id = fields.Many2one("res.users", string="Default User")
default_note = fields.Html(string="Default Note", translate=True)
+ keep_done = fields.Boolean(string="Keep Done", help='Keep activities marked as done in the activity view')
#Fields for display purpose only
initial_res_model = fields.Selection(selection=_get_model_selection, string='Initial model', compute="_compute_initial_res_model", store=False,
diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index 5ace9f997da..27b0d11badd 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -4183,7 +4183,7 @@ class MailThread(models.AbstractModel):
except AccessError:
pass
if 'activities' in request_list:
- res['activities'] = self.activity_ids.activity_format()
+ res['activities'] = self.with_context(active_test=True).activity_ids.activity_format()
if 'attachments' in request_list:
res['attachments'] = self._get_mail_thread_data_attachments()._attachment_format()
if 'followers' in request_list:
diff --git a/addons/mail/models/res_users.py b/addons/mail/models/res_users.py
index f4d462b5ab4..04a1cbb35ee 100644
--- a/addons/mail/models/res_users.py
+++ b/addons/mail/models/res_users.py
@@ -282,10 +282,11 @@ class Users(models.Model):
user_activities = {}
for model_name, activities_by_record in activities_by_record_by_model_name.items():
domain = [("id", "in", list({r.id for r in activities_by_record.keys()}))]
- allowed_records = self.env[model_name].search(domain)
+ Model = self.env[model_name]
+ allowed_records = Model.search(domain)
if not allowed_records:
continue
- module = self.env[model_name]._original_module
+ module = Model._original_module
icon = module and modules.module.get_module_icon(module)
model = self.env["ir.model"]._get(model_name).with_prefetch(model_ids)
user_activities[model_name] = {
@@ -298,12 +299,7 @@ class Users(models.Model):
"today_count": 0,
"overdue_count": 0,
"planned_count": 0,
- "actions": [
- {
- "icon": "fa-clock-o",
- "name": "Summary",
- }
- ],
+ "view_type": getattr(Model, '_systray_view', 'list'),
}
for record, activities in activities_by_record.items():
if record not in allowed_records:
diff --git a/addons/mail/static/src/core/web/activity_list_popover.js b/addons/mail/static/src/core/web/activity_list_popover.js
index de77115a607..e4cc764a722 100644
--- a/addons/mail/static/src/core/web/activity_list_popover.js
+++ b/addons/mail/static/src/core/web/activity_list_popover.js
@@ -62,6 +62,10 @@ export class ActivityListPopover extends Component {
this.props.close();
}
+ get doneActivities() {
+ return this.activities.filter((activity) => activity.state === "done");
+ }
+
get overdueActivities() {
return this.activities.filter((activity) => activity.state === "overdue");
}
diff --git a/addons/mail/static/src/core/web/activity_list_popover.xml b/addons/mail/static/src/core/web/activity_list_popover.xml
index 8bf55bfa4c5..ba714911fe3 100644
--- a/addons/mail/static/src/core/web/activity_list_popover.xml
+++ b/addons/mail/static/src/core/web/activity_list_popover.xml
@@ -28,6 +28,14 @@
-
diff --git a/addons/mail/models/mail_activity.py b/addons/mail/models/mail_activity.py
index 9e295b98151..c6b310f3c67 100644
--- a/addons/mail/models/mail_activity.py
+++ b/addons/mail/models/mail_activity.py
@@ -4,14 +4,14 @@
import logging
import pytz
-from collections import defaultdict
+from collections import defaultdict, Counter
from datetime import date, datetime
from dateutil.relativedelta import relativedelta
from odoo import api, exceptions, fields, models, _, Command
from odoo.osv import expression
from odoo.tools import is_html_empty
-from odoo.tools.misc import clean_context, get_lang
+from odoo.tools.misc import clean_context, get_lang, groupby
_logger = logging.getLogger(__name__)
@@ -78,9 +78,15 @@ class MailActivity(models.Model):
summary = fields.Char('Summary')
note = fields.Html('Note', sanitize_style=True)
date_deadline = fields.Date('Due Date', index=True, required=True, default=fields.Date.context_today)
+ date_done = fields.Date('Done Date', compute='_compute_date_done', store=True)
automated = fields.Boolean(
'Automated activity', readonly=True,
help='Indicates this activity has been created automatically and not by any user.')
+ # Attachments are linked to a document through model / res_id and to the activity through this field.
+ attachment_ids = fields.Many2many(
+ 'ir.attachment', 'activity_attachment_rel',
+ 'activity_id', 'attachment_id',
+ string='Attachments')
# description
user_id = fields.Many2one(
'res.users', 'Assigned to',
@@ -90,7 +96,8 @@ class MailActivity(models.Model):
state = fields.Selection([
('overdue', 'Overdue'),
('today', 'Today'),
- ('planned', 'Planned')], 'State',
+ ('planned', 'Planned'),
+ ('done', 'Done')], 'State',
compute='_compute_state')
recommended_activity_type_id = fields.Many2one('mail.activity.type', string="Recommended Activity Type")
previous_activity_type_id = fields.Many2one('mail.activity.type', string='Previous Activity Type', readonly=True)
@@ -101,6 +108,7 @@ class MailActivity(models.Model):
chaining_type = fields.Selection(related='activity_type_id.chaining_type', readonly=True)
# access
can_write = fields.Boolean(compute='_compute_can_write') # used to hide buttons if the current user has no access
+ active = fields.Boolean(default=True)
_sql_constraints = [
# Required on a Many2one reference field is not sufficient as actually
@@ -122,18 +130,26 @@ class MailActivity(models.Model):
if record.previous_activity_type_id.triggered_next_type_id:
record.activity_type_id = record.previous_activity_type_id.triggered_next_type_id
+ @api.depends('active')
+ def _compute_date_done(self):
+ unarchived = self.filtered('active')
+ unarchived.date_done = False
+ # keep earliest archive date if multi archive
+ toupdate = (self - unarchived).filtered(lambda act: not act.date_done)
+ toupdate.date_done = fields.Datetime.now()
+
@api.depends('res_model', 'res_id')
def _compute_res_name(self):
for activity in self:
activity.res_name = activity.res_model and \
self.env[activity.res_model].browse(activity.res_id).display_name
- @api.depends('date_deadline')
+ @api.depends('active', 'date_deadline')
def _compute_state(self):
for record in self.filtered(lambda activity: activity.date_deadline):
tz = record.user_id.sudo().tz
date_deadline = record.date_deadline
- record.state = self._compute_state_from_date(date_deadline, tz)
+ record.state = 'done' if not record.active else self._compute_state_from_date(date_deadline, tz)
@api.model
def _compute_state_from_date(self, date_deadline, tz=False):
@@ -533,6 +549,10 @@ class MailActivity(models.Model):
mail_activity_type_id=activity.activity_type_id.id,
subtype_xmlid='mail.mt_activities',
)
+ if activity.activity_type_id.keep_done:
+ attachment_ids = (attachment_ids or []) + activity_attachments.get(activity.id, [])
+ if attachment_ids:
+ activity.attachment_ids = attachment_ids
# Moving the attachments in the message
# TODO: Fix void res_id on attachment when you create an activity with an image
@@ -551,7 +571,9 @@ class MailActivity(models.Model):
if next_activities_values:
next_activities = self.env['mail.activity'].create(next_activities_values)
- self.unlink() # will unlink activity, dont access `self` after that
+ activity_to_keep = self.filtered('activity_type_id.keep_done')
+ activity_to_keep.action_archive()
+ (self - activity_to_keep).unlink() # will unlink activity, dont access `self` after that
return messages, next_activities
@@ -572,53 +594,152 @@ class MailActivity(models.Model):
def activity_format(self):
activities = self.read()
self.mail_template_ids.fetch(['name'])
+ self.attachment_ids.fetch(['name'])
for record, activity in zip(self, activities):
activity['mail_template_ids'] = [
{'id': mail_template.id, 'name': mail_template.name}
for mail_template in record.mail_template_ids
]
+ activity['attachment_ids'] = [
+ {'id': attachment.id, 'name': attachment.name}
+ for attachment in record.attachment_ids
+ ]
return activities
@api.model
- def get_activity_data(self, res_model, domain, limit=None, offset=0):
- activity_domain = [('res_model', '=', res_model)]
- if domain or limit or offset:
- res = self.env[res_model].search(domain or [], limit=limit, offset=offset)
- activity_domain.append(('res_id', 'in', res.ids))
- grouped_activities = self.env['mail.activity']._read_group(
- activity_domain,
- ['res_id', 'activity_type_id'],
- ['id:array_agg', 'date_deadline:min', '__count'])
- # filter out unreadable records
- if not domain:
- res_ids = tuple(res_id for res_id, *_ in grouped_activities)
- res_ids_set = set(self.env[res_model].search([('id', 'in', res_ids)])._ids)
- grouped_activities = [a for a in grouped_activities if a[0] in res_ids_set]
- res_id_to_deadline = {}
- activity_data = defaultdict(dict)
- for res_id, activity_type, ids, date_deadline, count in grouped_activities:
- activity_type_id = activity_type.id
- res_id_to_deadline[res_id] = date_deadline if (res_id not in res_id_to_deadline or date_deadline < res_id_to_deadline[res_id]) else res_id_to_deadline[res_id]
- state = self._compute_state_from_date(date_deadline, self.user_id.sudo().tz)
- activity_data[res_id][activity_type_id] = {
- 'count': count,
- 'ids': ids,
- 'state': state,
- 'o_closest_deadline': date_deadline,
- }
- activity_type_infos = []
- activity_type_ids = self.env['mail.activity.type'].search(
- ['|', ('res_model', '=', res_model), ('res_model', '=', False)])
- for elem in sorted(activity_type_ids, key=lambda item: item.sequence):
- mail_template_info = []
- for mail_template_id in elem.mail_template_ids:
- mail_template_info.append({"id": mail_template_id.id, "name": mail_template_id.name})
- activity_type_infos.append([elem.id, elem.name, mail_template_info])
+ def get_activity_data(self, res_model, domain, limit=None, offset=0, fetch_done=False):
+ """ Get aggregate data about records and their activities.
+ The goal is to fetch and compute aggregated data about records and their
+ activities to display them in the activity views and the chatter. For example,
+ the activity view displays it as a table with columns and rows being respectively
+ the activity_types and the activity_res_ids, and the grouped_activities being the
+ table entries with the aggregated data.
+
+ :param str res_model: model of the records to fetch
+ :param list domain: record search domain
+ :param int limit: maximum number of records to fetch
+ :param int offset: offset of the first record to fetch
+ :param bool fetch_done: determines if "done" activities are integrated in the
+ aggregated data or not.
+ :return dict: {'activity_types': dict of activity type info
+ {id: int, name: str, mail_template: list of {id:int, name:str},
+ keep_done: bool}
+ 'activity_res_ids': list
+
+ Done
+
+
+
+
-
-
-
+
diff --git a/addons/mail/static/src/views/web/activity/activity_controller.scss b/addons/mail/static/src/views/web/activity/activity_controller.scss
index 0bdc8f1c74d..b75cf15dca0 100644
--- a/addons/mail/static/src/views/web/activity/activity_controller.scss
+++ b/addons/mail/static/src/views/web/activity/activity_controller.scss
@@ -5,14 +5,47 @@
}
}
.o_activity_summary_cell {
+ .o-mail-ActivityCell-counter {
+ color: map-get($theme-colors, 'dark');
+ }
&.planned {
background-color: map-get($theme-colors, 'success');
+ color: map-get($theme-colors, 'light');
+ a {
+ color: map-get($theme-colors, 'light');
+ &:hover {
+ text-decoration: underline;
+ }
+ }
}
&.overdue {
background-color: map-get($theme-colors, 'danger');
+ color: map-get($theme-colors, 'light');
+ a {
+ color: map-get($theme-colors, 'light');
+ &:hover {
+ text-decoration: underline;
+ }
+ }
}
&.today {
background-color: map-get($theme-colors, 'warning');
+ color: map-get($theme-colors, 'light');
+ a {
+ color: map-get($theme-colors, 'light');
+ &:hover {
+ text-decoration: underline;
+ }
+ }
+ }
+ &.done {
+ background-color: map-get($theme-colors, 'secondary');
+ a {
+ color: map-get($theme-colors, 'dark');
+ &:hover {
+ text-decoration: underline;
+ }
+ }
}
&.o_activity_empty_cell {
> i {
@@ -57,20 +90,12 @@
font-size: large;
}
- > div {
- max-width: 200px;
-
- .o_text_block {
- @include o-text-overflow;
- display: block;
- }
- }
-
.o_text_bold {
- font-weight: bold;
+ font-weight: $font-weight-bold;
}
.o_text_block {
+ @include o-text-overflow($max-width: 15rem);
display: block;
}
}
diff --git a/addons/mail/static/src/views/web/activity/activity_model.js b/addons/mail/static/src/views/web/activity/activity_model.js
index 306d411ae25..489eabac05a 100644
--- a/addons/mail/static/src/views/web/activity/activity_model.js
+++ b/addons/mail/static/src/views/web/activity/activity_model.js
@@ -7,7 +7,9 @@ export class ActivityModel extends RelationalModel {
async load(params = {}) {
this.originalDomain = params.domain ? [...params.domain] : [];
- params.domain?.push(["activity_ids", "!=", false]);
+ // Ensure that only (active) records with at least one activity, "done" (archived) or not, are fetched.
+ // We don't use active_test=false in the context because otherwise we would also get archived records.
+ params.domain?.push(["activity_ids.active", "in", [true, false]]);
if (params && "groupBy" in params) {
params.groupBy = [];
}
@@ -20,6 +22,7 @@ export class ActivityModel extends RelationalModel {
domain: params.domain || this.env.searchModel._domain,
limit: params.limit || this.initialLimit,
offset: params.offset || 0,
+ fetch_done: true,
});
}
}
diff --git a/addons/mail/static/src/views/web/activity/activity_renderer.js b/addons/mail/static/src/views/web/activity/activity_renderer.js
index e7cdd0e7ad5..dbc8dbd5e5d 100644
--- a/addons/mail/static/src/views/web/activity/activity_renderer.js
+++ b/addons/mail/static/src/views/web/activity/activity_renderer.js
@@ -1,5 +1,6 @@
/* @odoo-module */
+import { MailColumnProgress } from "@mail/core/web/mail_column_progress";
import { ActivityCell } from "@mail/views/web/activity/activity_cell";
import { ActivityRecord } from "@mail/views/web/activity/activity_record";
@@ -9,19 +10,19 @@ import { browser } from "@web/core/browser/browser";
import { CheckBox } from "@web/core/checkbox/checkbox";
import { Dropdown } from "@web/core/dropdown/dropdown";
import { DropdownItem } from "@web/core/dropdown/dropdown_item";
-import { ColumnProgress } from "@web/views/view_components/column_progress";
+import { _t } from "@web/core/l10n/translation";
export class ActivityRenderer extends Component {
static components = {
ActivityCell,
ActivityRecord,
- ColumnProgress,
+ ColumnProgress: MailColumnProgress,
Dropdown,
DropdownItem,
CheckBox,
};
static props = {
- activityTypes: { type: Array },
+ activityTypes: { type: Object },
activityResIds: { type: Array },
fields: { type: Object },
resModel: { type: String },
@@ -42,7 +43,7 @@ export class ActivityRenderer extends Component {
active: null,
},
activityTypeId: null,
- resIds: [],
+ resIds: new Set(Object.keys(this.props.groupedActivities)),
});
this.storageKey = ["activity_columns", this.props.resModel, this.env.config.viewId];
@@ -56,34 +57,52 @@ export class ActivityRenderer extends Component {
*/
get activityResIds() {
return [...this.props.activityResIds].sort((a) =>
- this.activeFilter.resIds.includes(a) ? -1 : 0
+ this.activeFilter.resIds.has(a) ? -1 : 0
);
}
- getGroupInfo(group) {
+ getGroupInfo(activityType) {
const types = {
+ done: {
+ color: "secondary",
+ inProgressBar: false,
+ label: _t("done"), // activity_mixin.activity_state has no done state, so we add it manually here
+ value: 0,
+ },
planned: {
color: "success",
+ inProgressBar: true,
value: 0,
},
today: {
color: "warning",
+ inProgressBar: true,
value: 0,
},
overdue: {
- value: 0,
color: "danger",
+ inProgressBar: true,
+ value: 0,
},
};
- const typeId = group[0];
- const isColumnFiltered = this.activeFilter.activityTypeId === group[0];
+ for (const [type, label] of this.props.fields.activity_state.selection) {
+ types[type].label = label;
+ }
+ const typeId = activityType.id;
+ const isColumnFiltered = this.activeFilter.activityTypeId === activityType.id;
const progressValue = isColumnFiltered ? this.activeFilter.progressValue : { active: null };
- let totalCount = 0;
+ let totalCountWithoutDone = 0;
for (const activities of Object.values(this.props.groupedActivities)) {
if (typeId in activities) {
- types[activities[typeId].state].value += 1;
- totalCount++;
+ for (const [state, stateCount] of Object.entries(
+ activities[typeId].count_by_state
+ )) {
+ types[state].value += stateCount;
+ if (state !== "done") {
+ totalCountWithoutDone += stateCount;
+ }
+ }
}
}
@@ -92,21 +111,34 @@ export class ActivityRenderer extends Component {
activeBar: isColumnFiltered ? this.activeFilter.progressValue.active : null,
};
for (const [value, count] of Object.entries(types)) {
- progressBar.bars.push({
- count: count.value,
- value,
- string: this.props.fields.activity_state.selection.find((e) => e[0] === value)[1],
- color: count.color,
- });
+ if (count.inProgressBar) {
+ progressBar.bars.push({
+ count: count.value,
+ value,
+ string: types[value].label,
+ color: count.color,
+ });
+ }
}
+ const ongoingActivityCount = types.overdue.value + types.today.value + types.planned.value;
+ const ongoingAndDoneCount = ongoingActivityCount + types.done.value;
+ const labelAggregate = `${types.overdue.label} + ${types.today.label} + ${types.planned.label}`;
+ const aggregateOn =
+ ongoingAndDoneCount && this.isTypeDisplayDone(typeId)
+ ? {
+ title: `${types.done.label} + ${labelAggregate}`,
+ value: ongoingAndDoneCount,
+ }
+ : undefined;
return {
aggregate: {
- title: group[1],
- value: isColumnFiltered ? types[progressValue.active].value : totalCount,
+ title: labelAggregate,
+ value: isColumnFiltered ? types[progressValue.active].value : ongoingActivityCount,
},
+ aggregateOn: aggregateOn,
data: {
- count: totalCount,
+ count: totalCountWithoutDone,
filterProgressValue: (name) => this.onSetProgressBarState(typeId, name),
progressBar,
progressValue,
@@ -118,24 +150,30 @@ export class ActivityRenderer extends Component {
return this.props.records.find((r) => r.resId === resId);
}
+ isTypeDisplayDone(typeId) {
+ return this.props.activityTypes.find((a) => a.id === typeId).keep_done;
+ }
+
onSetProgressBarState(typeId, bar) {
const name = bar.value;
if (this.activeFilter.progressValue.active === name) {
this.activeFilter.progressValue.active = null;
this.activeFilter.activityTypeId = null;
- this.activeFilter.resIds = [];
+ this.activeFilter.resIds = new Set(Object.keys(this.props.groupedActivities));
} else {
this.activeFilter.progressValue.active = name;
this.activeFilter.activityTypeId = typeId;
- this.activeFilter.resIds = Object.entries(this.props.groupedActivities)
- .filter(([, resIds]) => typeId in resIds && resIds[typeId].state === name)
- .map(([key]) => parseInt(key));
+ this.activeFilter.resIds = new Set(
+ Object.entries(this.props.groupedActivities)
+ .filter(([, resIds]) => typeId in resIds && name in resIds[typeId].count_by_state)
+ .map(([key]) => parseInt(key))
+ );
}
}
get activeColumns() {
return this.props.activityTypes.filter(
- (activity) => this.storageActiveColumns[activity[0]]
+ (activityType) => this.storageActiveColumns[activityType.id]
);
}
@@ -145,11 +183,11 @@ export class ActivityRenderer extends Component {
this.storageActiveColumns = useState({});
for (const activityType of this.props.activityTypes) {
if (storageActiveColumnsList) {
- this.storageActiveColumns[activityType[0]] = storageActiveColumnsList.includes(
- activityType[0].toString()
+ this.storageActiveColumns[activityType.id] = storageActiveColumnsList.includes(
+ activityType.id.toString()
);
} else {
- this.storageActiveColumns[activityType[0]] = true;
+ this.storageActiveColumns[activityType.id] = true;
}
}
}
diff --git a/addons/mail/static/src/views/web/activity/activity_renderer.xml b/addons/mail/static/src/views/web/activity/activity_renderer.xml
index a26cf368076..1c9ec4786cc 100644
--- a/addons/mail/static/src/views/web/activity/activity_renderer.xml
+++ b/addons/mail/static/src/views/web/activity/activity_renderer.xml
@@ -4,18 +4,18 @@
@@ -38,13 +38,13 @@
-
+
-
@@ -65,9 +65,9 @@
-
+
+
-
-
+ t-attf-class="{{ activeFilter.resIds.has(resId) ? 'o_activity_filter_' + activeFilter.progressValue.active : '' }}"
+ t-on-click.prevent.stop="() => props.onEmptyCell(resId, type.id)">
@@ -93,7 +100,7 @@
-
+
Schedule activity
diff --git a/addons/mail/static/src/views/web/fields/avatar/avatar.js b/addons/mail/static/src/views/web/fields/avatar/avatar.js
index fc38e808918..99bbd552afe 100644
--- a/addons/mail/static/src/views/web/fields/avatar/avatar.js
+++ b/addons/mail/static/src/views/web/fields/avatar/avatar.js
@@ -14,4 +14,9 @@ export class Avatar extends Component {
}
}
Avatar.template = "mail.Avatar";
-Avatar.props = ["resModel", "resId", "displayName"];
+Avatar.props = {
+ resModel: { type: String },
+ resId: { type: Number },
+ displayName: { type: String },
+ noSpacing: { type: Boolean, optional: true },
+};
diff --git a/addons/mail/static/src/views/web/fields/avatar/avatar.xml b/addons/mail/static/src/views/web/fields/avatar/avatar.xml
index a845d66e572..0bc795e432b 100644
--- a/addons/mail/static/src/views/web/fields/avatar/avatar.xml
+++ b/addons/mail/static/src/views/web/fields/avatar/avatar.xml
@@ -3,11 +3,11 @@
diff --git a/addons/mail/static/tests/helpers/mock_server/models/mail_activity.js b/addons/mail/static/tests/helpers/mock_server/models/mail_activity.js
index 915c733c927..d74a24ceace 100644
--- a/addons/mail/static/tests/helpers/mock_server/models/mail_activity.js
+++ b/addons/mail/static/tests/helpers/mock_server/models/mail_activity.js
@@ -1,9 +1,10 @@
/* @odoo-module */
-import { sortBy } from "@web/core/utils/arrays";
+import { Domain } from "@web/core/domain";
+import { groupBy, sortBy, unique } from "@web/core/utils/arrays";
import { patch } from "@web/core/utils/patch";
import { MockServer } from "@web/../tests/helpers/mock_server";
-import { serializeDate, deserializeDate } from "@web/core/l10n/dates";
+import { deserializeDate } from "@web/core/l10n/dates";
const { DateTime} = luxon;
@@ -26,7 +27,14 @@ patch(MockServer.prototype, {
const domain = args.args[1] || args.kwargs.domain;
const limit = args[2] || args.kwargs.limit || 0;
const offset = args[3] || args.kwargs.offset || 0;
- return this._mockMailActivityGetActivityData(res_model, domain, limit, offset);
+ const fetch_done = args[4] || args.kwargs.fetch_done || false;
+ return this._mockMailActivityGetActivityData(
+ res_model,
+ domain,
+ limit,
+ offset,
+ fetch_done
+ );
}
return super._performRPC(route, args);
},
@@ -87,7 +95,7 @@ patch(MockServer.prototype, {
* @param {integer[]} ids
* @returns {Object}
*/
- _mockMailActivityActionFeedback(ids) {
+ _mockMailActivityActionFeedback(ids, attachment_ids= null) {
this._mockMailActivityActionDone(ids);
},
/**
@@ -118,63 +126,163 @@ patch(MockServer.prototype, {
* @param {number} offset
* @returns {Object}
*/
- _mockMailActivityGetActivityData(res_model, domain, limit = 0, offset = 0) {
+ /**
+ * Simulate partially (time zone not supported) `_compute_state_from_date` on `mail.activity`.
+ *
+ * @param {DateTime} date_deadline to convert into state
+ * @returns {string} dateline status (today, planned or overdue)
+ * @private
+ */
+ _mockComputeStateFromDate(date_deadline) {
+ const now = DateTime.now();
+ if (date_deadline.hasSame(now, "day")) {
+ return "today";
+ } else if (date_deadline > now) {
+ return "planned";
+ }
+ return "overdue";
+ },
+ /**
+ * Simulates `get_activity_data` on `mail.activity`.
+ *
+ * @private
+ * @param {string} res_model
+ * @param {string} domain
+ * @param {number} limit
+ * @param {number} offset
+ * @param {boolean} fetch_done
+ * @returns {Object}
+ */
+ _mockMailActivityGetActivityData(res_model, domain, limit = 0, offset = 0, fetch_done = false) {
const self = this;
- const allRecords = this.getRecords(res_model, domain);
+
+ // 1. Retrieve all ongoing and completed activities according to the parameters
+ const activityTypes = this.getRecords("mail.activity.type", [
+ "|",
+ ["res_model", "=", res_model],
+ ["res_model", "=", false],
+ ]);
+ // Remove domain term used to filter record having "done" activities (not understood by the getRecords mock)
+ domain = Domain.removeDomainLeaves(new Domain(domain ?? []).toList(), [
+ "activity_ids.active",
+ ]).toList();
+ const allRecords = this.getRecords(res_model, domain ?? []);
const records = limit ? allRecords.slice(offset, offset + limit) : allRecords;
+ const activityDomain = [["res_model", "=", res_model]];
+ const isFiltered = domain || limit || offset;
+ const domainResIds = records.map((r) => r.id);
+ if (isFiltered) {
+ activityDomain.push(["res_id", "in", domainResIds]);
+ }
+ const allActivities = this.getRecords("mail.activity", activityDomain, {
+ active_test: !fetch_done,
+ });
+ const allOngoing = allActivities.filter((a) => a.active);
+ const allCompleted = allActivities.filter((a) => !a.active);
- const activityTypes = this.getRecords("mail.activity.type", []);
- const activityIds = records.map((x) => x.activity_ids).flat();
+ // 2. Get attachment of completed activities
+ let attachmentsById;
+ if (allCompleted.length) {
+ const attachmentIds = allCompleted.map((a) => a.attachment_ids).flat();
+ attachmentsById = attachmentIds.length
+ ? Object.fromEntries(
+ this.getRecords("ir.attachment", [["id", "in", attachmentIds]]).map((a) => [a.id, a])
+ )
+ : {};
+ } else {
+ attachmentsById = {};
+ }
- const groupedActivities = {};
+ // 3. Group activities per records and activity type
+ const groupedCompleted = groupBy(allCompleted, (a) => [a.res_id, a.activity_type_id]);
+ const groupedOngoing = groupBy(allOngoing, (a) => [a.res_id, a.activity_type_id]);
+
+ // 4. Format data
const resIdToDeadline = {};
- const groups = self.mockReadGroup("mail.activity", {
- domain: [["id", "in", activityIds]],
- fields: [
- "res_id",
- "activity_type_id",
- "ids:array_agg(id)",
- "date_deadline:min(date_deadline)",
- ],
- groupby: ["res_id", "activity_type_id"],
- lazy: false,
- });
- groups.forEach(function (group) {
- // mockReadGroup doesn't correctly return all asked fields
- const activites = self.getRecords("mail.activity", group.__domain);
- group.activity_type_id = group.activity_type_id[0];
- let minDate;
- activites.forEach(function (activity) {
- if (!minDate || deserializeDate(activity.date_deadline) < deserializeDate(minDate)) {
- minDate = activity.date_deadline;
- }
- });
- group.date_deadline = minDate;
- resIdToDeadline[group.res_id] = minDate;
- let state;
- if (group.date_deadline === serializeDate(DateTime.now())) {
- state = "today";
- } else if (deserializeDate(group.date_deadline) > DateTime.now()) {
- state = "planned";
- } else {
- state = "overdue";
+ const resIdToDateDone = {};
+ const groupedActivities = {};
+ for (const resIdStrTuple of new Set([
+ ...Object.keys(groupedCompleted),
+ ...Object.keys(groupedOngoing),
+ ])) {
+ const [resId, activityTypeId] = resIdStrTuple.split(",").map((n) => Number(n));
+ const ongoing = groupedOngoing[resIdStrTuple] || [];
+ const completed = groupedCompleted[resIdStrTuple] || [];
+ const dateDone = completed.length
+ ? DateTime.max(...completed.map((a) => deserializeDate(a.date_done)))
+ : false;
+ const dateDeadline = ongoing.length
+ ? DateTime.min(...ongoing.map((a) => deserializeDate(a.date_deadline)))
+ : false;
+ if (
+ dateDeadline &&
+ (resIdToDeadline[resId] === undefined || dateDeadline < resIdToDeadline[resId])
+ ) {
+ resIdToDeadline[resId] = dateDeadline;
}
- if (!groupedActivities[group.res_id]) {
- groupedActivities[group.res_id] = {};
+ if (
+ dateDone &&
+ (resIdToDateDone[resId] === undefined || dateDone > resIdToDateDone[resId])
+ ) {
+ resIdToDateDone[resId] = dateDone;
}
- groupedActivities[group.res_id][group.activity_type_id] = {
- count: group.__count,
- state: state,
- o_closest_deadline: group.date_deadline,
- ids: activites.map((x) => x.id),
+ const userAssignedIds = unique(
+ sortBy(
+ ongoing.filter((a) => a.user_id),
+ (a) => a.date_deadline
+ ).map((a) => a.user_id)
+ );
+ const reportingDate = ongoing.length ? dateDeadline : dateDone;
+ const attachments = completed
+ .map((act) => act.attachment_ids)
+ .flat()
+ .map((attachmentId) => attachmentsById[attachmentId]);
+ const attachmentsInfo = {};
+ if (attachments.length) {
+ const lastAttachmentCreateDate = DateTime.max(
+ ...attachments.map((a) => deserializeDate(a.create_date))
+ );
+ const mostRecentAttachment = attachments.find((a) =>
+ lastAttachmentCreateDate.equals(deserializeDate(a.create_date))
+ );
+ attachmentsInfo.attachments = {
+ most_recent_id: mostRecentAttachment.id,
+ most_recent_name: mostRecentAttachment.name,
+ count: attachments.length,
+ };
+ }
+ if (!(resId in groupedActivities)) {
+ groupedActivities[resId] = {};
+ }
+ groupedActivities[resId][activityTypeId] = {
+ count_by_state: {
+ ...Object.fromEntries(
+ Object.entries(
+ groupBy(ongoing, (a) =>
+ self._mockComputeStateFromDate(deserializeDate(a.date_deadline))
+ )
+ ).map(([state, activities]) => [state, activities.length])
+ ),
+ ...(completed.length ? { done: completed.length } : {}),
+ },
+ ids: ongoing.map((a) => a.id).concat(completed.map((a) => a.id)),
+ reporting_date: reportingDate ? reportingDate.toFormat("yyyy-LL-dd") : false,
+ state: ongoing.length ? self._mockComputeStateFromDate(dateDeadline) : "done",
+ user_assigned_ids: userAssignedIds,
+ ...attachmentsInfo,
};
- });
+ }
+ const ongoingResIds = sortBy(Object.keys(resIdToDeadline), (item) => resIdToDeadline[item]);
+ const completedResIds = sortBy(
+ Object.keys(resIdToDateDone).filter((resId) => !(resId in resIdToDeadline)),
+ (item) => resIdToDateDone[item]
+ );
return {
activity_types: activityTypes.map((type) => {
- let mailTemplates = [];
+ let templates = [];
if (type.mail_template_ids) {
- mailTemplates = type.mail_template_ids.map((template_id) => {
+ templates = type.mail_template_ids.map((template_id) => {
const template = this.getRecords("mail.template", [
["id", "=", template_id],
])[0];
@@ -184,12 +292,14 @@ patch(MockServer.prototype, {
};
});
}
- return [type.id, type.display_name, mailTemplates];
+ return {
+ id: type.id,
+ name: type.display_name,
+ template_ids: templates,
+ keep_done: type.keep_done,
+ };
}),
- activity_res_ids: sortBy(
- records.map((x) => x.id),
- (id) => deserializeDate(resIdToDeadline[id])
- ),
+ activity_res_ids: ongoingResIds.concat(completedResIds).map((idStr) => Number(idStr)),
grouped_activities: groupedActivities,
};
},
diff --git a/addons/mail/views/mail_activity_views.xml b/addons/mail/views/mail_activity_views.xml
index 7ec2da2fbcd..be0a6340b98 100644
--- a/addons/mail/views/mail_activity_views.xml
+++ b/addons/mail/views/mail_activity_views.xml
@@ -23,6 +23,7 @@
![]()
diff --git a/addons/maintenance/views/maintenance_views.xml b/addons/maintenance/views/maintenance_views.xml
index 399398a7faa..8b4136c139f 100644
--- a/addons/maintenance/views/maintenance_views.xml
+++ b/addons/maintenance/views/maintenance_views.xml
@@ -52,6 +52,27 @@
+
+ maintenance.request.view.activity
+ maintenance.request
+
+
+
+
+
+
+
+
equipment.request.form
maintenance.request
@@ -264,7 +285,7 @@
Maintenance Requests
maintenance.request
- kanban,tree,form,pivot,graph,calendar
+ kanban,tree,form,pivot,graph,calendar,activity
{
'search_default_active': True,
@@ -282,7 +303,7 @@
Maintenance Requests
maintenance.request
- kanban,tree,form,pivot,graph,calendar
+ kanban,tree,form,pivot,graph,calendar,activity
{
@@ -303,7 +324,7 @@
Maintenance Requests
maintenance.request
kanban,tree,form,pivot,graph,calendar
+ kanban,tree,form,pivot,graph,calendar,activity
{
'search_default_active': True,
'default_equipment_id': active_id,
@@ -321,7 +342,7 @@
Maintenance Requests
maintenance.request
- kanban,tree,form,pivot,graph,calendar
+ kanban,tree,form,pivot,graph,calendar,activity
{
'search_default_active': True,
'search_default_maintenance_team_id': active_id,
@@ -340,7 +361,7 @@
Maintenance Requests
maintenance.request
- calendar,kanban,tree,form,pivot,graph
+ calendar,kanban,tree,form,pivot,graph,activity
{
'search_default_active': True,
@@ -358,7 +379,7 @@
Maintenance Requests
maintenance.request
- graph,pivot,kanban,tree,form,calendar
+ graph,pivot,kanban,tree,form,calendar,activity
{
'search_default_active': True,
}
diff --git a/addons/mass_mailing/models/mailing.py b/addons/mass_mailing/models/mailing.py
index 938d493b880..dbe302f8bd7 100644
--- a/addons/mass_mailing/models/mailing.py
+++ b/addons/mass_mailing/models/mailing.py
@@ -46,6 +46,7 @@ class MassMailing(models.Model):
]
_order = 'calendar_date DESC'
_rec_name = "subject"
+ _systray_view = 'list'
@api.model
def default_get(self, fields_list):
diff --git a/addons/mass_mailing_sms/models/res_users.py b/addons/mass_mailing_sms/models/res_users.py
index 8e5a4eb730a..d6f569bbd98 100644
--- a/addons/mass_mailing_sms/models/res_users.py
+++ b/addons/mass_mailing_sms/models/res_users.py
@@ -17,6 +17,7 @@ class Users(models.Model):
doing a new query to split them by mailing_type.
"""
activities = super(Users, self).systray_get_activities()
+ view_type = self.env['mailing.mailing']._systray_view
for activity in activities:
if activity.get('model') == 'mailing.mailing':
activities.remove(activity)
@@ -56,6 +57,7 @@ class Users(models.Model):
'icon': icon,
'total_count': 0, 'today_count': 0, 'overdue_count': 0, 'planned_count': 0,
'res_ids': res_ids,
+ "view_type": view_type,
}
user_activities[act['mailing_type']]['res_ids'].add(act['res_id'])
user_activities[act['mailing_type']]['%s_count' % act['states']] += act['count']
@@ -64,7 +66,6 @@ class Users(models.Model):
for mailing_type in user_activities.keys():
user_activities[mailing_type].update({
- 'actions': [{'icon': 'fa-clock-o', 'name': 'Summary',}],
'domain': json.dumps([['activity_ids.res_id', 'in', list(user_activities[mailing_type]['res_ids'])]])
})
activities.extend(list(user_activities.values()))
diff --git a/addons/mass_mailing_sms/static/tests/tours/mailing_activities_split.js b/addons/mass_mailing_sms/static/tests/tours/mailing_activities_split.js
index 43299702823..cd8c2d2da7a 100644
--- a/addons/mass_mailing_sms/static/tests/tours/mailing_activities_split.js
+++ b/addons/mass_mailing_sms/static/tests/tours/mailing_activities_split.js
@@ -14,9 +14,9 @@ registry.category("web_tour.tours").add('mailing_activities_split', {
trigger: '.o-mail-ActivityGroup:contains("Email Marketing")',
}, {
content: 'Open Email Marketing record in the kanban view',
- trigger: '.o_kanban_record:contains("New Email!")',
+ trigger: '.o_list_renderer .o_data_cell:contains("New Email!")',
run: () => {
- if ($(".o_kanban_record:contains(New SMS!)").length !== 0) {
+ if ($('.o_list_renderer .o_data_cell:contains("New SMS!")').length !== 0) {
console.error('SMS Marketing record should not appear in this view');
}
},
@@ -28,9 +28,9 @@ registry.category("web_tour.tours").add('mailing_activities_split', {
trigger: '.o-mail-ActivityGroup:contains("SMS Marketing")',
}, {
content: 'Open SMS Marketing record in the kanban view',
- trigger: '.o_kanban_record:contains("New SMS!")',
+ trigger: '.o_list_renderer .o_data_cell:contains("New SMS!")',
run: () => {
- if ($(".o_kanban_record:contains(New Email!)").length !== 0) {
+ if ($('.o_list_renderer .o_data_cell:contains("New Email!")').length !== 0) {
console.error('Email Marketing record should not appear in this view');
}
},
diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml
index 207c412fefd..9367bef5bf9 100644
--- a/addons/mrp/views/mrp_production_views.xml
+++ b/addons/mrp/views/mrp_production_views.xml
@@ -19,6 +19,24 @@
fullscreen
+
+ mrp.production.view.activity
+ mrp.production
+
+
+
+
+
+
+
+
mrp.production.tree
mrp.production
@@ -616,7 +634,7 @@
Manufacturing Orders
mrp.production
- tree,kanban,form,calendar,pivot,graph
+ tree,kanban,form,calendar,pivot,graph,activity
{'search_default_todo': True, 'default_company_id': allowed_company_ids[0]}
diff --git a/addons/mrp/views/mrp_unbuild_views.xml b/addons/mrp/views/mrp_unbuild_views.xml
index bd88f70df1d..7887ae849bb 100644
--- a/addons/mrp/views/mrp_unbuild_views.xml
+++ b/addons/mrp/views/mrp_unbuild_views.xml
@@ -196,7 +196,7 @@
Unbuild Orders
mrp.unbuild
- tree,kanban,form
+ tree,kanban,form,activity
-
-
+
+
- ![]()
-
+
-
+
+
+
+
+
+
+
+
+
+
No unbuild order found
diff --git a/addons/mrp/views/stock_picking_views.xml b/addons/mrp/views/stock_picking_views.xml
index b27e0b8a257..cdaf45c8130 100644
--- a/addons/mrp/views/stock_picking_views.xml
+++ b/addons/mrp/views/stock_picking_views.xml
@@ -144,7 +144,7 @@
-
+
diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml
index 43ecf8a1809..cb51ad41da3 100644
--- a/addons/product/views/product_views.xml
+++ b/addons/product/views/product_views.xml
@@ -483,8 +483,8 @@
[
-
+
diff --git a/addons/project/models/project_project.py b/addons/project/models/project_project.py
index 42e0d21373c..5d2b15366c6 100644
--- a/addons/project/models/project_project.py
+++ b/addons/project/models/project_project.py
@@ -19,6 +19,7 @@ class Project(models.Model):
_inherit = ['portal.mixin', 'mail.alias.mixin', 'rating.parent.mixin', 'mail.thread', 'mail.activity.mixin']
_order = "sequence, name, id"
_rating_satisfaction_days = 30 # takes 30 days by default
+ _systray_view = 'activity'
def _compute_attached_docs_count(self):
self.env.cr.execute(
diff --git a/addons/project/models/project_task.py b/addons/project/models/project_task.py
index 3166c3b351a..e381bb7879b 100644
--- a/addons/project/models/project_task.py
+++ b/addons/project/models/project_task.py
@@ -77,6 +77,7 @@ class Task(models.Model):
_mail_post_access = 'read'
_order = "priority desc, sequence, date_deadline asc, id desc"
_primary_email = 'email_from'
+ _systray_view = 'activity'
_track_duration_field = 'stage_id'
@api.model
diff --git a/addons/project/static/src/components/project_task_state_selection/project_task_state_selection.js b/addons/project/static/src/components/project_task_state_selection/project_task_state_selection.js
index f04570d5c37..c7ed3ef40de 100644
--- a/addons/project/static/src/components/project_task_state_selection/project_task_state_selection.js
+++ b/addons/project/static/src/components/project_task_state_selection/project_task_state_selection.js
@@ -131,14 +131,14 @@ export class ProjectTaskStateSelection extends StateSelectionField {
}
getDropdownPosition() {
- if (this.isView(['kanban', 'list', 'calendar']) || this.env.isSmall) {
+ if (this.isView(['activity', 'kanban', 'list', 'calendar']) || this.env.isSmall) {
return '';
}
return 'bottom-end';
}
getTogglerClass(currentValue) {
- if (this.isView(['kanban', 'list', 'calendar']) || this.env.isSmall) {
+ if (this.isView(['activity', 'kanban', 'list', 'calendar']) || this.env.isSmall) {
return 'btn btn-link d-flex p-0';
}
return 'o_state_button btn rounded-pill ' + this.colorButton[currentValue];
diff --git a/addons/project/static/src/components/project_task_state_selection/project_task_state_selection.xml b/addons/project/static/src/components/project_task_state_selection/project_task_state_selection.xml
index 4dcd2bcdbff..b04e70db622 100644
--- a/addons/project/static/src/components/project_task_state_selection/project_task_state_selection.xml
+++ b/addons/project/static/src/components/project_task_state_selection/project_task_state_selection.xml
@@ -13,7 +13,7 @@
[