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

chore: fix conflicts

Browse Source 
Removed conflicting code related to date_field assignment based on filters.
This commit is contained in:
rohitwaghchaure
2026-06-09 09:31:58 +05:30
committed by GitHub
parent a94e362b8c
commit c0f56cd284
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py
View File

@@ -95,16 +95,12 @@ def get_data(filters):
def get_sales_details(filters):
item_details_map = {}
<<<<<<< HEAD
date_field = "s.transaction_date" if filters["based_on"] == "Sales Order" else "s.posting_date"
=======
if filters["based_on"] not in ("Sales Order", "Sales Invoice"):
frappe.throw(_("Invalid value {0} for 'Based On'").format(filters["based_on"]))
parent = frappe.qb.DocType(filters["based_on"])
child_doctype = "Sales Order Item" if filters["based_on"] == "Sales Order" else "Sales Invoice Item"
child = frappe.qb.DocType(child_doctype)
>>>>>>> bd0acf4413 (fix: sql injection)
date_diff = CustomFunction("DATEDIFF", ["d1", "d2"])
current_date = CustomFunction("CURRENT_DATE", [])