From a1f1edc7863679c770f2c03b6c58d5ada19dfe7b Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Mon, 29 Jun 2015 16:04:12 +0530 Subject: [PATCH 1/2] Typo fixes in Sales Person --- erpnext/selling/page/sales_browser/sales_browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/selling/page/sales_browser/sales_browser.js b/erpnext/selling/page/sales_browser/sales_browser.js index 3b9e25aa1c..98d34be40d 100644 --- a/erpnext/selling/page/sales_browser/sales_browser.js +++ b/erpnext/selling/page/sales_browser/sales_browser.js @@ -122,7 +122,7 @@ erpnext.SalesChart = Class.extend({ if(me.ctype == "Sales Person") { fields.splice(-1, 0, {fieldtype:'Link', fieldname:'employee', label:__('Employee'), - options:'Employee', description: __("Please enter Employee Id of this sales parson")}); + options:'Employee', description: __("Please enter Employee Id of this sales person")}); } // the dialog From b9e5cd0df45a2c7f5b15c1bb666a0ca075f6fb54 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Mon, 29 Jun 2015 17:01:32 +0530 Subject: [PATCH 2/2] Fixed lead status not updating on Creation of oppurtunity issue --- erpnext/crm/doctype/lead/lead.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py index b523416484..12de2e5819 100644 --- a/erpnext/crm/doctype/lead/lead.py +++ b/erpnext/crm/doctype/lead/lead.py @@ -75,8 +75,7 @@ class Lead(SellingController): return frappe.db.get_value("Customer", {"lead_name": self.name}) def has_opportunity(self): - return frappe.db.get_value("Opportunity", {"lead": self.name, "docstatus": 1, - "status": ["!=", "Lost"]}) + return frappe.db.get_value("Opportunity", {"lead": self.name, "status": ["!=", "Lost"]}) @frappe.whitelist() def make_customer(source_name, target_doc=None):