From 0e6e80ca05547e33f0b22b3740954c581de16c63 Mon Sep 17 00:00:00 2001 From: Pierre Rousseau Date: Mon, 22 Jul 2019 08:38:31 +0000 Subject: [PATCH] [IMP] crm_iap_lead: improve credits tooltip MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before this commit, the tooltip message for the credits lacks clarity when making a request for companies and contacts. The sentence 'making a total of X credits for this request' was only the total of the credits for the contacts, without the credits for the companies. Now, the tooltip is clearer, the total takes into account the credits for the companies and the contacts. Task-ID 2036946 closes odoo/odoo#35049 Signed-off-by: Rémi Rahir (rar) --- .../models/crm_iap_lead_mining_request.py | 11 +++++------ addons/crm_iap_lead/views/crm_iap_lead_views.xml | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/crm_iap_lead/models/crm_iap_lead_mining_request.py b/addons/crm_iap_lead/models/crm_iap_lead_mining_request.py index 54ca723409a..8c996e2fdc6 100644 --- a/addons/crm_iap_lead/models/crm_iap_lead_mining_request.py +++ b/addons/crm_iap_lead/models/crm_iap_lead_mining_request.py @@ -62,18 +62,17 @@ class CRMLeadMiningRequest(models.Model): # Fields for the blue tooltip lead_credits = fields.Char(compute='_compute_tooltip', readonly=True) lead_contacts_credits = fields.Char(compute='_compute_tooltip', readonly=True) + lead_total_credits = fields.Char(compute='_compute_tooltip', readonly=True) @api.onchange('lead_number', 'contact_number') def _compute_tooltip(self): for record in self: - total_credits = CREDIT_PER_COMPANY * record.lead_number + company_credits = CREDIT_PER_COMPANY * record.lead_number contact_credits = CREDIT_PER_CONTACT * record.contact_number total_contact_credits = contact_credits * record.lead_number - message_contact = _("""Up to %d additional credits will be consumed - per company to identify its contacts (making a - total of %d credits for this request).""") - record.lead_credits = _('%d credits will be consumed to find %d companies.') % (total_credits, record.lead_number) - record.lead_contacts_credits = message_contact % (contact_credits, total_contact_credits) + record.lead_contacts_credits = _("Up to %d additional credits will be consumed to identify %d contacts per company.") % (contact_credits*company_credits, record.contact_number) + record.lead_credits = _('%d credits will be consumed to find %d companies.') % (company_credits, record.lead_number) + record.lead_total_credits = _("This makes a total of %d credits for this request.") % (total_contact_credits + company_credits) @api.depends('lead_ids') def _compute_leads_count(self): diff --git a/addons/crm_iap_lead/views/crm_iap_lead_views.xml b/addons/crm_iap_lead/views/crm_iap_lead_views.xml index eb71e29bb4f..eb85a63d910 100644 --- a/addons/crm_iap_lead/views/crm_iap_lead_views.xml +++ b/addons/crm_iap_lead/views/crm_iap_lead_views.xml @@ -91,6 +91,7 @@
+