fix: Deferred Revenue Section should be collapsible only if its not e…

…nabled (frappe#26930) * fix: Deferred Revenue Section should be collapsible only if its not enabled (frappe#26928) (cherry picked from commit 1de4c01) # 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>
resilient-tech · Oct 2, 2021 · 6510114 · 6510114
1 parent 536e0e8
commit 6510114
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -870,7 +870,11 @@
  "idx": 1,
  "istable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2021-09-01 16:04:03.538643",
+=======
+ "modified": "2021-08-12 20:14:45.506639",
+>>>>>>> fix: Deferred Revenue Section should be collapsible only if its not enabled (#26930)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice Item",

diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -833,7 +833,11 @@
  "idx": 1,
  "istable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2021-08-19 13:41:53.435827",
+=======
+ "modified": "2021-08-12 20:15:42.668399",
+>>>>>>> fix: Deferred Revenue Section should be collapsible only if its not enabled (#26930)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice Item",