fix: Multi-currency issues in Bank Recociliation Tool
diff --git a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
index d353270..f5f04ae 100644
--- a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
+++ b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
@@ -302,7 +302,7 @@
dict(
account=account, voucher_type=voucher["payment_doctype"], voucher_no=voucher["payment_name"]
),
- ["credit", "debit"],
+ ["credit_in_account_currency as credit", "debit_in_account_currency as debit"],
as_dict=1,
)
gl_amount, transaction_amount = (
diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.py b/erpnext/accounts/doctype/bank_transaction/bank_transaction.py
index a788514..9b36c93 100644
--- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.py
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.py
@@ -137,7 +137,7 @@
)
elif doc.payment_type == "Pay":
paid_amount_field = (
- "paid_amount" if doc.paid_to_account_currency == currency else "base_paid_amount"
+ "paid_amount" if doc.paid_from_account_currency == currency else "base_paid_amount"
)
return frappe.db.get_value(
diff --git a/erpnext/public/js/bank_reconciliation_tool/dialog_manager.js b/erpnext/public/js/bank_reconciliation_tool/dialog_manager.js
index ca01f68..b5e6ab8 100644
--- a/erpnext/public/js/bank_reconciliation_tool/dialog_manager.js
+++ b/erpnext/public/js/bank_reconciliation_tool/dialog_manager.js
@@ -355,12 +355,14 @@
fieldname: "deposit",
fieldtype: "Currency",
label: "Deposit",
+ options: "currency",
read_only: 1,
},
{
fieldname: "withdrawal",
fieldtype: "Currency",
label: "Withdrawal",
+ options: "currency",
read_only: 1,
},
{
@@ -378,6 +380,7 @@
fieldname: "allocated_amount",
fieldtype: "Currency",
label: "Allocated Amount",
+ options: "Currency",
read_only: 1,
},
@@ -385,8 +388,17 @@
fieldname: "unallocated_amount",
fieldtype: "Currency",
label: "Unallocated Amount",
+ options: "Currency",
read_only: 1,
},
+ {
+ fieldname: "currency",
+ fieldtype: "Link",
+ label: "Currency",
+ options: "Currency",
+ read_only: 1,
+ hidden: 1,
+ }
];
}