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

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Nabin Hait 2016-09-07 17:20:14 +05:30
commit a8b8d81e2a
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

@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '7.0.41' __version__ = '7.0.42'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

2
erpnext/patches/v7_0/convert_timelog_to_timesheet.py
View File

@ -7,7 +7,7 @@ def execute():
if not frappe.db.table_exists("Time Log"): if not frappe.db.table_exists("Time Log"):
return return
for data in frappe.db.sql("select * from `tabTime Log` where where docstatus < 2", as_dict=1): for data in frappe.db.sql("select * from `tabTime Log` where docstatus < 2", as_dict=1):
if data.task: if data.task:
company = frappe.db.get_value("Task", data.task, "company") company = frappe.db.get_value("Task", data.task, "company")
elif data.production_order: elif data.production_order: