nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: RCM taxable value in GSTR3b report

Browse Source
This commit is contained in:
Deepesh Garg
2020-08-08 20:58:01 +05:30
parent bbfd5a4cc8
commit f0f20bb434
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,9 +234,6 @@ class GSTR3BReport(Document):
self.report_dict[supply_type][supply_category][account_map.get(account_type)] += \ self.report_dict[supply_type][supply_category][account_map.get(account_type)] += \
flt(tax_details.get((account_name, gst_category), {}).get("amount"), 2) flt(tax_details.get((account_name, gst_category), {}).get("amount"), 2)
for k, v in iteritems(account_map):
txval -= self.report_dict.get(supply_type, {}).get(supply_category, {}).get(v, 0)
self.report_dict[supply_type][supply_category]["txval"] += flt(txval, 2) self.report_dict[supply_type][supply_category]["txval"] += flt(txval, 2)
def set_inter_state_supply(self, inter_state_supply): def set_inter_state_supply(self, inter_state_supply):
@@ -256,7 +253,7 @@ class GSTR3BReport(Document):
def get_total_taxable_value(self, doctype, reverse_charge): def get_total_taxable_value(self, doctype, reverse_charge):
return frappe._dict(frappe.db.sql(""" return frappe._dict(frappe.db.sql("""
select gst_category, sum(base_grand_total) as total select gst_category, sum(net_total) as total
from `tab{doctype}` from `tab{doctype}`
where docstatus = 1 and month(posting_date) = %s where docstatus = 1 and month(posting_date) = %s
and year(posting_date) = %s and reverse_charge = %s and year(posting_date) = %s and reverse_charge = %s
@@ -307,7 +304,6 @@ 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:
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,
@@ -319,23 +315,18 @@ class GSTR3BReport(Document):
}) })
if d.account_head in [a.cgst_account for a in self.account_heads]: if d.account_head in [a.cgst_account for a in self.account_heads]:
print(d, "CGST")
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 [a.sgst_account for a in self.account_heads]: if d.account_head in [a.sgst_account for a in self.account_heads]:
print(d, "SGST")
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 [a.igst_account for a in self.account_heads]: if d.account_head in [a.igst_account for a in self.account_heads]:
print(d, "IGST")
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 [a.cess_account for a in self.account_heads]: if d.account_head in [a.cess_account for a in self.account_heads]:
print(d, "CESS")
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, state_number)
if value.get('place_of_supply'): if value.get('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)
@@ -354,7 +345,6 @@ class GSTR3BReport(Document):
inter_state_supply_details[(value.get('gst_category'), value.get('place_of_supply'))]['txval'] += value['taxable_value'] inter_state_supply_details[(value.get('gst_category'), value.get('place_of_supply'))]['txval'] += value['taxable_value']
inter_state_supply_details[(value.get('gst_category'), value.get('place_of_supply'))]['iamt'] += value['iamt'] inter_state_supply_details[(value.get('gst_category'), value.get('place_of_supply'))]['iamt'] += value['iamt']
print(inter_state_supply_details)
return inter_state_supply_details return inter_state_supply_details
def get_inward_nil_exempt(self, state): def get_inward_nil_exempt(self, state):