Merge pull request #56394 from mihir-kandoi/pg-revert-3-commits

Revert 3 Postgres-parity commits (bom variant lookup, traceability div-by-zero, POS NULL ordering)

erpnext/manufacturing/doctype/bom/bom.py

@@ -1403,18 +1403,16 @@ def validate_bom_no(item, bom_no):
 
 
 def _bom_contains_item(bom, item):
-	item_lower = item.lower()
+	item = item.lower()
 	for d in bom.items:
-		if d.item_code.lower() == item_lower:
+		if d.item_code.lower() == item:
 			return True
 	for d in bom.secondary_items:
-		if d.item_code.lower() == item_lower:
+		if d.item_code.lower() == item:
 			return True
 
-	# Use the original-cased `item` for the Item lookup: names are case-sensitive on Postgres,
-	# so a lowercased name would miss the record and drop the variant->template BOM match.
 	return (
-		bom.item.lower() == item_lower
+		bom.item.lower() == item
 		or bom.item.lower() == cstr(frappe.db.get_value("Item", item, "variant_of")).lower()
 	)
 

erpnext/selling/page/point_of_sale/point_of_sale.py

@@ -6,7 +6,6 @@ import json
 
 import frappe
 from frappe.query_builder import Criterion, DocType, Order
-from frappe.query_builder.functions import Coalesce
 from frappe.utils import cint, get_datetime
 from frappe.utils.nestedset import get_root_of
 
@@ -232,10 +231,7 @@ def get_items(
 			.where(ItemPrice.selling == 1)
 			.where((ItemPrice.valid_from <= current_date) | (ItemPrice.valid_from.isnull()))
 			.where((ItemPrice.valid_upto >= current_date) | (ItemPrice.valid_upto.isnull()))
-			# Coalesce so a NULL valid_from (open-ended base price) sorts last under DESC on both
-			# engines: MariaDB already sorts NULL last for DESC, Postgres defaults to NULLS FIRST, which
-			# would otherwise make the base price win the positional pick over a dated override.
-			.orderby(Coalesce(ItemPrice.valid_from, "1900-01-01"), order=Order.desc)
+			.orderby(ItemPrice.valid_from, order=Order.desc)
 		).run(as_dict=True)
 
 		stock_uom_price = next((d for d in item_prices if d.get("uom") == item.stock_uom), {})

erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py

@@ -4,7 +4,6 @@
 import frappe
 from frappe import _
 from frappe.query_builder import Case
-from frappe.query_builder.functions import NullIf
 
 
 def execute(filters: dict | None = None):
@@ -301,12 +300,9 @@ class ReportData:
 				(
 					(
 						stock_entry_detail.qty
-						/ NullIf(
-							Case()
-							.when(stock_entry.fg_completed_qty > 0, stock_entry.fg_completed_qty)
-							.else_(sabb_data.qty),
-							0,
-						)
+						/ Case()
+						.when(stock_entry.fg_completed_qty > 0, stock_entry.fg_completed_qty)
+						.else_(sabb_data.qty)
 					)
 					* sabb_data.qty
 				).as_("qty"),