From 2959dc4a3a076a47e4c41793f1d41f8116dcb86d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 15 Apr 2018 18:20:04 +0200
Subject: [PATCH] Fix regression

---
 htdocs/fourn/class/fournisseur.commande.class.php | 7 +++++--
 htdocs/product/fournisseurs.php                   | 2 +-
 test/phpunit/CommandeFournisseurTest.php          | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index df4a189b885..4b795862e9b 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -324,9 +324,12 @@ class CommandeFournisseur extends CommonOrder
             $result=$this->fetch_lines();
             if ($result < 0)
             {
-            	return -3;
+            	return -1;
+            }
+            else
+            {
+            	return 1;
             }
-
         }
         else
         {
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index ebb7f9753dc..21439a1ac8a 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -852,7 +852,7 @@ SCRIPT;
 						{
 							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$productfourn->fourn_id.'&amp;action=add_price&amp;rowid='.$productfourn->product_fourn_price_id.'">'.img_edit()."</a>";
 							print ' &nbsp; ';
-							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$productfourn->fourn_id.'&amp;action=ask_remove_pf&amp;rowid='.$productfourn->product_fourn_price_id.'">'.img_picto($langs->trans("Remove"),'disable.png').'</a>';
+							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$productfourn->fourn_id.'&amp;action=ask_remove_pf&amp;rowid='.$productfourn->product_fourn_price_id.'">'.img_picto($langs->trans("Remove"),'delete').'</a>';
 						}
 
 						print '</td>';
diff --git a/test/phpunit/CommandeFournisseurTest.php b/test/phpunit/CommandeFournisseurTest.php
index 2d615e0bd06..33271a07dcc 100644
--- a/test/phpunit/CommandeFournisseurTest.php
+++ b/test/phpunit/CommandeFournisseurTest.php
@@ -179,7 +179,7 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase
 
         $result=$localobject2->create($user);
         print __METHOD__." result=".$result."\n";
-        $this->assertGreaterThanOrEqual(0, $result);
+        $this->assertGreaterThan(0, $result);
 
         return $result;
     }
@@ -206,7 +206,7 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase
         $result=$localobject->fetch($id);
 
         print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+        $this->assertLessThan($result, 0, 'Failed to fetch supplier order with id '.$id);
         return $localobject;
     }