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

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2023-01-04 08:24:20 +05:30
committed by GitHub
parent b6ed0698b4
commit be48b4a028
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,16 +9,7 @@ import frappe
from frappe import _ 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 cint, comma_or, cstr, flt, format_time, formatdate, getdate, nowdate
cint,
comma_or,
cstr,
flt,
format_time,
formatdate,
getdate,
nowdate,
)
from six import iteritems, itervalues, string_types from six import iteritems, itervalues, string_types
import erpnext import erpnext