diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index c68c262657..308db38d61 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -1068,9 +1068,9 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
-   "collapsible": 0, 
-   "collapsible_depends_on": "", 
-   "depends_on": "eval:doc.total_billing_amount > 0", 
+   "collapsible": 1, 
+   "collapsible_depends_on": "eval:doc.total_billing_amount > 0", 
+   "depends_on": "", 
    "fieldname": "time_sheet_list", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -3676,7 +3676,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-06-27 15:13:36.523798", 
+ "modified": "2016-07-02 20:10:14.146763", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice", 
diff --git a/erpnext/patches/v7_0/convert_timelog_to_timesheet.py b/erpnext/patches/v7_0/convert_timelog_to_timesheet.py
index eb727e5401..8c2b44a68a 100644
--- a/erpnext/patches/v7_0/convert_timelog_to_timesheet.py
+++ b/erpnext/patches/v7_0/convert_timelog_to_timesheet.py
@@ -14,10 +14,12 @@ def execute():
 
 def get_timesheet_data(data):
 	return {
+		'billable': data.billable,
 		'from_time': data.from_time,
 		'hours': data.hours,
 		'to_time': data.to_time,
 		'project': data.project,
+		'task': data.task,
 		'activity_type': data.activity_type,
 		'operation': data.operation,
 		'operation_id': data.operation_id,
diff --git a/erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py b/erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py
index 097097dc0a..6a50aa2aeb 100644
--- a/erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py
+++ b/erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py
@@ -21,10 +21,12 @@ def get_timesheet_data(data):
 	time_log = frappe.get_doc('Time Log', data.time_log)
 
 	return {
+		'billable': time_log.billable,
 		'from_time': time_log.from_time,
 		'hours': time_log.hours,
 		'to_time': time_log.to_time,
 		'project': time_log.project,
+		'task': time_log.task,
 		'activity_type': time_log.activity_type,
 		'operation': time_log.operation,
 		'operation_id': time_log.operation_id,