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

chore: resolve conflict

Browse Source
This commit is contained in:
Diptanil Saha
2025-12-09 20:52:33 +05:30
committed by GitHub
parent bf1c606610
commit 9ccf4900fe
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/taxes_and_totals.py
View File

@@ -6,12 +6,8 @@ import json
import frappe import frappe
from frappe import _, scrub from frappe import _, scrub
<<<<<<< HEAD
from frappe.model.document import Document from frappe.model.document import Document
=======
from frappe.model.document import Document, bulk_insert
from frappe.query_builder import functions from frappe.query_builder import functions
>>>>>>> fab1ef5d76 (fix: include return invoice discount in discount validation)
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