Ujjvala Collins (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-856422-uco into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #856422 in OpenERP Addons: "hr officer rights"
https://bugs.launchpad.net/openobject-addons/+bug/856422
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-856422-uco/+merge/77490
[FIX] hr_xxx:
----------------------
* Changed record rules in hr_attendance, hr_expense, hr_holidays, hr_timesheet
to allow HR Officer see the records of other users for these modules.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-856422-uco/+merge/77490
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-856422-uco.
=== modified file 'hr_attendance/security/ir_rule.xml'
--- hr_attendance/security/ir_rule.xml 2011-01-17 11:35:21 +0000
+++ hr_attendance/security/ir_rule.xml 2011-09-29 09:51:26 +0000
@@ -2,17 +2,11 @@
<openerp>
<data noupdate="True">
- <record id="property_rule_attendace" 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_hr_user'))]"/>
- </record>
<record id="property_rule_attendace_manager" model="ir.rule">
<field name="name">Manager Attendance</field>
<field model="ir.model" name="model_id" ref="model_hr_attendance"/>
<field name="domain_force">[(1,'=',1)]</field>
- <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/>
+ <field name="groups" eval="[(4,ref('base.group_hr_manager')), (4,ref('base.group_hr_user'))]"/>
</record>
<record id="property_rule_attendace_employee" model="ir.rule">
<field name="name">Employee Attendance</field>
@@ -21,7 +15,6 @@
<field name="groups" eval="[(4,ref('base.group_user'))]"/>
</record>
-
</data>
</openerp>
=== modified file 'hr_expense/security/ir_rule.xml'
--- hr_expense/security/ir_rule.xml 2011-06-08 07:29:35 +0000
+++ hr_expense/security/ir_rule.xml 2011-09-29 09:51:26 +0000
@@ -2,17 +2,11 @@
<openerp>
<data noupdate="1">
- <record id="property_rule_expense" 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_hr_user'))]"/>
- </record>
<record id="property_rule_expense_manager" model="ir.rule">
<field name="name">Manager Expense</field>
<field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
<field name="domain_force">[(1,'=',1)]</field>
- <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/>
+ <field name="groups" eval="[(4,ref('base.group_hr_manager')), (4,ref('base.group_hr_user'))]"/>
</record>
<record id="property_rule_expense_employee" model="ir.rule">
<field name="name">Employee Expense</field>
=== modified file 'hr_holidays/security/ir_rule.xml'
--- hr_holidays/security/ir_rule.xml 2011-02-11 11:36:49 +0000
+++ hr_holidays/security/ir_rule.xml 2011-09-29 09:51:26 +0000
@@ -2,17 +2,11 @@
<openerp>
<data>
- <record id="property_rule_holidays" 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), ('department_id.manager_id.user_id', '=', user.id)]</field>
- <field name="groups" eval="[(6,0,[ref('base.group_hr_user')])]"/>
- </record>
<record id="property_rule_holidays_manager" model="ir.rule">
<field name="name">Manager Holidays</field>
<field model="ir.model" name="model_id" ref="model_hr_holidays"/>
<field name="domain_force">[(1,'=',1)]</field>
- <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
+ <field name="groups" eval="[(4,ref('base.group_hr_manager')), (4,ref('base.group_hr_user'))]"/>
</record>
<record id="property_rule_holidays_employee" model="ir.rule">
<field name="name">Employee Holidays</field>
=== modified file 'hr_timesheet/security/hr_timesheet_security.xml'
--- hr_timesheet/security/hr_timesheet_security.xml 2011-04-11 07:00:35 +0000
+++ hr_timesheet/security/hr_timesheet_security.xml 2011-09-29 09:51:26 +0000
@@ -2,11 +2,19 @@
<openerp>
<data noupdate="True">
+ <record id="property_rule_timesheet_manager" model="ir.rule">
+ <field name="name">Manager HR Analytic Timesheet</field>
+ <field model="ir.model" name="model_id" ref="model_hr_analytic_timesheet"/>
+ <field name="domain_force">[(1,'=',1)]</field>
+ <field name="groups" eval="[(4,ref('base.group_hr_manager')), (4,ref('base.group_hr_user'))]"/>
+ </record>
+
<record id="property_rule_timesheet_employee" model="ir.rule">
- <field name="name">HR Analytic Timesheet</field>
+ <field name="name">Employee HR Analytic Timesheet</field>
<field model="ir.model" name="model_id" ref="model_hr_analytic_timesheet"/>
<field name="domain_force">[('user_id', '=', user.id)]</field>
+ <field name="groups" eval="[(4,ref('base.group_user'))]"/>
</record>
</data>
-</openerp>
\ No newline at end of file
+</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
