commit fa16b849a05629ace76b155b8d4ddfb750bf79a0
author Nabin Hait <nabinhait@gmail.com> Tue May 30 22:52:39 2017 +0530
committer Nabin Hait <nabinhait@gmail.com> Tue May 30 22:52:39 2017 +0530
tree 39b0b1591a6d34cb94e4e88a492736b4a14777f9
parent c9fa07b16d5c7f7ad357690b241774398cafea83
parent 38fae6a240b4a6ddeb9f630a6161998921ddbb5b

Merge branch 'master' into develop

erpnext/__init__.py

diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 641b9b6..e6f65d0 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '8.0.41'
+__version__ = '8.0.42'
 
 
 def get_default_company(user=None):

erpnext/crm/doctype/opportunity/opportunity.js

diff --git a/erpnext/crm/doctype/opportunity/opportunity.js b/erpnext/crm/doctype/opportunity/opportunity.js
index 0e14c85..96d6ac5 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.js
+++ b/erpnext/crm/doctype/opportunity/opportunity.js
@@ -54,7 +54,7 @@
 				frm.add_custom_button(__('Lost'),
 					cur_frm.cscript['Declare Opportunity Lost']);
 			}
-		},
+		}
 
 		if(!frm.doc.__islocal && frm.perm[0].write && frm.doc.docstatus==0) {
 			if(frm.doc.status==="Open") {