[IMP] improve Other Information tab view of payslip
bzr revid: psi@tinyerp.co.in-20110401104932-v71cdub1pse5543h
This commit is contained in:
parent
b78fdb96ec
commit
5e571864f7
|
@ -488,7 +488,6 @@ class hr_payslip(osv.osv):
|
|||
for hday in holiday_pool.browse(cr, uid, leave_ids, context=context):
|
||||
salary_rules = salary_rule_pool.search(cr, uid, [('code', '=', hday.holiday_status_id.code)], context=context)
|
||||
rules += salary_rule_pool.browse(cr, uid, salary_rules, context=context)
|
||||
|
||||
res[record.id] = {}
|
||||
for st in structure:
|
||||
if st:
|
||||
|
|
|
@ -297,17 +297,17 @@
|
|||
<field name="holiday_ids" colspan="4" nolabel="1" editable="bottom"/>
|
||||
</page>
|
||||
|
||||
<page string="Other Information">
|
||||
<group col="2" colspan="1">
|
||||
<separator colspan="2" string="Other Information"/>
|
||||
<field name="paid" readonly="1"/>
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
<page string="Other Information">
|
||||
<separator colspan="4" string="Other Information"/>
|
||||
<group col="5" colspan="2">
|
||||
<field name="register_id" groups="base.group_extended"/>
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
<field name="paid" readonly="1"/>
|
||||
</group>
|
||||
<newline/>
|
||||
<separator colspan="4" string="Description"/>
|
||||
<field name="note" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
</page>
|
||||
|
||||
</notebook>
|
||||
<group col="10" colspan="4">
|
||||
|
|
Loading…
Reference in New Issue