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

fix(reports): Made gstr1 ready for govt portal

Browse Source
This commit is contained in:
Nabin Hait
2018-09-06 17:44:31 +05:30
parent 1b49f3a4e7
commit a2a6568b7e
4 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,8 +4,9 @@
from __future__ import unicode_literals
import frappe, json
from frappe import _
from frappe.utils import flt
from frappe.utils import flt, formatdate
from datetime import date
from six import iteritems
def execute(filters=None):
return Gstr1Report(filters).run()
@@ -73,12 +74,17 @@ class Gstr1Report(object):
row.append(abs(invoice_details.base_rounded_total) or abs(invoice_details.base_grand_total))
elif fieldname == "invoice_value":
row.append(invoice_details.base_rounded_total or invoice_details.base_grand_total)
elif fieldname in ('posting_date', 'shipping_bill_date'):
row.append(formatdate(invoice_details.get(fieldname), 'dd-MMM-YY'))
elif fieldname == "export_type":
export_type = "WPAY" if invoice_details.get(fieldname)=="With Payment of Tax" else "WOPAY"
row.append(export_type)
else:
row.append(invoice_details.get(fieldname))
taxable_value = sum([abs(net_amount)
for item_code, net_amount in self.invoice_items.get(invoice).items() if item_code in items])
row += [tax_rate, taxable_value]
row += [tax_rate or 0, taxable_value]
return row, taxable_value
@@ -195,6 +201,12 @@ class Gstr1Report(object):
if unidentified_gst_accounts:
frappe.msgprint(_("Following accounts might be selected in GST Settings:")
+ "<br>" + "<br>".join(unidentified_gst_accounts), alert=True)
# Build itemised tax for export invoices where tax table is blank
for invoice, items in iteritems(self.invoice_items):
if invoice not in self.items_based_on_tax_rate \
and frappe.db.get_value(self.doctype, invoice, "export_type") == "Without Payment of Tax":
self.items_based_on_tax_rate.setdefault(invoice, {}).setdefault(0, items.keys())
def get_gst_accounts(self):
self.gst_accounts = frappe._dict()
@@ -250,7 +262,7 @@ class Gstr1Report(object):
{
"fieldname": "posting_date",
"label": "Invoice date",
"fieldtype": "Date",
"fieldtype": "Data",
"width":80
},
{
@@ -261,7 +273,7 @@ class Gstr1Report(object):
},
{
"fieldname": "place_of_supply",
"label": "Place of Supply",
"label": "Place Of Supply",
"fieldtype": "Data",
"width":100
},
@@ -303,7 +315,7 @@ class Gstr1Report(object):
{
"fieldname": "posting_date",
"label": "Invoice date",
"fieldtype": "Date",
"fieldtype": "Data",
"width": 100
},
{
@@ -314,7 +326,7 @@ class Gstr1Report(object):
},
{
"fieldname": "place_of_supply",
"label": "Place of Supply",
"label": "Place Of Supply",
"fieldtype": "Data",
"width": 120
},
@@ -357,7 +369,7 @@ class Gstr1Report(object):
{
"fieldname": "posting_date",
"label": "Invoice/Advance Receipt date",
"fieldtype": "Date",
"fieldtype": "Data",
"width": 120
},
{
@@ -367,12 +379,6 @@ class Gstr1Report(object):
"options": "Sales Invoice",
"width":120
},
{
"fieldname": "posting_date",
"label": "Invoice/Advance Receipt date",
"fieldtype": "Date",
"width": 120
},
{
"fieldname": "reason_for_issuing_document",
"label": "Reason For Issuing document",
@@ -381,7 +387,7 @@ class Gstr1Report(object):
},
{
"fieldname": "place_of_supply",
"label": "Place of Supply",
"label": "Place Of Supply",
"fieldtype": "Data",
"width": 120
},
@@ -416,7 +422,7 @@ class Gstr1Report(object):
self.invoice_columns = [
{
"fieldname": "place_of_supply",
"label": "Place of Supply",
"label": "Place Of Supply",
"fieldtype": "Data",
"width": 120
},
@@ -459,7 +465,7 @@ class Gstr1Report(object):
{
"fieldname": "posting_date",
"label": "Invoice date",
"fieldtype": "Date",
"fieldtype": "Data",
"width": 120
},
{
@@ -483,7 +489,7 @@ class Gstr1Report(object):
{
"fieldname": "shipping_bill_date",
"label": "Shipping Bill Date",
"fieldtype": "Date",
"fieldtype": "Data",
"width": 120
}
]