fix: Tax Breakup table headers fix (#27596)

(cherry picked from commit 0ff7367f39)

# Conflicts:
#	erpnext/regional/india/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/regional/india/utils.py

@@ -156,11 +156,15 @@ def validate_gstin_check_digit(gstin, label="GSTIN"):
 
 
 def get_itemised_tax_breakup_header(item_doctype, tax_accounts):
+<<<<<<< HEAD
 	hsn_wise_in_gst_settings = frappe.db.get_single_value("GST Settings", "hsn_wise_tax_breakup")
 	if frappe.get_meta(item_doctype).has_field("gst_hsn_code") and hsn_wise_in_gst_settings:
 		return [_("HSN/SAC"), _("Taxable Amount")] + tax_accounts
 	else:
 		return [_("Item"), _("Taxable Amount")] + tax_accounts
+=======
+	return [_("Item"), _("Taxable Amount")] + tax_accounts
+>>>>>>> 0ff7367f39 (fix: Tax Breakup table headers fix (#27596))
 
 
 def get_itemised_tax_breakup_data(doc, account_wise=False, hsn_wise=False):