ext/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-10-29 22:57:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(accounts): include all items in budget commitments

Browse Source
This commit is contained in:
pandiyan
2026-10-26 13:05:40 +05:30
parent 4ef6cba70b
commit 50b813154d
1 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
erpnext/accounts/doctype/budget/budget.py
+33 -25
View File
@@ -269,7 +269,7 @@ def compare_expense_with_budget(args, budget_amount, action_for, action, budget_
total_expense = args.actual_expense + amount
if total_expense > budget_amount:
if flt(total_expense - budget_amount, frappe.get_precision("Budget Account", "budget_amount")) > 0:
if args.actual_expense > budget_amount:
error_tense = _("is already")
diff = args.actual_expense - budget_amount
@@ -344,7 +344,6 @@ def get_expense_breakup(args, currency, budget_against):
"docstatus": 1,
"material_request_type": "Purchase",
"schedule_date": [["fiscal year", "2023-2024"]],
"item_code": args.item_code,
"per_ordered": [["<", 100]],
}
),
@@ -366,7 +365,6 @@ def get_expense_breakup(args, currency, budget_against):
"status": [["!=", "Closed"]],
"docstatus": 1,
"transaction_date": [["fiscal year", "2023-2024"]],
"item_code": args.item_code,
"per_billed": [["<", 100]],
}
),
@@ -394,17 +392,28 @@ def get_actions(args, budget):
return yearly_action, monthly_action
def get_requested_amount(args):
item_code = args.get("item_code")
condition = get_other_condition(args, "Material Request")
def get_requested_amount(params):
child = frappe.qb.DocType("Material Request Item")
parent = frappe.qb.DocType("Material Request")
data = frappe.db.sql(
""" select ifnull((sum(child.stock_qty - child.ordered_qty) * rate), 0) as amount
from `tabMaterial Request Item` child, `tabMaterial Request` parent where parent.name = child.parent and
child.item_code = %s and parent.docstatus = 1 and child.stock_qty > child.ordered_qty and {} and
parent.material_request_type = 'Purchase' and parent.status != 'Stopped'""".format(condition),
item_code,
as_list=1,
data = (
frappe.qb.from_(child)
.join(parent)
.on(parent.name == child.parent)
.select(
# rate inside the aggregate: Sum(qty * rate) is the correct requested amount and is PG-valid
Coalesce(
Sum((child.stock_qty - child.ordered_qty) * child.rate / child.conversion_factor), 0
).as_("amount")
)
.where(
(parent.docstatus == 1)
& (child.stock_qty > child.ordered_qty)
& Criterion.all(get_other_condition(params, child, parent, "Material Request"))
& (parent.material_request_type == "Purchase")
& (parent.status != "Stopped")
)
.run(as_list=1)
)
return data[0][0] if data else 0
@@ -415,7 +424,6 @@ def get_ordered_amount(params):
parent = frappe.qb.DocType("Purchase Order")
conditions = [
child.item_code == params.get("item_code"),
parent.docstatus == 1,
child.amount > child.billed_amt,
parent.status != "Closed",
@@ -448,22 +456,22 @@ def get_ordered_amount(params):
return data[0][0] if data else 0
def get_other_condition(args, for_doc):
condition = f"expense_account = {frappe.db.escape(args.expense_account)}"
budget_against_field = args.get("budget_against_field")
def get_other_condition(params, child, parent, for_doc):
conditions = [child.expense_account == params.expense_account]
budget_against_field = params.get("budget_against_field")
if budget_against_field and args.get(budget_against_field):
condition += f" and child.{budget_against_field} = {frappe.db.escape(args.get(budget_against_field))}"
if budget_against_field and params.get(budget_against_field):
conditions.append(child[budget_against_field] == params.get(budget_against_field))
if args.get("fiscal_year"):
date_field = "schedule_date" if for_doc == "Material Request" else "transaction_date"
date_field = "schedule_date" if for_doc == "Material Request" else "transaction_date"
if params.get("fiscal_year"):
start_date, end_date = frappe.get_cached_value(
"Fiscal Year", args.get("fiscal_year"), ["year_start_date", "year_end_date"]
"Fiscal Year", params.fiscal_year, ["year_start_date", "year_end_date"]
)
conditions.append(parent[date_field][str(start_date) : str(end_date)])
condition += f" and parent.{date_field} between {frappe.db.escape(str(start_date))} and {frappe.db.escape(str(end_date))}"
return condition
return conditions
def get_actual_expense(args):