Fix error management

htdocs/admin/tools/export.php

@@ -189,15 +189,16 @@ if ($what == 'mysql')
         $ok=0;
         dol_syslog("Run command ".$fullcommandcrypted);
         $handlein = popen($fullcommandclear, 'r');
-        while (!feof($handlein))
-        {
-            $read = fgets($handlein);
-            fwrite($handle,$read);
-            if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
-            elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
+        if ($handlein) {
+	        while (!feof($handlein))
+	        {
+	            $read = fgets($handlein);
+	            fwrite($handle,$read);
+	            if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
+	            elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
+	        }
+	        pclose($handlein);
         }
-        pclose($handlein);
-
         if ($compression == 'none') fclose($handle);
         if ($compression == 'gz')   gzclose($handle);
         if ($compression == 'bz')   bzclose($handle);

htdocs/fourn/class/fournisseur.commande.class.php

@@ -940,6 +940,7 @@ class CommandeFournisseur extends CommonOrder
 	                    $this->lines[$i]->remise_percent,
 	                    'HT',
 	                    0,
+	                    $this->lines[$i]->product_type,
 	                    $this->lines[$i]->info_bits
 	                );
 	                if ($result < 0)