odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] sale_crm, crm : rules updated 

bzr revid: mra@tinyerp.com-20100113102033-n520ib3qle3owx46
This commit is contained in:
mra (Open ERP) 2010-01-13 15:50:33 +05:30
parent f400e195cf
commit cf177047b1
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
addons/crm/security/crm_security.xml
View File

@ -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>

3
addons/sale_crm/sale_crm.py
View File

@ -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

4
addons/sale_crm/security/sale_crm_security.xml
View File

@ -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>