Merge lp:~openerp-dev/openobject-addons/7.0-opw-593517-rha into lp:openobject-addons/7.0

[Rifakat Husen (OpenERP)]

Added record rules for objects project.task.work and hr.analytic.timesheet
- Any user was able to see other's users' task work entry
- if there is already any task entry for any user then it is forbidden for another user to add his entry and it throws
  access warning.

Fix:
- user should be able to see his own task entry if he belongs to Project User group
- user should be able to see and modify all the entries if he belongs to Project Manager group

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Rifakat Husen (OpenERP) (rha-openerp)]

We don't need this branch anymore, it's already been taken care from server 7.0,
Revision 5162, Revision ID: <email address hidden>

review: Disapprove

Unmerged revisions

9327. By Rifakat Husen (OpenERP) on 2013-07-29

[FIX] project, project_timesheet: added record rules for object task work,
- project user must not see task work entry of other users
- project manager should be able to see all the users' entry and able to modify it

=== modified file 'project/security/project_security.xml'
--- project/security/project_security.xml	2013-04-12 14:37:19 +0000
+++ project/security/project_security.xml	2013-07-29 11:00:40 +0000
@@ -95,5 +95,19 @@
         <field name="groups" eval="[(4,ref('project.group_project_manager'))]"/>
     </record>
 
+    <record model="ir.rule" id="rule_project_user_task_work">
+        <field name="name">Project User: Task Work</field>
+        <field name="model_id" ref="model_project_task_work"/>
+        <field name="domain_force">[('user_id', '=', user.id)]</field>
+        <field name="groups" eval="[(4, ref('project.group_project_user'))]"/>
+    </record>
+    
+    <record model="ir.rule" id="rule_project_manager_task_work">
+        <field name="name">Project Manager: Task Work</field>
+        <field name="model_id" ref="model_project_task_work"/>
+        <field name="domain_force">[(1, '=', 1)]</field>
+        <field name="groups" eval="[(4, ref('project.group_project_manager'))]"/>
+    </record>
+
 </data>
 </openerp>

=== modified file 'project_timesheet/security/project_timesheet_security.xml'
--- project_timesheet/security/project_timesheet_security.xml	2012-06-25 12:30:34 +0000
+++ project_timesheet/security/project_timesheet_security.xml	2013-07-29 11:00:40 +0000
@@ -4,6 +4,14 @@
         <record model="res.groups" id="base.group_user">
             <field name="implied_ids" eval="[(4, ref('project.group_tasks_work_on_tasks'))]"/>
         </record>
+
+        <record model="ir.rule" id="rule_project_manager_analytic_timesheet">
+            <field name="name">Manager Project Analytic Timesheet</field>
+            <field name="model_id" ref="hr_timesheet.model_hr_analytic_timesheet"/>
+            <field name="domain_force">[(1, '=', 1)]</field>
+            <field name="groups" eval="[(4, ref('project.group_project_manager'))]"/>
+        </record>
+
     </data>
 </openerp>