From 7ecd67605f660523cec6122da83dbc2515646d0c Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 9 Aug 2022 19:06:57 +0530 Subject: [PATCH 1/2] fix: limited options for no-of-employees in crm --- erpnext/crm/doctype/lead/lead.json | 6 +++--- erpnext/crm/doctype/opportunity/opportunity.json | 4 ++-- erpnext/crm/doctype/prospect/prospect.json | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json index c946ae49994..99c00ad6e69 100644 --- a/erpnext/crm/doctype/lead/lead.json +++ b/erpnext/crm/doctype/lead/lead.json @@ -340,8 +340,8 @@ "fieldname": "no_of_employees", "fieldtype": "Select", "label": "No of Employees", - "options": "1-10\n11-20\n21-30\n31-100\n11-50\n51-200\n201-500\n101-500\n500-1000\n501-1000\n>1000\n1000+" - }, + "options": "1-10\n11-50\n51-200\n201-500\n501-1000\n1000+" + }, { "fieldname": "column_break_22", "fieldtype": "Column Break" @@ -514,7 +514,7 @@ "idx": 5, "image_field": "image", "links": [], - "modified": "2022-07-22 15:55:03.176094", + "modified": "2022-08-09 18:26:17.101521", "modified_by": "Administrator", "module": "CRM", "name": "Lead", diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json index 68a2156981f..fed0c7c79a2 100644 --- a/erpnext/crm/doctype/opportunity/opportunity.json +++ b/erpnext/crm/doctype/opportunity/opportunity.json @@ -463,7 +463,7 @@ "fieldname": "no_of_employees", "fieldtype": "Select", "label": "No of Employees", - "options": "1-10\n11-20\n21-30\n31-100\n11-50\n51-200\n201-500\n101-500\n500-1000\n501-1000\n>1000\n1000+" + "options": "1-10\n11-50\n51-200\n201-500\n501-1000\n1000+" }, { "fieldname": "annual_revenue", @@ -622,7 +622,7 @@ "icon": "fa fa-info-sign", "idx": 195, "links": [], - "modified": "2022-07-22 18:46:32.858696", + "modified": "2022-08-09 18:26:37.235964", "modified_by": "Administrator", "module": "CRM", "name": "Opportunity", diff --git a/erpnext/crm/doctype/prospect/prospect.json b/erpnext/crm/doctype/prospect/prospect.json index 7f33c08c132..820a6c72ea1 100644 --- a/erpnext/crm/doctype/prospect/prospect.json +++ b/erpnext/crm/doctype/prospect/prospect.json @@ -82,7 +82,7 @@ "fieldname": "no_of_employees", "fieldtype": "Select", "label": "No. of Employees", - "options": "1-10\n11-20\n21-30\n31-100\n11-50\n51-200\n201-500\n101-500\n500-1000\n501-1000\n>1000\n1000+" + "options": "1-10\n11-50\n51-200\n201-500\n501-1000\n1000+" }, { "fieldname": "annual_revenue", @@ -218,7 +218,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2022-06-22 15:10:26.887502", + "modified": "2022-08-09 18:26:56.950185", "modified_by": "Administrator", "module": "CRM", "name": "Prospect", From 909945c0ac214b3ad613ae944509e8bdec47c940 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 9 Aug 2022 19:28:26 +0530 Subject: [PATCH 2/2] fix: map old data as per new options of no-of-employees --- erpnext/patches.txt | 3 ++- .../patches/v14_0/fix_crm_no_of_employees.py | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 erpnext/patches/v14_0/fix_crm_no_of_employees.py diff --git a/erpnext/patches.txt b/erpnext/patches.txt index c7dc27e2944..e5beacde2b4 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -309,4 +309,5 @@ erpnext.patches.v14_0.migrate_gl_to_payment_ledger erpnext.patches.v14_0.crm_ux_cleanup erpnext.patches.v14_0.remove_india_localisation # 14-07-2022 erpnext.patches.v13_0.fix_number_and_frequency_for_monthly_depreciation -erpnext.patches.v14_0.remove_hr_and_payroll_modules # 20-07-2022 \ No newline at end of file +erpnext.patches.v14_0.remove_hr_and_payroll_modules # 20-07-2022 +erpnext.patches.v14_0.fix_crm_no_of_employees \ No newline at end of file diff --git a/erpnext/patches/v14_0/fix_crm_no_of_employees.py b/erpnext/patches/v14_0/fix_crm_no_of_employees.py new file mode 100644 index 00000000000..268eb95732e --- /dev/null +++ b/erpnext/patches/v14_0/fix_crm_no_of_employees.py @@ -0,0 +1,26 @@ +import frappe + + +def execute(): + options = { + "11-20": "11-50", + "21-30": "11-50", + "31-100": "51-200", + "101-500": "201-500", + "500-1000": "501-1000", + ">1000": "1000+", + } + + for doctype in ("Lead", "Opportunity", "Prospect"): + frappe.reload_doctype(doctype) + for key, value in options.items(): + frappe.db.sql( + """ + update `tab{doctype}` + set no_of_employees = %s + where no_of_employees = %s + """.format( + doctype=doctype + ), + (value, key), + )