odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] + improve hr_timesheet 

bzr revid: fp@tinyerp.com-20121026075951-2hmaydu7skwhs5k2
This commit is contained in:
Fabien Pinckaers 2012-10-26 09:59:51 +02:00
parent dd3e728fb6
commit 8eb7e8ab6c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
View File

@ -324,7 +324,7 @@
<field name="employee_id"/>
<field name="date_from"/>
<field name="date_to"/>
<field name="department_id"/>
<field name="department_id" invisible="1"/>
<field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/>
<field name="total_timesheet" widget="float_time"/>
<field name="total_difference" widget="float_time" groups="base.group_hr_attendance"/>

6
addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
View File

@ -5,7 +5,7 @@
<field name="name">hr_timesheet_current_open.form</field>
<field name="model">hr.timesheet.current.open</field>
<field name="arch" type="xml">
<form string="My Current Timesheet" version="7.0">
<form string="My Timesheet" version="7.0">
<group>
<separator string="It will open your current timesheet"/>
</group>
@ -19,7 +19,7 @@
</record>
<record id="action_hr_timesheet_current_open" model="ir.actions.act_window">
<field name="name">My Current Timesheet</field>
<field name="name">My Timesheet</field>
<field name="res_model">hr.timesheet.current.open</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
@ -28,7 +28,7 @@
<field name="help">My Timesheet opens your timesheet so that you can book your activities into the system. From the same form, you can register your attendances (Sign In/Out) and describe the working hours made on the different projects. At the end of the period defined in the company, the timesheet is confirmed by the user and can be validated by his manager. If required, as defined on the project, you can generate the invoices based on the timesheet.</field>
</record>
<menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="My Current Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/>
<menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="My Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/>
</data>
</openerp>