diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index f28e3d1a244..079d0c5c915 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2013 Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2011 Regis Houssin           <regis.houssin@capnetworks.com>
  * Copyright (C) 2004      Sebastien Di Cintio     <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier          <benoit.mortier@opensides.be>
@@ -24,7 +24,7 @@
 /**
  *  \file       htdocs/admin/supplier_invoice.php
  *  \ingroup    fournisseur
- *  \brief      Page d'administration-configuration du module Fournisseur
+ *  \brief      Setup to admin supplier invoices
  */
 
 require '../main.inc.php';
@@ -241,7 +241,7 @@ foreach ($dirmodels as $reldir)
 
             while (($file = readdir($handle))!==false)
             {
-                if (substr($file, 0, 25) == 'mod_facture_fournisseur_' && substr($file, dol_strlen($file)-3, 3) == 'php')
+                if (substr($file, 0, 24) == 'mod_facture_fournisseur_' && substr($file, dol_strlen($file)-3, 3) == 'php')
                 {
                     $file = substr($file, 0, dol_strlen($file)-4);
 
diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
index 2ed53db1e46..b0c49293a78 100755
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -93,6 +93,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
         // Get source company
         if (! is_object($object->thirdparty)) $object->fetch_thirdparty();
+        if (! is_object($object->thirdparty)) $object->thirdparty=$mysoc;	// If fetch_thirdparty fails, object has no socid (specimen)
         $this->emetteur=$object->thirdparty;
         if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
 
diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index 44c08732d13..3607c8c4edd 100755
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -1137,21 +1137,21 @@ tr.fiche {
 
 .ok {
 	color:#159e26;
-	background:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/ok.png',1); ?>) left center no-repeat;
+	background:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/ok.png',1); ?>) left center no-repeat !important;
 	padding-left:20px;
 	font-weight:bold;
 }
 
 .warning {
 	color:#bca936;
-	background:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/warning.png',1); ?>) left center no-repeat;
+	background:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/warning.png',1); ?>) left center no-repeat !important;
 	padding-left:20px;
 	font-weight:bold;
 }
 
 .error {
 	color:#a61111;
-	background:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/error.png',1); ?>) left center no-repeat;
+	background:#f58080 url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/error.png',1); ?>) left center no-repeat !important;
 	padding-left:20px;
 	font-weight:bold;
 }
@@ -1159,17 +1159,16 @@ tr.fiche {
 td.highlights {background:#f9c5c6;}
 
 div.ok {
-	background:#61e372 url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/ok.png',1); ?>) 3px center no-repeat;
-	color:#ffffff;
+	background:#61e372; /* url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/ok.png',1); ?>) 3px center no-repeat; */
+	/*color:#ffffff;*/
 	padding:2px 4px 2px 24px;
 	margin:0.5em 0em;
-	border:1px solid #159e26;
 	font-weight:normal;
 }
 
 div.warning, div.info {
-	background:#fcf5b8 url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/warning.png',1); ?>) 3px center no-repeat;
-	color:#232323;
+	background:#fcf5b8; /* url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/warning.png',1); ?>) 3px center no-repeat; */
+	/*color:#232323; */
 	padding:2px 4px 2px 24px;
 	margin:0.5em 0em;
 	border:1px solid #bca936;
@@ -1177,8 +1176,8 @@ div.warning, div.info {
 }
 
 div.error {
-	background:#f58080 url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/error.png',1); ?>) 3px center no-repeat;
-	color:#ffffff;
+	background:#f58080; /* url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/error.png',1); ?>) 3px center no-repeat; */
+	/* color:#ffffff; */
 	padding:2px 4px 2px 24px;
 	margin:0.5em 0em;
 	border:1px solid #a61111;