Merge branch 'develop' into fix-invoice-statuses

frappe · Oct 20, 2021 · 5a18fb2 · 5a18fb2
2 parents bdc2219 + 261f80c
commit 5a18fb2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/erpnext/projects/doctype/timesheet/timesheet.js b/erpnext/projects/doctype/timesheet/timesheet.js
@@ -32,12 +32,12 @@ frappe.ui.form.on("Timesheet", {
 		};
 	},
 
-	onload: function(frm){
+	onload: function(frm) {
 		if (frm.doc.__islocal && frm.doc.time_logs) {
 			calculate_time_and_amount(frm);
 		}
 
-		if (frm.is_new()) {
+		if (frm.is_new() && !frm.doc.employee) {
 			set_employee_and_company(frm);
 		}
 	},