diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 12759b9fbf2..cb7944e1cac 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -753,7 +753,7 @@ abstract class CommonInvoice extends CommonObject
 
 					if (!$error) {
 						// Force payment mode of invoice to withdraw
-						$payment_mode_id = dol_getIdFromCode($this->db, 'PRE', 'c_paiement', 'code', 'id', 1);
+						$payment_mode_id = dol_getIdFromCode($this->db, ($type == 'bank-transfer' ? 'VIR' : 'PRE'), 'c_paiement', 'code', 'id', 1);
 						if ($payment_mode_id > 0) {
 							$result = $this->setPaymentMethods($payment_mode_id);
 						}
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index e070985fbfb..959cb45a77e 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -416,8 +416,7 @@ class ImportCsv extends ModeleImports
 									$newval = preg_replace('/^(id|ref):/i', '', $newval); // Remove id: or ref: that was used to force if field is id or ref
 									//print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
 
-									if ($isidorref == 'ref')    // If value into input import file is a ref, we apply the function defined into descriptor
-									{
+									if ($isidorref == 'ref') {    // If value into input import file is a ref, we apply the function defined into descriptor
 										$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
 										$class = $objimport->array_import_convertvalue[0][$val]['class'];
 										$method = $objimport->array_import_convertvalue[0][$val]['method'];
@@ -472,8 +471,7 @@ class ImportCsv extends ModeleImports
 											}
 										}
 									}
-								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel')
-								{
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel') {
 									$isidorref = 'id';
 									if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
 									$newval = preg_replace('/^(id|ref):/i', '', $newval);
@@ -509,11 +507,9 @@ class ImportCsv extends ModeleImports
 											}
 										}
 									}
-								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull')
-								{
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull') {
 									if (empty($newval)) $newval = '0';
-								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits')
-								{
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits') {
 									$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
 									$class = $objimport->array_import_convertvalue[0][$val]['class'];
 									$method = $objimport->array_import_convertvalue[0][$val]['method'];
@@ -545,8 +541,7 @@ class ImportCsv extends ModeleImports
 											$error++;
 										}
 									}
-								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
-								{
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto') {
 									if (strtolower($newval) == 'auto')
 									{
 										$this->thirpartyobject->get_codeclient(0, 0);
@@ -554,8 +549,7 @@ class ImportCsv extends ModeleImports
 										//print 'code_client='.$newval;
 									}
 									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto')
-								{
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto') {
 									if (strtolower($newval) == 'auto')
 									{
 										$newval = $this->thirpartyobject->get_codefournisseur(0, 1);
@@ -563,8 +557,7 @@ class ImportCsv extends ModeleImports
 										//print 'code_fournisseur='.$newval;
 									}
 									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto')
-								{
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto') {
 									if (strtolower($newval) == 'auto')
 									{
 										$this->thirpartyobject->get_codecompta('customer');
@@ -572,8 +565,7 @@ class ImportCsv extends ModeleImports
 										//print 'code_compta='.$newval;
 									}
 									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto')
-								{
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto') {
 									if (strtolower($newval) == 'auto')
 									{
 										$this->thirpartyobject->get_codecompta('supplier');
@@ -582,8 +574,7 @@ class ImportCsv extends ModeleImports
 										//print 'code_compta_fournisseur='.$newval;
 									}
 									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto')
-								{
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto') {
 									$defaultref = '';
 									// TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
 									$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
@@ -595,8 +586,7 @@ class ImportCsv extends ModeleImports
 									}
 									if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
 									$newval = $defaultref;
-								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute')
-								{
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute') {
 									$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
 									$class = $objimport->array_import_convertvalue[0][$val]['class'];
 									$method = $objimport->array_import_convertvalue[0][$val]['method'];
@@ -614,9 +604,10 @@ class ImportCsv extends ModeleImports
 										$this->errors[$error]['type'] = 'FOREIGNKEY';
 										$errorforthistable++;
 										$error++;
+									} else {
+										$newval = $arrayrecord[($key - 1)]['val'];	//We get new value computed.
 									}
-								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
-								{
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
 									$newval = price2num($newval);
 								}
 
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 14c78087e8c..5502508d350 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -450,8 +450,7 @@ class ImportXlsx extends ModeleImports
 									$newval = preg_replace('/^(id|ref):/i', '', $newval); // Remove id: or ref: that was used to force if field is id or ref
 									//print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
 
-									if ($isidorref == 'ref')    // If value into input import file is a ref, we apply the function defined into descriptor
-									{
+									if ($isidorref == 'ref') {    // If value into input import file is a ref, we apply the function defined into descriptor
 										$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
 										$class = $objimport->array_import_convertvalue[0][$val]['class'];
 										$method = $objimport->array_import_convertvalue[0][$val]['method'];
@@ -506,8 +505,7 @@ class ImportXlsx extends ModeleImports
 											}
 										}
 									}
-								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel')
-								{
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel') {
 									$isidorref = 'id';
 									if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
 									$newval = preg_replace('/^(id|ref):/i', '', $newval);
@@ -543,11 +541,9 @@ class ImportXlsx extends ModeleImports
 											}
 										}
 									}
-								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull')
-								{
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull') {
 									if (empty($newval)) $newval = '0';
-								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits')
-								{
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits') {
 									$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
 									$class = $objimport->array_import_convertvalue[0][$val]['class'];
 									$method = $objimport->array_import_convertvalue[0][$val]['method'];
@@ -579,8 +575,7 @@ class ImportXlsx extends ModeleImports
 											$error++;
 										}
 									}
-								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
-								{
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto') {
 									if (strtolower($newval) == 'auto')
 									{
 										$this->thirpartyobject->get_codeclient(0, 0);
@@ -588,8 +583,7 @@ class ImportXlsx extends ModeleImports
 										//print 'code_client='.$newval;
 									}
 									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto')
-								{
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto') {
 									if (strtolower($newval) == 'auto')
 									{
 										$newval = $this->thirpartyobject->get_codefournisseur(0, 1);
@@ -597,8 +591,7 @@ class ImportXlsx extends ModeleImports
 										//print 'code_fournisseur='.$newval;
 									}
 									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto')
-								{
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto') {
 									if (strtolower($newval) == 'auto')
 									{
 										$this->thirpartyobject->get_codecompta('customer');
@@ -606,8 +599,7 @@ class ImportXlsx extends ModeleImports
 										//print 'code_compta='.$newval;
 									}
 									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto')
-								{
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto') {
 									if (strtolower($newval) == 'auto')
 									{
 										$this->thirpartyobject->get_codecompta('supplier');
@@ -616,8 +608,7 @@ class ImportXlsx extends ModeleImports
 										//print 'code_compta_fournisseur='.$newval;
 									}
 									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto')
-								{
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto') {
 									$defaultref = '';
 									// TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
 									$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
@@ -629,8 +620,7 @@ class ImportXlsx extends ModeleImports
 									}
 									if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
 									$newval = $defaultref;
-								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute')
-								{
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute') {
 									$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
 									$class = $objimport->array_import_convertvalue[0][$val]['class'];
 									$method = $objimport->array_import_convertvalue[0][$val]['method'];
@@ -648,9 +638,10 @@ class ImportXlsx extends ModeleImports
 										$this->errors[$error]['type'] = 'FOREIGNKEY';
 										$errorforthistable++;
 										$error++;
+									} else {
+										$newval = $arrayrecord[($key - 1)]['val'];	//We get new value computed.
 									}
-								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
-								{
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
 									$newval = price2num($newval);
 								}
 
diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index de837b16edf..dea5ce60d6e 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -80,7 +80,12 @@ $(document).ready(function(){
 						console.log("tableDND end of ajax call");
 						if (reloadpage == 1) {
 							//console.log('<?php echo $urltorefreshaftermove.' - '.$_SERVER['PHP_SELF'].' - '.dol_escape_js($_SERVER['QUERY_STRING']); ?>');
-							location.href = '<?php echo dol_escape_js(empty($urltorefreshaftermove) ? ($_SERVER['PHP_SELF'].'?'.dol_escape_js($_SERVER['QUERY_STRING'])) : $urltorefreshaftermove); ?>';
+							<?php
+							$redirectURL = empty($urltorefreshaftermove) ? ($_SERVER['PHP_SELF'].'?'.dol_escape_js($_SERVER['QUERY_STRING'])) : $urltorefreshaftermove;
+							// remove action parameter from URL
+							$redirectURL = preg_replace('/(&|\?)action=[^&#]*/', '', $redirectURL);
+							?>
+							location.href = '<?php echo dol_escape_js($redirectURL); ?>';
 						} else {
 							$("#<?php echo $tagidfortablednd; ?> .drag").each(
 									function( intIndex ) {