schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: typeerror on Payment Entry

Browse Source 
(cherry picked from commit e9cf8937cd)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.js
This commit is contained in:
ruthra kumar
2024-08-28 12:21:22 +05:30
committed by Mergify
parent 23c5edaf08
commit dda4002da4
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/doctype/payment_entry/payment_entry.js
View File

@@ -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",