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

chore: fix conflicts

Browse Source 
Removed unused imports and fixed import structure.
This commit is contained in:
rohitwaghchaure
2026-06-27 16:51:20 +05:30
committed by GitHub
parent f2da254f49
commit 54a30c709a
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
View File

@@ -4,14 +4,8 @@
import frappe
from frappe import _, bold, json, msgprint
<<<<<<< HEAD
from frappe.query_builder.functions import CombineDatetime, Sum
from frappe.utils import add_to_date, cint, cstr, flt, get_datetime, now
=======
from frappe.query_builder.functions import Sum
from frappe.utils import add_to_date, cint, cstr, flt, now
from frappe.utils.data import DateTimeLikeObject
>>>>>>> c7ef42ef98 (fix: sync Stock Reconciliation difference amount with GL after reposting (#56574))
import erpnext
from erpnext.accounts.utils import get_company_default