fix: update default KSA VAT rate for setup (#27614)

(cherry picked from commit abded895f3)

# Conflicts:
#	erpnext/setup/setup_wizard/data/country_wise_tax.json

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/setup/setup_wizard/data/country_wise_tax.json

@@ -2121,10 +2121,13 @@
 		"KSA VAT 15%": {
 			"account_name": "VAT 15%",
 			"tax_rate": 15.00
+<<<<<<< HEAD
 		},
 		"KSA VAT 5%": {
 			"account_name": "VAT 5%",
 			"tax_rate": 5.00
+=======
+>>>>>>> abded895f3 (fix: update default KSA VAT rate for setup (#27614))
 		},
 		"KSA VAT Zero": {
 			"account_name": "VAT Zero",