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

fix: sider issue

Browse Source
This commit is contained in:
Anupam 2021-08-05 19:44:00 +05:30
parent c35a526dd8
commit 4723e18f9e
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/crm/doctype/lead/lead.js
View File

@ -86,7 +86,7 @@ erpnext.LeadController = class LeadController extends frappe.ui.form.Controller
render_contact_day_html() { render_contact_day_html() {
if (cur_frm.doc.contact_date) { if (cur_frm.doc.contact_date) {
let contact_date = frappe.datetime.obj_to_str(cur_frm.doc.contact_date) let contact_date = frappe.datetime.obj_to_str(cur_frm.doc.contact_date);
let diff_days = frappe.datetime.get_day_diff(contact_date, frappe.datetime.get_today()); let diff_days = frappe.datetime.get_day_diff(contact_date, frappe.datetime.get_today());
let color = diff_days > 0 ? "orange" : "green"; let color = diff_days > 0 ? "orange" : "green";
let message = diff_days > 0 ? __("Next Contact Date") : __("Last Contact Date"); let message = diff_days > 0 ? __("Next Contact Date") : __("Last Contact Date");

20
erpnext/crm/doctype/lead/test_lead.py
View File

@ -37,7 +37,7 @@ class TestLead(unittest.TestCase):
def test_create_lead_and_unlinking_dynamic_links(self): def test_create_lead_and_unlinking_dynamic_links(self):
lead_doc = make_lead(first_name = "Lorem", last_name="Ipsum") lead_doc = make_lead(first_name = "Lorem", last_name="Ipsum")
lead_doc_1 = make_lead() lead_doc_1 = make_lead()
address = frappe.get_doc({ frappe.get_doc({
"doctype": "Address", "doctype": "Address",
"address_type": "Billing", "address_type": "Billing",
"city": "Mumbai", "city": "Mumbai",
@ -55,14 +55,16 @@ class TestLead(unittest.TestCase):
"address_line1": "Baner", "address_line1": "Baner",
"city": "Pune", "city": "Pune",
"country": "India", "country": "India",
"links": [{ "links": [
"link_doctype": "Lead", {
"link_name": lead_doc.name "link_doctype": "Lead",
}, "link_name": lead_doc.name
{ },
"link_doctype": "Lead", {
"link_name": lead_doc_1.name "link_doctype": "Lead",
}] "link_name": lead_doc_1.name
}
]
}).insert() }).insert()
lead_doc.delete() lead_doc.delete()