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

[IMP] hr_payroll: improved tooltip,code and view for payslip run 

bzr revid: mtr@mtr-20110520130536-j56u80qdnvjc6iii
This commit is contained in:
mtr 2011-05-20 18:35:36 +05:30
parent c22f7fece7
commit 79b139d095
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_payroll/hr_payroll.py
View File

@ -214,7 +214,7 @@ class hr_payslip_run(osv.osv):
], 'State', select=True, readonly=True),
'date_start': fields.date('Date From', required=False),
'date_end': fields.date('Date To', required=False),
'credit_note': fields.boolean('Credit Note', help="Indicates this payslip has a refund of another"),
'credit_note': fields.boolean('Credit Note', help="If its True,indicates that payslips generated from here are refundable payslips."),
}
_defaults = {
'state': 'draft',

5
addons/hr_payroll/hr_payroll_view.xml
View File

@ -649,11 +649,12 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Payslips Run">
<group col="4" colspan="2">
<group col="6" colspan="3">
<field name="name"/>
<field name="credit_note"/>
<field name="date_start"/>
<field name="date_end"/>
<newline/>
<field name="credit_note"/>
</group>
<notebook colspan="6">
<page string="Payslips">

2
addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
View File

@ -58,7 +58,7 @@ class hr_payslip_employees(osv.osv_memory):
'worked_days_line_ids': [(0, 0, x) for x in slip_data['value'].get('worked_days_line_ids', False)]
}
slip_ids.append(slip_pool.create(cr, uid, res, context=context))
run_pool.write(cr, uid, context.get('active_ids', []), {'date_start': from_date, 'date_end': to_date})
run_pool.write(cr, uid, context.get('active_ids', []), {'date_start': from_date, 'date_end': to_date})
slip_pool.compute_sheet(cr, uid, slip_ids, context=context)
return {'type': 'ir.actions.act_window_close'}