Merge pull request #24346 from GangaManoj/timesheet-linking
fix: Link timesheets with corresponding projects
diff --git a/erpnext/projects/doctype/timesheet/timesheet.js b/erpnext/projects/doctype/timesheet/timesheet.js
index b068245..b123af5 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.js
+++ b/erpnext/projects/doctype/timesheet/timesheet.js
@@ -134,7 +134,7 @@
});
},
- project: function(frm) {
+ parent_project: function(frm) {
set_project_in_timelog(frm);
},
@@ -168,8 +168,8 @@
},
time_logs_add: function(frm, cdt, cdn) {
- if(frm.doc.project) {
- frappe.model.set_value(cdt, cdn, 'project', frm.doc.project);
+ if(frm.doc.parent_project) {
+ frappe.model.set_value(cdt, cdn, 'project', frm.doc.parent_project);
}
var $trigger_again = $('.form-grid').find('.grid-row').find('.btn-open-row');
@@ -308,7 +308,9 @@
};
function set_project_in_timelog(frm) {
- if(frm.doc.project){
- erpnext.utils.copy_value_in_all_rows(frm.doc, frm.doc.doctype, frm.doc.name, "time_logs", "project");
+ if(frm.doc.parent_project) {
+ $.each(frm.doc.time_logs || [], function(i, item) {
+ frappe.model.set_value(item.doctype, item.name, "project", frm.doc.parent_project);
+ });
}
}
\ No newline at end of file
diff --git a/erpnext/projects/doctype/timesheet/timesheet.json b/erpnext/projects/doctype/timesheet/timesheet.json
index 4c2edf4..b286821 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.json
+++ b/erpnext/projects/doctype/timesheet/timesheet.json
@@ -15,7 +15,7 @@
"column_break_3",
"salary_slip",
"status",
- "project",
+ "parent_project",
"employee_detail",
"employee",
"employee_name",
@@ -261,7 +261,7 @@
"read_only": 1
},
{
- "fieldname": "project",
+ "fieldname": "parent_project",
"fieldtype": "Link",
"label": "Project",
"options": "Project"
@@ -271,7 +271,7 @@
"idx": 1,
"is_submittable": 1,
"links": [],
- "modified": "2020-10-29 07:50:35.938231",
+ "modified": "2021-01-08 20:51:14.590080",
"modified_by": "Administrator",
"module": "Projects",
"name": "Timesheet",