From aa699bacc6b64e0e6f4fe2d363c28782c7aaed8f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Aug 2020 20:10:31 +0200
Subject: [PATCH] css

---
 htdocs/product/list.php            | 24 +++++++++++++++++-------
 htdocs/societe/list.php            |  1 +
 htdocs/theme/eldy/info-box.inc.php | 18 ++++++++++++++++++
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 4b74e6b9a0f..2acdbaa7f56 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -647,7 +647,7 @@ if ($resql)
 	// Type
 	if (!empty($arrayfields['p.fk_product_type']['checked']))
 	{
-		print '<td class="liste_titre left">';
+		print '<td class="liste_titre center">';
 		$array = array('-1'=>'&nbsp;', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service'));
 		print $form->selectarray('search_type', $array, $search_type);
 		print '</td>';
@@ -875,7 +875,7 @@ if ($resql)
         print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"], "p.label", "", $param, "", $sortfield, $sortorder);
     }
     if (!empty($arrayfields['p.fk_product_type']['checked'])) {
-        print_liste_field_titre($arrayfields['p.fk_product_type']['label'], $_SERVER["PHP_SELF"], "p.fk_product_type", "", $param, "", $sortfield, $sortorder);
+        print_liste_field_titre($arrayfields['p.fk_product_type']['label'], $_SERVER["PHP_SELF"], "p.fk_product_type", "", $param, "", $sortfield, $sortorder, 'center ');
     }
     if (!empty($arrayfields['p.barcode']['checked'])) {
         print_liste_field_titre($arrayfields['p.barcode']['label'], $_SERVER["PHP_SELF"], "p.barcode", "", $param, "", $sortfield, $sortorder);
@@ -1086,9 +1086,19 @@ if ($resql)
 		// Type
 		if (!empty($arrayfields['p.fk_product_type']['checked']))
 		{
-			print '<td>';
-			if ($obj->fk_product_type == 0) print $langs->trans("Product");
-			else print $langs->trans("Service");
+			print '<td class="center">';
+			$s = '';
+			if ($obj->fk_product_type == 0)
+			{
+				$s .= '<a class="product-type-back" title="'.$langs->trans("Product").'">';
+				$s .= dol_substr($langs->trans("Product"), 0, 1);
+				$s .= '</a>';
+			} else {
+				$s .= '<span class="service-type-back" title="'.$langs->trans("Service").'">';
+				$s .= dol_substr($langs->trans("Service"), 0, 1);
+				$s .= '</a>';
+			}
+			print $s;
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
@@ -1323,7 +1333,7 @@ if ($resql)
 			print '</td>';
 		}
 
-        // Sell Tax Rate
+        // VAT or Sell Tax Rate
         if (!empty($arrayfields['p.tva_tx']['checked']))
         {
             print '<td class="right">';
@@ -1339,7 +1349,7 @@ if ($resql)
 			print price($product_static->pmp, 1, $langs);
 			print '</td>';
 		}
-		// cost_price
+		// Cost price
 		if (!empty($arrayfields['p.cost_price']['checked']))
 		{
 			print '<td class="nowrap right">';
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index cc61e6c3318..71e214af5c0 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -1196,6 +1196,7 @@ while ($i < min($num, $limit))
 		print "<td>".$obj->idprof6."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
+	// VAT
 	if (!empty($arrayfields['s.tva_intra']['checked']))
 	{
 		print "<td>";
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index c1f3be0df41..5d4ae8de59b 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -263,6 +263,24 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
 	border-radius: 3px;
 }
 
+.product-type-back {
+    background-color: #a6c974 !important;
+    color: #FFF !important;
+    padding: 2px;
+    margin: 2px;
+    border-bottom-left-radius: 5px;
+    border-top-right-radius: 5px;
+}
+.service-type-back {
+    background-color: #979c01 !important;
+    color: #FFF !important;
+    padding: 2px;
+    margin: 2px;
+    border-bottom-right-radius: 5px;
+    border-top-left-radius: 5px;
+}
+
+
 .bg-infobox-project{
 	<?php echo $prefix; ?>color: #6c6aa8 !important;
 }