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

chore: resolve confilcts

Browse Source
This commit is contained in:
barredterra
2025-01-17 14:38:03 +01:00
parent 77e92b38eb
commit 1ccf30d97b
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/projects/doctype/project/project.py
View File

@@ -7,15 +7,8 @@ from email_reply_parser import EmailReplyParser
from frappe import _, qb from frappe import _, qb
from frappe.desk.reportview import get_match_cond from frappe.desk.reportview import get_match_cond
from frappe.model.document import Document from frappe.model.document import Document
<<<<<<< HEAD
from frappe.query_builder.functions import Sum from frappe.query_builder.functions import Sum
from frappe.utils import add_days, flt, get_datetime, get_time, get_url, nowtime, today from frappe.utils import add_days, flt, get_datetime, get_link_to_form, get_time, nowtime, today
=======
from frappe.query_builder import Interval
from frappe.query_builder.functions import Count, CurDate, Date, Sum, UnixTimestamp
from frappe.utils import add_days, flt, get_datetime, get_link_to_form, get_time, get_url, nowtime, today
from frappe.utils.user import is_website_user
>>>>>>> 8d66142865 (fix(Project): re-phrase welcome email (#45175))
from erpnext import get_default_company from erpnext import get_default_company
from erpnext.controllers.queries import get_filters_cond from erpnext.controllers.queries import get_filters_cond