From cf177047b120d4c034e6d8b3baabd1cd1b388856 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Wed, 13 Jan 2010 15:50:33 +0530
Subject: [PATCH] [FIX] sale_crm, crm : rules updated

bzr revid: mra@tinyerp.com-20100113102033-n520ib3qle3owx46
---
 addons/crm/security/crm_security.xml           | 18 +++++++++---------
 addons/sale_crm/sale_crm.py                    |  3 ++-
 addons/sale_crm/security/sale_crm_security.xml |  4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 8d2c5530c7d..e1f29e70d37 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -26,7 +26,7 @@
     </record>
 
 	<record id="crm_meeting_rule" model="ir.rule">
-        <field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
+        <field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
         <field name="rule_group" ref="crm_meeting_rule_group"/>
     </record>
 
@@ -37,7 +37,7 @@
         <field name="global" eval="True"/>
     </record>
 	<record id="crm_claim_rule" model="ir.rule">
-        <field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
+        <field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
         <field name="rule_group" ref="crm_claim_rule_group"/>
     </record>
 
@@ -48,7 +48,7 @@
         <field name="global" eval="True"/>
     </record>
 	<record id="crm_fundraising_rule" model="ir.rule">
-        <field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
+        <field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
         <field name="rule_group" ref="crm_fundraising_rule_group"/>
     </record>
 
@@ -59,7 +59,7 @@
         <field name="global" eval="True"/>
     </record>
 	<record id="crm_helpdesk_rule" model="ir.rule">
-        <field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
+        <field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
         <field name="rule_group" ref="crm_helpdesk_rule_group"/>
     </record>
 
@@ -70,7 +70,7 @@
         <field name="global" eval="True"/>
     </record>
 	<record id="crm_job_rule" model="ir.rule">
-        <field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
+        <field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
         <field name="rule_group" ref="crm_job_rule_group"/>
     </record>
 
@@ -81,7 +81,7 @@
         <field name="global" eval="True"/>
     </record>
 	<record id="crm_leads_rule" model="ir.rule">
-        <field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
+        <field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
         <field name="rule_group" ref="crm_leads_rule_group"/>
    </record>
 
@@ -92,7 +92,7 @@
         <field name="global" eval="True"/>
     </record>
 	<record id="crm_opportunities_rule" model="ir.rule">
-        <field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
+        <field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
         <field name="rule_group" ref="crm_opportunities_rule_group"/>
     </record>
 
@@ -103,7 +103,7 @@
         <field name="global" eval="True"/>
     </record>
     <record id="crm_phone_calls_rule" model="ir.rule">
-        <field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
+        <field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
         <field name="rule_group" ref="crm_phone_calls_rule_group"/>
     </record>
 
@@ -114,7 +114,7 @@
         <field name="global" eval="True"/>
     </record>
     <record id="crm_case_rule" model="ir.rule">
-        <field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
+        <field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
         <field name="rule_group" ref="crm_case_rule_group"/>
     </record>
     </data>
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index 309a2bd76a9..03d191d79f6 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -30,7 +30,8 @@ class sale_order(osv.osv):
 
     def _get_section(self, cr, uid, context):
        user = self.pool.get('res.users').browse(cr,uid,uid,context=context)
-       return user.context_section_id
+       print "section id",type(user.context_section_id)
+       return int(user.context_section_id)
 
     _defaults = {
           'section_id':_get_section
diff --git a/addons/sale_crm/security/sale_crm_security.xml b/addons/sale_crm/security/sale_crm_security.xml
index 544fe1ab9a0..96fe3c63939 100644
--- a/addons/sale_crm/security/sale_crm_security.xml
+++ b/addons/sale_crm/security/sale_crm_security.xml
@@ -9,7 +9,7 @@
     </record>
     <record model="ir.rule" id="sale_order_comp_rule">
         <field name="rule_group" ref="sale_order_crm_rule_group"/>
-        <field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
+        <field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
     </record>
 
     <record model="ir.rule.group" id="sale_order_line_crm_rule_group">
@@ -19,7 +19,7 @@
     </record>
     <record model="ir.rule" id="sale_order_line_comp_rule">
         <field name="rule_group" ref="sale_order_line_crm_rule_group"/>
-        <field name="domain_force">['|',('order_id.section_id','=',False),('order_id.section_id','=',user.context_section_id)]</field>
+        <field name="domain_force">['|',('order_id.section_id','=',False),('order_id.section_id','in',[user.context_section_id])]</field>
     </record>