Merge branch 'develop' into Item-Tax-Template-V12
diff --git a/erpnext/regional/india/utils.py b/erpnext/regional/india/utils.py
index 43ed868..d93ef3b 100644
--- a/erpnext/regional/india/utils.py
+++ b/erpnext/regional/india/utils.py
@@ -11,7 +11,7 @@
if not hasattr(doc, 'gstin') or not doc.gstin:
return
- doc.gstin = doc.gstin.upper().strip() if doc.gstin else ""
+ doc.gstin = doc.gstin.upper().strip()
if not doc.gstin or doc.gstin == 'NA':
return
diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py
index c5c91d1..1de5ccb 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.py
+++ b/erpnext/setup/doctype/email_digest/email_digest.py
@@ -524,7 +524,7 @@
filters = {
"root_type": "Asset",
"account_type": "Bank",
- "date": self.future_to_date,
+ "report_date": self.future_to_date,
"company": self.company
}
label = get_link_to_report('Account Balance', label=self.meta.get_label(fieldname), filters=filters)
@@ -532,7 +532,7 @@
filters = {
"root_type": "Liability",
"account_type": "Bank",
- "to_date": self.future_to_date,
+ "report_date": self.future_to_date,
"company": self.company
}
label = get_link_to_report('Account Balance', label=self.meta.get_label(fieldname), filters=filters)