chore: resolve conflicts

erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py

@@ -293,18 +293,6 @@ def apply_conditions(query, pi, pii, filters):
 		if filters.get(opts):
 			query = query.where(pi[opts] == filters[opts])
 
-<<<<<<< HEAD
-	for opts in (
-		("company", " and `tabPurchase Invoice`.company=%(company)s"),
-		("supplier", " and `tabPurchase Invoice`.supplier = %(supplier)s"),
-		("item_code", " and `tabPurchase Invoice Item`.item_code = %(item_code)s"),
-		("from_date", " and `tabPurchase Invoice`.posting_date>=%(from_date)s"),
-		("to_date", " and `tabPurchase Invoice`.posting_date<=%(to_date)s"),
-		("mode_of_payment", " and ifnull(mode_of_payment, '') = %(mode_of_payment)s"),
-	):
-		if filters.get(opts[0]):
-			conditions += opts[1]
-=======
 	if filters.get("from_date"):
 		query = query.where(pi.posting_date >= filters.get("from_date"))
 
@@ -313,7 +301,6 @@ def apply_conditions(query, pi, pii, filters):
 
 	if filters.get("item_group"):
 		query = query.where(pii.item_group == filters.get("item_group"))
->>>>>>> d2af36e1eb (chore: update condition queries in qb)
 
 	if not filters.get("group_by"):
 		query = query.orderby(pi.posting_date, order=Order.desc)
@@ -324,63 +311,7 @@ def apply_conditions(query, pi, pii, filters):
 	return query
 
 
-<<<<<<< HEAD
-def get_items(filters, additional_query_columns):
-<<<<<<< HEAD
-<<<<<<< HEAD
-	conditions = get_conditions(filters)
-	if additional_query_columns:
-		additional_query_columns = "," + ",".join(additional_query_columns)
-	return frappe.db.sql(
-		"""
-		select
-			`tabPurchase Invoice Item`.`name`, `tabPurchase Invoice Item`.`parent`,
-			`tabPurchase Invoice`.posting_date, `tabPurchase Invoice`.credit_to, `tabPurchase Invoice`.company,
-			`tabPurchase Invoice`.supplier, `tabPurchase Invoice`.remarks, `tabPurchase Invoice`.base_net_total,
-			`tabPurchase Invoice`.unrealized_profit_loss_account,
-			`tabPurchase Invoice Item`.`item_code`, `tabPurchase Invoice Item`.description,
-			`tabPurchase Invoice Item`.`item_name` as pi_item_name, `tabPurchase Invoice Item`.`item_group`
-			,`tabPurchase Invoice Item`.`item_group` as pi_item_group,
-			`tabItem`.`item_name` as i_item_name, `tabItem`.`item_group` as i_item_group,
-			`tabPurchase Invoice Item`.`project`, `tabPurchase Invoice Item`.`purchase_order`,
-			`tabPurchase Invoice Item`.`purchase_receipt`, `tabPurchase Invoice Item`.`po_detail`,
-			`tabPurchase Invoice Item`.`expense_account`, `tabPurchase Invoice Item`.`stock_qty`,
-			`tabPurchase Invoice Item`.`stock_uom`, `tabPurchase Invoice Item`.`base_net_amount`,
-			`tabPurchase Invoice`.`supplier_name`, `tabPurchase Invoice`.`mode_of_payment` {}
-		from `tabPurchase Invoice`, `tabPurchase Invoice Item`, `tabItem`
-		where `tabPurchase Invoice`.name = `tabPurchase Invoice Item`.`parent` and
-			`tabItem`.name = `tabPurchase Invoice Item`.`item_code` and
-			`tabPurchase Invoice`.docstatus = 1 {}
-	""".format(additional_query_columns, conditions),
-		filters,
-		as_dict=1,
-	)
-=======
-    pi = frappe.qb.DocType('Purchase Invoice')
-    pii = frappe.qb.DocType('Purchase Invoice Item')
-    Item = frappe.qb.DocType('Item')
-    query = (frappe.qb.from_(pi)
-             .join(pii).on(pi.name == pii.parent)  
-             .left_join(Item).on(pii.item_code == Item.name) 
-             .select(
-                 pii.name.as_('pii_name'), pii.parent,
-                 pi.posting_date, pi.credit_to, pi.company,
-                 pi.supplier, pi.remarks, pi.base_net_total,
-                 pi.unrealized_profit_loss_account,
-                 pii.item_code, pii.description, pii.item_group,
-                 pii.item_name.as_('pi_item_name'), pii.item_group.as_('pi_item_group'),
-                 Item.item_name.as_('i_item_name'), Item.item_group.as_('i_item_group'),
-                 pii.project, pii.purchase_order,
-                 pii.purchase_receipt, pii.po_detail,
-                 pii.expense_account, pii.stock_qty,
-                 pii.stock_uom, pii.base_net_amount,
-                 pi.supplier_name, pi.mode_of_payment
-             )
-             .where(pi.docstatus == 1))
-=======
-=======
 def get_items(filters, additional_table_columns):
->>>>>>> 8ec364df6f (fix: Add additional condition application)
 	pi = frappe.qb.DocType("Purchase Invoice")
 	pii = frappe.qb.DocType("Purchase Invoice Item")
 	Item = frappe.qb.DocType("Item")
@@ -420,20 +351,12 @@ def get_items(filters, additional_table_columns):
 		)
 		.where(pi.docstatus == 1)
 	)
->>>>>>> 76073ae228 (fix: fixing Item-wise sales register and purchase register #41373)
 
 	if filters.get("supplier"):
 		query = query.where(pi.supplier == filters["supplier"])
 	if filters.get("company"):
 		query = query.where(pi.company == filters["company"])
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> 1b45ecfcae (fix: Item-wise Sales and Purchase register with no item codes #41373)
-=======
-=======
-=======
 	if additional_table_columns:
 		for column in additional_table_columns:
 			if column.get("_doctype"):
@@ -442,12 +365,9 @@ def get_items(filters, additional_table_columns):
 			else:
 				query = query.select(pi[column.get("fieldname")])
 
->>>>>>> 8ec364df6f (fix: Add additional condition application)
 	query = apply_conditions(query, pi, pii, filters)
 
->>>>>>> d2af36e1eb (chore: update condition queries in qb)
 	return query.run(as_dict=True)
->>>>>>> 76073ae228 (fix: fixing Item-wise sales register and purchase register #41373)
 
 
 def get_aii_accounts():

erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py

@@ -84,9 +84,7 @@ def _execute(filters=None, additional_table_columns=None, additional_conditions=
 			"company": d.company,
 			"sales_order": d.sales_order,
 			"delivery_note": d.delivery_note,
-			"income_account": d.unrealized_profit_loss_account
-			if d.is_internal_customer == 1
-			else d.income_account,
+			"income_account": get_income_account(d),
 			"cost_center": d.cost_center,
 			"stock_qty": d.stock_qty,
 			"stock_uom": d.stock_uom,
@@ -151,6 +149,15 @@ def _execute(filters=None, additional_table_columns=None, additional_conditions=
 	return columns, data, None, None, None, skip_total_row
 
 
+def get_income_account(row):
+	if row.enable_deferred_revenue:
+		return row.deferred_revenue_account
+	elif row.is_internal_customer == 1:
+		return row.unrealized_profit_loss_account
+	else:
+		return row.income_account
+
+
 def get_columns(additional_table_columns, filters):
 	columns = []
 
@@ -367,8 +374,6 @@ def apply_conditions(query, si, sii, filters, additional_conditions=None):
 	if filters.get("item_group"):
 		query = query.where(sii.item_group == filters.get("item_group"))
 
-<<<<<<< HEAD
-=======
 	if filters.get("income_account"):
 		query = query.where(
 			(sii.income_account == filters.get("income_account"))
@@ -376,7 +381,6 @@ def apply_conditions(query, si, sii, filters, additional_conditions=None):
 			| (si.unrealized_profit_loss_account == filters.get("income_account"))
 		)
 
->>>>>>> d2af36e1eb (chore: update condition queries in qb)
 	if not filters.get("group_by"):
 		query = query.orderby(si.posting_date, order=Order.desc)
 		query = query.orderby(sii.item_group, order=Order.desc)
@@ -402,84 +406,10 @@ def apply_group_by_conditions(query, si, ii, filters):
 	return query
 
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-def get_items(filters, additional_query_columns, additional_conditions=None):
-	conditions = get_conditions(filters, additional_conditions)
-	if additional_query_columns:
-		additional_query_columns = "," + ",".join(additional_query_columns)
-	return frappe.db.sql(
-		"""
-		select
-			`tabSales Invoice Item`.name, `tabSales Invoice Item`.parent,
-			`tabSales Invoice`.posting_date, `tabSales Invoice`.debit_to,
-			`tabSales Invoice`.unrealized_profit_loss_account,
-			`tabSales Invoice`.is_internal_customer,
-			`tabSales Invoice`.customer, `tabSales Invoice`.remarks,
-			`tabSales Invoice`.territory, `tabSales Invoice`.company, `tabSales Invoice`.base_net_total,
-			`tabSales Invoice Item`.project,
-			`tabSales Invoice Item`.item_code, `tabSales Invoice Item`.description,
-			`tabSales Invoice Item`.`item_name`, `tabSales Invoice Item`.`item_group`,
-			`tabSales Invoice Item`.`item_name` as si_item_name, `tabSales Invoice Item`.`item_group` as si_item_group,
-			`tabItem`.`item_name` as i_item_name, `tabItem`.`item_group` as i_item_group,
-			`tabSales Invoice Item`.sales_order, `tabSales Invoice Item`.delivery_note,
-			`tabSales Invoice Item`.income_account, `tabSales Invoice Item`.cost_center,
-			`tabSales Invoice Item`.stock_qty, `tabSales Invoice Item`.stock_uom,
-			`tabSales Invoice Item`.base_net_rate, `tabSales Invoice Item`.base_net_amount,
-			`tabSales Invoice`.customer_name, `tabSales Invoice`.customer_group, `tabSales Invoice Item`.so_detail,
-			`tabSales Invoice`.update_stock, `tabSales Invoice Item`.uom, `tabSales Invoice Item`.qty {}
-		from `tabSales Invoice`, `tabSales Invoice Item`, `tabItem`
-		where `tabSales Invoice`.name = `tabSales Invoice Item`.parent and
-			`tabItem`.name = `tabSales Invoice Item`.`item_code` and
-			`tabSales Invoice`.docstatus = 1 {}
-		""".format(additional_query_columns, conditions),
-		filters,
-		as_dict=1,
-	)  # nosec
-=======
-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')
-    
-    query = (
-        frappe.qb.from_(si)
-        .join(sii).on(si.name == sii.parent)  
-        .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'])
-=======
 def get_items(filters, additional_query_columns, additional_conditions=None):
 	si = frappe.qb.DocType("Sales Invoice")
 	sii = frappe.qb.DocType("Sales Invoice Item")
-<<<<<<< HEAD
-	Item = frappe.qb.DocType("Item")
->>>>>>> eafa88b8e9 (fix: fixing Item-wise sales register #41373)
-=======
 	item = frappe.qb.DocType("Item")
->>>>>>> d2af36e1eb (chore: update condition queries in qb)
 
 	query = (
 		frappe.qb.from_(si)
@@ -542,16 +472,9 @@ def get_items(filters, additional_query_columns, additional_conditions=None):
 	if filters.get("customer_group"):
 		query = query.where(si.customer_group == filters["customer_group"])
 
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> 1b45ecfcae (fix: Item-wise Sales and Purchase register with no item codes #41373)
-=======
-=======
 	query = apply_conditions(query, si, sii, filters, additional_conditions)
 
->>>>>>> d2af36e1eb (chore: update condition queries in qb)
 	return query.run(as_dict=True)
->>>>>>> eafa88b8e9 (fix: fixing Item-wise sales register #41373)
 
 
 def get_delivery_notes_against_sales_order(item_list):