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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Rohit Waghchaure 2018-01-19 15:49:29 +05:30
commit abc0632925
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.0.11' __version__ = '10.0.12'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

2
erpnext/utilities/transaction_base.py
View File

@ -26,7 +26,7 @@ class TransactionBase(StatusUpdater):
now = now_datetime() now = now_datetime()
self.posting_date = now.strftime('%Y-%m-%d') self.posting_date = now.strftime('%Y-%m-%d')
self.posting_time = now.strftime('%H:%M:%S.%f') self.posting_time = now.strftime('%H:%M:%S.%f')
else: elif self.posting_time:
try: try:
get_time(self.posting_time) get_time(self.posting_time)
except ValueError: except ValueError: