From db8cb70bd81534629148994a261b387926ec43bf Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 8 Apr 2025 11:13:44 +0530 Subject: [PATCH] chore: resolve conflict --- .../report/purchase_register/purchase_register.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/erpnext/accounts/report/purchase_register/purchase_register.py b/erpnext/accounts/report/purchase_register/purchase_register.py index 2a3356e0131..f56717c8d0b 100644 --- a/erpnext/accounts/report/purchase_register/purchase_register.py +++ b/erpnext/accounts/report/purchase_register/purchase_register.py @@ -412,16 +412,6 @@ def get_invoices(filters, additional_query_columns): filters, query, doctype="Purchase Invoice", child_doctype="Purchase Invoice Item" ) -<<<<<<< HEAD - invoices = query.run(as_dict=True) - return invoices -======= - if filters.get("include_payments"): - party_account = get_party_account( - "Supplier", filters.get("supplier"), filters.get("company"), include_advance=True - ) - query = query.where(pi.credit_to.isin(party_account)) - from frappe.desk.reportview import build_match_conditions query, params = query.walk() @@ -433,7 +423,6 @@ def get_invoices(filters, additional_query_columns): query += " order by posting_date desc, name desc" return frappe.db.sql(query, params, as_dict=True) ->>>>>>> f4bc1dfd00 (fix: user permissions in sales and purchase report) def get_conditions(filters, query, doctype):