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

[IMP] hr_contract, hr_timesheet_sheet : improvements

Browse Source 
bzr revid: vir@tinyerp.com-20101007084838-z09rntox0nrecgih
This commit is contained in:
Vir (Open ERP)
2010-10-07 14:18:38 +05:30
parent 389a623545
commit 393ae5bfcd
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_contract/hr_contract_view.xml
+6 -5
View File
@@ -146,6 +146,9 @@
<field name="arch" type="xml">
<search string="Search Contract">
<group col='15' colspan='4'>
<filter string="Current" icon="terp-check" name="current" domain="[('date_end','&gt;=', time.strftime('%%Y-%%m-%%d'))]" context="{'group_by':'date_end'}" help="Contracts in progress"/>
<filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','&lt;', time.strftime('%%Y-%%m-%%d'))]" context="{'group_by':'date_end'}" help="Contracts whose end date already passed"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="employee_id"/>
<field name="working_hours"/>
@@ -154,11 +157,9 @@
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="20">
<filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
<filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
<filter string="Current" icon="terp-stock_symbol-selection" name="current"
domain="[('date_end','&gt;=', time.strftime('%%Y-%%m-%%d'))]"
context="{'group_by':'date_end'}"/>
<filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
<filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
<filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
</group>
</search>
</field>
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+4 -4
View File
@@ -67,19 +67,19 @@
<button icon="terp-gtk-go-back-rtl" name="date_next" string="" type="object"/>
</group>
<field colspan="3" context="name=date_current,user_id=user_id" height="100" name="attendances_ids" nolabel="1" groups="base.group_hr_attendance">
<field colspan="3" context="name=date_current,user_id=user_id" height="100" name="attendances_ids" nolabel="1">
<tree string="Attendances" editable="bottom">
<field name="name"/>
<field name="action"/>
<field invisible="1" name="employee_id"/>
</tree>
</field>
<group col="1" colspan="1" groups="base.group_hr_attendance">
<group col="1" colspan="1">
<button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
<button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
</group>
<field name="state_attendance" groups="base.group_hr_attendance"/>
<field name="total_attendance_day" widget="float_time" groups="base.group_hr_attendance"/>
<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">
<field invisible="1" name="date"/>