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

fix: budget naming series (backport #48075) (#48080)

Browse Source 
* fix: budget naming series (#48075)

(cherry picked from commit c4bdf2a721)

# Conflicts:
#	erpnext/accounts/doctype/budget/budget.json

* chore: resolve conflict

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
This commit is contained in:
mergify[bot]
2025-06-17 11:21:54 +05:30
committed by GitHub
parent d054486495
commit 4d18fd0e80
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/doctype/budget/budget.json
View File

@@ -7,10 +7,10 @@
"editable_grid": 1, "editable_grid": 1,
"engine": "InnoDB", "engine": "InnoDB",
"field_order": [ "field_order": [
"naming_series",
"budget_against", "budget_against",
"company", "company",
"cost_center", "cost_center",
"naming_series",
"project", "project",
"fiscal_year", "fiscal_year",
"column_break_3", "column_break_3",
@@ -195,19 +195,19 @@
}, },
{ {
"fieldname": "naming_series", "fieldname": "naming_series",
"fieldtype": "Data", "fieldtype": "Select",
"hidden": 1,
"label": "Series", "label": "Series",
"no_copy": 1, "no_copy": 1,
"options": "BUDGET-.YYYY.-",
"print_hide": 1, "print_hide": 1,
"read_only": 1, "reqd": 1,
"set_only_once": 1 "set_only_once": 1
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2022-10-10 22:14:36.361509", "modified": "2025-06-16 15:57:13.114981",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Budget", "name": "Budget",
@@ -235,4 +235,4 @@
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"track_changes": 1 "track_changes": 1
} }

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

@@ -48,7 +48,7 @@ class Budget(Document):
cost_center: DF.Link | None cost_center: DF.Link | None
fiscal_year: DF.Link fiscal_year: DF.Link
monthly_distribution: DF.Link | None monthly_distribution: DF.Link | None
naming_series: DF.Data | None naming_series: DF.Literal["BUDGET-.YYYY.-"]
project: DF.Link | None project: DF.Link | None
# end: auto-generated types # end: auto-generated types
@@ -136,9 +136,6 @@ class Budget(Document):
): ):
self.applicable_on_booking_actual_expenses = 1 self.applicable_on_booking_actual_expenses = 1
def before_naming(self):
self.naming_series = f"{{{frappe.scrub(self.budget_against)}}}./.{self.fiscal_year}/.###"
def validate_expense_against_budget(args, expense_amount=0): def validate_expense_against_budget(args, expense_amount=0):
args = frappe._dict(args) args = frappe._dict(args)