From dda4002da4b5779401b0f5f15f9956cee8d91e72 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 28 Aug 2024 12:21:22 +0530 Subject: [PATCH] fix: typeerror on Payment Entry (cherry picked from commit e9cf8937cd4a6c00666bf5f016b0647121d9838c) # Conflicts: # erpnext/accounts/doctype/payment_entry/payment_entry.js --- erpnext/accounts/doctype/payment_entry/payment_entry.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js index 137dedf80ec..8cd3d20e858 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js @@ -249,8 +249,15 @@ 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) 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",