fix: project filtering based on company in P&L Report (#35943)
* fix: project filtering in P&L Report (cherry picked from commit904ca746a6) * fix: show projects with no company value set (cherry picked from commitce252a0d45) * fix: make company field mandatory in project doctype (cherry picked from commit84d4888f5f) --------- Co-authored-by: Gursheen Anand <gursheen@frappe.io>
This commit is contained in:
@@ -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",
|
||||||
|
|||||||
@@ -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",
|
||||||
|
|||||||
Reference in New Issue
Block a user