From 22f4cc2f0180af2a0d6e507f2f132bdb33d119d5 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Mon, 11 Jan 2010 14:15:56 +0530
Subject: [PATCH] [IMP] project: rules updated

bzr revid: mra@tinyerp.com-20100111084556-pl9ho54mztf1wfu2
---
 addons/crm_project/crm_project_bug.py                |  6 ++++--
 addons/crm_project/crm_project_feature.py            |  7 +++++--
 addons/crm_project/security/crm_project_security.xml |  6 ------
 addons/project/security/project_security.xml         | 12 ------------
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/addons/crm_project/crm_project_bug.py b/addons/crm_project/crm_project_bug.py
index ecc1167372a..16bf0131eb7 100644
--- a/addons/crm_project/crm_project_bug.py
+++ b/addons/crm_project/crm_project_bug.py
@@ -43,8 +43,10 @@ class crm_project_bug(osv.osv):
     }
 
     def _get_project(self, cr, uid, context):
-       user = self.pool.get('res.users').browse(cr, uid, uid)
-       return user.project_id.id
+       user = self.pool.get('res.users').browse(cr,uid,uid, context=context)
+       if user.context_project_id:
+           return user.context_project_id.id
+       return False
 
     _defaults = {
           'project_id':_get_project
diff --git a/addons/crm_project/crm_project_feature.py b/addons/crm_project/crm_project_feature.py
index dbf04814057..4301cc5ab30 100644
--- a/addons/crm_project/crm_project_feature.py
+++ b/addons/crm_project/crm_project_feature.py
@@ -42,8 +42,11 @@ class crm_project_future_request(osv.osv):
            'project_id':fields.many2one('project.project', 'Project'),
     }
     def _get_project(self, cr, uid, context):
-       user = self.pool.get('res.users').browse(cr,uid,uid)
-       return user.project_id.id
+       user = self.pool.get('res.users').browse(cr,uid,uid, context=context)
+       if user.context_project_id:
+           return user.context_project_id.id
+       return False
+
     _defaults = {
           'project_id':_get_project
           }
diff --git a/addons/crm_project/security/crm_project_security.xml b/addons/crm_project/security/crm_project_security.xml
index 489f363ee1b..e14afc42bfc 100644
--- a/addons/crm_project/security/crm_project_security.xml
+++ b/addons/crm_project/security/crm_project_security.xml
@@ -10,9 +10,6 @@
         <field name="global" eval="True"/>
     </record>
  	<record id="crm_project_bug_rule" model="ir.rule">
-        <field model="ir.model.fields" name="field_id" search="[('model','=','crm.project.bug'),('name','=','project_id')]"/>
-        <field name="operator">=</field>
-        <field name="operand">user.context_project_id.id</field>
         <field name="domain_force">['|',('project_id','=',False),('project_id','=',[user.context_project_id.id])]</field>
         <field name="rule_group" ref="crm_project_bug_rule_group"/>
     </record>
@@ -23,9 +20,6 @@
         <field name="global" eval="True"/>
     </record>
  	<record id="crm_project_feature_rule" model="ir.rule">
-        <field model="ir.model.fields" name="field_id" search="[('model','=','crm.project.future'),('name','=','project_id')]"/>
-        <field name="operator">=</field>
-        <field name="operand">user.context_project_id.id</field>
         <field name="domain_force">['|',('project_id','=',False),('project_id','=',[user.context_project_id.id])]</field>
         <field name="rule_group" ref="crm_project_feature_rule_group"/>
     </record>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index e00d72ef1ce..835ad037ee0 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -44,9 +44,6 @@
         <field name="global" eval="True"/>
     </record>
  	<record id="project_task_rule" model="ir.rule">
-        <field model="ir.model.fields" name="field_id" search="[('model','=','project.task'),('name','=','project_id')]"/>
-        <field name="operator">=</field>
-        <field name="operand">user.context_project_id.id</field>
         <field name="domain_force">['|',('project_id','=',False),('project_id','=',[user.context_project_id.id])]</field>
         <field name="rule_group" ref="project_task_rule_group"/>
     </record>
@@ -57,9 +54,6 @@
         <field name="global" eval="True"/>
     </record>
  	<record id="project_task_work_rule" model="ir.rule">
-        <field model="ir.model.fields" name="field_id" search="[('model','=','project.task.work'),('name','=','task_id.project_id')]"/>
-        <field name="operator">=</field>
-        <field name="operand">user.context_project_id.id</field>
         <field name="domain_force">['|',('task_id.project_id','=',False),('task_id.project_id','=',[user.context_project_id.id])]</field>
         <field name="rule_group" ref="project_task_work_rule_group"/>
     </record>
@@ -70,9 +64,6 @@
         <field name="global" eval="True"/>
     </record>
  	<record id="project_project_rule" model="ir.rule">
-        <field model="ir.model.fields" name="field_id" search="[('model','=','project.project'),('name','=','id')]"/>
-        <field name="operator">=</field>
-        <field name="operand">user.context_project_id.id</field>
         <field name="domain_force">['|',('id','=',False),('id','=',[user.context_project_id.id])]</field>
         <field name="rule_group" ref="project_project_rule_group"/>
     </record>
@@ -83,9 +74,6 @@
         <field name="global" eval="True"/>
     </record>
  	<record id="project_message_rule" model="ir.rule">
-        <field model="ir.model.fields" name="field_id" search="[('model','=','project.message'),('name','=','project_id')]"/>
-        <field name="operator">=</field>
-        <field name="operand">user.context_project_id.id</field>
         <field name="domain_force">['|',('project_id','=',False),('project_id','=',[user.context_project_id.id])]</field>
         <field name="rule_group" ref="project_message_rule_group"/>
     </record>