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

[FIX] hr_payroll : Impossible to remove elements from the Employee payslip list view 

lp bug: https://launchpad.net/bugs/885673 fixed

bzr revid: mdi@tinyerp.com-20111109053906-pfedy5myoj54vcx5
This commit is contained in:
Divyesh Makwana (Open ERP) 2011-11-09 11:09:06 +05:30
parent 9fd3158961
commit f2d356f857
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/hr_payroll/hr_payroll.py
View File

@ -712,7 +712,7 @@ class hr_payslip_worked_days(osv.osv):
_description = 'Payslip Worked Days'
_columns = {
'name': fields.char('Description', size=256, required=True),
'payslip_id': fields.many2one('hr.payslip', 'Pay Slip', required=True),
'payslip_id': fields.many2one('hr.payslip', 'Pay Slip', required=True, ondelete='cascade'),
'sequence': fields.integer('Sequence', required=True,),
'code': fields.char('Code', size=52, required=True, help="The code that can be used in the salary rules"),
'number_of_days': fields.float('Number of Days'),
@ -734,7 +734,7 @@ class hr_payslip_input(osv.osv):
_description = 'Payslip Input'
_columns = {
'name': fields.char('Description', size=256, required=True),
'payslip_id': fields.many2one('hr.payslip', 'Pay Slip', required=True),
'payslip_id': fields.many2one('hr.payslip', 'Pay Slip', required=True, ondelete='cascade'),
'sequence': fields.integer('Sequence', required=True,),
'code': fields.char('Code', size=52, required=True, help="The code that can be used in the salary rules"),
'amount': fields.float('Amount', help="It is used in computation. For e.g. A rule for sales having 1% commission of basic salary for per product can defined in expression like result = inputs.SALEURO.amount * contract.wage*0.01."),
@ -823,7 +823,7 @@ result = rules.NET > categories.NET * 0.10''',
'amount_percentage': 0.0,
'quantity': '1.0',
}
def _recursive_search_of_rules(self, cr, uid, rule_ids, context=None):
"""
@param rule_ids: list of browse record
@ -919,7 +919,7 @@ class hr_payslip_line(osv.osv):
return res
_columns = {
'slip_id':fields.many2one('hr.payslip', 'Pay Slip', required=True),
'slip_id':fields.many2one('hr.payslip', 'Pay Slip', required=True, ondelete='cascade'),
'salary_rule_id':fields.many2one('hr.salary.rule', 'Rule', required=True),
'employee_id':fields.many2one('hr.employee', 'Employee', required=True),
'contract_id':fields.many2one('hr.contract', 'Contract', required=True),