Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18113 from deepeshgarg007/gstr1-total

Browse Source 
fix: Add total row in GSTR-1 report
This commit is contained in:
Deepesh Garg 2019-07-03 11:12:43 +05:30 committed by GitHub
commit 1a6bfe986e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
erpnext/regional/report/gstr_1/gstr_1.json
View File

@ -1,29 +1,30 @@
{ {
"add_total_row": 0, "add_total_row": 1,
"apply_user_permissions": 1, "creation": "2018-01-02 15:54:41.424225",
"creation": "2018-01-02 15:54:41.424225", "disable_prepared_report": 0,
"disabled": 0, "disabled": 0,
"docstatus": 0, "docstatus": 0,
"doctype": "Report", "doctype": "Report",
"idx": 0, "idx": 0,
"is_standard": "Yes", "is_standard": "Yes",
"modified": "2018-01-02 17:56:15.379347", "modified": "2019-06-30 19:33:59.769385",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Regional", "module": "Regional",
"name": "GSTR-1", "name": "GSTR-1",
"owner": "Administrator", "owner": "Administrator",
"ref_doctype": "GL Entry", "prepared_report": 0,
"report_name": "GSTR-1", "ref_doctype": "GL Entry",
"report_type": "Script Report", "report_name": "GSTR-1",
"report_type": "Script Report",
"roles": [ "roles": [
{ {
"role": "Accounts User" "role": "Accounts User"
}, },
{ {
"role": "Accounts Manager" "role": "Accounts Manager"
}, },
{ {
"role": "Auditor" "role": "Auditor"
} }
] ]
} }

6
erpnext/regional/report/gstr_1/gstr_1.py
View File

@ -559,19 +559,19 @@ def get_json():
res = {} res = {}
if filters["type_of_business"] == "B2B": 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) res.setdefault(item["customer_gstin"], {}).setdefault(item["invoice_number"],[]).append(item)
out = get_b2b_json(res, gstin) out = get_b2b_json(res, gstin)
gst_json["b2b"] = out gst_json["b2b"] = out
elif filters["type_of_business"] == "B2C Large": 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) res.setdefault(item["place_of_supply"], []).append(item)
out = get_b2cl_json(res, gstin) out = get_b2cl_json(res, gstin)
gst_json["b2cl"] = out gst_json["b2cl"] = out
elif filters["type_of_business"] == "EXPORT": elif filters["type_of_business"] == "EXPORT":
for item in report_data: for item in report_data[:-1]:
res.setdefault(item["export_type"], []).append(item) res.setdefault(item["export_type"], []).append(item)
out = get_export_json(res) out = get_export_json(res)