Merge branch 'version-13' into version-13-hotfix

erpnext/__init__.py

@@ -4,7 +4,7 @@ import frappe
 
 from erpnext.hooks import regional_overrides
 
-__version__ = "13.36.1"
+__version__ = "13.42.7"
 
 
 def get_default_company(user=None):

erpnext/stock/doctype/stock_entry/stock_entry.py

@@ -9,7 +9,18 @@ import frappe
 from frappe import _
 from frappe.model.mapper import get_mapped_doc
 from frappe.query_builder.functions import Sum
-from frappe.utils import cint, comma_or, cstr, flt, format_time, formatdate, getdate, nowdate
+from frappe.utils import (
+	add_days,
+	cint,
+	comma_or,
+	cstr,
+	flt,
+	format_time,
+	formatdate,
+	getdate,
+	nowdate,
+	today,
+)
 from six import iteritems, itervalues, string_types
 
 import erpnext