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

Merge pull request #38207 from s-aga-r/FIX-37809

Browse Source 
fix(ux): `Task` creation from `Timesheet`
This commit is contained in:
s-aga-r 2023-11-20 12:39:30 +05:30 committed by GitHub
commit 80ab4eea8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/projects/doctype/task/task.json
View File

@ -57,6 +57,7 @@
], ],
"fields": [ "fields": [
{ {
"allow_in_quick_entry": 1,
"fieldname": "subject", "fieldname": "subject",
"fieldtype": "Data", "fieldtype": "Data",
"in_global_search": 1, "in_global_search": 1,
@ -66,6 +67,7 @@
"search_index": 1 "search_index": 1
}, },
{ {
"allow_in_quick_entry": 1,
"bold": 1, "bold": 1,
"fieldname": "project", "fieldname": "project",
"fieldtype": "Link", "fieldtype": "Link",
@ -396,7 +398,7 @@
"is_tree": 1, "is_tree": 1,
"links": [], "links": [],
"max_attachments": 5, "max_attachments": 5,
"modified": "2023-09-28 13:52:05.861175", "modified": "2023-11-20 11:42:41.884069",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Projects", "module": "Projects",
"name": "Task", "name": "Task",
@ -416,6 +418,7 @@
"write": 1 "write": 1
} }
], ],
"quick_entry": 1,
"search_fields": "subject", "search_fields": "subject",
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"show_preview_popup": 1, "show_preview_popup": 1,

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

@ -111,6 +111,7 @@ frappe.ui.form.on("Timesheet", {
frm.trigger('setup_filters'); frm.trigger('setup_filters');
frm.trigger('set_dynamic_field_label'); frm.trigger('set_dynamic_field_label');
frm.trigger('set_route_options_for_new_task');
}, },
customer: function(frm) { customer: function(frm) {
@ -172,6 +173,14 @@ frappe.ui.form.on("Timesheet", {
frm.refresh_fields(); frm.refresh_fields();
}, },
set_route_options_for_new_task: (frm) => {
let task_field = frm.get_docfield('time_logs', 'task');
if (task_field) {
task_field.get_route_options_for_new_doc = (row) => ({'project': row.doc.project});
}
},
make_invoice: function(frm) { make_invoice: function(frm) {
let fields = [{ let fields = [{
"fieldtype": "Link", "fieldtype": "Link",