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

Address filter in gstr1 report (#14290)

Browse Source
This commit is contained in:
Shreya Shah
2018-05-31 09:33:36 +05:30
committed by Nabin Hait
parent f3a6d95634
commit c55f774fbf
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/regional/report/gstr_1/gstr_1.js
View File

@@ -11,6 +11,21 @@ frappe.query_reports["GSTR-1"] = {
"reqd": 1, "reqd": 1,
"default": frappe.defaults.get_user_default("Company") "default": frappe.defaults.get_user_default("Company")
}, },
{
"fieldname":"company_address",
"label": __("Address"),
"fieldtype": "Link",
"options": "Address",
"get_query": function() {
var company = frappe.query_report_filters_by_name.company.get_value();
if (company) {
return {
"query": 'frappe.contacts.doctype.address.address.address_query',
"filters": { link_doctype: 'Company', link_name: company}
};
}
}
},
{ {
"fieldname":"from_date", "fieldname":"from_date",
"label": __("From Date"), "label": __("From Date"),

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

@@ -102,7 +102,8 @@ class Gstr1Report(object):
for opts in (("company", " and company=%(company)s"), for opts in (("company", " and company=%(company)s"),
("from_date", " and posting_date>=%(from_date)s"), ("from_date", " and posting_date>=%(from_date)s"),
("to_date", " and posting_date<=%(to_date)s")): ("to_date", " and posting_date<=%(to_date)s"),
("company_address", " and company_address=%(company_address)s")):
if self.filters.get(opts[0]): if self.filters.get(opts[0]):
conditions += opts[1] conditions += opts[1]