nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-19 21:19:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
Diptanil Saha
2026-01-14 15:53:18 +05:30
committed by GitHub
parent d09de53d1d
commit 39e1bddce6
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/public/js/controllers/transaction.js
View File

@@ -1089,18 +1089,12 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
plc_conversion_rate() { plc_conversion_rate() {
if(this.frm.doc.price_list_currency === this.get_company_currency()) { if(this.frm.doc.price_list_currency === this.get_company_currency()) {
this.frm.set_value("plc_conversion_rate", 1.0); 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 ( } else if (
this.frm.doc.price_list_currency === this.frm.doc.currency && this.frm.doc.price_list_currency === this.frm.doc.currency &&
this.frm.doc.plc_conversion_rate && this.frm.doc.plc_conversion_rate &&
flt(this.frm.doc.plc_conversion_rate) != 1 && flt(this.frm.doc.plc_conversion_rate) != 1 &&
flt(this.frm.doc.plc_conversion_rate) != flt(this.frm.doc.conversion_rate) 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); this.frm.set_value("conversion_rate", this.frm.doc.plc_conversion_rate);
} }