CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 18:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into Item-Tax-Template-V12

Browse Source
This commit is contained in:
Nabin Hait
2019-01-25 11:26:47 +05:30
committed by GitHub
parent 37d7b80572 f1ff5c24ff
commit f05d91d317
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/regional/india/utils.py
View File

@@ -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

4
erpnext/setup/doctype/email_digest/email_digest.py
View File

@@ -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)