Merge remote-tracking branch 'frappe/develop' into v5.0

Conflicts:
	erpnext/__version__.py
	erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
	erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
	erpnext/hooks.py
	erpnext/patches.txt
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	erpnext/stock/get_item_details.py
	erpnext/translations/ar.csv
	erpnext/translations/bs.csv
	erpnext/translations/ca.csv
	erpnext/translations/el.csv
	erpnext/translations/es.csv
	erpnext/translations/fr.csv
	erpnext/translations/hr.csv
	erpnext/translations/id.csv
	erpnext/translations/is.csv
	erpnext/translations/ja.csv
	erpnext/translations/nl.csv
	erpnext/translations/pl.csv
	erpnext/translations/pt-BR.csv
	erpnext/translations/ru.csv
	erpnext/translations/tr.csv
	erpnext/translations/zh-cn.csv
	erpnext/translations/zh-tw.csv
	setup.py

erpnext/patches/v4_2/default_website_style.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 from frappe.templates.pages.style_settings import default_properties
 

erpnext/patches/v4_2/update_project_milestones.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 def execute():

erpnext/patches/v4_2/update_sales_order_invoice_field_name.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 def execute():

erpnext/patches/v4_2/update_stock_uom_for_dn_in_sle.py

@@ -0,0 +1,11 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.db.sql("""update `tabStock Ledger Entry` sle, tabItem item
+		set sle.stock_uom = item.stock_uom
+		where sle.voucher_type="Delivery Note" and item.name = sle.item_code
+		and sle.stock_uom != item.stock_uom""")