diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 91986653e54..4e511c462b7 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1375,14 +1375,14 @@ class CommonObject
 			}
 			
 			$classpath = $element.'/class';
-			if ($element == 'facture') { $tplpath = 'compta/'.$element; $classpath = $tplpath.'/class'; }  // To work with non standard path
-			if ($element == 'propal') { $tplpath = 'comm/'.$element; $classpath = $tplpath.'/class'; }    // To work with non standard path
-            if ($element == 'invoice_supplier') { $tplpath = 'fourn/facture'; $classpath = 'fourn/class'; }    // To work with non standard path
-            if ($element == 'order_supplier') { $tplpath = 'fourn/commande'; $classpath = 'fourn/class'; }    // To work with non standard path
+			if ($objecttype == 'facture') { $tplpath = 'compta/'.$element; $classpath = $tplpath.'/class'; }  // To work with non standard path
+			if ($objecttype == 'propal')  { $tplpath = 'comm/'.$element; $classpath = $tplpath.'/class'; }    // To work with non standard path
+            if ($objecttype == 'invoice_supplier') { $tplpath = 'fourn/facture'; $classpath = 'fourn/class'; }    // To work with non standard path
+            if ($objecttype == 'order_supplier')   { $tplpath = 'fourn/commande'; $classpath = 'fourn/class'; }    // To work with non standard path
 
             $classfile = strtolower($subelement); $classname = ucfirst($subelement);
-			if ($subelement == 'invoice_supplier') { $classfile='fournisseur.facture'; $classname='FactureFournisseur';   }
-            if ($subelement == 'order_supplier')   { $classfile='fournisseur.commande'; $classname='CommandeFournisseur'; }
+			if ($objecttype == 'invoice_supplier') { $classfile='fournisseur.facture'; $classname='FactureFournisseur';   }
+            if ($objecttype == 'order_supplier')   { $classfile='fournisseur.commande'; $classname='CommandeFournisseur'; }
             //print $classfile." - ".$classpath." - ".$tplpath;
             if(!class_exists($classname))
             {
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 7ae77169e56..a9a1648bb36 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -1341,8 +1341,6 @@ if ($id > 0 || ! empty($ref))
 
 			$object=$commande;
 
-            if ($somethingshown) print '<br>';
-			
             /*
              * Linked object block
              */
diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
index 3c4c97d1597..565d17b63db 100755
--- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
@@ -22,6 +22,13 @@
 <!-- BEGIN PHP TEMPLATE -->
 
 <?php
+
+$langs = $GLOBALS['langs'];
+$somethingshown = $GLOBALS['somethingshown'];
+$linkedObjectBlock = $GLOBALS['object']->linkedObjectBlock;
+$objectid = $GLOBALS['object']->objectid;
+$num = count($objectid);
+
 $langs->load("orders");
 if ($somethingshown) { echo '<br>'; }
 print_titre($langs->trans('RelatedOrders'));
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 11f71240655..814fa32d209 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -1806,8 +1806,6 @@ else
 
                 $object=$fac;
 
-                if ($somethingshown) print '<br>';
-                
                 /*
                  * Linked object block
                  */
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index b2b01865454..8f3a0eb998b 100755
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -22,6 +22,13 @@
 <!-- BEGIN PHP TEMPLATE -->
 
 <?php
+
+$langs = $GLOBALS['langs'];
+$somethingshown = $GLOBALS['somethingshown'];
+$linkedObjectBlock = $GLOBALS['object']->linkedObjectBlock;
+$objectid = $GLOBALS['object']->objectid;
+$num = count($objectid);
+
 $langs->load("bills");
 if ($somethingshown) { echo '<br>'; }
 if ($num > 1) print_titre($langs->trans("RelatedBills"));