Saurang Suthar(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons-hr-general-pso-hr_general_imp-ssu
into lp:~openerp-dev/openobject-addons/trunk-addons-hr-general-pso.
Requested reviews:
Priyesh (OpenERP) (pso-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-hr-general-pso-hr_general_imp-ssu/+merge/122618
Hello sir,
I have fixed issues of hr general as follows:
- removed access error for HR/Employee while clicking on Timesheets and
Payslips buttons from Employee form.
- created new access rules for HR/Employee to see payslip and timesheet of that
particular logged in employee.
- removed Belgium Payroll with Accounting from Human Resources config wizard.
- removed marital status is automatically set to single.
Kindly review it.
Thank you.
Saurang Suthar
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-hr-general-pso-hr_general_imp-ssu/+merge/122618
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons-hr-general-pso.
=== modified file 'hr/hr.py'
--- hr/hr.py 2012-08-10 14:43:39 +0000
+++ hr/hr.py 2012-09-04 06:36:19 +0000
@@ -262,7 +262,6 @@
_defaults = {
'active': 1,
'image': _get_default_image,
- 'marital': 'single',
'color': 0,
}
=== modified file 'hr/res_config_view.xml'
--- hr/res_config_view.xml 2012-08-13 16:06:57 +0000
+++ hr/res_config_view.xml 2012-09-04 06:36:19 +0000
@@ -18,7 +18,7 @@
<field name="name">Payroll</field>
<field name="res_model">ir.module.module</field>
<field name="view_mode">kanban,tree,form</field>
- <field name="context" eval="{'search_default_category_id': ref('base.module_category_localization'), 'search_default_name': 'payroll'}"/>
+ <field name="context" eval="{'search_default_category_id': ref('base.module_category_localization'), 'search_default_name': 'l10n_be_hr_payroll'}"/>
<field name="search_view_id" ref="base.view_module_filter"/>
</record>
=== modified file 'hr/security/ir.model.access.csv'
--- hr/security/ir.model.access.csv 2012-03-07 05:21:00 +0000
+++ hr/security/ir.model.access.csv 2012-09-04 06:36:19 +0000
@@ -7,4 +7,5 @@
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
=== modified file 'hr_payroll/security/hr_security.xml'
--- hr_payroll/security/hr_security.xml 2011-04-28 08:35:38 +0000
+++ hr_payroll/security/hr_security.xml 2012-09-04 06:36:19 +0000
@@ -13,5 +13,12 @@
<field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
</record>
+ <record id="employee_payslip_rule" model="ir.rule">
+ <field name="name">Employee Payslip Rule</field>
+ <field model="ir.model" name="model_id" ref="model_hr_payslip"/>
+ <field name="domain_force">['|', ('employee_id.user_id', '=', user.id), ('employee_id.department_id.manager_id.user_id', '=', user.id)]</field>
+ <field name="groups" eval="[(4,ref('base.group_user'))]"/>
+ </record>
+
</data>
</openerp>
\ No newline at end of file
=== modified file 'hr_payroll/security/ir.model.access.csv'
--- hr_payroll/security/ir.model.access.csv 2011-12-19 16:54:40 +0000
+++ hr_payroll/security/ir.model.access.csv 2012-09-04 06:36:19 +0000
@@ -4,8 +4,12 @@
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
=== modified file 'hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml'
--- hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml 2011-02-28 13:57:54 +0000
+++ hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml 2012-09-04 06:36:19 +0000
@@ -9,5 +9,12 @@
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
+ <record id="employee_timesheet_rule" model="ir.rule">
+ <field name="name">Employee Timesheet Rule</field>
+ <field model="ir.model" name="model_id" ref="model_hr_timesheet_sheet_sheet"/>
+ <field name="domain_force">['|', ('employee_id.user_id', '=', user.id), ('employee_id.department_id.manager_id.user_id', '=', user.id)]</field>
+ <field name="groups" eval="[(4,ref('base.group_user'))]"/>
+ </record>
+
</data>
</openerp>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
