mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-26 06:31:13 +01:00
* fix(Task): make Timesheet-dependent fields no_copy
(cherry picked from commit 2a2e4b5423)
# Conflicts:
# erpnext/projects/doctype/task/task.json
* chore: resolve conflicts
---------
Co-authored-by: Patrick Eissler <77415730+PatrickDEissler@users.noreply.github.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
This commit is contained in:
@@ -245,6 +245,7 @@
|
|||||||
"fieldname": "act_start_date",
|
"fieldname": "act_start_date",
|
||||||
"fieldtype": "Date",
|
"fieldtype": "Date",
|
||||||
"label": "Actual Start Date (via Timesheet)",
|
"label": "Actual Start Date (via Timesheet)",
|
||||||
|
"no_copy": 1,
|
||||||
"oldfieldname": "act_start_date",
|
"oldfieldname": "act_start_date",
|
||||||
"oldfieldtype": "Date",
|
"oldfieldtype": "Date",
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
@@ -253,6 +254,7 @@
|
|||||||
"fieldname": "actual_time",
|
"fieldname": "actual_time",
|
||||||
"fieldtype": "Float",
|
"fieldtype": "Float",
|
||||||
"label": "Actual Time in Hours (via Timesheet)",
|
"label": "Actual Time in Hours (via Timesheet)",
|
||||||
|
"no_copy": 1,
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -263,6 +265,7 @@
|
|||||||
"fieldname": "act_end_date",
|
"fieldname": "act_end_date",
|
||||||
"fieldtype": "Date",
|
"fieldtype": "Date",
|
||||||
"label": "Actual End Date (via Timesheet)",
|
"label": "Actual End Date (via Timesheet)",
|
||||||
|
"no_copy": 1,
|
||||||
"oldfieldname": "act_end_date",
|
"oldfieldname": "act_end_date",
|
||||||
"oldfieldtype": "Date",
|
"oldfieldtype": "Date",
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
@@ -277,6 +280,7 @@
|
|||||||
"fieldname": "total_costing_amount",
|
"fieldname": "total_costing_amount",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
"label": "Total Costing Amount (via Timesheet)",
|
"label": "Total Costing Amount (via Timesheet)",
|
||||||
|
"no_copy": 1,
|
||||||
"oldfieldname": "actual_budget",
|
"oldfieldname": "actual_budget",
|
||||||
"oldfieldtype": "Currency",
|
"oldfieldtype": "Currency",
|
||||||
"options": "Company:company:default_currency",
|
"options": "Company:company:default_currency",
|
||||||
@@ -290,6 +294,7 @@
|
|||||||
"fieldname": "total_billing_amount",
|
"fieldname": "total_billing_amount",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
"label": "Total Billable Amount (via Timesheet)",
|
"label": "Total Billable Amount (via Timesheet)",
|
||||||
|
"no_copy": 1,
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -399,7 +404,7 @@
|
|||||||
"is_tree": 1,
|
"is_tree": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"max_attachments": 5,
|
"max_attachments": 5,
|
||||||
"modified": "2024-01-08 16:00:41.296203",
|
"modified": "2025-10-16 08:39:12.214577",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Projects",
|
"module": "Projects",
|
||||||
"name": "Task",
|
"name": "Task",
|
||||||
@@ -429,4 +434,4 @@
|
|||||||
"timeline_field": "project",
|
"timeline_field": "project",
|
||||||
"title_field": "subject",
|
"title_field": "subject",
|
||||||
"track_seen": 1
|
"track_seen": 1
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user