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

Merge pull request #45302 from aerele/validate-dimensions-company

Browse Source 
feat: add company level validation for accounting dimension
This commit is contained in:
ruthra kumar
2025-01-27 14:53:49 +05:30
committed by GitHub
parent e88f96b92d 36bae55299
commit 49570a5544
5 changed files with 65 additions and 18 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",

1
erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
View File

@@ -4294,6 +4294,7 @@ class TestSalesInvoice(IntegrationTestCase):
si = create_sales_invoice(do_not_submit=True) si = create_sales_invoice(do_not_submit=True)
project = frappe.new_doc("Project") project = frappe.new_doc("Project")
project.company = "_Test Company"
project.project_name = "Test Total Billed Amount" project.project_name = "Test Total Billed Amount"
project.save() project.save()

36
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 (
@@ -269,6 +269,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:
@@ -407,6 +408,39 @@ 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")
dimension_list = (
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(dimension_list, ["Project"])
self.validate_company(dimension_list)
for child in self.get_all_children() or []:
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"

41
erpnext/controllers/tests/test_accounts_controller.py
View File

@@ -17,6 +17,7 @@ from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
from erpnext.accounts.party import get_party_account from erpnext.accounts.party import get_party_account
from erpnext.buying.doctype.purchase_order.test_purchase_order import prepare_data_for_internal_transfer from erpnext.buying.doctype.purchase_order.test_purchase_order import prepare_data_for_internal_transfer
from erpnext.projects.doctype.project.test_project import make_project
from erpnext.stock.doctype.item.test_item import create_item from erpnext.stock.doctype.item.test_item import create_item
@@ -1536,32 +1537,32 @@ class TestAccountsController(IntegrationTestCase):
# Invoices # Invoices
si1 = self.create_sales_invoice(qty=1, rate=rate_in_account_currency, do_not_submit=True) si1 = self.create_sales_invoice(qty=1, rate=rate_in_account_currency, do_not_submit=True)
si1.department = "Management" si1.department = "Management - _TC"
si1.save().submit() si1.save().submit()
si2 = self.create_sales_invoice(qty=1, rate=rate_in_account_currency, do_not_submit=True) si2 = self.create_sales_invoice(qty=1, rate=rate_in_account_currency, do_not_submit=True)
si2.department = "Operations" si2.department = "Operations - _TC"
si2.save().submit() si2.save().submit()
# Payments # Payments
cr_note1 = self.create_sales_invoice(qty=-1, conversion_rate=75, rate=1, do_not_save=True) cr_note1 = self.create_sales_invoice(qty=-1, conversion_rate=75, rate=1, do_not_save=True)
cr_note1.department = "Management" cr_note1.department = "Management - _TC"
cr_note1.is_return = 1 cr_note1.is_return = 1
cr_note1.save().submit() cr_note1.save().submit()
cr_note2 = self.create_sales_invoice(qty=-1, conversion_rate=75, rate=1, do_not_save=True) cr_note2 = self.create_sales_invoice(qty=-1, conversion_rate=75, rate=1, do_not_save=True)
cr_note2.department = "Legal" cr_note2.department = "Legal - _TC"
cr_note2.is_return = 1 cr_note2.is_return = 1
cr_note2.save().submit() cr_note2.save().submit()
pe1 = get_payment_entry(si1.doctype, si1.name) pe1 = get_payment_entry(si1.doctype, si1.name)
pe1.references = [] pe1.references = []
pe1.department = "Research & Development" pe1.department = "Research & Development - _TC"
pe1.save().submit() pe1.save().submit()
pe2 = get_payment_entry(si1.doctype, si1.name) pe2 = get_payment_entry(si1.doctype, si1.name)
pe2.references = [] pe2.references = []
pe2.department = "Management" pe2.department = "Management - _TC"
pe2.save().submit() pe2.save().submit()
je1 = self.create_journal_entry( je1 = self.create_journal_entry(
@@ -1574,7 +1575,7 @@ class TestAccountsController(IntegrationTestCase):
) )
je1.accounts[0].party_type = "Customer" je1.accounts[0].party_type = "Customer"
je1.accounts[0].party = self.customer je1.accounts[0].party = self.customer
je1.accounts[0].department = "Management" je1.accounts[0].department = "Management - _TC"
je1.save().submit() je1.save().submit()
# assert dimension filter's result # assert dimension filter's result
@@ -1583,17 +1584,17 @@ class TestAccountsController(IntegrationTestCase):
self.assertEqual(len(pr.invoices), 2) self.assertEqual(len(pr.invoices), 2)
self.assertEqual(len(pr.payments), 5) self.assertEqual(len(pr.payments), 5)
pr.department = "Legal" pr.department = "Legal - _TC"
pr.get_unreconciled_entries() pr.get_unreconciled_entries()
self.assertEqual(len(pr.invoices), 0) self.assertEqual(len(pr.invoices), 0)
self.assertEqual(len(pr.payments), 1) self.assertEqual(len(pr.payments), 1)
pr.department = "Management" pr.department = "Management - _TC"
pr.get_unreconciled_entries() pr.get_unreconciled_entries()
self.assertEqual(len(pr.invoices), 1) self.assertEqual(len(pr.invoices), 1)
self.assertEqual(len(pr.payments), 3) self.assertEqual(len(pr.payments), 3)
pr.department = "Research & Development" pr.department = "Research & Development - _TC"
pr.get_unreconciled_entries() pr.get_unreconciled_entries()
self.assertEqual(len(pr.invoices), 0) self.assertEqual(len(pr.invoices), 0)
self.assertEqual(len(pr.payments), 1) self.assertEqual(len(pr.payments), 1)
@@ -1604,17 +1605,17 @@ class TestAccountsController(IntegrationTestCase):
# Invoice # Invoice
si = self.create_sales_invoice(qty=1, rate=rate_in_account_currency, do_not_submit=True) si = self.create_sales_invoice(qty=1, rate=rate_in_account_currency, do_not_submit=True)
si.department = "Management" si.department = "Management - _TC"
si.save().submit() si.save().submit()
# Payment # Payment
cr_note = self.create_sales_invoice(qty=-1, conversion_rate=75, rate=1, do_not_save=True) cr_note = self.create_sales_invoice(qty=-1, conversion_rate=75, rate=1, do_not_save=True)
cr_note.department = "Management" cr_note.department = "Management - _TC"
cr_note.is_return = 1 cr_note.is_return = 1
cr_note.save().submit() cr_note.save().submit()
pr = self.create_payment_reconciliation() pr = self.create_payment_reconciliation()
pr.department = "Management" pr.department = "Management - _TC"
pr.get_unreconciled_entries() pr.get_unreconciled_entries()
self.assertEqual(len(pr.invoices), 1) self.assertEqual(len(pr.invoices), 1)
self.assertEqual(len(pr.payments), 1) self.assertEqual(len(pr.payments), 1)
@@ -1646,7 +1647,7 @@ class TestAccountsController(IntegrationTestCase):
# Sales Invoice in Foreign Currency # Sales Invoice in Foreign Currency
self.setup_dimensions() self.setup_dimensions()
rate_in_account_currency = 1 rate_in_account_currency = 1
dpt = "Research & Development" dpt = "Research & Development - _TC"
si = self.create_sales_invoice(qty=1, rate=rate_in_account_currency, do_not_save=True) si = self.create_sales_invoice(qty=1, rate=rate_in_account_currency, do_not_save=True)
si.department = dpt si.department = dpt
@@ -1681,7 +1682,7 @@ class TestAccountsController(IntegrationTestCase):
def test_93_dimension_inheritance_on_advance(self): def test_93_dimension_inheritance_on_advance(self):
self.setup_dimensions() self.setup_dimensions()
dpt = "Research & Development" dpt = "Research & Development - _TC"
adv = self.create_payment_entry(amount=1, source_exc_rate=85) adv = self.create_payment_entry(amount=1, source_exc_rate=85)
adv.department = dpt adv.department = dpt
@@ -2139,3 +2140,13 @@ class TestAccountsController(IntegrationTestCase):
journal_voucher = frappe.get_doc("Journal Entry", exc_je_for_pi[0].parent) journal_voucher = frappe.get_doc("Journal Entry", exc_je_for_pi[0].parent)
purchase_invoice = frappe.get_doc("Purchase Invoice", pi.name) purchase_invoice = frappe.get_doc("Purchase Invoice", pi.name)
self.assertEqual(purchase_invoice.advances[0].difference_posting_date, journal_voucher.posting_date) self.assertEqual(purchase_invoice.advances[0].difference_posting_date, journal_voucher.posting_date)
def test_company_validation_in_dimension(self):
si = create_sales_invoice(do_not_submit=True)
project = make_project({"project_name": "_Test Demo Project1", "company": "_Test Company 1"})
si.project = project.name
self.assertRaises(frappe.ValidationError, si.save)
si_1 = create_sales_invoice(do_not_submit=True)
si_1.items[0].project = project.name
self.assertRaises(frappe.ValidationError, si_1.save)

2
erpnext/projects/doctype/project/test_records.toml
View File

@@ -1,4 +1,4 @@
[[Project]] [[Project]]
project_name = "_Test Project" project_name = "_Test Project"
status = "Open" status = "Open"
company = "_Test Company"