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

fix: resolve backport conflicts

Browse Source
This commit is contained in:
khushi8112
2026-08-13 11:52:26 +05:30
parent 956be58c9c
commit 3fd3f9485b
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

@@ -6,11 +6,8 @@ from collections import OrderedDict
import frappe import frappe
from frappe import _, qb, query_builder, scrub from frappe import _, qb, query_builder, scrub
<<<<<<< HEAD
from frappe.database.schema import get_definition from frappe.database.schema import get_definition
=======
from frappe.permissions import get_allowed_docs_for_doctype from frappe.permissions import get_allowed_docs_for_doctype
>>>>>>> 8b09ba429e (fix: apply Sales Person user permissions in Accounts Receivable)
from frappe.query_builder import Criterion from frappe.query_builder import Criterion
from frappe.query_builder.functions import Date, Substring, Sum from frappe.query_builder.functions import Date, Substring, Sum
from frappe.utils import cint, cstr, flt, getdate, nowdate from frappe.utils import cint, cstr, flt, getdate, nowdate
@@ -932,25 +929,11 @@ class ReceivablePayableReport:
if self.filters.get("sales_person"): if self.filters.get("sales_person"):
lft, rgt = frappe.db.get_value("Sales Person", self.filters.get("sales_person"), ["lft", "rgt"]) lft, rgt = frappe.db.get_value("Sales Person", self.filters.get("sales_person"), ["lft", "rgt"])
<<<<<<< HEAD
# nosemgrep
records = frappe.db.sql(
"""
select distinct parent, parenttype
from `tabSales Team` steam
where parenttype in ('Customer', 'Sales Invoice')
and exists(select name from `tabSales Person` where lft >= %s and rgt <= %s and name = steam.sales_person)
""",
(lft, rgt),
as_dict=1,
=======
sp = frappe.qb.DocType("Sales Person") sp = frappe.qb.DocType("Sales Person")
conditions.append( conditions.append(
steam.sales_person.isin( steam.sales_person.isin(
frappe.qb.from_(sp).select(sp.name).where((sp.lft >= lft) & (sp.rgt <= rgt)) frappe.qb.from_(sp).select(sp.name).where((sp.lft >= lft) & (sp.rgt <= rgt))
) )
>>>>>>> 8b09ba429e (fix: apply Sales Person user permissions in Accounts Receivable)
) )
records = ( records = (