schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Deferred Revenue Section should be collapsible only if its not enabled (#26930)

Browse Source 
* fix: Deferred Revenue Section should be collapsible only if its not enabled (#26928)

(cherry picked from commit 1de4c01942)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json

* fix: conflicts

* fix: conflicts

* fix: conflicts

* fix: conflicts

* fix: conflicts

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
This commit is contained in:
Frappe PR Bot
2021-08-13 10:58:43 +05:30
committed by GitHub
parent adfa11d449
commit a2a5800b23
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
View File

@@ -502,6 +502,7 @@
}, },
{ {
"collapsible": 1, "collapsible": 1,
"collapsible_depends_on": "enable_deferred_expense",
"fieldname": "deferred_expense_section", "fieldname": "deferred_expense_section",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Deferred Expense" "label": "Deferred Expense"
@@ -861,7 +862,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2021-07-13 02:04:37.787882", "modified": "2021-08-12 20:14:45.506639",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice Item", "name": "Purchase Invoice Item",

3
erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
View File

@@ -474,6 +474,7 @@
}, },
{ {
"collapsible": 1, "collapsible": 1,
"collapsible_depends_on": "enable_deferred_revenue",
"fieldname": "deferred_revenue", "fieldname": "deferred_revenue",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Deferred Revenue" "label": "Deferred Revenue"
@@ -833,7 +834,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2021-07-05 15:07:22.857128", "modified": "2021-08-12 20:15:42.668399",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice Item", "name": "Sales Invoice Item",