schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: do not add actual expense twice for validating budget

Browse Source 
(cherry picked from commit af26ac96e9)
This commit is contained in:
Gursheen Anand
2024-03-29 17:22:48 +05:30
committed by Mergify
parent e8accd0256
commit ec4f07fd60
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -273,12 +273,10 @@ def get_amount(args, budget):
amount = 0 amount = 0
if args.get("doctype") == "Material Request" and budget.for_material_request: if args.get("doctype") == "Material Request" and budget.for_material_request:
amount = ( amount = get_requested_amount(args, budget) + get_ordered_amount(args, budget)
get_requested_amount(args, budget) + get_ordered_amount(args, budget) + get_actual_expense(args)
)
elif args.get("doctype") == "Purchase Order" and budget.for_purchase_order: elif args.get("doctype") == "Purchase Order" and budget.for_purchase_order:
amount = get_ordered_amount(args, budget) + get_actual_expense(args) amount = get_ordered_amount(args, budget)
return amount return amount