From 513ef1e727e8fc8dbe215e3789079d8a5ccf7207 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 Mar 2019 16:16:08 +0100
Subject: [PATCH 1/3] Fix label short

---
 htdocs/core/lib/functions.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f1c67429d95..0937981164b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8027,7 +8027,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
         }
 
         if ($displayMode === 2) {
-            $return =  $htmlImg .' '. $htmlLabel;
+            $return =  $htmlImg .' '. $htmlLabelShort;
         }
         elseif ($displayMode === 3) {
             $return = $htmlImg;

From c62d147c600831fc5be502ddcdc8e09e985e751b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 25 Mar 2019 16:47:20 +0100
Subject: [PATCH 2/3] Auto clean search field to avoid to have 2 conflict
 search criteria

---
 htdocs/accountancy/admin/productaccount.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 07df2a91872..37ec3c4e503 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -333,7 +333,7 @@ if ($result)
 	if ($accounting_product_mode == 'ACCOUNTANCY_BUY') print '<td class="liste_titre"></td>';
 	// Current account
 	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" size="6" name="search_current_account" value="' . dol_escape_htmltag($search_current_account) . '">';
+	print '<input type="text" class="flat" size="6" name="search_current_account" id="search_current_account" value="' . dol_escape_htmltag($search_current_account) . '">';
 	$listofvals=array('withoutvalidaccount'=>$langs->trans("WithoutValidAccount"), 'withvalidaccount'=>$langs->trans("WithValidAccount"));
 	print ' '.$langs->trans("or").' '.$form->selectarray('search_current_account_valid', $listofvals, $search_current_account_valid, 1);
 	print '</td>';
@@ -481,6 +481,14 @@ if ($result)
         	});
 
         	init_savebutton();
+
+            jQuery("#search_current_account").keyup(function() {
+        		if (jQuery("#search_current_account").val() != \'\')
+                {
+                    console.log("We set a value of account to search "+jQuery("#search_current_account").val()+", so we disable the other search criteria on account");
+                    jQuery("#search_current_account_valid").val(-1);
+                }
+        	});
         });
         </script>';
 

From 12c5844065680f814d9e15d46e833789c9b9d5d3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 26 Mar 2019 11:55:22 +0100
Subject: [PATCH 3/3] Look and feel v10

---
 htdocs/contrat/contact.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 1e8fbcbfdee..1235fe301cf 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -204,7 +204,7 @@ if ($id > 0 || ! empty($ref))
 	    print '<div class="fichecenter">';
 	    print '<div class="underbanner clearboth"></div>';
 
-		print '<table class="border" width="100%">';
+		print '<table class="border tableforfield" width="100%">';
 
 
         // Ligne info remises tiers