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

fix: include total hours validation in depends on

Browse Source 
(cherry picked from commit 57d34ab146)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
This commit is contained in:
l0gesh29
2025-12-24 18:35:48 +05:30
committed by Mergify
parent b88de73724
commit d4ec7fb416
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -776,7 +776,7 @@
}, },
{ {
"collapsible": 1, "collapsible": 1,
"depends_on": "eval:doc.total_billing_amount > 0", "collapsible_depends_on": "eval:doc.total_billing_amount > 0 || doc.total_billing_hours > 0",
"fieldname": "time_sheet_list", "fieldname": "time_sheet_list",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"hide_border": 1, "hide_border": 1,
@@ -2109,7 +2109,7 @@
"fieldtype": "Column Break" "fieldtype": "Column Break"
}, },
{ {
"depends_on": "eval:doc.total_billing_amount > 0", "depends_on": "eval:doc.total_billing_amount > 0 || doc.total_billing_hours > 0",
"fieldname": "section_break_104", "fieldname": "section_break_104",
"fieldtype": "Section Break" "fieldtype": "Section Break"
}, },
@@ -2197,11 +2197,15 @@
"link_fieldname": "consolidated_invoice" "link_fieldname": "consolidated_invoice"
} }
], ],
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< 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", "modified": "2025-12-23 20:09:14.424656",
>>>>>>> 38a4642479 (feat: modify field properties) >>>>>>> 38a4642479 (feat: modify field properties)
=======
"modified": "2025-12-24 18:29:50.242618",
>>>>>>> 57d34ab146 (fix: include total hours validation in depends on)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",