fix: Improve validation message
This commit is contained in:
parent
4a8c2c4cb5
commit
e061004956
@ -17,14 +17,14 @@ class TestAccountingDimensionFilter(unittest.TestCase):
|
||||
def test_allowed_dimension_validation(self):
|
||||
si = create_sales_invoice(do_not_save=1)
|
||||
si.items[0].cost_center = 'Main - _TC'
|
||||
si.location = 'Block 1'
|
||||
si.department = 'Accounts - _TC'
|
||||
si.save()
|
||||
|
||||
self.assertRaises(InvalidAccountDimensionError, si.submit)
|
||||
|
||||
def test_mandatory_dimension_validation(self):
|
||||
si = create_sales_invoice(do_not_save=1)
|
||||
si.location = 'Block 1'
|
||||
si.department = ''
|
||||
|
||||
# Test with no department for Sales Account
|
||||
si.items[0].department = ''
|
||||
@ -71,7 +71,7 @@ def create_accounting_dimension_filter():
|
||||
}],
|
||||
'dimensions': [{
|
||||
'accounting_dimension': 'Department',
|
||||
'dimension_value': '_Test Department - _TC'
|
||||
'dimension_value': 'Accounts - _TC'
|
||||
}]
|
||||
}).insert()
|
||||
else:
|
||||
|
@ -107,12 +107,12 @@ class GLEntry(Document):
|
||||
|
||||
if value['allow_or_restrict'] == 'Allow':
|
||||
if self.get(dimension) and self.get(dimension) not in value['allowed_dimensions']:
|
||||
frappe.throw(_("Invalid value {0} for account {1}").format(
|
||||
frappe.bold(self.get(dimension)), frappe.bold(self.account)), InvalidAccountDimensionError)
|
||||
frappe.throw(_("Invalid value {0} for {1} against account {2}").format(
|
||||
frappe.bold(self.get(dimension)), frappe.bold(frappe.unscrub(dimension)), frappe.bold(self.account)), InvalidAccountDimensionError)
|
||||
else:
|
||||
if self.get(dimension) and self.get(dimension) in value['allowed_dimensions']:
|
||||
frappe.throw(_("Invalid value {0} for account {1}").format(
|
||||
frappe.bold(self.get(dimension)), frappe.bold(self.account)), InvalidAccountDimensionError)
|
||||
frappe.throw(_("Invalid value {0} for {1} against account {2}").format(
|
||||
frappe.bold(self.get(dimension)), frappe.bold(frappe.unscrub(dimension)), frappe.bold(self.account)), InvalidAccountDimensionError)
|
||||
|
||||
def check_pl_account(self):
|
||||
if self.is_opening=='Yes' and \
|
||||
|
Loading…
x
Reference in New Issue
Block a user