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

[MOD/IMP] hr_contract: Usability Improvement 

bzr revid: dbr@tinyerp.com-20100831132859-qcauhvszvui87udx
This commit is contained in:
DBR (OpenERP) 2010-08-31 18:58:59 +05:30
parent 7cb9677b2c
commit 5ca781f537
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
addons/hr_contract/hr_contract_data.xml
View File

@ -24,7 +24,20 @@
<field name="name">Monthly Net Wage</field>
<field name="type">net</field>
<field name="period_id" ref="hr_contract_wage_type_period_monthly"/>
</record>
</record>
<!-- Contract Types -->
<record id="hr_contract_type_emp" model="hr.contract.type">
<field name="name">Employee</field>
</record>
<record id="hr_contract_type_wrkr" model="hr.contract.type">
<field name="name">Worker</field>
</record>
<record id="hr_contract_type_sub" model="hr.contract.type">
<field name="name">Subcontractor</field>
</record>
</data>
</openerp>

14
addons/hr_contract/hr_contract_view.xml
View File

@ -154,8 +154,11 @@
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="20">
<filter string="Wage Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'wage_type_id'}"/>
<filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
<filter string="Working Schedule" icon="terp-personal+" domain="[]" context="{'group_by':'working_hours'}"/>
<filter string="Current" icon="terp-stock_symbol-selection"
domain="[('date_end','&gt;=', time.strftime('%%Y-%%m-%%d'))]"
context="{'group_by':'date_end'}"/>
</group>
</search>
</field>
@ -182,7 +185,7 @@
<field name="date_start" />
<field name="date_end" />
<field name="working_hours"/>
</group>
</group>
<group col="2" colspan="2">
<separator colspan="2" string="Advantages"/>
<field name="advantages_net"/>
@ -207,11 +210,12 @@
<field name="employee_id"/>
<field name="job_id"/>
<field name="department_id"/>
<field name="working_hours"/>
<field name="date_start"/>
<field name="date_end"/>
<field name="working_hours"/>
<field name="wage_type_id"/>
<field name="wage"/>
<field name="wage_type_id" invisible="1"/>
<field name="wage" invisible="1"/>
<field name="type_id"/>
</tree>
</field>
</record>