Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(regional): use net figures for sales calc (#38260)

Browse Source
This commit is contained in:
Dany Robert 2023-11-29 09:03:47 +05:30 committed by GitHub
parent 458dd51af7
commit 663bb8726c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,7 +141,7 @@ def get_total_emiratewise(filters):
return frappe.db.sql( return frappe.db.sql(
""" """
select select
s.vat_emirate as emirate, sum(i.base_amount) as total, sum(i.tax_amount) s.vat_emirate as emirate, sum(i.base_net_amount) as total, sum(i.tax_amount)
from from
`tabSales Invoice Item` i inner join `tabSales Invoice` s `tabSales Invoice Item` i inner join `tabSales Invoice` s
on on
@ -356,7 +356,7 @@ def get_zero_rated_total(filters):
frappe.db.sql( frappe.db.sql(
""" """
select select
sum(i.base_amount) as total sum(i.base_net_amount) as total
from from
`tabSales Invoice Item` i inner join `tabSales Invoice` s `tabSales Invoice Item` i inner join `tabSales Invoice` s
on on
@ -383,7 +383,7 @@ def get_exempt_total(filters):
frappe.db.sql( frappe.db.sql(
""" """
select select
sum(i.base_amount) as total sum(i.base_net_amount) as total
from from
`tabSales Invoice Item` i inner join `tabSales Invoice` s `tabSales Invoice Item` i inner join `tabSales Invoice` s
on on