From 6cb9ae20358d1caf13b3cf647df41085470f2d76 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 28 Aug 2024 13:23:00 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/accounts/doctype/payment_entry/payment_entry.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js index 8cd3d20e858..2e5a278c492 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js @@ -249,15 +249,8 @@ frappe.ui.form.on('Payment Entry', { frm.refresh_fields(); }, -<<<<<<< HEAD set_dynamic_labels: function(frm) { - var company_currency = frm.doc.company? frappe.get_doc(":Company", frm.doc.company).default_currency: ""; -======= - set_dynamic_labels: function (frm) { - var company_currency = frm.doc.company - ? frappe.get_doc(":Company", frm.doc.company)?.default_currency - : ""; ->>>>>>> e9cf8937cd (fix: typeerror on Payment Entry) + var company_currency = frm.doc.company? frappe.get_doc(":Company", frm.doc.company)?.default_currency: ""; frm.set_currency_labels(["base_paid_amount", "base_received_amount", "base_total_allocated_amount", "difference_amount", "base_paid_amount_after_tax", "base_received_amount_after_tax",