From 5778a97065f9cfdbbd6c82c9a7ec4b164c8b1712 Mon Sep 17 00:00:00 2001 From: mtr Date: Tue, 1 Mar 2011 15:29:10 +0530 Subject: [IMP] hr_payroll:removed company contribution object and merged it with salry rules bzr revid: mtr@mtr-20110301095910-y1qhf82zms1lubrs --- addons/hr_payroll/security/ir.model.access.csv | 2 -- 1 file changed, 2 deletions(-) (limited to 'addons/hr_payroll/security/ir.model.access.csv') diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index bafa1564e23..415ba142613 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -7,8 +7,6 @@ "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_allounce_deduction_category","hr.allounce.deduction.category","model_hr_allounce_deduction_categoty","base.group_hr_user",1,1,1,1 -"access_company_contribution","company.contribution","model_company_contribution","base.group_hr_user",1,1,1,1 -"access_company_contribution_line","company.contribution.line","model_company_contribution_line","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_hr_payslip_line_line","hr.payslip.line.line","model_hr_payslip_line_line","base.group_hr_user",1,1,1,1 -- cgit v1.2.3 From dcd7a887b10fb0850c3d940d820b340cd5e17451 Mon Sep 17 00:00:00 2001 From: mtr Date: Wed, 2 Mar 2011 15:47:36 +0530 Subject: [IMP] hr_payroll:removed 'hr.payslip.line.line' from code and view. bzr revid: mtr@mtr-20110302101736-v9xhxj0hbpted3bt --- addons/hr_payroll/security/ir.model.access.csv | 1 - 1 file changed, 1 deletion(-) (limited to 'addons/hr_payroll/security/ir.model.access.csv') diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index 415ba142613..d88e56d0b05 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -9,7 +9,6 @@ "access_hr_allounce_deduction_category","hr.allounce.deduction.category","model_hr_allounce_deduction_categoty","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_hr_payslip_line_line","hr.payslip.line.line","model_hr_payslip_line_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 -- cgit v1.2.3 From d8404257932ec96b3e449a7224ad77d4bf9865d7 Mon Sep 17 00:00:00 2001 From: mtr Date: Thu, 3 Mar 2011 15:22:26 +0530 Subject: [IMP] hr_payroll:renamed 'hr.allounce.deduction.categoty' to 'hr.salary.head' and improved its object and fields bzr revid: mtr@mtr-20110303095226-kga2d2ulq0mhb4ne --- addons/hr_payroll/security/ir.model.access.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/hr_payroll/security/ir.model.access.csv') diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index d88e56d0b05..f3421d06551 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -6,7 +6,7 @@ "access_hr_payroll_advice_line","hr.payroll.advice.line","model_hr_payroll_advice_line","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_allounce_deduction_category","hr.allounce.deduction.category","model_hr_allounce_deduction_categoty","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 -- cgit v1.2.3 From 6f0f2e5325389647719283e2d67dfc9e697a59f9 Mon Sep 17 00:00:00 2001 From: mtr Date: Thu, 3 Mar 2011 15:37:53 +0530 Subject: [IMP] hr_payroll:removed 'Bank Advice' and 'Bank Advice Lines' bzr revid: mtr@mtr-20110303100753-jdc0o3nddrlv21jv --- addons/hr_payroll/security/ir.model.access.csv | 2 -- 1 file changed, 2 deletions(-) (limited to 'addons/hr_payroll/security/ir.model.access.csv') diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index f3421d06551..9160d378a50 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -2,8 +2,6 @@ "access_hr_passport","hr.passport","model_hr_passport","base.group_hr_user",1,1,1,1 "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_payroll_advice","hr.payroll.advice","model_hr_payroll_advice","base.group_hr_user",1,1,1,1 -"access_hr_payroll_advice_line","hr.payroll.advice.line","model_hr_payroll_advice_line","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 -- cgit v1.2.3 From 016fbccf002241204080539888eb48a6b2548471 Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Thu, 3 Mar 2011 18:19:03 +0530 Subject: [IMP] changes as per hr_payroll_new file given by QDP sir: move hr_passport obj to hr module, move some fields of hr.contract from hr_paroll to hr_contract, remove working_days_per_week field for contart and get it from resource calender bzr revid: psi@tinyerp.co.in-20110303124903-nopz0swoebyqtsqq --- addons/hr_payroll/security/ir.model.access.csv | 3 --- 1 file changed, 3 deletions(-) (limited to 'addons/hr_payroll/security/ir.model.access.csv') diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index bafa1564e23..f853aafe88c 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -1,5 +1,4 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_hr_passport","hr.passport","model_hr_passport","base.group_hr_user",1,1,1,1 "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_payroll_advice","hr.payroll.advice","model_hr_payroll_advice","base.group_hr_user",1,1,1,1 @@ -16,5 +15,3 @@ "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 -"access_hr_passport_manager","hr.passport.manager","model_hr_passport","base.group_hr_manager",1,1,1,1 -"access_hr_contract_wage_type","hr.contract.wage.type user","hr_contract.model_hr_contract_wage_type","base.group_hr_user",1,1,1,1 -- cgit v1.2.3 From 9843f42b1fe105e8270a5728a876fed4cd997e82 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Mon, 4 Apr 2011 18:30:33 +0530 Subject: [FIX] payroll bzr revid: mra@mra-laptop-20110404130033-rxhyg3jpwga7xaof --- addons/hr_payroll/security/ir.model.access.csv | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'addons/hr_payroll/security/ir.model.access.csv') 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 -- cgit v1.2.3 From 481a4d104e635a19e49047d57201b1cc81cc63ab Mon Sep 17 00:00:00 2001 From: mtr Date: Tue, 5 Apr 2011 11:51:32 +0530 Subject: [IMP] hr_payroll:improved ir.model.access.csv file bzr revid: mtr@mtr-20110405062132-fswk1fn73341866x --- addons/hr_payroll/security/ir.model.access.csv | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'addons/hr_payroll/security/ir.model.access.csv') diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index fdca8baeeb2..d24699752ec 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -1,11 +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_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 -- cgit v1.2.3 From 7ff22495b9ab3ba677c183b9d1855980425e17ea Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Thu, 7 Apr 2011 18:36:34 +0530 Subject: [FIX] Payroll: Remove contribution reg lines in xml and in .csv bzr revid: mra@mra-laptop-20110407130634-syjdvcme17nwhdhe --- addons/hr_payroll/security/ir.model.access.csv | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'addons/hr_payroll/security/ir.model.access.csv') diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index d24699752ec..579f38f5f8e 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -1,11 +1,10 @@ -"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 +"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_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 -- cgit v1.2.3 From c9a30f97ae5a6a206296d49f40a98e699ce44820 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Fri, 8 Apr 2011 11:18:41 +0530 Subject: [FIX] Payroll: Installation error on csv access bzr revid: mra@mra-laptop-20110408054841-7vpltohm639ov7u5 --- addons/hr_payroll/security/ir.model.access.csv | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'addons/hr_payroll/security/ir.model.access.csv') diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index 579f38f5f8e..557633b3d86 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -1,10 +1,10 @@ -"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_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_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 -- cgit v1.2.3 From d43364223251bcbc920c314270772c3fd29c48b7 Mon Sep 17 00:00:00 2001 From: mtr Date: Mon, 11 Apr 2011 17:28:23 +0530 Subject: [IMP] hr_payroll: added access rules bzr revid: mtr@mtr-20110411115823-kp0oarpmo8vz9rtr --- addons/hr_payroll/security/ir.model.access.csv | 2 ++ 1 file changed, 2 insertions(+) (limited to 'addons/hr_payroll/security/ir.model.access.csv') diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index 557633b3d86..431ae06fa20 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -8,3 +8,5 @@ "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 +"access_hr_payslip_input ","hr.payslip.input","model_hr_payslip_input","base.group_hr_manager",1,1,1,1 +"access_hr_salary_rule","hr.salary.rule","model_hr_salary_rule","base.group_hr_manager",1,1,1,1 -- cgit v1.2.3 From 2dad28d4fd6e33c800149b7491de5b2601011ee9 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Tue, 12 Apr 2011 19:01:28 +0200 Subject: [IMP] hr_payroll: misc improvements among * remove typo in hr.contribution.register object name * fix engine: a rule with same code must overwrite the previous value * improved demo data: set same code for Conveyance Allowance for Paolino and parent rule * improved tree/search views bzr revid: qdp-launchpad@openerp.com-20110412170128-xlf1r1tfsm8ke7e5 --- addons/hr_payroll/security/ir.model.access.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/hr_payroll/security/ir.model.access.csv') diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index 431ae06fa20..609fc99c034 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -1,6 +1,6 @@ "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_contribution_register","hr.contribution.register","model_hr_contribution_register","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 -- cgit v1.2.3 From ac07145e5ac10eabd2fac907a06639539d1f422a Mon Sep 17 00:00:00 2001 From: mtr Date: Thu, 28 Apr 2011 12:01:40 +0530 Subject: [IMP] hr_payroll: added ir.rule for employee payslip and modified access rights bzr revid: mtr@mtr-20110428063140-rxao7nev4xgzl9f2 --- addons/hr_payroll/security/ir.model.access.csv | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'addons/hr_payroll/security/ir.model.access.csv') diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index 609fc99c034..d783db77455 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -1,10 +1,10 @@ "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_contribution_register","hr.contribution.register","model_hr_contribution_register","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_payroll_structure","hr.payroll.structure","model_hr_payroll_structure","base.group_hr_user",1,0,0,0 +"access_hr_contribution_register","hr.contribution.register","model_hr_contribution_register","base.group_hr_user",1,0,0,0 +"access_hr_salary_head","hr.salary.head","model_hr_salary_head","base.group_hr_user",1,0,0,0 +"access_hr_payslip","hr.payslip","model_hr_payslip","base.group_hr_user",1,0,0,0 +"access_hr_payslip_line","hr.payslip.line","model_hr_payslip_line","base.group_hr_user",1,0,0,0 +"access_hr_payslip_input_user","hr.payslip.input.user","model_hr_payslip_input","base.group_hr_user",1,0,0,0 "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 -- cgit v1.2.3 From 148b1d45a12789be61ea6e8a731defcaec0a1b7f Mon Sep 17 00:00:00 2001 From: mtr Date: Thu, 28 Apr 2011 14:23:11 +0530 Subject: [IMP] hr_payroll: revert back the changes of access rights,made for hr user bzr revid: mtr@mtr-20110428085311-7017lofdf8jf7s3f --- addons/hr_payroll/security/ir.model.access.csv | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'addons/hr_payroll/security/ir.model.access.csv') diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index d783db77455..ba816ea94f8 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -1,10 +1,10 @@ "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,0,0,0 -"access_hr_contribution_register","hr.contribution.register","model_hr_contribution_register","base.group_hr_user",1,0,0,0 -"access_hr_salary_head","hr.salary.head","model_hr_salary_head","base.group_hr_user",1,0,0,0 -"access_hr_payslip","hr.payslip","model_hr_payslip","base.group_hr_user",1,0,0,0 -"access_hr_payslip_line","hr.payslip.line","model_hr_payslip_line","base.group_hr_user",1,0,0,0 -"access_hr_payslip_input_user","hr.payslip.input.user","model_hr_payslip_input","base.group_hr_user",1,0,0,0 +"access_hr_payroll_structure","hr.payroll.structure","model_hr_payroll_structure","base.group_hr_user",1,1,1,1 +"access_hr_contribution_register","hr.contribution.register","model_hr_contribution_register","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_hr_payslip_input_user","hr.payslip.input.user","model_hr_payslip_input","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 -- cgit v1.2.3 From 978b7567607a85157a408c8e21008b04ae834703 Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Mon, 2 May 2011 17:48:22 +0530 Subject: [IMP] wizard will work for employees instead of employee categories bzr revid: psi@tinyerp.co.in-20110502121822-2xw9r1yilxoovr2o --- addons/hr_payroll/security/ir.model.access.csv | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/hr_payroll/security/ir.model.access.csv') diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index 609fc99c034..622eebc5337 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -10,3 +10,4 @@ "access_hr_payroll_structure_manager","hr.payroll.structure.manager","model_hr_payroll_structure","base.group_hr_manager",1,1,1,1 "access_hr_payslip_input ","hr.payslip.input","model_hr_payslip_input","base.group_hr_manager",1,1,1,1 "access_hr_salary_rule","hr.salary.rule","model_hr_salary_rule","base.group_hr_manager",1,1,1,1 +"access_hr_payslip_groups","hr.payslip.groups","model_hr_payslip_groups","base.group_hr_manager",1,1,1,1 -- cgit v1.2.3 From 46cf36457483bc106c8d52d27ce5629e2bd204f8 Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Tue, 3 May 2011 18:08:07 +0530 Subject: [IMP] rename the class and changed the view accourdingly bzr revid: psi@tinyerp.co.in-20110503123807-ptgnp6gejy045fai --- addons/hr_payroll/security/ir.model.access.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/hr_payroll/security/ir.model.access.csv') diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index 622eebc5337..d3f794089c2 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -10,4 +10,4 @@ "access_hr_payroll_structure_manager","hr.payroll.structure.manager","model_hr_payroll_structure","base.group_hr_manager",1,1,1,1 "access_hr_payslip_input ","hr.payslip.input","model_hr_payslip_input","base.group_hr_manager",1,1,1,1 "access_hr_salary_rule","hr.salary.rule","model_hr_salary_rule","base.group_hr_manager",1,1,1,1 -"access_hr_payslip_groups","hr.payslip.groups","model_hr_payslip_groups","base.group_hr_manager",1,1,1,1 +"access_hr_payslip_run","hr.payslip.run","model_hr_payslip_run","base.group_hr_manager",1,1,1,1 -- cgit v1.2.3 From 8666be5ebd2c9314b9c14e02c4d3f0348b86f012 Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Mon, 9 May 2011 14:20:02 +0530 Subject: [IMP] rename object to worked_days and add one object hr.salary.input bzr revid: psi@tinyerp.co.in-20110509085002-l0ygkq5al9yedmz6 --- addons/hr_payroll/security/ir.model.access.csv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addons/hr_payroll/security/ir.model.access.csv') diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index 609fc99c034..a5b2ee24201 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -8,5 +8,6 @@ "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 -"access_hr_payslip_input ","hr.payslip.input","model_hr_payslip_input","base.group_hr_manager",1,1,1,1 +"access_hr_payslip_worked_days ","hr.payslip.worked_days","model_hr_payslip_worked_days","base.group_hr_manager",1,1,1,1 "access_hr_salary_rule","hr.salary.rule","model_hr_salary_rule","base.group_hr_manager",1,1,1,1 +"access_hr_payslip_input","hr.payslip.input","model_hr_payslip_input","base.group_hr_manager",1,1,1,1 -- cgit v1.2.3 From c600603f3acd8e650522d9a32644961815d405c2 Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Tue, 10 May 2011 16:49:31 +0530 Subject: [ADD] improve code and add demo rule for sales bzr revid: psi@tinyerp.co.in-20110510111931-4v21peqft66hblpp --- addons/hr_payroll/security/ir.model.access.csv | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/hr_payroll/security/ir.model.access.csv') diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index a5b2ee24201..7f54f1dd50b 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -11,3 +11,4 @@ "access_hr_payslip_worked_days ","hr.payslip.worked_days","model_hr_payslip_worked_days","base.group_hr_manager",1,1,1,1 "access_hr_salary_rule","hr.salary.rule","model_hr_salary_rule","base.group_hr_manager",1,1,1,1 "access_hr_payslip_input","hr.payslip.input","model_hr_payslip_input","base.group_hr_manager",1,1,1,1 +"access_hr_rule_input","hr.rule.input","model_hr_rule_input","base.group_hr_manager",1,1,1,1 -- cgit v1.2.3 From 84739f218e893b52e13f5024fd80ac12aa49062d Mon Sep 17 00:00:00 2001 From: mtr Date: Tue, 10 May 2011 17:24:11 +0530 Subject: [IMP] hr_payroll: renamed salary head into salary category bzr revid: mtr@mtr-20110510115411-lkf923pyakj1ykug --- addons/hr_payroll/security/ir.model.access.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/hr_payroll/security/ir.model.access.csv') diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index 609fc99c034..9fe2fd67498 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -1,7 +1,7 @@ "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_contribution_register","hr.contribution.register","model_hr_contribution_register","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_salary_category","hr.salary.category","model_hr_salary_category","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 -- cgit v1.2.3 From 7ae069998e9f72e400de7d3874f8853cf3976355 Mon Sep 17 00:00:00 2001 From: mtr Date: Wed, 11 May 2011 12:48:54 +0530 Subject: [IMP] hr_payroll: renamed hr.salary.category into hr.salary.rule.category bzr revid: mtr@mtr-20110511071854-ctdf3czpedhe5t6l --- addons/hr_payroll/security/ir.model.access.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/hr_payroll/security/ir.model.access.csv') diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index d91f380cf0e..f1a3a0f4ae4 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -1,7 +1,7 @@ "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_contribution_register","hr.contribution.register","model_hr_contribution_register","base.group_hr_user",1,1,1,1 -"access_hr_salary_category","hr.salary.category","model_hr_salary_category","base.group_hr_user",1,1,1,1 +"access_hr_salary_rule_category","hr.salary.rule.category","model_hr_salary_rule_category","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_hr_payslip_input_user","hr.payslip.input.user","model_hr_payslip_input","base.group_hr_user",1,1,1,1 -- cgit v1.2.3