nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 07:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Improve validation message

Browse Source
This commit is contained in:
Deepesh Garg
2020-12-29 17:00:39 +05:30
parent 4a8c2c4cb5
commit e061004956
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/accounting_dimension_filter/test_accounting_dimension_filter.py
View File

@@ -17,14 +17,14 @@ class TestAccountingDimensionFilter(unittest.TestCase):
def test_allowed_dimension_validation(self): def test_allowed_dimension_validation(self):
si = create_sales_invoice(do_not_save=1) si = create_sales_invoice(do_not_save=1)
si.items[0].cost_center = 'Main - _TC' si.items[0].cost_center = 'Main - _TC'
si.location = 'Block 1' si.department = 'Accounts - _TC'
si.save() si.save()
self.assertRaises(InvalidAccountDimensionError, si.submit) self.assertRaises(InvalidAccountDimensionError, si.submit)
def test_mandatory_dimension_validation(self): def test_mandatory_dimension_validation(self):
si = create_sales_invoice(do_not_save=1) si = create_sales_invoice(do_not_save=1)
si.location = 'Block 1' si.department = ''
# Test with no department for Sales Account # Test with no department for Sales Account
si.items[0].department = '' si.items[0].department = ''
@@ -71,7 +71,7 @@ def create_accounting_dimension_filter():
}], }],
'dimensions': [{ 'dimensions': [{
'accounting_dimension': 'Department', 'accounting_dimension': 'Department',
'dimension_value': '_Test Department - _TC' 'dimension_value': 'Accounts - _TC'
}] }]
}).insert() }).insert()
else: else:

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

@@ -107,12 +107,12 @@ class GLEntry(Document):
if value['allow_or_restrict'] == 'Allow': if value['allow_or_restrict'] == 'Allow':
if self.get(dimension) and self.get(dimension) not in value['allowed_dimensions']: if self.get(dimension) and self.get(dimension) not in value['allowed_dimensions']:
frappe.throw(_("Invalid value {0} for account {1}").format( frappe.throw(_("Invalid value {0} for {1} against account {2}").format(
frappe.bold(self.get(dimension)), frappe.bold(self.account)), InvalidAccountDimensionError) frappe.bold(self.get(dimension)), frappe.bold(frappe.unscrub(dimension)), frappe.bold(self.account)), InvalidAccountDimensionError)
else: else:
if self.get(dimension) and self.get(dimension) in value['allowed_dimensions']: if self.get(dimension) and self.get(dimension) in value['allowed_dimensions']:
frappe.throw(_("Invalid value {0} for account {1}").format( frappe.throw(_("Invalid value {0} for {1} against account {2}").format(
frappe.bold(self.get(dimension)), frappe.bold(self.account)), InvalidAccountDimensionError) frappe.bold(self.get(dimension)), frappe.bold(frappe.unscrub(dimension)), frappe.bold(self.account)), InvalidAccountDimensionError)
def check_pl_account(self): def check_pl_account(self):
if self.is_opening=='Yes' and \ if self.is_opening=='Yes' and \