schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18196 from deepeshgarg007/b2cs_json_hotfix

Browse Source 
fix: Cess amount calculation fix in GSTR-1 report (hotfix)
This commit is contained in:
Deepesh Garg
2019-07-08 10:11:06 +05:30
committed by GitHub
parent 7543916da6 34867ced92
commit 6940a6cd47
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,7 +85,7 @@ class Gstr1Report(object):
"rate": "", "rate": "",
"taxable_value": 0, "taxable_value": 0,
"cess_amount": 0, "cess_amount": 0,
"type": 0 "type": ""
}) })
row = b2cs_output.get((rate, place_of_supply, ecommerce_gstin)) row = b2cs_output.get((rate, place_of_supply, ecommerce_gstin))
@@ -94,6 +94,7 @@ class Gstr1Report(object):
row["rate"] = rate row["rate"] = rate
row["taxable_value"] += sum([abs(net_amount) row["taxable_value"] += sum([abs(net_amount)
for item_code, net_amount in self.invoice_items.get(inv).items() if item_code in items]) for item_code, net_amount in self.invoice_items.get(inv).items() if item_code in items])
row["cess_amount"] += flt(self.invoice_cess.get(inv), 2)
row["type"] = "E" if ecommerce_gstin else "OE" row["type"] = "E" if ecommerce_gstin else "OE"
for key, value in iteritems(b2cs_output): for key, value in iteritems(b2cs_output):
@@ -118,6 +119,10 @@ class Gstr1Report(object):
for item_code, net_amount in self.invoice_items.get(invoice).items() if item_code in items]) for item_code, net_amount in self.invoice_items.get(invoice).items() if item_code in items])
row += [tax_rate or 0, taxable_value] row += [tax_rate or 0, taxable_value]
for column in self.other_columns:
if column.get('fieldname') == 'cess_amount':
row.append(flt(self.invoice_cess.get(invoice), 2))
return row, taxable_value return row, taxable_value
def get_invoice_data(self): def get_invoice_data(self):