Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Made no of employees a select field

Browse Source
This commit is contained in:
Nabin Hait 2022-06-22 12:51:56 +05:30
parent 483fc420a1
commit 2d226be3c4
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/crm/doctype/lead/lead.json
View File

@ -277,8 +277,7 @@
"fieldtype": "Data",
"label": "Website",
"oldfieldname": "website",
"oldfieldtype": "Data",
"options": "URL"
"oldfieldtype": "Data"
},
{
"fieldname": "territory",
@ -334,8 +333,9 @@
},
{
"fieldname": "no_of_employees",
"fieldtype": "Int",
"label": "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+"
},
{
"fieldname": "column_break_22",
@ -483,7 +483,7 @@
"idx": 5,
"image_field": "image",
"links": [],
"modified": "2022-06-06 18:10:14.494424",
"modified": "2022-06-21 15:10:06.613519",
"modified_by": "Administrator",
"module": "CRM",
"name": "Lead",

7
erpnext/crm/doctype/opportunity/opportunity.json
View File

@ -463,8 +463,9 @@
},
{
"fieldname": "no_of_employees",
"fieldtype": "Int",
"label": "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+"
},
{
"fieldname": "annual_revenue",
@ -607,7 +608,7 @@
"icon": "fa fa-info-sign",
"idx": 195,
"links": [],
"modified": "2022-06-10 16:19:33.310006",
"modified": "2022-06-21 15:04:34.363959",
"modified_by": "Administrator",
"module": "CRM",
"name": "Opportunity",

10
erpnext/crm/doctype/prospect/prospect.json
View File

@ -80,8 +80,9 @@
},
{
"fieldname": "no_of_employees",
"fieldtype": "Int",
"label": "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+"
},
{
"fieldname": "annual_revenue",
@ -99,8 +100,7 @@
{
"fieldname": "website",
"fieldtype": "Data",
"label": "Website",
"options": "URL"
"label": "Website"
},
{
"fieldname": "prospect_owner",
@ -218,7 +218,7 @@
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2022-06-09 16:58:45.100244",
"modified": "2022-06-21 15:10:26.887502",
"modified_by": "Administrator",
"module": "CRM",
"name": "Prospect",

6
erpnext/public/js/templates/crm_activities.html
View File

@ -39,7 +39,11 @@
name="{{tasks[i].name}}" title="{{ __('Mark As Closed') }}">
</div>
</div>
<div class="text-muted ml-1">{%= frappe.datetime.global_date_format(tasks[i].date) %}</div>
{% if(tasks[i].date) { %}
<div class="text-muted ml-1">
{%= frappe.datetime.global_date_format(tasks[i].date) %}
</div>
{% } %}
{% if(tasks[i].allocated_to) { %}
<div class="text-muted ml-1">
{{ __("Allocated To:") }}