From af999f40dd641b16df173bca3b696b9269be395c Mon Sep 17 00:00:00 2001
From: Mathieu Duckerts-Antoine <dam@odoo.com>
Date: Mon, 11 Jun 2018 15:47:15 +0200
Subject: [PATCH] [IMP] *: review date type groupbys in search views archs

The parent commit allows to select a specific interval for any
date or datetime field in the groupby menu. This makes some filter
akward, for instance "Order Month".

Accordingly, we have rewritten the string and help attributes in
search views archs and removed groupbys related to the same field
(that would have become redundant).
---
 addons/account/report/account_invoice_report_view.xml        | 2 +-
 addons/account/views/account_view.xml                        | 2 +-
 addons/account_asset/views/account_asset_views.xml           | 2 +-
 addons/analytic/views/analytic_account_views.xml             | 2 +-
 addons/crm/report/crm_activity_report_views.xml              | 2 +-
 addons/crm/report/crm_opportunity_report_views.xml           | 4 ++--
 addons/crm/views/crm_lead_views.xml                          | 4 ++--
 addons/event/views/event_views.xml                           | 5 ++---
 addons/fleet/views/fleet_vehicle_cost_views.xml              | 3 +--
 addons/hr_attendance/views/hr_attendance_view.xml            | 2 +-
 addons/hr_expense/views/hr_expense_views.xml                 | 4 ++--
 addons/hr_holidays/report/hr_leave_reports.xml               | 2 +-
 addons/hr_holidays/views/hr_leave_views.xml                  | 2 +-
 addons/hr_recruitment/views/hr_recruitment_views.xml         | 2 +-
 addons/hr_timesheet/views/hr_timesheet_views.xml             | 2 +-
 .../im_livechat/report/im_livechat_report_channel_views.xml  | 5 +----
 .../im_livechat/report/im_livechat_report_operator_views.xml | 5 +----
 addons/im_livechat/views/mail_channel_views.xml              | 5 +----
 .../l10n_in_hr_payroll/report/payment_advice_report_view.xml | 2 +-
 addons/l10n_in_hr_payroll/report/payslip_report_view.xml     | 2 +-
 addons/lunch/views/lunch_views.xml                           | 2 +-
 addons/mail/views/mail_mail_views.xml                        | 2 +-
 addons/membership/views/partner_views.xml                    | 4 ++--
 addons/membership/views/product_views.xml                    | 2 +-
 addons/mrp/views/mrp_production_views.xml                    | 2 +-
 addons/mrp/views/mrp_workorder_views.xml                     | 2 +-
 addons/point_of_sale/views/pos_order_report_view.xml         | 2 +-
 addons/point_of_sale/views/pos_order_view.xml                | 2 +-
 addons/project/report/project_report_views.xml               | 2 +-
 addons/purchase/report/purchase_report_views.xml             | 2 +-
 .../views/purchase_requisition_views.xml                     | 2 +-
 addons/rating/views/rating_view.xml                          | 4 +---
 addons/repair/views/repair_views.xml                         | 2 +-
 addons/resource/views/resource_views.xml                     | 2 +-
 addons/sale/report/sale_report_views.xml                     | 2 +-
 addons/sale/views/sale_views.xml                             | 2 +-
 addons/stock/views/stock_inventory_views.xml                 | 2 +-
 addons/stock_landed_costs/views/stock_landed_cost_views.xml  | 2 +-
 .../report/crm_lead_report_view.xml                          | 2 +-
 odoo/addons/base/views/ir_attachment_views.xml               | 2 +-
 odoo/addons/base/views/ir_logging_views.xml                  | 3 +--
 41 files changed, 46 insertions(+), 60 deletions(-)

diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 2630b8eb6c0..fea86d8c1ff 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -94,7 +94,7 @@
                     <filter string="Company" name="company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical" />
                     <filter string="Date" name="date" context="{'group_by':'date'}"/>
-                    <filter string="Due Month" name="duemonth" context="{'group_by':'date_due:month'}"/>
+                    <filter string="Due Date" name="duemonth" context="{'group_by':'date_due:month'}"/>
                     <filter string="Analytic Account" name="account_analytic_id" context="{'group_by':'account_analytic_id'}" groups="analytic.group_analytic_accounting" />
                 </group>
             </search>
diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml
index 7f517d38cea..b2ceee51f15 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -1601,7 +1601,7 @@
                         <filter string="Partner" name="partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" name="journal" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Date" name="date" domain="[]" context="{'group_by':'date'}" help="Journal Entries by Month"/>
+                        <filter string="Date" name="date" domain="[]" context="{'group_by':'date'}" help="Journal Entries by Date"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/account_asset/views/account_asset_views.xml b/addons/account_asset/views/account_asset_views.xml
index 4d4c9cea441..95a3c271a31 100644
--- a/addons/account_asset/views/account_asset_views.xml
+++ b/addons/account_asset/views/account_asset_views.xml
@@ -303,7 +303,7 @@
                 <field name="category_id" string="Asset Category"/>
                 <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                 <group expand="0" string="Group By...">
-                        <filter string="Month" name="month" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Date" name="month" domain="[]" context="{'group_by':'date'}"/>
                         <filter string="Asset Category" name="category" domain="[]" context="{'group_by':'category_id'}"/>
                 </group>
             </search>
diff --git a/addons/analytic/views/analytic_account_views.xml b/addons/analytic/views/analytic_account_views.xml
index 1d7d129e7c1..d77509275d0 100644
--- a/addons/analytic/views/analytic_account_views.xml
+++ b/addons/analytic/views/analytic_account_views.xml
@@ -306,7 +306,7 @@
                     <field name="tag_ids" widget="many2many_tags"/>
                     <group string="Group By..." expand="0" name="groupby">
                         <filter string="Analytic Account" context="{'group_by':'account_id'}" name="account_id"/>
-                        <filter string="Tasks Month" context="{'group_by':'date'}" name="group_date"/>
+                        <filter string="Tasks Date" context="{'group_by':'date'}" name="group_date"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/crm/report/crm_activity_report_views.xml b/addons/crm/report/crm_activity_report_views.xml
index 3bb8bd56a9c..8ddf6fcc63a 100644
--- a/addons/crm/report/crm_activity_report_views.xml
+++ b/addons/crm/report/crm_activity_report_views.xml
@@ -46,7 +46,7 @@
                         <filter string="Country" name="country" context="{'group_by':'country_id'}" />
                         <filter string="Company" name="company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Stage" name="stage" context="{'group_by':'stage_id'}"/>
-                        <filter string="Month" context="{'group_by':'date:month'}" name="month"/>
+                        <filter string="Date" context="{'group_by':'date:month'}" name="month"/>
                         <filter string="Leads" name="group_by_opportunity" context="{'group_by':'lead_id'}" />
                     </group>
                 </search>
diff --git a/addons/crm/report/crm_opportunity_report_views.xml b/addons/crm/report/crm_opportunity_report_views.xml
index 2744cea7260..8ae35895a38 100644
--- a/addons/crm/report/crm_opportunity_report_views.xml
+++ b/addons/crm/report/crm_opportunity_report_views.xml
@@ -126,8 +126,8 @@
                         <filter string="Company" name="company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Stage" name="stage" context="{'group_by':'stage_id'}"/>
                         <separator orientation="vertical" />
-                        <filter string="Creation Month" context="{'group_by':'create_date:month'}" name="month"/>
-                        <filter string="Expected Closing" context="{'group_by':'date_deadline:month'}" name="date_deadline" help="Expiration Closing Month"/>
+                        <filter string="Creation Date" context="{'group_by':'create_date:month'}" name="month"/>
+                        <filter string="Expected Closing" context="{'group_by':'date_deadline:month'}" name="date_deadline"/>
                         <filter string="Conversion Date" context="{'group_by':'date_conversion:month'}" name="conversion_date" help="Conversion Date from Lead to Opportunity"/>
                         <filter string="Lost Reason" name="lostreason" context="{'group_by':'lost_reason'}"/>
                     </group>
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index d7b3d538e63..994a577239b 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -417,7 +417,7 @@
                         <filter string="Campaign" name="groupby_campaign"  domain="[]" context="{'group_by':'campaign_id'}"/>
                         <filter string="Source" name="groupby_source" domain="[]" context="{'group_by':'source_id'}"/>
                         <filter string="Medium" name="groupby_channel" domain="[]" context="{'group_by':'medium_id'}"/>
-                        <filter string="Creation Month" name="groupby_createmonth" domain="[]" context="{'group_by':'create_date'}"/>
+                        <filter string="Creation Date" name="groupby_createmonth" domain="[]" context="{'group_by':'create_date'}"/>
                     </group>
                 </search>
             </field>
@@ -689,7 +689,7 @@
                         <filter string="Medium" name="medium" domain="[]" context="{'group_by':'medium_id'}"/>
                         <filter string="Source" name="source" domain="[]" context="{'group_by':'source_id'}"/>
                         <separator orientation="vertical" />
-                        <filter string="Creation Month" context="{'group_by':'create_date:month'}" name="month"/>
+                        <filter string="Creation Date" context="{'group_by':'create_date:month'}" name="month"/>
                         <filter string="Expected Closing Date" name="date_deadline" context="{'group_by':'date_deadline'}"/>
                         <filter string="Lost Reason" name="lostreason" context="{'group_by':'lost_reason'}"/>
                     </group>
diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml
index 5a09604128a..af015656140 100644
--- a/addons/event/views/event_views.xml
+++ b/addons/event/views/event_views.xml
@@ -383,7 +383,7 @@
                         <filter string="Responsible" name="responsible" context="{'group_by': 'user_id'}"/>
                         <filter string="Event Category" name="event_type_id" context="{'group_by':'event_type_id'}"/>
                         <filter string="Status" name="status" context="{'group_by':'state'}"/>
-                        <filter string="Start Month" name="date_begin" domain="[]" context="{'group_by':'date_begin'}"/>
+                        <filter string="Start Date" name="date_begin" domain="[]" context="{'group_by':'date_begin'}"/>
                     </group>
                 </search>
             </field>
@@ -539,8 +539,7 @@
                         <filter string="Partner" name="partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Event" name="group_event" domain="[]" context="{'group_by':'event_id'}"/>
                         <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Registration Day" name="createday" domain="[]" context="{'group_by': 'create_date:day'}"/>
-                        <filter string="Registration Month" name="createmonth" domain="[]" context="{'group_by': 'create_date:month'}"/>
+                        <filter string="Registration Date" name="createmonth" domain="[]" context="{'group_by': 'create_date:month'}"/>
                    </group>
                 </search>
             </field>
diff --git a/addons/fleet/views/fleet_vehicle_cost_views.xml b/addons/fleet/views/fleet_vehicle_cost_views.xml
index 9d81440f03d..63499f7340a 100644
--- a/addons/fleet/views/fleet_vehicle_cost_views.xml
+++ b/addons/fleet/views/fleet_vehicle_cost_views.xml
@@ -105,8 +105,7 @@
                         <filter name="groupby_vehicle_id" context="{'group_by': 'vehicle_id'}" string="Vehicle"/>
                         <filter name="groupby_parent_id" context="{'group_by': 'parent_id'}" string="Parent"/>
                         <separator/>
-                        <filter name="groupby_date" context="{'group_by': 'date:month'}" string="Month" help="Vehicle Costs by Month"/>
-                        <filter name="groupby_year" context="{'group_by': 'date:year'}" string="Year"/>
+                        <filter name="groupby_date" context="{'group_by': 'date:month'}" string="Date" help="Vehicle Costs by Date"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_attendance/views/hr_attendance_view.xml b/addons/hr_attendance/views/hr_attendance_view.xml
index 7687cbddb3f..497d90d799d 100644
--- a/addons/hr_attendance/views/hr_attendance_view.xml
+++ b/addons/hr_attendance/views/hr_attendance_view.xml
@@ -77,7 +77,7 @@
                 <group expand="0" string="Group By">
                     <filter name="employee" string="Employee" context="{'group_by':'employee_id'}"/>
                     <separator/>
-                    <filter name="groupby_name" string="Month" context="{'group_by':'check_in'}"/>
+                    <filter name="groupby_name" string="Date" context="{'group_by':'check_in'}"/>
                 </group>
             </search>
         </field>
diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml
index 4ba5028ca18..13c33451b67 100644
--- a/addons/hr_expense/views/hr_expense_views.xml
+++ b/addons/hr_expense/views/hr_expense_views.xml
@@ -220,7 +220,7 @@
                         <filter string="Company" name="company" domain="[]" context="{'group_by': 'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Product" name="product" domain="[]" context="{'group_by': 'product_id'}"/>
                         <filter string="Analytic Account" name="analyticacc" domain="[]" context="{'group_by': 'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
-                        <filter string="Expenses Month" name="expensesmonth" domain="[]" context="{'group_by': 'date'}" help="Expenses by Month"/>
+                        <filter string="Date" name="expensesmonth" domain="[]" context="{'group_by': 'date'}" help="Expense Date"/>
                         <filter string="Status" name="status" domain="[]" context="{'group_by': 'state'}"/>
                     </group>
                     <separator />
@@ -603,7 +603,7 @@
                         <filter string="Employee" name="employee" domain="[]" context="{'group_by': 'employee_id'}"/>
                         <filter string="Department" name="department" domain="[]" context="{'group_by': 'department_id'}"/>
                         <filter string="Company" name="company" domain="[]" context="{'group_by': 'company_id'}" groups="base.group_multi_company"/>
-                        <filter string="Expenses Month" name="expenses_month" domain="[]" context="{'group_by': 'accounting_date'}" help="Expenses by Month"/>
+                        <filter string="Date" name="expenses_month" domain="[]" context="{'group_by': 'accounting_date'}" help="Expenses by Date"/>
                         <filter string="State" domain="[]" context="{'group_by': 'state'}" name="state"/>
                     </group>
                     <separator />
diff --git a/addons/hr_holidays/report/hr_leave_reports.xml b/addons/hr_holidays/report/hr_leave_reports.xml
index 4694fe392dd..c3728fff213 100644
--- a/addons/hr_holidays/report/hr_leave_reports.xml
+++ b/addons/hr_holidays/report/hr_leave_reports.xml
@@ -35,7 +35,7 @@
                     <filter name="group_category" string="Category" context="{'group_by':'category_id'}"/>
                     <filter name="group_type" string="Type" context="{'group_by':'holiday_status_id'}"/>
                     <separator/>
-                    <filter name="group_date_from" string="Start Month" context="{'group_by':'date_from'}"/>
+                    <filter name="group_date_from" string="Start Date" context="{'group_by':'date_from'}"/>
                 </group>
             </search>
         </field>
diff --git a/addons/hr_holidays/views/hr_leave_views.xml b/addons/hr_holidays/views/hr_leave_views.xml
index 3308f6f645e..25319d1f04d 100644
--- a/addons/hr_holidays/views/hr_leave_views.xml
+++ b/addons/hr_holidays/views/hr_leave_views.xml
@@ -59,7 +59,7 @@
                     <filter name="group_second_approver_id" string="Validator" context="{'group_by':'second_approver_id'}"/>
                     <filter name="group_type" string="Type" context="{'group_by':'holiday_status_id'}"/>
                     <separator/>
-                    <filter name="group_date_from" string="Start Month" context="{'group_by':'date_from'}"/>
+                    <filter name="group_date_from" string="Start Date" context="{'group_by':'date_from'}"/>
                 </group>
             </search>
         </field>
diff --git a/addons/hr_recruitment/views/hr_recruitment_views.xml b/addons/hr_recruitment/views/hr_recruitment_views.xml
index b46e557be71..96e18b5436b 100644
--- a/addons/hr_recruitment/views/hr_recruitment_views.xml
+++ b/addons/hr_recruitment/views/hr_recruitment_views.xml
@@ -953,7 +953,7 @@
                    <filter string="Department" name="department" context="{'group_by':'department_id'}"/>
                    <filter string="Stage" name="stage" context="{'group_by':'stage_id'}" />
                    <separator/>
-                   <filter string="Creation Week" name="creation_week" context="{'group_by':'create_date:week'}" help="Creation Week"/>
+                   <filter string="Creation Date" name="creation_week" context="{'group_by':'create_date:week'}" help="Creation Date"/>
                 </group>
             </search>
         </field>
diff --git a/addons/hr_timesheet/views/hr_timesheet_views.xml b/addons/hr_timesheet/views/hr_timesheet_views.xml
index ccc13c433c1..caefdad4c90 100644
--- a/addons/hr_timesheet/views/hr_timesheet_views.xml
+++ b/addons/hr_timesheet/views/hr_timesheet_views.xml
@@ -155,7 +155,7 @@
                         <filter string="Employee" name="groupby_employee" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Project" name="groupby_project" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Task" name="groupby_task" domain="[]" context="{'group_by':'task_id'}"/>
-                        <filter string="Timesheet Month" name="groupby_date" domain="[]" context="{'group_by':'date'}" help="Timesheet by Month"/>
+                        <filter string="Timesheet Date" name="groupby_date" domain="[]" context="{'group_by':'date'}" help="Timesheet by Date"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/im_livechat/report/im_livechat_report_channel_views.xml b/addons/im_livechat/report/im_livechat_report_channel_views.xml
index be77497f826..71fccb7c7c9 100644
--- a/addons/im_livechat/report/im_livechat_report_channel_views.xml
+++ b/addons/im_livechat/report/im_livechat_report_channel_views.xml
@@ -40,10 +40,7 @@
                         <filter name="group_by_operator" string="Operator" domain="[('partner_id','!=', False)]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical" />
                         <filter name="group_by_hour" string="Creation date (hour)" domain="[]" context="{'group_by':'start_date_hour'}"/>
-                        <filter name="group_by_day" string="Creation date (day)" domain="[]" context="{'group_by':'start_date:day'}"/>
-                        <filter name="group_by_week" string="Creation date (week)" domain="[]" context="{'group_by':'start_date:week'}"/>
-                        <filter name="group_by_month" string="Creation date (month)" domain="[]" context="{'group_by':'start_date:month'}" />
-                        <filter name="group_by_year" string="Creation date (year)" domain="[]" context="{'group_by':'start_date:year'}"/>
+                        <filter name="group_by_month" string="Creation date" domain="[]" context="{'group_by':'start_date:month'}" />
                     </group>
                 </search>
             </field>
diff --git a/addons/im_livechat/report/im_livechat_report_operator_views.xml b/addons/im_livechat/report/im_livechat_report_operator_views.xml
index 43c00e1757c..fd7a5c4b422 100644
--- a/addons/im_livechat/report/im_livechat_report_operator_views.xml
+++ b/addons/im_livechat/report/im_livechat_report_operator_views.xml
@@ -36,10 +36,7 @@
                         <filter name="group_by_channel" string="Channel" domain="[]" context="{'group_by':'channel_id'}"/>
                         <filter name="group_by_operator" string="Operator" domain="[('partner_id','!=', False)]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical" />
-                        <filter name="group_by_day" string="Creation date (day)" domain="[]" context="{'group_by':'start_date:day'}"/>
-                        <filter name="group_by_week" string="Creation date (week)" domain="[]" context="{'group_by':'start_date:week'}"/>
-                        <filter name="group_by_month" string="Creation date (month)" domain="[]" context="{'group_by':'start_date:month'}" />
-                        <filter name="group_by_year" string="Creation date (year)" domain="[]" context="{'group_by':'start_date:year'}"/>
+                        <filter name="group_by_month" string="Creation date" domain="[]" context="{'group_by':'start_date:month'}" />
                     </group>
                 </search>
             </field>
diff --git a/addons/im_livechat/views/mail_channel_views.xml b/addons/im_livechat/views/mail_channel_views.xml
index adde76225e3..17217c6c36a 100644
--- a/addons/im_livechat/views/mail_channel_views.xml
+++ b/addons/im_livechat/views/mail_channel_views.xml
@@ -11,10 +11,7 @@
                     <group expand="0" string="Group By...">
                         <filter name="group_by_channel" string="Channel" domain="[]" context="{'group_by':'livechat_channel_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter name="group_by_day" string="Creation date (day)" domain="[]" context="{'group_by':'create_date:day'}"/>
-                        <filter name="group_by_week" string="Creation date (week)" domain="[]" context="{'group_by':'create_date:week'}"/>
-                        <filter name="group_by_month" string="Creation date (month)" domain="[]" context="{'group_by':'create_date:month'}"/>
-                        <filter name="group_by_year" string="Creation date (year)" domain="[]" context="{'group_by':'create_date:year'}"/>
+                        <filter name="group_by_month" string="Creation Date" domain="[]" context="{'group_by':'create_date:month'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
index 1ecf708c7ae..fd6524f6ad3 100644
--- a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
+++ b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
@@ -60,7 +60,7 @@
                     <separator orientation="vertical"/>
                     <filter string="Company" name="comapny" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Month" name="order_month" context="{'group_by':'month'}" help="Month of Payment Advices"/>
+                    <filter string="Date" name="order_month" context="{'group_by':'month'}" help="Date of Payment Advices"/>
                 </group>
             </search>
         </field>
diff --git a/addons/l10n_in_hr_payroll/report/payslip_report_view.xml b/addons/l10n_in_hr_payroll/report/payslip_report_view.xml
index c1b076f3beb..bfc24ffdcbd 100644
--- a/addons/l10n_in_hr_payroll/report/payslip_report_view.xml
+++ b/addons/l10n_in_hr_payroll/report/payslip_report_view.xml
@@ -58,7 +58,7 @@
                     <separator orientation="vertical"/>
                     <filter string="Company" name="company" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Month" name="order_month" context="{'group_by':'month'}" help="Month of Payslip"/>
+                    <filter string="Date" name="order_month" context="{'group_by':'month'}" help="Date of Payslip"/>
                 </group>
             </search>
         </field>
diff --git a/addons/lunch/views/lunch_views.xml b/addons/lunch/views/lunch_views.xml
index aef9f006d4b..5281ed69a3b 100644
--- a/addons/lunch/views/lunch_views.xml
+++ b/addons/lunch/views/lunch_views.xml
@@ -24,7 +24,7 @@
                     <group expand="0" string="Group By">
                         <filter name="group_by_order_id" string="By Order" context="{'group_by':'order_id'}"/>
                         <filter name="group_by_supplier" string="By Vendor" context="{'group_by':'supplier'}"/>
-                        <filter name="group_by_date" string="Order Month" context="{'group_by':'date'}" help="Vendor Orders by Month"/>
+                        <filter name="group_by_date" string="Order Date" context="{'group_by':'date'}" help="Vendor Orders by Date"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/mail/views/mail_mail_views.xml b/addons/mail/views/mail_mail_views.xml
index ee7d9e0e041..3958dae10fc 100644
--- a/addons/mail/views/mail_mail_views.xml
+++ b/addons/mail/views/mail_mail_views.xml
@@ -109,7 +109,7 @@
                         <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Author" name="author" context="{'group_by':'author_id'}"/>
                         <filter string="Thread" name="thread" domain="[]" context="{'group_by':'message_id'}"/>
-                        <filter string="Month" name="month" help="Creation Month" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Date" name="month" help="Creation Date" domain="[]" context="{'group_by':'date'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/membership/views/partner_views.xml b/addons/membership/views/partner_views.xml
index d778eee80ed..1379ec63078 100644
--- a/addons/membership/views/partner_views.xml
+++ b/addons/membership/views/partner_views.xml
@@ -38,8 +38,8 @@
                         <filter string="Salesperson" name="salesperson" domain="[]" context="{'group_by' : 'user_id'}"/>
                         <filter string="Associate Member" name = "associate" domain="[]" context="{'group_by':'associate_member'}"/>
                         <filter string=" Membership State" name="membership_state" domain="[]" context="{'group_by':'membership_state'}"/>
-                        <filter string="Start Month" name="start_month" help="Starting Month Of Membership" domain="[]" context="{'group_by':'membership_start'}"/>
-                        <filter string="End Month" name="end_month" help="Ending Month Of Membership" domain="[]" context="{'group_by':'membership_stop'}"/>
+                        <filter string="Start Date" name="start_month" help="Starting Date Of Membership" domain="[]" context="{'group_by':'membership_start'}"/>
+                        <filter string="End Date" name="end_month" help="Ending Date Of Membership" domain="[]" context="{'group_by':'membership_stop'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/membership/views/product_views.xml b/addons/membership/views/product_views.xml
index 900f282b06e..3598f1b2b5a 100644
--- a/addons/membership/views/product_views.xml
+++ b/addons/membership/views/product_views.xml
@@ -16,7 +16,7 @@
                     <field name="categ_id" operator="child_of"/>
                     <group  expand='0' string='Group by...'>
                         <filter string='Category' name="category" domain="[]" context="{'group_by' : 'categ_id'}"/>
-                        <filter string='From Month' name="from_month" domain="[]" context="{'group_by' : 'membership_date_from'}"/>
+                        <filter string='Start Date' name="from_month" domain="[]" context="{'group_by' : 'membership_date_from'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml
index 4292b50b88a..48d7ae71b56 100644
--- a/addons/mrp/views/mrp_production_views.xml
+++ b/addons/mrp/views/mrp_production_views.xml
@@ -282,7 +282,7 @@
                         <filter string="Product" name="product" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Routing" name="routing" domain="[]" context="{'group_by':'routing_id'}"/>
                         <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Scheduled Month" name="scheduled_month" domain="[]" context="{'group_by':'date_planned_start'}" help="Scheduled Date by Month"/>
+                        <filter string="Scheduled Date" name="scheduled_month" domain="[]" context="{'group_by':'date_planned_start'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/mrp/views/mrp_workorder_views.xml b/addons/mrp/views/mrp_workorder_views.xml
index 15561dc1ddd..0aee35f12b1 100644
--- a/addons/mrp/views/mrp_workorder_views.xml
+++ b/addons/mrp/views/mrp_workorder_views.xml
@@ -267,7 +267,7 @@
                     <filter string="Work Center" name="work_center" domain="[]" context="{'group_by':'workcenter_id'}"/>
                     <filter string="Production" name="production" domain="[]" context="{'group_by':'production_id'}"/>
                     <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Scheduled Month" name="scheduled_month" domain="[]" context="{'group_by':'date_planned_start'}" help="Scheduled Date by Month"/>
+                    <filter string="Scheduled Date" name="scheduled_month" domain="[]" context="{'group_by':'date_planned_start'}"/>
                 </group>
              </search>
         </field>
diff --git a/addons/point_of_sale/views/pos_order_report_view.xml b/addons/point_of_sale/views/pos_order_report_view.xml
index 82a131e9705..243e93a3e0e 100644
--- a/addons/point_of_sale/views/pos_order_report_view.xml
+++ b/addons/point_of_sale/views/pos_order_report_view.xml
@@ -46,7 +46,7 @@
                         <filter string="Product Category" name="product_category" context="{'group_by':'product_categ_id'}"/>
                         <filter string="Product" name="product" context="{'group_by':'product_id'}"/>
                         <separator/>
-                        <filter string="Order Month" name="order_month" context="{'group_by':'date:month'}" help="Month of order date"/>
+                        <filter string="Order Date" name="order_month" context="{'group_by':'date:month'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/point_of_sale/views/pos_order_view.xml b/addons/point_of_sale/views/pos_order_view.xml
index 895504b3217..307282f0804 100644
--- a/addons/point_of_sale/views/pos_order_view.xml
+++ b/addons/point_of_sale/views/pos_order_view.xml
@@ -294,7 +294,7 @@
                     <filter string="Salesman" name="salesman" domain="[]" context="{'group_by':'user_id'}"/>
                     <filter string="Session" name="session" domain="[]" context="{'group_by':'session_id'}"/>
                     <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Order Month" name="order_month" domain="[]" context="{'group_by':'date_order'}"/>
+                    <filter string="Order Date" name="order_month" domain="[]" context="{'group_by':'date_order'}"/>
                 </group>
             </search>
         </field>
diff --git a/addons/project/report/project_report_views.xml b/addons/project/report/project_report_views.xml
index 085e655815d..08b2c4c4f0a 100644
--- a/addons/project/report/project_report_views.xml
+++ b/addons/project/report/project_report_views.xml
@@ -76,7 +76,7 @@
                         <filter string="Stage" name="Stage" context="{'group_by':'stage_id'}"/>
                         <filter string="Company" name="company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <separator/>
-                        <filter string="Assignation Month" name="assignation_month" context="{'group_by':'date_start:month'}" help="Creation Date"/>
+                        <filter string="Assignation Date" name="assignation_month" context="{'group_by':'date_start:month'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/purchase/report/purchase_report_views.xml b/addons/purchase/report/purchase_report_views.xml
index 5b65a546b88..5bc8256ee7b 100644
--- a/addons/purchase/report/purchase_report_views.xml
+++ b/addons/purchase/report/purchase_report_views.xml
@@ -73,7 +73,7 @@
                     <filter string="Status" name="status" context="{'group_by':'state'}"/>
                     <filter string="Company" name="company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator/>
-                    <filter string="Order Month" name="order_month" context="{'group_by':'date_order:month'}" help="Order of Day"/>
+                    <filter string="Order Date" name="order_month" context="{'group_by':'date_order:month'}"/>
                     <filter string="Fiscal Position" name="fiscal_position" context="{'group_by':'fiscal_position_id'}" help="Purchase Order Fiscal Position"/>
                 </group>
             </search>
diff --git a/addons/purchase_requisition/views/purchase_requisition_views.xml b/addons/purchase_requisition/views/purchase_requisition_views.xml
index 52953440ab1..57cb2d81ce1 100644
--- a/addons/purchase_requisition/views/purchase_requisition_views.xml
+++ b/addons/purchase_requisition/views/purchase_requisition_views.xml
@@ -292,7 +292,7 @@
                         <filter string="Source" name="source" domain="[]" context="{'group_by':'origin'}"/>
                         <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Ordering Date" name="ordering_date" domain="[]" context="{'group_by':'ordering_date'}"/>
-                        <filter string="End Month" name="end_month" domain="[]" context="{'group_by':'date_end'}"/>
+                        <filter string="End Date" name="end_month" domain="[]" context="{'group_by':'date_end'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/rating/views/rating_view.xml b/addons/rating/views/rating_view.xml
index 3c856f7fad9..a7ec28584bb 100644
--- a/addons/rating/views/rating_view.xml
+++ b/addons/rating/views/rating_view.xml
@@ -149,9 +149,7 @@
                         <filter string="Customer" name="customer" context="{'group_by':'partner_id'}"/>
                         <filter string="Rating" name="rating_text" context="{'group_by':'rating_text'}"/>
                         <filter string="Resource" name="resource" context="{'group_by':'res_name'}"/>
-                        <filter string="Day" name="day" context="{'group_by':'create_date:day'}"/>
-                        <filter string="Month" name="month" context="{'group_by':'create_date:month'}"/>
-                        <filter string="Year" name="year" context="{'group_by':'create_date:year'}"/>
+                        <filter string="Date" name="month" context="{'group_by':'create_date:month'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/repair/views/repair_views.xml b/addons/repair/views/repair_views.xml
index 9ced7d7c9f4..d5bece8235e 100644
--- a/addons/repair/views/repair_views.xml
+++ b/addons/repair/views/repair_views.xml
@@ -255,7 +255,7 @@
                       <filter string="Partner" name="partner" domain="[]" context="{'group_by':'partner_id'}"/>
                       <filter string="Product" name="product" domain="[]" context="{'group_by':'product_id'}"/>
                       <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
-                      <filter string="Guarantee limit Month" name="guarantee_limit" domain="[]" context="{'group_by':'guarantee_limit'}" help="Guarantee limit by Month"/>
+                      <filter string="Warranty Expiration" name="guarantee_limit" domain="[]" context="{'group_by':'guarantee_limit'}"/>
                       <filter string="Company" name="company" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                   </group>
               </search>
diff --git a/addons/resource/views/resource_views.xml b/addons/resource/views/resource_views.xml
index 6629144f053..54c17e16be8 100644
--- a/addons/resource/views/resource_views.xml
+++ b/addons/resource/views/resource_views.xml
@@ -94,7 +94,7 @@
                 <group expand="0" string="Group By">
                     <filter string="Resource" name="resource" domain="[]" context="{'group_by':'resource_id'}"/>
                     <filter string="Company" name="company" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <filter string="Leave Month" name="leave_month" domain="[]" context="{'group_by':'date_from'}" help="Starting Date of Leave by Month"/>
+                    <filter string="Leave Date" name="leave_month" domain="[]" context="{'group_by':'date_from'}" help="Starting Date of Leave"/>
                 </group>
            </search>
         </field>
diff --git a/addons/sale/report/sale_report_views.xml b/addons/sale/report/sale_report_views.xml
index c74e8c5eca4..80920e180d4 100644
--- a/addons/sale/report/sale_report_views.xml
+++ b/addons/sale/report/sale_report_views.xml
@@ -18,7 +18,7 @@
          <field name="model">sale.report</field>
          <field name="arch" type="xml">
              <graph string="Sales Analysis">
-                 <field name="date" type="row"/>
+                 <field name="date" type="row" interval="day"/>
                  <field name="price_subtotal" type="measure"/>
              </graph>
          </field>
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index 09dba5794eb..7e763917c4c 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -451,7 +451,7 @@
                     <group expand="0" string="Group By">
                         <filter string="Salesperson" name="salesperson" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter name="customer" string="Customer" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Order Month" name="order_month" domain="[]" context="{'group_by':'date_order'}"/>
+                        <filter string="Order Date" name="order_month" domain="[]" context="{'group_by':'date_order'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/stock/views/stock_inventory_views.xml b/addons/stock/views/stock_inventory_views.xml
index 32bd5767096..37d72d168a3 100644
--- a/addons/stock/views/stock_inventory_views.xml
+++ b/addons/stock/views/stock_inventory_views.xml
@@ -59,7 +59,7 @@
                 <field name="product_id" string="Inventory Product" filter_domain="['|', ('product_id', 'ilike', self), ('line_ids.product_id','ilike',self)]"/>
                 <group expand="0" string="Group By">
                     <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Inventories Month" name="inventories_month" domain="[]" context="{'group_by':'date'}" help="Physical Inventories by Month"/>
+                    <filter string="Inventories Date" name="inventories_month" domain="[]" context="{'group_by':'date'}" help="Physical Inventories by Date"/>
                 </group>
             </search>
 
diff --git a/addons/stock_landed_costs/views/stock_landed_cost_views.xml b/addons/stock_landed_costs/views/stock_landed_cost_views.xml
index bf712eb6474..77362b076b9 100644
--- a/addons/stock_landed_costs/views/stock_landed_cost_views.xml
+++ b/addons/stock_landed_costs/views/stock_landed_cost_views.xml
@@ -159,7 +159,7 @@
                     <filter string="Draft" name="draft" domain="[('state','=','draft')]"/>
                     <filter string="Done" name="done" domain="[('state','=','done')]"/>
                     <group expand="0" string="Group By">
-                        <filter string="Month" name="group_by_month" context="{'group_by': 'date'}"/>
+                        <filter string="Date" name="group_by_month" context="{'group_by': 'date'}"/>
                         <filter string="Status" name="status" context="{'group_by': 'state'}"/>
                     </group>
                 </search>
diff --git a/addons/website_crm_partner_assign/report/crm_lead_report_view.xml b/addons/website_crm_partner_assign/report/crm_lead_report_view.xml
index 27a04e18bec..8d0c09e1fb0 100644
--- a/addons/website_crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/website_crm_partner_assign/report/crm_lead_report_view.xml
@@ -25,7 +25,7 @@
                         <filter string="Country" name="country" context="{'group_by':'country_id'}" />
                         <filter string="Company" name="company" context="{'group_by':'company_id'}" />
                         <separator/>
-                        <filter string="Assign Month" name="assign_month" context="{'group_by':'date_assign:month'}"/>
+                        <filter string="Assign Date" name="assign_month" context="{'group_by':'date_assign:month'}"/>
                     </group>
                 </search>
             </field>
diff --git a/odoo/addons/base/views/ir_attachment_views.xml b/odoo/addons/base/views/ir_attachment_views.xml
index d0292745ff3..a954444169d 100644
--- a/odoo/addons/base/views/ir_attachment_views.xml
+++ b/odoo/addons/base/views/ir_attachment_views.xml
@@ -79,7 +79,7 @@
                         <filter name="owner" string="Owner" domain="[]" context="{'group_by':'create_uid'}"/>
                         <filter string="Type" name="type" domain="[]" context="{'group_by':'type'}" groups="base.group_no_one"/>
                         <filter string="Company" name="company" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <filter string="Creation Month" name="creation_month" domain="[]" context="{'group_by':'create_date'}"/>
+                        <filter string="Creation Date" name="creation_month" domain="[]" context="{'group_by':'create_date'}"/>
                         <filter string="Attached Document Name" name="attached_document_name" domain="[]" context="{'group_by': 'res_name'}"/>
                     </group>
                 </search>
diff --git a/odoo/addons/base/views/ir_logging_views.xml b/odoo/addons/base/views/ir_logging_views.xml
index ab76e725cd8..baa21f2b89d 100644
--- a/odoo/addons/base/views/ir_logging_views.xml
+++ b/odoo/addons/base/views/ir_logging_views.xml
@@ -47,8 +47,7 @@
                         <filter string="Database" name="database" domain="[]" context="{'group_by': 'dbname'}" />
                         <filter string="Level" name="group_by_level" domain="[]" context="{'group_by': 'level'}" />
                         <filter string="Type" name="group_by_type" domain="[]" context="{'group_by': 'type'}" />
-                        <filter string="Month" name="group_by_month" domain="[]" context="{'group_by': 'create_date'}" />
-                        <filter string="Day" name="group_by_day" domain="[]" context="{'group_by': 'create_date:day'}" />
+                        <filter string="Creation Date" name="group_by_month" domain="[]" context="{'group_by': 'create_date'}" />
                     </group>
                 </search>
             </field>