fix: fixing Item-wise sales register

frappe · May 10, 2024 · c90185f · c90185f
1 parent 92673d7
commit c90185f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/erpnext/accounts/report/purchase_register/purchase_register.py b/erpnext/accounts/report/purchase_register/purchase_register.py
@@ -376,8 +376,10 @@ def get_account_columns(invoice_list, include_payments):
 
 def get_invoices(filters, additional_query_columns):
 	pi = frappe.qb.DocType("Purchase Invoice")
+	pii = frappe.qb.DocType("Purchase Invoice Item") 
 	query = (
 		frappe.qb.from_(pi)
+		.left_join(pii).on(pi.name == pii.parent)
 		.select(
 			ConstantColumn("Purchase Invoice").as_("doctype"),
 			pi.name,
@@ -386,7 +388,7 @@ def get_invoices(filters, additional_query_columns):
 			pi.supplier,
 			pi.supplier_name,
 			pi.tax_id,
-			pi.bill_no,
+			pi.bill_no,	
 			pi.bill_date,
 			pi.remarks,
 			pi.base_net_total,
@@ -395,7 +397,7 @@ def get_invoices(filters, additional_query_columns):
 			pi.outstanding_amount,
 			pi.mode_of_payment,
 		)
-		.where(pi.docstatus == 1)
+		.where((pi.docstatus == 1) & pii.item_code.isnotnull())
 		.orderby(pi.posting_date, pi.name, order=Order.desc)
 	)
 

diff --git a/erpnext/accounts/report/sales_register/sales_register.py b/erpnext/accounts/report/sales_register/sales_register.py
@@ -414,9 +414,11 @@ def get_account_columns(invoice_list, include_payments):
 
 def get_invoices(filters, additional_query_columns):
 	si = frappe.qb.DocType("Sales Invoice")
+	sii = frappe.qb.DocType("Sales Invoice Item")
 	query = (
 		frappe.qb.from_(si)
-		.select(
+		.left_join(sii).on(si.name == sii.parent)
+		.select(	
 			ConstantColumn("Sales Invoice").as_("doctype"),
 			si.name,
 			si.posting_date,
@@ -437,7 +439,7 @@ def get_invoices(filters, additional_query_columns):
 			si.represents_company,
 			si.company,
 		)
-		.where(si.docstatus == 1)
+		.where((si.docstatus == 1) & sii.item_code.isnotnull())
 		.orderby(si.posting_date, si.name, order=Order.desc)
 	)