diff --git a/crm_lead_to_task/__manifest__.py b/crm_lead_to_task/__manifest__.py index f5ebb7efc8e..10613798c24 100644 --- a/crm_lead_to_task/__manifest__.py +++ b/crm_lead_to_task/__manifest__.py @@ -1,6 +1,6 @@ # Copyright 2010-2020 Odoo S. A. # Copyright 2021 Tecnativa - Pedro M. Baeza -# Copyright 2023 Tecnativa - Carolina Fernandez +# Copyright 2023-2024 Tecnativa - Carolina Fernandez # License LGPL-3 - See https://www.gnu.org/licenses/lgpl-3.0.html { "name": "Lead to Task", @@ -11,7 +11,7 @@ "author": "Odoo S.A., Odoo Community Association (OCA), Tecnativa", "website": "https://github.com/OCA/crm", "depends": ["crm", "project"], - "version": "16.0.1.0.1", + "version": "17.0.1.0.0", "license": "LGPL-3", "installable": True, "data": [ diff --git a/crm_lead_to_task/static/description/index.html b/crm_lead_to_task/static/description/index.html index 50788645e6b..4a9d866ae93 100644 --- a/crm_lead_to_task/static/description/index.html +++ b/crm_lead_to_task/static/description/index.html @@ -8,10 +8,11 @@ /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ +:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. +Despite the name, some widely supported CSS2 features are used. See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. @@ -274,7 +275,7 @@ margin-left: 2em ; margin-right: 2em } -pre.code .ln { color: grey; } /* line numbers */ +pre.code .ln { color: gray; } /* line numbers */ pre.code, code { background-color: #eeeeee } pre.code .comment, code .comment { color: #5C6576 } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } @@ -300,7 +301,7 @@ span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { @@ -438,7 +439,9 @@

Contributors

Maintainers

This module is maintained by the OCA.

-Odoo Community Association + +Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

diff --git a/crm_lead_to_task/tests/test_crm_project.py b/crm_lead_to_task/tests/test_crm_project.py index a6e2080d5ef..251238d233c 100644 --- a/crm_lead_to_task/tests/test_crm_project.py +++ b/crm_lead_to_task/tests/test_crm_project.py @@ -1,11 +1,12 @@ # Copyright 2021 Tecnativa - Pedro M. Baeza # Copyright 2022 Tecnativa - Víctor Martínez +# Copyright 2024 Tecnativa - Carolina Fernandez # License LGPL-3 - See https://www.gnu.org/licenses/lgpl-3.0.html -from odoo.tests import common +from odoo.addons.base.tests.common import BaseCommon -class TestCrmProject(common.TransactionCase): +class TestCrmProject(BaseCommon): @classmethod def setUpClass(cls): super().setUpClass() @@ -13,8 +14,7 @@ def setUpClass(cls): { "name": "Test lead", "description": "Description", - "email_from": "test@example.org", - "partner_name": "Test partner", + "partner_name": "Test partner crm_lead_to_task", "email_cc": "cc@example.org", } ) @@ -31,8 +31,7 @@ def test_crm_project(self): action = wizard.action_lead_to_project_task() task = self.env["project.task"].browse(action["res_id"]) self.assertEqual(task.description, "

Description

") - self.assertEqual(task.email_from, "test@example.org") self.assertEqual(task.email_cc, "cc@example.org") - self.assertEqual(task.partner_id.name, "Test partner") + self.assertEqual(task.partner_id.name, "Test partner crm_lead_to_task") self.assertEqual(task.project_id, self.project) - self.assertFalse(self.lead.exists()) + self.assertFalse(self.lead.active) diff --git a/crm_lead_to_task/views/crm_lead_views.xml b/crm_lead_to_task/views/crm_lead_views.xml index c4c933cc3de..c71064dfbab 100644 --- a/crm_lead_to_task/views/crm_lead_views.xml +++ b/crm_lead_to_task/views/crm_lead_views.xml @@ -11,7 +11,7 @@ type="action" name="%(crm_lead_convert2task_action)d" string="Convert to Task" - context="{'default_lead_id': active_id}" + context="{'default_lead_id': id}" groups="project.group_project_user" /> diff --git a/crm_lead_to_task/wizard/crm_lead_convert2task.py b/crm_lead_to_task/wizard/crm_lead_convert2task.py index 5b3f696e7ba..109ba4fcecb 100644 --- a/crm_lead_to_task/wizard/crm_lead_convert2task.py +++ b/crm_lead_to_task/wizard/crm_lead_convert2task.py @@ -36,7 +36,6 @@ def action_lead_to_project_task(self): vals = { "name": lead.name, "description": lead.description, - "email_from": lead.email_from, "project_id": self.project_id.id, "partner_id": partner.id, "email_cc": lead.email_cc, @@ -49,8 +48,8 @@ def action_lead_to_project_task(self): [("res_model", "=", "crm.lead"), ("res_id", "=", lead.id)] ) attachments.write({"res_model": "project.task", "res_id": task.id}) - # remove the lead - lead.unlink() + # archive the lead (can't be unlinked by plain salesmen) + lead.active = False # return the action to go to the form view of the new Task view = self.env.ref("project.view_task_form2") return {