Merge lp:~openerp-dev/openobject-addons/trunk-bug-1224879-dja into lp:openobject-addons

[Dharmraj Zala(OpenERP)]

Hello ,

I've fixed the issue of losing link while creating phone call from another phone call by passing opportunity_id from wizard.

Thanks,
dja

Unmerged revisions

8903. By Dharmraj Zala(OpenERP) on 2014-01-07

[IMP] removed opportunity_id from view file as it is not needed

8902. By Dharmraj Zala(OpenERP) on 2014-01-07

[MERGE] with trunk

8901. By Dharmraj Zala(OpenERP) on 2013-09-16

[FIX] shcedulig call from another call won't lose link

=== modified file 'crm/crm_phonecall.py'
--- crm/crm_phonecall.py	2013-11-27 15:32:57 +0000
+++ crm/crm_phonecall.py	2014-01-07 12:42:55 +0000
@@ -110,7 +110,7 @@
         return True
 
     def schedule_another_phonecall(self, cr, uid, ids, schedule_time, call_summary, \
-                    user_id=False, section_id=False, categ_id=False, action='schedule', context=None):
+                    user_id=False, section_id=False, categ_id=False, opportunity_id=False, action='schedule', context=None):
         """
         action :('schedule','Schedule a call'), ('log','Log a call')
         """
@@ -140,6 +140,7 @@
                     'partner_phone' : call.partner_phone,
                     'partner_mobile' : call.partner_mobile,
                     'priority': call.priority,
+                    'opportunity_id': call.opportunity_id and call.opportunity_id.id or False,
             }
             new_id = self.create(cr, uid, vals, context=context)
             if action == 'log':

=== modified file 'crm/wizard/crm_phonecall_to_phonecall.py'
--- crm/wizard/crm_phonecall_to_phonecall.py	2013-11-27 15:32:57 +0000
+++ crm/wizard/crm_phonecall_to_phonecall.py	2014-01-07 12:42:55 +0000
@@ -40,7 +40,8 @@
         'section_id':fields.many2one('crm.case.section','Sales Team'),
         'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True),
         'partner_id' : fields.many2one('res.partner', "Partner"),
-        'note':fields.text('Note')
+        'note':fields.text('Note'),
+        'opportunity_id': fields.many2one('crm.lead','Lead/Opportunity'),
     }
 
 
@@ -61,6 +62,7 @@
                     this.user_id and this.user_id.id or False, \
                     this.section_id and this.section_id.id or False, \
                     this.categ_id and this.categ_id.id or False, \
+                    this.opportunity_id and this.opportunity_id.id or False, \
                     action=this.action, context=context)
 
         return phonecall.redirect_phonecall_view(cr, uid, phocall_ids[phonecall_ids[0]], context=context)
@@ -96,6 +98,8 @@
                 res.update({'categ_id': categ_id})
             if 'partner_id' in fields:
                 res.update({'partner_id': phonecall.partner_id and phonecall.partner_id.id or False})
+            if 'opportunity_id' in fields:
+                res.update({'opportunity_id': phonecall.opportunity_id and phonecall.opportunity_id.id or False})
         return res