Merge lp:~invitu/openerp-asterisk-connector/openerp-asterisk-connector_7_0 into lp:openerp-asterisk-connector/7.0

Proposed by invitu
Status: Merged
Merged at revision: 88
Proposed branch: lp:~invitu/openerp-asterisk-connector/openerp-asterisk-connector_7_0
Merge into: lp:openerp-asterisk-connector/7.0
Diff against target: 25 lines (+4/-3)
1 file modified
asterisk_click2dial_crm/asterisk_click2dial_crm.py (+4/-3)
To merge this branch: bzr merge lp:~invitu/openerp-asterisk-connector/openerp-asterisk-connector_7_0
Reviewer Review Type Date Requested Status
OpenERP Asterisk commiters Pending
Review via email: mp+163795@code.launchpad.net

Description of the change

[FIX] fix open crm phonecall that did not work due to last rewrite

To post a comment you must log in.
88. By invitu

[MERGE] branch lp:~invitu/openerp-asterisk-connector/openerp-asterisk-connector_7_0 that fixes the fonction "open crm phonecall" that was broken by my recent commits

Revision history for this message
Alexis de Lattre (alexis-via) wrote :

Thank you very much for fixing my code :-) Very good contribution !

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'asterisk_click2dial_crm/asterisk_click2dial_crm.py'
2--- asterisk_click2dial_crm/asterisk_click2dial_crm.py 2013-05-12 23:22:42 +0000
3+++ asterisk_click2dial_crm/asterisk_click2dial_crm.py 2013-05-14 19:49:22 +0000
4@@ -39,9 +39,10 @@
5
6
7 class res_partner(osv.osv):
8- _inherit = "res.partner"
9+ _name = 'res.partner'
10+ _inherit = ['res.partner', 'asterisk.common']
11
12- def dial(self, cr, uid, ids, phone_field='phone', context=None):
13+ def action_dial(self, cr, uid, ids, context=None):
14 '''
15 This method open the phone call history when the phone click2dial
16 button of asterisk_click2dial module is pressed
17@@ -49,7 +50,7 @@
18 '''
19 if context is None:
20 context = {}
21- super(res_partner, self).dial(cr, uid, ids, phone_field=phone_field, context=context)
22+ super(res_partner, self).action_dial(cr, uid, ids, context=context)
23 user = self.pool['res.users'].browse(cr, uid, uid, context=context)
24 context['partner_id'] = ids[0]
25 action_start_wizard = {

Subscribers

People subscribed via source and target branches