[MERGE] merge with dev-addons3 branch
[odoo/odoo.git] / addons / hr_timesheet_sheet / hr_timesheet_sheet_view.xml
index 5d927a5..35c20fd 100644 (file)
-<?xml version="1.0" ?>
-<terp>
-       <data>
-               <record model="ir.ui.view" id="hr_timesheet_sheet_tree">
-                       <field name="name">hr.timesheet.sheet.tree</field>
-                       <field name="model">hr_timesheet_sheet.sheet</field>
-                       <field name="type">tree</field>
-                       <field name="arch" type="xml">
-                               <tree string="Timesheets">
-                                       <field name="user_id"/>
-                                       <field name="date_from" />
-                                       <field name="date_to" />
-                                       <field name="name" />
-                                       <field name="total_attendance"/>
-                                       <field name="total_timesheet"/>
-                                       <field name="total_difference"/>
-                                       <field name="state"/>
-                               </tree>
-                       </field>
-               </record>
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="hr_timesheet_sheet_tree" model="ir.ui.view">
+            <field name="name">hr.timesheet.sheet.tree</field>
+            <field name="model">hr_timesheet_sheet.sheet</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Timesheets"
+                    colors="blue:state == 'draft';grey:state == 'done'">
+                    <field name="user_id"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                    <field name="name"/>
+                    <field name="department_id"/>
+                    <field name="total_attendance" groups="hr_attendance.group_hr_attendance"/>
+                    <field name="total_timesheet"/>
+                    <field name="total_difference" groups="hr_attendance.group_hr_attendance"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+       <record id="hr_timesheet_sheet_graph" model="ir.ui.view">
+         <field name="name">hr.timesheet.sheet.graph</field>
+         <field name="model">hr_timesheet_sheet.sheet</field>
+         <field name="type">graph</field>
+         <field name="arch" type="xml">
+             <graph string="Timesheets" type="bar">
+                 <field name="name"/>
+                 <field name="total_attendance" operator="+"/>
+                 <field name="total_timesheet" operator="+"/>
+             </graph>
+         </field>
+        </record>
+        <record id="hr_timesheet_account_form" model="ir.ui.view">
+            <field name="name">hr.timesheet.account.form</field>
+            <field name="model">hr_timesheet_sheet.sheet.account</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Timesheet by Accounts">
+                    <field name="sheet_id" select="1"/>
+                    <field name="name" select="1"/>
+                    <field name="total" sum="Total"/>
+                    <field name="invoice_rate"/>
+                </form>
+            </field>
+        </record>
 
+        <record id="hr_timesheet_account_tree" model="ir.ui.view">
+            <field name="name">hr.timesheet.account.tree</field>
+            <field name="model">hr_timesheet_sheet.sheet.account</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Timesheet by Accounts">
+                    <field name="sheet_id"/>
+                    <field name="name"/>
+                    <field name="total" sum="Total"/>
+                    <field name="invoice_rate"/>
+                </tree>
+            </field>
+        </record>
+<!--
+        <record id="hr_timesheet_day_form" model="ir.ui.view">
+            <field name="name">hr.timesheet.day.form</field>
+            <field name="model">hr_timesheet_sheet.sheet.day</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Timesheet by Days">
+                    <field name="sheet_id" select="1"/>
+                    <field name="name" select="1"/>
+                    <field name="total_timesheet"/>
+                    <field name="total_attendance" groups="hr_attendance.group_hr_attendance"/>
+                    <field name="total_difference" groups="hr_attendance.group_hr_attendance"/>
+                </form>
+            </field>
+        </record>
 
-               <record model="ir.ui.view" id="hr_timesheet_account_tree">
-                       <field name="name">hr.timesheet.account.tree</field>
-                       <field name="model">hr_timesheet_sheet.sheet.account</field>
-                       <field name="type">tree</field>
-                       <field name="arch" type="xml">
-                               <tree string="Timesheet by accounts">
-                                       <field name="sheet_id"/>
-                                       <field name="name"/>
-                                       <field name="total"/>
-                                       <field name="invoice_rate"/>
-                               </tree>
-                       </field>
-               </record>
+        <record id="hr_timesheet_day_tree" model="ir.ui.view">
+            <field name="name">hr.timesheet.day.tree</field>
+            <field name="model">hr_timesheet_sheet.sheet.day</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree colors="red:total_difference&lt;0.1;blue:total_difference&gt;=0.1" string="Timesheet by Days">
+                    <field name="sheet_id"/>
+                    <field name="name"/>
+                    <field name="total_timesheet" sum="Total Timesheet"/>
+                    <field name="total_attendance" sum="Total Attendance" groups="hr_attendance.group_hr_attendance"/>
+                    <field name="total_difference" sum="Total Difference" groups="hr_attendance.group_hr_attendance"/>
+                </tree>
+            </field>
+        </record>
+-->
+        <record id="hr_timesheet_sheet_form" model="ir.ui.view">
+            <field name="name">hr.timesheet.sheet.form</field>
+            <field name="model">hr_timesheet_sheet.sheet</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Timesheet">
+                    <field name="name"/>
+                    <field name="user_id"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                    <field name="company_id" select="1" groups="base.group_multi_company"/>
+                    <field name="department_id" groups="base.group_extended"/>
+                    <notebook colspan="4">
+                        <page string="Daily View">
+                            <group col="6" colspan="4">
+                                <button name="button_dummy" string="Go to:" type="object" icon="gtk-redo"/>
+                                <field name="date_current" nolabel="1"/>
+                                <label string=""/>
+                                <button icon="gtk-media-previous" name="date_previous" string="" type="object"/>
+                                <button name="date_today" string="Today" type="object" icon="gtk-home"/>
+                                <button icon="gtk-media-next" name="date_next" string="" type="object"/>
+                            </group>
 
+                            <field colspan="3" context="name=date_current,user_id=user_id" height="100" name="attendances_ids" nolabel="1" groups="hr_attendance.group_hr_attendance">
+                                <tree string="Attendances" editable="bottom">
+                                    <field name="name"/>
+                                    <field name="action"/>
+                                    <field invisible="1" name="employee_id"/>
+                                </tree>
+                            </field>
+                            <group col="1" colspan="1" groups="hr_attendance.group_hr_attendance">
+                                <button name="sign_in" string="Sign In" type="object" icon="gtk-go-back"/>
+                                <button name="sign_out" string="Sign Out" type="object" icon="gtk-go-forward"/>
+                            </group>
 
+                            <field name="state_attendance" groups="hr_attendance.group_hr_attendance"/>
+                            <field name="total_attendance_day" widget="float_time" groups="hr_attendance.group_hr_attendance"/>
+                            <field colspan="4" context="date=date_current,user_id=user_id" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
+                                <tree editable="top" string="Timesheet">
+                                    <field invisible="1" name="date"/>
+                                    <field domain="[('type','=','normal'), ('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
+                                    <field name="name"/>
+                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" widget="float_time"/>
+                                    <field name="to_invoice"/>
+                                    <field invisible="1" name="journal_id"/>
+                                    <field invisible="1" name="product_id"/>
+                                    <field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                                    <field name="amount"/>
+                                    <field name="general_account_id"/>
+                                    <field invisible="1" name="user_id" required="1"/>
+                                </tree>
+                                <form string="Timesheet">
+                                    <field name="date"/>
+                                    <field domain="[('type','=','normal'), ('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
+                                    <field name="name"/>
+                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" widget="float_time"/>
+                                    <field name="to_invoice"/>
+                                    <field invisible="1" name="journal_id"/>
+                                    <field invisible="1" name="product_id"/>
+                                    <field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                                    <field name="amount"/>
+                                    <field name="general_account_id"/>
+                                    <field name="user_id" required="1"/>
+                                </form>
+                            </field>
+                            <field name="total_difference_day" widget="float_time"/>
+                            <field name="total_timesheet_day" widget="float_time"/>
+                        </page>
+                        <page string="By Day">
+                            <field colspan="4" name="period_ids" nolabel="1">
+                                <tree colors="red:total_difference&lt;0.1;blue:total_difference&gt;=0.1" string="Period">
+                                    <field name="name"/>
+                                    <field name="total_attendance" widget="float_time" groups="hr_attendance.group_hr_attendance"/>
+                                    <field name="total_timesheet" widget="float_time"/>
+                                    <field name="total_difference" widget="float_time" groups="hr_attendance.group_hr_attendance"/>
+                                </tree>
+                            </field>
+                            <group colspan="4" col="6">
+                                <field name="total_attendance" widget="float_time"/>
+                                <field name="total_timesheet" widget="float_time"/>
+                                <field name="total_difference" widget="float_time"/>
+                            </group>
+                        </page>
+                    </notebook>
+                    <field name="state"/>
+                    <group col="4" colspan="2">
+                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="gtk-execute"/>
+                        <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert"/>
+                        <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-stop"/>
+                        <button name="done" states="confirm" string="Accept" type="workflow" icon="gtk-apply"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-               <record model="ir.ui.view" id="hr_timesheet_sheet_form">
-                       <field name="name">hr.timesheet.sheet.form</field>
-                       <field name="model">hr_timesheet_sheet.sheet</field>
-                       <field name="type">form</field>
-                       <field name="arch" type="xml">
-                               <form string="Timesheet">
-                                       <field name="name" />
-                                       <field name="user_id"/>
-                                       <field name="date_from" />
-                                       <field name="date_to" />
+        <record id="view_hr_timesheet_sheet_filter" model="ir.ui.view">
+            <field name="name">hr_timesheet_sheet.sheet.filter</field>
+            <field name="model">hr_timesheet_sheet.sheet</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Timesheet">
+                    <group col="10" colspan="4">
+                        <filter icon="terp-crm" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
+                        <filter icon="terp-crm" string="To Validate" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
+                        <separator orientation="vertical"/>
+                        <field name="user_id" select="1" widget="selection"/>
+                        <field name="date_from"/>
+                        <field name="department_id" widget="selection">
+                            <filter icon="terp-crm"
+                                domain="[('department_id','=',context.get('department_id',False))]"
+                                help="My Departments Timesheet"/>
+                        </field>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
+                        <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>
+                </search>
+            </field>
+        </record>
 
-                                       <notebook colspan="4">
-                                       <page string="Daily view">
-                                               <group col="6" colspan="4">
-                                                       <button name="button_dummy" string="Go to:" type="object"/>
-                                                       <field name="date_current" nolabel="1"/>
-                                                       <label string=""/>
-                                                       <button icon="gtk-media-previous" string="" name="date_previous" type="object"/>
-                                                       <button  string="Today" name="date_today" type="object"/>
-                                                       <button icon="gtk-media-next" string="" name="date_next" type="object"/>
-                                               </group>
+        <record id="act_hr_timesheet_sheet_form" model="ir.actions.act_window">
+            <field name="name">Timesheets</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr_timesheet_sheet.sheet</field>
+            <field name="view_type">form</field>
+            <field name="view_id" eval="False"/>
+            <field name="context">{'search_default_my_timesheet':1, 'search_default_user_id':uid }</field>
+            <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
+        </record>
 
-                                               <field name="attendances_ids" colspan="3" nolabel="1" context="name=date_current,user_id=user_id" height="100">
-                                                       <tree string="Attendances">
-                                                               <field name="name"/>
-                                                               <field name="action"/>
-                                                               <field name="employee_id" invisible="True"/>
-                                                       </tree>
-                                               </field>
-                                               <group col="1" colspan="1">
-                                                       <button string="Sign In" name="sign_in" type="object"/>
-                                                       <button string="Sign Out" name="sign_out" type="object"/>
-                                               </group>
+        <!--Time Tracking menu in project Management-->
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
+          <menuitem
+             id="base.menu_project_management_time_tracking"
+             name="Time Tracking"
+             parent="base.menu_main_pm" sequence="3"/>
+         <menuitem action="hr_timesheet_sheet.act_hr_timesheet_sheet_form" id="menu_act_project_management_timesheet_sheet_form" parent="base.menu_project_management_time_tracking"
+             groups="hr.group_hr_manager" sequence="5"/>
+        <!--<menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/>-->
+        <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
+            groups="hr.group_hr_manager"/>
 
+        <!--
+            Company inheritancy
+        -->
 
-                                               <field name="state_attendance"/>
-                                               <field name="total_attendance_day" widget="float_time"/>
-                                               <field name="timesheet_ids" colspan="4" nolabel="1" domain="[('name','=',date_current)]" context="date=date_current,user_id=user_id">
-                                                       <tree string="Timesheet" editable="top">
-                                                               <field name="date" />
-                                                               <field name="account_id" on_change="on_change_account_id(account_id)" domain="[('type','=','normal'), ('state', '&lt;&gt;', 'close')]"/>
-                                                               <field name="name" />
-                                                               <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" widget="float_time"/>
-                                                               <field name="to_invoice"/>
-                                                               <field name="journal_id" invisible="True"/>
-                                                               <field name="product_id" invisible="True"/>
-                                                               <field name="product_uom_id" invisible="True" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" />
-                                                               <field name="amount" invisible="True"/>
-                                                               <field name="general_account_id" invisible="True"/>
-                                                               <field name="journal_id" invisible="True"/>
-                                                               <field name="user_id" required="1" invisible="True"/>
-                                                       </tree>
-                                               </field>
-                                               <field name="total_difference_day" widget="float_time"/>
-                                               <field name="total_timesheet_day" widget="float_time"/>
-                                       </page>
-                                       <page string="By day">
-                                               <field name="period_ids" colspan="4" nolabel="1">
-                                                       <tree string="Period" colors="red:total_difference&lt;=0.1;blue:total_difference&gt;=0.1">
-                                                               <field name="name"/>
-                                                               <field name="total_attendance" widget="float_time"/>
-                                                               <field name="total_timesheet" widget="float_time"/>
-                                                               <field name="total_difference" widget="float_time"/>
-                                                       </tree>
-                                               </field>
-                                               <field name="total_attendance" widget="float_time"/>
-                                               <field name="total_timesheet" widget="float_time"/>
-                                               <field name="total_difference" widget="float_time"/>
-                                       </page>
-                                       <page string="By account">
-                                               <field name="account_ids" colspan="4" nolabel="1">
-                                                       <tree string="Analytic accounts">
-                                                               <field name="name"/>
-                                                               <field name="total" widget="float_time"/>
-                                                               <field name="invoice_rate"/>
-                                                       </tree>
-                                               </field>
-                                       </page>
-                                       </notebook>
-                                               <field name="state"/>
-                                               <group col="4" colspan="2">
-                                                       <button string="Confirm" name="button_confirm" states="draft" type="object"/>
-                                                       <button string="Set to Draft" name="action_set_to_draft" states="done" type="object"/>
-                                                       <button string="Refuse" name="cancel" states="confirm"/>
-                                                       <button string="Accept" name="done" states="confirm"/>
-                                               </group>
-                               </form>
-                       </field>
-               </record>
+        <record id="hr_timesheet_sheet_company" model="ir.ui.view">
+            <field name="name">res.company.sheet</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <page string="Configuration" position="inside">
+                    <separator string="Timesheets" colspan="4"/>
+                    <field name="timesheet_range"/>
+                    <field name="timesheet_max_difference"/>
+                    <newline/>
+                </page>
+            </field>
+        </record>
 
-               <record model="ir.actions.act_window" id="act_hr_timesheet_sheet_form">
-                       <field name="type">ir.actions.act_window</field>
-                       <field name="res_model">hr_timesheet_sheet.sheet</field>
-                       <field name="view_type">form</field>
-                       <field name="view_id" ref="hr_timesheet_sheet_form" />
-               </record>
-               <menuitem name="Human Resources/Timesheets/All timesheets"
-                       id="menu_act_hr_timesheet_sheet_form"
-                       action="act_hr_timesheet_sheet_form" />
+        <!--
+            hr.analytic.timesheet inheritancy
+        -->
 
-               <record model="ir.actions.act_window" id="act_hr_timesheet_sheet_form_my">
-                       <field name="name">My timesheets</field>
-                       <field name="type">ir.actions.act_window</field>
-                       <field name="res_model">hr_timesheet_sheet.sheet</field>
-                       <field name="domain">[('user_id','=',uid)]</field>
-                       <field name="view_type">form</field>
-                       <field name="view_mode">tree,form</field>
-               </record>
-               <menuitem name="Human Resources/Timesheets/My timesheets"
-                       id="menu_act_hr_timesheet_sheet_form_my"
-                       action="act_hr_timesheet_sheet_form_my" />
+        <record id="hr_timesheet_line_form" model="ir.ui.view">
+            <field name="name">hr.analytic.timesheet.form</field>
+            <field name="model">hr.analytic.timesheet</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
+            <field name="arch" type="xml">
+                <field name="date" position="after">
+                    <field name="sheet_id" />
+                </field>
+            </field>
+        </record>
+        <!--
+            hr.attendance inheritancy
+        -->
 
-               <record model="ir.actions.act_window" id="act_hr_timesheet_sheet_form_my_confirm">
-                       <field name="name">My timesheets to confirm</field>
-                       <field name="type">ir.actions.act_window</field>
-                       <field name="res_model">hr_timesheet_sheet.sheet</field>
-                       <field name="domain">[('user_id','=',uid),('state','=','draft'),('date_to','&lt;=',time.strftime('%Y-%m-%d'))]</field>
-                       <field name="view_type">form</field>
-                       <field name="view_mode">tree,form</field>
-               </record>
-               <menuitem name="Human Resources/Timesheets/My timesheets/My timesheets to confirm"
-                       id="menu_act_hr_timesheet_sheet_form_my_confirm"
-                       action="act_hr_timesheet_sheet_form_my_confirm" />
+        <record model="ir.ui.view" id="view_hr_attendance_filter">
+            <field name="name">view_hr_attendance_filter</field>
+            <field name="model">hr.attendance</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="hr_attendance.view_hr_attendance_filter" />
+            <field name="arch" type="xml">
+                <field name="action" position="after">
+                    <field name="sheet_id" select="1" />
+                </field>
+            </field>
+        </record>
 
-               <wizard string="My department's timesheet"
-                       model="hr.employee"
-                       name="hr_timesheet_sheet.department.open"
-                       id="act_hr_timesheet_sheet_form_department_current"/>
-               <menuitem name="Human Resources/Timesheets/My department's timesheets"
-                       id="menu_act_hr_timesheet_sheet_form_department_current"
-                       action="act_hr_timesheet_sheet_form_department_current"
-                       icon="STOCK_JUSTIFY_FILL"
-                       type="wizard"/>
+        <record id="view_attendance_form" model="ir.ui.view">
+            <field name="name">hr.attendance.form</field>
+            <field name="model">hr.attendance</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr_attendance.view_attendance_form"/>
+            <field name="arch" type="xml">
+                <field name="action_desc" position="after">
+                    <field name="sheet_id"/>
+                </field>
+            </field>
+        </record>
+        <record id="view_attendance_tree" model="ir.ui.view">
+            <field name="name">hr.attendance.tree</field>
+            <field name="model">hr.attendance</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="hr_attendance.view_attendance_tree"/>
+            <field name="arch" type="xml">
+                <field name="action" position="after">
+                    <field name="sheet_id"/>
+                </field>
+            </field>
+        </record>
+        <record id="view_attendance_tree_who" model="ir.ui.view">
+            <field name="name">hr.attendance.tree</field>
+            <field name="model">hr.attendance</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="hr_attendance.view_attendance_who"/>
+            <field name="arch" type="xml">
+                <field name="action" position="after">
+                    <field name="sheet_id"/>
+                </field>
+            </field>
+        </record>
 
-               <wizard string="My department's timesheet"
-                       model="hr.employee"
-                       name="hr_timesheet_sheet.department.validate.open"
-                       id="act_hr_timesheet_sheet_form_department_validate"/>
-               <menuitem name="Human Resources/Timesheets/My department's timesheets/Timesheets to validate"
-                       id="menu_act_hr_timesheet_sheet_form_department_validate"
-                       action="act_hr_timesheet_sheet_form_department_validate"
-                       icon="STOCK_JUSTIFY_FILL"
-                       type="wizard"/>
+        <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_by_day" name="Timesheet by Account" res_model="hr_timesheet_sheet.sheet.account" src_model="hr_timesheet_sheet.sheet"/>
+<!--         <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_by_account" name="Timesheet by Day" res_model="hr_timesheet_sheet.sheet.day" src_model="hr_timesheet_sheet.sheet"/>  -->
 
 
-               <wizard string="My department's timesheet"
-                       model="hr.employee"
-                       name="hr_timesheet_sheet.department.confirm.open"
-                       id="act_hr_timesheet_sheet_form_department_confirm"/>
-               <menuitem name="Human Resources/Timesheets/My department's timesheets/Timesheets to confirm"
-                       id="menu_act_hr_timesheet_sheet_form_department_confirm"
-                       action="act_hr_timesheet_sheet_form_department_confirm"
-                       icon="STOCK_JUSTIFY_FILL"
-                       type="wizard"/>
+        <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet" name="Timesheet Lines" res_model="hr.analytic.timesheet" src_model="hr_timesheet_sheet.sheet"/>
 
+        <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_2_hr_attendance" name="Attendances" res_model="hr.attendance" src_model="hr_timesheet_sheet.sheet"/>
 
+        <record id="hr_timesheet_sheet_tree_simplified" model="ir.ui.view">
+            <field name="name">hr.timesheet.sheet.tree.simplified</field>
+            <field name="model">hr_timesheet_sheet.sheet</field>
+            <field name="type">tree</field>
+            <field eval="20" name="priority"/>
+            <field name="arch" type="xml">
+                <tree string="Timesheets">
+                    <field name="date_from"/>
+                    <field name="user_id"/>
+                    <field name="name"/>
+                    <field name="total_attendance"/>
+                    <field name="total_timesheet"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
 
+       <!-- Timesheet Button on Employee Form -->
+       <act_window domain="[('user_id', '=', user_id)]" id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
 
-               <wizard string="My current timesheet"
-                       model="hr.employee"
-                       name="hr_timesheet_sheet.current.open"
-                       id="act_hr_timesheet_sheet_form_my_current"/>
-               <menuitem name="Human Resources/Timesheets/My timesheets/My current timesheet"
-                       id="menu_act_hr_timesheet_sheet_form_my_current"
-                       action="act_hr_timesheet_sheet_form_my_current"
-                       icon="STOCK_NEW"
-                       type="wizard"/>
-
-               <record model="ir.actions.act_window" id="act_hr_timesheet_sheet_form_all_confirm">
-                       <field name="name">Timesheets to confirm</field>
-                       <field name="type">ir.actions.act_window</field>
-                       <field name="res_model">hr_timesheet_sheet.sheet</field>
-                       <field name="domain">[('state','=','draft'),('date_to','&lt;=',time.strftime('%Y-%m-%d'))]</field>
-                       <field name="view_type">form</field>
-                       <field name="view_mode">tree,form</field>
-               </record>
-               <menuitem name="Human Resources/Timesheets/All timesheets/Timesheets to confirm"
-                       id="menu_act_hr_timesheet_sheet_form_all_confirm"
-                       action="act_hr_timesheet_sheet_form_all_confirm" />
-
-               <record model="ir.actions.act_window" id="act_hr_timesheet_sheet_form_all_valid">
-                       <field name="name">Timesheets to validate</field>
-                       <field name="type">ir.actions.act_window</field>
-                       <field name="res_model">hr_timesheet_sheet.sheet</field>
-                       <field name="domain">[('state','=','confirm')]</field>
-                       <field name="view_type">form</field>
-                       <field name="view_mode">tree,form</field>
-               </record>
-               <menuitem name="Human Resources/Timesheets/All timesheets/Timesheets to validate"
-                       id="menu_act_hr_timesheet_sheet_form_all_valid"
-                       action="act_hr_timesheet_sheet_form_all_valid" />
-
-               <!--
-                       Company inheritancy
-               -->
-
-               <record model="ir.ui.view" id="hr_timesheet_sheet_company">
-                       <field name="name">res.company.sheet</field>
-                       <field name="model">res.company</field>
-                       <field name="type">form</field>
-                       <field name="inherit_id" ref="base.view_company_form"/>
-                       <field name="arch" type="xml">
-                               <field name="rml_footer2" position="after">
-                                       <newline/>
-                                       <field name="timesheet_range"/>
-                                       <field name="timesheet_max_difference"/>
-                                       <newline/>
-                               </field>
-                       </field>
-               </record>
-
-               <!--
-                       hr.analytic.timesheet inheritancy
-               -->
-
-               <record model="ir.ui.view" id="hr_timesheet_line_tree">
-                       <field name="name">hr.analytic.timesheet.tree</field>
-                       <field name="model">hr.analytic.timesheet</field>
-                       <field name="type">tree</field>
-                       <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
-                       <field name="arch" type="xml">
-                               <field name="date" position="after">
-                                       <field name="sheet_id"/>
-                               </field>
-                       </field>
-               </record>
-               <record model="ir.ui.view" id="hr_timesheet_line_form">
-                       <field name="name">hr.analytic.timesheet.form</field>
-                       <field name="model">hr.analytic.timesheet</field>
-                       <field name="type">form</field>
-                       <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
-                       <field name="arch" type="xml">
-                               <field name="date" position="after">
-                                       <field name="sheet_id"/>
-                               </field>
-                       </field>
-               </record>
-
-               <!--
-                       hr.attendance inheritancy
-               -->
-
-               <record model="ir.ui.view" id="view_attendance_form">
-                       <field name="name">hr.attendance.form</field>
-                       <field name="model">hr.attendance</field>
-                       <field name="type">form</field>
-                       <field name="inherit_id" ref="hr.view_attendance_form"/>
-                       <field name="arch" type="xml">
-                               <field name="action_desc" position="after">
-                                       <field name="sheet_id"/>
-                               </field>
-                       </field>
-               </record>
-               <record model="ir.ui.view" id="view_attendance_tree">
-                       <field name="name">hr.attendance.tree</field>
-                       <field name="model">hr.attendance</field>
-                       <field name="type">tree</field>
-                       <field name="inherit_id" ref="hr.view_attendance_tree"/>
-                       <field name="arch" type="xml">
-                               <field name="action_desc" position="after">
-                                       <field name="sheet_id"/>
-                               </field>
-                       </field>
-               </record>
-
-               <act_window name="Timesheet lines"
-                       domain="[('sheet_id', '=', active_id)]"
-                       res_model="hr.analytic.timesheet"
-                       src_model="hr_timesheet_sheet.sheet"
-                       id="act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet"/>
-
-               <act_window name="Attendances"
-                       domain="[('sheet_id', '=', active_id)]"
-                       res_model="hr.attendance"
-                       src_model="hr_timesheet_sheet.sheet"
-                       id="act_hr_timesheet_sheet_sheet_2_hr_attendance"/>
-
-       </data>
-</terp>
+    </data>
+</openerp>