Bharat Devnani (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons-issues5-crm-pso-meeting-merge-bde
into lp:~openerp-dev/openobject-addons/trunk-addons-issues5-crm-pso.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-issues5-crm-pso-meeting-merge-bde/+merge/122515
Hello Sir,
I have added the feature merge with existing opportunity and also solved the
bug when
Admin clicks on meeting.
Thanks & Regards,
Devnani Bharat R.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-issues5-crm-pso-meeting-merge-bde/+merge/122515
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-addons-issues5-crm-pso-meeting-merge-bde
into lp:~openerp-dev/openobject-addons/trunk-addons-issues5-crm-pso.
=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py 2012-08-10 10:22:57 +0000
+++ base_calendar/base_calendar.py 2012-09-03 13:29:19 +0000
@@ -1463,7 +1463,7 @@
continue
if r['class']=='private':
for f in r.keys():
- if f not in ('id','date','date_deadline','duration','user_id','state'):
+ if f not in ('id','date','date_deadline','duration','user_id','state','message_follower_ids'):
r[f] = False
if f=='name':
r[f] = _('Busy')
=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py 2012-08-28 11:32:41 +0000
+++ crm/crm_lead.py 2012-09-03 13:29:19 +0000
@@ -476,6 +476,7 @@
return "\n".join(body + ['---'])
def _merge_notification(self, cr, uid, opportunity_id, opportunities, context=None):
+ opportunities = self.pool.get('crm.lead').browse(cr, uid, opportunities, context=context)
#TOFIX: mail template should be used instead of fix body, subject text
details = []
merge_message = _('Merged opportunities')
@@ -533,10 +534,10 @@
:param ids: list of opportunities ids to merge
"""
if context is None: context = {}
-
+
#TOCHECK: where pass lead_ids in context?
lead_ids = context and context.get('lead_ids', []) or []
-
+
if len(ids) <= 1:
raise osv.except_osv(_('Warning!'),_('Please select more than one opportunity from the list view.'))
@@ -555,6 +556,9 @@
'partner_name', 'phone', 'probability', 'planned_revenue', 'street', 'street2', 'zip', 'create_date', 'date_action_last',
'date_action_next', 'email_from', 'email_cc', 'partner_name']
+ #Notification about loss of information
+ self._merge_notification(cr, uid, first_opportunity, lead_ids, context=context)
+
data = self._merge_data(cr, uid, ids, oldest, fields, context=context)
# merge data into first opportunity
@@ -564,8 +568,6 @@
self._merge_opportunity_history(cr, uid, first_opportunity.id, tail_opportunities, context=context)
self._merge_opportunity_attachments(cr, uid, first_opportunity.id, tail_opportunities, context=context)
- #Notification about loss of information
- self._merge_notification(cr, uid, first_opportunity, opportunities, context=context)
#delete tail opportunities
self.unlink(cr, uid, [x.id for x in tail_opportunities], context=context)
=== modified file 'crm/wizard/crm_lead_to_opportunity.py'
--- crm/wizard/crm_lead_to_opportunity.py 2012-08-06 17:07:32 +0000
+++ crm/wizard/crm_lead_to_opportunity.py 2012-09-03 13:29:19 +0000
@@ -116,13 +116,16 @@
#TOFIX: is it usefully ?
if context is None:
context = {}
+ lead_ids = context.get('active_ids', [])
merge_opportunity = self.pool.get('crm.merge.opportunity')
res = False
#If we convert in mass, don't merge if there is no other opportunity but no warning
if action == 'merge' and (len(opportunity_ids) > 1 or not context.get('mass_convert') ):
self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, [opportunity_ids[0].id])]}, context=context)
- context.update({'lead_ids' : record_id, "convert" : True})
- res = merge_opportunity.merge(cr, uid, data.opportunity_ids, context=context)
+ merge_opportunity_ids = [lead_ids[0]] + [opportunity_ids[0].id]
+ print "merge_opportunity_ids", merge_opportunity_ids
+ context.update({'lead_ids' : lead_ids, 'convert' : True})
+ res = self.pool.get('crm.lead').merge_opportunity(cr, uid, sorted(merge_opportunity_ids), context=context)
return res
def action_apply(self, cr, uid, ids, context=None):
@@ -136,7 +139,7 @@
lead_ids = context.get('active_ids', [])
data = self.browse(cr, uid, ids, context=context)[0]
self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids}, context=context)
- self._merge_opportunity(cr, uid, ids, data.opportunity_ids, data.action, context=context)
+ self._merge_opportunity(cr, uid, ids, data.opportunity_ids, data.name, context=context)
return lead.redirect_opportunity_view(cr, uid, lead_ids[0], context=context)
crm_lead2opportunity_partner()
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
