From 904ca746a69e3e53fd8469fadac56d18d5af9e27 Mon Sep 17 00:00:00 2001 From: Gursheen Anand Date: Fri, 30 Jun 2023 12:11:23 +0530 Subject: [PATCH 1/3] fix: project filtering in P&L Report --- .../profit_and_loss_statement/profit_and_loss_statement.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js index 1c461efbcd3..298d83894c6 100644 --- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js +++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js @@ -14,8 +14,10 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() { "label": __("Project"), "fieldtype": "MultiSelectList", 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", From ce252a0d45918f9cb03626bad9521e92df2be260 Mon Sep 17 00:00:00 2001 From: Gursheen Anand Date: Fri, 30 Jun 2023 12:42:19 +0530 Subject: [PATCH 2/3] fix: show projects with no company value set --- .../profit_and_loss_statement/profit_and_loss_statement.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js index 298d83894c6..6fda7b5220b 100644 --- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js +++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js @@ -15,7 +15,7 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() { "fieldtype": "MultiSelectList", get_data: function(txt) { return frappe.db.get_link_options('Project', txt, { - company: frappe.query_report.get_filter_value("company") + company: ["in", [frappe.query_report.get_filter_value("company"), ""]], }); }, }, From 84d4888f5fcd8ff98e308b501b63f28d890dd861 Mon Sep 17 00:00:00 2001 From: Gursheen Anand Date: Fri, 30 Jun 2023 12:54:45 +0530 Subject: [PATCH 3/3] fix: make company field mandatory in project doctype --- .../profit_and_loss_statement/profit_and_loss_statement.js | 2 +- erpnext/projects/doctype/project/project.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js index 6fda7b5220b..298d83894c6 100644 --- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js +++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js @@ -15,7 +15,7 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() { "fieldtype": "MultiSelectList", get_data: function(txt) { return frappe.db.get_link_options('Project', txt, { - company: ["in", [frappe.query_report.get_filter_value("company"), ""]], + company: frappe.query_report.get_filter_value("company") }); }, }, diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json index f007430ab37..502ee574159 100644 --- a/erpnext/projects/doctype/project/project.json +++ b/erpnext/projects/doctype/project/project.json @@ -289,7 +289,8 @@ "fieldtype": "Link", "label": "Company", "options": "Company", - "remember_last_selected_value": 1 + "remember_last_selected_value": 1, + "reqd": 1 }, { "fieldname": "column_break_28",