From d68d1942f7d9f5d5273598b626df2da263f7e59b Mon Sep 17 00:00:00 2001 From: Saurang Suthar Date: Mon, 3 Sep 2012 11:22:08 +0530 Subject: [PATCH 1/5] [IMP]hr:remove marital status field value automatically set to single bzr revid: ssu@tinyerp.com-20120903055208-3epnm8i77ypg6cxs --- addons/hr/hr.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 966c29cab07..fc47b673bfb 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -262,7 +262,6 @@ class hr_employee(osv.osv): _defaults = { 'active': 1, 'image': _get_default_image, - 'marital': 'single', 'color': 0, } From 142261ad5ea03369bd3a1f61c3648b167f9da3d3 Mon Sep 17 00:00:00 2001 From: Saurang Suthar Date: Mon, 3 Sep 2012 12:46:13 +0530 Subject: [PATCH 2/5] [IMP]removed access denied error at the time of clicking on Timesheets and Payslips button in employee form by HR/Employee and created new access rules for HR/Employee bzr revid: ssu@tinyerp.com-20120903071613-731x8686z2euy0sk --- addons/hr/security/ir.model.access.csv | 1 + addons/hr_payroll/security/hr_security.xml | 7 +++++++ addons/hr_payroll/security/ir.model.access.csv | 6 +++++- .../security/hr_timesheet_sheet_security.xml | 7 +++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv index 121e0f23f25..07593028028 100644 --- a/addons/hr/security/ir.model.access.csv +++ b/addons/hr/security/ir.model.access.csv @@ -7,4 +7,5 @@ access_hr_employee_resource_user,resource.resource.user,resource.model_resource_ access_hr_department_user,hr.department.user,model_hr_department,base.group_hr_user,1,1,1,1 access_hr_department_employee,hr.department.employee,model_hr_department,base.group_user,1,0,0,0 access_hr_job_user,hr.job user,model_hr_job,base.group_hr_user,1,1,1,1 +access_hr_employee_user,hr.employee user,model_hr_employee,base.group_user,1,1,1,1 access_ir_property_hr_user,ir_property hr_user,base.model_ir_property,base.group_hr_user,1,1,1,0 diff --git a/addons/hr_payroll/security/hr_security.xml b/addons/hr_payroll/security/hr_security.xml index d55f1c81cce..c97c0b5a5eb 100644 --- a/addons/hr_payroll/security/hr_security.xml +++ b/addons/hr_payroll/security/hr_security.xml @@ -13,5 +13,12 @@ + + Employee Payslip Rule + + ['|', ('employee_id.user_id', '=', user.id), ('employee_id.department_id.manager_id.user_id', '=', user.id)] + + + \ No newline at end of file diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index 24ca631c4d8..58d5835fb6b 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -4,8 +4,12 @@ access_hr_contribution_register,hr.contribution.register,model_hr_contribution_r 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,hr.payslip,model_hr_payslip,base.group_user,1,0,0,0 +access_hr_payslip_line,hr.payslip.line,model_hr_payslip_line,base.group_user,1,0,0,0 access_hr_payslip_input_user,hr.payslip.input.user,model_hr_payslip_input,base.group_hr_user,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_payslip_input_user,hr.payslip.input.user,model_hr_payslip_input,base.group_user,1,0,0,0 +access_hr_payslip_worked_days ,hr.payslip.worked_days,model_hr_payslip_worked_days,base.group_user,1,0,0,0 access_hr_payslip_run,hr.payslip.run,model_hr_payslip_run,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 -access_hr_salary_rule_user,hr.salary.rule.user,model_hr_salary_rule,base.group_hr_user,1,1,1,1 +access_hr_salary_rule_user,hr.salary.rule.user,model_hr_salary_rule,base.group_user,1,1,1,1 \ No newline at end of file diff --git a/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml b/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml index ff387a898ca..8755e319ae9 100644 --- a/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml +++ b/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml @@ -9,5 +9,12 @@ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + Employee Timesheet Rule + + ['|', ('employee_id.user_id', '=', user.id), ('employee_id.department_id.manager_id.user_id', '=', user.id)] + + + From 809c0b984dbbca248f53668807a11e920b826175 Mon Sep 17 00:00:00 2001 From: Saurang Suthar Date: Tue, 4 Sep 2012 11:58:58 +0530 Subject: [PATCH 3/5] [IMP]hr:removed Belgium Payroll with Accounting from Human Resources config wizard bzr revid: ssu@tinyerp.com-20120904062858-78sdkm4x25f13qwe --- addons/hr/res_config_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml index ad36818e525..7afc745bd13 100644 --- a/addons/hr/res_config_view.xml +++ b/addons/hr/res_config_view.xml @@ -18,7 +18,7 @@ Payroll ir.module.module kanban,tree,form - + From dd17296490cdf2f4fc35eed5addb5902433de738 Mon Sep 17 00:00:00 2001 From: Saurang Suthar Date: Thu, 13 Sep 2012 18:28:51 +0530 Subject: [PATCH 4/5] [IMP]:improved access rights by giving rights of Read to HR/Employee bzr revid: ssu@tinyerp.com-20120913125851-p80ayg3ka4gevulu --- addons/hr/security/ir.model.access.csv | 2 +- addons/hr_payroll/security/hr_security.xml | 2 +- addons/hr_payroll/security/ir.model.access.csv | 2 +- .../hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv index 07593028028..651fbaa7fcf 100644 --- a/addons/hr/security/ir.model.access.csv +++ b/addons/hr/security/ir.model.access.csv @@ -7,5 +7,5 @@ access_hr_employee_resource_user,resource.resource.user,resource.model_resource_ access_hr_department_user,hr.department.user,model_hr_department,base.group_hr_user,1,1,1,1 access_hr_department_employee,hr.department.employee,model_hr_department,base.group_user,1,0,0,0 access_hr_job_user,hr.job user,model_hr_job,base.group_hr_user,1,1,1,1 -access_hr_employee_user,hr.employee user,model_hr_employee,base.group_user,1,1,1,1 +access_hr_employee_user,hr.employee user,model_hr_employee,base.group_user,1,0,0,0 access_ir_property_hr_user,ir_property hr_user,base.model_ir_property,base.group_hr_user,1,1,1,0 diff --git a/addons/hr_payroll/security/hr_security.xml b/addons/hr_payroll/security/hr_security.xml index c97c0b5a5eb..412e06871eb 100644 --- a/addons/hr_payroll/security/hr_security.xml +++ b/addons/hr_payroll/security/hr_security.xml @@ -16,7 +16,7 @@ Employee Payslip Rule - ['|', ('employee_id.user_id', '=', user.id), ('employee_id.department_id.manager_id.user_id', '=', user.id)] + [('employee_id.user_id', '=', user.id)] diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index 58d5835fb6b..a8211e18369 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -12,4 +12,4 @@ access_hr_payslip_input_user,hr.payslip.input.user,model_hr_payslip_input,base.g access_hr_payslip_worked_days ,hr.payslip.worked_days,model_hr_payslip_worked_days,base.group_user,1,0,0,0 access_hr_payslip_run,hr.payslip.run,model_hr_payslip_run,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 -access_hr_salary_rule_user,hr.salary.rule.user,model_hr_salary_rule,base.group_user,1,1,1,1 \ No newline at end of file +access_hr_salary_rule_user,hr.salary.rule.user,model_hr_salary_rule,base.group_user,1,0,0,0 \ No newline at end of file diff --git a/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml b/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml index 8755e319ae9..cadbe81a6f2 100644 --- a/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml +++ b/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml @@ -12,7 +12,7 @@ Employee Timesheet Rule - ['|', ('employee_id.user_id', '=', user.id), ('employee_id.department_id.manager_id.user_id', '=', user.id)] + [('employee_id.user_id', '=', user.id)] From dbe9d080c421507360651d22e52a66c1d6249695 Mon Sep 17 00:00:00 2001 From: Saurang Suthar Date: Thu, 13 Sep 2012 18:33:35 +0530 Subject: [PATCH 5/5] [IMP]hr:display only Belgium-Payroll module if selected from manage from HR configuration bzr revid: ssu@tinyerp.com-20120913130335-ufgx6n6ehcc742uo --- addons/hr/res_config_view.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml index da3749eec8f..80ec6a3663d 100644 --- a/addons/hr/res_config_view.xml +++ b/addons/hr/res_config_view.xml @@ -18,7 +18,8 @@ Payroll ir.module.module kanban,tree,form - + + [('name','=','l10n_be_hr_payroll')]