From b19b0a4a98b1f74785f18d0d754827257ac8c2b0 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 1 May 2023 20:54:32 +0530 Subject: [PATCH] fix: conflicts --- .../doctype/repost_item_valuation/repost_item_valuation.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py index 5cb2ce2eb32..e197f302901 100644 --- a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py +++ b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py @@ -5,11 +5,7 @@ import frappe from frappe import _ from frappe.exceptions import QueryDeadlockError, QueryTimeoutError from frappe.model.document import Document -<<<<<<< HEAD -======= -from frappe.query_builder import DocType, Interval -from frappe.query_builder.functions import Max, Now ->>>>>>> f751727149 (fix: don't allow to make reposting for the closed period) +from frappe.query_builder.functions import Max from frappe.utils import cint, get_link_to_form, get_weekday, getdate, now, nowtime from frappe.utils.user import get_users_with_role from rq.timeouts import JobTimeoutException