nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 05:59:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #46508 from ruthra-kumar/use_base_total_for_uae_report

Browse Source 
fix: use base currency total for UAE VAT 201 report
This commit is contained in:
ruthra kumar
2025-03-18 10:58:58 +05:30
committed by GitHub
parent dd214fedd8 e80129627a
commit 3eaa9bfca4
2 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,11 +39,10 @@ class TestUaeVat201(TestCase):
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_uae_vat_201_report(self):
make_sales_invoices() make_sales_invoices()
create_purchase_invoices() create_purchase_invoices()
def test_uae_vat_201_report(self):
filters = {"company": "_Test Company UAE VAT"} filters = {"company": "_Test Company UAE VAT"}
total_emiratewise = get_total_emiratewise(filters) total_emiratewise = get_total_emiratewise(filters)
amounts_by_emirate = {} amounts_by_emirate = {}
@@ -64,6 +63,37 @@ class TestUaeVat201(TestCase):
self.assertEqual(get_standard_rated_expenses_total(filters), 250) self.assertEqual(get_standard_rated_expenses_total(filters), 250)
self.assertEqual(get_standard_rated_expenses_tax(filters), 1) self.assertEqual(get_standard_rated_expenses_tax(filters), 1)
def test_uae_vat_201_report_with_foreign_transaction(self):
pi = make_purchase_invoice(
company="_Test Company UAE VAT",
supplier="_Test UAE Supplier",
supplier_warehouse="_Test UAE VAT Supplier Warehouse - _TCUV",
warehouse="_Test UAE VAT Supplier Warehouse - _TCUV",
currency="USD",
conversion_rate=3.67,
cost_center="Main - _TCUV",
expense_account="Cost of Goods Sold - _TCUV",
item="_Test UAE VAT Item",
do_not_save=1,
uom="Nos",
)
pi.append(
"taxes",
{
"charge_type": "On Net Total",
"account_head": "VAT 5% - _TCUV",
"cost_center": "Main - _TCUV",
"description": "VAT 5% @ 5.0",
"rate": 5.0,
},
)
pi.recoverable_standard_rated_expenses = 50
pi.save().submit()
filters = {"company": "_Test Company UAE VAT"}
self.assertEqual(get_standard_rated_expenses_total(filters), 917.5)
self.assertEqual(get_standard_rated_expenses_tax(filters), 50)
def make_company(company_name, abbr): def make_company(company_name, abbr):
if not frappe.db.exists("Company", company_name): if not frappe.db.exists("Company", company_name):

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

@@ -179,7 +179,7 @@ def get_reverse_charge_total(filters):
try: try:
return ( return (
frappe.db.get_all( frappe.db.get_all(
"Purchase Invoice", filters=query_filters, fields=["sum(total)"], as_list=True, limit=1 "Purchase Invoice", filters=query_filters, fields=["sum(base_total)"], as_list=True, limit=1
)[0][0] )[0][0]
or 0 or 0
) )
@@ -219,7 +219,7 @@ def get_reverse_charge_recoverable_total(filters):
try: try:
return ( return (
frappe.db.get_all( frappe.db.get_all(
"Purchase Invoice", filters=query_filters, fields=["sum(total)"], as_list=True, limit=1 "Purchase Invoice", filters=query_filters, fields=["sum(base_total)"], as_list=True, limit=1
)[0][0] )[0][0]
or 0 or 0
) )
@@ -274,7 +274,7 @@ def get_standard_rated_expenses_total(filters):
try: try:
return ( return (
frappe.db.get_all( frappe.db.get_all(
"Purchase Invoice", filters=query_filters, fields=["sum(total)"], as_list=True, limit=1 "Purchase Invoice", filters=query_filters, fields=["sum(base_total)"], as_list=True, limit=1
)[0][0] )[0][0]
or 0 or 0
) )
@@ -310,7 +310,7 @@ def get_tourist_tax_return_total(filters):
try: try:
return ( return (
frappe.db.get_all( frappe.db.get_all(
"Sales Invoice", filters=query_filters, fields=["sum(total)"], as_list=True, limit=1 "Sales Invoice", filters=query_filters, fields=["sum(base_total)"], as_list=True, limit=1
)[0][0] )[0][0]
or 0 or 0
) )