Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24346 from GangaManoj/timesheet-linking

Browse Source 
fix: Link timesheets with corresponding projects
This commit is contained in:
Deepesh Garg 2021-01-14 18:49:40 +05:30 committed by GitHub
commit 660d4a1097
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,7 +134,7 @@ frappe.ui.form.on("Timesheet", {
});
},
project: function(frm) {
parent_project: function(frm) {
set_project_in_timelog(frm);
},
@ -168,8 +168,8 @@ frappe.ui.form.on("Timesheet Detail", {
},
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 @@ const set_employee_and_company = function(frm) {
};
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);
});
}
}

6
erpnext/projects/doctype/timesheet/timesheet.json
View File

@ -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",