Removed date_current more
bzr revid: nicolas.vanhoren@openerp.com-20121002151520-q1m2tpgbfmcvxzux
This commit is contained in:
parent
add8348f4b
commit
66b62190c7
|
@ -6,7 +6,6 @@
|
||||||
<field name="name">Sheet 1</field>
|
<field name="name">Sheet 1</field>
|
||||||
<field name="user_id" ref="base.user_root"/>
|
<field name="user_id" ref="base.user_root"/>
|
||||||
<field name="employee_id" ref="hr.employee_fp" />
|
<field name="employee_id" ref="hr.employee_fp" />
|
||||||
<field eval="time.strftime('%Y-%m-%d')" name="date_current"/>
|
|
||||||
</record>
|
</record>
|
||||||
-->
|
-->
|
||||||
</data>
|
</data>
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
I create a timesheet for employee "Quentin Paolinon".
|
I create a timesheet for employee "Quentin Paolinon".
|
||||||
-
|
-
|
||||||
!record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
|
!record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
|
||||||
date_current: !eval time.strftime('%Y-%m-%d')
|
|
||||||
date_from: !eval time.strftime('%Y-%m-01')
|
date_from: !eval time.strftime('%Y-%m-01')
|
||||||
name: Quentin Paolinon
|
name: Quentin Paolinon
|
||||||
state: new
|
state: new
|
||||||
|
|
|
@ -42,7 +42,6 @@ class hr_timesheet_current_open(osv.osv_memory):
|
||||||
view_type = 'tree,form'
|
view_type = 'tree,form'
|
||||||
domain = "[('id','in',["+','.join(map(str, ids))+"]),('user_id', '=', uid)]"
|
domain = "[('id','in',["+','.join(map(str, ids))+"]),('user_id', '=', uid)]"
|
||||||
elif len(ids)==1:
|
elif len(ids)==1:
|
||||||
ts.write(cr, uid, ids, {'date_current': time.strftime('%Y-%m-%d')}, context=context)
|
|
||||||
domain = "[('user_id', '=', uid)]"
|
domain = "[('user_id', '=', uid)]"
|
||||||
else:
|
else:
|
||||||
domain = "[('user_id', '=', uid)]"
|
domain = "[('user_id', '=', uid)]"
|
||||||
|
|
|
@ -45,7 +45,6 @@
|
||||||
Create a timesheet sheet for HR manager
|
Create a timesheet sheet for HR manager
|
||||||
-
|
-
|
||||||
!record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_sheetforhrmanager0}:
|
!record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_sheetforhrmanager0}:
|
||||||
date_current: !eval time.strftime('%Y-05-%d')
|
|
||||||
date_from: !eval "'%s-05-01' %(datetime.now().year)"
|
date_from: !eval "'%s-05-01' %(datetime.now().year)"
|
||||||
date_to: !eval "'%s-05-31' %(datetime.now().year)"
|
date_to: !eval "'%s-05-31' %(datetime.now().year)"
|
||||||
name: Sheet for hr manager
|
name: Sheet for hr manager
|
||||||
|
|
Loading…
Reference in New Issue