Merge lp:~openerp-dev/openobject-addons/trunk-bug-719063-pso into lp:openobject-addons

[Priyesh (OpenERP)]

Fixed 719063 (https://bugs.launchpad.net/openobject-addons/+bug/719063)
Added security rules in timesheet and payroll module.

Thanks.

[Priyesh (OpenERP) (pso-openerp)]

Make proper indentation.

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

[qdp (OpenERP) (qdp)]

patch for payroll is wrong: HR / Officer should be able to see all the payslips of him or of employess for which he's the manager. But this will be addressed in the R&D project related to hr_payroll, so you can simply remove that hunk.

second path for timesheet is correct, but i'm not sure that there isn't any other patch needed.

More investigation is needed, in the meanwhile you can already remove the 1st patch Priyesh.
Thanks

review: Needs Fixing

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

yes,

first patch for the payslip should be removed.

There is two problems still exists.

first for payslips (new user can see the payslip of another employees...) => We will fix this in trunk-payroll branch so no need to include it here.
and second for evaluation (new user can see the evaluations for other employess) => this should be fix here.

Thanks,
mra

review: Needs Fixing

[Priyesh (OpenERP) (pso-openerp)]

Removed rule from timesheet and payroll.
Created rule for evaluation and moved demo record of rule from demo xml to rule xml.

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

remove changes from hr_payroll/security/hr_security.xml.

for the evaluation it is working fine => as new user now only can see his/her evaulation.

[lp:~openerp-dev/openobject-addons/trunk-bug-719063-pso]

4609. By Priyesh (OpenERP) on 2011-04-28

[MERGE] merge from same branch

[Priyesh (OpenERP) (pso-openerp)]

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

[qdp (OpenERP) (qdp)]

hum how to say it?... i don't find a single line that differs between existing and proposed versions! And i must say that it's quite amazing to see that a diff of 76 lines (+27/-14), 4 files modified is doing absolutely nothing...

i must be missing something, please open my eyes!

review: Disapprove

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Yes,

We have created new file under security/ir_rule.xml because currently both the ir.rules for evaluation object was in demo file so we transfer them to ir.rule.xml in security as per openerp module structure.

And i agree we dont have any change in modified file 'hr_payroll/security/hr_security.xml' file but we had some changes before this diff so it appears here to remove it we have to manually uncommit that changes.

+ <record id="employee_evaluation_rule" model="ir.rule"> => this is the duplication of <record id="property_rule_evaluation" model="ir.rule"> it should be remove

Thanks,
mra

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-719063-pso]

4610. By Ashvin Rathod (OpenERP) on 2011-06-03

[IMP] hr_evalution: remove duplicate record

[Ashvin Rathod (OpenERP) (ara-tinyerp)]

Hello,

I have improved as per suggestion.

Thanks,
ara

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

As per comment 10 in bug it does not work for evaluation.
New user (groups= employee and partner manager only) can see only his/her evaluation.

Thanks,
mra

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-719063-pso]

4611. By Purnendu Singh (OpenERP) on 2011-06-08

[FIX] hr_*: New user (groups= employee and partner manager only) can see only his/her evaluation, timesheet lines

[Purnendu Singh (OpenERP) (purnendu-singh)]

Hello,

Add rules in hr_evolution and hr_timesheet_sheet module.

So, the new user with (Groups= Employee and partner manger only) will be able to see only
his/her evolutions and timesheet lines.

Thanks,
Purnendu Singh

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Not working for timesheet lines.
If i have hr manager rights i can see all the time sheet lines as like expense.

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-719063-pso]

4612. By Ujjvala Collins on 2011-07-12

[MERGE]: Merged with trunk-addons.

4613. By Ujjvala Collins on 2011-07-12

[IMP] hr_timesheet_sheet: Improved securtiy rules for timesheet lines.

[Ujjvala Collins (uco-openerp)]

Hello sir,

I've fixed the said problem. Please check.

Thanks,
Ujjvala

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Timesheet line: manager can see the all the timesheet lines but currently he/she can not.

can you fix it please?

And yes now we have Trunk payroll for 6.1 in trunk addons so kindly check the same issue with payroll and payroll account module too.

Thanks,
Mustufa

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-719063-pso]

4614. By Ujjvala Collins on 2011-07-12

[FIX] hr_timesheet,hr_payroll: Fixed security rules for manager.

[Ujjvala Collins (uco-openerp)]

Hello sir,

I've fixed the said problem in timesheet lines as well as payroll module.

Thanks.

review: Needs Resubmitting

[Ujjvala Collins (uco-openerp)]

Hello sir,

I've fixed the said problem in timesheet lines as well as payroll module.

Thanks.

review: Needs Resubmitting

[Ujjvala Collins (uco-openerp)]

Hello sir,

I've fixed the said problem in timesheet lines as well as payroll module.

Thanks.

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

[qdp (OpenERP) (qdp)]

access rights set are not compliant with what we want for employees, hr officers and hr managers. Aline will make clear specs and a full review of the access rights in HR soon, so in the meanwhile i'm rejecting that branch.

review: Disapprove

Unmerged revisions

4614. By Ujjvala Collins on 2011-07-12

[FIX] hr_timesheet,hr_payroll: Fixed security rules for manager.

4613. By Ujjvala Collins on 2011-07-12

[IMP] hr_timesheet_sheet: Improved securtiy rules for timesheet lines.

4612. By Ujjvala Collins on 2011-07-12

[MERGE]: Merged with trunk-addons.

4611. By Purnendu Singh (OpenERP) on 2011-06-08

[FIX] hr_*: New user (groups= employee and partner manager only) can see only his/her evaluation, timesheet lines

4610. By Ashvin Rathod (OpenERP) on 2011-06-03

[IMP] hr_evalution: remove duplicate record

4609. By Priyesh (OpenERP) on 2011-04-28

[MERGE] merge from same branch

4608. By Priyesh (OpenERP) on 2011-03-29

Revert Changes

4607. By Priyesh (OpenERP) on 2011-03-29

[FIX] hr_timesheet_sheet: Added record rules for better security

=== modified file 'hr_evaluation/__openerp__.py'
--- hr_evaluation/__openerp__.py	2011-04-08 12:57:58 +0000
+++ hr_evaluation/__openerp__.py	2011-07-12 10:02:45 +0000
@@ -44,6 +44,7 @@
     "update_xml": [
         "security/ir.model.access.csv",
         "security/hr_evaluation_security.xml",
+        "security/ir_rule.xml",
         "wizard/hr_evaluation_mail_view.xml",
         "hr_evaluation_view.xml",
         "report/hr_evaluation_report_view.xml",

=== modified file 'hr_evaluation/hr_evaluation_demo.xml'
--- hr_evaluation/hr_evaluation_demo.xml	2011-02-18 12:23:44 +0000
+++ hr_evaluation/hr_evaluation_demo.xml	2011-07-12 10:02:45 +0000
@@ -1611,19 +1611,6 @@
            <field eval="'run_employee_evaluation'" name="function" />
            <field eval="'(False,)'" name="args" />
           </record>
-
-        <record id="property_rule_evaluation" model="ir.rule">
-            <field name="name">Employee Evaluation</field>
-            <field model="ir.model" name="model_id" ref="model_hr_evaluation_evaluation"/>
-            <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_evaluation_manager" model="ir.rule">
-            <field name="name">Manager Evaluation</field>
-            <field model="ir.model" name="model_id" ref="model_hr_evaluation_evaluation"/>
-            <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
-            <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/>
-        </record>
          </data>
 
 </openerp>

=== added file 'hr_evaluation/security/ir_rule.xml'
--- hr_evaluation/security/ir_rule.xml	1970-01-01 00:00:00 +0000
+++ hr_evaluation/security/ir_rule.xml	2011-07-12 10:02:45 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="True">
+
+        <record id="property_rule_evaluation" model="ir.rule">
+            <field name="name">Employee Evaluation</field>
+            <field model="ir.model" name="model_id" ref="model_hr_evaluation_evaluation"/>
+            <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_evaluation_manager" model="ir.rule">
+            <field name="name">Manager Evaluation</field>
+            <field model="ir.model" name="model_id" ref="model_hr_evaluation_evaluation"/>
+            <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id)]</field>
+            <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/>
+        </record>
+        <record id="property_rule_evaluation_employee" model="ir.rule">
+            <field name="name">Employee Evaluation</field>
+            <field model="ir.model" name="model_id" ref="model_hr_evaluation_evaluation"/>
+            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+            <field name="groups" eval="[(4,ref('base.group_user'))]"/>
+        </record>
+
+    </data>
+</openerp>

=== 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	2011-07-12 10:02:45 +0000
@@ -12,6 +12,13 @@
         <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_hr_user'))]"/>
     </record>
+    
+    <record id="property_rule_employee_payslip_manager" model="ir.rule">
+        <field name="name">Manager Payslip</field>
+        <field model="ir.model" name="model_id" ref="model_hr_payslip"/>
+        <field name="domain_force">[(1,'=',1)]</field>
+        <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/>
+    </record>
 
 </data>
-</openerp>
\ No newline at end of file
+</openerp>

=== 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-07-12 10:02:45 +0000
@@ -6,6 +6,7 @@
             <field name="name">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_hr_user'))]"/>
         </record>
 
     </data>

=== 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	2011-07-12 10:02:45 +0000
@@ -8,6 +8,30 @@
             <field name="global" eval="True"/>
             <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         </record>
+        <record model="ir.rule" id="timesheet_rule">
+            <field name="name">Employee Timesheet</field>
+            <field name="model_id" search="[('model','=','hr_timesheet_sheet.sheet')]" model="ir.model"/>
+            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+            <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
+        </record>
+        <record model="ir.rule" id="timesheet_rule_manager">
+            <field name="name">Manager Timesheet</field>
+            <field name="model_id" search="[('model','=','hr_timesheet_sheet.sheet')]" model="ir.model"/>
+            <field name="domain_force">[(1,'=',1)]</field>
+            <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/>
+        </record>
+        <record model="ir.rule" id="timesheet_line_rule">
+            <field name="name">Employee Timesheet Lines</field>
+            <field name="model_id" search="[('model','=','hr.analytic.timesheet')]" model="ir.model"/>
+            <field name="domain_force">[('user_id','=',user.id)]</field>
+            <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
+        </record>
+        <record model="ir.rule" id="timesheet_line_rule_manager">
+            <field name="name">Manager Timesheet Lines</field>
+            <field name="model_id" search="[('model','=','hr.analytic.timesheet')]" model="ir.model"/>
+            <field name="domain_force">[(1,'=',1)]</field>
+            <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/>
+        </record>
 
     </data>
 </openerp>