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

Merge pull request #3526 from neilLasrado/minor-fixes

Browse Source 
Minor fixes
This commit is contained in:
Nabin Hait 2015-06-29 18:53:10 +05:30
commit 8687d25f7e
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/crm/doctype/lead/lead.py
View File

@ -75,8 +75,7 @@ class Lead(SellingController):
return frappe.db.get_value("Customer", {"lead_name": self.name}) return frappe.db.get_value("Customer", {"lead_name": self.name})
def has_opportunity(self): def has_opportunity(self):
return frappe.db.get_value("Opportunity", {"lead": self.name, "docstatus": 1, return frappe.db.get_value("Opportunity", {"lead": self.name, "status": ["!=", "Lost"]})
"status": ["!=", "Lost"]})
@frappe.whitelist() @frappe.whitelist()
def make_customer(source_name, target_doc=None): def make_customer(source_name, target_doc=None):

2
erpnext/selling/page/sales_browser/sales_browser.js
View File

@ -122,7 +122,7 @@ erpnext.SalesChart = Class.extend({
if(me.ctype == "Sales Person") { if(me.ctype == "Sales Person") {
fields.splice(-1, 0, {fieldtype:'Link', fieldname:'employee', label:__('Employee'), 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 // the dialog