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

fix: validate company region in uae vat 201 (#54899)

Browse Source
This commit is contained in:
Ravibharathi
2026-05-19 16:30:07 +05:30
committed by GitHub
parent 6878fc9ab6
commit ad7ddae32f
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/regional/report/uae_vat_201/test_uae_vat_201.py
View File

@@ -4,6 +4,7 @@ import erpnext
from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
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.regional.report.uae_vat_201.uae_vat_201 import ( from erpnext.regional.report.uae_vat_201.uae_vat_201 import (
execute,
get_exempt_total, get_exempt_total,
get_standard_rated_expenses_tax, get_standard_rated_expenses_tax,
get_standard_rated_expenses_total, get_standard_rated_expenses_total,
@@ -30,6 +31,13 @@ class TestUaeVat201(ERPNextTestSuite):
make_item("_Test UAE VAT Zero Rated Item", properties={"is_zero_rated": 1, "is_exempt": 0}) make_item("_Test UAE VAT Zero Rated Item", properties={"is_zero_rated": 1, "is_exempt": 0})
make_item("_Test UAE VAT Exempt Item", properties={"is_zero_rated": 0, "is_exempt": 1}) make_item("_Test UAE VAT Exempt Item", properties={"is_zero_rated": 0, "is_exempt": 1})
def test_validate_company_region(self):
self.assertRaises(
frappe.exceptions.ValidationError,
execute,
{"company": "_Test Company"},
)
def test_uae_vat_201_report(self): def test_uae_vat_201_report(self):
make_sales_invoices() make_sales_invoices()
create_purchase_invoices() create_purchase_invoices()

7
erpnext/regional/report/uae_vat_201/uae_vat_201.js
View File

@@ -10,6 +10,13 @@ frappe.query_reports["UAE VAT 201"] = {
options: "Company", options: "Company",
reqd: 1, reqd: 1,
default: frappe.defaults.get_user_default("Company"), default: frappe.defaults.get_user_default("Company"),
get_query: function () {
return {
filters: {
country: "United Arab Emirates",
},
};
},
}, },
{ {
fieldname: "from_date", fieldname: "from_date",

12
erpnext/regional/report/uae_vat_201/uae_vat_201.py
View File

@@ -5,13 +5,25 @@
import frappe import frappe
from frappe import _ from frappe import _
from erpnext import get_region
def execute(filters=None): def execute(filters=None):
validate_company_region(filters)
columns = get_columns() columns = get_columns()
data, emirates, amounts_by_emirate = get_data(filters) data, emirates, amounts_by_emirate = get_data(filters)
return columns, data return columns, data
def validate_company_region(filters):
if filters.get("company") and get_region(filters.get("company")) != "United Arab Emirates":
frappe.throw(
_(
"The company {0} is not in United Arab Emirates. UAE VAT 201 report is only available for companies in United Arab Emirates."
).format(frappe.bold(filters.get("company")))
)
def get_columns(): def get_columns():
"""Creates a list of dictionaries that are used to generate column headers of the data table.""" """Creates a list of dictionaries that are used to generate column headers of the data table."""
return [ return [