From 9843f42b1fe105e8270a5728a876fed4cd997e82 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 4 Apr 2011 18:30:33 +0530
Subject: [PATCH] [FIX] payroll

bzr revid: mra@mra-laptop-20110404130033-rxhyg3jpwga7xaof
---
 addons/hr_payroll/hr_payroll.py               |  9 ++++----
 .../hr_payroll/security/ir.model.access.csv   | 23 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 4f33d45e33a..1d9e15721c5 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -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"),
diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv
index e765537e6ae..fdca8baeeb2 100644
--- a/addons/hr_payroll/security/ir.model.access.csv
+++ b/addons/hr_payroll/security/ir.model.access.csv
@@ -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