Merge branch 'develop' into payment-terms
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 70ae35a..da3786b 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -4,7 +4,7 @@
import frappe
from erpnext.hooks import regional_overrides
-__version__ = '8.10.2'
+__version__ = '8.11.0'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index add640a..13b3424 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -1153,8 +1153,15 @@
self.assertEqual(flt(si.outstanding_amount), flt(si.grand_total + si.total_advance, si.precision("outstanding_amount")))
def test_multiple_uom_in_selling(self):
- si = frappe.copy_doc(test_records[1])
+ frappe.db.sql("""delete from `tabItem Price`
+ where price_list='_Test Price List' and item_code='_Test Item'""")
+ item_price = frappe.new_doc("Item Price")
+ item_price.price_list = "_Test Price List"
+ item_price.item_code = "_Test Item"
+ item_price.price_list_rate = 100
+ item_price.insert()
+ si = frappe.copy_doc(test_records[1])
si.items[0].uom = "_Test UOM 1"
si.items[0].conversion_factor = None
si.items[0].price_list_rate = None