diff options
| author | Mustufa Rangwala <mra@mra-laptop> | 2011-01-17 15:55:56 +0530 |
|---|---|---|
| committer | Mustufa Rangwala <mra@mra-laptop> | 2011-01-17 15:55:56 +0530 |
| commit | 2f09faba4213f66304267ea7ad5766e3b4824309 (patch) | |
| tree | ab18a67babd5c1df8b3d876dc50db8da688e76ad | |
| parent | 269b43ca7283c4df2ec8f6cdfb8311864b78701d (diff) | |
| parent | bfea6901f16f1203f7bf6ac168d74a2037cf2869 (diff) | |
[MERGE] an employee shouldn't be able to see expenses and holidays of others employee
bzr revid: mra@mra-laptop-20110117102556-evp00eqczxuy5l5z
| -rw-r--r-- | addons/hr_attendance/security/ir_rule.xml | 6 | ||||
| -rw-r--r-- | addons/hr_expense/security/ir_rule.xml | 6 | ||||
| -rw-r--r-- | addons/hr_holidays/security/ir_rule.xml | 6 | ||||
| -rw-r--r-- | addons/hr_timesheet/report/user_timesheet.py | 2 |
4 files changed, 19 insertions, 1 deletions
diff --git a/addons/hr_attendance/security/ir_rule.xml b/addons/hr_attendance/security/ir_rule.xml index 5f93aa2a4fd..92534da7dc0 100644 --- a/addons/hr_attendance/security/ir_rule.xml +++ b/addons/hr_attendance/security/ir_rule.xml @@ -14,6 +14,12 @@ <field name="domain_force">[(1,'=',1)]</field> <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/> </record> + <record id="property_rule_attendace_employee" model="ir.rule"> + <field name="name">Employee Attendance</field> + <field model="ir.model" name="model_id" ref="model_hr_attendance"/> + <field name="domain_force">[('employee_id.user_id','=',user.id)]</field> + <field name="groups" eval="[(4,ref('base.group_user'))]"/> + </record> </data> diff --git a/addons/hr_expense/security/ir_rule.xml b/addons/hr_expense/security/ir_rule.xml index 4807cf38465..292db38bf5e 100644 --- a/addons/hr_expense/security/ir_rule.xml +++ b/addons/hr_expense/security/ir_rule.xml @@ -14,6 +14,12 @@ <field name="domain_force">[(1,'=',1)]</field> <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/> </record> + <record id="property_rule_expense_employee" model="ir.rule"> + <field name="name">Employee Expense</field> + <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/> + <field name="domain_force">[('employee_id.user_id','=',user.id)]</field> + <field name="groups" eval="[(4,ref('base.group_user'))]"/> + </record> </data> </openerp> diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml index cbb425fa103..9a56336dcdc 100644 --- a/addons/hr_holidays/security/ir_rule.xml +++ b/addons/hr_holidays/security/ir_rule.xml @@ -14,6 +14,12 @@ <field name="domain_force">[(1,'=',1)]</field> <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/> </record> + <record id="property_rule_holidays_employee" model="ir.rule"> + <field name="name">Employee Holidays</field> + <field model="ir.model" name="model_id" ref="model_hr_holidays"/> + <field name="domain_force">[('employee_id.user_id','=',user.id)]</field> + <field name="groups" eval="[(4,ref('base.group_user'))]"/> + </record> </data> </openerp> diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py index 4d1d5f428cf..25a389639e6 100644 --- a/addons/hr_timesheet/report/user_timesheet.py +++ b/addons/hr_timesheet/report/user_timesheet.py @@ -49,7 +49,7 @@ class report_custom(report_rml): emp_obj = pooler.get_pool(cr.dbname).get('hr.employee') user_id = emp_obj.browse(cr, uid, emp_id).user_id.id empl_name = emp_obj.browse(cr, uid, emp_id).name - + # Computing the dates (start of month: som, and end of month: eom) som = datetime.date(data['form']['year'], data['form']['month'], 1) eom = som + datetime.timedelta(lengthmonth(som.year, som.month)) |