diff options
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/account/views/account_invoice_view.xml | 13 | ||||
| -rw-r--r-- | addons/crm/views/crm_lead_views.xml | 32 | ||||
| -rw-r--r-- | addons/hr_recruitment/views/hr_recruitment_views.xml | 13 | ||||
| -rw-r--r-- | addons/mail/views/mail_activity_views.xml | 13 | ||||
| -rw-r--r-- | addons/mail/views/res_partner_views.xml | 15 | ||||
| -rw-r--r-- | addons/maintenance/views/maintenance_views.xml | 13 | ||||
| -rw-r--r-- | addons/mrp/views/mrp_production_views.xml | 13 | ||||
| -rw-r--r-- | addons/mrp/views/mrp_unbuild_views.xml | 15 | ||||
| -rw-r--r-- | addons/mrp_repair/views/mrp_repair_views.xml | 13 | ||||
| -rw-r--r-- | addons/note/views/note_views.xml | 13 | ||||
| -rw-r--r-- | addons/project/views/project_views.xml | 13 | ||||
| -rw-r--r-- | addons/project_issue/views/project_issue_views.xml | 13 | ||||
| -rw-r--r-- | addons/purchase/views/purchase_views.xml | 13 | ||||
| -rw-r--r-- | addons/sale/views/sale_views.xml | 13 | ||||
| -rw-r--r-- | addons/stock/views/stock_picking_views.xml | 13 | ||||
| -rw-r--r-- | addons/survey/views/survey_views.xml | 13 | ||||
| -rw-r--r-- | addons/website_event_track/views/event_track_views.xml | 13 |
17 files changed, 98 insertions, 146 deletions
diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml index d5337006b9b..cf1d70b40c0 100644 --- a/addons/account/views/account_invoice_view.xml +++ b/addons/account/views/account_invoice_view.xml @@ -524,16 +524,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="['&', ('activity_ids.date_deadline', '>=', context_today().strftime('%Y-%m-%d')), - ('activity_ids.date_deadline', '<=', (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', '<', 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', '>', context_today().strftime('%Y-%m-%d')) ]"/> <group expand="0" string="Group By"> diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml index 6fb1811b1e2..4934fed5bc0 100644 --- a/addons/crm/views/crm_lead_views.xml +++ b/addons/crm/views/crm_lead_views.xml @@ -373,16 +373,17 @@ <separator/> <filter string="My Activities" name="activities_my" domain="[('activity_ids.user_id', '=', uid)]"/> + <separator/> + <filter string="Late Activities" name="activities_overdue" + domain="[('activity_ids.date_deadline', '<', context_today().strftime('%Y-%m-%d'))]" + help="Show all records which has next action date is before today"/> <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" + <filter string="Future Activities (7 days)" name="activities_week" domain="['&', ('activity_ids.date_deadline', '>=', context_today().strftime('%Y-%m-%d')), ('activity_ids.date_deadline', '<=', (context_today()+datetime.timedelta(days=7)).strftime('%Y-%m-%d')) ]"/> - <filter string="Overdue Activities" name="activities_overdue" - domain="[('activity_ids.date_deadline', '<', 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="Future Activities (All)" name="activities_upcoming_all" domain="[('activity_ids.date_deadline', '>', context_today().strftime('%Y-%m-%d')) ]"/> <group expand="0" string="Group By"> @@ -616,23 +617,22 @@ <filter string="Unassigned" name="unassigned" domain="[('user_id','=', False)]" help="No salesperson"/> <separator/> - <filter string="My Activities" name="activities_my" + <filter string="Activities Todo" 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="['&', ('activity_ids.date_deadline', '>=', context_today().strftime('%Y-%m-%d')), - ('activity_ids.date_deadline', '<=', (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', '<', context_today().strftime('%Y-%m-%d'))]" help="Show all opportunities for which the next action date is before today"/> + <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', '>', context_today().strftime('%Y-%m-%d')) + ]"/> + + <separator/> <filter string="Overdue Opportunities" name="overdue_opp" domain="[('date_deadline', '<', context_today().strftime('%Y-%m-%d'))]" help="Show all opportunities with a deadline for which the next action date is before today"/> - <filter string="Upcoming Activities (All)" name="activities_upcoming_all" - domain="[('activity_ids.date_deadline', '>', context_today().strftime('%Y-%m-%d')) - ]"/> <separator/> <filter string="Lost" domain="[('active', '=', False)]"/> <filter string="Won" name="won" diff --git a/addons/hr_recruitment/views/hr_recruitment_views.xml b/addons/hr_recruitment/views/hr_recruitment_views.xml index 321a1187228..01faec3975a 100644 --- a/addons/hr_recruitment/views/hr_recruitment_views.xml +++ b/addons/hr_recruitment/views/hr_recruitment_views.xml @@ -203,16 +203,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="['&', ('activity_ids.date_deadline', '>=', context_today().strftime('%Y-%m-%d')), - ('activity_ids.date_deadline', '<=', (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', '<', 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', '>', context_today().strftime('%Y-%m-%d')) ]"/> <field name="categ_ids"/> diff --git a/addons/mail/views/mail_activity_views.xml b/addons/mail/views/mail_activity_views.xml index a1104eec0c9..5627785eeee 100644 --- a/addons/mail/views/mail_activity_views.xml +++ b/addons/mail/views/mail_activity_views.xml @@ -111,16 +111,13 @@ <separator/> <filter string="My Activities" name="activities_my" domain="[('create_uid', '=', uid)]"/> - <filter string="Today Activities" name="activities_today" - domain="[('date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/> - <filter string="Upcoming Activities (7 days)" name="activities_week" - domain="['&', ('date_deadline', '>=', context_today().strftime('%Y-%m-%d')), - ('date_deadline', '<=', (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="[('date_deadline', '<', 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="[('date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/> + <filter string="Future Activities" name="activities_upcoming_all" domain="[('activity_ids.date_deadline', '>', context_today().strftime('%Y-%m-%d')) ]"/> <separator/> diff --git a/addons/mail/views/res_partner_views.xml b/addons/mail/views/res_partner_views.xml index eeaf586d1a9..0fc6007b449 100644 --- a/addons/mail/views/res_partner_views.xml +++ b/addons/mail/views/res_partner_views.xml @@ -34,17 +34,14 @@ <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="['&', ('activity_ids.date_deadline', '>=', context_today().strftime('%Y-%m-%d')), - ('activity_ids.date_deadline', '<=', (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', '<', 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" - domain="[('activity_ids.date_deadline', '>', context_today().strftime('%Y-%m-%d')) + <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', '>', context_today().strftime('%Y-%m-%d')) ]"/> <separator/> </filter> diff --git a/addons/maintenance/views/maintenance_views.xml b/addons/maintenance/views/maintenance_views.xml index 7638212451d..4bb973aad1c 100644 --- a/addons/maintenance/views/maintenance_views.xml +++ b/addons/maintenance/views/maintenance_views.xml @@ -27,16 +27,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="['&', ('activity_ids.date_deadline', '>=', context_today().strftime('%Y-%m-%d')), - ('activity_ids.date_deadline', '<=', (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', '<', 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', '>', context_today().strftime('%Y-%m-%d')) ]"/> <separator/> diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml index 39196c3661a..948064c8d33 100644 --- a/addons/mrp/views/mrp_production_views.xml +++ b/addons/mrp/views/mrp_production_views.xml @@ -272,16 +272,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="['&', ('activity_ids.date_deadline', '>=', context_today().strftime('%Y-%m-%d')), - ('activity_ids.date_deadline', '<=', (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', '<', 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', '>', context_today().strftime('%Y-%m-%d')) ]"/> <group expand="0" string="Group By..."> diff --git a/addons/mrp/views/mrp_unbuild_views.xml b/addons/mrp/views/mrp_unbuild_views.xml index e73a263ecc4..5ba1a073ff6 100644 --- a/addons/mrp/views/mrp_unbuild_views.xml +++ b/addons/mrp/views/mrp_unbuild_views.xml @@ -25,16 +25,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="['&', ('activity_ids.date_deadline', '>=', context_today().strftime('%Y-%m-%d')), - ('activity_ids.date_deadline', '<=', (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', '<', 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 Activitie" name="activities_upcoming_all" domain="[('activity_ids.date_deadline', '>', context_today().strftime('%Y-%m-%d')) ]"/> </group> @@ -181,4 +178,4 @@ action="mrp_unbuild" sequence="20"/> -</odoo>
\ No newline at end of file +</odoo> diff --git a/addons/mrp_repair/views/mrp_repair_views.xml b/addons/mrp_repair/views/mrp_repair_views.xml index 524188e261f..53cb9e7843a 100644 --- a/addons/mrp_repair/views/mrp_repair_views.xml +++ b/addons/mrp_repair/views/mrp_repair_views.xml @@ -244,16 +244,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="['&', ('activity_ids.date_deadline', '>=', context_today().strftime('%Y-%m-%d')), - ('activity_ids.date_deadline', '<=', (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', '<', 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', '>', context_today().strftime('%Y-%m-%d')) ]"/> <group expand="0" string="Group By"> 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="['&', ('activity_ids.date_deadline', '>=', context_today().strftime('%Y-%m-%d')), - ('activity_ids.date_deadline', '<=', (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', '<', 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', '>', context_today().strftime('%Y-%m-%d')) ]"/> <group expand="0" string="Group By"> diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml index 045d38090f1..34908f9255f 100644 --- a/addons/project/views/project_views.xml +++ b/addons/project/views/project_views.xml @@ -38,16 +38,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="['&', ('activity_ids.date_deadline', '>=', context_today().strftime('%Y-%m-%d')), - ('activity_ids.date_deadline', '<=', (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', '<', 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', '>', context_today().strftime('%Y-%m-%d')) ]"/> <group expand="0" string="Group By"> diff --git a/addons/project_issue/views/project_issue_views.xml b/addons/project_issue/views/project_issue_views.xml index 064487dab57..a0d49f1ab75 100644 --- a/addons/project_issue/views/project_issue_views.xml +++ b/addons/project_issue/views/project_issue_views.xml @@ -124,16 +124,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="['&', ('activity_ids.date_deadline', '>=', context_today().strftime('%Y-%m-%d')), - ('activity_ids.date_deadline', '<=', (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', '<', 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', '>', context_today().strftime('%Y-%m-%d')) ]"/> <group expand="0" string="Group By" > diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml index c50b14a63fc..db703d92698 100644 --- a/addons/purchase/views/purchase_views.xml +++ b/addons/purchase/views/purchase_views.xml @@ -325,16 +325,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="['&', ('activity_ids.date_deadline', '>=', context_today().strftime('%Y-%m-%d')), - ('activity_ids.date_deadline', '<=', (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', '<', 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', '>', context_today().strftime('%Y-%m-%d')) ]"/> <group expand="0" string="Group By"> diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml index 1873a81b900..0daf25f7ffe 100644 --- a/addons/sale/views/sale_views.xml +++ b/addons/sale/views/sale_views.xml @@ -398,16 +398,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="['&', ('activity_ids.date_deadline', '>=', context_today().strftime('%Y-%m-%d')), - ('activity_ids.date_deadline', '<=', (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', '<', 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', '>', context_today().strftime('%Y-%m-%d')) ]"/> <group expand="0" string="Group By"> diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml index d5606751094..6473a765af6 100644 --- a/addons/stock/views/stock_picking_views.xml +++ b/addons/stock/views/stock_picking_views.xml @@ -407,16 +407,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="['&', ('activity_ids.date_deadline', '>=', context_today().strftime('%Y-%m-%d')), - ('activity_ids.date_deadline', '<=', (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', '<', 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', '>', context_today().strftime('%Y-%m-%d')) ]"/> <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/> diff --git a/addons/survey/views/survey_views.xml b/addons/survey/views/survey_views.xml index de452c32741..04022ab6b44 100644 --- a/addons/survey/views/survey_views.xml +++ b/addons/survey/views/survey_views.xml @@ -293,16 +293,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="['&', ('activity_ids.date_deadline', '>=', context_today().strftime('%Y-%m-%d')), - ('activity_ids.date_deadline', '<=', (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', '<', 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="Upcoming Activities" name="activities_upcoming_all" domain="[('activity_ids.date_deadline', '>', context_today().strftime('%Y-%m-%d')) ]"/> </search> diff --git a/addons/website_event_track/views/event_track_views.xml b/addons/website_event_track/views/event_track_views.xml index 5e8e4dfe60b..f071619b3a3 100644 --- a/addons/website_event_track/views/event_track_views.xml +++ b/addons/website_event_track/views/event_track_views.xml @@ -83,16 +83,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="['&', ('activity_ids.date_deadline', '>=', context_today().strftime('%Y-%m-%d')), - ('activity_ids.date_deadline', '<=', (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', '<', 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', '>', context_today().strftime('%Y-%m-%d')) ]"/> <group expand="0" string="Group By"> |