nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 00:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: modify field properties

Browse Source 
(cherry picked from commit 38a4642479)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#	erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
#	erpnext/projects/doctype/timesheet/timesheet.json
This commit is contained in:
l0gesh29
2025-12-23 20:10:38 +05:30
committed by Mergify
parent b807f9318f
commit 61b3be3bc3
3 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@@ -776,8 +776,7 @@
}, },
{ {
"collapsible": 1, "collapsible": 1,
"collapsible_depends_on": "eval:doc.total_billing_amount > 0", "depends_on": "eval:doc.total_billing_amount > 0",
"depends_on": "eval:!doc.is_return",
"fieldname": "time_sheet_list", "fieldname": "time_sheet_list",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"hide_border": 1, "hide_border": 1,
@@ -791,7 +790,6 @@
"hide_days": 1, "hide_days": 1,
"hide_seconds": 1, "hide_seconds": 1,
"label": "Time Sheets", "label": "Time Sheets",
"no_copy": 1,
"options": "Sales Invoice Timesheet", "options": "Sales Invoice Timesheet",
"print_hide": 1 "print_hide": 1
}, },
@@ -2111,7 +2109,7 @@
"fieldtype": "Column Break" "fieldtype": "Column Break"
}, },
{ {
"depends_on": "eval:(!doc.is_return && doc.total_billing_amount > 0)", "depends_on": "eval:doc.total_billing_amount > 0",
"fieldname": "section_break_104", "fieldname": "section_break_104",
"fieldtype": "Section Break" "fieldtype": "Section Break"
}, },
@@ -2199,7 +2197,11 @@
"link_fieldname": "consolidated_invoice" "link_fieldname": "consolidated_invoice"
} }
], ],
<<<<<<< HEAD
"modified": "2025-09-09 14:48:59.472826", "modified": "2025-09-09 14:48:59.472826",
=======
"modified": "2025-12-23 20:09:14.424656",
>>>>>>> 38a4642479 (feat: modify field properties)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",

10
erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
View File

@@ -52,7 +52,6 @@
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 1, "hidden": 1,
"label": "Timesheet Detail", "label": "Timesheet Detail",
"no_copy": 1,
"print_hide": 1, "print_hide": 1,
"read_only": 1 "read_only": 1
}, },
@@ -117,14 +116,23 @@
], ],
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2021-10-02 03:48:44.979777", "modified": "2021-10-02 03:48:44.979777",
=======
"modified": "2025-12-23 13:54:17.677187",
>>>>>>> 38a4642479 (feat: modify field properties)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice Timesheet", "name": "Sales Invoice Timesheet",
"owner": "Administrator", "owner": "Administrator",
"permissions": [], "permissions": [],
"quick_entry": 1, "quick_entry": 1,
<<<<<<< HEAD
"sort_field": "modified", "sort_field": "modified",
=======
"row_format": "Dynamic",
"sort_field": "creation",
>>>>>>> 38a4642479 (feat: modify field properties)
"sort_order": "DESC", "sort_order": "DESC",
"track_changes": 1 "track_changes": 1
} }

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

@@ -91,7 +91,7 @@
"in_standard_filter": 1, "in_standard_filter": 1,
"label": "Status", "label": "Status",
"no_copy": 1, "no_copy": 1,
"options": "Draft\nSubmitted\nBilled\nPayslip\nCompleted\nCancelled", "options": "Draft\nSubmitted\nPartially Billed\nBilled\nPayslip\nCompleted\nCancelled",
"print_hide": 1, "print_hide": 1,
"read_only": 1 "read_only": 1
}, },
@@ -310,7 +310,11 @@
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-04-20 15:59:11.107831", "modified": "2023-04-20 15:59:11.107831",
=======
"modified": "2025-12-19 13:48:23.453636",
>>>>>>> 38a4642479 (feat: modify field properties)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Projects", "module": "Projects",
"name": "Timesheet", "name": "Timesheet",
@@ -386,7 +390,12 @@
"write": 1 "write": 1
} }
], ],
<<<<<<< HEAD
"sort_field": "modified", "sort_field": "modified",
=======
"row_format": "Dynamic",
"sort_field": "creation",
>>>>>>> 38a4642479 (feat: modify field properties)
"sort_order": "ASC", "sort_order": "ASC",
"states": [], "states": [],
"title_field": "title" "title_field": "title"