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

fix: GSTR-2 Report fixes (#17903)

Browse Source
This commit is contained in:
Deepesh Garg 2019-06-14 12:02:36 +05:30 committed by Nabin Hait
parent 459155fae1
commit b095d0a0c5
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,6 +209,9 @@ class Gstr1Report(object):
sum(i.get('base_net_amount', 0) for i in items sum(i.get('base_net_amount', 0) for i in items
if i.item_code == d.item_code and i.parent == d.parent)) if i.item_code == d.item_code and i.parent == d.parent))
item_tax_rate = {}
if d.item_tax_rate:
item_tax_rate = json.loads(d.item_tax_rate) item_tax_rate = json.loads(d.item_tax_rate)
if item_tax_rate: if item_tax_rate:

7
erpnext/regional/report/gstr_2/gstr_2.py
View File

@ -43,8 +43,11 @@ class Gstr2Report(Gstr1Report):
self.get_igst_invoices() self.get_igst_invoices()
for inv, items_based_on_rate in self.items_based_on_tax_rate.items(): for inv, items_based_on_rate in self.items_based_on_tax_rate.items():
invoice_details = self.invoices.get(inv) invoice_details = self.invoices.get(inv)
for rate, items in items_based_on_rate.items(): for key, items in items_based_on_rate.items():
row, taxable_value = self.get_row_data_for_invoice(inv, invoice_details, rate, items) rate = key[0]
account = key[1]
row, taxable_value = self.get_row_data_for_invoice(inv, invoice_details, rate, account, items)
tax_amount = taxable_value * rate / 100 tax_amount = taxable_value * rate / 100
if inv in self.igst_invoices: if inv in self.igst_invoices:
row += [tax_amount, 0, 0] row += [tax_amount, 0, 0]