commit abc06329250b8af06466a16d59348e2dc9f45f07
author Rohit Waghchaure <rohitw1991@gmail.com> Fri Jan 19 15:49:29 2018 +0530
committer Rohit Waghchaure <rohitw1991@gmail.com> Fri Jan 19 15:49:29 2018 +0530
tree dec3b1f759fa68d9d3c5fbc172a655938238e747
parent c987500e08f5a114a13b52962d91d67e4cc215d6
parent 03adf84a8ddb8c50897d9a5d10f1cbdddfa036ce

Merge branch 'master' into develop

erpnext/__init__.py

diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 7ab6784..4beb35b 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -5,7 +5,7 @@
 from erpnext.hooks import regional_overrides
 from frappe.utils import getdate
 
-__version__ = '10.0.11'
+__version__ = '10.0.12'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/utilities/transaction_base.py

diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py
index 01125f9..0032e80 100644
--- a/erpnext/utilities/transaction_base.py
+++ b/erpnext/utilities/transaction_base.py
@@ -26,7 +26,7 @@
 			now = now_datetime()
 			self.posting_date = now.strftime('%Y-%m-%d')
 			self.posting_time = now.strftime('%H:%M:%S.%f')
-		else:
+		elif self.posting_time:
 			try:
 				get_time(self.posting_time)
 			except ValueError: