mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-26 18:18:30 +00:00
fix: include total hours validation in depends on
(cherry picked from commit 57d34ab146)
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/sales_invoice.json
This commit is contained in:
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user