From be48b4a02887389489746aa660b3f62fd6644e7e Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 4 Jan 2023 08:24:20 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/stock/doctype/stock_entry/stock_entry.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index ef2c28580c3..3da24974919 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -9,16 +9,7 @@ import frappe from frappe import _ from frappe.model.mapper import get_mapped_doc from frappe.query_builder.functions import Sum -from frappe.utils import ( - cint, - comma_or, - cstr, - flt, - format_time, - formatdate, - getdate, - nowdate, -) +from frappe.utils import cint, comma_or, cstr, flt, format_time, formatdate, getdate, nowdate from six import iteritems, itervalues, string_types import erpnext