pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] sync with latest trunk

Browse Source 
bzr revid: odo@openerp.com-20111103005313-xxlshd2jqkf0ke0u
This commit is contained in:
Olivier Dony
2011-11-03 01:53:13 +01:00
parent 66f9bd69d5 b3664a2c49
commit 39e8e468d7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_timesheet/test/test_hr_timesheet.yml
+2 -2
View File
@@ -79,7 +79,7 @@
!record {model: hr.attendance, id: hr_attendance_0}:
action: sign_in
employee_id: 'hr_employee_fracline1'
name: !eval time.strftime('%Y-%m-%d')+' '+'%s:%s:%s' %(datetime.now().hour-2,datetime.now().minute,datetime.now().second)
name: !eval (datetime.now()-timedelta(hours=2)).strftime('%Y-%m-%d %H:%M:%S')
-
I create attendance and perform "Sign Out" action.
@@ -87,7 +87,7 @@
!record {model: hr.attendance, id: hr_attendance_1}:
action: sign_out
employee_id: 'hr_employee_fracline1'
name: !eval time.strftime('%Y-%m-%d')+' '+'%s:%s:%s' %(datetime.now().hour-1,datetime.now().minute,datetime.now().second)
name: !eval (datetime.now()-timedelta(hours=1)).strftime('%Y-%m-%d %H:%M:%S')
-
On "Sign In/Sign Out by Project" wizard i click on "Sign In/Sign Out" button of this wizard.