Group email fields together and add IFSC Code (#13535)

* [fix] #13534

* change field order cell no

erpnext/hr/doctype/employee/employee.json

@@ -972,40 +972,6 @@
    "translatable": 0, 
    "unique": 0
   }, 
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Provide Email Address registered in company",
-   "fieldname": "company_email",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Company Email",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "company_email",
-   "oldfieldtype": "Data",
-   "options": "Email",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
@@ -1294,6 +1260,36 @@
    "translatable": 0, 
    "unique": 0
   }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cell_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Cell Number", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
@@ -1365,7 +1361,8 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "cell_number",
+   "description": "Provide Email Address registered in company", 
+   "fieldname": "company_email", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -1374,9 +1371,12 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Cell Number",
+   "label": "Company Email", 
    "length": 0, 
    "no_copy": 0, 
+   "oldfieldname": "company_email", 
+   "oldfieldtype": "Data", 
+   "options": "Email", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -2702,7 +2702,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-03-27 22:38:22.614237",
+ "modified": "2018-04-05 13:54:36.881449", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee", 
@@ -2711,7 +2711,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0,
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -2731,7 +2730,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0,
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -2747,12 +2745,10 @@
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 0, 
-   "user_permission_doctypes": "[\"Branch\",\"Company\",\"Department\",\"Designation\"]",
    "write": 1
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0,
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 

erpnext/regional/india/setup.py

@@ -180,7 +180,11 @@ def make_custom_fields():
 		'Sales Invoice Item': [hsn_sac_field],
 		'Purchase Order Item': [hsn_sac_field],
 		'Purchase Receipt Item': [hsn_sac_field],
-		'Purchase Invoice Item': [hsn_sac_field]
+		'Purchase Invoice Item': [hsn_sac_field],
+		'Employee': [
+			dict(fieldname='ifsc_code', label='IFSC Code',
+				fieldtype='Data', insert_after='bank_ac_no', print_hide=1, 
+				depends_on='eval:doc.salary_mode == 'Bank'') ]
 	}
 
 	create_custom_fields(custom_fields)