From 1dc7cb22e7470c4bd3c6c3df202626ce1652a049 Mon Sep 17 00:00:00 2001
From: Hiral Bhavsar <hbh@odoo.com>
Date: Tue, 11 Sep 2018 16:02:11 +0530
Subject: [PATCH 1/8] [IMP] hr and dependencies: improve filters

Specifications: improve search filters and groupby, reorder filters, update
some labels.

This commit is related to task #1881274 and PR #26938 .
---
 addons/hr/views/hr_views.xml                       |  3 ++-
 addons/hr_attendance/views/hr_attendance_view.xml  |  7 ++++---
 addons/hr_attendance/views/hr_employee_view.xml    |  3 ++-
 addons/hr_contract/views/hr_contract_views.xml     |  4 ++--
 addons/hr_expense/views/hr_expense_views.xml       | 14 ++++++--------
 .../hr_recruitment/views/hr_recruitment_views.xml  |  2 +-
 6 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/addons/hr/views/hr_views.xml b/addons/hr/views/hr_views.xml
index 33e80a8d3d6..d77e584db5b 100644
--- a/addons/hr/views/hr_views.xml
+++ b/addons/hr/views/hr_views.xml
@@ -180,8 +180,9 @@
                     <field name="department_id"/>
                     <field name="category_ids" groups="hr.group_hr_user"/>
                     <field name="job_id" />
-                    <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction','=',True)]"/>
                     <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
+                    <separator/>
+                    <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction', '=', True)]"/>
                     <group expand="0" string="Group By">
                         <filter name="group_manager" string="Manager" domain="[]" context="{'group_by':'parent_id'}"/>
                         <filter name="group_coach" string="Coach" domain="[]" context="{'group_by':'coach_id'}"/>
diff --git a/addons/hr_attendance/views/hr_attendance_view.xml b/addons/hr_attendance/views/hr_attendance_view.xml
index 1997f8e415d..4c7b33c0980 100644
--- a/addons/hr_attendance/views/hr_attendance_view.xml
+++ b/addons/hr_attendance/views/hr_attendance_view.xml
@@ -68,14 +68,15 @@
             <search string="Hr Attendance Search">
                 <field name="employee_id"/>
                 <field name="department_id"/>
+                <filter string="My Attendances" name="myattendances" domain="[('employee_id.user_id.id', '=', uid)]" />
+                <separator/>
                 <filter name="check_in_filter" string="Check In Date" date="check_in"/>
                 <filter string="No Check Out" name="nocheckout" domain="[('check_out', '=', False)]" />
-                <separator/>
-                <filter string="My Attendances" name="myattendances" domain="[('employee_id.user_id.id', '=', uid)]" />
                 <group expand="0" string="Group By">
                     <filter name="employee" string="Employee" context="{'group_by':'employee_id'}"/>
                     <separator/>
-                    <filter name="groupby_name" string="Date" context="{'group_by':'check_in'}"/>
+                    <filter name="groupby_name" string="Check In Date" context="{'group_by': 'check_in'}"/>
+                    <filter name="groupby_check_out" string="Check Out Date" context="{'group_by': 'check_out'}"/>
                 </group>
             </search>
         </field>
diff --git a/addons/hr_attendance/views/hr_employee_view.xml b/addons/hr_attendance/views/hr_employee_view.xml
index 1ae0d2a4943..0b0e80968bf 100644
--- a/addons/hr_attendance/views/hr_employee_view.xml
+++ b/addons/hr_attendance/views/hr_employee_view.xml
@@ -35,9 +35,10 @@
         <field name="model">hr.employee</field>
         <field name="inherit_id" ref="hr.view_employee_filter"/>
         <field name="arch" type="xml">
-            <xpath expr="//filter[@name='inactive']" position="after">
+            <xpath expr="//filter[@name='inactive']" position="before">
                 <filter string="Signed In" name="signed_in" domain="[('last_attendance_id.check_out', '=', False)]"/>
                 <filter string="Signed Out" name="signed_out" domain="['|', ('last_attendance_id', '=', False), ('last_attendance_id.check_out', '!=', False)]"/>
+                <separator/>
             </xpath>
         </field>
     </record>
diff --git a/addons/hr_contract/views/hr_contract_views.xml b/addons/hr_contract/views/hr_contract_views.xml
index fcf2e205acb..d39e29053e6 100644
--- a/addons/hr_contract/views/hr_contract_views.xml
+++ b/addons/hr_contract/views/hr_contract_views.xml
@@ -60,10 +60,10 @@
                     <separator />
                     <filter string="Current Employee" name="current_employee" domain="[('employee_id.active','=',True)]"/>
                     <separator/>
-                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
-                    <separator/>
                     <filter string="To Report to Social Secretariat" name="to_report" domain="[('reported_to_secretariat', '=', False)]"/>
                     <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+                    <separator/>
                     <filter string="Important Messages" name="message_needaction" domain="[('message_needaction','=',True)]"/>
                     <group expand="0" string="Group By">
                         <filter string="Employee" name="employee" domain="[]" context="{'group_by':'employee_id'}"/>
diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml
index da7834e2851..0e1b01a2937 100644
--- a/addons/hr_expense/views/hr_expense_views.xml
+++ b/addons/hr_expense/views/hr_expense_views.xml
@@ -195,14 +195,15 @@
                     <field name="employee_id"/>
                     <field name="product_id"/>
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                    <filter string="My Team Expenses" name="my_team_expenses" domain="[('employee_id.parent_id.user_id', '=', uid)]" groups="hr_expense.group_hr_expense_manager" help="Expenses of Your Team Member"/>
+                    <filter string="My Expenses" name="my_expenses" domain="[('employee_id.user_id', '=', uid)]"/>
                     <separator />
                     <filter domain="[('sheet_id', '=', False)]" string="To report" name="no_report"/>
                     <filter domain="[('sheet_id', '!=', False)]" string="Reported" name="submitted" help="Confirmed Expenses"/>
                     <filter domain="[('state', '=', 'refused')]" string="Refused" name="refused" help="Refused Expenses"/>
                     <filter domain="['|', ('state', '=', 'approved'), ('state', '=', 'done')]" string="Approved" name="approved" help="Actual expense sheets, not the refused ones"/>
                     <separator />
-                    <filter string="My Team Expenses" name="my_team_expenses" domain="[('employee_id.parent_id.user_id', '=', uid)]" groups="hr_expense.group_hr_expense_manager" help="Expenses of Your Team Member"/>
-                    <filter string="My Expenses" name="my_expenses" domain="[('employee_id.user_id', '=', uid)]"/>
+                    <filter domain="[('employee_id.active', '=', False)]" string="Former Employees" name="inactive" groups="hr_expense.group_hr_expense_user,hr_expense.group_hr_expense_manager"/>
                     <separator/>
                     <filter string="Late Activities" name="activities_overdue"
                         domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
@@ -221,8 +222,6 @@
                         <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 />
-                    <filter domain="[('employee_id.active', '=', False)]" string="Former Employees" name="inactive" groups="hr_expense.group_hr_expense_user,hr_expense.group_hr_expense_manager"/>
                 </search>
             </field>
         </record>
@@ -581,6 +580,8 @@
                     <field name="employee_id"/>
                     <field name="department_id" string="Department"/>
                     <field name="journal_id"/>
+                    <filter string="My Reports" name="my_reports" domain="[('employee_id.user_id', '=', uid)]"/>
+                    <filter string="My Team Reports" name="my_team_reports" domain="[('employee_id.parent_id.user_id', '=', uid)]" groups="hr_expense.group_hr_expense_manager" help="Expenses of Your Team Member"/>
                     <separator />
                     <filter domain="[('state', '=', 'draft')]" string="Draft" name="draft" help="Expenses in Draft"/>
                     <filter domain="[('state', '=', 'submit')]" string="To Approve" name="submitted" help="Confirmed Expenses"/>
@@ -588,8 +589,7 @@
                     <filter domain="['|', ('state', '=', 'approve'), ('state', '=', 'post')]" string="To Pay" name="approved" help="Expenses to Invoice"/>
                     <filter domain="[('state', '=', 'cancel')]" string="Refused" name="canceled"/>
                     <separator/>
-                    <filter string="My Reports" name="my_reports" domain="[('employee_id.user_id', '=', uid)]"/>
-                    <filter string="My Team Reports" name="my_team_reports" domain="[('employee_id.parent_id.user_id', '=', uid)]" groups="hr_expense.group_hr_expense_manager" help="Expenses of Your Team Member"/>
+                    <filter domain="[('employee_id.active', '=', False)]" string="Former Employees" name="inactive" groups="hr_expense.group_hr_expense_user,hr_expense.group_hr_expense_manager"/>
                     <separator/>
                     <filter string="Late Activities" name="activities_overdue"
                         domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
@@ -606,8 +606,6 @@
                         <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 />
-                    <filter domain="[('employee_id.active', '=', False)]" string="Former Employees" name="inactive" groups="hr_expense.group_hr_expense_user,hr_expense.group_hr_expense_manager"/>
                 </search>
             </field>
         </record>
diff --git a/addons/hr_recruitment/views/hr_recruitment_views.xml b/addons/hr_recruitment/views/hr_recruitment_views.xml
index c09e2954256..7d67916f040 100644
--- a/addons/hr_recruitment/views/hr_recruitment_views.xml
+++ b/addons/hr_recruitment/views/hr_recruitment_views.xml
@@ -881,7 +881,7 @@
         <field name="inherit_id" ref="hr.view_employee_filter"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='department_id']" position="after">
-                <filter name="newly_hired_employee" string="New Hired" domain="[('newly_hired_employee', '=', True)]" groups="hr_recruitment.group_hr_recruitment_user"/>
+                <filter name="newly_hired_employee" string="Newly Hired" domain="[('newly_hired_employee', '=', True)]" groups="hr_recruitment.group_hr_recruitment_user"/>
             </xpath>
         </field>
     </record>

From 3da13c2e1a826987b98a15ec28f03983f138177a Mon Sep 17 00:00:00 2001
From: Hiral Bhavsar <hbh@odoo.com>
Date: Wed, 19 Sep 2018 14:28:57 +0200
Subject: [PATCH 2/8] [IMP] maintenance: improve search filters order

This commit is related to task #1875881 and PR #26938 .
---
 addons/maintenance/views/maintenance_views.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/maintenance/views/maintenance_views.xml b/addons/maintenance/views/maintenance_views.xml
index ee4d53d2574..a07a8b7189a 100644
--- a/addons/maintenance/views/maintenance_views.xml
+++ b/addons/maintenance/views/maintenance_views.xml
@@ -14,6 +14,7 @@
                 <field name="owner_user_id"/>
                 <field name="stage_id"/>
                 <field name="maintenance_team_id"/>
+                <filter string="My Requests" name="my_requests" domain="[('user_id', '=', uid)]"/>
                 <separator/>
                 <filter string="To do" domain="[('stage_id.done', '=', False)]" name="todo"/>
                 <filter string="Blocked" name="kanban_state_block" domain="[('kanban_state', '=', 'blocked')]"/>
@@ -23,8 +24,6 @@
                 <separator/>
                 <filter string="Unscheduled Maintenance" domain="[('schedule_date', '=', False)]" name="unscheduled"/>
                 <separator/>
-                <filter string="My Requests" name="my_requests" domain="[('user_id', '=', uid)]"/>
-                <separator/>
                 <filter string="My Activities" name="activities_my"
                     domain="[('activity_ids.user_id', '=', uid)]"/>
                 <separator/>

From e5d3a1ac8289ca2cf37da3e8c2075466e7fee697 Mon Sep 17 00:00:00 2001
From: Hiral Bhavsar <hbh@odoo.com>
Date: Wed, 19 Sep 2018 14:29:45 +0200
Subject: [PATCH 3/8] [IMP] mass_mailing: reorder a bit menus by deleting
 unnecessary duplicate mailings menu entry

This commit is related to task #1875881 and PR #26938 .
---
 addons/mass_mailing/views/mass_mailing_views.xml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/addons/mass_mailing/views/mass_mailing_views.xml b/addons/mass_mailing/views/mass_mailing_views.xml
index 1b278a1e36b..b59cf820864 100644
--- a/addons/mass_mailing/views/mass_mailing_views.xml
+++ b/addons/mass_mailing/views/mass_mailing_views.xml
@@ -3,8 +3,6 @@
 
         <!-- Marketing / Mailing -->
         <menuitem name="Email Marketing" id="mass_mailing_menu_root" sequence="60" web_icon="mass_mailing,static/description/icon.png"/>
-        <menuitem name="Mailings" id="mass_mailing_menu"
-            parent="mass_mailing_menu_root" sequence="1" groups="mass_mailing.group_mass_mailing_user"/>
         <menuitem name="Mailing Lists" id="mass_mailing_mailing_list_menu"
             parent="mass_mailing_menu_root" sequence="2" groups="mass_mailing.group_mass_mailing_user"/>
         <!-- Marketing / Configuration -->
@@ -825,9 +823,8 @@
             </field>
         </record>
 
-        <menuitem name="Mailings" id="menu_email_mass_mailings"
-            parent="mass_mailing_menu" sequence="2"
-            action="action_view_mass_mailings"/>
+        <menuitem name="Mailings" id="mass_mailing_menu" parent="mass_mailing_menu_root"
+            sequence="1" action="action_view_mass_mailings" groups="mass_mailing.group_mass_mailing_user"/>
 
         <!--  MAILING CAMPAIGN STAGE !-->
         <record model="ir.ui.view" id="view_mail_mass_mailing_stage_search">

From ed8331051adaa833ef6fc2556e0d4075c3dce906 Mon Sep 17 00:00:00 2001
From: Hiral Bhavsar <hbh@odoo.com>
Date: Wed, 19 Sep 2018 14:30:31 +0200
Subject: [PATCH 4/8] [IMP] survey: improve search filters order and labelling

This commit is related to task #1875881 and PR #26938 .
---
 addons/survey/views/survey_views.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/survey/views/survey_views.xml b/addons/survey/views/survey_views.xml
index 1a3e4af5a56..70ad96da26b 100644
--- a/addons/survey/views/survey_views.xml
+++ b/addons/survey/views/survey_views.xml
@@ -12,9 +12,10 @@
                     <field name="email"/>
                     <field name="partner_id"/>
                     <filter name="completed" string="Completed" domain="[('state', '=', 'done')]"/>
-                    <filter string="Partially completed" name="partially_completed" domain="[('state', '=', 'skip')]"/>
+                    <filter string="Partially Completed" name="partially_completed" domain="[('state', '=', 'skip')]"/>
                     <filter string="New" name="new" domain="[('state', '=', 'new')]"/>
-                    <filter string="Test" name="test" domain="[('test_entry','=', True)]"/>
+                    <separator/>
+                    <filter string="Test Entries" name="test" domain="[('test_entry','=', True)]"/>
                     <group expand="0" string="Group By">
                         <filter name="group_by_survey" string="Survey" domain="[]" context="{'group_by': 'survey_id'}"/>
                         <filter string="Email" name="group_by_email" domain="[]" context="{'group_by': 'email'}"/>

From d6442e418bbce9f128d2b4ba98a4815bf97e5f9b Mon Sep 17 00:00:00 2001
From: Hiral Bhavsar <hbh@odoo.com>
Date: Wed, 19 Sep 2018 14:31:00 +0200
Subject: [PATCH 5/8] [IMP] base: reorder search filters on attachment model

This commit is related to task #1875881 and PR #26938 .
---
 odoo/addons/base/views/ir_attachment_views.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/odoo/addons/base/views/ir_attachment_views.xml b/odoo/addons/base/views/ir_attachment_views.xml
index 2cdfe812bd3..8077b18e335 100644
--- a/odoo/addons/base/views/ir_attachment_views.xml
+++ b/odoo/addons/base/views/ir_attachment_views.xml
@@ -66,13 +66,13 @@
                 <search string="Attachments">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('datas_fname','ilike',self)]" string="Attachment"/>
                     <field name="create_date"/>
-                    <filter name="url_filter" string="URL" domain="[('type','=','url')]"/>
-                    <filter name="binary_filter" string="Stored" domain="[('type','=','binary')]"/>
-                    <separator/>
                     <filter name="my_documents_filter"
                         string="My Document(s)"
                         domain="[('create_uid','=',uid)]"
                         help="Filter on my documents"/>
+                    <filter name="url_filter" string="URL" domain="[('type', '=', 'url')]"/>
+                    <filter name="binary_filter" string="Stored" domain="[('type', '=', 'binary')]"/>
+                    <separator/>
                     <field name="create_uid" string="Created by"/>
                     <field name="type"/>
                     <group expand="0" string="Group By">

From 96abf2ca907208d9f0e383c717ed7187b0b0da23 Mon Sep 17 00:00:00 2001
From: Hiral Bhavsar <hbh@odoo.com>
Date: Tue, 11 Sep 2018 15:59:53 +0530
Subject: [PATCH 6/8] [IMP] product, stock and dependencies: improve search
 filters labels and order

Specifications: improve menu and action names, search filters and groupby,
reorder filters, update some field labels.

This commit is related to task #1875881 and PR #26938 .
---
 addons/product_expiry/views/production_lot_views.xml   |  2 +-
 addons/stock/views/stock_inventory_views.xml           |  3 +++
 addons/stock/views/stock_move_line_views.xml           |  3 ++-
 addons/stock/views/stock_move_views.xml                | 10 +++++-----
 addons/stock/views/stock_picking_views.xml             |  7 +++++--
 addons/stock/views/stock_quant_views.xml               |  2 +-
 addons/stock/wizard/stock_quantity_history.xml         |  2 +-
 addons/stock_account/views/stock_account_views.xml     |  2 +-
 .../views/stock_picking_batch_views.xml                |  7 ++-----
 9 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/addons/product_expiry/views/production_lot_views.xml b/addons/product_expiry/views/production_lot_views.xml
index e13ec58bdb2..2df81528068 100644
--- a/addons/product_expiry/views/production_lot_views.xml
+++ b/addons/product_expiry/views/production_lot_views.xml
@@ -54,7 +54,7 @@
         <field name="inherit_id" ref="stock.search_product_lot_filter"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='product_id']" position="after">
-                <filter string="Expiration alerts" name="expiration_alerts" domain="[('alert_date', '&lt;=', time.strftime('%Y-%m-%d %H:%M:%S'))]"/>
+                <filter string="Expiration Alerts" name="expiration_alerts" domain="[('alert_date', '&lt;=', time.strftime('%Y-%m-%d %H:%M:%S'))]"/>
             </xpath>
         </field>
      </record>
diff --git a/addons/stock/views/stock_inventory_views.xml b/addons/stock/views/stock_inventory_views.xml
index e13fbbe9337..f6c60243c22 100644
--- a/addons/stock/views/stock_inventory_views.xml
+++ b/addons/stock/views/stock_inventory_views.xml
@@ -58,6 +58,9 @@
                 <field name="date"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <field name="product_id" string="Inventory Product" filter_domain="['|', ('product_id', 'ilike', self), ('line_ids.product_id','ilike',self)]"/>
+                <filter string="Draft" name="draft" domain="[('state', '=', 'draft')]"/>
+                <filter string="In Progress" name="confirm" domain="[('state', '=', 'confirm')]"/>
+                <filter string="Validated" name="done" domain="[('state', '=', 'done')]"/>
                 <group expand="0" string="Group By">
                     <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Inventories Date" name="inventories_month" domain="[]" context="{'group_by':'date'}" help="Physical Inventories by Date"/>
diff --git a/addons/stock/views/stock_move_line_views.xml b/addons/stock/views/stock_move_line_views.xml
index f979463f8af..d0adb2caf08 100644
--- a/addons/stock/views/stock_move_line_views.xml
+++ b/addons/stock/views/stock_move_line_views.xml
@@ -78,6 +78,7 @@
                 <separator/>
                 <group expand="0" string="Group By">
                     <filter string="Status" name="by_state" domain="[]"  context="{'group_by':'state'}"/>
+                    <filter string="Product" name="groupby_product_id" domain="[]" context="{'group_by': 'product_id'}"/>
                 </group>
             </search>
         </field>
@@ -118,7 +119,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,kanban,pivot,form</field>
             <field name="view_id" ref="view_move_line_tree"/>
-            <field name="context">{'search_default_done': 1}</field>
+            <field name="context">{'search_default_done': 1, 'search_default_groupby_product_id': 1}</field>
             <field name="help" type="html">
               <p class="o_view_nocontent_empty_folder">
                 There's no product move yet
diff --git a/addons/stock/views/stock_move_views.xml b/addons/stock/views/stock_move_views.xml
index 8a69a4aba1b..d9811745801 100644
--- a/addons/stock/views/stock_move_views.xml
+++ b/addons/stock/views/stock_move_views.xml
@@ -334,11 +334,11 @@
                     <group expand="0" string="Group By">
                         <filter string="Product" name="by_product" domain="[]"  context="{'group_by':'product_id'}"/>
                         <filter string="Picking" name="groupby_picking_id" domain="[]"  context="{'group_by':'picking_id'}"/>
-                        <filter string="Source" name="groupby_location_id" domain="[]" context="{'group_by':'location_id'}" groups="stock.group_stock_multi_locations"/>
-                        <filter string="Destination" name="groupby_dest_location_id" domain="[]" context="{'group_by':'location_dest_id'}" groups="stock.group_stock_multi_locations"/>
+                        <filter string="Source Location" name="groupby_location_id" domain="[]" context="{'group_by': 'location_id'}" groups="stock.group_stock_multi_locations"/>
+                        <filter string="Destination Location" name="groupby_dest_location_id" domain="[]" context="{'group_by': 'location_dest_id'}" groups="stock.group_stock_multi_locations"/>
                         <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Creation" name="groupby_create_date" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
-                        <filter string="Scheduled" name="groupby_date" domain="[]" context="{'group_by':'date_expected'}"/>
+                        <filter string="Creation Date" name="groupby_create_date" domain="[]" context="{'group_by': 'create_date'}" groups="base.group_no_one"/>
+                        <filter string="Scheduled Date" name="groupby_date" domain="[]" context="{'group_by': 'date_expected'}"/>
                     </group>
                 </search>
             </field>
@@ -359,7 +359,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_move_search"/>
-            <field name="context">{}</field>
+            <field name="context">{'search_default_done': 1, 'search_default_groupby_location_id': 1}</field>
             <field name="help" type="html">
               <p class="o_view_nocontent_smiling_face">
                 Create a new stock movement
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index 053a91ed570..454a9048bbd 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -9,6 +9,10 @@
                     <field name="sequence_id"/>
                     <field name="warehouse_id"/>
                     <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
+                    <group expand="0" string="Group By">
+                        <filter string="Type of Operation" name="groupby_code" domain="[]" context="{'group_by': 'code'}"/>
+                        <filter string="Warehouse" name="groupby_warehouse_id" domain="[]" context="{'group_by': 'warehouse_id'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -375,10 +379,9 @@
                     <group expand="0" string="Group By">
                         <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" name="order_date" domain="[]"  context="{'group_by':'date'}"/>
-                        <filter string="Expected Date" name="expected_date" domain="[]" context="{'group_by':'scheduled_date'}"/>
+                        <filter string="Scheduled Date" name="expected_date" domain="[]" context="{'group_by': 'scheduled_date'}"/>
                         <filter string="Origin" name="origin" domain="[]" context="{'group_by':'origin'}"/>
                         <filter name="picking_type" string="Operation Type" domain="[]" context="{'group_by':'picking_type_id'}"/>
-                        <filter string="Procurement Group" name="procurement_group" domain="[]" context="{'group_by':'group_id'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/stock/views/stock_quant_views.xml b/addons/stock/views/stock_quant_views.xml
index 08c44cae7bd..ee7933127ec 100644
--- a/addons/stock/views/stock_quant_views.xml
+++ b/addons/stock/views/stock_quant_views.xml
@@ -249,6 +249,6 @@
         </field>
     </record>
 
-    <menuitem id="menu_package" name="Packages" parent="menu_stock_inventory_control" action="action_package_view" groups="stock.group_tracking_lot" sequence="102"/>
+    <menuitem id="menu_package" name="Delivery Packages" parent="menu_stock_warehouse_mgmt" action="action_package_view" groups="stock.group_tracking_lot" sequence="102"/>
 
 </odoo>
diff --git a/addons/stock/wizard/stock_quantity_history.xml b/addons/stock/wizard/stock_quantity_history.xml
index 378fde286e7..c464bf7b42d 100644
--- a/addons/stock/wizard/stock_quantity_history.xml
+++ b/addons/stock/wizard/stock_quantity_history.xml
@@ -27,6 +27,6 @@
         <field name="target">new</field>
         <field name="context">{'default_compute_at_date': 0}</field>
     </record>
-    <menuitem id="menu_valuation" name="Inventory" parent="stock.menu_warehouse_report" sequence="100" action="action_stock_quantity_history"/>
+    <menuitem id="menu_valuation" name="Inventory Report" parent="stock.menu_warehouse_report" sequence="100" action="action_stock_quantity_history"/>
 </odoo>
 
diff --git a/addons/stock_account/views/stock_account_views.xml b/addons/stock_account/views/stock_account_views.xml
index 3cf112f2f55..b4c720d6f81 100644
--- a/addons/stock_account/views/stock_account_views.xml
+++ b/addons/stock_account/views/stock_account_views.xml
@@ -101,7 +101,7 @@
         </record>
 
         <record id="action_stock_inventory_valuation" model="ir.actions.act_window">
-            <field name="name">Valuation Report</field>
+            <field name="name">Inventory Valuation</field>
             <field name="res_model">stock.quantity.history</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
diff --git a/addons/stock_picking_batch/views/stock_picking_batch_views.xml b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
index 79d4bb30db7..b3f42b7c726 100644
--- a/addons/stock_picking_batch/views/stock_picking_batch_views.xml
+++ b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
@@ -89,10 +89,10 @@
         <field name="arch" type="xml">
             <search string="Search Batch Picking">
                 <field name="name" string="Batch Picking"/>
-                <filter name="in_progress" string="In Progress" domain="[('state','=', 'in_progress')]" help="Batch Pickings not finished"/>
+                <filter name="in_progress" string="Running" domain="[('state', '=', 'in_progress')]" help="Batch Pickings not finished"/>
                 <field name="user_id"/>
                 <group expand="0" string="Group By">
-                    <filter string="User" name="user" domain="[]" context="{'group_by':'user_id'}"/>
+                    <filter string="Responsible" name="user" domain="[]" context="{'group_by': 'user_id'}"/>
                     <filter string="State" name="state" domain="[]" context="{'group_by':'state'}"/>
                 </group>
            </search>
@@ -134,9 +134,6 @@
         <field name="model">stock.picking</field>
         <field name="inherit_id" ref="stock.view_picking_internal_search"/>
         <field name="arch" type="xml">
-            <xpath expr="//filter[@name='picking_type']" position="after">
-                <filter string="Batch" name="batch" domain="[]" context="{'group_by':'batch_id'}"/>
-            </xpath>
             <xpath expr="//field[@name='picking_type_id']" position="after">
                 <field name="batch_id"/>
             </xpath>

From 5b1ccb66092d0b5199ce7b5e81c2153909d09ad3 Mon Sep 17 00:00:00 2001
From: Hiral Bhavsar <hbh@odoo.com>
Date: Tue, 11 Sep 2018 17:32:41 +0530
Subject: [PATCH 7/8] [IMP] project, sale_timesheet: improve menus and filters

Specifications: improve menu organization, search filters and groupby, reorder
filters, update some field labels.

This commit is related to task #1875881 and PR #26938 .
---
 addons/project/views/project_views.xml        | 33 +++----------------
 ...ct_profitability_report_analysis_views.xml |  2 +-
 .../views/hr_timesheet_views.xml              |  4 +--
 3 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index 5a715d6387f..a04ab035d09 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -8,11 +8,6 @@
             web_icon="project,static/description/icon.png"
             sequence="50"/>
 
-        <menuitem name="Search"
-            id="menu_project_management"
-            parent="menu_main_pm"
-            sequence="2" groups="base.group_no_one,group_project_user"/>
-
         <menuitem id="menu_project_config" name="Configuration" parent="menu_main_pm"
             sequence="100" groups="project.group_project_manager"/>
 
@@ -197,8 +192,8 @@
                     <field name="user_id" string="Project Manager"/>
                     <field name="partner_id" string="Contact" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <group expand="0" string="Group By">
-                        <filter string="Manager" name="Manager" context="{'group_by':'user_id'}"/>
-                        <filter string="Contact" name="Partner" context="{'group_by':'partner_id'}"/>
+                        <filter string="Project Manager" name="Manager" context="{'group_by': 'user_id'}"/>
+                        <filter string="Customer" name="Partner" context="{'group_by': 'partner_id'}"/>
                     </group>
                 </search>
             </field>
@@ -696,22 +691,8 @@
             <field name="act_window_id" ref="action_view_task"/>
         </record>
 
-        <record id="project_task_action_activity" model="ir.actions.act_window">
-            <field name="name">My Next Activities</field>
-            <field name="res_model">project.task</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,kanban,calendar</field>
-            <field name="view_id" ref="project_task_view_tree_activity"/>
-            <field name="context">{'search_default_activities_my':1}</field>
-            <field name="domain">[('activity_date_deadline', '!=', False)]</field>
-            <field name="help" type="html">
-                <p class="o_view_nocontent_empty_folder">
-                    No scheduled activity at the moment
-                </p>
-            </field>
-        </record>
-
-        <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="5"/>
+        <menuitem name="All Tasks" id="menu_project_management" parent="menu_main_pm"
+            action="action_view_task" sequence="2" groups="base.group_no_one,group_project_user"/>
 
         <record id="project_task_action_from_partner" model="ir.actions.act_window">
             <field name="name">Tasks</field>
@@ -720,12 +701,6 @@
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
 
-        <menuitem id="project_task_menu_activity"
-            name="Next Activities"
-            parent="project.menu_project_management"
-            action="project_task_action_activity"
-            sequence="25"/>
-
         <record id="action_view_task_overpassed_draft" model="ir.actions.act_window">
             <field name="name">Overpassed Tasks</field>
             <field name="res_model">project.task</field>
diff --git a/addons/sale_timesheet/report/project_profitability_report_analysis_views.xml b/addons/sale_timesheet/report/project_profitability_report_analysis_views.xml
index 6f803ae126f..120a8707607 100644
--- a/addons/sale_timesheet/report/project_profitability_report_analysis_views.xml
+++ b/addons/sale_timesheet/report/project_profitability_report_analysis_views.xml
@@ -64,7 +64,7 @@
     </record>
 
     <menuitem id="menu_project_profitability_analysis"
-        parent="hr_timesheet.menu_timesheets_reports"
+        parent="project.menu_project_report"
         action="project_profitability_report_action"
         name="Project Costs and Revenues"
         sequence="50"/>
diff --git a/addons/sale_timesheet/views/hr_timesheet_views.xml b/addons/sale_timesheet/views/hr_timesheet_views.xml
index 8eb17ad9d15..a561a6e35fa 100644
--- a/addons/sale_timesheet/views/hr_timesheet_views.xml
+++ b/addons/sale_timesheet/views/hr_timesheet_views.xml
@@ -6,13 +6,13 @@
             <field name="model">account.analytic.line</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
             <field name="arch" type="xml">
-                <xpath expr="//filter[@name='month']" position="after">
+                <xpath expr="//filter[@name='month']" position="before">
                     <field name="timesheet_invoice_type"/>
                     <field name="timesheet_invoice_id"/>
-                    <separator/>
                     <filter name="billable_time" string="Billable Hours" domain="[('timesheet_invoice_type', '=', 'billable_time')]"/>
                     <filter name="billable_fixed" string="Fixed Price Projects" domain="[('timesheet_invoice_type', '=', 'billable_fixed')]"/>
                     <filter name="non_billable" string="Non Billable Hours" domain="[('timesheet_invoice_type', '=', 'non_billable')]"/>
+                    <separator/>
                 </xpath>
             </field>
     </record>

From b091a11c03f48b5de6f2419b6c9d44909c704d0c Mon Sep 17 00:00:00 2001
From: Hiral Bhavsar <hbh@odoo.com>
Date: Wed, 12 Sep 2018 14:46:35 +0530
Subject: [PATCH 8/8] [IMP] event, website_event_track: improve filters and
 views

Specifications: improve menu organization, search filters and groupby, reorder
filters, update some field labels.

Add search view for event type and make tree views for locations, sponsor
types and track tags editable bottom.

This commit is related to task #1878516 and PR #2649 .
---
 addons/event/views/event_views.xml              | 17 ++++++++++++++---
 .../views/event_track_views.xml                 |  6 +++---
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml
index 1977634b90a..010f9f65d26 100644
--- a/addons/event/views/event_views.xml
+++ b/addons/event/views/event_views.xml
@@ -140,6 +140,17 @@
             </field>
         </record>
 
+        <record id="event_type_view_search" model="ir.ui.view">
+            <field name="name">event.type.search</field>
+            <field name="model">event.type</field>
+            <field name="arch" type="xml">
+                <search string="Event Categories">
+                    <field name="name"/>
+                    <filter string="Online Event" name="online_event" help="Online Event" domain="[('is_online', '=', True)]"/>
+                </search>
+            </field>
+        </record>
+
         <record model="ir.actions.act_window" id="action_event_type">
             <field name="name">Event Categories</field>
             <field name="res_model">event.type</field>
@@ -366,15 +377,15 @@
             <field name="arch" type="xml">
                 <search string="Events">
                     <field name="name" string="Events"/>
+                    <filter string="My Events" name="myevents" help="My Events" domain="[('user_id', '=', uid)]"/>
                     <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction','=',True)]"/>
                     <separator/>
-                    <filter string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
                     <filter name="confirm" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
-                    <separator/>
-                    <filter string="My Events" name="myevents" help="My Events" domain="[('user_id','=',uid)]"/>
+                    <filter string="Unconfirmed" name="draft" domain="[('state', '=', 'draft')]" help="Events in New state"/>
                     <separator/>
                     <filter string="Upcoming/Running" name="upcoming"
                         domain="['&amp;', ('state', '!=', 'cancel'), ('date_end','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0)))]" help="Upcoming events from today" />
+                    <filter string="Online Events" name="online_events" help="Online Events" domain="[('is_online', '=', True)]"/>
                     <field name="event_type_id"/>
                     <field name="user_id"/>
                     <separator/>
diff --git a/addons/website_event_track/views/event_track_views.xml b/addons/website_event_track/views/event_track_views.xml
index d0ce53a11e8..5e22b4af8f3 100644
--- a/addons/website_event_track/views/event_track_views.xml
+++ b/addons/website_event_track/views/event_track_views.xml
@@ -238,7 +238,7 @@
             <field name="name">Event Location</field>
             <field name="model">event.track.location</field>
             <field name="arch" type="xml">
-                <tree string="Event Location">
+                <tree string="Event Location" editable="bottom">
                     <field name="name"/>
                 </tree>
             </field>
@@ -275,7 +275,7 @@
             <field name="name">Sponsor Types</field>
             <field name="model">event.sponsor.type</field>
             <field name="arch" type="xml">
-                <tree string="Event Sponsor Type">
+                <tree string="Event Sponsor Type" editable="bottom">
                     <field name="sequence"/>
                     <field name="name"/>
                 </tree>
@@ -343,7 +343,7 @@
             <field name="name">Tracks Tag</field>
             <field name="model">event.track.tag</field>
             <field name="arch" type="xml">
-                <tree string="Event Track Tag">
+                <tree string="Event Track Tag" editable="bottom">
                     <field name="name"/>
                 </tree>
             </field>