nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-25 09:38:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: avoid resetting employee on amending timesheets (#28025) (#28026)

Browse Source 
(cherry picked from commit 261f80c5ca)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
This commit is contained in:
mergify[bot]
2021-10-20 17:45:43 +05:30
committed by GitHub
parent a739bf90c4
commit 9ce7ea692d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/projects/doctype/timesheet/timesheet.js
View File

@@ -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);
}
},