From 39e1bddce6701562bb5dc23da9fb592fd8448086 Mon Sep 17 00:00:00 2001 From: Diptanil Saha Date: Wed, 14 Jan 2026 15:53:18 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/public/js/controllers/transaction.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index b5f6b7e9f64..ee7a9b05f10 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -1089,18 +1089,12 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe plc_conversion_rate() { if(this.frm.doc.price_list_currency === this.get_company_currency()) { this.frm.set_value("plc_conversion_rate", 1.0); -<<<<<<< HEAD - } else if(this.frm.doc.price_list_currency === this.frm.doc.currency - && this.frm.doc.plc_conversion_rate && cint(this.frm.doc.plc_conversion_rate) != 1 && - cint(this.frm.doc.plc_conversion_rate) != cint(this.frm.doc.conversion_rate)) { -======= } else if ( this.frm.doc.price_list_currency === this.frm.doc.currency && this.frm.doc.plc_conversion_rate && flt(this.frm.doc.plc_conversion_rate) != 1 && flt(this.frm.doc.plc_conversion_rate) != flt(this.frm.doc.conversion_rate) ) { ->>>>>>> 8b445e04e5 (fix(transaction.js): use flt instead of cint for plc_conversion_rate) this.frm.set_value("conversion_rate", this.frm.doc.plc_conversion_rate); }