fix(Expense Claim): description not saved (#1265)

(cherry picked from commit 60a2622) # Conflicts: # hrms/hr/doctype/expense_claim_detail/expense_claim_detail.json
frappe · Jan 8, 2024 · 10db7c0 · 10db7c0
1 parent 8b7be90
commit 10db7c0
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/hrms/hr/doctype/expense_claim_detail/expense_claim_detail.json b/hrms/hr/doctype/expense_claim_detail/expense_claim_detail.json
@@ -57,10 +57,15 @@
    "read_only": 1
   },
   {
+<<<<<<< HEAD
    "fieldname": "section_break_4",
    "fieldtype": "Section Break"
   },
   {
+=======
+   "fetch_from": "expense_type.description",
+   "fetch_if_empty": 1,
+>>>>>>> 60a26223a (fix(Expense Claim): description not saved (#1265))
    "fieldname": "description",
    "fieldtype": "Text Editor",
    "in_list_view": 1,
@@ -126,7 +131,11 @@
  "idx": 1,
  "istable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2023-06-24 00:56:08.900677",
+=======
+ "modified": "2024-01-08 11:47:28.315381",
+>>>>>>> 60a26223a (fix(Expense Claim): description not saved (#1265))
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Expense Claim Detail",