diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 84770462434..116f2b9269b 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -776,7 +776,7 @@ }, { "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", "fieldtype": "Section Break", "hide_border": 1, @@ -2109,7 +2109,7 @@ "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", "fieldtype": "Section Break" }, @@ -2197,11 +2197,15 @@ "link_fieldname": "consolidated_invoice" } ], +<<<<<<< HEAD <<<<<<< HEAD "modified": "2025-09-09 14:48:59.472826", ======= "modified": "2025-12-23 20:09:14.424656", >>>>>>> 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", "module": "Accounts", "name": "Sales Invoice",