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

chore: remove unused import

Browse Source 
(cherry picked from commit 81ab15351e)

# Conflicts:
#	erpnext/controllers/taxes_and_totals.py
This commit is contained in:
Sagar Vora
2025-10-18 00:08:38 +05:30
committed by Mergify
parent b4df87e545
commit 22848eb4da
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/taxes_and_totals.py
View File

@@ -8,11 +8,15 @@ import frappe
from frappe import _, scrub from frappe import _, scrub
from frappe.model.document import Document from frappe.model.document import Document
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
from frappe.utils import cint, flt, round_based_on_smallest_currency_fraction from frappe.utils import cint, flt, round_based_on_smallest_currency_fraction
from frappe.utils.deprecations import deprecated from frappe.utils.deprecations import deprecated
======= =======
from frappe.utils import cint, flt, fmt_money, round_based_on_smallest_currency_fraction from frappe.utils import cint, flt, fmt_money, round_based_on_smallest_currency_fraction
>>>>>>> f4f79d99e4 (fix: validate that discount amount cannot exceed total before discount) >>>>>>> f4f79d99e4 (fix: validate that discount amount cannot exceed total before discount)
=======
from frappe.utils import cint, flt, round_based_on_smallest_currency_fraction
>>>>>>> 81ab15351e (chore: remove unused import)
import erpnext import erpnext
from erpnext.accounts.doctype.journal_entry.journal_entry import get_exchange_rate from erpnext.accounts.doctype.journal_entry.journal_entry import get_exchange_rate