Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #30938 from rohitwaghchaure/formatting-for-to-discuss-field

Browse Source 
fix: allow to use formatting for the field to_discuss in opportunity
This commit is contained in:
Ankush Menat 2022-05-10 12:10:42 +05:30 committed by GitHub
commit 3b6752dc8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/crm/doctype/opportunity/opportunity.py
View File

@ -9,7 +9,7 @@ from frappe import _
from frappe.email.inbox import link_communication_to_document from frappe.email.inbox import link_communication_to_document
from frappe.model.mapper import get_mapped_doc from frappe.model.mapper import get_mapped_doc
from frappe.query_builder import DocType from frappe.query_builder import DocType
from frappe.utils import cint, cstr, flt, get_fullname from frappe.utils import cint, flt, get_fullname
from erpnext.crm.utils import add_link_in_communication, copy_comments from erpnext.crm.utils import add_link_in_communication, copy_comments
from erpnext.setup.utils import get_exchange_rate from erpnext.setup.utils import get_exchange_rate
@ -215,20 +215,20 @@ class Opportunity(TransactionBase):
if self.party_name and self.opportunity_from == "Customer": if self.party_name and self.opportunity_from == "Customer":
if self.contact_person: if self.contact_person:
opts.description = "Contact " + cstr(self.contact_person) opts.description = f"Contact {self.contact_person}"
else: else:
opts.description = "Contact customer " + cstr(self.party_name) opts.description = f"Contact customer {self.party_name}"
elif self.party_name and self.opportunity_from == "Lead": elif self.party_name and self.opportunity_from == "Lead":
if self.contact_display: if self.contact_display:
opts.description = "Contact " + cstr(self.contact_display) opts.description = f"Contact {self.contact_display}"
else: else:
opts.description = "Contact lead " + cstr(self.party_name) opts.description = f"Contact lead {self.party_name}"
opts.subject = opts.description opts.subject = opts.description
opts.description += ". By : " + cstr(self.contact_by) opts.description += f". By : {self.contact_by}"
if self.to_discuss: if self.to_discuss:
opts.description += " To Discuss : " + cstr(self.to_discuss) opts.description += f" To Discuss : {frappe.render_template(self.to_discuss, {'doc': self})}"
super(Opportunity, self).add_calendar_event(opts, force) super(Opportunity, self).add_calendar_event(opts, force)

18
erpnext/crm/doctype/opportunity/test_opportunity.py
View File

@ -4,7 +4,7 @@
import unittest import unittest
import frappe import frappe
from frappe.utils import now_datetime, random_string, today from frappe.utils import add_days, now_datetime, random_string, today
from erpnext.crm.doctype.lead.lead import make_customer from erpnext.crm.doctype.lead.lead import make_customer
from erpnext.crm.doctype.lead.test_lead import make_lead from erpnext.crm.doctype.lead.test_lead import make_lead
@ -97,6 +97,22 @@ class TestOpportunity(unittest.TestCase):
self.assertEqual(quotation_comment_count, 4) self.assertEqual(quotation_comment_count, 4)
self.assertEqual(quotation_communication_count, 4) self.assertEqual(quotation_communication_count, 4)
def test_render_template_for_to_discuss(self):
doc = make_opportunity(with_items=0, opportunity_from="Lead")
doc.contact_by = "test@example.com"
doc.contact_date = add_days(today(), days=2)
doc.to_discuss = "{{ doc.name }} test data"
doc.save()
event = frappe.get_all(
"Event Participants",
fields=["parent"],
filters={"reference_doctype": doc.doctype, "reference_docname": doc.name},
)
event_description = frappe.db.get_value("Event", event[0].parent, "description")
self.assertTrue(doc.name in event_description)
def make_opportunity_from_lead(): def make_opportunity_from_lead():
new_lead_email_id = "new{}@example.com".format(random_string(5)) new_lead_email_id = "new{}@example.com".format(random_string(5))