nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Test case

Browse Source
This commit is contained in:
Deepesh Garg
2020-08-07 22:02:14 +05:30
parent 67e07b69dd
commit b8eff8d141
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -239,8 +239,6 @@ class GSTR3BReport(Document):
self.report_dict[supply_type][supply_category]["txval"] += flt(txval, 2) self.report_dict[supply_type][supply_category]["txval"] += flt(txval, 2)
print(self.report_dict['sup_details']['osup_det']['iamt'], 1)
def set_inter_state_supply(self, inter_state_supply): def set_inter_state_supply(self, inter_state_supply):
osup_det = self.report_dict["sup_details"]["osup_det"] osup_det = self.report_dict["sup_details"]["osup_det"]
@@ -308,9 +306,7 @@ class GSTR3BReport(Document):
inter_state_supply_tax_mapping = {} inter_state_supply_tax_mapping = {}
inter_state_supply_details = {} inter_state_supply_details = {}
print(inter_state_supply_tax)
for d in inter_state_supply_tax: for d in inter_state_supply_tax:
print(d)
inter_state_supply_tax_mapping.setdefault(cstr(d.name), { inter_state_supply_tax_mapping.setdefault(cstr(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,
@@ -321,24 +317,19 @@ class GSTR3BReport(Document):
}) })
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]:
print(d.account_head, d.name, d.tax_amount)
inter_state_supply_tax_mapping[cstr(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]:
print(d.account_head, d.name, d.tax_amount)
inter_state_supply_tax_mapping[cstr(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]:
print(d.account_head, d.name, d.tax_amount)
inter_state_supply_tax_mapping[cstr(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]:
print(d.account_head, d.name, d.tax_amount)
inter_state_supply_tax_mapping[cstr(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):
print(key, value, d.place_of_supply) if value.get('place_of_supply'):
if d.place_of_supply:
osup_det = self.report_dict["sup_details"]["osup_det"] osup_det = self.report_dict["sup_details"]["osup_det"]
osup_det["txval"] = flt(osup_det["txval"] + value['taxable_value'], 2) osup_det["txval"] = flt(osup_det["txval"] + value['taxable_value'], 2)
osup_det["iamt"] = flt(osup_det["iamt"] + value['iamt'], 2) osup_det["iamt"] = flt(osup_det["iamt"] + value['iamt'], 2)