Merge pull request #18113 from deepeshgarg007/gstr1-total
fix: Add total row in GSTR-1 report
diff --git a/erpnext/regional/report/gstr_1/gstr_1.json b/erpnext/regional/report/gstr_1/gstr_1.json
index 4ef8d53..2012bb8 100644
--- a/erpnext/regional/report/gstr_1/gstr_1.json
+++ b/erpnext/regional/report/gstr_1/gstr_1.json
@@ -1,29 +1,30 @@
{
- "add_total_row": 0,
- "apply_user_permissions": 1,
- "creation": "2018-01-02 15:54:41.424225",
- "disabled": 0,
- "docstatus": 0,
- "doctype": "Report",
- "idx": 0,
- "is_standard": "Yes",
- "modified": "2018-01-02 17:56:15.379347",
- "modified_by": "Administrator",
- "module": "Regional",
- "name": "GSTR-1",
- "owner": "Administrator",
- "ref_doctype": "GL Entry",
- "report_name": "GSTR-1",
- "report_type": "Script Report",
+ "add_total_row": 1,
+ "creation": "2018-01-02 15:54:41.424225",
+ "disable_prepared_report": 0,
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 0,
+ "is_standard": "Yes",
+ "modified": "2019-06-30 19:33:59.769385",
+ "modified_by": "Administrator",
+ "module": "Regional",
+ "name": "GSTR-1",
+ "owner": "Administrator",
+ "prepared_report": 0,
+ "ref_doctype": "GL Entry",
+ "report_name": "GSTR-1",
+ "report_type": "Script Report",
"roles": [
{
"role": "Accounts User"
- },
+ },
{
"role": "Accounts Manager"
- },
+ },
{
"role": "Auditor"
}
]
-}
+}
\ No newline at end of file
diff --git a/erpnext/regional/report/gstr_1/gstr_1.py b/erpnext/regional/report/gstr_1/gstr_1.py
index ee3619b..eff5780 100644
--- a/erpnext/regional/report/gstr_1/gstr_1.py
+++ b/erpnext/regional/report/gstr_1/gstr_1.py
@@ -559,19 +559,19 @@
res = {}
if filters["type_of_business"] == "B2B":
- for item in report_data:
+ for item in report_data[:-1]:
res.setdefault(item["customer_gstin"], {}).setdefault(item["invoice_number"],[]).append(item)
out = get_b2b_json(res, gstin)
gst_json["b2b"] = out
elif filters["type_of_business"] == "B2C Large":
- for item in report_data:
+ for item in report_data[:-1]:
res.setdefault(item["place_of_supply"], []).append(item)
out = get_b2cl_json(res, gstin)
gst_json["b2cl"] = out
elif filters["type_of_business"] == "EXPORT":
- for item in report_data:
+ for item in report_data[:-1]:
res.setdefault(item["export_type"], []).append(item)
out = get_export_json(res)