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

chore: resolve conflicts

Browse Source
This commit is contained in:
Sagar Vora
2025-11-11 15:11:52 +05:30
parent 22848eb4da
commit 313e6af528
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/controllers/taxes_and_totals.py
View File

@@ -7,16 +7,8 @@ import json
import frappe import frappe
from frappe import _, scrub from frappe import _, scrub
from frappe.model.document import Document from frappe.model.document import Document
<<<<<<< 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
>>>>>>> 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