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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2023-11-24 11:54:55 +05:30
parent 47093bebd3
commit 1d1af26f7a
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,11 +7,7 @@ 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 import Interval
from frappe.query_builder.functions import Count, CurDate, Date, Sum, UnixTimestamp
>>>>>>> bcbe6c4a53 (refactor: provide UI button to recalculate when needed)
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_time, get_url, nowtime, today
from erpnext import get_default_company from erpnext import get_default_company