nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 11:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Test Case

Browse Source
This commit is contained in:
Deepesh Garg
2020-07-20 13:34:46 +05:30
parent 6946796047
commit 0b31d6f630
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py
View File

@@ -8,7 +8,7 @@ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
import json import json
from six import iteritems from six import iteritems
from frappe.utils import flt, getdate from frappe.utils import flt, getdate, cstr
from erpnext.regional.india import state_numbers from erpnext.regional.india import state_numbers
class GSTR3BReport(Document): class GSTR3BReport(Document):
@@ -306,27 +306,26 @@ class GSTR3BReport(Document):
inter_state_supply_details = {} inter_state_supply_details = {}
for d in inter_state_supply_tax: for d in inter_state_supply_tax:
if d.name: inter_state_supply_tax_mapping.setdefault(cstr(d.name), {
inter_state_supply_tax_mapping.setdefault(d.name, { 'place_of_supply': d.place_of_supply,
'place_of_supply': d.place_of_supply, 'taxable_value': d.net_total,
'taxable_value': d.net_total, 'camt': 0.0,
'camt': 0.0, 'samt': 0.0,
'samt': 0.0, 'iamt': 0.0,
'iamt': 0.0, 'csamt': 0.0
'csamt': 0.0 })
})
if d.account_head in [d.cgst_account for d in self.account_heads]: if d.account_head in [d.cgst_account for d in self.account_heads]:
inter_state_supply_tax_mapping[d.name]['camt'] += d.tax_amount inter_state_supply_tax_mapping[cstr(d.name)]['camt'] += d.tax_amount
if d.account_head in [d.sgst_account for d in self.account_heads]: if d.account_head in [d.sgst_account for d in self.account_heads]:
inter_state_supply_tax_mapping[d.name]['samt'] += d.tax_amount inter_state_supply_tax_mapping[cstr(d.name)]['samt'] += d.tax_amount
if d.account_head in [d.igst_account for d in self.account_heads]: if d.account_head in [d.igst_account for d in self.account_heads]:
inter_state_supply_tax_mapping[d.name]['iamt'] += d.tax_amount inter_state_supply_tax_mapping[cstr(d.name)]['iamt'] += d.tax_amount
if d.account_head in [d.cess_account for d in self.account_heads]: if d.account_head in [d.cess_account for d in self.account_heads]:
inter_state_supply_tax_mapping[d.name]['csamt'] += d.tax_amount inter_state_supply_tax_mapping[cstr(d.name)]['csamt'] += d.tax_amount
for key, value in iteritems(inter_state_supply_tax_mapping): for key, value in iteritems(inter_state_supply_tax_mapping):
if d.place_of_supply: if d.place_of_supply: