From 1bf8e703393fd392e5f5a0c92e9e37da2db3540d Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 7 Sep 2016 17:19:27 +0530 Subject: [PATCH 1/2] Update convert_timelog_to_timesheet.py --- erpnext/patches/v7_0/convert_timelog_to_timesheet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/patches/v7_0/convert_timelog_to_timesheet.py b/erpnext/patches/v7_0/convert_timelog_to_timesheet.py index 89af095754..52433a5dba 100644 --- a/erpnext/patches/v7_0/convert_timelog_to_timesheet.py +++ b/erpnext/patches/v7_0/convert_timelog_to_timesheet.py @@ -7,7 +7,7 @@ def execute(): if not frappe.db.table_exists("Time Log"): 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: company = frappe.db.get_value("Task", data.task, "company") elif data.production_order: From 3e669ca656cc4a80738c1203adac5f876406c22c Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 7 Sep 2016 17:50:14 +0600 Subject: [PATCH 2/2] bumped to version 7.0.42 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 958957ca77..fcbc3f1fe2 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = '7.0.41' +__version__ = '7.0.42' def get_default_company(user=None): '''Get default company for user'''