nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 21:49:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50258 from barredterra/budget-msg

Browse Source 
refactor: error message in budget
This commit is contained in:
ruthra kumar
2025-11-03 10:15:05 +05:30
committed by GitHub
parent fdd0e39c91 71db348330
commit edf8f83a2a
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/budget/budget.py
View File

@@ -272,21 +272,19 @@ def compare_expense_with_budget(args, budget_amount, action_for, action, budget_
if total_expense > budget_amount: if total_expense > budget_amount:
if args.actual_expense > budget_amount: if args.actual_expense > budget_amount:
error_tense = _("is already")
diff = args.actual_expense - budget_amount diff = args.actual_expense - budget_amount
_msg = _("{0} Budget for Account {1} against {2} {3} is {4}. It is already exceeded by {5}.")
else: else:
error_tense = _("will be")
diff = total_expense - budget_amount diff = total_expense - budget_amount
_msg = _("{0} Budget for Account {1} against {2} {3} is {4}. It will be exceeded by {5}.")
currency = frappe.get_cached_value("Company", args.company, "default_currency") currency = frappe.get_cached_value("Company", args.company, "default_currency")
msg = _msg.format(
msg = _("{0} Budget for Account {1} against {2} {3} is {4}. It {5} exceed by {6}").format(
_(action_for), _(action_for),
frappe.bold(args.account), frappe.bold(args.account),
frappe.unscrub(args.budget_against_field), frappe.unscrub(args.budget_against_field),
frappe.bold(budget_against), frappe.bold(budget_against),
frappe.bold(fmt_money(budget_amount, currency=currency)), frappe.bold(fmt_money(budget_amount, currency=currency)),
error_tense,
frappe.bold(fmt_money(diff, currency=currency)), frappe.bold(fmt_money(diff, currency=currency)),
) )