From a58f713f6d64c9aa8f60a47914faf40a9278752a Mon Sep 17 00:00:00 2001
From: Polkiko <jesus.jerez1@gmail.com>
Date: Sat, 23 Oct 2021 23:12:23 +0200
Subject: [PATCH] NEW Canceled purchase orders do not qualify for total in
 project overview (and are hidden) If purchase order has been canceled then it
 does not qualify for total amount and is not shown in table. It can be seen
 by clicking on the "show/hide" button.

---
 htdocs/langs/en_US/projects.lang |  4 +++-
 htdocs/langs/es_ES/projects.lang |  2 ++
 htdocs/projet/element.php        | 27 ++++++++++++++++++++++++++-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 2fda7e1df0e..570caef7f95 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -37,6 +37,8 @@ OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
 OpportunitiesStatusForProjects=Leads amount of projects by status
 ShowProject=Show project
 ShowTask=Show task
+ShowCanceled=Show canceled
+HideCanceled=Hide canceled
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Number of projects
@@ -274,4 +276,4 @@ AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
-SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them 
\ No newline at end of file
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them 
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 6beabd61c1c..01aad98a391 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -37,6 +37,8 @@ OpportunitiesStatusForOpenedProjects=Importe oportunidades de proyectos por esta
 OpportunitiesStatusForProjects=Importe oportunidades de proyectos por estado
 ShowProject=Ver proyecto
 ShowTask=Ver tarea
+ShowCanceled=Mostrar cancelados
+HideCanceled=Ocultar cancelados
 SetProject=Definir proyecto
 NoProject=Ningún proyecto definido
 NbOfProjects=Numero de proyectos
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 9e14a53e7ea..0002da42a82 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -1048,6 +1048,24 @@ foreach ($listofreferent as $key => $value) {
 			}
 			$addform .= '<div>';
 		}
+		if ($key == "order_supplier") {
+			$addform .= '<a id="btnShow" class="buttonxxx marginleftonly" href="#" onClick="return false;">
+						 <span id="textBtnShow" class="valignmiddle text-plus-circle hideonsmartphone">'.$langs->trans("ShowCanceled").'</span><span id="minus-circle" class="fa fa-eye valignmiddle paddingleft" style="padding: 3px 4px 2px 3px"></span>
+						 </a>
+						 <script>
+						 $("#btnShow").on("click", function () {
+							if($("#tr_canceled").css("display") == "none"){
+								$("#tr_canceled").show();
+								$("#textBtnShow").text("'.$langs->trans("HideCanceled").'");
+								$("#minus-circle").removeClass("fa-eye").addClass("fa-eye-slash");
+							} else {
+								$("#tr_canceled").hide();
+								$("#textBtnShow").text("'.$langs->trans("ShowCanceled").'");
+								$("#minus-circle").removeClass("fa-eye-slash").addClass("fa-eye");
+							}
+						 });
+						 </script>';
+		}
 
 		print load_fiche_titre($langs->trans($title), $addform, '');
 
@@ -1170,9 +1188,16 @@ foreach ($listofreferent as $key => $value) {
 					if (!empty($element->close_code) && $element->close_code == 'replaced') {
 						$qualifiedfortotal = false; // Replacement invoice, do not include into total
 					}
+				} elseif (($key == 'order_supplier') && ($element->status == 7)) {
+					$qualifiedfortotal = false; // It makes no sense to include canceled orders in the total
+				}
+
+				if (($key == "order_supplier") && ($element->status == 7)) {
+					print '<tr id ="tr_canceled" class="oddeven" style=display:none>';
+				} else {
+					print '<tr class="oddeven" >';
 				}
 
-				print '<tr class="oddeven">';
 
 				// Remove link
 				print '<td style="width: 24px">';