fix: Presentation currency conversion in reports (#27316)

(cherry picked from commit ceaa804f04)

# Conflicts:
#	erpnext/accounts/report/utils.py

erpnext/__init__.py

@@ -4,7 +4,7 @@ import frappe
 
 from erpnext.hooks import regional_overrides
 
-__version__ = "13.55.2"
+__version__ = "13.54.4"
 
 
 def get_default_company(user=None):

erpnext/accounts/doctype/pos_invoice/pos_invoice.py

@@ -704,7 +704,7 @@ def get_pos_reserved_qty(item_code, warehouse):
 	reserved_qty = (
 		frappe.qb.from_(p_inv)
 		.from_(p_item)
-		.select(Sum(p_item.qty).as_("qty"))
+		.select(Sum(p_item.stock_qty).as_("stock_qty"))
 		.where(
 			(p_inv.name == p_item.parent)
 			& (IfNull(p_inv.consolidated_invoice, "") == "")
@@ -715,7 +715,7 @@ def get_pos_reserved_qty(item_code, warehouse):
 		)
 	).run(as_dict=True)
 
-	return reserved_qty[0].qty or 0 if reserved_qty else 0
+	return flt(reserved_qty[0].stock_qty) if reserved_qty else 0
 
 
 @frappe.whitelist()

erpnext/accounts/report/utils.py

@@ -107,6 +107,7 @@ def convert_to_presentation_currency(gl_entries, currency_info, company):
 			if credit_in_account_currency:
 				entry["credit"] = credit_in_account_currency
 		else:
+<<<<<<< HEAD
 			date = currency_info["report_date"]
 			converted_debit_value = convert(debit, presentation_currency, company_currency, date)
 			converted_credit_value = convert(credit, presentation_currency, company_currency, date)
@@ -116,6 +117,17 @@ def convert_to_presentation_currency(gl_entries, currency_info, company):
 
 			if entry.get("credit"):
 				entry["credit"] = converted_credit_value
+=======
+			date = currency_info['report_date']
+			converted_debit_value = convert(debit, presentation_currency, company_currency, date)
+			converted_credit_value = convert(credit, presentation_currency, company_currency, date)
+
+			if entry.get('debit'):
+				entry['debit'] = converted_debit_value
+
+			if entry.get('credit'):
+				entry['credit'] = converted_credit_value
+>>>>>>> ceaa804f04 (fix: Presentation currency conversion in reports (#27316))
 
 		converted_gl_list.append(entry)