Merge branch 'hotfix'

This commit is contained in:
Rohit Waghchaure 2018-01-19 15:49:29 +05:30
commit 03adf84a8d
2 changed files with 2 additions and 2 deletions

View File

@ -5,7 +5,7 @@ import frappe
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'''

View File

@ -26,7 +26,7 @@ class TransactionBase(StatusUpdater):
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: