nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 18:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into lead-owner-efficiency

Browse Source
This commit is contained in:
Deepesh Garg
2020-07-13 11:32:09 +05:30
committed by GitHub
parent cd445786fe d058840094
commit f5a457c397
80 changed files with 648 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/crm/dashboard_fixtures.py
View File

@@ -172,7 +172,9 @@ def get_number_cards():
"doctype": "Number Card",
"document_type": "Lead",
"name": "New Lead (Last 1 Month)",
"filters_json": json.dumps([["Lead","creation","Previous","1 month",False]]),
"filters_json": json.dumps([
["Lead", "creation", "Timespan", "last month"]
]),
"function": "Count",
"is_public": 1,
"label": _("New Lead (Last 1 Month)"),
@@ -183,7 +185,9 @@ def get_number_cards():
"doctype": "Number Card",
"document_type": "Opportunity",
"name": "New Opportunity (Last 1 Month)",
"filters_json": json.dumps([["Opportunity","creation","Previous","1 month",False]]),
"filters_json": json.dumps([
["Opportunity", "creation", "Timespan", "last month"]
]),
"function": "Count",
"is_public": 1,
"label": _("New Opportunity (Last 1 Month)"),
@@ -194,7 +198,10 @@ def get_number_cards():
"doctype": "Number Card",
"document_type": "Opportunity",
"name": "Won Opportunity (Last 1 Month)",
"filters_json": json.dumps([["Opportunity","creation","Previous","1 month",False]]),
"filters_json": json.dumps([
["Opportunity", "status", "=", "Converted",False],
["Opportunity", "creation", "Timespan", "last month"]
]),
"function": "Count",
"is_public": 1,
"label": _("Won Opportunity (Last 1 Month)"),

8
erpnext/crm/doctype/lead/lead.py
View File

@@ -114,10 +114,12 @@ class Lead(SellingController):
def set_lead_name(self):
if not self.lead_name:
# Check for leads being created through data import
if not self.company_name and not self.flags.ignore_mandatory:
if not self.company_name and not self.email_id and not self.flags.ignore_mandatory:
frappe.throw(_("A Lead requires either a person's name or an organization's name"))
self.lead_name = self.company_name
elif self.company_name:
self.lead_name = self.company_name
else:
self.lead_name = self.email_id.split("@")[0]
def set_title(self):
if self.organization_lead:

9
erpnext/crm/module_onboarding/crm/crm.json
View File

@@ -16,7 +16,7 @@
"documentation_url": "https://docs.erpnext.com/docs/user/manual/en/CRM",
"idx": 0,
"is_complete": 0,
"modified": "2020-05-28 21:07:41.278784",
"modified": "2020-07-08 14:05:42.644448",
"modified_by": "Administrator",
"module": "CRM",
"name": "CRM",
@@ -35,8 +35,7 @@
"step": "Create and Send Quotation"
}
],
"subtitle": "Lead, Opportunity, Customer and more.",
"success_message": "CRM Module is all Set Up!",
"title": "Let's Set Up Your CRM.",
"user_can_dismiss": 1
"subtitle": "Lead, Opportunity, Customer, and more.",
"success_message": "The CRM Module is all set up!",
"title": "Let's Set Up Your CRM."
}