From 8de1d8663f67fb491f07f10ecef31e429538dda8 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 10:42:33 +0530
Subject: [PATCH] fix: project filtering based on company in P&L Report
 (#35943)

* fix: project filtering in P&L Report

(cherry picked from commit 904ca746a69e3e53fd8469fadac56d18d5af9e27)

* fix: show projects with no company value set

(cherry picked from commit ce252a0d45918f9cb03626bad9521e92df2be260)

* fix: make company field mandatory in project doctype

(cherry picked from commit 84d4888f5fcd8ff98e308b501b63f28d890dd861)

---------

Co-authored-by: Gursheen Anand <gursheen@frappe.io>
---
 .../profit_and_loss_statement/profit_and_loss_statement.js  | 6 ++++--
 erpnext/projects/doctype/project/project.json               | 3 ++-
 2 files changed, 6 insertions(+), 3 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",
diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json
index ba7aa850825..8238af0ad16 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",