From 34da40a44d200f761ffa0b2acf70781eeadd7acf Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Wed, 5 Jul 2017 23:32:23 +0200
Subject: [IMP] acitvity filters cleaning

---
 addons/note/views/note_views.xml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'addons/note/views/note_views.xml')

diff --git a/addons/note/views/note_views.xml b/addons/note/views/note_views.xml
index 7d84e1d6e43..83f658acd06 100644
--- a/addons/note/views/note_views.xml
+++ b/addons/note/views/note_views.xml
@@ -183,16 +183,13 @@
           <separator/>
           <filter string="My Activities" name="activities_my"
                   domain="[('activity_ids.user_id', '=', uid)]"/>
-          <filter string="Today Activities" name="activities_today"
-                  domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
-          <filter string="Upcoming Activities (7 days)" name="activities_week"
-                  domain="['&amp;', ('activity_ids.date_deadline', '&gt;=', context_today().strftime('%Y-%m-%d')),
-                           ('activity_ids.date_deadline', '&lt;=', (context_today()+datetime.timedelta(days=7)).strftime('%Y-%m-%d'))
-                  ]"/>
-          <filter string="Overdue Activities" name="activities_overdue"
+          <separator/>
+          <filter string="Late Activities" name="activities_overdue"
                   domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                   help="Show all records which has next action date is before today"/>
-          <filter string="Upcoming Activities (All)" name="activities_upcoming_all"
+          <filter string="Today Activities" name="activities_today"
+                  domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
+          <filter string="Future Activities" name="activities_upcoming_all"
                         domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
                         ]"/>
           <group expand="0" string="Group By">
-- 
cgit v1.2.3