Skip to content

[pull] main from ERPGulf:main #72

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

Merged
pull merged 2 commits into from
May 6, 2026
Merged

[pull] main from ERPGulf:main #72

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c0c49e
The new validation added for tax id of customet
HusnaMa May 6, 2026
784f61a
Merge pull request #225 from ERPGulf/zatca-3.0
HusnaMa May 6, 2026
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
26 changes: 26 additions & 0 deletions zatca_erpgulf/zatca_erpgulf/sign_invoice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1416,6 +1416,19 @@ def zatca_background(invoice_number: str, source_doc:str|dict=None, bypass_backg
"As per ZATCA regulations, Customer Tax ID must start with 3 and end with 3."
)
)
tax_id = (customer_doc.tax_id or "").strip()

if tax_id: # :white_check_mark: Only validate if value exists (not None / empty)
if (
not tax_id.isdigit()
or len(tax_id) != 15
or not (tax_id.startswith("3") and tax_id.endswith("3"))
):
frappe.throw(
_(
"As per ZATCA regulations, Customer Tax ID must be exactly 15 digits and start with 3 and end with 3."
)
)
if not customer_doc.custom_buyer_id_type and customer_doc.custom_buyer_id:
frappe.throw(_("Buyer ID must be blank if Buyer ID Type is not set."))
if "claudion4saudi" in frappe.get_installed_apps():
Expand Down Expand Up @@ -1862,6 +1875,19 @@ def zatca_background_on_submit(doc: "str|dict", _method: str = None, bypass_back
"As per ZATCA regulations, Customer Tax ID must start with 3 and end with 3."
)
)
tax_id = (customer_doc.tax_id or "").strip()

if tax_id: # :white_check_mark: Only validate if value exists (not None / empty)
if (
not tax_id.isdigit()
or len(tax_id) != 15
or not (tax_id.startswith("3") and tax_id.endswith("3"))
):
frappe.throw(
_(
"As per ZATCA regulations, Customer Tax ID must be exactly 15 digits and start with 3 and end with 3."
)
)
if not customer_doc.custom_buyer_id_type and customer_doc.custom_buyer_id:
frappe.throw(_("Buyer ID must be blank if Buyer ID Type is not set."))
if "claudion4saudi" in frappe.get_installed_apps():
Expand Down
Loading