nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: mentions in notes, workspace links, no-of-employees field type and report fixes

Browse Source
This commit is contained in:
Nabin Hait
2022-07-22 15:33:23 +05:30
parent 538f5a9964
commit 29b8715205
9 changed files with 163 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/crm/doctype/lead/lead.js
View File

@@ -54,7 +54,6 @@ erpnext.LeadController = class LeadController extends frappe.ui.form.Controller
frappe.contacts.clear_address_and_contact(this.frm);
}
this.frm.dashboard.links_area.hide();
this.show_notes();
this.show_activities();
}

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

@@ -74,7 +74,8 @@
"all_activities_html",
"notes_tab",
"notes_html",
"notes"
"notes",
"dashboard_tab"
],
"fields": [
{
@@ -337,9 +338,10 @@
},
{
"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",
"fieldtype": "Column Break"
@@ -500,13 +502,19 @@
"fieldtype": "Link",
"label": "Country",
"options": "Country"
},
{
"fieldname": "dashboard_tab",
"fieldtype": "Tab Break",
"label": "Dashboard",
"show_dashboard": 1
}
],
"icon": "fa fa-user",
"idx": 5,
"image_field": "image",
"links": [],
"modified": "2022-06-27 21:56:17.392756",
"modified": "2022-07-22 15:55:03.176094",
"modified_by": "Administrator",
"module": "CRM",
"name": "Lead",

2
erpnext/crm/doctype/opportunity/opportunity.js
View File

@@ -84,7 +84,7 @@ frappe.ui.form.on("Opportunity", {
erpnext.toggle_naming_series();
if(!frm.is_new() && doc.status!=="Lost") {
if(doc.with_items){
if(doc.items){
frm.add_custom_button(__('Supplier Quotation'),
function() {
frm.trigger("make_supplier_quotation")

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

@@ -225,16 +225,12 @@
"fieldname": "items_section",
"fieldtype": "Tab Break",
"label": "Items",
"oldfieldtype": "Section Break",
"options": "fa fa-shopping-cart"
},
{
"fieldname": "items",
"fieldtype": "Table",
"label": "Items",
"mandatory_depends_on": "eval: doc.with_items == 1",
"oldfieldname": "enquiry_details",
"oldfieldtype": "Table",
"options": "Opportunity Item"
},
{
@@ -409,7 +405,6 @@
"read_only": 1
},
{
"depends_on": "with_items",
"fieldname": "section_break_32",
"fieldtype": "Section Break",
"hide_border": 1
@@ -466,8 +461,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",
@@ -626,7 +622,7 @@
"icon": "fa fa-info-sign",
"idx": 195,
"links": [],
"modified": "2022-06-27 18:44:32.858696",
"modified": "2022-07-22 18:46:32.858696",
"modified_by": "Administrator",
"module": "CRM",
"name": "Opportunity",

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

@@ -218,7 +218,7 @@
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2022-06-21 15:10:26.887502",
"modified": "2022-06-22 15:10:26.887502",
"modified_by": "Administrator",
"module": "CRM",
"name": "Prospect",