From 668193fd78c60234b6af4c9f6d4213d19da18c4b Mon Sep 17 00:00:00 2001
From: Prakash Prajapati <ppr@odoo.com>
Date: Wed, 5 Jun 2019 10:29:26 +0000
Subject: [PATCH 01/10] [IMP] project, hr_timesheet: set optional field to
 simplify the tree view

Purpose of the commit is to set the new attribute OPTIONAL = SHOW/Hide on tree
view so the user can easily hide/show the optional fields on the tree view.

task-1997453
Closes: #33888
---
 addons/hr_timesheet/views/project_views.xml |  8 +++-----
 addons/project/views/project_views.xml      | 12 +++++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/hr_timesheet/views/project_views.xml b/addons/hr_timesheet/views/project_views.xml
index d9a205f8c4e..b34d5b6e037 100644
--- a/addons/hr_timesheet/views/project_views.xml
+++ b/addons/hr_timesheet/views/project_views.xml
@@ -148,13 +148,11 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <field name="user_id" position="after">
-                    <field name="planned_hours" widget="float_time" sum="Initially Planned Hours" />
-                    <field name="remaining_hours" widget="float_time" sum="Remaining Hours" readonly="1"/>
+                    <field name="planned_hours" widget="float_time" sum="Initially Planned Hours" optional="show"/>
+                    <field name="remaining_hours" widget="float_time" sum="Remaining Hours" readonly="1" optional="show"/>
+                    <field name="progress" widget="progressbar" optional="show"/>
                     <field name="effective_hours" widget="float_time" sum="Spent Hours" invisible="1"/>
                 </field>
-                <field name="stage_id" position="after">
-                    <field name="progress" widget="progressbar"/>
-                </field>
             </field>
         </record>
 
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index 725cffbbb71..f9d2d7e2529 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -631,11 +631,13 @@
                     <field name="message_needaction" invisible="1"/>
                     <field name="sequence" invisible="not context.get('seq_visible', False)"/>
                     <field name="name"/>
-                    <field name="project_id" invisible="context.get('user_invisible', False)"/>
-                    <field name="user_id" invisible="context.get('user_invisible', False)"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
-                    <field name="stage_id" invisible="context.get('set_visible',False)"/>
+                    <field name="project_id" invisible="context.get('user_invisible', False)" optional="show"/>
+                    <field name="user_id" invisible="context.get('user_invisible', False)" optional="show"/>
+                    <field name="date_deadline" optional="hide"/>
+                    <field name="partner_id" optional="hide"/>
+                    <field name="tag_ids" optional="hide" widget="many2many_tags"/>
+                    <field name="stage_id" invisible="context.get('set_visible',False)" optional="show"/>
+                    <field name="company_id" groups="base.group_multi_company" optional="show"/>
                 </tree>
             </field>
         </record>

From 67ad4632a1910198b42c212799a2b8cce54148f1 Mon Sep 17 00:00:00 2001
From: Prakash Prajapati <ppr@odoo.com>
Date: Wed, 5 Jun 2019 10:31:22 +0000
Subject: [PATCH 02/10] [IMP] mrp: set optional field to simplify the tree view

Purpose of the commit is to set the new attribute OPTIONAL = SHOW/Hide on tree
view so the user can easily hide/show the optional fields on the tree view.

Update string date_start_wo field from mrp.production model.

task-1997453
Closes: #33888
---
 addons/mrp/models/mrp_production.py       |  2 +-
 addons/mrp/views/mrp_bom_views.xml        | 13 +++++++------
 addons/mrp/views/mrp_production_views.xml | 21 ++++++++++++---------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/addons/mrp/models/mrp_production.py b/addons/mrp/models/mrp_production.py
index 5131ad30b2d..930ce953948 100644
--- a/addons/mrp/models/mrp_production.py
+++ b/addons/mrp/models/mrp_production.py
@@ -106,7 +106,7 @@ class MrpProduction(models.Model):
     date_start = fields.Datetime('Start Date', copy=False, index=True, readonly=True)
     date_finished = fields.Datetime('End Date', copy=False, index=True, readonly=True)
     date_start_wo = fields.Datetime(
-        'Planning Start Date', copy=False, readonly=True,
+        'Planned Start Date', copy=False, readonly=True,
         states={'draft': [('readonly', False)], 'confirmed': [('readonly', False)]},
         help="The work orders will be planned based on the availability of the work centers starting from "
         "this date. If emtpy, the work orders are planned as soon as possible.")
diff --git a/addons/mrp/views/mrp_bom_views.xml b/addons/mrp/views/mrp_bom_views.xml
index ef1d696ab5c..6a66e7f82e6 100644
--- a/addons/mrp/views/mrp_bom_views.xml
+++ b/addons/mrp/views/mrp_bom_views.xml
@@ -114,12 +114,13 @@
                     <field name="active" invisible="1"/>
                     <field name="sequence" invisible="1"/>
                     <field name="product_tmpl_id"/>
-                    <field name="code"/>
-                    <field name="product_id" groups="product.group_product_variant"/>
-                    <field name="product_qty"/>
-                    <field name="product_uom_id" groups="uom.group_uom"/>
-                    <field name="routing_id" groups="mrp.group_mrp_routings"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="code" optional="show"/>
+                    <field name="product_id" groups="product.group_product_variant" optional="show"/>
+                    <field name="product_qty" optional="show"/>
+                    <field name="product_uom_id" groups="uom.group_uom" optional="show" string="Unit of Measure"/>
+                    <field name="type" optional="hide"/>
+                    <field name="company_id" groups="base.group_multi_company" optional="show"/>
+                    <field name="routing_id" groups="mrp.group_mrp_routings" optional="show"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml
index 507aa9ab1e1..2324f76389d 100644
--- a/addons/mrp/views/mrp_production_views.xml
+++ b/addons/mrp/views/mrp_production_views.xml
@@ -9,15 +9,18 @@
                 <tree decoration-bf="message_needaction==True" default_order="date_planned_start desc" decoration-info="state=='confirmed'" decoration-danger="date_planned_start&lt;current_date and state not in ('done','cancel')" decoration-muted="state in ('done','cancel')" string="Manufacturing Orders">
                     <field name="message_needaction" invisible="1"/>
                     <field name="name"/>
-                    <field name="date_planned_start"/>
-                    <field name="product_id"/>
-                    <field name="origin"/>
-                    <field name="product_qty" sum="Total Qty" string="Quantity"/>
-                    <field name="product_uom_id" string="Unit of Measure" options="{'no_open':True,'no_create':True}" groups="uom.group_uom"/>
-                    <field name="routing_id" groups="mrp.group_mrp_routings"/>
-                    <field name="state"/>
-                    <field name="reservation_state"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="date_start_wo" optional="hide"/>
+                    <field name="date_planned_start" optional="show"/>
+                    <field name="product_id" optional="show"/>
+                    <field name="product_qty" sum="Total Qty" string="Quantity" optional="show"/>
+                    <field name="product_uom_id" string="Unit of Measure" options="{'no_open':True,'no_create':True}" groups="uom.group_uom" optional="show"/>
+                    <field name="bom_id" optional="hide"/>
+                    <field name="origin" optional="show"/>
+                    <field name="user_id" optional="hide"/>
+                    <field name="routing_id" groups="mrp.group_mrp_routings" optional="show"/>
+                    <field name="state" optional="show"/>
+                    <field name="reservation_state" optional="show"/>
+                    <field name="company_id" groups="base.group_multi_company" optional="show"/>
                 </tree>
             </field>
         </record>

From d5ffe890587d73c5079ee71087a08344e82b643b Mon Sep 17 00:00:00 2001
From: Prakash Prajapati <ppr@odoo.com>
Date: Wed, 5 Jun 2019 10:39:04 +0000
Subject: [PATCH 03/10] [IMP] repair: set optional field to simplify the tree
 view

Purpose of the commit is to set the new attribute OPTIONAL = SHOW/Hide on tree
view so the user can easily hide/show the optional fields on the tree view.

task-1997453
Closes: #33888
---
 addons/repair/views/repair_views.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/addons/repair/views/repair_views.xml b/addons/repair/views/repair_views.xml
index abbf31fefc4..cecd336973a 100644
--- a/addons/repair/views/repair_views.xml
+++ b/addons/repair/views/repair_views.xml
@@ -8,12 +8,15 @@
         <field name="arch" type="xml">
             <tree string="Repairs order" decoration-muted="state in ('done','cancel')" decoration-info="state=='draft'">
                 <field name="name" />
-                <field name="product_id" />
-                <field name="partner_id"/>
-                <field name="address_id"/>
-                <field name="company_id" groups="base.group_multi_company"/>
-                <field name="guarantee_limit"/>
-                <field name="state"/>
+                <field name="product_id" optional="show"/>
+                <field name="product_qty" optional="hide" string="Quantity"/>
+                <field name="product_uom" optional="hide" string="Unit of Measure"/>
+                <field name="partner_id" optional="show"/>
+                <field name="address_id" optional="show"/>
+                <field name="guarantee_limit" optional="show"/>
+                <field name="location_id" optional="hide"/>
+                <field name="company_id" groups="base.group_multi_company" optional="show"/>
+                <field name="state" optional="show"/>
             </tree>
         </field>
     </record>

From 5f6c698a75fff9a5d35df3e8591d1387a0ac0193 Mon Sep 17 00:00:00 2001
From: Prakash Prajapati <ppr@odoo.com>
Date: Wed, 5 Jun 2019 09:56:23 +0000
Subject: [PATCH 04/10] [IMP] base: set optional field to simplify the tree
 view

Purpose of the commit is to set the new attribute OPTIONAL = SHOW/Hide on tree
view so the user can easily hide/show the optional fields on the tree view.

task-1997453
Closes: #33888
---
 odoo/addons/base/views/res_partner_views.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/odoo/addons/base/views/res_partner_views.xml b/odoo/addons/base/views/res_partner_views.xml
index 5a93c801e9d..c6b748463fb 100644
--- a/odoo/addons/base/views/res_partner_views.xml
+++ b/odoo/addons/base/views/res_partner_views.xml
@@ -46,12 +46,14 @@
                 <tree string="Contacts">
                     <field name="display_name" string="Name"/>
                     <field name="function" invisible="1"/>
-                    <field name="phone"/>
-                    <field name="email"/>
+                    <field name="phone" optional="show"/>
+                    <field name="email" optional="show"/>
                     <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="city" optional="hide"/>
+                    <field name="state_id" optional="hide"/>
+                    <field name="country_id" optional="hide"/>
                     <field name="user_id" invisible="1"/>
                     <field name="is_company" invisible="1"/>
-                    <field name="country_id" invisible="1"/>
                     <field name="parent_id" invisible="1"/>
                     <field name="active" invisible="1"/>
                 </tree>

From fd5e297707d6c42de620cc7064e7d8961d87dfc3 Mon Sep 17 00:00:00 2001
From: Prakash Prajapati <ppr@odoo.com>
Date: Wed, 5 Jun 2019 10:09:23 +0000
Subject: [PATCH 05/10] [IMP] product: set optional field to simplify the tree
 view

Purpose of the commit is to set the new attribute OPTIONAL = SHOW/Hide on tree
view so the user can easily hide/show the optional fields on the tree view.

task-1997453
Closes: #33888
---
 addons/product/views/product_template_views.xml | 13 +++++++------
 addons/product/views/product_views.xml          | 14 ++++++++------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/addons/product/views/product_template_views.xml b/addons/product/views/product_template_views.xml
index ea7ce47ee30..1aadcfbd5d0 100644
--- a/addons/product/views/product_template_views.xml
+++ b/addons/product/views/product_template_views.xml
@@ -6,13 +6,14 @@
         <field name="arch" type="xml">
             <tree string="Product">
                 <field name="sequence" widget="handle"/>
-                <field name="default_code"/>
+                <field name="default_code" optional="show"/>
+                <field name="barcode" optional="hide"/>
                 <field name="name"/>
-                <field name="list_price" string="Sales Price"/>
-                <field name="standard_price"/>
-                <field name="categ_id"/>
-                <field name="type"/>
-                <field name="uom_id" options="{'no_open': True, 'no_create': True}" groups="uom.group_uom"/>
+                <field name="list_price" string="Sales Price" optional="show"/>
+                <field name="standard_price" optional="show"/>
+                <field name="categ_id" optional="hide"/>
+                <field name="type" optional="hide"/>
+                <field name="uom_id" options="{'no_open': True, 'no_create': True}" groups="uom.group_uom" optional="show"/>
                 <field name="active" invisible="1"/>
             </tree>
         </field>
diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml
index bfc4e29995a..fe533e325bf 100644
--- a/addons/product/views/product_views.xml
+++ b/addons/product/views/product_views.xml
@@ -347,15 +347,17 @@
             <field eval="7" name="priority"/>
             <field name="arch" type="xml">
                 <tree string="Product Variants">
-                    <field name="default_code"/>
+                    <field name="default_code" optional="show"/>
+                    <field name="barcode" optional="hide"/>
                     <field name="name"/>
                     <field name="attribute_value_ids" widget="many2many_tags" groups="product.group_product_variant"/>
-                    <field name="lst_price"/>
-                    <field name="standard_price"/>
-                    <field name="type" invisible="1"/>
+                    <field name="company_id" groups="base.group_multi_company" optional="hide"/>
+                    <field name="lst_price" optional="show" string="Sales Price"/>
+                    <field name="standard_price" optional="show"/>
+                    <field name="categ_id" optional="hide"/>
+                    <field name="type" optional="hide"/>
                     <field name="price" invisible="not context.get('pricelist',False)"/>
-                    <field name="uom_id" options="{'no_open': True, 'no_create': True}" groups="uom.group_uom"/>
-                    <field name="barcode"/>
+                    <field name="uom_id" options="{'no_open': True, 'no_create': True}" groups="uom.group_uom" optional="show"/>
                     <field name="product_tmpl_id" invisible="1"/>
                     <field name="active" invisible="1"/>
                 </tree>

From e0389c0f1525da7c2933247f5dd88040c081a666 Mon Sep 17 00:00:00 2001
From: Prakash Prajapati <ppr@odoo.com>
Date: Wed, 5 Jun 2019 10:36:13 +0000
Subject: [PATCH 06/10] [IMP] purchase(_requisition): set optional field to
 simplify the tree view

Purpose of the commit is to set the new attribute OPTIONAL = SHOW/Hide on tree
view so the user can easily hide/show the optional fields on the tree view.

task-1997453
Closes #33888
---
 addons/purchase/views/purchase_views.xml      | 22 ++++++++++---------
 .../views/purchase_requisition_views.xml      | 13 ++++++-----
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml
index 3c5cc0860ae..4db8dab2043 100644
--- a/addons/purchase/views/purchase_views.xml
+++ b/addons/purchase/views/purchase_views.xml
@@ -375,6 +375,7 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                     <field name="name" string="Reference"/>
+                    <field name="partner_ref" optional="hide"/>
                     <field name="partner_id" operator="child_of"/>
                     <field name="product_id"/>
                     <field name="create_uid"/>
@@ -454,19 +455,20 @@
             <field name="arch" type="xml">
                 <tree decoration-bf="message_unread==True" decoration-muted="state=='cancel'" decoration-info="state in ('wait','confirmed')" string="Purchase Order">
                     <field name="message_unread" invisible="1"/>
+                    <field name="partner_ref" optional="hide"/>
                     <field name="name" string="Reference"/>
-                    <field name="date_order" invisible="not context.get('quotation_only', False)"/>
-                    <field name="date_approve" invisible="context.get('quotation_only', False)"/>
+                    <field name="date_order" invisible="not context.get('quotation_only', False)" optional="show"/>
+                    <field name="date_approve" invisible="context.get('quotation_only', False)" optional="show"/>
                     <field name="partner_id"/>
-                    <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
-                    <field name="date_planned" invisible="context.get('quotation_only', False)"/>
-                    <field name="user_id"/>
-                    <field name="origin"/>
-                    <field name="amount_untaxed" sum="Total Untaxed amount" string="Untaxed" widget="monetary"/>
-                    <field name="amount_total" sum="Total amount" widget="monetary"/>
+                    <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}" optional="show"/>
+                    <field name="date_planned" invisible="context.get('quotation_only', False)" optional="show"/>
+                    <field name="user_id" optional="show"/>
+                    <field name="origin" optional="show"/>
+                    <field name="amount_untaxed" sum="Total Untaxed amount" string="Untaxed" widget="monetary" optional="hide"/>
+                    <field name="amount_total" sum="Total amount" widget="monetary" optional="show"/>
                     <field name="currency_id" invisible="1"/>
-                    <field name="state"/>
-                    <field name="invoice_status" invisible="1"/>
+                    <field name="state" optional="show"/>
+                    <field name="invoice_status" attrs="{'column_invisible': [('parent.state', 'not in', ('purchase', 'done'))]}"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/purchase_requisition/views/purchase_requisition_views.xml b/addons/purchase_requisition/views/purchase_requisition_views.xml
index 06a9b5ea5e1..0308949a4bb 100644
--- a/addons/purchase_requisition/views/purchase_requisition_views.xml
+++ b/addons/purchase_requisition/views/purchase_requisition_views.xml
@@ -206,12 +206,13 @@
             <tree decoration-bf="message_needaction==True" decoration-muted="state == 'cancel'" decoration-danger="date_end and date_end&lt;current_date" string="Purchase Agreements">
                 <field name="message_needaction" invisible="1"/>
                 <field name="name"/>
-                <field name="user_id"/>
-                <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
-                <field name="ordering_date"/>
-                <field name="date_end"/>
-                <field name="origin"/>
-                <field name="state"/>
+                <field name="user_id" optional="show"/>
+                <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}" optional="show"/>
+                <field name="ordering_date" optional="show"/>
+                <field name="schedule_date" optional="hide"/>
+                <field name="date_end" optional="show"/>
+                <field name="origin" optional="show"/>
+                <field name="state" optional="show"/>
             </tree>
       </field>
     </record>

From cb9e69ce1a2781e003e23c3500bae5a4a1dedae0 Mon Sep 17 00:00:00 2001
From: Prakash Prajapati <ppr@odoo.com>
Date: Wed, 5 Jun 2019 09:57:59 +0000
Subject: [PATCH 07/10] [IMP] crm(_*):  set optional field to simplify the tree
 view

* = website_crm_partner_assign

Purpose of the commit is to set the new attribute OPTIONAL = SHOW/Hide on tree
view so the user can easily hide/show the optional fields on the tree view.

task-1997453
Closes: #33888
---
 addons/crm/views/crm_lead_views.xml           | 50 +++++++++++--------
 .../views/crm_lead_views.xml                  |  6 +--
 .../views/res_partner_views.xml               |  6 +--
 3 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index db526541ae7..6734bdc4bf6 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -184,22 +184,27 @@
             <field name="arch" type="xml">
                 <tree string="Leads" decoration-bf="message_needaction==True" decoration-muted="probability == 100">
                     <field name="date_deadline" invisible="1"/>
-                    <field name="create_date"/>
+                    <field name="create_date" optional="show"/>
                     <field name="name" string="Lead"/>
-                    <field name="contact_name"/>
-                    <field name="city"/>
-                    <field name="country_id"/>
-                    <field name="email_from"/>
-                    <field name="phone"/>
-                    <field name="user_id" invisible="1"/>
+                    <field name="contact_name" optional="show"/>
+                    <field name="partner_name" optional="hide"/>
+                    <field name="email_from" optional="show"/>
+                    <field name="phone" optional="show"/>
+                    <field name="city" optional="show"/>
+                    <field name="state_id" optional="hide"/>
+                    <field name="country_id" optional="show"/>
                     <field name="partner_id" invisible="1"/>
-                    <field name="team_id"/>
+                    <field name="team_id" optional="show"/>
+                    <field name="user_id" optional="show" string="Sales Person"/>
+                    <field name="company_id" groups="base.group_multi_company" optional="show"/>
                     <field name="active" invisible="1"/>
                     <field name="probability" invisible="1"/>
                     <field name="campaign_id" invisible="1"/>
                     <field name="referred" invisible="1"/>
                     <field name="medium_id" invisible="1"/>
                     <field name="message_needaction" invisible="1"/>
+                    <field name="tag_ids" optional="show" widget="many2many_tags"/>
+                    <field name="priority" optional="hide"/>
                 </tree>
             </field>
         </record>
@@ -686,26 +691,31 @@
             <field name="arch" type="xml">
                 <tree string="Opportunities" decoration-bf="message_needaction==True" decoration-muted="probability == 100" decoration-danger="activity_date_deadline and (activity_date_deadline &lt; current_date)">
                     <field name="date_deadline" invisible="1"/>
-                    <field name="create_date"/>
+                    <field name="create_date" optional="show"/>
                     <field name="name" string="Opportunity"/>
-                    <field name="partner_id" string="Customer"/>
-                    <field name="country_id"/>
-                    <field name="activity_date_deadline"/>
-                    <field name="activity_summary"/>
+                    <field name="partner_id" string="Customer" optional="show"/>
+                    <field name="email_from" optional="hide"/>
+                    <field name="phone" optional="hide"/>
+                    <field name="city" optional="hide"/>
+                    <field name="state_id" optional="hide"/>
+                    <field name="country_id" optional="show"/>
+                    <field name="activity_date_deadline" optional="show"/>
+                    <field name="activity_summary" optional="show"/>
                     <field name="medium_id" invisible="1"/>
                     <field name="campaign_id" invisible="1"/>
                     <field name="source_id" invisible="1"/>
-                    <field name="stage_id"/>
-                    <field name="planned_revenue" sum="Expected Revenues"/>
-                    <field name="probability" avg="Avg. of Probability"/>
-                    <field name="team_id"/>
-                    <field name="user_id"/>
+                    <field name="stage_id" optional="show"/>
+                    <field name="planned_revenue" sum="Expected Revenues" optional="show"/>
+                    <field name="probability" avg="Avg. of Probability" optional="show"/>
+                    <field name="user_id" optional="hide"/>
+                    <field name="team_id" optional="show"/>
                     <field name="referred" invisible="1"/>
-                    <field name="priority" invisible="1"/>
                     <field name="message_needaction" invisible="1"/>
                     <field name="probability" invisible="1"/>
                     <field name="write_date" invisible="1"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company" optional="show" />
+                    <field name="tag_ids" optional="hide" widget="many2many_tags"/>
+                    <field name="priority" optional="hide"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/website_crm_partner_assign/views/crm_lead_views.xml b/addons/website_crm_partner_assign/views/crm_lead_views.xml
index 8d07457cfa8..846c5a94bff 100644
--- a/addons/website_crm_partner_assign/views/crm_lead_views.xml
+++ b/addons/website_crm_partner_assign/views/crm_lead_views.xml
@@ -37,8 +37,8 @@
             <field name="model">crm.lead</field>
             <field name="inherit_id" ref="crm.crm_case_tree_view_oppor"/>
             <field name="arch" type="xml">
-                <field name="partner_id" position="after">
-                    <field name="partner_assigned_id"/>
+                <field name="user_id" position="before">
+                    <field name="partner_assigned_id" optional="show"/>
                     <field name="date_assign" invisible="1"/>
                  </field>
             </field>
@@ -99,7 +99,7 @@
             <field name="inherit_id" ref="crm.crm_case_tree_view_leads"/>
             <field name="arch" type="xml">
                 <field name="partner_id" position="after">
-                    <field name="partner_assigned_id"/>
+                    <field name="partner_assigned_id" optional="show"/>
                 </field>
             </field>
         </record>
diff --git a/addons/website_crm_partner_assign/views/res_partner_views.xml b/addons/website_crm_partner_assign/views/res_partner_views.xml
index fc5dcbce76d..dba9d112162 100644
--- a/addons/website_crm_partner_assign/views/res_partner_views.xml
+++ b/addons/website_crm_partner_assign/views/res_partner_views.xml
@@ -93,9 +93,9 @@
         <field name="inherit_id" ref="base.view_partner_tree"/>
         <field name="arch" type="xml">
             <field name="user_id" position="after">
-                <field name="date_review_next"/>
-                <field name="grade_id"/>
-                <field name="activation"/>
+                <field name="date_review_next" optional="hide"/>
+                <field name="grade_id" optional="hide"/>
+                <field name="activation" optional="hide"/>
             </field>
         </field>
     </record>

From 317802d69e6236a43b2249b38d2f352813644f20 Mon Sep 17 00:00:00 2001
From: Prakash Prajapati <ppr@odoo.com>
Date: Wed, 5 Jun 2019 10:25:54 +0000
Subject: [PATCH 08/10] [IMP] analytic, account: set optional field to simplify
 the tree view

Purpose of the commit is to set the new attribute OPTIONAL = SHOW/Hide on tree
view so the user can easily hide/show the optional fields on the tree view.

task-1997453
Closes: #33888
---
 .../account/views/account_analytic_view.xml   |  7 ++-
 addons/account/views/account_move_views.xml   | 49 ++++++++++---------
 .../analytic/views/analytic_account_views.xml | 11 +++--
 addons/membership/views/partner_views.xml     |  4 +-
 addons/sale/views/sale_views.xml              | 11 +++++
 5 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/addons/account/views/account_analytic_view.xml b/addons/account/views/account_analytic_view.xml
index 7f8164329b7..3c13b0be4d7 100644
--- a/addons/account/views/account_analytic_view.xml
+++ b/addons/account/views/account_analytic_view.xml
@@ -30,8 +30,11 @@
             <field name="inherit_id" ref="analytic.view_account_analytic_line_tree"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//field[@name='date']" position="after">
-                        <field name="ref" invisible="context.get('to_invoice', False)"/>
+                    <xpath expr="//field[@name='account_id']" position="after">
+                        <field name="ref" invisible="context.get('to_invoice', False)" optional="hide"/>
+                        <field name="general_account_id" optional="hide"/>
+                        <field name="move_id" optional="hide"/>
+                        <field name="product_id" optional="hide"/>
                     </xpath>
                 </data>
             </field>
diff --git a/addons/account/views/account_move_views.xml b/addons/account/views/account_move_views.xml
index 83f79b1b292..0ea26ac6708 100644
--- a/addons/account/views/account_move_views.xml
+++ b/addons/account/views/account_move_views.xml
@@ -131,24 +131,24 @@
             <field eval="100" name="priority"/>
             <field name="arch" type="xml">
                 <tree string="Journal Items" create="false" editable="bottom">
-                    <field name="date"/>
+                    <field name="date" optional="show"/>
                     <field name="journal_id" options='{"no_open":True}'/>
                     <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
-                    <field name="name"/>
-                    <field name="ref"/>
+                    <field name="name" optional="show"/>
+                    <field name="ref" optional="show"/>
                     <field name="statement_id" invisible="1"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" optional="show"/>
                     <field name="account_id" options="{'no_open': True, 'no_create': True}" domain="[('company_id', '=', company_id)]" groups="account.group_account_user" attrs="{'readonly':[('parent_state','=','posted')]}"/>
-                    <field name="analytic_account_id" groups="account.group_account_user"/>
+                    <field name="analytic_account_id" groups="account.group_account_user" optional="show"/>
                     <field name="analytic_tag_ids" widget="many2many_tags" groups="analytic.group_analytic_tags"/>
                     <field name="reconciled" invisible="1"/>
-                    <field name="full_reconcile_id"/>
+                    <field name="full_reconcile_id" optional="show"/>
                     <field name="reconcile_model_id" invisible="1"/>
                     <field name="debit" sum="Total Debit"/>
                     <field name="credit" sum="Total Credit"/>
                     <field name="amount_currency" readonly="True" groups="base.group_multi_currency"/>
                     <field name="currency_id" readonly="True" invisible="1" />
-                    <field name="date_maturity"/>
+                    <field name="date_maturity" optional="hide"/>
                     <field name="company_currency_id" invisible="1"/>
                     <field name="company_id" invisible="1"/>
                     <field name="parent_state" invisible="1"/></tree>
@@ -337,10 +337,10 @@
                 <tree decoration-info="state == 'draft'" string="Journal Entries" decoration-muted="state == 'cancel'">
                     <field name="date"/>
                     <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="ref"/>
+                    <field name="partner_id" optional="show"/>
+                    <field name="ref" optional="show"/>
                     <field name="journal_id"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company" optional="show"/>
                     <field name="amount_total_signed" sum="Total Amount"/>
                     <field name="state"/>
                     <field name="currency_id" invisible="1"/>
@@ -352,25 +352,26 @@
             <field name="name">account.invoice.tree</field>
             <field name="model">account.move</field>
             <field name="arch" type="xml">
-                <tree decoration-info="state == 'draft'" string="Invoices" decoration-muted="state == 'cancel'" js_class="account_tree" banner_route="/account/account_invoice_onboarding">
+                <tree decoration-info="state == 'draft'" string="Invoices" decoration-muted="state == 'cancel'" js_class="account_tree">
+                    <field name="name"/>
                     <field name="partner_id" invisible="1"/>
                     <field name="invoice_source_email" invisible="1"/>
                     <field name="invoice_vendor_icon" string=" "/>
-                    <field name="invoice_vendor_display_name" groups="base.group_user" string="Vendor"/>
-                    <field name="invoice_date"/>
-                    <field name="name"/>
-                    <field name="invoice_payment_ref"/>
-                    <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
-                    <field name="invoice_date_due"/>
-                    <field name="invoice_origin"/>
-                    <field name="amount_untaxed_signed" string="Tax Excluded" sum="Total"/>
-                    <field name="amount_tax_signed" string="Tax" sum="Total"/>
-                    <field name="amount_total_signed" string="Total" sum="Total"/>
-                    <field name="amount_residual_signed" string="Amount Due" sum="Amount Due"/>
+                    <field name="invoice_vendor_display_name" invisible="context.get('default_type') not in ('in_invoice', 'in_refund','in_receipt')" groups="base.group_user" string="Vendor" />
+                    <field name="invoice_date" optional="show"/>
+                    <field name="invoice_payment_ref" optional="hide"/>
+                    <field name="invoice_user_id" optional="show" invisible="context.get('default_type') not in ('out_invoice', 'out_refund','out_receipt')" string="Sales Person"/>
+                    <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}" optional="show"/>
+                    <field name="invoice_date_due" optional="show"/>
+                    <field name="invoice_origin" optional="show" string="Source Document"/>
+                    <field name="amount_untaxed_signed" string="Tax Excluded" sum="Total" optional="show"/>
+                    <field name="amount_tax_signed" string="Tax" sum="Total" optional="hide"/>
+                    <field name="amount_total_signed" string="Total" sum="Total" optional="show"/>
+                    <field name="amount_residual_signed" string="Amount Due" sum="Amount Due" optional="show"/>
                     <field name="currency_id" invisible="1"/>
                     <field name="company_currency_id" invisible="1"/>
-                    <field name="state"/>
-                    <field name="invoice_payment_state"/>
+                    <field name="state" optional="show"/>
+                    <field name="invoice_payment_state" optional="hide"/>
                     <field name="type" invisible="context.get('default_type', True)"/>
                 </tree>
             </field>
diff --git a/addons/analytic/views/analytic_account_views.xml b/addons/analytic/views/analytic_account_views.xml
index 8ae4c546a86..8505e72cefa 100644
--- a/addons/analytic/views/analytic_account_views.xml
+++ b/addons/analytic/views/analytic_account_views.xml
@@ -97,13 +97,16 @@
             <field name="model">account.analytic.line</field>
             <field name="arch" type="xml">
                 <tree string="Analytic Entries">
-                    <field name="date"/>
+                    <field name="date" optional="show"/>
                     <field name="name"/>
                     <field name="account_id"/>
                     <field name="currency_id" invisible="1"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="unit_amount" sum="Quantity"/>
-                    <field name="amount" sum="Total"/>
+                    <field name="unit_amount" sum="Quantity" optional="hide"/>
+                    <field name="product_uom_id" optional="hide"/>
+                    <field name="partner_id" optional="hide"/>
+                    <field name="company_id" groups="base.group_multi_company" optional="show"/>
+                    <field name="amount" sum="Total" optional="show"/>
+                    <field name="tag_ids" optional="hide" widget="many2many_tags"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/membership/views/partner_views.xml b/addons/membership/views/partner_views.xml
index f44d3ffa14e..cd4feefb6d9 100644
--- a/addons/membership/views/partner_views.xml
+++ b/addons/membership/views/partner_views.xml
@@ -91,8 +91,8 @@
             <field name="inherit_id" ref="base.view_partner_tree"/>
             <field name="arch" type="xml">
                 <tree string="Contacts">
-                    <field name="category_id" position="after"/>
-                    <field name="membership_state"/>
+                    <field name="category_id" position="after" optional="hide"/>
+                    <field name="membership_state" optional="hide"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index 1a75bd33c62..668e3a857fc 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -1082,6 +1082,17 @@
             </field>
         </record>
 
+        <record id="account_invoice_view_tree" model="ir.ui.view">
+            <field name="name">account.move.tree.inherit.sale</field>
+            <field name="model">account.move</field>
+            <field name="inherit_id" ref="account.view_invoice_tree"/>
+            <field name="arch" type="xml">
+                <field name="invoice_user_id" position="after">
+                    <field name="team_id" invisible="context.get('default_type') not in ('out_invoice', 'out_refund','out_receipt')" optional="hide"/>
+                </field>
+            </field>
+        </record>
+
         <!-- Update account invoice !-->
         <record model="ir.ui.view" id="account_invoice_form">
             <field name="name">Account Invoice</field>

From 16db6d8fd075717e3f6c5bfdbd8c38591468ae38 Mon Sep 17 00:00:00 2001
From: Prakash Prajapati <ppr@odoo.com>
Date: Wed, 5 Jun 2019 10:45:10 +0000
Subject: [PATCH 09/10] [IMP] stock(_*):  set optional field to simplify the
 tree view

* = stock_account, stock_picking_batch, stock_product_expiry, delivery

Purpose of the commit is to set the new attribute OPTIONAL = SHOW/Hide on tree
view so the user can easily hide/show the optional fields on the tree view.

Update string date field from incoming products tree view.

Update string virtual_available field from product tree view.

task-1997453
Closes #33888
---
 addons/delivery/views/delivery_view.xml       | 14 +++++++++++++
 .../views/production_lot_views.xml            | 13 ++++++++++++
 addons/stock/views/product_views.xml          |  8 ++++----
 addons/stock/views/stock_inventory_views.xml  |  2 ++
 addons/stock/views/stock_move_views.xml       |  6 +++---
 addons/stock/views/stock_picking_views.xml    | 20 ++++++++++---------
 .../views/stock_production_lot_views.xml      |  4 ++--
 addons/stock/views/stock_quant_views.xml      |  4 ++--
 .../views/stock_account_views.xml             | 11 ++++++++++
 .../views/stock_picking_batch_views.xml       |  4 ++--
 10 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml
index 21b7f8dd919..5a451302f91 100644
--- a/addons/delivery/views/delivery_view.xml
+++ b/addons/delivery/views/delivery_view.xml
@@ -385,4 +385,18 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
+
+        <record id="vpicktree_view_tree" model="ir.ui.view">
+            <field name="name">stock.picking.delivery.tree.inherit.delivery</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.vpicktree"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='backorder_id']" position="after">
+                    <field name="carrier_tracking_ref" optional="hide"/>
+                    <field name="carrier_id" optional="hide"/>
+                    <field name="weight" optional="hide"/>
+                    <field name="shipping_weight" optional="hide"/>
+                </xpath>
+            </field>
+        </record>
 </odoo>
diff --git a/addons/product_expiry/views/production_lot_views.xml b/addons/product_expiry/views/production_lot_views.xml
index 0465a9b2269..3fb7e3981c2 100644
--- a/addons/product_expiry/views/production_lot_views.xml
+++ b/addons/product_expiry/views/production_lot_views.xml
@@ -35,4 +35,17 @@
         </field>
      </record>
 
+    <record id="view_production_lot_view_tree" model="ir.ui.view">
+        <field name="name">stock.production.lot.tree.inherit.product.expiry</field>
+        <field name="model">stock.production.lot</field>
+        <field name="inherit_id" ref="stock.view_production_lot_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='create_date']" position="after">
+                <field name="use_date" optional="hide"/>
+                <field name="removal_date" optional="hide"/>
+                <field name="life_date" optional="hide"/>
+                <field name="alert_date" optional="hide"/>
+            </xpath>
+        </field>
+    </record>
 </odoo>
diff --git a/addons/stock/views/product_views.xml b/addons/stock/views/product_views.xml
index 660897759fc..ed326116f38 100644
--- a/addons/stock/views/product_views.xml
+++ b/addons/stock/views/product_views.xml
@@ -41,8 +41,8 @@
                     <attribute name="decoration-info">type != 'product' or virtual_available&gt;=0</attribute>
                 </tree>
                 <field name="price" position="after">
-                    <field name="qty_available" attrs="{'invisible':[('type', '!=', 'product')]}"/>
-                    <field name="virtual_available" attrs="{'invisible':[('type', '!=', 'product')]}"/>
+                    <field name="qty_available" attrs="{'invisible':[('type', '!=', 'product')]}" optional="show"/>
+                    <field name="virtual_available" attrs="{'invisible':[('type', '!=', 'product')]}" string="Forecasted Quantity" optional="show"/>
                 </field>
             </field>
         </record>
@@ -57,8 +57,8 @@
                     <attribute name="decoration-info">type != 'product' or virtual_available&gt;=0</attribute>
                 </tree>
                 <field name="uom_id" position="before">
-                    <field name="qty_available" attrs="{'invisible':[('type', '!=', 'product')]}"/>
-                    <field name="virtual_available" attrs="{'invisible':[('type', '!=', 'product')]}"/>
+                    <field name="qty_available" attrs="{'invisible':[('type', '!=', 'product')]}" optional="show"/>
+                    <field name="virtual_available" attrs="{'invisible':[('type', '!=', 'product')]}" optional="show"/>
                 </field>
             </field>
         </record>
diff --git a/addons/stock/views/stock_inventory_views.xml b/addons/stock/views/stock_inventory_views.xml
index caeee8a2b09..259f1803d63 100644
--- a/addons/stock/views/stock_inventory_views.xml
+++ b/addons/stock/views/stock_inventory_views.xml
@@ -114,6 +114,8 @@
             <tree string="Lot/Serial Number Inventory" decoration-muted="state == 'cancel'">
                 <field name="name"/>
                 <field name="date"/>
+                <field name="location_ids" optional="hide" groups="stock.group_stock_multi_locations"/>
+                <field name="company_id" groups="base.group_multi_company" optional="show"/>
                 <field name="state"/>
             </tree>
         </field>
diff --git a/addons/stock/views/stock_move_views.xml b/addons/stock/views/stock_move_views.xml
index 4a9ac214581..be42657afff 100644
--- a/addons/stock/views/stock_move_views.xml
+++ b/addons/stock/views/stock_move_views.xml
@@ -409,17 +409,17 @@
             <field name="arch" type="xml">
                 <tree decoration-muted="state == 'cancel'" default_order='date_expected, picking_id, sequence' string="Moves">
                     <field name="date_expected" widget='date'/>
-                    <field name="date" widget="date"/>
+                    <field name="date" string="Creation date" widget="date" optional="hide"/>
                     <field name="picking_id" string="Reference" invisible="1"/>
                     <field name="sequence" invisible="1"/>
-                    <field name="origin"/>
+                    <field name="origin" optional="show"/>
                     <field name="product_id"/>
                     <field name="product_uom_qty"/>
                     <field name="product_uom" options="{'no_open': True, 'no_create': True}" string="Unit of Measure" groups="uom.group_uom"/>
                     <field name="location_id" options="{'no_create': True}" invisible="1"/>
                     <field name="location_dest_id" invisible="1"/>
                     <field name="create_date" invisible="1"/>
-                    <field name="state"/>
+                    <field name="state" optional="show"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index 612e8a1a568..96b067e1cfb 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -179,17 +179,19 @@
             <field name="arch" type="xml">
                 <tree decoration-info="state == 'draft'" decoration-muted="state == 'cancel'" decoration-danger="state not in ('cancel', 'done') and scheduled_date &lt; current_date" string="Picking list">
                     <field name="name"/>
-                    <field name="location_id" options="{'no_create': True}" string="From" groups="stock.group_stock_multi_locations"/>
-                    <field name="location_dest_id" options="{'no_create': True}" string="To" groups="stock.group_stock_multi_locations"/>
-                    <field name="partner_id"/>
+                    <field name="location_id" options="{'no_create': True}" string="From" groups="stock.group_stock_multi_locations" optional="show"/>
+                    <field name="location_dest_id" options="{'no_create': True}" string="To" groups="stock.group_stock_multi_locations" optional="show"/>
+                    <field name="partner_id" optional="show"/>
+                    <field name="user_id" optional="hide"/>
                     <field name="date" invisible="1"/>
-                    <field name="scheduled_date"/>
-                    <field name="origin"/>
+                    <field name="scheduled_date" optional="show"/>
+                    <field name="origin" optional="show"/>
                     <field name="group_id" invisible="1"/>
-                    <field name="backorder_id"/>
-                    <field name="state"/>
-                    <field name="priority" invisible="1"/>
-                    <field name="picking_type_id" invisible="1"/>
+                    <field name="backorder_id" optional="hide"/>
+                    <field name="state" optional="show"/>
+                    <field name="priority" optional="hide"/>
+                    <field name="picking_type_id" optional="hide"/>
+                    <field name="company_id" groups="base.group_multi_company" optional="show"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/stock/views/stock_production_lot_views.xml b/addons/stock/views/stock_production_lot_views.xml
index e3652942b88..710592d2ce0 100644
--- a/addons/stock/views/stock_production_lot_views.xml
+++ b/addons/stock/views/stock_production_lot_views.xml
@@ -53,9 +53,9 @@
         <field name="arch" type="xml">
             <tree string="Lots/Serial Numbers">
                 <field name="name"/>
-                <field name="ref"/>
+                <field name="ref" optional="show"/>
                 <field name="product_id"/>
-                <field name="create_date"/>
+                <field name="create_date" optional="show"/>
             </tree>
         </field>
     </record>
diff --git a/addons/stock/views/stock_quant_views.xml b/addons/stock/views/stock_quant_views.xml
index e3dc4271566..2730d0b15b9 100644
--- a/addons/stock/views/stock_quant_views.xml
+++ b/addons/stock/views/stock_quant_views.xml
@@ -98,13 +98,13 @@
                 <field name="owner_id" groups="stock.group_tracking_owner"
                        attrs="{'readonly': [('id', '!=', False)]}"
                        options="{'no_create': True}"/>
-                <field name="reserved_quantity"/>
                 <field name="quantity" string="On Hand Quantity"
                        invisible="1"/>
                 <field name="inventory_quantity" string="On Hand Quantity"
                        readonly="0"/>
+                <field name="reserved_quantity" optional="hide"/>
                 <field name="product_uom_id" groups="uom.group_uom"/>
-                <field name='company_id' groups="base.group_multi_company"/>
+                <field name='company_id' groups="base.group_multi_company" optional="show"/>
             </tree>
         </field>
     </record>
diff --git a/addons/stock_account/views/stock_account_views.xml b/addons/stock_account/views/stock_account_views.xml
index 37fc321461a..50a59a11bb6 100644
--- a/addons/stock_account/views/stock_account_views.xml
+++ b/addons/stock_account/views/stock_account_views.xml
@@ -30,6 +30,17 @@
             </field>
         </record>
 
+        <record id="view_inventory_tree" model="ir.ui.view">
+            <field name="name">stock.inventory.tree.inherit.stock.account</field>
+            <field name="model">stock.inventory</field>
+            <field name="inherit_id" ref="stock.view_inventory_tree"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='company_id']" position="after">
+                    <field name="accounting_date" optional="hide"/>
+                </xpath>
+            </field>
+        </record>
+
         <record id="view_location_form_inherit" model="ir.ui.view">
             <field name="name">stock.location.form.inherit</field>
             <field name="model">stock.location</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 5f1a636cd54..12d9c7a3fea 100644
--- a/addons/stock_picking_batch/views/stock_picking_batch_views.xml
+++ b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
@@ -132,8 +132,8 @@
         <field name="model">stock.picking</field>
         <field name="inherit_id" ref="stock.vpicktree"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='picking_type_id']" position="after">
-                <field name="batch_id"/>
+            <xpath expr="//field[@name='state']" position="before">
+                <field name="batch_id" optional="show"/>
             </xpath>
         </field>
     </record>

From f8814f2a799f5e16b9756d94726d0ef26ebdcfbf Mon Sep 17 00:00:00 2001
From: Prakash Prajapati <ppr@odoo.com>
Date: Wed, 5 Jun 2019 10:39:55 +0000
Subject: [PATCH 10/10] [IMP] sale(_*): set optional field to simplify the tree
 view

* = sale_crm, sale_stock, website_sale

Purpose of the commit is to set the new attribute OPTIONAL = SHOW/Hide on tree
view so the user can easily hide/show the optional fields on the tree view.

task-1997453
Closes: #33888
---
 .../product/views/product_template_views.xml  |  1 +
 addons/sale/views/sale_views.xml              | 21 +++++++++++-------
 addons/sale_crm/views/sale_order_views.xml    | 22 +++++++++++++++++++
 addons/sale_stock/views/sale_order_views.xml  | 22 +++++++++++++++++++
 addons/website_sale/views/product_views.xml   |  4 ++--
 .../website_sale/views/sale_order_views.xml   | 22 +++++++++++++++++++
 6 files changed, 82 insertions(+), 10 deletions(-)

diff --git a/addons/product/views/product_template_views.xml b/addons/product/views/product_template_views.xml
index 1aadcfbd5d0..1540b133fe2 100644
--- a/addons/product/views/product_template_views.xml
+++ b/addons/product/views/product_template_views.xml
@@ -9,6 +9,7 @@
                 <field name="default_code" optional="show"/>
                 <field name="barcode" optional="hide"/>
                 <field name="name"/>
+                <field name="company_id" groups="base.group_multi_company" optional="hide"/>
                 <field name="list_price" string="Sales Price" optional="show"/>
                 <field name="standard_price" optional="show"/>
                 <field name="categ_id" optional="hide"/>
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index 668e3a857fc..e0bc1ef3632 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -187,14 +187,16 @@
                 <tree string="Sales Orders" decoration-bf="message_needaction==True" decoration-muted="state=='cancel'">
                     <field name="message_needaction" invisible="1"/>
                     <field name="name" string="Order Number"/>
-                    <field name="confirmation_date" string="Confirmation Date"/>
+                    <field name="confirmation_date" string="Confirmation Date" optional="show"/>
                     <field name="commitment_date" groups="sale.group_sale_order_dates"/>
                     <field name="expected_date" groups="sale.group_sale_order_dates"/>
                     <field name="partner_id"/>
-                    <field name="user_id"/>
-                    <field name="amount_total" sum="Total Tax Included" widget="monetary"/>
+                    <field name="user_id" optional="show"/>
+                    <field name="team_id" optional="hide"/>
+                    <field name="company_id" groups="base.group_multi_company" optional="show"/>
+                    <field name="amount_total" sum="Total Tax Included" widget="monetary" optional="show"/>
                     <field name="currency_id" invisible="1"/>
-                    <field name="invoice_status" invisible="1"/>
+                    <field name="invoice_status" optional="show"/>
                     <field name="state" invisible="1"/>
                 </tree>
             </field>
@@ -208,14 +210,17 @@
                 <tree string="Quotation" class="o_sale_order" decoration-bf="message_needaction==True" decoration-muted="state=='cancel'">
                     <field name="message_needaction" invisible="1"/>
                     <field name="name" string="Quotation Number"/>
-                    <field name="date_order" string="Quotation Date"/>
+                    <field name="date_order" string="Quotation Date" optional="show"/>
                     <field name="commitment_date" groups="sale.group_sale_order_dates"/>
                     <field name="expected_date" groups="sale.group_sale_order_dates"/>
                     <field name="partner_id"/>
-                    <field name="user_id"/>
-                    <field name="amount_total" sum="Total Tax Included" widget="monetary"/>
+                    <field name="user_id" optional="show"/>
+                    <field name="team_id" optional="hide"/>
+                    <field name="company_id" groups="base.group_multi_company" optional="show"/>
+                    <field name="amount_total" sum="Total Tax Included" widget="monetary" optional="show"/>
                     <field name="currency_id" invisible="1"/>
-                    <field name="state"/>
+                    <field name="state" optional="show"/>
+                    <field name="invoice_status" optional="hide"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/sale_crm/views/sale_order_views.xml b/addons/sale_crm/views/sale_order_views.xml
index 61318da066b..2428a1bb037 100644
--- a/addons/sale_crm/views/sale_order_views.xml
+++ b/addons/sale_crm/views/sale_order_views.xml
@@ -51,6 +51,28 @@
         </field>
     </record>
 
+    <record id="view_quotation_tree" model="ir.ui.view">
+        <field name="name">sale.order.tree.inherit.sale.crm</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_quotation_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='invoice_status']" position="after">
+                <field name="tag_ids" optional="hide" widget="many2many_tags"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_order_tree" model="ir.ui.view">
+        <field name="name">sale.order.tree.inherit.sale.crm</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='invoice_status']" position="after">
+                <field name="tag_ids" optional="hide" widget="many2many_tags"/>
+            </xpath>
+        </field>
+    </record>
+
     <!-- This menu is display in CRM app when sale is installed-->
     <menuitem
         id="sale_order_menu_quotations_crm"
diff --git a/addons/sale_stock/views/sale_order_views.xml b/addons/sale_stock/views/sale_order_views.xml
index 7c6829e591c..7b1d086a7cc 100644
--- a/addons/sale_stock/views/sale_order_views.xml
+++ b/addons/sale_stock/views/sale_order_views.xml
@@ -42,6 +42,28 @@
            </field>
         </record>
 
+        <record id="view_quotation_tree" model="ir.ui.view">
+            <field name="name">sale.order.tree.inherit.sale.stock</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_quotation_tree"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='team_id']" position="after">
+                    <field name="warehouse_id" options="{'no_create': True}" groups="stock.group_stock_multi_warehouses" optional="hide" />
+                </xpath>
+            </field>
+        </record>
+
+        <record id="view_order_tree" model="ir.ui.view">
+            <field name="name">sale.order.tree.inherit.sale.stock</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_tree"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='team_id']" position="after">
+                    <field name="warehouse_id" options="{'no_create': True}" groups="stock.group_stock_multi_warehouses" optional="hide"/>
+                </xpath>
+            </field>
+        </record>
+
         <record id="view_order_line_tree_inherit_sale_stock" model="ir.ui.view">
             <field name="name">sale.order.line.tree.sale.stock.location</field>
             <field name="inherit_id" ref="sale.view_order_line_tree"/>
diff --git a/addons/website_sale/views/product_views.xml b/addons/website_sale/views/product_views.xml
index 76b8e5f3066..25a1aa61181 100644
--- a/addons/website_sale/views/product_views.xml
+++ b/addons/website_sale/views/product_views.xml
@@ -29,7 +29,7 @@
         <field name="inherit_id" ref="product.product_product_tree_view"/>
         <field name="arch" type="xml">
             <field name="name" position="after">
-                <field name="website_id" groups="website.group_multi_website"/>
+                <field name="website_id" groups="website.group_multi_website" optional="show"/>
             </field>
         </field>
     </record>
@@ -41,7 +41,7 @@
         <field name="inherit_id" ref="product.product_template_tree_view"/>
         <field name="arch" type="xml">
             <field name="name" position="after">
-                <field name="website_id" groups="website.group_multi_website"/>
+                <field name="website_id" groups="website.group_multi_website" optional="show"/>
             </field>
         </field>
     </record>
diff --git a/addons/website_sale/views/sale_order_views.xml b/addons/website_sale/views/sale_order_views.xml
index c1f72eac0ec..be648ef240f 100644
--- a/addons/website_sale/views/sale_order_views.xml
+++ b/addons/website_sale/views/sale_order_views.xml
@@ -270,4 +270,26 @@
             </field>
         </field>
     </record>
+
+    <record id="view_quotation_tree" model="ir.ui.view">
+        <field name="name">sale.order.tree.inherit.website.sale</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_quotation_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='user_id']" position="before">
+                <field name="website_id" optional="show"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_order_tree" model="ir.ui.view">
+        <field name="name">sale.order.tree.inherit.website.sale</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='user_id']" position="before">
+                <field name="website_id" optional="show"/>
+            </xpath>
+        </field>
+    </record>
 </odoo>