From fd46fef857b578515db6d12245d8f01895dc00b1 Mon Sep 17 00:00:00 2001
From: Rohan Bansal <rohan@digithinkit.com>
Date: Fri, 6 Sep 2019 14:10:20 +0530
Subject: [PATCH] fix: add designation to Lead

---
 erpnext/crm/doctype/lead/lead.json | 153 +++++++++++++++--------------
 erpnext/crm/doctype/lead/lead.py   |   4 +-
 2 files changed, 82 insertions(+), 75 deletions(-)

diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index 88a562f720..c8e9fbc463 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -17,6 +17,7 @@
   "lead_owner",
   "status",
   "salutation",
+  "designation",
   "gender",
   "source",
   "customer",
@@ -136,6 +137,13 @@
    "reqd": 1,
    "search_index": 1
   },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "salutation",
+   "fieldtype": "Link",
+   "label": "Salutation",
+   "options": "Salutation"
+  },
   {
    "fieldname": "gender",
    "fieldtype": "Link",
@@ -237,6 +245,56 @@
    "label": "Address HTML",
    "read_only": 1
   },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "address_title",
+   "fieldtype": "Data",
+   "label": "Address Title"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "address_line1",
+   "fieldtype": "Data",
+   "label": "Address Line 1"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "address_line2",
+   "fieldtype": "Data",
+   "label": "Address Line 2"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "city",
+   "fieldtype": "Data",
+   "label": "City/Town"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "county",
+   "fieldtype": "Data",
+   "label": "County"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "state",
+   "fieldtype": "Data",
+   "label": "State"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "country",
+   "fieldtype": "Link",
+   "label": "Country",
+   "options": "Country"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "pincode",
+   "fieldtype": "Data",
+   "label": "Postal Code",
+   "options": "Country"
+  },
   {
    "fieldname": "column_break2",
    "fieldtype": "Column Break"
@@ -255,13 +313,6 @@
    "oldfieldname": "contact_no",
    "oldfieldtype": "Data"
   },
-  {
-   "depends_on": "eval: doc.__islocal",
-   "fieldname": "salutation",
-   "fieldtype": "Link",
-   "label": "Salutation",
-   "options": "Salutation"
-  },
   {
    "depends_on": "eval: doc.__islocal",
    "fieldname": "mobile_no",
@@ -278,22 +329,6 @@
    "oldfieldname": "fax",
    "oldfieldtype": "Data"
   },
-  {
-   "fieldname": "website",
-   "fieldtype": "Data",
-   "label": "Website",
-   "oldfieldname": "website",
-   "oldfieldtype": "Data"
-  },
-  {
-   "fieldname": "territory",
-   "fieldtype": "Link",
-   "label": "Territory",
-   "oldfieldname": "territory",
-   "oldfieldtype": "Link",
-   "options": "Territory",
-   "print_hide": 1
-  },
   {
    "collapsible": 1,
    "fieldname": "more_info",
@@ -349,6 +384,22 @@
    "options": "Company",
    "remember_last_selected_value": 1
   },
+  {
+   "fieldname": "website",
+   "fieldtype": "Data",
+   "label": "Website",
+   "oldfieldname": "website",
+   "oldfieldtype": "Data"
+  },
+  {
+   "fieldname": "territory",
+   "fieldtype": "Link",
+   "label": "Territory",
+   "oldfieldname": "territory",
+   "oldfieldtype": "Link",
+   "options": "Territory",
+   "print_hide": 1
+  },
   {
    "default": "0",
    "fieldname": "unsubscribed",
@@ -361,62 +412,18 @@
    "fieldtype": "Check",
    "label": "Blog Subscriber"
   },
-  {
-   "depends_on": "eval: doc.__islocal",
-   "fieldname": "address_title",
-   "fieldtype": "Data",
-   "label": "Address Title"
-  },
-  {
-   "depends_on": "eval: doc.__islocal",
-   "fieldname": "address_line1",
-   "fieldtype": "Data",
-   "label": "Address Line 1"
-  },
-  {
-   "depends_on": "eval: doc.__islocal",
-   "fieldname": "address_line2",
-   "fieldtype": "Data",
-   "label": "Address Line 2"
-  },
-  {
-   "depends_on": "eval: doc.__islocal",
-   "fieldname": "city",
-   "fieldtype": "Data",
-   "label": "City/Town"
-  },
-  {
-   "depends_on": "eval: doc.__islocal",
-   "fieldname": "county",
-   "fieldtype": "Data",
-   "label": "County"
-  },
-  {
-   "depends_on": "eval: doc.__islocal",
-   "fieldname": "state",
-   "fieldtype": "Data",
-   "label": "State"
-  },
-  {
-   "depends_on": "eval: doc.__islocal",
-   "fieldname": "country",
-   "fieldtype": "Link",
-   "label": "Country",
-   "options": "Country"
-  },
-  {
-   "depends_on": "eval: doc.__islocal",
-   "fieldname": "pincode",
-   "fieldtype": "Data",
-   "label": "Postal Code",
-   "options": "Country"
-  },
   {
    "fieldname": "title",
    "fieldtype": "Data",
    "hidden": 1,
    "label": "Title",
    "print_hide": 1
+  },
+  {
+   "fieldname": "designation",
+   "fieldtype": "Link",
+   "label": "Designation",
+   "options": "Designation"
   }
  ],
  "icon": "fa fa-user",
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index bd0c742aa2..c0416092b1 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -154,7 +154,7 @@ class Lead(SellingController):
 		else:
 			first_name, last_name = self.lead_name, None
 
-		contact_fields = ["email_id", "salutation", "gender", "phone", "mobile_no"]
+		contact_fields = ["email_id", "salutation", "gender", "designation", "phone", "mobile_no"]
 
 		contact = frappe.new_doc("Contact")
 		contact.update({contact_field: self.get(contact_field) for contact_field in contact_fields})
@@ -187,7 +187,7 @@ class Lead(SellingController):
 
 	def flush_address_and_contact_fields(self):
 		fields = ['address_line1', 'address_line2', 'address_title', 'city', 'country',
-			'county', 'fax', 'mobile_no', 'phone', 'pincode', 'salutation', 'state']
+			'county', 'fax', 'mobile_no', 'phone', 'pincode', 'state']
 
 		for field in fields:
 			self.set(field, None)