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

[MERGE] bugfix of bug number 720627 

bzr revid: qdp-launchpad@openerp.com-20110225133259-qy3a7b11tuktgfb1
This commit is contained in:
Quentin (OpenERP) 2011-02-25 14:32:59 +01:00
parent e9b0d86ea6 55ae3a8683
commit f1e62cf560
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/hr_timesheet/hr_timesheet_view.xml
View File

@ -84,14 +84,14 @@
</record>
<record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window">
<field name="name">Working Hours</field>
<field name="name">Timesheet Lines</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.analytic.timesheet</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="context">{"search_default_user_id":uid, "search_default_today":1}</field>
<field name="search_view_id" ref="hr_timesheet_line_search"/>
<field name="help">Through Working Hours you can register your working hours by project every day.</field>
<field name="help">Through this menu you can register and follow your workings hours by project every day.</field>
</record>
<menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>

4
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
View File

@ -96,7 +96,7 @@
<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">
<tree editable="top" string="Timesheet Lines">
<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"/>
@ -109,7 +109,7 @@
<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', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
<field name="name"/>