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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2024-12-24 10:16:53 +05:30
committed by GitHub
parent 7a5c30fe9b
commit 90aadcdcbc
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/deprecated_serial_batch.py
View File

@@ -3,12 +3,8 @@ from collections import defaultdict
import frappe
from frappe.query_builder.functions import CombineDatetime, Sum
<<<<<<< HEAD
from frappe.utils import flt
from frappe.utils.deprecations import deprecated
=======
from frappe.utils import flt, nowtime
>>>>>>> 079b86044e (fix: posting_time issue (#44870))
from frappe.utils.deprecations import deprecated
from pypika import Order