From c033a4778e68f8371ff7a4983a0751de0ed6b591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josep=20Llu=C3=ADs?= <joseplluis@lliuretic.cat>
Date: Wed, 21 Dec 2022 13:17:18 +0100
Subject: [PATCH 1/4] New filter for Signed+Billed in proposals

New filter for Signed+Billed in proposals
---
 htdocs/core/class/html.formpropal.class.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index e23e71a8124..d9c458161bc 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -132,6 +132,14 @@ class FormPropal
 			print '</option>';
 			$i++;
 		}
+		//Option for Signed+Billed
+		if ($selected != '' && $selected == "2,4") {
+            print '<option value="2,4" selected>';
+        } else {
+            print '<option value="2,4">';
+        }
+		print ($langs->trans($prefix.'Signed'.($short ? 'Short' : '')).'+'.$langs->trans($prefix.'Billed'.($short ? 'Short' : '')));
+        print '</option>';
 		print '</select>';
 
 		print ajax_combobox($htmlname, array(), 0, 0, 'resolve', ($showempty < 0 ? (string) $showempty : '-1'), $morecss);

From 3004c3cd920b815651aaa36c491cd4444d7fb1e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josep=20Llu=C3=ADs?= <joseplluis@lliuretic.cat>
Date: Wed, 21 Dec 2022 13:22:56 +0100
Subject: [PATCH 2/4] Update html.formpropal.class.php

---
 htdocs/core/class/html.formpropal.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index d9c458161bc..48551926e1f 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2012 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2022 Josep Lluís Amador	<joseplluis@lliuretic.cat>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From 80d6c262029ec69caec69db358fa4fbae5cc89ec Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 21 Dec 2022 12:31:33 +0000
Subject: [PATCH 3/4] Fixing style errors.

---
 htdocs/core/class/html.formpropal.class.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index 48551926e1f..fbbf2c97fb7 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -135,12 +135,12 @@ class FormPropal
 		}
 		//Option for Signed+Billed
 		if ($selected != '' && $selected == "2,4") {
-            print '<option value="2,4" selected>';
-        } else {
-            print '<option value="2,4">';
-        }
+			print '<option value="2,4" selected>';
+		} else {
+			print '<option value="2,4">';
+		}
 		print ($langs->trans($prefix.'Signed'.($short ? 'Short' : '')).'+'.$langs->trans($prefix.'Billed'.($short ? 'Short' : '')));
-        print '</option>';
+		print '</option>';
 		print '</select>';
 
 		print ajax_combobox($htmlname, array(), 0, 0, 'resolve', ($showempty < 0 ? (string) $showempty : '-1'), $morecss);

From edfa7dddfcc4c78faa6f6130f418be6818488205 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2023 01:50:25 +0100
Subject: [PATCH 4/4] Update html.formpropal.class.php

---
 htdocs/core/class/html.formpropal.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index fbbf2c97fb7..7cce3c839c5 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -139,7 +139,7 @@ class FormPropal
 		} else {
 			print '<option value="2,4">';
 		}
-		print ($langs->trans($prefix.'Signed'.($short ? 'Short' : '')).'+'.$langs->trans($prefix.'Billed'.($short ? 'Short' : '')));
+		print ($langs->trans($prefix.'Signed'.($short ? 'Short' : '')).' '.$langs->trans("or").' '.$langs->trans($prefix.'Billed'.($short ? 'Short' : '')));
 		print '</option>';
 		print '</select>';