Merge branch 'master' into develop

erpnext/__init__.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '7.1.9'
+__version__ = '7.1.10'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/patches/v7_0/set_base_amount_in_invoice_payment_table.py

@@ -6,7 +6,8 @@ def execute():
 	si_list = frappe.db.sql("""
 		select distinct parent
 		from `tabSales Invoice Payment`
-		where docstatus!=2 and amount != 0 and base_amount = 0
+		where docstatus!=2 and parenttype = 'Sales Invoice'
+		and amount != 0 and base_amount = 0
 	""")
 
 	count = 0
@@ -20,4 +21,4 @@ def execute():
 		count +=1
 			
 		if count % 200 == 0:
-			frappe.db.commit()
+			frappe.db.commit()