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

fix: add account filter

Browse Source
This commit is contained in:
18alantom 2021-06-07 13:58:45 +05:30
parent 23b907df1a
commit 6f79c4c348
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.js
View File

@ -2,8 +2,9 @@
// For license information, please see license.txt // For license information, please see license.txt
/* eslint-disable */ /* eslint-disable */
frappe.query_reports["COGS By Item Group"] = { frappe.query_reports["COGS By Item Group"] = {
"filters": [ filters: [
{ {
label: __("Company"), label: __("Company"),
fieldname: "company", fieldname: "company",
@ -12,22 +13,22 @@ frappe.query_reports["COGS By Item Group"] = {
mandatory: true, mandatory: true,
default: frappe.defaults.get_user_default("Company"), default: frappe.defaults.get_user_default("Company"),
}, },
{ // {
label: __("Account"), // label: __("Account"),
fieldname: "account", // fieldname: "account",
fieldtype: "Link", // fieldtype: "Link",
options: "Account", // options: "Account",
mandatory: true, // mandatory: true,
get_query() { // get_query() {
var company = frappe.query_report.get_filter_value('company'); // const company = frappe.query_report.get_filter_value('company');
return { // return {
"doctype": "Account", // "doctype": "Account",
"filters": { // "filters": {
"company": company, // "company": company,
} // }
} // }
}, // },
}, // },
{ {
label: __("From Date"), label: __("From Date"),
fieldname: "from_date", fieldname: "from_date",

6
erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.py
View File

@ -9,12 +9,18 @@ from erpnext.accounts.report.general_ledger.general_ledger import get_gl_entries
def execute(filters=None): def execute(filters=None):
update_filters_with_account(filters)
validate_filters(filters) validate_filters(filters)
columns = get_columns() columns = get_columns()
data = get_data(filters) data = get_data(filters)
return columns, data return columns, data
def update_filters_with_account(filters):
account = frappe.get_value("Company", filters.get("company"), "default_expense_account")
filters.update(dict(account=account))
def validate_filters(filters): def validate_filters(filters):
if filters.from_date > filters.to_date: if filters.from_date > filters.to_date:
frappe.throw(_("From Date must be before To Date")) frappe.throw(_("From Date must be before To Date"))