%s
%s
' % (help_title, sub_title) + # ------------------------------------------------------------ # BUSINESS # ------------------------------------------------------------ @@ -872,7 +909,7 @@ class Lead(models.Model): return self.message_post(body=message) # ------------------------------------------------------------ - # MERGE LEADS / OPPS + # MERGE AND CONVERT LEADS / OPPORTUNITIES # ------------------------------------------------------------ def _merge_get_result_type(self): @@ -962,7 +999,7 @@ class Lead(models.Model): which fields has been merged and their new value. `self` is the resulting merge crm.lead record. - :param opportunities: see ``merge_dependences`` + :param opportunities: see ``_merge_dependences`` """ # TODO JEM: mail template should be used instead of fix body, subject text self.ensure_one() @@ -979,7 +1016,7 @@ class Lead(models.Model): """ Move mail.message from the given opportunities to the current one. `self` is the crm.lead record destination for message of `opportunities`. - :param opportunities: see ``merge_dependences`` + :param opportunities: see ``_merge_dependences`` """ self.ensure_one() for opportunity in opportunities: @@ -998,7 +1035,7 @@ class Lead(models.Model): """ Move attachments of given opportunities to the current one `self`, and rename the attachments having same name than native ones. - :param opportunities: see ``merge_dependences`` + :param opportunities: see ``_merge_dependences`` """ self.ensure_one() @@ -1020,7 +1057,7 @@ class Lead(models.Model): attachment.write(values) return True - def merge_dependences(self, opportunities): + def _merge_dependences(self, opportunities): """ Merge dependences (messages, attachments, ...). These dependences will be transfered to `self`, the most important lead. @@ -1065,7 +1102,7 @@ class Lead(models.Model): merged_data['team_id'] = team_id # merge other data (mail.message, attachments, ...) from tail into head - opportunities_head.merge_dependences(opportunities_tail) + opportunities_head._merge_dependences(opportunities_tail) # check if the stage is in the stages of the Sales Team. If not, assign the stage with the lowest sequence if merged_data.get('team_id'): @@ -1083,16 +1120,6 @@ class Lead(models.Model): return opportunities_head - def _sort_by_confidence_level(self, reverse=False): - """ Sorting the leads/opps according to the confidence level of its stage, which relates to the probability of winning it - The confidence level increases with the stage sequence - An Opportunity always has higher confidence level than a lead - """ - def opps_key(opportunity): - return opportunity.type == 'opportunity', opportunity.stage_id.sequence, -opportunity._origin.id - - return self.sorted(key=opps_key, reverse=reverse) - def _convert_opportunity_data(self, customer, team_id=False): """ Extract the data from a lead to create the opportunity :param customer : res.partner record @@ -1122,10 +1149,57 @@ class Lead(models.Model): lead.write(vals) if user_ids or team_id: - self.handle_salesmen_assignment(user_ids, team_id) + self._handle_salesmen_assignment(user_ids=user_ids, team_id=team_id) return True + def _handle_partner_assignment(self, force_partner_id=False, create_missing=True): + """ Update customer (partner_id) of leads. Purpose is to set the same + partner on most leads; either through a newly created partner either + through a given partner_id. + + :param int force_partner_id: if set, update all leads to that customer; + :param create_missing: for leads without customer, create a new one + based on lead information; + """ + for lead in self: + if force_partner_id: + lead.partner_id = force_partner_id + if not lead.partner_id and create_missing: + partner = lead._create_customer() + lead.partner_id = partner.id + + def _handle_salesmen_assignment(self, user_ids=False, team_id=False): + """ Assign salesmen and salesteam to a batch of leads. If there are more + leads than salesmen, these salesmen will be assigned in round-robin. E.g. + 4 salesmen (S1, S2, S3, S4) for 6 leads (L1, L2, ... L6) will assigned as + following: L1 - S1, L2 - S2, L3 - S3, L4 - S4, L5 - S1, L6 - S2. + + :param list user_ids: salesmen to assign + :param int team_id: salesteam to assign + """ + update_vals = {'team_id': team_id} if team_id else {} + if not user_ids and team_id: + self.write(update_vals) + else: + lead_ids = self.ids + steps = len(user_ids) + # pass 1 : lead_ids[0:6:3] = [L1,L4] + # pass 2 : lead_ids[1:6:3] = [L2,L5] + # pass 3 : lead_ids[2:6:3] = [L3,L6] + # ... + for idx in range(0, steps): + subset_ids = lead_ids[idx:len(lead_ids):steps] + update_vals['user_id'] = user_ids[idx] + self.env['crm.lead'].browse(subset_ids).write(update_vals) + + # ------------------------------------------------------------ + # MERGE / CONVERT TOOLS + # --------------------------------------------------------- + + # CLASSIFICATION TOOLS + # -------------------------------------------------- + def _get_lead_duplicates(self, partner=None, email=None, include_lost=False): """ Search for leads that seem duplicated based on partner / email. @@ -1155,6 +1229,43 @@ class Lead(models.Model): return self.with_context(active_test=False).search(domain) + def _sort_by_confidence_level(self, reverse=False): + """ Sorting the leads/opps according to the confidence level of its stage, which relates to the probability of winning it + The confidence level increases with the stage sequence + An Opportunity always has higher confidence level than a lead + """ + def opps_key(opportunity): + return opportunity.type == 'opportunity', opportunity.stage_id.sequence, -opportunity._origin.id + + return self.sorted(key=opps_key, reverse=reverse) + + # CUSTOMER TOOLS + # -------------------------------------------------- + + def _find_matching_partner(self, email_only=False): + """ Try to find a matching partner with available information on the + lead, using notably customer's name, email, ... + + :param email_only: Only find a matching based on the email. To use + for automatic process where ilike based on name can be too dangerous + :return: partner browse record + """ + self.ensure_one() + partner = self.partner_id + + if not partner and self.email_from: + partner = self.env['res.partner'].search([('email', '=', self.email_from)], limit=1) + + if not partner and not email_only: + # search through the existing partners based on the lead's partner or contact name + # to be aligned with _create_customer, search on lead's name as last possibility + for customer_potential_name in [self[field_name] for field_name in ['partner_name', 'contact_name', 'name'] if self[field_name]]: + partner = self.env['res.partner'].search([('name', 'ilike', '%' + customer_potential_name + '%')], limit=1) + if partner: + break + + return partner + def _create_customer(self): """ Create a partner from lead data and link it to the lead. @@ -1188,7 +1299,7 @@ class Lead(models.Model): :return: dictionary of values to give at res_partner.create() """ - email_split = tools.email_split(self.email_from) + email_parts = tools.email_split(self.email_from) res = { 'name': partner_name, 'user_id': self.env.context.get('default_user_id') or self.user_id.id, @@ -1197,7 +1308,7 @@ class Lead(models.Model): 'parent_id': parent_id, 'phone': self.phone, 'mobile': self.mobile, - 'email': email_split[0] if email_split else False, + 'email': email_parts[0] if email_parts else False, 'title': self.title.id, 'function': self.function, 'street': self.street, @@ -1214,107 +1325,6 @@ class Lead(models.Model): res['lang'] = self.lang_id.code return res - def _find_matching_partner(self, email_only=False): - """ Try to find a matching partner with available information on the - lead, using notably customer's name, email, ... - - :param email_only: Only find a matching based on the email. To use - for automatic process where ilike based on name can be too dangerous - :return: partner browse record - """ - self.ensure_one() - partner = self.partner_id - - if not partner and self.email_from: - partner = self.env['res.partner'].search([('email', '=', self.email_from)], limit=1) - - if not partner and not email_only: - # search through the existing partners based on the lead's partner or contact name - # to be aligned with _create_customer, search on lead's name as last possibility - for customer_potential_name in [self[field_name] for field_name in ['partner_name', 'contact_name', 'name'] if self[field_name]]: - partner = self.env['res.partner'].search([('name', 'ilike', '%' + customer_potential_name + '%')], limit=1) - if partner: - break - - return partner - - def handle_partner_assignment(self, force_partner_id=False, create_missing=True): - """ Update customer (partner_id) of leads. Purpose is to set the same - partner on most leads; either through a newly created partner either - through a given partner_id. - - :param int force_partner_id: if set, update all leads to that customer; - :param create_missing: for leads without customer, create a new one - based on lead information; - """ - for lead in self: - if force_partner_id: - lead.partner_id = force_partner_id - if not lead.partner_id and create_missing: - partner = lead._create_customer() - lead.partner_id = partner.id - - def handle_salesmen_assignment(self, user_ids=None, team_id=False): - """ Assign salesmen and salesteam to a batch of leads. If there are more - leads than salesmen, these salesmen will be assigned in round-robin. E.g. - 4 salesmen (S1, S2, S3, S4) for 6 leads (L1, L2, ... L6) will assigned as - following: L1 - S1, L2 - S2, L3 - S3, L4 - S4, L5 - S1, L6 - S2. - - :param list user_ids: salesmen to assign - :param int team_id: salesteam to assign - """ - update_vals = {'team_id': team_id} if team_id else {} - if not user_ids: - self.write(update_vals) - else: - lead_ids = self.ids - steps = len(user_ids) - # pass 1 : lead_ids[0:6:3] = [L1,L4] - # pass 2 : lead_ids[1:6:3] = [L2,L5] - # pass 3 : lead_ids[2:6:3] = [L3,L6] - # ... - for idx in range(0, steps): - subset_ids = lead_ids[idx:len(lead_ids):steps] - update_vals['user_id'] = user_ids[idx] - self.env['crm.lead'].browse(subset_ids).write(update_vals) - - # ------------------------------------------------------------ - # TOOLS - # ------------------------------------------------------------ - - def redirect_lead_opportunity_view(self): - self.ensure_one() - return { - 'name': _('Lead or Opportunity'), - 'view_mode': 'form', - 'res_model': 'crm.lead', - 'domain': [('type', '=', self.type)], - 'res_id': self.id, - 'view_id': False, - 'type': 'ir.actions.act_window', - 'context': {'default_type': self.type} - } - - @api.model - def get_empty_list_help(self, help): - help_title, sub_title = "", "" - if self._context.get('default_type') == 'lead': - help_title = _('Create a new lead') - else: - help_title = _('Create an opportunity to start playing with your pipeline.') - alias_record = self.env['mail.alias'].search([ - ('alias_name', '!=', False), - ('alias_name', '!=', ''), - ('alias_model_id.model', '=', 'crm.lead'), - ('alias_parent_model_id.model', '=', 'crm.team'), - ('alias_force_thread_id', '=', False) - ], limit=1) - if alias_record and alias_record.alias_domain and alias_record.alias_name: - email = '%s@%s' % (alias_record.alias_name, alias_record.alias_domain) - email_link = "%s" % (email, email) - sub_title = _('Use the top left Create button, or send an email to %s to test the email gateway.') % (email_link) - return '%s
%s
' % (help_title, sub_title) - # ------------------------------------------------------------ # MAILING # ------------------------------------------------------------ diff --git a/addons/crm/tests/test_crm_lead.py b/addons/crm/tests/test_crm_lead.py index 92f7ff638e1..3ab0e9fe526 100644 --- a/addons/crm/tests/test_crm_lead.py +++ b/addons/crm/tests/test_crm_lead.py @@ -291,6 +291,6 @@ class TestCRMLead(TestCrmCommon): subtype_xmlid='mail.mt_comment') self.assertEqual(message.author_id, self.user_sales_manager.partner_id) - new_lead.handle_partner_assignment(create_missing=True) + new_lead._handle_partner_assignment(create_missing=True) self.assertEqual(new_lead.partner_id.email, 'unknown.sender@test.example.com') self.assertEqual(new_lead.partner_id.team_id, self.sales_team_1) diff --git a/addons/crm/tests/test_crm_lead_convert_mass.py b/addons/crm/tests/test_crm_lead_convert_mass.py index 44d6281cef2..a58a60d269d 100644 --- a/addons/crm/tests/test_crm_lead_convert_mass.py +++ b/addons/crm/tests/test_crm_lead_convert_mass.py @@ -25,7 +25,7 @@ class TestLeadConvertMass(crm_common.TestLeadConvertMassCommon): test_leads = self.env['crm.lead'].browse(test_leads.ids) with self.assertQueryCount(user_sales_manager=254): # crm only: 251 - test_leads.handle_salesmen_assignment(user_ids=user_ids, team_id=False) + test_leads._handle_salesmen_assignment(user_ids=user_ids, team_id=False) self.assertEqual(test_leads.team_id, self.sales_team_convert | self.sales_team_1) self.assertEqual(test_leads[0::3].user_id, self.user_sales_manager) @@ -43,7 +43,7 @@ class TestLeadConvertMass(crm_common.TestLeadConvertMassCommon): test_leads = self.env['crm.lead'].browse(test_leads.ids) with self.assertQueryCount(user_sales_manager=220): # crm only: 215 - test_leads.handle_salesmen_assignment(user_ids=user_ids, team_id=team_id) + test_leads._handle_salesmen_assignment(user_ids=user_ids, team_id=team_id) self.assertEqual(test_leads.team_id, self.sales_team_convert) self.assertEqual(test_leads[0::3].user_id, self.user_sales_manager) diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py index 7f138f2a281..fbc8923cbc2 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity.py +++ b/addons/crm/wizard/crm_lead_to_opportunity.py @@ -152,18 +152,18 @@ class Lead2OpportunityPartner(models.TransientModel): self._convert_handle_partner( lead, self.action, self.partner_id.id or lead.partner_id.id) - lead.convert_opportunity(lead.partner_id.id, [], False) + lead.convert_opportunity(lead.partner_id.id, user_ids=False, team_id=False) leads_to_allocate = leads if not self.force_assignment: leads_to_allocate = leads_to_allocate.filtered(lambda lead: not lead.user_id) if user_ids: - leads_to_allocate.handle_salesmen_assignment(user_ids, team_id=team_id) + leads_to_allocate._handle_salesmen_assignment(user_ids, team_id=team_id) def _convert_handle_partner(self, lead, action, partner_id): # used to propagate user_id (salesman) on created partners during conversion - lead.with_context(default_user_id=self.user_id.id).handle_partner_assignment( + lead.with_context(default_user_id=self.user_id.id)._handle_partner_assignment( force_partner_id=partner_id, create_missing=(action == 'create') ) diff --git a/addons/sale_crm/wizard/crm_opportunity_to_quotation.py b/addons/sale_crm/wizard/crm_opportunity_to_quotation.py index aef9a259ff8..24a18383581 100644 --- a/addons/sale_crm/wizard/crm_opportunity_to_quotation.py +++ b/addons/sale_crm/wizard/crm_opportunity_to_quotation.py @@ -46,5 +46,5 @@ class Opportunity2Quotation(models.TransientModel): """ self.ensure_one() if self.action != 'nothing': - self.lead_id.handle_partner_assignment(force_partner_id=self.partner_id.id, create_missing=(self.action == 'create')) + self.lead_id._handle_partner_assignment(force_partner_id=self.partner_id.id, create_missing=(self.action == 'create')) return self.lead_id.action_new_quotation() diff --git a/addons/sales_team/tests/__init__.py b/addons/sales_team/tests/__init__.py index 828034121fe..d3d022e9d99 100644 --- a/addons/sales_team/tests/__init__.py +++ b/addons/sales_team/tests/__init__.py @@ -2,4 +2,4 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import common -from . import test_sales_team_membership +from . import test_sales_team diff --git a/addons/sales_team/tests/test_sales_team_membership.py b/addons/sales_team/tests/test_sales_team.py similarity index 82% rename from addons/sales_team/tests/test_sales_team_membership.py rename to addons/sales_team/tests/test_sales_team.py index 8e08178915f..c8b7f965f8e 100644 --- a/addons/sales_team/tests/test_sales_team_membership.py +++ b/addons/sales_team/tests/test_sales_team.py @@ -1,17 +1,26 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo.addons.sales_team.tests.common import TestSalesMC +from odoo.addons.sales_team.tests.common import TestSalesCommon -class TestDefaultTeam(TestSalesMC): +class TestDefaultTeam(TestSalesCommon): """Tests to check if correct default team is found.""" @classmethod def setUpClass(cls): """Set up data for default team tests.""" super(TestDefaultTeam, cls).setUpClass() - + cls.company_2 = cls.env['res.company'].create({ + 'name': 'New Test Company', + 'email': 'company.2@test.example.com', + 'country_id': cls.env.ref('base.fr'), + }) + cls.team_c2 = cls.env['crm.team'].create({ + 'name': 'C2 Team1', + 'sequence': 1, + 'company_id': cls.company_2.id, + }) cls.team_sequence = cls.env['crm.team'].create({ 'name': 'Team LowSequence', 'sequence': 0, diff --git a/addons/website_crm/models/website_visitor.py b/addons/website_crm/models/website_visitor.py index 6c996df424c..5f2bf253451 100644 --- a/addons/website_crm/models/website_visitor.py +++ b/addons/website_crm/models/website_visitor.py @@ -38,7 +38,7 @@ class WebsiteVisitor(models.Model): partners = sorted_leads.mapped('partner_id') if not partners: main_lead = self.lead_ids[0] - main_lead.handle_partner_assignment(create_missing=True) + main_lead._handle_partner_assignment(create_missing=True) self.partner_id = main_lead.partner_id.id return True return check diff --git a/addons/website_crm_partner_assign/models/crm_lead.py b/addons/website_crm_partner_assign/models/crm_lead.py index 42213a6c2ca..b5f49d02dde 100644 --- a/addons/website_crm_partner_assign/models/crm_lead.py +++ b/addons/website_crm_partner_assign/models/crm_lead.py @@ -68,7 +68,7 @@ class CrmLead(models.Model): lead.assign_geo_localize(lead.partner_latitude, lead.partner_longitude) partner = self.env['res.partner'].browse(partner_id) if partner.user_id: - lead.handle_salesmen_assignment(partner.user_id.ids, team_id=partner.team_id.id) + lead._handle_salesmen_assignment(user_ids=partner.user_id.ids, team_id=partner.team_id.id) lead.write({'partner_assigned_id': partner_id}) return res