refactor: added new filters in the Batch-wise balance history report (#23676)

* refactor: added new filters in the Batch-wise balance history report

* fix: added semicolon

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
This commit is contained in:
rohitwaghchaure 2020-10-19 11:37:54 +05:30 committed by GitHub
parent 083f3fd981
commit 2fbeb7c1dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 5 deletions

View File

@ -3,6 +3,14 @@
frappe.query_reports["Batch-Wise Balance History"] = { frappe.query_reports["Batch-Wise Balance History"] = {
"filters": [ "filters": [
{
"fieldname":"company",
"label": __("Company"),
"fieldtype": "Link",
"options": "Company",
"default": frappe.defaults.get_user_default("Company"),
"reqd": 1
},
{ {
"fieldname":"from_date", "fieldname":"from_date",
"label": __("From Date"), "label": __("From Date"),
@ -20,12 +28,46 @@ frappe.query_reports["Batch-Wise Balance History"] = {
"reqd": 1 "reqd": 1
}, },
{ {
"fieldname": "item", "fieldname":"item_code",
"label": __("Item"), "label": __("Item Code"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Item", "options": "Item",
"width": "80" "get_query": function() {
} return {
filters: {
"has_batch_no": 1
}
};
}
},
{
"fieldname":"warehouse",
"label": __("Warehouse"),
"fieldtype": "Link",
"options": "Warehouse",
"get_query": function() {
let company = frappe.query_report.get_filter_value('company');
return {
filters: {
"company": company
}
};
}
},
{
"fieldname":"batch_no",
"label": __("Batch No"),
"fieldtype": "Link",
"options": "Batch",
"get_query": function() {
let item_code = frappe.query_report.get_filter_value('item_code');
return {
filters: {
"item": item_code
}
};
}
},
], ],
"formatter": function (value, row, column, data, default_formatter) { "formatter": function (value, row, column, data, default_formatter) {
if (column.fieldname == "Batch" && data && !!data["Batch"]) { if (column.fieldname == "Batch" && data && !!data["Batch"]) {
@ -43,4 +85,4 @@ frappe.query_reports["Batch-Wise Balance History"] = {
frappe.set_route("query-report", "Stock Ledger"); frappe.set_route("query-report", "Stock Ledger");
} }
} }

View File

@ -57,6 +57,10 @@ def get_conditions(filters):
else: else:
frappe.throw(_("'To Date' is required")) frappe.throw(_("'To Date' is required"))
for field in ["item_code", "warehouse", "batch_no", "company"]:
if filters.get(field):
conditions += " and {0} = {1}".format(field, frappe.db.escape(filters.get(field)))
return conditions return conditions