fix: fixing Item-wise sales register #41373

(cherry picked from commit eafa88b8e9)

# Conflicts:
#	erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
(cherry picked from commit 5e0fa1b75e)

erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py

@@ -371,7 +371,6 @@ def get_items(filters, additional_query_columns):
 		frappe.qb.from_(pi)
 		.join(pii)
 		.on(pi.name == pii.parent)
-		# added left join
 		.left_join(Item)
 		.on(pii.item_code == Item.name)
 		.select(

erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py

@@ -388,6 +388,7 @@ def get_group_by_conditions(filters, doctype):
 		return "ORDER BY `tab{}`.{}".format(doctype, frappe.scrub(filters.get("group_by")))
 
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 def get_items(filters, additional_query_columns, additional_conditions=None):
 	conditions = get_conditions(filters, additional_conditions)
@@ -455,14 +456,71 @@ def get_items(filters, additional_query_columns,additional_conditions=None):
     )
     if filters.get("customer"):
         query = query.where(si.customer == filters['customer'])
+=======
+def get_items(filters, additional_query_columns, additional_conditions=None):
+	si = frappe.qb.DocType("Sales Invoice")
+	sii = frappe.qb.DocType("Sales Invoice Item")
+	Item = frappe.qb.DocType("Item")
+>>>>>>> eafa88b8e9 (fix: fixing Item-wise sales register #41373)
 
-    if filters.get("customer_group"):
+	query = (
-        query = query.where(si.customer_group == filters['customer_group'])
+		frappe.qb.from_(si)
-    
+		.join(sii)
-    return query.run(as_dict=True)
+		.on(si.name == sii.parent)
+		# added left join
+		.left_join(Item)
+		.on(sii.item_code == Item.name)
+		.select(
+			sii.name,
+			sii.parent,
+			si.posting_date,
+			si.debit_to,
+			si.unrealized_profit_loss_account,
+			si.is_internal_customer,
+			si.customer,
+			si.remarks,
+			si.territory,
+			si.company,
+			si.base_net_total,
+			sii.project,
+			sii.item_code,
+			sii.description,
+			sii.item_name,
+			sii.item_group,
+			sii.item_name.as_("si_item_name"),
+			sii.item_group.as_("si_item_group"),
+			Item.item_name.as_("i_item_name"),
+			Item.item_group.as_("i_item_group"),
+			sii.sales_order,
+			sii.delivery_note,
+			sii.income_account,
+			sii.cost_center,
+			sii.enable_deferred_revenue,
+			sii.deferred_revenue_account,
+			sii.stock_qty,
+			sii.stock_uom,
+			sii.base_net_rate,
+			sii.base_net_amount,
+			si.customer_name,
+			si.customer_group,
+			sii.so_detail,
+			si.update_stock,
+			sii.uom,
+			sii.qty,
+		)
+		.where(si.docstatus == 1)
+	)
+	if filters.get("customer"):
+		query = query.where(si.customer == filters["customer"])
 
+	if filters.get("customer_group"):
+		query = query.where(si.customer_group == filters["customer_group"])
 
+<<<<<<< HEAD
 >>>>>>> 1b45ecfcae (fix: Item-wise Sales and Purchase register with no item codes #41373)
+=======
+	return query.run(as_dict=True)
+>>>>>>> eafa88b8e9 (fix: fixing Item-wise sales register #41373)
 
 
 def get_delivery_notes_against_sales_order(item_list):

erpnext/accounts/report/purchase_register/purchase_register.py

@@ -377,7 +377,7 @@ def get_account_columns(invoice_list, include_payments):
 def get_invoices(filters, additional_query_columns):
 	pi = frappe.qb.DocType("Purchase Invoice")
 	query = (
-		frappe.qb.from_(pi)
+		frappe.qb.from_(pi)  # qb
 		.select(
 			ConstantColumn("Purchase Invoice").as_("doctype"),
 			pi.name,
@@ -395,7 +395,7 @@ def get_invoices(filters, additional_query_columns):
 			pi.outstanding_amount,
 			pi.mode_of_payment,
 		)
-		.where((pi.docstatus == 1))
+		.where(pi.docstatus == 1)
 		.orderby(pi.posting_date, pi.name, order=Order.desc)
 	)
 

erpnext/accounts/report/sales_register/sales_register.py

@@ -415,7 +415,7 @@ def get_account_columns(invoice_list, include_payments):
 def get_invoices(filters, additional_query_columns):
 	si = frappe.qb.DocType("Sales Invoice")
 	query = (
-		frappe.qb.from_(si)
+		frappe.qb.from_(si)  # qb
 		.select(
 			ConstantColumn("Sales Invoice").as_("doctype"),
 			si.name,
@@ -437,7 +437,7 @@ def get_invoices(filters, additional_query_columns):
 			si.represents_company,
 			si.company,
 		)
-		.where((si.docstatus == 1))
+		.where(si.docstatus == 1)
 		.orderby(si.posting_date, si.name, order=Order.desc)
 	)