Merge branch 'staging' into production

Author: sahil28297

frappe/__init__.py

@@ -24,7 +24,7 @@
 	sys.setdefaultencoding("utf-8")
 
 __frappe_version__ = '12.8.1'
-__version__ = '2.0.14'
+__version__ = '2.1.0'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/boot.py

@@ -72,6 +72,7 @@ def get_bootinfo():
 		bootinfo.lang = text_type(bootinfo.lang)
 	bootinfo.versions = {k: v['version'] for k, v in get_versions().items()}
 
+	bootinfo.default_country = get_default_country()
 	bootinfo.error_report_email = frappe.conf.error_report_email or frappe.get_hooks("error_report_email")
 	bootinfo.calendars = sorted(frappe.get_hooks("calendars"))
 	bootinfo.treeviews = frappe.get_hooks("treeviews") or []
@@ -273,4 +274,18 @@ def doctypes_with_show_link_field_title():
 	dts = frappe.get_all("DocType", {"show_title_field_in_link": 1})
 	custom_dts = frappe.get_all("Property Setter", {"field_name": "show_title_field_in_link", "value": 1})
 
-	return [d.name for d in dts + custom_dts if d]
+	return [d.name for d in dts + custom_dts if d]
+
+def get_default_country():
+	if not (frappe.db.exists("DocType", "System Settings") and frappe.db.exists("DocType", "Country")):
+		return {}
+
+	country = frappe.get_value("System Settings", "System Settings", "country")
+	if not country:
+		return {}
+
+	country = frappe.get_doc("Country", country)
+	return {
+		"country": country.name,
+		"code": country.code
+	}

frappe/contacts/doctype/contact/contact.json

@@ -2,6 +2,7 @@
  "allow_events_in_timeline": 1,
  "allow_import": 1,
  "allow_rename": 1,
+ "autoname": "Contact-.####",
  "creation": "2013-01-10 16:34:32",
  "doctype": "DocType",
  "document_type": "Setup",
@@ -39,7 +40,8 @@
   "links",
   "more_info",
   "department",
-  "unsubscribed"
+  "unsubscribed",
+  "title"
  ],
  "fields": [
   {
@@ -243,6 +245,12 @@
    "fieldtype": "Data",
    "label": "Company Name"
   },
+  {
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "title"
+  },
   {
    "fetch_from": "address.country",
    "fieldname": "country",
@@ -261,7 +269,7 @@
  "icon": "fa fa-user",
  "idx": 1,
  "image_field": "image",
- "modified": "2021-02-23 06:40:54.152210",
+ "modified": "2021-03-21 22:46:46.221645",
  "modified_by": "Administrator",
  "module": "Contacts",
  "name": "Contact",
@@ -391,6 +399,8 @@
    "role": "All"
   }
  ],
+ "show_title_field_in_link": 1,
  "sort_field": "modified",
- "sort_order": "ASC"
+ "sort_order": "ASC",
+ "title_field": "title"
 }

frappe/contacts/doctype/contact/contact.py

@@ -15,23 +15,11 @@
 import functools
 
 class Contact(Document):
-	def autoname(self):
-		# concat first and last name
-		self.name = " ".join(filter(None,
-			[cstr(self.get(f)).strip() for f in ["first_name", "last_name"]]))
-
-		if frappe.db.exists("Contact", self.name):
-			self.name = append_number_if_name_exists('Contact', self.name)
-
-		# concat party name if reqd
-		for link in self.links:
-			self.name = self.name + '-' + link.link_name.strip()
-			break
-
 	def validate(self):
 		self.set_primary_email()
 		self.set_primary("phone")
 		self.set_primary("mobile_no")
+		self.set_title()
 
 		self.set_user()
 
@@ -122,6 +110,17 @@ def set_primary(self, fieldname):
 				setattr(self, fieldname, d.phone)
 				break
 
+	def set_title(self):
+		self.title = "{0} {1}".format(self.first_name, self.last_name)
+
+		if frappe.db.exists("Contact", {"title": self.title}):
+			self.title = append_number_if_name_exists('Contact', self.title)
+
+		 # concat party name if reqd
+		for link in self.links:
+			self.title = self.title + '-' + link.link_name.strip()
+			break
+
 def get_default_contact(doctype, name):
 	'''Returns default contact for the given doctype, name'''
 	out = frappe.db.sql('''select parent,