diff --git a/frappe/contacts/doctype/contact/contact.json b/frappe/contacts/doctype/contact/contact.json index 7bc13accf8..7dd5aad4ce 100644 --- a/frappe/contacts/doctype/contact/contact.json +++ b/frappe/contacts/doctype/contact/contact.json @@ -193,7 +193,7 @@ { "fieldname": "phone_nos", "fieldtype": "Table", - "label": "Numbers", + "label": "Contact Numbers", "options": "Contact Phone" }, { @@ -245,7 +245,7 @@ "icon": "fa fa-user", "idx": 1, "image_field": "image", - "modified": "2019-09-24 17:48:26.790985", + "modified": "2019-10-10 22:04:41.070479", "modified_by": "Administrator", "module": "Contacts", "name": "Contact", diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py index f851e19b46..b9239dc1f6 100644 --- a/frappe/contacts/doctype/contact/contact.py +++ b/frappe/contacts/doctype/contact/contact.py @@ -32,7 +32,6 @@ class Contact(Document): self.set_primary_email() self.set_primary("phone") self.set_primary("mobile_no") - self.check_if_primary_phone_and_mobile_no_same() self.set_user() @@ -119,11 +118,6 @@ class Contact(Document): setattr(self, fieldname, d.phone) break - def check_if_primary_phone_and_mobile_no_same(self): - if self.phone and self.mobile_no and self.phone == self.mobile_no: - number = frappe.bold(self.phone) - frappe.throw(_("Number {0} cannot be set as primary for Phone as well as Mobile No.").format(number)) - def get_default_contact(doctype, name): '''Returns default contact for the given doctype, name''' out = frappe.db.sql('''select parent, diff --git a/frappe/core/doctype/dynamic_link/dynamic_link.json b/frappe/core/doctype/dynamic_link/dynamic_link.json index abc47df100..b99f77f139 100644 --- a/frappe/core/doctype/dynamic_link/dynamic_link.json +++ b/frappe/core/doctype/dynamic_link/dynamic_link.json @@ -13,7 +13,7 @@ "fieldname": "link_doctype", "fieldtype": "Link", "in_list_view": 1, - "label": "Link DocType", + "label": "Link Document Type", "options": "DocType", "reqd": 1 }, @@ -34,7 +34,7 @@ } ], "istable": 1, - "modified": "2019-05-16 19:54:31.400026", + "modified": "2019-10-10 22:05:54.736093", "modified_by": "Administrator", "module": "Core", "name": "Dynamic Link", diff --git a/frappe/desk/doctype/global_search_settings/global_search_settings.json b/frappe/desk/doctype/global_search_settings/global_search_settings.json index e0b4b11d05..6fa25f72b7 100644 --- a/frappe/desk/doctype/global_search_settings/global_search_settings.json +++ b/frappe/desk/doctype/global_search_settings/global_search_settings.json @@ -10,12 +10,12 @@ { "fieldname": "allowed_in_global_search", "fieldtype": "Table", - "label": "Document Types", + "label": "Search Priorities", "options": "Global Search DocType" } ], "issingle": 1, - "modified": "2019-09-18 18:00:17.388486", + "modified": "2019-10-10 22:05:02.692689", "modified_by": "Administrator", "module": "Desk", "name": "Global Search Settings",