From 9d780a172272eb834b53c1c326595300d29327f3 Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Wed, 7 Nov 2018 10:11:29 +0100
Subject: [PATCH 1/3] Fix sign

---
 htdocs/margin/tabs/thirdpartyMargins.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 5d80814099d..2f5ba9cc7b2 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -207,7 +207,10 @@ if ($socid > 0)
     			$marginRate = ($objp->buying_price != 0)?(100 * $objp->marge / $objp->buying_price):'' ;
     			$markRate = ($objp->selling_price != 0)?(100 * $objp->marge / $objp->selling_price):'' ;
 
-
+    			$sign = '';
+    			if($objp->type == Facture::TYPE_CREDIT_NOTE){
+    			    $sign = '-';
+    			}
 
     			print '<tr class="oddeven">';
     			print '<td>';
@@ -219,11 +222,11 @@ if ($socid > 0)
     			print dol_print_date($db->jdate($objp->datef),'day')."</td>";
     			print "<td align=\"right\">".price($objp->selling_price, null, null, null, null, $rounding)."</td>\n";
     			print "<td align=\"right\">".price(($objp->type == 2 ? -1 : 1) * $objp->buying_price, null, null, null, null, $rounding)."</td>\n";
-    			print "<td align=\"right\">".price($objp->marge, null, null, null, null, $rounding)."</td>\n";
+    			print "<td align=\"right\">".$sign.price($objp->marge, null, null, null, null, $rounding)."</td>\n";
     			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-    				print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+    			    print "<td align=\"right\">".(($marginRate === '')?'n/a':$sign.price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
     			if (! empty($conf->global->DISPLAY_MARK_RATES))
-    				print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+    			    print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
     			print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
     			print "</tr>\n";
     			$i++;

From 05a679a10c3a9957ac053aabede07ffa974abc01 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Wed, 7 Nov 2018 16:26:25 +0100
Subject: [PATCH 2/3] FIX : OppStatusShort doesn't exists

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

diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 6b3613a7b0a..5f683a251a2 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -533,7 +533,7 @@ if (! empty($arrayfields['p.public']['checked']))
 if (! empty($arrayfields['p.fk_opp_status']['checked']))
 {
 	print '<td class="liste_titre nowrap center">';
-	print $formproject->selectOpportunityStatus('search_opp_status', $search_opp_status, 1, 1, 1, 0, 'maxwidth100');
+	print $formproject->selectOpportunityStatus('search_opp_status', $search_opp_status, 1, 0, 1, 0, 'maxwidth100');
 	print '</td>';
 }
 if (! empty($arrayfields['p.opp_amount']['checked']))

From 70826c31912808e6ddce76783f416b245f41c3f8 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Wed, 7 Nov 2018 16:32:23 +0100
Subject: [PATCH 3/3] FIX : same on lines

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

diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 5f683a251a2..86f1c2ffcad 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -742,7 +742,7 @@ while ($i < min($num,$limit))
 		if (! empty($arrayfields['p.fk_opp_status']['checked']))
 		{
 			print '<td class="center">';
-			if ($obj->opp_status_code) print $langs->trans("OppStatusShort".$obj->opp_status_code);
+			if ($obj->opp_status_code) print $langs->trans("OppStatus".$obj->opp_status_code);
 			print '</td>';
 			if (! $i) $totalarray['nbfield']++;
 		}