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

[IMP]: crm: Added selection in opportunity to phonecall wizard for phonecall type + Some minor Fixes 

bzr revid: rpa@tinyerp.com-20100719131155-yl80i3mtq0g6tfuo
This commit is contained in:
rpa (Open ERP) 2010-07-19 18:41:55 +05:30
parent 2eaaacf7a2
commit 2926ac88a0
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/crm/crm_opportunity_view.xml
View File

@ -188,7 +188,7 @@
<button string="Forward"
attrs="{'invisible':[('partner_assigned_id','=',False)]}"
name="%(crm_lead_forward_to_partner_act)d"
icon="gtk-go-forward" type="action"
icon="terp-mail-forward" type="action"
context="{'default_name': 'partner', 'default_partner_id': partner_assigned_id}"
/>
</group>

2
addons/crm/wizard/crm_lead_to_opportunity.py
View File

@ -79,7 +79,7 @@ class crm_lead2opportunity(osv.osv_memory):
'probability': this.probability,
'name': this.name,
'partner_id': this.partner_id.id,
'user_id': this.partner_id.user_id.id or lead.user_id.id,
'user_id': (this.partner_id.user_id and this.partner_id.user_id.id) or (lead.user_id and lead.user_id.id),
'type': 'opportunity'
}
lead_obj.write(cr, uid, lead.id, vals, context=context)

15
addons/crm/wizard/crm_opportunity_to_phonecall.py
View File

@ -33,6 +33,9 @@ class crm_opportunity2phonecall(osv.osv_memory):
'user_id' : fields.many2one('res.users', "Assign To"),
'date': fields.datetime('Date' , required=True),
'section_id': fields.many2one('crm.case.section', 'Sales Team'),
'categ_id': fields.many2one('crm.case.categ', 'Category', required=True, \
domain="[('section_id','=',section_id),\
('object_id.model', '=', 'crm.phonecall')]"),
}
def default_get(self, cr, uid, fields, context=None):
@ -47,6 +50,12 @@ class crm_opportunity2phonecall(osv.osv_memory):
@return : default values of fields.
"""
opp_obj = self.pool.get('crm.lead')
categ_id = False
data_obj = self.pool.get('ir.model.data')
res_id = data_obj._get_id(cr, uid, 'crm', 'categ_phone2')
if res_id:
categ_id = data_obj.browse(cr, uid, res_id, context=context).res_id
record_ids = context and context.get('active_ids', []) or []
res = super(crm_opportunity2phonecall, self).default_get(cr, uid, fields, context=context)
for opp in opp_obj.browse(cr, uid, record_ids, context=context):
@ -56,6 +65,8 @@ class crm_opportunity2phonecall(osv.osv_memory):
res.update({'user_id': opp.user_id and opp.user_id.id or False})
if 'section_id' in fields:
res.update({'section_id': opp.section_id and opp.section_id.id or False})
if 'categ_id' in fields:
res.update({'categ_id': categ_id})
return res
def action_cancel(self, cr, uid, ids, context=None):
@ -90,8 +101,6 @@ class crm_opportunity2phonecall(osv.osv_memory):
res = mod_obj.read(cr, uid, result, ['res_id'])
data_obj = self.pool.get('ir.model.data')
categ_id = mod_obj._get_id(cr, uid, 'crm', 'categ_phone1')
categ_id = data_obj.browse(cr, uid, categ_id, context=context).res_id
# Select the view
id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
@ -107,7 +116,7 @@ class crm_opportunity2phonecall(osv.osv_memory):
'name' : opp.name,
'case_id' : opp.id ,
'user_id' : this.user_id and this.user_id.id or False,
'categ_id' : categ_id,
'categ_id' : this.categ_id.id,
'description' : opp.description or False,
'date' : this.date,
'section_id' : this.section_id.id or opp.section_id.id or False,

1
addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
View File

@ -17,6 +17,7 @@
<newline/>
<field name="user_id" />
<field name="section_id"/>
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
<separator string="" colspan="4"/>
<label string ="" colspan="2"/>
<button name="action_cancel" string="_Cancel"