From c102e51eb18748b60f5793b23bd6dfd35b66835b Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Mon, 20 Jan 2025 12:41:28 +0530
Subject: [PATCH] fix: logical error in where condition of qb query

(cherry picked from commit 47f8a8600374a6a130c45c12e65f1cf11fa450e0)

# Conflicts:
#	erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
---
 erpnext/manufacturing/doctype/bom/bom.py           |  3 ++-
 .../landed_cost_taxes_and_charges.json             | 14 +++++++++++++-
 .../landed_cost_taxes_and_charges.py               |  1 +
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 53ec6fc1e8b..5d13471f541 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -1404,7 +1404,7 @@ def add_operations_cost(stock_entry, work_order=None, expense_account=None):
 		query = (
 			frappe.qb.from_(table)
 			.select(Sum(table.amount).as_("amount"))
-			.where(table.parent.isin(subquery) & (table.description == "Corrective Operation Cost"))
+			.where(table.parent.isin(subquery) & (table.has_corrective_cost == 1))
 		)
 		return query.run(as_dict=True)[0].amount or 0
 
@@ -1424,6 +1424,7 @@ def add_operations_cost(stock_entry, work_order=None, expense_account=None):
 			{
 				"expense_account": expense_account,
 				"description": "Corrective Operation Cost",
+				"has_corrective_cost": 1,
 				"amount": remaining_cc / max_qty * flt(stock_entry.fg_completed_qty),
 			},
 		)
diff --git a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
index 9c59c13ac07..2d5823d3d51 100644
--- a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
+++ b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
@@ -11,7 +11,8 @@
   "description",
   "col_break3",
   "amount",
-  "base_amount"
+  "base_amount",
+  "has_corrective_cost"
  ],
  "fields": [
   {
@@ -62,12 +63,23 @@
    "label": "Amount (Company Currency)",
    "options": "Company:company:default_currency",
    "read_only": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "has_corrective_cost",
+   "fieldtype": "Check",
+   "label": "Has Corrective Cost",
+   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2021-05-17 13:57:10.807980",
+=======
+ "modified": "2025-01-20 12:22:03.455762",
+>>>>>>> 47f8a86003 (fix: logical error in where condition of qb query)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Landed Cost Taxes and Charges",
diff --git a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.py b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.py
index 8509cb71d85..a3f7f037d60 100644
--- a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.py
+++ b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.py
@@ -20,6 +20,7 @@ class LandedCostTaxesandCharges(Document):
 		description: DF.SmallText
 		exchange_rate: DF.Float
 		expense_account: DF.Link | None
+		has_corrective_cost: DF.Check
 		parent: DF.Data
 		parentfield: DF.Data
 		parenttype: DF.Data