<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
+
<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>
</form>
</field>
</record>
-
+ <record id="hr_timesheet_account_filter" model="ir.ui.view">
+ <field name="name">hr.timesheet.account.filter</field>
+ <field name="model">hr_timesheet_sheet.sheet.account</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Search Account">
+ <group>
+ <field name="sheet_id" />
+ <field name="name" groups="analytic.group_analytic_accounting"/>
+ <field name="invoice_rate"/>
+ </group>
+ </search>
+ </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="arch" type="xml">
<form string="Timesheet">
<group colspan="4" col="6">
+ <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
+ <field name="user_id" invisible="1"/>
+ <field name="date_from"/>
+ <field name="date_to"/>
+ <newline/>
<field name="name"/>
<field name="company_id" select="1" groups="base.group_multi_company"/>
<field name="department_id" groups="base.group_extended"/>
- <newline/>
- <field name="employee_id"/>
- <field name="date_from"/>
- <field name="date_to"/>
</group>
<notebook colspan="4">
- <page string="Daily View">
+ <page string="Daily">
<group col="6" colspan="4">
<button name="button_dummy" string="Go to:" type="object" icon="terp-gtk-jump-to-ltr"/>
<field name="date_current" nolabel="1"/>
<button icon="terp-gtk-go-back-rtl" 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">
+ <field colspan="3" context="{'name':date_current,'user_id':user_id}" height="100" name="attendances_ids" nolabel="1">
<tree string="Attendances" editable="bottom">
<field name="name"/>
<field name="action"/>
<field invisible="1" name="employee_id"/>
</tree>
</field>
- <group col="1" colspan="1">
+ <group col="4" colspan="1">
+ <field name="state_attendance"/>
<button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
<button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
+ <field name="total_attendance_day" widget="float_time" colspan="4"/>
</group>
- <field name="state_attendance"/>
- <field name="total_attendance_day" widget="float_time"/>
- <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 colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
+ <tree editable="top" string="Timesheet Lines">
<field invisible="1" name="date"/>
<field domain="[('type','=','normal'), ('state', '<>', '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, False, product_uom_id,journal_id)" widget="float_time"/>
- <field name="to_invoice"/>
+ <field name="to_invoice" widget="selection"/>
<field invisible="1" name="journal_id"/>
<field invisible="1" name="product_id" domain="[('type','=','service')]" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
<field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
<field invisible="1" name="general_account_id"/>
<field invisible="1" name="user_id" required="1"/>
</tree>
- <form string="Timesheet">
+ <form string="Timesheet Lines">
<field name="date"/>
<field domain="[('type','=','normal'), ('state', '<>', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
<field name="name"/>
<field name="total_difference_day" widget="float_time"/>
<field name="total_timesheet_day" widget="float_time"/>
</page>
- <page string="By Day">
+ <page string="Summary">
<field colspan="4" name="period_ids" nolabel="1">
<tree colors="red:total_difference<0.1;blue:total_difference>=0.1" string="Period">
<field name="name"/>
</page>
</notebook>
<group col="6" colspan="4">
- <field name="state"/>
- <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-check"/>
+ <field name="state" widget="statusbar" statusbar_visible="new,confirm,done"/>
+ <button name="button_confirm" states="draft" string="Submited to Manager" type="object" icon="terp-check"/>
<button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
- <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel"/>
- <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test"/>
+ <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_user"/>
+ <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test" groups="base.group_hr_user"/>
</group>
</form>
</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Timesheet">
- <group col="10" colspan="4">
+ <group>
<filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
<filter icon="terp-camera_test" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
<separator orientation="vertical"/>
- <field name="employee_id" select="1"/>
+ <field name="employee_id"/>
<field name="date_from"/>
<field name="department_id" widget="selection">
<filter icon="terp-personal+"
<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, }</field>
+ <field name="context">{'search_default_my_timesheet':1}</field>
<field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
- <field name="help">Employees can encode their time spent on the different projects. A project is an analytic account and the time spent on a project generate costs on the analytic account.</field>
+ <field name="help">Check your timesheets for a specific period. You can also encode time spent on a project (i.e. an analytic account) thus generating costs in the analytic account concerned.</field>
</record>
- <!--Time Tracking menu in project Management-->
- <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
- <menuitem
- id="base.menu_project_management_time_tracking"
- name="Time Tracking"
- parent="base.menu_main_pm" sequence="5"/>
-
<menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
- sequence="2"/>
-
- <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"
- sequence="5"/>
+ sequence="2" groups="base.group_hr_user,base.group_hr_manager"/>
<!--
Company inheritancy
</record>
<act_window
- context="{'search_default_sheet_id': [active_id]}"
+ context="{'search_default_sheet_id': [active_id], 'default_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
- context="{'search_default_sheet_id': [active_id]}"
+ context="{'search_default_sheet_id': [active_id], 'default_sheet_id': active_id}"
id="act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet"
name="Timesheet Lines"
res_model="hr.analytic.timesheet"
<act_window
- context="{'search_default_sheet_id': [active_id]}"
+ context="{'search_default_sheet_id': [active_id], 'default_sheet_id': active_id}"
id="act_hr_timesheet_sheet_sheet_2_hr_attendance"
name="Attendances"
res_model="hr.attendance"
<field name="type">tree</field>
<field eval="10" name="priority"/>
<field name="arch" type="xml">
- <tree colors="blue:state in ('draft');black:state in ('confirm','new');gray:state in('done')" string="Timesheets">
+ <tree colors="blue:state == 'draft';black:state in ('confirm','new');gray:state == 'done'" string="Timesheets">
<field name="employee_id"/>
<field name="date_from"/>
<field name="date_to"/>
<field name="department_id"/>
- <field name="total_attendance"/>
- <field name="total_timesheet"/>
- <field name="total_difference"/>
+ <field name="total_attendance" widget="float_time"/>
+ <field name="total_timesheet" widget="float_time"/>
+ <field name="total_difference" widget="float_time"/>
<field name="state"/>
</tree>
</field>
</record>
<!-- Timesheet Button on Employee Form -->
<act_window
- context="{'search_default_employee_id': [active_id]}"
+ context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
</data>
projects / odoo / odoo.git / blobdiff