Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-fixes

Browse Source
This commit is contained in:
Frappe Bot 2019-01-23 08:08:55 +00:00
commit 34121bc81a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '10.1.79' __version__ = '10.1.80'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

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

@ -8,7 +8,7 @@ from erpnext.hr.utils import get_salary_assignment
from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip
def validate_gstin_for_india(doc, method): def validate_gstin_for_india(doc, method):
if not hasattr(doc, 'gstin'): if not hasattr(doc, 'gstin') or not doc.gstin:
return return
doc.gstin = doc.gstin.upper().strip() if doc.gstin else "" doc.gstin = doc.gstin.upper().strip() if doc.gstin else ""