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

[FIX] payroll 

bzr revid: mra@mra-laptop-20110404130033-rxhyg3jpwga7xaof
This commit is contained in:
Mustufa Rangwala 2011-04-04 18:30:33 +05:30
parent 9202d61260
commit 9843f42b1f
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/hr_payroll/hr_payroll.py
View File

@ -374,11 +374,12 @@ class hr_salary_head(osv.osv):
self.pool.get('res.users').browse(cr, uid, uid,
context=context).company_id.id,
# 'display_payslip_report': 1,
'sequence': 5
}
hr_salary_head()
#TODO: check me. we shouldn't need to touch the holidays
#TODO: check me. we shouldn't need to touch the holidays
#class hr_holidays_status(osv.osv):
#
# _inherit = "hr.holidays.status"
@ -495,8 +496,8 @@ class hr_payslip(osv.osv):
if r.id not in rul:
rul.append(r.id)
cr.execute('''SELECT sr.id
FROM hr_salary_rule as sr, hr_salary_head as sh
WHERE sr.category_id = sh.id AND sr.id in %s
FROM hr_salary_rule as sr, hr_salary_head as sh
WHERE sr.category_id = sh.id AND sr.id in %s
ORDER BY sh.sequence''',(tuple(rul),))
for x in cr.fetchall():
final_rules.append(x[0])
@ -1437,7 +1438,7 @@ class hr_payslip_input(osv.osv):
_name = 'hr.payslip.input'
_description = 'Payslip Input'
_columns = {
'name': fields.char('Description', size=256, required=True),
'name': fields.char('Description', size=256, required=True),
'payslip_id': fields.many2one('hr.payslip', 'Pay Slip', required=True),
'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"),

23
addons/hr_payroll/security/ir.model.access.csv
View File

@ -1,12 +1,11 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_hr_payroll_structure","hr.payroll.structure","model_hr_payroll_structure","base.group_hr_user",1,1,1,1
"access_hr_payroll_register","hr.payroll.register","model_hr_payroll_register","base.group_hr_user",1,1,1,1
"access_hr_contibution_register","hr.contibution.register","model_hr_contibution_register","base.group_hr_user",1,1,1,1
"access_hr_contibution_register_line","hr.contibution.register.line","model_hr_contibution_register_line","base.group_hr_user",1,1,1,1
"access_hr_salary_head","hr.salary.head","model_hr_salary_head","base.group_hr_user",1,1,1,1
"access_hr_payslip","hr.payslip","model_hr_payslip","base.group_hr_user",1,1,1,1
"access_hr_payslip_line","hr.payslip.line","model_hr_payslip_line","base.group_hr_user",1,1,1,1
"access_res_partner_payroll","res.partner.payroll","base.model_res_partner","base.group_hr_user",1,1,1,1
"access_hr_payslip_manager","hr.payslip.manager","model_hr_payslip","base.group_hr_manager",1,1,1,1
"access_hr_payslip_line_manager","hr.payslip.line.manager","model_hr_payslip_line","base.group_hr_manager",1,1,1,1
"access_hr_payroll_structure_manager","hr.payroll.structure.manager","model_hr_payroll_structure","base.group_hr_manager",1,1,1,1
"id";"name";"model_id:id";"group_id:id";"perm_read";"perm_write";"perm_create";"perm_unlink"
"access_hr_payroll_structure";"hr.payroll.structure";"model_hr_payroll_structure";"base.group_hr_user";1;1;1;1
"access_hr_contibution_register";"hr.contibution.register";"model_hr_contibution_register";"base.group_hr_user";1;1;1;1
"access_hr_contibution_register_line";"hr.contibution.register.line";"model_hr_contibution_register_line";"base.group_hr_user";1;1;1;1
"access_hr_salary_head";"hr.salary.head";"model_hr_salary_head";"base.group_hr_user";1;1;1;1
"access_hr_payslip";"hr.payslip";"model_hr_payslip";"base.group_hr_user";1;1;1;1
"access_hr_payslip_line";"hr.payslip.line";"model_hr_payslip_line";"base.group_hr_user";1;1;1;1
"access_res_partner_payroll";"res.partner.payroll";"base.model_res_partner";"base.group_hr_user";1;1;1;1
"access_hr_payslip_manager";"hr.payslip.manager";"model_hr_payslip";"base.group_hr_manager";1;1;1;1
"access_hr_payslip_line_manager";"hr.payslip.line.manager";"model_hr_payslip_line";"base.group_hr_manager";1;1;1;1
"access_hr_payroll_structure_manager";"hr.payroll.structure.manager";"model_hr_payroll_structure";"base.group_hr_manager";1;1;1;1

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_hr_payroll_structure hr.payroll.structure model_hr_payroll_structure base.group_hr_user 1 1 1 1
3 access_hr_payroll_register access_hr_contibution_register hr.payroll.register hr.contibution.register model_hr_payroll_register model_hr_contibution_register base.group_hr_user 1 1 1 1
4 access_hr_contibution_register access_hr_contibution_register_line hr.contibution.register hr.contibution.register.line model_hr_contibution_register model_hr_contibution_register_line base.group_hr_user 1 1 1 1
5 access_hr_contibution_register_line access_hr_salary_head hr.contibution.register.line hr.salary.head model_hr_contibution_register_line model_hr_salary_head base.group_hr_user 1 1 1 1
6 access_hr_salary_head access_hr_payslip hr.salary.head hr.payslip model_hr_salary_head model_hr_payslip base.group_hr_user 1 1 1 1
7 access_hr_payslip access_hr_payslip_line hr.payslip hr.payslip.line model_hr_payslip model_hr_payslip_line base.group_hr_user 1 1 1 1
8 access_hr_payslip_line access_res_partner_payroll hr.payslip.line res.partner.payroll model_hr_payslip_line base.model_res_partner base.group_hr_user 1 1 1 1
9 access_res_partner_payroll access_hr_payslip_manager res.partner.payroll hr.payslip.manager base.model_res_partner model_hr_payslip base.group_hr_user base.group_hr_manager 1 1 1 1
10 access_hr_payslip_manager access_hr_payslip_line_manager hr.payslip.manager hr.payslip.line.manager model_hr_payslip model_hr_payslip_line base.group_hr_manager 1 1 1 1
11 access_hr_payslip_line_manager access_hr_payroll_structure_manager hr.payslip.line.manager hr.payroll.structure.manager model_hr_payslip_line model_hr_payroll_structure base.group_hr_manager 1 1 1 1
access_hr_payroll_structure_manager hr.payroll.structure.manager model_hr_payroll_structure base.group_hr_manager 1 1 1 1