From d75095b04c794e957315f67e41cd0d5764d8fee5 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Wed, 23 Jan 2019 14:40:01 +0530 Subject: [PATCH 1/2] fix(regional): remove duplicate validation for GSTIN --- erpnext/regional/india/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/regional/india/utils.py b/erpnext/regional/india/utils.py index 43ed8688647..d93ef3b87dd 100644 --- a/erpnext/regional/india/utils.py +++ b/erpnext/regional/india/utils.py @@ -11,7 +11,7 @@ def validate_gstin_for_india(doc, method): 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 From 0c38cf06a52b16cab585067d11cde63cf9a13c73 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Wed, 23 Jan 2019 19:11:24 +0530 Subject: [PATCH 2/2] fix: Wrong argument fix in email digest filters --- erpnext/setup/doctype/email_digest/email_digest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py index c5c91d1b454..1de5ccb1427 100644 --- a/erpnext/setup/doctype/email_digest/email_digest.py +++ b/erpnext/setup/doctype/email_digest/email_digest.py @@ -524,7 +524,7 @@ class EmailDigest(Document): 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 @@ class EmailDigest(Document): 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)