nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-15 12:55:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add company level validation for accounting dimension

Browse Source 
(cherry picked from commit 60efd3e219)
This commit is contained in:
Sugesh393
2025-01-17 11:41:52 +05:30
committed by Mergify
parent a718737931
commit 8f0d270746
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/accounting_dimension/accounting_dimension.json
View File

@@ -31,7 +31,8 @@
"label": "Reference Document Type", "label": "Reference Document Type",
"options": "DocType", "options": "DocType",
"read_only_depends_on": "eval:!doc.__islocal", "read_only_depends_on": "eval:!doc.__islocal",
"reqd": 1 "reqd": 1,
"search_index": 1
}, },
{ {
"default": "0", "default": "0",

37
erpnext/controllers/accounts_controller.py
View File

@@ -8,7 +8,7 @@ from collections import defaultdict
import frappe import frappe
from frappe import _, bold, qb, throw from frappe import _, bold, qb, throw
from frappe.model.workflow import get_workflow_name, is_transition_condition_satisfied from frappe.model.workflow import get_workflow_name, is_transition_condition_satisfied
from frappe.query_builder import Criterion from frappe.query_builder import Criterion, DocType
from frappe.query_builder.custom import ConstantColumn from frappe.query_builder.custom import ConstantColumn
from frappe.query_builder.functions import Abs, Sum from frappe.query_builder.functions import Abs, Sum
from frappe.utils import ( from frappe.utils import (
@@ -266,6 +266,7 @@ class AccountsController(TransactionBase):
self.set_total_in_words() self.set_total_in_words()
self.set_default_letter_head() self.set_default_letter_head()
self.validate_company_in_accounting_dimension()
def set_default_letter_head(self): def set_default_letter_head(self):
if hasattr(self, "letter_head") and not self.letter_head: if hasattr(self, "letter_head") and not self.letter_head:
@@ -403,6 +404,40 @@ class AccountsController(TransactionBase):
for row in batches: for row in batches:
frappe.delete_doc("Batch", row.name) frappe.delete_doc("Batch", row.name)
def validate_company_in_accounting_dimension(self):
doc_field = DocType("DocField")
accounting_dimension = DocType("Accounting Dimension")
query = (
frappe.qb.from_(accounting_dimension)
.select(accounting_dimension.document_type)
.join(doc_field)
.on(doc_field.parent == accounting_dimension.document_type)
.where(doc_field.fieldname == "company")
).run(as_list=True)
dimension_list = sum(query, ["Project"])
self.validate_company(dimension_list)
if childs := self.get_all_children():
for child in childs:
self.validate_company(dimension_list, child)
def validate_company(self, dimension_list, child=None):
for dimension in dimension_list:
if not child:
dimension_value = self.get(frappe.scrub(dimension))
else:
dimension_value = child.get(frappe.scrub(dimension))
if dimension_value:
company = frappe.get_cached_value(dimension, dimension_value, "company")
if company and company != self.company:
frappe.throw(
_("{0}: {1} does not belong to the Company: {2}").format(
dimension, frappe.bold(dimension_value), self.company
)
)
def validate_return_against_account(self): def validate_return_against_account(self):
if self.doctype in ["Sales Invoice", "Purchase Invoice"] and self.is_return and self.return_against: if self.doctype in ["Sales Invoice", "Purchase Invoice"] and self.is_return and self.return_against:
cr_dr_account_field = "debit_to" if self.doctype == "Sales Invoice" else "credit_to" cr_dr_account_field = "debit_to" if self.doctype == "Sales Invoice" else "credit_to"