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

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2023-01-03 22:56:58 +05:30
committed by GitHub
parent 208d541373
commit b6ed0698b4
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@@ -10,7 +10,6 @@ from frappe import _
from frappe.model.mapper import get_mapped_doc from frappe.model.mapper import get_mapped_doc
from frappe.query_builder.functions import Sum from frappe.query_builder.functions import Sum
from frappe.utils import ( from frappe.utils import (
add_days,
cint, cint,
comma_or, comma_or,
cstr, cstr,
@@ -19,7 +18,6 @@ from frappe.utils import (
formatdate, formatdate,
getdate, getdate,
nowdate, nowdate,
today,
) )
from six import iteritems, itervalues, string_types from six import iteritems, itervalues, string_types