[MERGE] forward port branch 9.0 up to 2917b38f28

This commit is contained in:
Christophe Simonis
2018-08-14 14:15:13 +02:00
2 changed files with 6 additions and 1 deletions
+2
View File
@@ -658,6 +658,8 @@ class Lead(FormatAddress, models.Model):
@api.model
def _get_duplicated_leads_by_emails(self, partner_id, email, include_lost=False):
""" Search for opportunities that have the same partner and that arent done or cancelled """
if not email:
return []
partner_match_domain = []
for email in set(email_split(email) + [email]):
partner_match_domain.append(('email_from', '=ilike', email))
+4 -1
View File
@@ -17,7 +17,10 @@
<button string="New Quotation" name="%(sale_action_quotations_new)d" type="action" class="oe_highlight"
context="{'search_default_partner_id': partner_id,
'default_partner_id': partner_id,
'default_team_id': team_id}"/>
'default_team_id': team_id,
'default_campaign_id': campaign_id,
'default_medium_id': medium_id,
'default_source_id': source_id}"/>
</xpath>
<div name="button_box" position="inside">
<button class="oe_stat_button" type="action"