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

Merge pull request #35943 from GursheenK/company-specific-proj-filtering

Browse Source 
fix: project filtering based on company in P&L Report
This commit is contained in:
Deepesh Garg 2023-06-30 20:01:24 +05:30 committed by GitHub
commit be5cb1aa17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
View File

@ -14,8 +14,10 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
"label": __("Project"), "label": __("Project"),
"fieldtype": "MultiSelectList", "fieldtype": "MultiSelectList",
get_data: function(txt) { get_data: function(txt) {
return frappe.db.get_link_options('Project', txt); return frappe.db.get_link_options('Project', txt, {
} company: frappe.query_report.get_filter_value("company")
});
},
}, },
{ {
"fieldname": "include_default_book_entries", "fieldname": "include_default_book_entries",

3
erpnext/projects/doctype/project/project.json
View File

@ -289,7 +289,8 @@
"fieldtype": "Link", "fieldtype": "Link",
"label": "Company", "label": "Company",
"options": "Company", "options": "Company",
"remember_last_selected_value": 1 "remember_last_selected_value": 1,
"reqd": 1
}, },
{ {
"fieldname": "column_break_28", "fieldname": "column_break_28",