diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0773e95f2a6..a4fe3df4034 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -16,7 +16,7 @@
  * Copyright (C) 2012       Cedric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2012-2015  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2014       Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2018-2021  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018       Nicolas ZABOURI	        <info@inovea-conseil.com>
  * Copyright (C) 2018       Christophe Battarel     <christophe@altairis.fr>
@@ -7205,7 +7205,7 @@ class Form
 						print '<input type="radio" name="idtolinkto" value='.$objp->rowid.'>';
 						print '</td>';
 						print '<td class="center">'.$objp->ref.'</td>';
-						print '<td>'.$objp->ref_client.'</td>';
+						print '<td>'.(!empty($objp->ref_client) ? $objp->ref_client : $objp->ref_supplier).'</td>';
 						print '<td class="right">';
 						if ($possiblelink[label] == 'LinkToContract') {
 							$form = new Form($db);
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 057122ec648..c81e5440a5d 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -285,15 +285,15 @@ class modAccounting extends DolibarrModules
 			//'b.doc_type'=>'Doctype',
 			'b.doc_ref'=>'Piece',
 			'b.code_journal'=>'Codejournal',
-			//'b.journal_label'=>'JournalLabel',
+			'b.journal_label'=>'JournalLabel',
 			'b.numero_compte'=>'AccountAccounting',
-			//'b.label_compte'=>'LabelAccount',
+			'b.label_compte'=>'LabelAccount',
 			'b.subledger_account'=>'SubledgerAccount',
 			'b.subledger_label'=>'SubledgerAccountLabel',
 			'b.label_operation'=>'LabelOperation',
 			'b.debit'=>"Debit",
 			'b.credit'=>"Credit",
-			'b.sens'=>'Direction'	// This field is still used by accounting export. We can remove it once it has been replace into accountancyexport.class.php by a detection using ->debit and ->credit
+			'b.sens'=>'Direction'	// This field is still used by accounting export. We can remove it once it has been replaced into accountancyexport.class.php by a detection using ->debit and ->credit
 		);
 		$this->import_fieldshidden_array[$r] = array('b.doc_type'=>'const-import_from_external', 'b.fk_doc'=>'const-0', 'b.fk_docdet'=>'const-0', 'b.fk_user_author'=>'user->id', 'b.date_creation'=>'const-'.dol_print_date(dol_now(), 'standard')); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_regex_array[$r] = array('b.doc_date'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
@@ -303,9 +303,9 @@ class modAccounting extends DolibarrModules
 			//'b.doc_type'=>'import',
 			'b.doc_ref'=>'My document ABC',
 			'b.code_journal'=>"VTE",
-			//'b.journal_label'=>"Sale journal",
+			'b.journal_label'=>"Sale journal",
 			'b.numero_compte'=>"707",
-			//'b.label_compte'=>'Product account 707',
+			'b.label_compte'=>'Product account 707',
 			'b.subledger_account'=>'',
 			'b.subledger_label'=>'',
 			'b.label_operation'=>"Sale of ABC",