diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 8ba39410380..c192136fbd2 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -711,7 +711,8 @@ class Propal extends CommonObject
 				// Reorder if child line
 				if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
 				elseif($ranktouse > 0 && $ranktouse <= count($this->lines)) { // Update all rank of all other lines
-					for ($ii = $ranktouse; $ii <= count($this->lines); $ii++) {
+					$linecount = count($this->lines);
+					for ($ii = $ranktouse; $ii <= $linecount; $ii++) {
 						$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii + 1);
 					}
 				}
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index d9921ca1d14..e758eaee9a9 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1659,7 +1659,8 @@ class Commande extends CommonOrder
 				// Reorder if child line
 				if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
 				elseif($ranktouse > 0 && $ranktouse <= count($this->lines)) { // Update all rank of all other lines
-					for ($ii = $ranktouse; $ii <= count($this->lines); $ii++) {
+					$linecount = count($this->lines);
+					for ($ii = $ranktouse; $ii <= $linecount; $ii++) {
 						$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii + 1);
 					}
 				}
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 44297da0ff3..0ec9db3ea44 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1988,7 +1988,8 @@ class Facture extends CommonInvoice
 
 			if(!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 				$facligne->rang = 1;
-				for ($ii = 1; $ii <= count($this->lines); $ii++) {
+				$linecount = count($this->lines);
+				for ($ii = 1; $ii <= $linecount; $ii++) {
 					$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii+1);
 				}
 			}
@@ -3217,7 +3218,8 @@ class Facture extends CommonInvoice
 				// Reorder if child line
 				if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
 				elseif($ranktouse > 0 && $ranktouse <= count($this->lines)) { // Update all rank of all other lines
-					for ($ii = $ranktouse; $ii <= count($this->lines); $ii++) {
+					$linecount = count($this->lines);
+					for ($ii = $ranktouse; $ii <= $linecount; $ii++) {
 						$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii + 1);
 					}
 				}
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index ff2e07b9600..5ee4ea285b3 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1845,7 +1845,8 @@ class CommandeFournisseur extends CommonOrder
                 // Reorder if child line
                 if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
 				elseif($rang > 0 && $rang <= count($this->lines)) { // Update all rank of all other lines
-					for ($ii = $rang; $ii <= count($this->lines); $ii++) {
+					$linecount = count($this->lines);
+					for ($ii = $rang; $ii <= $linecount; $ii++) {
 						$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii + 1);
 					}
 				}
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 8e12bf11b45..1cf23600e6d 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1058,12 +1058,13 @@ class FactureFournisseur extends CommonInvoice
     		$facligne->rang = -1;
     		$facligne->info_bits = 2;
 
-		if(!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
-			$facligne->rang = 1;
-			for ($ii = 1; $ii <= count($this->lines); $ii++) {
-				$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii+1);
+			if(!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+				$facligne->rang = 1;
+				$linecount = count($this->lines);
+				for ($ii = 1; $ii <= $linecount; $ii++) {
+					$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii+1);
+				}
 			}
-		}
 
     		// Get buy/cost price of invoice that is source of discount
     		if ($remise->fk_invoice_supplier_source > 0)
@@ -1865,7 +1866,8 @@ class FactureFournisseur extends CommonInvoice
 				// Reorder if child line
 				if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
 				elseif($rang > 0 && $rang <= count($this->lines)) { // Update all rank of all other lines
-					for ($ii = $rang; $ii <= count($this->lines); $ii++) {
+					$linecount = count($this->lines);
+					for ($ii = $rang; $ii <= $linecount; $ii++) {
 						$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii + 1);
 					}
 				}
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 91652248395..4dee2294fcd 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -619,7 +619,8 @@ class SupplierProposal extends CommonObject
                 // Reorder if child line
                 if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
 				elseif($ranktouse > 0 && $ranktouse <= count($this->lines)) { // Update all rank of all other lines
-					for ($ii = $ranktouse; $ii <= count($this->lines); $ii++) {
+					$linecount = count($this->lines);
+					for ($ii = $ranktouse; $ii <= $linecount; $ii++) {
 						$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii + 1);
 					}
 				}