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

Merge pull request #21792 from deepeshgarg007/gst_insstate_v1_13

Browse Source 
fix: Tax amount in GSTR-1 JSON
This commit is contained in:
Deepesh Garg 2020-05-19 20:05:07 +05:30 committed by GitHub
commit 3dae7af868
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/regional/report/gstr_1/gstr_1.py
View File

@ -60,9 +60,6 @@ class Gstr1Report(object):
for inv, items_based_on_rate in self.items_based_on_tax_rate.items():
invoice_details = self.invoices.get(inv)
for rate, items in items_based_on_rate.items():
if inv in self.cgst_igst_invoices:
rate = rate/2
row, taxable_value = self.get_row_data_for_invoice(inv, invoice_details, rate, items)
if self.filters.get("type_of_business") == "CDNR":
@ -120,9 +117,15 @@ class Gstr1Report(object):
else:
row.append(invoice_details.get(fieldname))
taxable_value = 0
if invoice in self.cgst_igst_invoices:
division_factor = 2
else:
division_factor = 1
for item_code, net_amount in self.invoice_items.get(invoice).items():
if item_code in items:
if self.item_tax_rate.get(invoice) and tax_rate in self.item_tax_rate.get(invoice, {}).get(item_code, []):
if self.item_tax_rate.get(invoice) and tax_rate/division_factor in self.item_tax_rate.get(invoice, {}).get(item_code, []):
taxable_value += abs(net_amount)
elif not self.item_tax_rate.get(invoice):
taxable_value += abs(net_amount)