fix: logical error in where condition of qb query

This commit is contained in:
Mihir Kandoi
2025-01-20 12:41:28 +05:30
parent 063a205e5a
commit 47f8a86003
3 changed files with 13 additions and 3 deletions

View File

@@ -1466,7 +1466,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
@@ -1486,6 +1486,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),
},
)

View File

@@ -11,7 +11,8 @@
"description",
"col_break3",
"amount",
"base_amount"
"base_amount",
"has_corrective_cost"
],
"fields": [
{
@@ -62,12 +63,19 @@
"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": [],
"modified": "2024-03-27 13:09:59.493991",
"modified": "2025-01-20 12:22:03.455762",
"modified_by": "Administrator",
"module": "Stock",
"name": "Landed Cost Taxes and Charges",

View File

@@ -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