diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 122fc490b9b..dce08fb7a02 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -342,7 +342,7 @@ if (getDolGlobalString('USER_PASSWORD_GENERATED') == "Perso") {
 	print '<script type="text/javascript">';
 	print '	function getStringArg(){';
 	print '		var pattern = "";';
-	print '		pattern += $("#minlenght").val() + ";";';
+	print '		pattern += $("#minlength").val() + ";";';
 	print '		pattern += $("#NbMajMin").val() + ";";';
 	print '		pattern += $("#NbNumMin").val() + ";";';
 	print '		pattern += $("#NbSpeMin").val() + ";";';
@@ -352,14 +352,14 @@ if (getDolGlobalString('USER_PASSWORD_GENERATED') == "Perso") {
 	print '	}';
 
 	print '	function valuePossible(){';
-	print '		var fields = ["#minlenght", "#NbMajMin", "#NbNumMin", "#NbSpeMin", "#NbIteConsecutive"];';
+	print '		var fields = ["#minlength", "#NbMajMin", "#NbNumMin", "#NbSpeMin", "#NbIteConsecutive"];';
 	print '		for(var i = 0 ; i < fields.length ; i++){';
 	print '		    if($(fields[i]).val() < $(fields[i]).attr("min")){';
 	print '		        return false;';
 	print '		    }';
 	print '		}';
 	print '		';
-	print '		var length = parseInt($("#minlenght").val());';
+	print '		var length = parseInt($("#minlength").val());';
 	print '		var length_mini = parseInt($("#NbMajMin").val()) + parseInt($("#NbNumMin").val()) + parseInt($("#NbSpeMin").val());';
 	print '		return length >= length_mini;';
 	print '	}';
@@ -383,7 +383,7 @@ if (getDolGlobalString('USER_PASSWORD_GENERATED') == "Perso") {
 	print '		}';
 	print '	}';
 
-	print '	$("#minlenght").change(function(){valuePatternChange();});';
+	print '	$("#minlength").change(function(){valuePatternChange();});';
 	print '	$("#NbMajMin").change(function(){valuePatternChange();});';
 	print '	$("#NbNumMin").change(function(){valuePatternChange();});';
 	print '	$("#NbSpeMin").change(function(){valuePatternChange();});';
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index ef5939be02f..b4867e8168a 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -1539,7 +1539,11 @@ class Invoices extends DolibarrApi
 
 		// Creation of payment line
 		$paymentobj = new Paiement($this->db);
-		$paymentobj->datepaye     = $datepaye;
+		if (is_numeric($datepaye)) {
+			$paymentobj->datepaye = $datepaye;
+		} else {
+			$paymentobj->datepaye = dol_stringtotime($datepaye);
+		}
 		$paymentobj->amounts      = $amounts; // Array with all payments dispatching with invoice id
 		$paymentobj->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
 		$paymentobj->paiementid = $paymentid;
@@ -1687,7 +1691,11 @@ class Invoices extends DolibarrApi
 
 		// Creation of payment line
 		$paymentobj = new Paiement($this->db);
-		$paymentobj->datepaye     = $datepaye;
+		if (is_numeric($datepaye)) {
+			$paymentobj->datepaye = $datepaye;
+		} else {
+			$paymentobj->datepaye = dol_stringtotime($datepaye);
+		}
 		$paymentobj->amounts      = $amounts; // Array with all payments dispatching with invoice id
 		$paymentobj->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
 		$paymentobj->paiementid   = $paymentid;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f0b84bf328e..ec72e0ed58b 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3961,25 +3961,41 @@ abstract class CommonObject
 
 					if ($diff_on_current_total) {
 						// This should not happen, we should always have in table: total_ttc = total_ht + total_vat + total_localtax1 + total_localtax2
-						$sqlfix = "UPDATE ".$this->db->prefix().$this->table_element_line." SET ".$fieldtva." = ".price2num((float) $tmpcal[1]).", total_ttc = ".price2num((float) $tmpcal[2])." WHERE rowid = ".((int) $obj->rowid);
-						dol_syslog('We found inconsistent data into detailed line (diff_on_current_total = '.$diff_on_current_total.') for line rowid = '.$obj->rowid." (ht=".$obj->total_ht." vat=".$obj->total_tva." tax1=".$obj->total_localtax1." tax2=".$obj->total_localtax2." ttc=".$obj->total_ttc."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix, LOG_WARNING);
+						$sqlfix = "UPDATE ".$this->db->prefix().$this->table_element_line;
+						$sqlfix .= " SET ".$fieldtva." = ".price2num((float) $tmpcal[1]).", total_ttc = ".price2num((float) $tmpcal[2]);
+						$sqlfix .= ", multicurrency_total_tva = ".price2num((float) $tmpcal[17]).", multicurrency_total_ttc = ".price2num((float) $tmpcal[18]);
+						$sqlfix .= " WHERE rowid = ".((int) $obj->rowid);
+						dol_syslog('Warn1: We found inconsistent data into detailed line (diff_on_current_total = '.$diff_on_current_total.') for line rowid = '.$obj->rowid." (ht=".$obj->total_ht." vat=".$obj->total_tva." tax1=".$obj->total_localtax1." tax2=".$obj->total_localtax2." ttc=".$obj->total_ttc."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix, LOG_WARNING);
 						$resqlfix = $this->db->query($sqlfix);
 						if (!$resqlfix) {
 							dol_print_error($this->db, 'Failed to update line');
 						}
 						$obj->total_tva = $tmpcal[1];
 						$obj->total_ttc = $tmpcal[2];
+						$obj->multicurrency_total_tva = $tmpcal[17];
+						$obj->multicurrency_total_ttc = $tmpcal[18];
 					} elseif ($diff_when_using_price_ht) {
-						// After calculation from HT, total is consistent but we have found a difference between VAT part in calculation and into database and
-						// we ask to force the use of rounding on line (like done on calculation) so we force update of line
-						$sqlfix = "UPDATE ".$this->db->prefix().$this->table_element_line." SET ".$fieldtva." = ".price2num((float) $tmpcal[1]).", total_ttc = ".price2num((float) $tmpcal[2])." WHERE rowid = ".((int) $obj->rowid);
-						dol_syslog('We found a line with different rounding data into detailed line (diff_when_using_price_ht = '.$diff_when_using_price_ht.' and diff_on_current_total = '.$diff_on_current_total.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
-						$resqlfix = $this->db->query($sqlfix);
-						if (!$resqlfix) {
-							dol_print_error($this->db, 'Failed to update line');
+						// If total_ht calculated from unit price is different than the one in database, we do nothing, this may be a regular case to have also a different VAT, that can be explained
+						// because price was entered included tax and we round the unit price without tax to store it in database (so recalculation will give different results).
+						if ((float) $tmpcal[0] == (float) $obj->total_ht) {
+							// After calculation from HT, total is consistent and total_ht is same, but we have found a difference between VAT part calculated from unit price and the VAT part into database,
+							// and we ask to force the use of rounding on line (like done on calculation) so this should not happen, so we force the update of line to fix.
+
+							// This part of code must be called only to fix corrupted data due to the use of the feature to round total instead of rounding lines.
+							$sqlfix = "UPDATE ".$this->db->prefix().$this->table_element_line;
+							$sqlfix .= " SET ".$fieldtva." = ".price2num((float) $tmpcal[1]).", total_ttc = ".price2num((float) $tmpcal[2]);
+							$sqlfix .= ", multicurrency_total_tva = ".price2num((float) $tmpcal[17]).", multicurrency_total_ttc = ".price2num((float) $tmpcal[18]);
+							$sqlfix .= " WHERE rowid = ".((int) $obj->rowid);
+							dol_syslog('Warn2: We found a line with different rounding data into detailed line (diff_when_using_price_ht = '.$diff_when_using_price_ht.' and diff_on_current_total = '.$diff_on_current_total.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
+							$resqlfix = $this->db->query($sqlfix);
+							if (!$resqlfix) {
+								dol_print_error($this->db, 'Failed to update line');
+							}
+							$obj->total_tva = $tmpcal[1];
+							$obj->total_ttc = $tmpcal[2];
+							$obj->multicurrency_total_tva = $tmpcal[17];
+							$obj->multicurrency_total_ttc = $tmpcal[18];
 						}
-						$obj->total_tva = $tmpcal[1];
-						$obj->total_ttc = $tmpcal[2];
 					}
 				}
 
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index 5a5558bdad6..259e2e02353 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -59,8 +59,8 @@
  *						 1=total_vat, (main vat only)
  *						 2=total_ttc, (total_ht + main vat + local taxes)
  *						 3=pu_ht,
- *						 4=pu_vat, (main vat only)
- *						 5=pu_ttc,
+ *						 4=pu_vat, (main vat only)						!! should not be used
+ *						 5=pu_ttc,										!! should not be used except if it is stored in database one day
  *						 6=total_ht_without_discount,
  *						 7=total_vat_without_discount, (main vat only)
  *						 8=total_ttc_without_discount, (total_ht + main vat + local taxes)
@@ -198,7 +198,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	}
 
 	// initialize total (may be HT or TTC depending on price_base_type)
-	$tot_sans_remise = $pu * $qty * $progress / 100;
+	$tot_sans_remise = $pu * $qty * ($progress / 100);
 	$tot_avec_remise_ligne = $tot_sans_remise * (1 - ((float) $remise_percent_ligne / 100));
 	$tot_avec_remise       = $tot_avec_remise_ligne * (1 - ((float) $remise_percent_global / 100));
 
@@ -211,16 +211,26 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 
 	// if input unit price is 'HT', we need to have the totals with main VAT for a correct calculation
 	if ($price_base_type != 'TTC') {
-		$tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)), 'MU');
-		$tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)), 'MU');
-		$pu_wt = price2num($pu * (1 + ($txtva / 100)), 'MU');
+		$tot_sans_remise_withvat = price2num($tot_sans_remise * (1 + ($txtva / 100)), 'MU');
+		$tot_avec_remise_withvat = price2num($tot_avec_remise * (1 + ($txtva / 100)), 'MU');
+
+		$tot_sans_remise_withoutvat = $tot_sans_remise;
+		$tot_avec_remise_withoutvat = $tot_avec_remise;
+
+		$pu_withouttax = $pu;
+		$pu_withmainvat = price2num($pu * (1 + ($txtva / 100)), 'MU');
 	} else {
-		$tot_sans_remise_wt = $tot_sans_remise;
-		$tot_avec_remise_wt = $tot_avec_remise;
-		$pu_wt = $pu;
+		$tot_sans_remise_withvat = $tot_sans_remise;
+		$tot_avec_remise_withvat = $tot_avec_remise;
+
+		$tot_sans_remise_withoutvat = price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MU');
+		$tot_avec_remise_withoutvat = price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MU');
+
+		$pu_withouttax = price2num($pu / (1 + ($txtva / 100)), 'MU');
+		$pu_withmainvat = $pu;
 	}
 
-	//print 'rr'.$price_base_type.'-'.$txtva.'-'.$tot_sans_remise_wt."-".$pu_wt."-".$uselocaltax1_rate."-".$localtax1_rate."-".$localtax1_type."\n";
+	//print 'rr'.$price_base_type.'-'.$txtva.'-'.$tot_sans_remise_withvat."-".$pu_withmainvat."-".$uselocaltax1_rate."-".$localtax1_rate."-".$localtax1_type."\n";
 
 	$localtaxes = array(0, 0, 0);
 	$apply_tax = false;
@@ -241,13 +251,13 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	}
 
 	if ($uselocaltax1_rate && $apply_tax) {
-		$result[14] = price2num(($tot_sans_remise_wt * (1 + ($localtax1_rate / 100))) - $tot_sans_remise_wt, 'MT');
+		$result[14] = price2num(($tot_sans_remise_withvat * (1 + ($localtax1_rate / 100))) - $tot_sans_remise_withvat, 'MT');
 		$localtaxes[0] += $result[14];
 
-		$result[9] = price2num(($tot_avec_remise_wt * (1 + ($localtax1_rate / 100))) - $tot_avec_remise_wt, 'MT');
+		$result[9] = price2num(($tot_avec_remise_withvat * (1 + ($localtax1_rate / 100))) - $tot_avec_remise_withvat, 'MT');
 		$localtaxes[1] += $result[9];
 
-		$result[11] = price2num(($pu_wt * (1 + ($localtax1_rate / 100))) - $pu_wt, 'MU');
+		$result[11] = price2num(($pu_withmainvat * (1 + ($localtax1_rate / 100))) - $pu_withmainvat, 'MU');
 		$localtaxes[2] += $result[11];
 	}
 
@@ -268,13 +278,13 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 			break;
 	}
 	if ($uselocaltax2_rate && $apply_tax) {
-		$result[15] = price2num(($tot_sans_remise_wt * (1 + ($localtax2_rate / 100))) - $tot_sans_remise_wt, 'MT');
+		$result[15] = price2num(($tot_sans_remise_withvat * (1 + ($localtax2_rate / 100))) - $tot_sans_remise_withvat, 'MT');
 		$localtaxes[0] += $result[15];
 
-		$result[10] = price2num(($tot_avec_remise_wt * (1 + ($localtax2_rate / 100))) - $tot_avec_remise_wt, 'MT');
+		$result[10] = price2num(($tot_avec_remise_withvat * (1 + ($localtax2_rate / 100))) - $tot_avec_remise_withvat, 'MT');
 		$localtaxes[1] += $result[10];
 
-		$result[12] = price2num(($pu_wt * (1 + ($localtax2_rate / 100))) - $pu_wt, 'MU');
+		$result[12] = price2num(($pu_withmainvat * (1 + ($localtax2_rate / 100))) - $pu_withmainvat, 'MU');
 		$localtaxes[2] += $result[12];
 	}
 
@@ -315,13 +325,6 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 
 	// if there's some localtax without vat, we calculate localtaxes (we will add them at end)
 
-	//If input unit price is 'TTC', we need to have the totals without main VAT for a correct calculation
-	if ($price_base_type == 'TTC') {
-		$tot_sans_remise = price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MU');
-		$tot_avec_remise = price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MU');
-		$pu = price2num($pu / (1 + ($txtva / 100)), 'MU');
-	}
-
 	$apply_tax = false;
 	switch ($localtax1_type) {
 		case '1':     // localtax on product or service
@@ -339,13 +342,13 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 			break;
 	}
 	if ($uselocaltax1_rate && $apply_tax) {
-		$result[14] = price2num(($tot_sans_remise * (1 + ($localtax1_rate / 100))) - $tot_sans_remise, 'MT'); // amount tax1 for total_ht_without_discount
+		$result[14] = price2num(($tot_sans_remise_withoutvat * (1 + ($localtax1_rate / 100))) - $tot_sans_remise_withoutvat, 'MT'); // amount tax1 for total_ht_without_discount
 		$result[8] += $result[14]; // total_ttc_without_discount + tax1
 
-		$result[9] = price2num(($tot_avec_remise * (1 + ($localtax1_rate / 100))) - $tot_avec_remise, 'MT'); // amount tax1 for total_ht
+		$result[9] = price2num(($tot_avec_remise_withoutvat * (1 + ($localtax1_rate / 100))) - $tot_avec_remise_withoutvat, 'MT'); // amount tax1 for total_ht
 		$result[2] += $result[9]; // total_ttc + tax1
 
-		$result[11] = price2num(($pu * (1 + ($localtax1_rate / 100))) - $pu, 'MU'); // amount tax1 for pu_ht
+		$result[11] = price2num(($pu_withouttax * (1 + ($localtax1_rate / 100))) - $pu_withouttax, 'MU'); // amount tax1 for pu_ht
 		$result[5] += $result[11]; // pu_ht + tax1
 	}
 
@@ -366,13 +369,13 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 			break;
 	}
 	if ($uselocaltax2_rate && $apply_tax) {
-		$result[15] = price2num(($tot_sans_remise * (1 + ($localtax2_rate / 100))) - $tot_sans_remise, 'MT'); // amount tax2 for total_ht_without_discount
+		$result[15] = price2num(($tot_sans_remise_withoutvat * (1 + ($localtax2_rate / 100))) - $tot_sans_remise_withoutvat, 'MT'); // amount tax2 for total_ht_without_discount
 		$result[8] += $result[15]; // total_ttc_without_discount + tax2
 
-		$result[10] = price2num(($tot_avec_remise * (1 + ($localtax2_rate / 100))) - $tot_avec_remise, 'MT'); // amount tax2 for total_ht
+		$result[10] = price2num(($tot_avec_remise_withoutvat * (1 + ($localtax2_rate / 100))) - $tot_avec_remise_withoutvat, 'MT'); // amount tax2 for total_ht
 		$result[2] += $result[10]; // total_ttc + tax2
 
-		$result[12] = price2num(($pu * (1 + ($localtax2_rate / 100))) - $pu, 'MU'); // amount tax2 for pu_ht
+		$result[12] = price2num(($pu_withouttax * (1 + ($localtax2_rate / 100))) - $pu_withouttax, 'MU'); // amount tax2 for pu_ht
 		$result[5] += $result[12]; // pu_ht + tax2
 	}
 
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 99d0d83d13e..2114799c797 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -98,11 +98,11 @@ class pdf_paiement extends CommonDocGenerator
 		$this->tab_height = $this->page_hauteur - $this->marge_haute - $this->marge_basse - $this->tab_top - 5; // must be > $this->line_height * $this->line_per_page and < $this->page_hauteur - $this->marge_haute - $this->marge_basse - $this->tab_top - 5;
 
 		$this->posxdate = $this->marge_gauche + 2;
-		$this->posxpaymenttype = 42;
-		$this->posxinvoice = 82;
-		$this->posxbankaccount = 110;
-		$this->posxinvoiceamount = 132;
-		$this->posxpaymentamount = 162;
+		$this->posxpaymenttype = 32;
+		$this->posxinvoice = 72;
+		$this->posxbankaccount = 115;
+		$this->posxinvoiceamount = 135;
+		$this->posxpaymentamount = 167;
 		if ($this->page_largeur < 210) { // To work with US executive format
 			$this->line_per_page = 35;
 			$this->posxpaymenttype -= 10;
@@ -110,6 +110,7 @@ class pdf_paiement extends CommonDocGenerator
 			$this->posxinvoiceamount -= 10;
 			$this->posxpaymentamount -= 20;
 		}
+
 		// which type of document will be generated: clients (client) or providers (fourn) invoices
 		$this->doc_type = "client";
 	}
diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index 90d0afca1ba..08663edd711 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -843,7 +843,7 @@ IMG;
 			// using windows libreoffice that must be in path
 			// using linux/mac libreoffice that must be in path
 			// Note PHP Config "fastcgi.impersonate=0" must set to 0 - Default is 1
-			$command ='soffice --headless -env:UserInstallation=file:\''.$conf->user->dir_temp.'/odtaspdf\' --convert-to pdf --outdir '. escapeshellarg(dirname($name)). " ".escapeshellarg($name);
+			$command ='soffice --headless -env:UserInstallation=file:'.(getDolGlobalString('MAIN_ODT_ADD_SLASH_FOR_WINDOWS') ? '///' : '').'\''.$conf->user->dir_temp.'/odtaspdf\' --convert-to pdf --outdir '. escapeshellarg(dirname($name)). " ".escapeshellarg($name);
 		} elseif (preg_match('/unoconv/', getDolGlobalString('MAIN_ODT_AS_PDF'))) {
 			// If issue with unoconv, see https://github.com/dagwieers/unoconv/issues/87
 
diff --git a/test/phpunit/PricesTest.php b/test/phpunit/PricesTest.php
index 2511367a7c0..306d867eb9b 100644
--- a/test/phpunit/PricesTest.php
+++ b/test/phpunit/PricesTest.php
@@ -40,6 +40,9 @@ if (empty($user->id)) {
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
+$conf->global->MAIN_MAX_DECIMALS_UNIT = 5;
+$conf->global->MAIN_MAX_DECIMALS_TOT = 2;
+
 if (getDolGlobalString('MAIN_ROUNDING_RULE_TOT')) {
 	print "Parameter MAIN_ROUNDING_RULE_TOT must be set to 0 or not set.\n";
 	exit(1);