From 9ccf4900fed1981c16f430981db4447bb9ad0e1f Mon Sep 17 00:00:00 2001 From: Diptanil Saha Date: Tue, 9 Dec 2025 20:52:33 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/controllers/taxes_and_totals.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py index 9581d35f418..d6c4b99588c 100644 --- a/erpnext/controllers/taxes_and_totals.py +++ b/erpnext/controllers/taxes_and_totals.py @@ -6,12 +6,8 @@ import json import frappe from frappe import _, scrub -<<<<<<< HEAD from frappe.model.document import Document -======= -from frappe.model.document import Document, bulk_insert 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.deprecations import deprecated