Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.10.1'
+__version__ = '6.10.2'

erpnext/hooks.py

@@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
 app_description = """ERP made simple"""
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "6.10.1"
+app_version = "6.10.2"
 app_email = "info@erpnext.com"
 app_license = "GNU General Public License (v3)"
 source_link = "https://github.com/frappe/erpnext"

erpnext/selling/doctype/customer/customer.py

@@ -29,14 +29,14 @@ class Customer(TransactionBase):
 				frappe.throw(_("Series is mandatory"), frappe.MandatoryError)
 
 			self.name = make_autoname(self.naming_series+'.#####')
-			
+
 	def get_customer_name(self):
 		if frappe.db.get_value("Customer", self.customer_name):
 			count = frappe.db.sql("""select ifnull(max(SUBSTRING_INDEX(name, ' ', -1)), 0) from tabCustomer
-				 where name like  '%{0} - %'""".format(self.customer_name), as_list=1)[0][0]
+				 where name like %s""", "%{0} - %".format(self.customer_name), as_list=1)[0][0]
 			count = cint(count) + 1
 			return "{0} - {1}".format(self.customer_name, cstr(count))
-		
+
 		return self.customer_name
 
 	def validate(self):
@@ -234,4 +234,4 @@ def get_credit_limit(customer, company):
 		credit_limit = frappe.db.get_value("Customer Group", customer_group, "credit_limit") or \
 			frappe.db.get_value("Company", company, "credit_limit")
 
-	return credit_limit
+	return credit_limit

erpnext/stock/doctype/purchase_receipt/purchase_receipt.js

@@ -151,7 +151,7 @@ $.extend(cur_frm.cscript, new erpnext.stock.PurchaseReceiptController({frm: cur_
 cur_frm.cscript.update_status = function(status) {
 	frappe.ui.form.is_saving = true;
 	frappe.call({
-		method:"erpnext.stock.doctype.purchase_receipt.purchase_receipt.update_purchase_order_status",
+		method:"erpnext.stock.doctype.purchase_receipt.purchase_receipt.update_purchase_receipt_status",
 		args: {docname: cur_frm.doc.name, status: status},
 		callback: function(r){
 			if(!r.exc)

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "6.10.1"
+version = "6.10.2"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()