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

fix: Instate Invoice not appearing in GSTR-1 report

Browse Source
This commit is contained in:
Deepesh Garg 2020-05-19 18:53:08 +05:30
parent 8caffe2c71
commit 007eda7164
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,9 @@ class Gstr1Report(object):
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 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) row, taxable_value = self.get_row_data_for_invoice(inv, invoice_details, rate, items)
if self.filters.get("type_of_business") == "CDNR": if self.filters.get("type_of_business") == "CDNR":
@ -221,6 +224,8 @@ class Gstr1Report(object):
self.items_based_on_tax_rate = {} self.items_based_on_tax_rate = {}
self.invoice_cess = frappe._dict() self.invoice_cess = frappe._dict()
self.cgst_igst_invoices = []
unidentified_gst_accounts = [] unidentified_gst_accounts = []
for parent, account, item_wise_tax_detail, tax_amount in self.tax_details: for parent, account, item_wise_tax_detail, tax_amount in self.tax_details:
if account in self.gst_accounts.cess_account: if account in self.gst_accounts.cess_account:
@ -243,6 +248,8 @@ class Gstr1Report(object):
tax_rate = tax_amounts[0] tax_rate = tax_amounts[0]
if cgst_or_sgst: if cgst_or_sgst:
tax_rate *= 2 tax_rate *= 2
if parent not in self.cgst_igst_invoices:
self.cgst_igst_invoices.append(parent)
rate_based_dict = self.items_based_on_tax_rate\ rate_based_dict = self.items_based_on_tax_rate\
.setdefault(parent, {}).setdefault(tax_rate, []) .setdefault(parent, {}).setdefault(tax_rate, [])