summaryrefslogtreecommitdiff
path: root/addons/project
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-12-11 17:06:48 +0100
committerChristophe Simonis <chs@odoo.com>2018-12-11 17:06:48 +0100
commit55dafc20f6bfef845f7db2e365b78b570d75a1d2 (patch)
tree1da460e83e5473b2db0e058c32a22d32d9510bc0 /addons/project
parent007669feac1fbf46860a22d17ab480c83937d735 (diff)
parent7e5d5045bfa7752176dd8f19c546ff6b19841381 (diff)
[MERGE] forward port branch 11.0 up to 7e5d5045bfa
Diffstat (limited to 'addons/project')
-rw-r--r--addons/project/controllers/portal.py2
-rw-r--r--addons/project/views/project_views.xml1
2 files changed, 1 insertions, 2 deletions
diff --git a/addons/project/controllers/portal.py b/addons/project/controllers/portal.py
index 1ea74c36da4..4cc54906447 100644
--- a/addons/project/controllers/portal.py
+++ b/addons/project/controllers/portal.py
@@ -160,7 +160,7 @@ class CustomerPortal(CustomerPortal):
# content according to pager and archive selected
if groupby == 'project':
order = "project_id, %s" % order # force sort on project first to group by project in view
- tasks = request.env['project.task'].search(domain, order=order, limit=self._items_per_page, offset=pager['offset'])
+ tasks = request.env['project.task'].search(domain, order=order, limit=self._items_per_page, offset=(page - 1) * self._items_per_page)
request.session['my_tasks_history'] = tasks.ids[:100]
if groupby == 'project':
grouped_tasks = [request.env['project.task'].concat(*g) for k, g in groupbyelem(tasks, itemgetter('project_id'))]
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index 0f168cd52f5..be13932261a 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -516,7 +516,6 @@
<field name="stage_id" options='{"group_by_tooltip": {"description": "Stage Description", "legend_priority": "Use of stars"}}'/>
<field name="user_id"/>
<field name="user_email"/>
- <field name="description"/>
<field name="sequence"/>
<field name="date_deadline"/>
<field name="message_needaction_counter"/>