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

Revert "fix: GSTR-2 Report fixes"

Browse Source 
This reverts commit a55413cb0d3828c20ad53e54ad7abe3ca2492668.
This commit is contained in:
deepeshgarg007 2019-06-20 15:26:04 +05:30
parent 7483cb49fe
commit a8e49b8afd
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,10 +204,7 @@ 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 = {} item_tax_rate = json.loads(d.item_tax_rate)
if d.item_tax_rate:
item_tax_rate = json.loads(d.item_tax_rate)
if item_tax_rate: if item_tax_rate:
for account, rate in item_tax_rate.items(): for account, rate in item_tax_rate.items():

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

@ -43,11 +43,8 @@ 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 key, items in items_based_on_rate.items(): for rate, items in items_based_on_rate.items():
rate = key[0] row, taxable_value = self.get_row_data_for_invoice(inv, invoice_details, rate, items)
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]