From 66d4b7372ecc843a246bac1b85dc16c878b499d8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 Aug 2020 22:36:14 +0200
Subject: [PATCH 1/2] FIX Look and feel v12

Conflicts:
	htdocs/comm/card.php
	htdocs/societe/tpl/linesalesrepresentative.tpl.php
---
 htdocs/comm/card.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 9b385ea7ead..d48c897d6bb 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -529,6 +529,7 @@ if ($object->id > 0)
 
 	print "</table>";
 
+	// Prospection level and status
 	if ($object->client == 2 || $object->client == 3)
 	{
     	print '<br>';
@@ -541,7 +542,7 @@ if ($object->id > 0)
 	    print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 	    print $langs->trans('ProspectLevel');
 	    print '<td>';
-	    if ($action != 'editlevel' && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;socid='.$object->id.'">'.img_edit($langs->trans('Modify'), 1).'</a></td>';
+	    if ($action != 'editlevel' && $user->rights->societe->creer) print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;socid='.$object->id.'">'.img_edit($langs->trans('Modify'), 1).'</a></td>';
 	    print '</tr></table>';
 	    print '</td><td>';
 	    if ($action == 'editlevel')
@@ -564,7 +565,7 @@ if ($object->id > 0)
         {
             $titlealt = 'default';
             if (!empty($val['code']) && !in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt = $val['label'];
-            if ($object->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&stcomm='.$val['code'].'&action=setstcomm">'.img_action($titlealt, $val['code']).'</a>';
+            if ($object->stcomm_id != $val['id']) print '<a class="pictosubstatus reposition" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&stcomm='.$val['code'].'&action=setstcomm">'.img_action($titlealt, $val['code']).'</a>';
         }
         print '</div></td></tr>';
         print "</table>";
@@ -1146,7 +1147,7 @@ if ($object->id > 0)
 	}
 
 	/*
-	 *   Last invoices
+	 *   Latest invoices
 	 */
 	if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	{

From c35a1036945f643a05cf0620fece3ec46cb32220 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 Aug 2020 22:40:17 +0200
Subject: [PATCH 2/2] Fix phpcs

---
 htdocs/admin/receiptprinter.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index 7af626ef0bb..3cb6c4d68d1 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -391,7 +391,6 @@ if ($mode == 'config' && $user->admin) {
 
 // mode = template
 if ($mode == 'template' && $user->admin) {
-
 	dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
 
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=template" autocomplete="off">';