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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2026-06-09 09:48:38 +05:30
committed by GitHub
parent fa08501045
commit 10cfac865e
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/selling/report/inactive_customers/inactive_customers.py
View File

@@ -16,11 +16,7 @@ def execute(filters=None):
days_since_last_order = filters.get("days_since_last_order") days_since_last_order = filters.get("days_since_last_order")
doctype = filters.get("doctype") doctype = filters.get("doctype")
<<<<<<< HEAD
if doctype not in ("Sales Order", "Sales Invoice"): if doctype not in ("Sales Order", "Sales Invoice"):
=======
if doctype not in {"Sales Order", "Sales Invoice"}:
>>>>>>> 2ecf8b0466 (fix(inactive_customers): add allowlist for doctype filter and migrate to qb)
frappe.throw(_("Invalid value {0} for 'Doctype'").format(doctype)) frappe.throw(_("Invalid value {0} for 'Doctype'").format(doctype))
if cint(days_since_last_order) <= 0: if cint(days_since_last_order) <= 0: