fix(Expense Claim): Pass company to properly pick currency for each r…

…ecord (#1335) (cherry picked from commit f7c8f64) # Conflicts: # hrms/hr/doctype/expense_claim/expense_claim_list.js
frappe · Jan 19, 2024 · 9135a2f · 9135a2f
1 parent 8709d96
commit 9135a2f
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/hrms/hr/doctype/expense_claim/expense_claim_list.js b/hrms/hr/doctype/expense_claim/expense_claim_list.js
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 frappe.listview_settings['Expense Claim'] = {
 	add_fields: ["total_claimed_amount", "docstatus", "company"],
 	get_indicator: function(doc) {
@@ -10,3 +11,8 @@ frappe.listview_settings['Expense Claim'] = {
 		}
 	}
 };
+=======
+frappe.listview_settings["Expense Claim"] = {
+	add_fields: ["company"]
+}
+>>>>>>> f7c8f64e2 (fix(Expense Claim): Pass company to properly pick currency for each record (#1335))