Merge lp:~openerp-dev/openobject-addons/trunk-lead_notification_imp-pga into lp:openobject-addons

[Dharmraj Zala(OpenERP)]

Hello,

This mp contains some improvements of crm_partner_assign module like
  -- Improved lead assignation notifications
  -- Added new subtypes in lead and partner

Thanks
dja.

[lp:~openerp-dev/openobject-addons/trunk-lead_notification_imp-pga]

9023. By Dharmraj Zala(OpenERP) on 2014-02-21

[MERGE] with latest trunk

9024. By Dharmraj Zala(OpenERP) on 2014-02-26

[MERGE] with latest trunk

9025. By Dharmraj Zala(OpenERP) on 2014-03-04

[MERGE] with trunk

9026. By Dharmraj Zala(OpenERP) on 2014-03-05

[IMP] improved onchange method for assigned partner

9027. By Dharmraj Zala(OpenERP) on 2014-03-05

[MERGE] with trunk

9028. By Amit Vora(OpenERP) on 2014-03-19

[MERGE] merge with main branch

9029. By Dharmraj Zala(OpenERP) on 2014-03-19

[MERGE] with latest trunk

9030. By Amit Vora(OpenERP) on 2014-03-24

[MERGE] merge with main branch

9031. By Dharmraj Zala(OpenERP) on 2014-04-01

[MERGE] sync with trunk

9032. By Amit Vora(OpenERP) on 2014-04-04

[IMP] partner_assign_id use in _tack for notification

9033. By Amit Vora(OpenERP) on 2014-04-15

[MRG] merge with main branch

9034. By Amit Vora(OpenERP) on 2014-04-23

[MRG] merge with main branch

9035. By Dharmraj Zala(OpenERP) on 2014-04-24

[MERGE] sync with trunk-addons

9036. By Dharmraj Zala(OpenERP) on 2014-04-25

[MERGE] sync with latest trunk

9037. By Amit Vora(OpenERP) on 2014-05-16

[MRG] merge with main branch

Unmerged revisions

9037. By Amit Vora(OpenERP) on 2014-05-16

[MRG] merge with main branch

9036. By Dharmraj Zala(OpenERP) on 2014-04-25

[MERGE] sync with latest trunk

9035. By Dharmraj Zala(OpenERP) on 2014-04-24

[MERGE] sync with trunk-addons

9034. By Amit Vora(OpenERP) on 2014-04-23

[MRG] merge with main branch

9033. By Amit Vora(OpenERP) on 2014-04-15

[MRG] merge with main branch

9032. By Amit Vora(OpenERP) on 2014-04-04

[IMP] partner_assign_id use in _tack for notification

9031. By Dharmraj Zala(OpenERP) on 2014-04-01

[MERGE] sync with trunk

9030. By Amit Vora(OpenERP) on 2014-03-24

[MERGE] merge with main branch

9029. By Dharmraj Zala(OpenERP) on 2014-03-19

[MERGE] with latest trunk

9028. By Amit Vora(OpenERP) on 2014-03-19

[MERGE] merge with main branch

=== modified file 'crm_partner_assign/crm_partner_assign.py'
--- crm_partner_assign/crm_partner_assign.py	2013-12-02 15:09:25 +0000
+++ crm_partner_assign/crm_partner_assign.py	2014-05-16 09:54:03 +0000
@@ -86,6 +86,12 @@
 
 class crm_lead(osv.osv):
     _inherit = "crm.lead"
+    _track = {
+        'partner_assigned_id': {
+            # this is only an heuristics; depending on your particular stage configuration it may not match all 'new' stages
+            'crm_partner_assign.mt_crm_partner_lead_assign': lambda self, cr, uid, obj, ctx=None: obj.partner_assigned_id,
+        },
+    }
     _columns = {
         'partner_latitude': fields.float('Geo Latitude'),
         'partner_longitude': fields.float('Geo Longitude'),
@@ -105,10 +111,10 @@
         else:
             partners = self.pool.get('res.partner').browse(cr, uid, [partner_assigned_id], context=context)
             user_id = partners[0] and partners[0].user_id.id or False
-            return {'value':
-                        {'date_assign': fields.date.context_today(self,cr,uid,context=context),
-                         'user_id' : user_id}
-                   }
+            values = {'date_assign': fields.date.context_today(self,cr,uid,context=context)}
+            if user_id:
+                values.update({'user_id' : user_id})
+            return {'value': values}
 
     def action_assign_partner(self, cr, uid, ids, context=None):
         return self.assign_partner(cr, uid, ids, partner_id=False, context=context)

=== modified file 'crm_partner_assign/portal_data.xml'
--- crm_partner_assign/portal_data.xml	2013-10-08 14:57:30 +0000
+++ crm_partner_assign/portal_data.xml	2014-05-16 09:54:03 +0000
@@ -31,4 +31,38 @@
         </record>
 
     </data>
-</openerp>
+    <data noupdate="1">
+
+        <record id="mt_lead_accept" model="mail.message.subtype">
+            <field name="name">Partner Accept</field>
+            <field name="res_model">crm.lead</field>
+            <field name="default" eval="False"/>
+            <field name="description">Partner Accept</field>
+        </record>
+        
+        <record id="mt_lead_refused" model="mail.message.subtype">
+            <field name="name">Partner Refused</field>
+            <field name="res_model">crm.lead</field>
+            <field name="default" eval="False"/>
+            <field name="description">Partner Refused</field>
+        </record>
+        
+        <record id="mt_crm_partner_lead_assign" model="mail.message.subtype">
+            <field name="name">Lead Assign</field>
+            <field name="res_model">crm.lead</field>
+            <field name="default" eval="False"/>
+            <field name="hidden" eval="True"/>
+            <field name="description">Lead Assign</field>
+        </record>
+        
+        <record id="mt_partner_lead_assign" model="mail.message.subtype">
+            <field name="name">Lead Assign</field>
+            <field name="res_model">res.partner</field>
+            <field name="default" eval="False"/>
+            <field name="description">Lead Assign</field>
+            <field name="parent_id" eval="ref('mt_crm_partner_lead_assign')"/>
+            <field name="relation_field">partner_assigned_id</field>
+        </record>
+     
+    </data>
+ </openerp>

=== modified file 'crm_partner_assign/wizard/crm_channel_interested.py'
--- crm_partner_assign/wizard/crm_channel_interested.py	2014-04-04 12:54:50 +0000
+++ crm_partner_assign/wizard/crm_channel_interested.py	2014-05-16 09:54:03 +0000
@@ -53,6 +53,9 @@
             values = {'partner_assigned_id': False}
             user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
             partner_ids = self.pool.get('res.partner').search(cr, SUPERUSER_ID, [('id', 'child_of', user.partner_id.commercial_partner_id.id)], context=context)
+            if wizard.comment:
+                message += '<p>%s</p>' % wizard.comment
+            lead_obj.message_post(cr, uid, context.get('active_ids'), body=_(message),subtype="crm_partner_assign.mt_lead_refused", context=context)
             lead_obj.message_unsubscribe(cr, SUPERUSER_ID, context.get('active_ids', []), partner_ids, context=None)
             try:
                 stage_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', stage)[1]
@@ -60,13 +63,13 @@
                 stage_id = False
             if stage_id:
                 values.update({'stage_id': stage_id})
+                
         if wizard.comment:
             message += '<p>%s</p>' % wizard.comment
-        for active_id in context.get('active_ids', []):
-            lead_obj.message_post(cr, uid, active_id, body=message, subtype="mail.mt_comment", context=context)
         if values:
             lead_obj.write(cr, SUPERUSER_ID, context.get('active_ids', []), values)
         if wizard.interested:
+            lead_obj.message_post(cr, uid, context.get('active_ids'), body=_(message),subtype="crm_partner_assign.mt_lead_accept", context=context)
             for lead in lead_obj.browse(cr, uid, context.get('active_ids', []), context=context):
                 lead_obj.convert_opportunity(cr, SUPERUSER_ID, [lead.id], lead.partner_id and lead.partner_id.id or None, context=None)
         return {

=== modified file 'crm_partner_assign/wizard/crm_forward_to_partner.py'
--- crm_partner_assign/wizard/crm_forward_to_partner.py	2014-01-16 10:39:10 +0000
+++ crm_partner_assign/wizard/crm_forward_to_partner.py	2014-05-16 09:54:03 +0000
@@ -79,6 +79,7 @@
 
     def action_forward(self, cr, uid, ids, context=None):
         lead_obj = self.pool.get('crm.lead')
+        partner_obj = self.pool.get('res.partner')
         record = self.browse(cr, uid, ids[0], context=context)
         email_template_obj = self.pool.get('email.template')
         try:
@@ -143,8 +144,25 @@
                 values['section_id'] = partner_leads['partner'].user_id.default_section_id.id
             lead_obj.write(cr, uid, lead_ids, values)
             self.pool.get('crm.lead').message_subscribe(cr, uid, lead_ids, [partner_id], context=context)
+            message = self._prepare_notify_message(partner_leads['leads'], partner_leads['partner'].name)
+            partner_obj.message_post(cr, uid, [partner_id], body=message,subtype="crm_partner_assign.mt_partner_lead_assign", context=context)
         return True
 
+    def _prepare_notify_message(self, leads, partner_name):
+        child_message, lead, link = '<ol>', False, False
+        for lead_dict in leads:
+            link = "#model=crm.lead&id=%s" % (lead_dict['lead_id'].id)
+            lead = lead_dict['lead_id']
+            child_message += '<li> <a href="%s">%s</a></li>'%(link,lead.name)
+        child_message += '</ol>'
+        message = '<ul><li><b>Assign to:</b> %s </li>'%(partner_name)
+        if len(leads) == 1:
+            message += '<li><b>Lead: <a href="%s">%s</a> </b> </li>'%(link,lead.name)
+        else:
+            message += '<li><b>Leads: %s</li>'%(child_message)
+        message += '</b></li></ul>'
+        return message
+            
     def get_lead_portal_url(self, cr, uid, lead_id, type, context=None):
         action = type == 'opportunity' and 'action_portal_opportunities' or 'action_portal_leads'
         try: