From bba3dcfe5a4f4c71f99de6f1cf18206c5ee90a8b Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 13 May 2010 18:59:23 +0530
Subject: [PATCH] [MOD] general usability chabges

bzr revid: vir@tinyerp.com-20100513132923-y3uo7pzwmqhfmc91
---
 addons/account/account_invoice_view.xml       |  2 +-
 addons/account/project/project_view.xml       |  8 ++--
 .../report/account_analytic_report_view.xml   |  2 +-
 .../report/account_invoice_report_view.xml    |  2 +-
 .../account_aged_trial_balance_view.xml       |  2 +-
 .../wizard/account_balance_report_view.xml    |  2 +-
 .../account_general_ledger_report_view.xml    |  2 +-
 .../account_partner_balance_report_view.xml   |  2 +-
 .../wizard/account_third_party_ledger.xml     |  2 +-
 addons/account/wizard/account_vat_view.xml    |  2 +-
 addons/crm/report/crm_claim_report_view.xml   |  2 +-
 .../report/crm_fundraising_report_view.xml    |  2 +-
 .../crm/report/crm_helpdesk_report_view.xml   |  2 +-
 addons/crm/report/crm_lead_report_view.xml    |  2 +-
 .../report/crm_opportunity_report_view.xml    |  2 +-
 .../crm/report/crm_phonecall_report_view.xml  |  2 +-
 addons/crm/report/crm_report_view.xml         |  2 +-
 addons/hr/hr_view.xml                         |  2 +-
 addons/hr_attendance/hr_attendance_view.xml   |  2 +-
 addons/hr_contract/hr_contract_view.xml       |  2 +-
 addons/hr_evaluation/hr_evaluation_view.xml   |  8 ++--
 .../report/hr_evaluation_report_view.xml      |  2 +-
 addons/hr_expense/hr_expense_view.xml         |  2 +-
 .../report/hr_expense_report_view.xml         |  2 +-
 addons/hr_holidays/hr_holidays_view.xml       |  2 +-
 addons/hr_recruitment/hr_recruitment_view.xml |  2 +-
 .../report/hr_recruitment_report_view.xml     |  2 +-
 .../hr_timesheet_invoice_report_view.xml      |  2 +-
 .../hr_timesheet_sheet_view.xml               |  2 +-
 .../report/timesheet_report_view.xml          |  2 +-
 addons/mrp/mrp_view.xml                       |  4 +-
 .../mrp/report/mrp_production_order_view.xml  |  2 +-
 addons/mrp_operations/mrp_operations_view.xml |  2 +-
 .../mrp_procurement/mrp_procurement_view.xml  |  4 +-
 addons/mrp_repair/mrp_repair_view.xml         |  2 +-
 addons/point_of_sale/pos_view.xml             | 38 +++++++++----------
 addons/point_of_sale/statement_view.xml       | 12 +++---
 addons/product/product_view.xml               |  4 +-
 addons/project/project_view.xml               |  2 +-
 addons/project/report/project_report_view.xml |  2 +-
 addons/project_issue/project_issue_view.xml   |  2 +-
 .../report/project_issue_report_view.xml      |  2 +-
 .../project_long_term_view.xml                |  2 +-
 .../report/task_report_view.xml               |  4 +-
 addons/purchase/purchase_view.xml             |  8 ++--
 .../purchase/report/purchase_report_view.xml  |  2 +-
 .../purchase_requisition_view.xml             |  2 +-
 addons/resource/resource_view.xml             | 20 +++++-----
 addons/sale/report/sale_report_view.xml       |  4 +-
 addons/sale/sale_view.xml                     |  4 +-
 addons/scrum/scrum_view.xml                   |  2 +-
 addons/stock/stock_view.xml                   |  2 +-
 52 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 5ef07f6c88b..1fa182645d7 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -351,7 +351,7 @@
                         <field name="amount_total"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="12" col="10">
+                    <group expand="1" string="Group By..." colspan="12" col="10" groups="base.group_extended">
                         <filter string="Journal" icon="terp-account" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-account" domain="[]" context="{'group_by':'period_id'}"/>
                         <separator orientation="vertical"/>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index a97be959cd1..5f89a9172a9 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -67,7 +67,7 @@
                         <field name="name" select="1" colspan="4"/>
                         <field name="code" select="1"/>
                         <field name="parent_id" on_change="on_change_parent(parent_id)"/>
-                        <field name="company_id" select="2" widget="selection"/>
+                        <field name="company_id" select="2" widget="selection" groups="base.group_multi_company"/>
                         <field name="type" select="2"/>
                         <field name="company_currency_id" select="2"/>
                     </group>
@@ -152,7 +152,7 @@
                     <field name="ref" select="2"/>
                     <field name="currency_id" select="2"/>
                     <field name="amount_currency" select="2"/>
-                    <field name="company_id" select="2"/>
+                    <field name="company_id" select="2" groups="base.group_multi_company"/>
                     <newline/>
                     <field name="product_id" select="2"/>
                     <field name="product_uom_id" select="2"/>
@@ -177,7 +177,7 @@
                     <field name="ref"/>
                     <field name="currency_id" />
                     <field name="amount_currency" />
-                    <field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
+                    <field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -286,7 +286,7 @@
                     <field name="code" select="1"/>
                     <field name="type" select="2"/>
                     <field name="active" select="2"/>
-                    <field name="company_id" widget="selection"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </form>
             </field>
         </record>
diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index de97bfcb798..c6214615377 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -53,7 +53,7 @@
 	                <field name="partner_id"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Extended options..." colspan="10" col="12">
+                <group expand="1" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
                     <filter icon="terp-account"
                     		string="Draft"
                     		domain="[('state','=','draft')]"/>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 5a833e454fb..6f5116cb3da 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -92,7 +92,7 @@
 				<field name="company_id" groups="base.group_multi_company" widget="selection"/>
 				</group>
                 <newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
+                <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
                 	<filter string="Done"
                    			icon="terp-account"
                    			domain="[('state','=','paid')]"
diff --git a/addons/account/wizard/account_aged_trial_balance_view.xml b/addons/account/wizard/account_aged_trial_balance_view.xml
index 7984f69e86e..769d7ee268f 100644
--- a/addons/account/wizard/account_aged_trial_balance_view.xml
+++ b/addons/account/wizard/account_aged_trial_balance_view.xml
@@ -8,7 +8,7 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
 				<form string="Print Aged Trial Balance">
-				    <field name="company_id"/>
+				    <field name="company_id" groups="base.group_multi_company"/>
 				    <newline/>
 				    <field name="date1"/>
 				    <field name="period_length"/>
diff --git a/addons/account/wizard/account_balance_report_view.xml b/addons/account/wizard/account_balance_report_view.xml
index dd1b7147f13..f50cce039cc 100644
--- a/addons/account/wizard/account_balance_report_view.xml
+++ b/addons/account/wizard/account_balance_report_view.xml
@@ -8,7 +8,7 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
               	<form string="Select period">
-				    <field name="company_id"/>
+				    <field name="company_id" groups="base.group_multi_company"/>
 				    <field name="display_account" required = "True"/>
 				    <newline/>
 				    <field name="fiscalyear"/>
diff --git a/addons/account/wizard/account_general_ledger_report_view.xml b/addons/account/wizard/account_general_ledger_report_view.xml
index 0790a1654b9..a2ff3accf5f 100644
--- a/addons/account/wizard/account_general_ledger_report_view.xml
+++ b/addons/account/wizard/account_general_ledger_report_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Select Date-Period">
-			    <field name="company_id" colspan="4"/>
+			    <field name="company_id" colspan="4" groups="base.group_multi_company"/>
 			    <newline/>
 			    <field name="fiscalyear"/>
 			    <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
diff --git a/addons/account/wizard/account_partner_balance_report_view.xml b/addons/account/wizard/account_partner_balance_report_view.xml
index 02c2ec03a25..55fb71553d7 100644
--- a/addons/account/wizard/account_partner_balance_report_view.xml
+++ b/addons/account/wizard/account_partner_balance_report_view.xml
@@ -8,7 +8,7 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
               	<form string="Select Date-Period">
-     				<field name="company_id"/>
+     				<field name="company_id" groups="base.group_multi_company"/>
      				<field name="result_selection" required = "True"/>
     	 			<newline/>
      				<field name="fiscalyear"/>
diff --git a/addons/account/wizard/account_third_party_ledger.xml b/addons/account/wizard/account_third_party_ledger.xml
index 6ddc9a1e847..e731086af2c 100644
--- a/addons/account/wizard/account_third_party_ledger.xml
+++ b/addons/account/wizard/account_third_party_ledger.xml
@@ -8,7 +8,7 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
 				<form string="Select Date-Period">
-				    <field name="company_id"/>
+				    <field name="company_id" groups="base.group_multi_company"/>
 				    <field name="result_selection"/>
 				    <newline/>
 				    <field name="fiscalyear"/>
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 7662594bb79..528922d8763 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Select Period">
-				    <field name="company_id"/>
+				    <field name="company_id" groups="base.group_multi_company"/>
 					<newline/>
 				    <field name="based_on"/>
 				    <newline/>
diff --git a/addons/crm/report/crm_claim_report_view.xml b/addons/crm/report/crm_claim_report_view.xml
index 647a0125179..a5a492f75c4 100644
--- a/addons/crm/report/crm_claim_report_view.xml
+++ b/addons/crm/report/crm_claim_report_view.xml
@@ -70,7 +70,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
             <data>
-            	<xpath expr='//search[@string="Search"]/group[@string="Extended options..."]/filter[@string="Cancel"]' position='after'>
+            	<xpath expr='//search[@string="Search"]/group[@string="Extended filters..."]/filter[@string="Cancel"]' position='after'>
             	<group>
             	    <separator orientation="vertical"/>
             	    <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
diff --git a/addons/crm/report/crm_fundraising_report_view.xml b/addons/crm/report/crm_fundraising_report_view.xml
index e1c32726b4f..a1a1012ee7e 100644
--- a/addons/crm/report/crm_fundraising_report_view.xml
+++ b/addons/crm/report/crm_fundraising_report_view.xml
@@ -69,7 +69,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
             <data>
-            	<xpath expr='//search[@string="Search"]/group[@string="Extended options..."]/filter[@string="Cancel"]' position='after'>
+            	<xpath expr='//search[@string="Search"]/group[@string="Extended filters..."]/filter[@string="Cancel"]' position='after'>
             	<group>
             	    <separator orientation="vertical"/>
 	                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
diff --git a/addons/crm/report/crm_helpdesk_report_view.xml b/addons/crm/report/crm_helpdesk_report_view.xml
index b10f51162e7..4995a3b8357 100644
--- a/addons/crm/report/crm_helpdesk_report_view.xml
+++ b/addons/crm/report/crm_helpdesk_report_view.xml
@@ -109,7 +109,7 @@
                          <field name="user_id" widget="selection"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Extended options..." colspan="4" col="5">
+                   <group expand="1" string="Extended filters..." colspan="4" col="5">
                         <filter icon="terp-sale"
                             string="Lowest"
                             domain="[('priority','=','5')]"/>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index d6502c190d9..2d742aadaa9 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -65,7 +65,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
             <data>
-                <xpath expr='//search[@string="Search"]/group[@string="Extended options..."]/filter[@string="Cancel"]' position='after'>
+                <xpath expr='//search[@string="Search"]/group[@string="Extended filters..."]/filter[@string="Cancel"]' position='after'>
                 <group>
             	    <separator orientation="vertical"/>
             	    <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
diff --git a/addons/crm/report/crm_opportunity_report_view.xml b/addons/crm/report/crm_opportunity_report_view.xml
index 29a66b838f0..7e64ada6078 100644
--- a/addons/crm/report/crm_opportunity_report_view.xml
+++ b/addons/crm/report/crm_opportunity_report_view.xml
@@ -71,7 +71,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
             <data>
-                 <xpath expr='//search[@string="Search"]/group[@string="Extended options..."]/filter[@string="Cancel"]' position='after'>
+                 <xpath expr='//search[@string="Search"]/group[@string="Extended filters..."]/filter[@string="Cancel"]' position='after'>
                  <group>
             	    <separator orientation="vertical"/>
             	    <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 698a9b88fa3..2230399e70a 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -66,7 +66,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
              <data>
-                 <xpath expr='//search[@string="Search"]/group[@string="Extended options..."]/filter[@string="Cancel"]' position='after'>
+                 <xpath expr='//search[@string="Search"]/group[@string="Extended filters..."]/filter[@string="Cancel"]' position='after'>
                  <group>
             	    <separator orientation="vertical"/>
 	                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
diff --git a/addons/crm/report/crm_report_view.xml b/addons/crm/report/crm_report_view.xml
index 97fa4feb6f1..78208920edd 100644
--- a/addons/crm/report/crm_report_view.xml
+++ b/addons/crm/report/crm_report_view.xml
@@ -111,7 +111,7 @@
                			</field>
                    </group>
                    <newline/>
-                   <group  expand="0" string="Extended options..." colspan="10" col="12">
+                   <group  expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
                          <filter icon="terp-sale"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 47efc17825e..73de349c8cd 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -101,7 +101,7 @@
                     <field name="job_id" widget="selection"/>
                     <field name="parent_id" widget="selection" />
                     <newline />
-                    <group expand="1" string="Group By..." colspan="11" col="11">
+                    <group expand="1" string="Group By..." colspan="11" col="11" groups="base.group_extended">
                         <filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'parent_id'}"/>
                         <filter string="Coach" icon="terp-sale" domain="[]" context="{'group_by':'coach_id'}" groups="base.group_extended"/>
                         <separator orientation="vertical" />
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 2ea2d325867..6c3f82cbe72 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -55,7 +55,7 @@
                     <field name="name" select="1"  />
                     <field name="action" select="1" />
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="11" col="11">
+                    <group expand="1" string="Group By..." colspan="11" col="11" groups="base.group_extended">
                         <filter name="employee" string="Employee" icon="terp-sale" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Day" icon="terp-sale" domain="[]" context="{'group_by':'day'}"/>
                     </group>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 9951a9e3982..5793172b930 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -147,7 +147,7 @@
                        	<field name="date_end"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Group By..." colspan="4" col="20">
+                   <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <filter string="Department" icon="terp-project" domain="[]" context="{'group_by':'department_id'}"/>
                     </group>
                </search>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e2b1532d17f..b4d7d1c39d0 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -13,7 +13,7 @@
                        <field name="company_id" widget="selection"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Group By..." colspan="4" col="20">
+                   <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <filter string="Company" icon="terp-project" domain="[]" context="{'group_by':'company_id'}"/>
                     </group>
                </search>
@@ -28,7 +28,7 @@
                 <form string="Evaluation Plan">
                     <group col="6" colspan="4">
                         <field name="name" select="1"/>
-                        <field name="company_id" select="1" widget="selection"/>
+                        <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
                         <field name="active"/>
                         <field name="month_first"/>
                         <field name="month_next"/>
@@ -51,7 +51,7 @@
                     <field name="name"/>
                     <field name="month_first"/>
                     <field name="month_next"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -261,7 +261,7 @@
                         <field name="plan_id" widget="selection" select="1"/>
                         </group>
                         <newline/>
-                        <group expand='1' string='Group by...'>
+                        <group expand='1' string='Group by...' groups="base.group_extended">
                         <filter string='Employee' icon="terp-stock" domain="[]" context="{'group_by' : 'employee_id'}" />
                         <filter string='Plan' icon="terp-stock" domain="[]" context="{'group_by' : 'plan_id'}" />
                         <filter string='State' icon="terp-stock" domain="[]" context="{'group_by' : 'state'}" />
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 0dacc90c53c..7f00a6c935b 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -71,7 +71,7 @@
 	                <field name="employee_id" widget="selection"/>
                 </group>
                 <newline/>
-				<group expand="0" string="Extended options..." colspan="10" col="12">
+				<group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
                 	<filter icon="terp-hr"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index cb74901fc4e..37b7eb27900 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -159,7 +159,7 @@
                       <field name="department_id" widget="selection" groups="base.group_extended"/>
                 </group>
                 <newline />
-                <group expand="1" string="Group By..." colspan="11" col="11">
+                <group expand="1" string="Group By..." colspan="11" col="11" groups="base.group_extended">
                     <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
                     <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index c376df3e4d7..ecd27234c98 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -85,7 +85,7 @@
                     </field>
 				</group>
 				<newline/>
-				<group expand="0" string="Extended options..." colspan="10" col="12">
+				<group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
 					<filter string="Invoiced"
 	                   		icon="terp-hr"
 	                   		domain="[('state','=','invoiced')]"
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 5004635f59c..3617286fb29 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -22,7 +22,7 @@
                         <field name="holiday_status_id" widget="selection"/>
                     </group>
                     <newline />
-                    <group expand="1" string="Group By..." colspan="11" col="11">
+                    <group expand="1" string="Group By..." colspan="11" col="11" groups="base.group_extended">
                         <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
                         <filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'manager_id'}"/>
                         <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 461b10181b7..2b404f253d9 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -232,7 +232,7 @@
                        help="My Department"/>
                </field>
                <newline/>
-                <group expand="1" string="Group By..." colspan="11" col="20">
+                <group expand="1" string="Group By..." colspan="11" col="20" groups="base.group_extended">
                     <filter string="Department" icon="terp-project" domain="[]" context="{'group_by':'department_id'}"/>
                     <filter string="Responsible" icon="terp-project" domain="[]"  context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index ec7f08bbbe0..95c9ea8df4c 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -95,7 +95,7 @@
                 </field>
                 </group>
                 <newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
+                <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
                     <filter icon="terp-hr"
                     		string="Hired"
                         name="done"
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index cb6c8d5771c..6ff2e597561 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -74,7 +74,7 @@
                         <field name="product_id"/>
                     </group>
                     <newline/>
-	                <group expand="0" string="Extended options..." colspan="10" col="12">
+	                <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
 	                    <field name="date"/>
 	                    <separator orientation="vertical"/>
 	                    <field name="invoice_id" widget="selection"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index eae4e8e1e9a..95057aff83a 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -206,7 +206,7 @@
                         </field>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20">
+                    <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <filter string="Users" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Department" icon="terp-project" domain="[]" context="{'group_by':'department_id'}"/>
                     </group>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 976b2a6f8ea..aff66002ea3 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -80,7 +80,7 @@
 	                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
+                <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
                 	<filter icon="terp-hr"
                     		string="New"
                     		domain="[('state','=','new')]"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 0aa4cf00f5f..534d19a570b 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -294,10 +294,10 @@
                       <field name="name"/>
 	                    <field name="code" string="Reference"/>
 	                    <field name="product_id"/>
-	                    <field name="company_id"/>
+	                    <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By" colspan="4" col="8">
+                    <group expand="1" string="Group By" colspan="4" col="8" groups="base.group_extended">
                         <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Routing" icon="terp-mrp" domain="[]" context="{'group_by':'routing_id'}"/>
                    </group>
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index e62cc04fab6..e5b69380473 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -57,7 +57,7 @@
 						<field name="date_planned"/>
                    </group>
                    <newline/>
-	                <group expand="1" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
+	                <group expand="1" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
 	                    <filter icon="terp-mrp" string="Draft" domain="[('state','=','draft')]"/>
 	                    <filter icon="terp-mrp" string="Picking Exception" domain="[('state','=','picking_except')]"/>
 	                    <separator orientation="vertical"/>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 00eed2a6aec..37e90a995b4 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -96,7 +96,7 @@
                 		<field name="production_id"/>
                 	</group>
                 	<newline/>
-                    <group expand="1" string="Group By" colspan="10" col="8">
+                    <group expand="1" string="Group By" colspan="10" col="8" groups="base.group_extended">
                         <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product'}"/>
                         <filter string="State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
diff --git a/addons/mrp_procurement/mrp_procurement_view.xml b/addons/mrp_procurement/mrp_procurement_view.xml
index f3b7d10fd25..5045adc99db 100644
--- a/addons/mrp_procurement/mrp_procurement_view.xml
+++ b/addons/mrp_procurement/mrp_procurement_view.xml
@@ -98,7 +98,7 @@
                        <field name="state" />
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By" colspan="4" col="8">
+                    <group expand="1" string="Group By" colspan="4" col="8" groups="base.group_extended">
                         <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Reason" icon="terp-mrp" domain="[]" context="{'group_by':'name'}"/>
                         <filter string="Scheduled Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
@@ -184,7 +184,7 @@
                         <field name="name" select="1" />
                         <field name="warehouse_id" select="1" widget="selection"/>
                         <field name="location_id" select="1" />
-                        <field name="company_id" select="1" widget="selection"/>
+                        <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
                         <field name="product_id" select="1"/>
                     </group>
                     <newline/>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 6be5f12447c..47e80be3e31 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -183,7 +183,7 @@
                     <field name="product_id" />
               	</group>
               	<newline/>
-                  <group expand="1" string="Group By" colspan="10" col="8">
+                  <group expand="1" string="Group By" colspan="10" col="8" groups="base.group_extended">
                       <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
                       <filter string="State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
                       <filter string="Partner" icon="terp-mrp" domain="[]" context="{'group_by':'partner_id'}"/>
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index c36420da08a..7d90b088527 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -65,14 +65,14 @@
                                 <button name="%(action_report_pos_receipt)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
                                 <button name="set_to_draft" string="Set to draft" states="paid" icon="gtk-execute" type="object" />
                                 <button name="%(action_view_pos_return)d" string="Return Picking" type="action" icon="gtk-ok" states="paid"
-                                    attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}"/>                             
+                                    attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}"/>
                             </group>
                         </page>
 
                         <page string="Payment">
                             <group colspan="2" col="2" name="Type">
                                 <separator string="Order Information" colspan="4"/>
-                                <field name="company_id"/>
+                                <field name="company_id" groups="base.group_multi_company"/>
                                 <field name="shop_id" widget="selection"  />
                                 <field name="name" select="1"/>
                                 <field name="user_id" />
@@ -142,7 +142,7 @@
                     <field name="invoice_id"/>
                     <field name="state" select="1"/>
                     <field name="amount_total" sum="Amount total"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -162,7 +162,7 @@
                     </field>
                     <field name="date_order" select="1" string="Order date" />
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="11" col="11">
+                    <group expand="1" string="Group By..." colspan="11" col="11" groups="base.group_extended">
                         <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
@@ -171,12 +171,12 @@
                </search>
             </field>
         </record>
-        
+
         <menuitem name="Point of Sale" id="menu_point_root" sequence="10"/>
         <menuitem name="Point of Sale" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
         <menuitem name="Sales Order" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1"/>
         <menuitem name="Products" id="menu_point_of_sale_product" parent="menu_point_root" sequence="2" />
-        
+
         <menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale_product" sequence="2" name="Products"/>
 
         <!--  POS Order view (date_payment)  -->
@@ -188,8 +188,8 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_pos_order_tree"/>
             <field name="domain">['|',('state_2','=','to_verify'),('state','=','advance')]</field>
-			<field name="search_view_id" ref="view_pos_order_filter"/>	             
- 				           
+			<field name="search_view_id" ref="view_pos_order_filter"/>
+
         </record>
 
         <record model="ir.actions.act_window" id="action_pos_order_tobinvoiced">
@@ -200,8 +200,8 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_pos_order_tree"/>
             <field name="domain">[('state','!=', 'invoiced')]</field>
-			<field name="search_view_id" ref="view_pos_order_filter"/>	             
-		    	             
+			<field name="search_view_id" ref="view_pos_order_filter"/>
+
         </record>
         <menuitem name="Invoicing" id="menu_point_of_sale_invoicing" parent="menu_point_root" sequence="4" />
         <menuitem name="Sales to Invoice" action="action_pos_order_tobinvoiced" id="menu_point_of_sale_tobinvoiced" parent="menu_point_of_sale_invoicing"/>
@@ -212,7 +212,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=', 'paid')]</field>
- 			<field name="search_view_id" ref="view_pos_order_filter"/>	               
+ 			<field name="search_view_id" ref="view_pos_order_filter"/>
         </record>
         <record model="ir.actions.act_window" id="action_pos_order_tree2">
             <field name="name">Point of Sale</field>
@@ -221,7 +221,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('date_order','&lt;=', time.strftime('%Y-%m-%d 23:59:59'))]</field>
- 			<field name="search_view_id" ref="view_pos_order_filter"/>	               
+ 			<field name="search_view_id" ref="view_pos_order_filter"/>
         </record>
 
         <record model="ir.actions.act_window" id="action_pos_order_tree3">
@@ -230,7 +230,7 @@
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-			<field name="search_view_id" ref="view_pos_order_filter"/>            
+			<field name="search_view_id" ref="view_pos_order_filter"/>
         </record>
         <record model="ir.actions.act_window" id="action_pos_order_tree_open">
             <field name="name">Opened Sales</field>
@@ -238,7 +238,7 @@
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
-			<field name="search_view_id" ref="view_pos_order_filter"/>            
+			<field name="search_view_id" ref="view_pos_order_filter"/>
         </record>
 
         <record model="ir.ui.view" id="view_pos_order_line">
@@ -724,7 +724,7 @@
                                   <field name="expense_pdt"/>
                             <field name="am_out"/>
                           <field name="disc_controle"/>
-                                  <field name="company_id" groups="base.group_extended"/>
+                                  <field name="company_id" groups="base.group_extended,base.group_multi_company""/>
                               </group>
                               <group colspan="2" col="2" name="Prices">
                                   <separator string="Prices" colspan="2"/>
@@ -789,7 +789,7 @@
                     parent="menu_point_config_product"
                     action="action_product_output"
                     id="products_for_output_operations"/>
-            
+
         <menuitem name="Register Management" parent="menu_point_root"
             id="menu_point_config" sequence="3"/>
         <menuitem
@@ -797,7 +797,7 @@
             string="Refloat"
             action="action_box_entries"
             id="menu_wizard_enter_jrnl" sequence="3" />
-            
+
         <menuitem
             name="Output Operations" parent="menu_point_config"
             string="Refloat"
@@ -820,7 +820,7 @@
                     <field name="note" select="1" />
                     <field name="state" select="1"/>
                     <field name="amount_total" sum="Amount total"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -920,7 +920,7 @@
 
         <menuitem icon="STOCK_PRINT" action="action_report_pos_payment_repport_date"
                 id="menu_pos_payment_report_date" parent="menu_trans_pos_tree" sequence="5" groups="base.group_extended"/>
- 
+
         <menuitem icon="STOCK_PRINT" action="action_report_pos_payment_report_user"
                 id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" sequence="6" groups="base.group_extended"/>
         <menuitem icon="STOCK_PRINT" action="action_pos_sales_user_today"
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index cef2748b5e4..69c3232f1a0 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -46,7 +46,7 @@
                 <form string="Statement">
                     <field name="name" select="1"/>
                     <field name="user_id" select="1"/>
-                    <field name="company_id" select="1"/>
+                    <field name="company_id" select="1" groups="base.group_multi_company"/>
                     <field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash'),('auto_cash','=',False)]" select="1" />
                     <newline/>
                     <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
@@ -123,7 +123,7 @@
                 <form string="Statement">
                     <field name="name" select="1"/>
                     <field name="user_id" select="1"/>
-                    <field name="company_id" select="1"/>
+                    <field name="company_id" select="1" groups="base.group_multi_company"/>
                     <field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash')]" select="1" readonly="1"/>
                     <newline/>
                     <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
@@ -236,7 +236,7 @@
                 <form string="Statement">
                     <field name="name" select="1"/>
                     <field name="user_id" select="1"/>
-                    <field name="company_id" select="1"/>
+                    <field name="company_id" select="1" groups="base.group_multi_company"/>
                     <field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash')]" select="1" readonly="1"/>
                     <newline/>
                     <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
@@ -417,7 +417,7 @@
 		<menuitem name="Cashboxes to Close" parent="menu_pos_bank_statment_tree"
 		 		action="action_cashboxes_to_close" id="menu_cashboxes_to_close_tree" groups="base.group_extended"/>
 
-	
+
 		<menuitem
             name="Open Registers" parent="point_of_sale.menu_point_config"
             string="Open Register"
@@ -434,11 +434,11 @@
             string="Close Register"
             action="action_pos_close_statement"
             id="menu_close_statement" sequence="2" />
-       
+
        <menuitem icon="STOCK_PRINT"
        			 action="action_report_all_closed_cashbox_of_the_day"
 				 id="menu_all_closed_cashbox_of_the_day"
 				 parent="menu_point_report_register"/>
-            
+
 	</data>
 </openerp>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 24976a71533..5984f2d1693 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -18,11 +18,11 @@
                    <field name="name" select="1"/>
                    <field name="categ_id" select="1" widget="selection" operator="child_of"/>
                    <newline/>
-                   <group col='8' colspan='14' expand="1" string="Extended options...">
+                   <group col='8' colspan='14' expand="1" string="Extended filters..." groups="base.group_extended">
                        <field name="pricelist_id" select="1" widget="selection" context="{'pricelist': self}" />
                    </group>
                    <newline/>
-                   <group col='8' colspan='15' expand='1' string='Group by...'>
+                   <group col='8' colspan='15' expand='1' string='Group by...' groups="base.group_extended">
                        <filter string='Category' icon="terp-stock" domain="[]" context="{'group_by' : 'categ_id'}" />
                        <separator orientation="vertical"/>
                        <filter string='Default UOM' icon="terp-stock" domain="[]" context="{'group_by' : 'uom_id'}" />
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index fa795c12d6a..1583f7e98fc 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -122,7 +122,7 @@
                        <field name="user_id" string="Project Manager" default="1"/>
                        <field name="partner_id" string="Partner"/>
                    </group>
-                    <group expand="1" string="Group By..." colspan="4" col="20">
+                    <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <filter string="Users" name="Users"  icon="terp-project" domain = "[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" name="Partner"  icon="terp-project" domain = "[]" context="{'group_by':'partner_id'}"/>
                       </group>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index a4a072849b9..198ce49820b 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -100,7 +100,7 @@
 	                    </field>
                     </group>
                     <newline/>
-	                <group expand="0" string="Extended options..." colspan="10" col="12">
+	                <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
                       	<filter string="Done"
                     			icon="terp-project"
                     			name="done"
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 04168492d38..8e5d771bc09 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -202,7 +202,7 @@
                         </field>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="16">
+                    <group expand="1" string="Group By..." colspan="16" groups="base.group_extended">
 	                    <filter string="Stage" icon="terp-crm" domain="[]"
 	                        context="{'group_by':'stage_id'}" />
 	                    <filter string="Priority" icon="terp-crm" domain="[]"
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 24290530be7..b1b610342dc 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -56,7 +56,7 @@
 	            			<filter icon="terp-crm" string="My Project Issue" help="My Project Issue Entries" domain="[('user_id','=',uid)]" />
                			</field>
             	</xpath>
-               	<xpath expr='//search[@string="Search"]/group[@string="Extended options..."]/filter[@string="Cancel"]' position='after'>
+               	<xpath expr='//search[@string="Search"]/group[@string="Extended filters..."]/filter[@string="Cancel"]' position='after'>
                     	<group>
                     		<separator orientation="vertical"/>
                   			<field name="project_id" widget="selection" />
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index ae06ebb3b71..c6fed8f052a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -210,7 +210,7 @@
                         <field name="date_start"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20">
+                    <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="State" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'responsible_id'}"/>
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index e44e399b292..71f820b1f5d 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -84,7 +84,7 @@
 	            			<filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]" default="1"/>
                 		</field>
                 		<newline/>
-                		<group expand="1" string="Extended options..." colspan="10" col="12">
+                		<group expand="1" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
                     		<filter icon="terp-project"
                     		string="Very urgent"
                     		domain="[('priority','=','0')]"/>
@@ -102,7 +102,7 @@
                     		domain="[('priority','=','4')]"/>
                 		</group>
 	                    <newline/>
-                		<group expand="1" string="Group By..." colspan="10" col="11">
+                		<group expand="1" string="Group By..." colspan="10" col="11" groups="base.group_extended">
                     		<filter string="User" icon="terp-project" context="{'group_by':'user_id'}" />
                     		<filter string="Project" icon="terp-project" context="{'group_by':'project_id'}" />
                     		<filter string="Company" icon="terp-project" context="{'group_by':'company_id'}" />
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 555d1fb085c..543a9e28b96 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -165,7 +165,7 @@
                     </field>
                 </group>
                 <newline/>
-                  <group expand="1" string="Group By..." colspan="4" col="10">
+                  <group expand="1" string="Group By..." colspan="4" col="10" groups="base.group_extended">
                     <filter string="Supplier" icon="terp-purchase" domain="[]" context="{'group_by':'partner_id'}"/>
                     <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Order Date" icon="terp-purchase" domain="[]" context="{'group_by':'date_order'}"/>
@@ -323,11 +323,11 @@
             <field name="act_window_id" ref="purchase_line_form_action2"/>
         </record>
          <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" parent="menu_procurement_management_invoice"/>
-		
-		<!-- 
+
+		<!--
         	Procurements
         -->
-         
+
         <record id="view_procurement_form_inherit" model="ir.ui.view">
         	<field name="name">mrp.procurement.form.inherit</field>
         	<field name="model">mrp.procurement</field>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 93918160bd1..f687a17b7a4 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -86,7 +86,7 @@
 
 				</group>
 				<newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
+                <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
                     <filter icon="terp-purchase" string="Shipping Exception" domain="[('state','=','shipping_except')]"/>
                     <filter icon="terp-purchase" string="Done" domain="[('state','=','done')]"/>
                     <separator orientation="vertical"/>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 5ce49ec3693..bd68c1f23a8 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -117,7 +117,7 @@
                     <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                 </group>
                 <newline/>
-                  <group expand="1" string="Group By..." colspan="4" col="10">
+                  <group expand="1" string="Group By..." colspan="4" col="10" groups="base.group_extended">
                     <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Date Start" icon="terp-purchase" domain="[]" context="{'group_by':'date_start'}"/>
                     <filter string="Date End" icon="terp-purchase" domain="[]" context="{'group_by':'date_end'}"/>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 3f5b0dbd932..65d46b79da1 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -16,10 +16,10 @@
                            <filter domain="[('user_id','=',uid)]" help="My Resouces" icon="gtk-execute" default="1"/>
                        </field>
                        <field name="resource_type"/>
-                       <field name="company_id" widget="selection"/>
+                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Group By..." colspan="4" col="20">
+                   <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <filter string="Type" icon="terp-project" domain="[]" context="{'group_by':'resource_type'}"/>
                         <filter string="Company" icon="terp-project" domain="[]" context="{'group_by':'company_id'}"/>
                         <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
@@ -38,7 +38,7 @@
                    <group col='15' colspan='4'>
                        <field name="name" string="Name"/>
                        <field name="manager" widget="selection"/>
-                       <field name="company_id" widget="selection"/>
+                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                </search>
             </field>
@@ -52,7 +52,7 @@
                 <search string="Search Working Period Leaves">
                    <group col='15' colspan='4'>
                        <field name="name" string="Name"/>
-                       <field name="company_id" string="Company" widget="selection"/>
+                       <field name="company_id" string="Company" widget="selection" />
                        <field name="calendar_id" string="Working Time" widget="selection"/>
                        <field name="resource_id" string="Resource" widget="selection"/>
                    </group>
@@ -73,7 +73,7 @@
                 <form string="Working Period">
                     <field name="name" select="1"/>
                     <field name="manager" select="1"/>
-                    <field name="company_id" select="1"/>
+                    <field name="company_id" select="1" groups="base.group_multi_company"/>
                     <newline/>
                     <field colspan="4" name="week_id" nolabel="1" widget="one2many_list"/>
                 </form>
@@ -88,7 +88,7 @@
                 <tree string="Working Period">
                     <field name="name"/>
                     <field name="manager" select="1"/>
-                    <field name="company_id" select="1"/>
+                    <field name="company_id" select="1" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -165,7 +165,7 @@
                 <form string="Resource">
                     <field name="name" />
                     <field name="active"/>
-                    <field name="company_id" widget="selection"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <field name="calendar_id" widget="selection"/>
                     <field name="resource_type" />
                     <field name="user_id" attrs="{'required':[('resource_type','=','user')]}"/>
@@ -180,7 +180,7 @@
             <field name="arch" type="xml">
                 <tree string="Resources">
                     <field name="name" />
-                    <field name="company_id" />
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="resource_type" />
                     <field name="calendar_id" />
                     <field name="time_efficiency" groups="base.group_extended"/>
@@ -202,7 +202,7 @@
             <field name="arch" type="xml">
                 <form string="Leave Detail">
                     <field name="name" />
-                    <field name="company_id"  widget="selection"/>
+                    <field name="company_id"  widget="selection" groups="base.group_multi_company"/>
                     <field name="calendar_id" />
                     <field name="date_from" />
                     <field name="date_to" />
@@ -217,7 +217,7 @@
             <field name="arch" type="xml">
                 <tree string="Leave Detail">
                     <field name="name" />
-                    <field name="company_id" />
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="calendar_id" />
                     <field name="date_from" />
                     <field name="date_to" />
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 72707f6e01d..4a333fbc077 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -13,7 +13,7 @@
                 <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="shop_id" invisible="1"/>
-                <field name="company_id" invisible="1"/>
+                <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
                 <field name="product_qty" invisible="1"/>
@@ -85,7 +85,7 @@
 	                <field name="product_id"/>
 				</group>
 				<newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
+                <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
                     <filter icon="terp-sale" string="Shipping Exception" domain="[('state','=','shipping_except')]"/>
                     <filter icon="terp-sale" string="       Invoice Exception      " domain="[('state','=','invoice_except')]"/>
                     <separator orientation="vertical"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 894ff6b2e6c..cbfa3e77665 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -226,7 +226,7 @@
                                 <separator string="Conditions" colspan="2"/>
                                 <field name="payment_term" widget="selection"/>
                                 <field name="fiscal_position" widget="selection"/>
-                                <field name="company_id" widget="selection"/>
+                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                             </group>
                             <group colspan="2" col="2" groups="base.group_extended">
                                 <separator string="Dates" colspan="2"/>
@@ -263,7 +263,7 @@
                     </field>
                     <field name="date_order" select="1" string="Order date" />
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="11" col="11">
+                    <group expand="1" string="Group By..." colspan="11" col="11" groups="base.group_extended">
                         <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 9ea4c8592a9..8ff66680131 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -133,7 +133,7 @@
                         </field>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20">
+                    <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Sprint" icon="terp-project" domain="[]" context="{'group_by':'sprint_id'}"/>
                         <filter string="Responsible" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index b7a865e3d8f..01e23206a93 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -55,7 +55,7 @@
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="4">
+                    <group expand="1" string="Group By..." colspan="4" col="4" groups="base.group_extended">
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Date" icon="terp-sale" domain="[]" context="{'group_by':'date'}"/>
                     </group>