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

fix: HSN-wise-summary of outward supplies Updated Report

Browse Source 
Report changes done in order to meet the specification as per govt guideline - [GUIDELINE](https://taxguru.in/goods-and-service-tax/12-points-note-filing-gstr-1-01st-2021-onwards.html)
This commit is contained in:
Govind S Menokee
2022-03-02 22:29:19 +05:30
committed by GitHub
parent 5bad8d0e10
commit 363752510e
1 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py
View File

@@ -31,7 +31,7 @@ def _execute(filters=None):
added_item = [] added_item = []
for d in item_list: for d in item_list:
if (d.parent, d.item_code) not in added_item: if (d.parent, d.item_code) not in added_item:
row = [d.gst_hsn_code, d.description, d.stock_uom, d.stock_qty] row = [d.gst_hsn_code, d.description, d.stock_uom, d.stock_qty, d.tax_rate]
total_tax = 0 total_tax = 0
for tax in tax_columns: for tax in tax_columns:
item_tax = itemised_tax.get((d.parent, d.item_code), {}).get(tax, {}) item_tax = itemised_tax.get((d.parent, d.item_code), {}).get(tax, {})
@@ -39,11 +39,9 @@ def _execute(filters=None):
row += [d.base_net_amount + total_tax] row += [d.base_net_amount + total_tax]
row += [d.base_net_amount] row += [d.base_net_amount]
for tax in tax_columns: for tax in tax_columns:
item_tax = itemised_tax.get((d.parent, d.item_code), {}).get(tax, {}) item_tax = itemised_tax.get((d.parent, d.item_code), {}).get(tax, {})
row += [item_tax.get("tax_amount", 0)] row += [item_tax.get("tax_amount", 0)]
data.append(row) data.append(row)
added_item.append((d.parent, d.item_code)) added_item.append((d.parent, d.item_code))
if data: if data:
@@ -77,6 +75,12 @@ def get_columns():
"fieldtype": "Float", "fieldtype": "Float",
"width": 90 "width": 90
}, },
{
"fieldname": "tax_rate",
"label": _("Tax Rate"),
"fieldtype": "Data",
"width": 90
},
{ {
"fieldname": "total_amount", "fieldname": "total_amount",
"label": _("Total Amount"), "label": _("Total Amount"),
@@ -120,16 +124,25 @@ def get_items(filters):
sum(`tabSales Invoice Item`.stock_qty) as stock_qty, sum(`tabSales Invoice Item`.stock_qty) as stock_qty,
sum(`tabSales Invoice Item`.base_net_amount) as base_net_amount, sum(`tabSales Invoice Item`.base_net_amount) as base_net_amount,
sum(`tabSales Invoice Item`.base_price_list_rate) as base_price_list_rate, sum(`tabSales Invoice Item`.base_price_list_rate) as base_price_list_rate,
`tabSales Invoice Item`.parent, `tabSales Invoice Item`.item_code, `tabSales Invoice Item`.parent,
`tabGST HSN Code`.description `tabSales Invoice Item`.item_code,
from `tabSales Invoice`, `tabSales Invoice Item`, `tabGST HSN Code` `tabGST HSN Code`.description,
where `tabSales Invoice`.name = `tabSales Invoice Item`.parent json_extract(`tabSales Taxes and Charges`.item_wise_tax_detail,
concat('$."' , `tabSales Invoice Item`.item_code, '"[0]')) * count(distinct `tabSales Taxes and Charges`.name) as tax_rate
from
`tabSales Invoice`,
`tabSales Invoice Item`,
`tabGST HSN Code`,
`tabSales Taxes and Charges`
where
`tabSales Invoice`.name = `tabSales Invoice Item`.parent
and `tabSales Taxes and Charges`.parent = `tabSales Invoice`.name
and `tabSales Invoice`.docstatus = 1 and `tabSales Invoice`.docstatus = 1
and `tabSales Invoice Item`.gst_hsn_code is not NULL and `tabSales Invoice Item`.gst_hsn_code is not NULL
and `tabSales Invoice Item`.gst_hsn_code = `tabGST HSN Code`.name %s %s and `tabSales Invoice Item`.gst_hsn_code = `tabGST HSN Code`.name %s %s
group by group by
`tabSales Invoice Item`.parent, `tabSales Invoice Item`.item_code `tabSales Invoice Item`.parent,
`tabSales Invoice Item`.item_code
""" % (conditions, match_conditions), filters, as_dict=1) """ % (conditions, match_conditions), filters, as_dict=1)
return items return items
@@ -206,15 +219,16 @@ def get_merged_data(columns, data):
result = [] result = []
for row in data: for row in data:
merged_hsn_dict.setdefault(row[0], {}) key = row[0] + '-' + str(row[4])
merged_hsn_dict.setdefault(key, {})
for i, d in enumerate(columns): for i, d in enumerate(columns):
if d['fieldtype'] not in ('Int', 'Float', 'Currency'): if d['fieldtype'] not in ('Int', 'Float', 'Currency'):
merged_hsn_dict[row[0]][d['fieldname']] = row[i] merged_hsn_dict[key][d['fieldname']] = row[i]
else: else:
if merged_hsn_dict.get(row[0], {}).get(d['fieldname'], ''): if merged_hsn_dict.get(key, {}).get(d['fieldname'], ''):
merged_hsn_dict[row[0]][d['fieldname']] += row[i] merged_hsn_dict[key][d['fieldname']] += row[i]
else: else:
merged_hsn_dict[row[0]][d['fieldname']] = row[i] merged_hsn_dict[key][d['fieldname']] = row[i]
for key, value in iteritems(merged_hsn_dict): for key, value in iteritems(merged_hsn_dict):
result.append(value) result.append(value)
@@ -232,7 +246,7 @@ def get_json(filters, report_name, data):
fp = "%02d%s" % (getdate(filters["to_date"]).month, getdate(filters["to_date"]).year) fp = "%02d%s" % (getdate(filters["to_date"]).month, getdate(filters["to_date"]).year)
gst_json = {"version": "GST2.3.4", gst_json = {"version": "GST3.0.3",
"hash": "hash", "gstin": gstin, "fp": fp} "hash": "hash", "gstin": gstin, "fp": fp}
gst_json["hsn"] = { gst_json["hsn"] = {
@@ -267,7 +281,7 @@ def get_hsn_wise_json_data(filters, report_data):
"desc": hsn.get("description"), "desc": hsn.get("description"),
"uqc": hsn.get("stock_uom").upper(), "uqc": hsn.get("stock_uom").upper(),
"qty": hsn.get("stock_qty"), "qty": hsn.get("stock_qty"),
"val": flt(hsn.get("total_amount"), 2), "rt": flt(hsn.get("tax_rate"), 2),
"txval": flt(hsn.get("taxable_amount", 2)), "txval": flt(hsn.get("taxable_amount", 2)),
"iamt": 0.0, "iamt": 0.0,
"camt": 0.0, "camt": 0.0,