[MOD/IMP] hr : Usability Improvenment in Accessrights
bzr revid: dbr@tinyerp.com-20101006093147-xaqdyfd23izwtfmm
This commit is contained in:
@@ -67,7 +67,7 @@
|
||||
<field name="help">Your Company's Departments Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitements, etc.</field>
|
||||
</record>
|
||||
|
||||
<menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_management" sequence="6"/>
|
||||
<menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_management" sequence="6" groups="base.group_user"/>
|
||||
|
||||
<record model="ir.ui.view" id="view_users_form_inherit">
|
||||
<field name="name">res.users.form</field>
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
|
||||
<menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"/>
|
||||
<menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
|
||||
<menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_system" sequence="50"/>
|
||||
<menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
|
||||
<menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
|
||||
<menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" groups="base.group_system" name="Employees" sequence="1" />
|
||||
<menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" groups="base.group_hr_manager" name="Employees" sequence="1" />
|
||||
|
||||
<!--
|
||||
==========
|
||||
@@ -151,7 +151,7 @@
|
||||
<field name="help">The employee directory contains all data related to your employees : from their photo up to their hourly estimated costs for the timesheets.Employees are managed by departments and can be linked to users to manage their access rights.</field>
|
||||
</record>
|
||||
|
||||
<menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main" groups="base.group_system,base.group_hr_manager,base.group_hr_user"/>
|
||||
<menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main" groups="base.group_hr_manager,base.group_hr_user,base.group_user"/>
|
||||
|
||||
<!--
|
||||
=======================
|
||||
@@ -284,7 +284,7 @@
|
||||
</record>
|
||||
|
||||
<menuitem action="open_view_categ_form" id="menu_view_employee_category_form"
|
||||
parent="menu_view_employee_category_configuration_form" sequence="1" groups="base.group_extended"/>
|
||||
parent="menu_view_employee_category_configuration_form" sequence="1" groups="base.group_extended,base.group_user"/>
|
||||
|
||||
<record id="open_view_categ_tree" model="ir.actions.act_window">
|
||||
<field name="name">Categories structure</field>
|
||||
@@ -399,7 +399,7 @@
|
||||
<field name="help">Job Positions are used to define the jobs, the requirements. You can attach a survey to a job position. This survey will be used in the recruitement process to evaluate the applicants for this job position.</field>
|
||||
</record>
|
||||
|
||||
<menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_manager,base.group_system"/>
|
||||
<menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_manager"/>
|
||||
<menuitem parent="base.menu_crm_case_job_req_main" id="menu_hr_job" action="action_hr_job" sequence="2"/>
|
||||
|
||||
</data>
|
||||
|
||||
@@ -1,20 +1,15 @@
|
||||
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
|
||||
"access_hr_employee_category_user","hr.employee.category.user","model_hr_employee_category","base.group_hr_user",1,0,0,0
|
||||
"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,1,1,1
|
||||
"access_hr_employee_category_employee","hr.employee.category.employee","model_hr_employee_category","base.group_user",1,0,0,0
|
||||
"access_hr_employee_employee","hr.employee.employee","model_hr_employee","base.group_user",1,0,0,0
|
||||
"access_hr_employee_user","hr.employee user","model_hr_employee","base.group_hr_user",1,1,1,1
|
||||
"access_hr_employee_resource_user","resource.resource.user","resource.model_resource_resource","base.group_hr_user",1,1,1,1
|
||||
"access_hr_department_user","hr.department.user","model_hr_department","base.group_hr_user",1,1,1,1
|
||||
"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,1,1,1
|
||||
"access_hr_department_manager","hr.department.manager","model_hr_department","base.group_hr_manager",1,1,1,1
|
||||
"access_hr_employee_marital_status","hr.employee.marital.status","model_hr_employee_marital_status","base.group_system",1,1,1,1
|
||||
"access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,0,0,0
|
||||
"access_hr_employee_category_system","hr.employee.category.system","model_hr_employee_category","base.group_system",1,1,1,1
|
||||
"access_hr_employee_manager","hr.employee.manager","model_hr_employee","base.group_hr_manager",1,1,1,1
|
||||
"access_hr_employee_resource_manager","resource.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
|
||||
"access_hr_department_system","hr.department.system","model_hr_department","base.group_system",1,1,1,1
|
||||
"access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
|
||||
"access_hr_job_manager","hr.job.manager","model_hr_job","base.group_hr_manager",1,1,1,1
|
||||
"access_hr_employee_system","hr.employee.system","model_hr_employee","base.group_system",1,0,0,0
|
||||
"access_hr_job_system","hr.job system","model_hr_job","base.group_system",1,0,0,0
|
||||
"access_hr_employee_employee","hr.employee.employee","model_hr_employee","base.group_user",1,0,0,0
|
||||
"access_hr_employee_category_employee","hr.employee.category.employee","model_hr_employee_category","base.group_user",1,0,0,0
|
||||
"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_department_manager","hr.department.manager","model_hr_department","base.group_hr_manager",1,1,1,1
|
||||
"access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,0,0,0
|
||||
"access_hr_job_manager","hr.job.manager","model_hr_job","base.group_hr_manager",1,1,1,1
|
||||
"access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
|
||||
"access_hr_employee_marital_status_manager","hr.employee.marital.status.manager","model_hr_employee_marital_status","base.group_hr_manager",1,1,1,1
|
||||
|
||||
|
@@ -100,7 +100,6 @@ class report_custom(report_rml):
|
||||
today=datetime.datetime.today()
|
||||
|
||||
first_date=data['form']['date_from']
|
||||
|
||||
som = strToDate(first_date)
|
||||
eom = som+datetime.timedelta(59)
|
||||
day_diff=eom-som
|
||||
|
||||
@@ -29,7 +29,6 @@ class hr_holidays_summary_dept(osv.osv_memory):
|
||||
_description = 'HR Holidays Summary Report By Department'
|
||||
_columns = {
|
||||
'date_from': fields.date('From', required=True),
|
||||
'date_to': fields.date('To', required=True),
|
||||
'depts': fields.many2many('hr.department', 'summary_dept_rel', 'sum_id', 'dept_id', 'Department(s)'),
|
||||
'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Select Holyday State', required=True)
|
||||
}
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
<form string="Holidays by Department">
|
||||
<group col="4" colspan="6">
|
||||
<field name="date_from" />
|
||||
<field name="date_to" />
|
||||
<newline/>
|
||||
<field name="holiday_type" colspan="4"/>
|
||||
<newline/>
|
||||
|
||||
Reference in New Issue
Block a user