schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-01-31 10:38:08 +05:30
committed by GitHub
parent 9217e919c3
commit dee6e2b697
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/stock/report/stock_ledger/stock_ledger.py
View File

@@ -4,13 +4,8 @@
import frappe import frappe
from frappe import _ from frappe import _
<<<<<<< HEAD
from frappe.query_builder.functions import CombineDatetime from frappe.query_builder.functions import CombineDatetime
from frappe.utils import cint, flt
=======
from frappe.query_builder.functions import CombineDatetime, Sum
from frappe.utils import cint, flt, get_datetime from frappe.utils import cint, flt, get_datetime
>>>>>>> e61ab48145 (fix: posting_date to posting_datetime in stock related queries)
from erpnext.stock.doctype.inventory_dimension.inventory_dimension import get_inventory_dimensions from erpnext.stock.doctype.inventory_dimension.inventory_dimension import get_inventory_dimensions
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos