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

chore: fix conflicts

Browse Source 
Removed unused import of DateTimeLikeObject.
This commit is contained in:
rohitwaghchaure
2026-06-05 20:48:19 +05:30
committed by GitHub
parent e7eaa87a77
commit 8c9168595f
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/stock/doctype/batch/batch.py
View File

@@ -10,12 +10,7 @@ from frappe.model.document import Document
from frappe.model.naming import make_autoname, revert_series_if_last from frappe.model.naming import make_autoname, revert_series_if_last
from frappe.query_builder.functions import CurDate, Sum from frappe.query_builder.functions import CurDate, Sum
from frappe.utils import cint, flt, get_link_to_form from frappe.utils import cint, flt, get_link_to_form
<<<<<<< HEAD
from frappe.utils.data import add_days from frappe.utils.data import add_days
from frappe.utils.jinja import render_template
=======
from frappe.utils.data import DateTimeLikeObject, add_days
>>>>>>> 3a50056968 (fix: naming series issue)
class UnableToSelectBatchError(frappe.ValidationError): class UnableToSelectBatchError(frappe.ValidationError):