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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-01-17 10:36:29 +05:30
parent b35a83ee47
commit 42c1de640c
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/controllers/queries.py
View File

@@ -8,20 +8,10 @@ from collections import defaultdict
import frappe import frappe
from frappe import qb, scrub from frappe import qb, scrub
from frappe.desk.reportview import get_filters_cond, get_match_cond from frappe.desk.reportview import get_filters_cond, get_match_cond
<<<<<<< HEAD
<<<<<<< HEAD
from frappe.utils import nowdate, unique
=======
from frappe.query_builder import Criterion
from frappe.query_builder.functions import Concat, Sum
from frappe.utils import nowdate, today, unique
>>>>>>> 4eefb445a7 (fix: project query controller logic)
=======
from frappe.query_builder import Criterion, CustomFunction from frappe.query_builder import Criterion, CustomFunction
from frappe.query_builder.functions import Concat, Locate, Sum from frappe.query_builder.functions import Locate
from frappe.utils import nowdate, today, unique from frappe.utils import nowdate, unique
from pypika import Order from pypika import Order
>>>>>>> bfe42fdccb (refactor: better ordering of query result)
import erpnext import erpnext
from erpnext.stock.get_item_details import _get_item_tax_template from erpnext.stock.get_item_details import _get_item_tax_template