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

hr_timesheet_sheet: gui improvement : new button and other button moved 

bzr revid: bch-c8e404f61a3a09c6925a0db0c2fffd0f757eeb3f
This commit is contained in:
bch 2007-04-25 12:37:56 +00:00
parent e430c8ef88
commit 7cdc2697f7
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
View File

@ -187,7 +187,9 @@ class hr_timesheet_sheet(osv.osv):
'date_current': (DateTime.strptime(sheet.date_current, '%Y-%m-%d') + DateTime.RelativeDateTime(days=1)).strftime('%Y-%m-%d'),
})
return True
def button_dummy(self, cr, uid, ids, context):
return True
def sign_in(self, cr, uid, ids, context):
if not self.browse(cr, uid, ids, context)[0].date_current == time.strftime('%Y-%m-%d'):
raise osv.except_osv('Error !', 'You can not sign in from an other date than today')

31
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
View File

@ -49,21 +49,28 @@
<notebook colspan="4">
<page string="Daily view">
<group col="4" colspan="2">
<group col="6" colspan="4">
<button name="button_dummy" string="Go to:" type="object"/>
<field name="date_current" nolabel="1"/>
<label string=""/>
<button icon="gtk-media-previous" string="" name="date_previous" type="object"/>
<button icon="gtk-jump-to" string="" name="date_today" type="object"/>
<button string="Today" name="date_today" type="object"/>
<button icon="gtk-media-next" string="" name="date_next" type="object"/>
</group>
<button string="Sign In" name="sign_in" type="object"/>
<button string="Sign Out" name="sign_out" type="object"/>
<field name="attendances_ids" colspan="4" nolabel="1" context="name=date_current,user_id=user_id" height="100">
<field name="attendances_ids" colspan="3" nolabel="1" context="name=date_current,user_id=user_id" height="100">
<tree string="Attendances">
<field name="name"/>
<field name="action"/>
<field name="employee_id" invisible="True"/>
</tree>
</field>
<group col="1" colspan="1">
<button string="Sign In" name="sign_in" type="object"/>
<button string="Sign Out" name="sign_out" type="object"/>
</group>
<field name="state_attendance"/>
<field name="total_attendance_day" widget="float_time"/>
<field name="timesheet_ids" colspan="4" nolabel="1" domain="[('name','=',date_current)]" context="date=date_current,user_id=user_id">
@ -84,13 +91,6 @@
</field>
<field name="total_difference_day" widget="float_time"/>
<field name="total_timesheet_day" widget="float_time"/>
<field name="state"/>
<group col="4" colspan="2">
<button string="Confirm" name="button_confirm" states="draft" type="object"/>
<button string="Cancel" name="cancel" states="done"/>
<button string="Refuse" name="cancel" states="confirm"/>
<button string="Accept" name="done" states="confirm"/>
</group>
</page><page string="By day">
<field name="period_ids" colspan="4" nolabel="1">
<tree string="Period" colors="red:total_difference&lt;=0.1;blue:total_difference&gt;=0.1">
@ -113,6 +113,13 @@
</field>
</page>
</notebook>
<field name="state"/>
<group col="4" colspan="2">
<button string="Confirm" name="button_confirm" states="draft" type="object"/>
<button string="Cancel" name="cancel" states="done"/>
<button string="Refuse" name="cancel" states="confirm"/>
<button string="Accept" name="done" states="confirm"/>
</group>
</form>
</field>
</record>