Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: show error message instead of throw during Purchase Invoice name validation (backport #2864) #2865

Merged
merged 2 commits into from
Dec 13, 2024
Merged

fix: show error message instead of throw during Purchase Invoice name validation (backport #2864) #2865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
703c0b5
fix: show error message instead of throw during Purchase Invoice name…
Sanket322 Dec 13, 2024
ddfbf01
chore: resolve conflicts
vorasmit Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions india_compliance/gst_india/overrides/test_purchase_invoice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ def test_validate_invoice_length(self):
setattr(pinv, "__newname", "INV/2022/00001/asdfsadg") # NOQA
pinv.meta.autoname = "prompt"

self.assertRaisesRegex(
frappe.exceptions.ValidationError,
pinv.save()

self.assertEqual(
frappe.parse_json(frappe.message_log[-1]).get("message"),
"Transaction Name must be 16 characters or fewer to meet GST requirements",
pinv.save,
)
4 changes: 3 additions & 1 deletion india_compliance/gst_india/overrides/test_sales_invoice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ def test_validate_invoice_number(self):
"PI2021 - 001",
]
for name in invalid_names:
doc = frappe._dict(name=name, posting_date=posting_date)
doc = frappe._dict(
name=name, posting_date=posting_date, doctype="Sales Invoice"
)
self.assertRaises(frappe.ValidationError, validate_invoice_number, doc)

valid_names = [
Expand Down
34 changes: 20 additions & 14 deletions india_compliance/gst_india/utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,22 +919,28 @@ def disable_item_tax_template_notification():
def validate_invoice_number(doc):
"""Validate GST invoice number requirements."""

if len(doc.name) > 16:
frappe.throw(
_(
"Transaction Name must be 16 characters or fewer to meet GST requirements"
),
title=_("Invalid GST Transaction Name"),
)
is_valid_length = len(doc.name) <= 16
is_valid_format = GST_INVOICE_NUMBER_FORMAT.match(doc.name)

if not GST_INVOICE_NUMBER_FORMAT.match(doc.name):
frappe.throw(
_(
"Transaction Name should start with an alphanumeric character and can"
" only contain alphanumeric characters, dash (-) and slash (/) to meet GST requirements"
),
title=_("Invalid GST Transaction Name"),
if is_valid_length and is_valid_format:
return

title = _("Invalid GST Transaction Name")

if not is_valid_length:
message = _(
"Transaction Name must be 16 characters or fewer to meet GST requirements"
)
else:
message = _(
"Transaction Name should start with an alphanumeric character and can"
" only contain alphanumeric characters, dash (-) and slash (/) to meet GST requirements"
)

if doc.doctype == "Sales Invoice":
frappe.throw(message, title=title)

frappe.msgprint(message, title=title)


def handle_server_errors(settings, doc, document_type, error):
Expand Down
Loading