Merge branch 'master' into develop
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 1525849..1eee360 100644
--- a/erpnext/__init__.py
+++ b/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'''
diff --git a/erpnext/patches/v7_0/set_base_amount_in_invoice_payment_table.py b/erpnext/patches/v7_0/set_base_amount_in_invoice_payment_table.py
index 89ce43b..5dd61a0 100644
--- a/erpnext/patches/v7_0/set_base_amount_in_invoice_payment_table.py
+++ b/erpnext/patches/v7_0/set_base_amount_in_invoice_payment_table.py
@@ -6,7 +6,8 @@
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 @@
count +=1
if count % 200 == 0:
- frappe.db.commit()
\ No newline at end of file
+ frappe.db.commit()