nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 04:09:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into gst-category

Browse Source
This commit is contained in:
Anuja Pawar
2021-10-29 21:32:49 +05:30
committed by GitHub
parent bc1e7bc15f 1a6e98ed48
commit f9e7dc3f62
12 changed files with 150 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,7 @@ def get_total_emiratewise(filters):
try:
return frappe.db.sql("""
select
s.vat_emirate as emirate, sum(i.base_amount) as total, sum(s.total_taxes_and_charges)
s.vat_emirate as emirate, sum(i.base_amount) as total, sum(i.tax_amount)
from
`tabSales Invoice Item` i inner join `tabSales Invoice` s
on