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

fix: conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2023-05-01 20:54:32 +05:30
committed by GitHub
parent b31d8eec05
commit b19b0a4a98
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
View File

@@ -5,11 +5,7 @@ import frappe
from frappe import _ from frappe import _
from frappe.exceptions import QueryDeadlockError, QueryTimeoutError from frappe.exceptions import QueryDeadlockError, QueryTimeoutError
from frappe.model.document import Document from frappe.model.document import Document
<<<<<<< HEAD from frappe.query_builder.functions import Max
=======
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.utils import cint, get_link_to_form, get_weekday, getdate, now, nowtime from frappe.utils import cint, get_link_to_form, get_weekday, getdate, now, nowtime
from frappe.utils.user import get_users_with_role from frappe.utils.user import get_users_with_role
from rq.timeouts import JobTimeoutException from rq.timeouts import JobTimeoutException