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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Nabin Hait 2017-05-30 22:52:39 +05:30
commit fa16b849a0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '8.0.41' __version__ = '8.0.42'
def get_default_company(user=None): def get_default_company(user=None):

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

@ -54,7 +54,7 @@ frappe.ui.form.on("Opportunity", {
frm.add_custom_button(__('Lost'), frm.add_custom_button(__('Lost'),
cur_frm.cscript['Declare Opportunity Lost']); cur_frm.cscript['Declare Opportunity Lost']);
} }
}, }
if(!frm.doc.__islocal && frm.perm[0].write && frm.doc.docstatus==0) { if(!frm.doc.__islocal && frm.perm[0].write && frm.doc.docstatus==0) {
if(frm.doc.status==="Open") { if(frm.doc.status==="Open") {