From e4efcb808db5ef6aeb48e12d048269241fd788d5 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 25 Apr 2012 16:11:35 +0200
Subject: [PATCH] [IMP] hr*: remove group_extended

bzr revid: rco@openerp.com-20120425141135-9jgai7os8mxj80go
---
 addons/hr/hr_view.xml                         | 12 ++++----
 .../report/hr_evaluation_report_view.xml      |  2 +-
 addons/hr_expense/hr_expense_view.xml         |  8 +++---
 .../report/hr_expense_report_view.xml         |  2 +-
 addons/hr_holidays/hr_holidays_view.xml       |  2 +-
 .../hr_holidays_summary_department_view.xml   |  1 -
 addons/hr_payroll/hr_payroll_view.xml         | 28 +++++++++----------
 addons/hr_recruitment/hr_recruitment_view.xml |  6 ++--
 .../report/hr_recruitment_report_view.xml     |  2 +-
 addons/hr_timesheet/hr_timesheet_view.xml     |  2 +-
 .../hr_timesheet_print_employee_view.xml      |  2 +-
 .../hr_timesheet_analytic_profit_view.xml     |  2 +-
 ...hr_timesheet_invoice_create_final_view.xml |  4 +--
 .../hr_timesheet_invoice_create_view.xml      |  4 +--
 .../hr_timesheet_sheet_view.xml               |  2 +-
 .../report/hr_timesheet_report_view.xml       |  2 +-
 .../report/timesheet_report_view.xml          |  2 +-
 17 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index a954d916385..c60eaed818d 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -27,8 +27,8 @@
                         <group colspan="6" col="6">
                         <field colspan="6" name="name" />
                         <field name="user_id" on_change="onchange_user(user_id)"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company,base.group_extended" on_change="onchange_company(company_id)"/>
-                        <field name="active" groups="base.group_extended"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
+                        <field name="active"/>
                         <newline/>
                         <field name="department_id" on_change="onchange_department_id(department_id)" />
                         <field name="parent_id" />
@@ -42,8 +42,8 @@
                             <group col="2" colspan="2" groups="base.group_hr_user">
                                 <separator colspan="2" string="Social IDs"/>
                                 <field name="ssnid"/>
-                                <field name="sinid" groups="base.group_extended"/>
-                                <field name="identification_id" groups="base.group_extended"/>
+                                <field name="sinid"/>
+                                <field name="identification_id"/>
                                 <field name="passport_id"/>
                                 <field name="otherid"/>
                             </group>
@@ -109,12 +109,12 @@
                     <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]" string="My Departments Employee"/>
                     </field>
                     <field name="job_id" widget="selection"/>
-                    <field name="category_ids" select="1" groups="base.group_extended"/>
+                    <field name="category_ids" select="1"/>
                     <field name="parent_id"/>
                     <newline />
                     <group expand="0" string="Group By...">
                     <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
-                    <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}" groups="base.group_extended"/>
+                    <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/>
                     <separator orientation="vertical" />
                     <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                     <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index c70c1d27923..b82c8f6f850 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -68,7 +68,7 @@
 	                <field name="plan_id" widget="selection"/>
                 </group>
                 <newline/>
-				<group expand="0" string="Extended Filters..." groups="base.group_extended">
+				<group expand="0" string="Extended Filters...">
                     <field name="rating"/>
                     <newline/>
                     <field name="deadline"/>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 66d2aa89617..babceb2116f 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -49,7 +49,7 @@
                 <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','invoiced','paid');gray:state == 'cancelled'"  string="Expenses" editable="top">
                     <field name="employee_id"/>
                     <field name="date"/>
-                    <field name="department_id" groups="base.group_extended"/>
+                    <field name="department_id"/>
                     <field name="ref"/>
                     <field name="name"/>
                     <field name="amount"/>
@@ -69,10 +69,10 @@
                     <group colspan="4" col="6">
                         <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
                         <field name="name"/>
-                        <field name="ref" groups="base.group_extended"/>
+                        <field name="ref"/>
                         <field name="date"/>
                         <field name="currency_id"/>
-                        <field name="department_id" groups="base.group_extended"/>
+                        <field name="department_id"/>
                         <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <notebook colspan="4">
@@ -108,7 +108,7 @@
                                 <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward" groups="base.group_hr_user"/>
                             </group>
                         </page>
-                        <page string="Other Info" groups="base.group_extended">
+                        <page string="Other Info">
                             <group col="2" colspan="2">
                             <separator colspan="2" string="Accounting data"/>
                             <field name="journal_id"/>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 0685880b863..32f4ab32b65 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -77,7 +77,7 @@
                     <field name="department_id"/>
             </group>
             <newline/>
-            <group expand="0" string="Extended Filters..." groups="base.group_extended">
+            <group expand="0" string="Extended Filters...">
                 <field name="product_id"/>
                 <separator orientation="vertical"/>
                 <field name="user_id"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 066ac29c6e3..2a4dcc92723 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -378,7 +378,7 @@
                     <group colspan="4" col="6">
                         <field name="name"/>
                         <field name="color_name"/>
-                        <field name="categ_id" widget="selection" groups="base.group_extended"/>
+                        <field name="categ_id" widget="selection"/>
                     </group>
                     <notebook colspan="4">
                       <page string="Details">
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index 22cdca38936..ba8b180ff9a 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -39,7 +39,6 @@
 	        parent="menu_hr_leaves_reports"
 	        action="action_hr_holidays_summary_dept"
 	        id="menu_account_central_journal"
-	        groups="base.group_extended"
 	        icon="STOCK_PRINT"/>
 
 	</data>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index e0212a68646..b5ec2e679e3 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -120,7 +120,7 @@
                                 <field name="name"/>
                                 <field name="code"/>
                                 <field name="category_id"/>
-                                <field name="sequence" groups="base.group_extended" invisible="1"/>
+                                <field name="sequence" invisible="1"/>
                                 <field name="register_id"/>
                              </tree>
                           </field>
@@ -167,7 +167,7 @@
                 <tree string="Salary Structure" editable="bottom" colors="blue:total == 0">
                     <field name="category_id"/>
                     <field name="employee_id" invisible="1"/>
-                    <field name="sequence" groups="base.group_extended"/>
+                    <field name="sequence"/>
                     <field name="name"/>
                     <field name="code"/>
                     <field name="quantity"/>
@@ -197,7 +197,7 @@
                         <field name="amount_select"/>
                         <field name="amount_fix"  attrs="{'readonly':[('amount_select','&lt;&gt;','fix')]}"/>
                         <field name="amount_percentage"  attrs="{'readonly':[('amount_select','&lt;&gt;','percentage')]}"/>
-                        <field name="sequence" groups="base.group_extended"/>
+                        <field name="sequence"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Description">
@@ -265,8 +265,8 @@
                         <field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
                         <field name="number"/>
                         <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
-                        <field name="contract_id" groups="base.group_extended" domain="[('employee_id','=',employee_id)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)"/>
-                        <field name="struct_id" groups="base.group_extended" attrs="{'required':[('contract_id','&lt;&gt;',False)]}"/>
+                        <field name="contract_id" domain="[('employee_id','=',employee_id)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)"/>
+                        <field name="struct_id" attrs="{'required':[('contract_id','&lt;&gt;',False)]}"/>
                         <field name="date_to"/>
                         <field name="name" colspan="4"/>
                         <field name="credit_note"/>
@@ -279,7 +279,7 @@
                                     <field name="code"/>
                                     <field name="number_of_days" sum="Total Working Days"/>
                                     <field name="number_of_hours"/>
-                                    <field name="contract_id" groups="base.group_extended"/>
+                                    <field name="contract_id"/>
                                     <field name="sequence" invisible="True"/>
                                 </tree>
                                 <form string="Worked Day">
@@ -287,10 +287,10 @@
                                         <field name="name" select="1"/>
                                         <field name="code" select="1"/>
                                         <field name="payslip_id"/>
-                                        <field name="sequence" groups="base.group_extended"/>
+                                        <field name="sequence"/>
                                         <field name="number_of_days"/>
                                         <field name="number_of_hours"/>
-                                        <field name="contract_id" groups="base.group_extended"/>
+                                        <field name="contract_id"/>
                                     </group>
                                 </form>
                             </field>
@@ -299,7 +299,7 @@
                                     <field name="name"/>
                                     <field name="code"/>
                                     <field name="amount"/>
-                                    <field name="contract_id" groups="base.group_extended"/>
+                                    <field name="contract_id"/>
                                     <field name="sequence" invisible="True"/>
                                 </tree>
                                 <form string="Payslip Line">
@@ -307,9 +307,9 @@
                                         <field name="name" select="1"/>
                                         <field name="code" select="1"/>
                                         <field name="payslip_id"/>
-                                        <field name="sequence" groups="base.group_extended"/>
+                                        <field name="sequence"/>
                                         <field name="amount"/>
-                                        <field name="contract_id" groups="base.group_extended"/>
+                                        <field name="contract_id"/>
                                     </group>
                                 </form>
                             </field>
@@ -331,12 +331,12 @@
                                         <field name="name" select="1"/>
                                         <field name="code" select="1"/>
                                         <field name="category_id"/>
-                                        <field name="sequence" groups="base.group_extended"/>
+                                        <field name="sequence"/>
                                         <field name="quantity"/>
                                         <field name="rate"/>
                                         <field name="amount"/>
                                         <field name="total"/>
-                                        <field name="salary_rule_id" groups="base.group_extended"/>
+                                        <field name="salary_rule_id"/>
                                     </group>
                                 </form>
                             </field>
@@ -565,7 +565,7 @@
                     <field name="name"/>
                     <field name="code"/>
                     <field name="category_id"/>
-                    <field name="sequence" groups="base.group_extended" invisible="1"/>
+                    <field name="sequence" invisible="1"/>
                     <field name="register_id"/>
                 </tree>
             </field>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 9e4948eebc6..1adc30daa28 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -106,7 +106,7 @@
                         <field name="title_action"/>
                         <field name="survey" invisible="1"/>
                         <button name="action_print_survey" string="Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
-                        <button name="%(survey.action_view_survey_question_message)d" string="Answer" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
+                        <button name="%(survey.action_view_survey_question_message)d" string="Answer" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}" attrs="{'readonly':[('survey','=',False)]}"/>
                         <field name="response" invisible="1"/>
                     </group>
                     <newline/>
@@ -357,7 +357,7 @@
             <tree string="Stages">
                 <field name="sequence" invisible="1"/>
                 <field name="name"/>
-                <field name="department_id" groups="base.group_extended"/>
+                <field name="department_id"/>
             </tree>
         </field>
     </record>
@@ -373,7 +373,7 @@
                 <group colspan="4" col="6">
                     <separator string="Stage Definition" colspan="6"/>
                     <field name="name" select="1"/>
-                    <field name="department_id" groups="base.group_extended"/>
+                    <field name="department_id"/>
                     <field name="sequence"/>
                 </group>
                 <separator string="Requirements" colspan="4"/>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 994102cab43..112258ac4af 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -89,7 +89,7 @@
                     </field>
                 </group>
                 <newline/>
-                <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                <group expand="0" string="Extended Filters...">
                     <!--field name="job_id"/-->
                     <field name="priority"/>
                     <field name="stage_id" widget="selection"/>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 352bacd0b06..e4838edbd3e 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -42,7 +42,7 @@
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Accounting" colspan="2"/>
-                                <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id" select="1" groups="base.group_extended"/>
+                                <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id" select="1"/>
                                 <field name="amount"/>
                                 <field name="general_account_id"/>
                                 <field name="journal_id"/>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index 063481f5211..197b3d2435d 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -35,7 +35,7 @@
         <menuitem action="action_hr_timesheet_employee"
         	id="menu_hr_timesheet_employee"
         	parent="menu_hr_timesheet_reports"
-        	groups="base.group_extended" sequence="2" icon="STOCK_PRINT"/>
+        	sequence="2" icon="STOCK_PRINT"/>
 
 
       <!-- Print My Timesheet -->
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index ee6b619ceeb..99ac6edc675 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -38,7 +38,7 @@
 
        	<menuitem action="action_hr_timesheet_analytic_profit"
         	id="menu_hr_timesheet_analytic_profit"
-        	parent="hr_timesheet.menu_hr_timesheet_reports" groups="base.group_extended" icon="STOCK_PRINT"/>
+        	parent="hr_timesheet.menu_hr_timesheet_reports" icon="STOCK_PRINT"/>
 
 	</data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
index 514996816cc..5fc6c35d785 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
@@ -33,8 +33,8 @@
                     <field name="time"/>
                     <field name="name"/>
                     <field name="price"/>
-                    <separator string="Force to use a special product" colspan="4" groups="base.group_extended"/>
-                    <field name="product" groups="base.group_extended"/>
+                    <separator string="Force to use a special product" colspan="4"/>
+                    <field name="product"/>
                 </group>
                 <separator colspan="4"/>
                 <group col="2" colspan="4">
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index 4a2d1a5e536..9f25a49213e 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -15,9 +15,9 @@
                                 <field name="date"/>
                                 <field name="time"/>
                                 <field name="name"/>
-                                <field name="price" groups="base.group_extended"/>
+                                <field name="price"/>
                            </group>
-                        <group col="2" colspan="4" groups="base.group_extended">
+                        <group col="2" colspan="4">
                             <separator string="Force to use a specific product" colspan="4"/>
                             <field name="product"/>
                         </group>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 87128b8799f..d822f10d944 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -69,7 +69,7 @@
                         <newline/>
                         <field name="name"/>
                         <field name="company_id" select="1" groups="base.group_multi_company"/>
-                        <field name="department_id" groups="base.group_extended"/>
+                        <field name="department_id"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Daily">
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 11915fb64c9..447c3be6966 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -59,7 +59,7 @@
                             <field name="user_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <group expand="0" string="Extended Filters...">
                         <field name="general_account_id"/>
                         <field name="product_id"/>
                         <field name="journal_id"/>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 468197884ba..96277f10c78 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -77,7 +77,7 @@
                       <field name="user_id" />
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <group expand="0" string="Extended Filters...">
                         <field name="general_account_id"/>
                         <field name="to_invoice" widget="selection"/>
                         <separator orientation="vertical"/>