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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2023-10-25 11:27:51 +05:30
parent 91130854d8
commit 2317f6a000
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
View File

@@ -16,12 +16,8 @@ from erpnext.accounts.report.bank_reconciliation_statement.bank_reconciliation_s
get_amounts_not_reflected_in_system, get_amounts_not_reflected_in_system,
get_entries, get_entries,
) )
<<<<<<< HEAD
from erpnext.accounts.utils import get_balance_on from erpnext.accounts.utils import get_balance_on
=======
from erpnext.accounts.utils import get_account_currency, get_balance_on
from erpnext.setup.utils import get_exchange_rate from erpnext.setup.utils import get_exchange_rate
>>>>>>> 89f484282a (refactor: exc rate on foreign currency JE from Bank Reconciliation)
class BankReconciliationTool(Document): class BankReconciliationTool(Document):