Merge f6cad39 into 1682402

erpnext/projects/doctype/task/task.py

@@ -11,7 +11,7 @@
 from frappe.model.mapper import get_mapped_doc
 from frappe.utils import add_days, cstr, date_diff, get_link_to_form, getdate, today, flt
 from frappe.utils.nestedset import NestedSet
-
+from frappe.defaults import get_user_default
 
 class CircularReferenceError(frappe.ValidationError): pass
 class EndDateCannotBeGreaterThanProjectEndDateError(frappe.ValidationError): pass
@@ -318,6 +318,13 @@ def add_node():
 
 	if args.parent_task == 'All Tasks' or args.parent_task == args.project:
 		args.parent_task = None
+		if args.parent_task == args.project:
+			args.company == frappe.get_value('Project', args.project, 'company')
+		else:
+			args.company == get_user_default('company')
+
+	else:
+		args.company = frappe.get_value('Task', args.parent_task, 'company')
 
 	frappe.get_doc(args).insert()
 
@@ -326,6 +333,7 @@ def add_multiple_tasks(data, parent):
 	data = json.loads(data)
 	new_doc = {'doctype': 'Task', 'parent_task': parent if parent!="All Tasks" else ""}
 	new_doc['project'] = frappe.db.get_value('Task', {"name": parent}, 'project') or ""
+	new_doc['company'] = frappe.db.get_value('Task', {"name": parent}, 'company') or get_user_default('company')
 
 	for d in data:
 		if not d.get("subject"): continue