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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2025-04-08 11:13:44 +05:30
parent f26b22ee7f
commit db8cb70bd8
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/report/purchase_register/purchase_register.py
View File

@@ -412,16 +412,6 @@ def get_invoices(filters, additional_query_columns):
filters, query, doctype="Purchase Invoice", child_doctype="Purchase Invoice Item" 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 from frappe.desk.reportview import build_match_conditions
query, params = query.walk() query, params = query.walk()
@@ -433,7 +423,6 @@ def get_invoices(filters, additional_query_columns):
query += " order by posting_date desc, name desc" query += " order by posting_date desc, name desc"
return frappe.db.sql(query, params, as_dict=True) return frappe.db.sql(query, params, as_dict=True)
>>>>>>> f4bc1dfd00 (fix: user permissions in sales and purchase report)
def get_conditions(filters, query, doctype): def get_conditions(filters, query, doctype):