ATM-Consulting / dolibarr_module_subtotal

class/subtotal.class.php

Braces +285 added lines, -138 removed lines

@@ -13,18 +13,23 @@ 
 			/**
 			 * @var $object Facture
 			 */
-			if($object->element=='facture') $res =  $object->addline($object->id, $label, 0,$qty,0,0,0,0,0,'','',0,0,'','HT',0,9,-1, TSubtotal::$module_number);
+			if($object->element=='facture') {
+				$res =  $object->addline($object->id, $label, 0,$qty,0,0,0,0,0,'','',0,0,'','HT',0,9,-1, TSubtotal::$module_number);
+			}
 			/**
 			 * @var $object Propal
 			 */
-			else if($object->element=='propal') $res =  $object->addline($object->id,$label, 0,$qty,0,0,0,0,0,'HT',0,0,9,-1, TSubtotal::$module_number);
+			else if($object->element=='propal') {
+				$res =  $object->addline($object->id,$label, 0,$qty,0,0,0,0,0,'HT',0,0,9,-1, TSubtotal::$module_number);
+			}
 			/**
 			 * @var $object Commande
 			 */
-			else if($object->element=='commande') $res =  $object->addline($object->id,$label, 0,$qty,0,0,0,0,0,0,0,'HT',0,'','',9,-1, TSubtotal::$module_number);
+			else if($object->element=='commande') {
+				$res =  $object->addline($object->id,$label, 0,$qty,0,0,0,0,0,0,0,'HT',0,'','',9,-1, TSubtotal::$module_number);
+			}
 
-		}
-		else {
+		} else {
 			$desc = '';
 			
 			$TNotElements = array ('invoice_supplier', 'order_supplier');
@@ -36,7 +41,9 @@ 
 			/**
 			 * @var $object Facture
 			 */
-			if($object->element=='facture') $res =  $object->addline($desc, 0,$qty,0,0,0,0,0,'','',0,0,'','HT',0,9,$rang, TSubtotal::$module_number, '', 0, 0, null, 0, $label);
+			if($object->element=='facture') {
+				$res =  $object->addline($desc, 0,$qty,0,0,0,0,0,'','',0,0,'','HT',0,9,$rang, TSubtotal::$module_number, '', 0, 0, null, 0, $label);
+			}
 			/**
 			 * @var $object Facture fournisseur
 			 */
@@ -48,16 +55,22 @@ 
 			/**
 			 * @var $object Propal
 			 */
-			else if($object->element=='propal') $res = $object->addline($desc, 0,$qty,0,0,0,0,0,'HT',0,0,9,$rang, TSubtotal::$module_number, 0, 0, 0, $label);
+			else if($object->element=='propal') {
+				$res = $object->addline($desc, 0,$qty,0,0,0,0,0,'HT',0,0,9,$rang, TSubtotal::$module_number, 0, 0, 0, $label);
+			}
 			/**
 			 * @var $object Propal Fournisseur
 			 */
-			else if($object->element=='supplier_proposal') $res = $object->addline($desc, 0,$qty,0,0,0,0,0,'HT',0,0,9,$rang, TSubtotal::$module_number, 0, 0, 0, $label);
+			else if($object->element=='supplier_proposal') {
+				$res = $object->addline($desc, 0,$qty,0,0,0,0,0,'HT',0,0,9,$rang, TSubtotal::$module_number, 0, 0, 0, $label);
+			}
 			
 			/**
 			 * @var $object Commande
 			 */
-			else if($object->element=='commande') $res =  $object->addline($desc, 0,$qty,0,0,0,0,0,0,0,'HT',0,'','',9,$rang, TSubtotal::$module_number, 0, null, 0, $label);
+			else if($object->element=='commande') {
+				$res =  $object->addline($desc, 0,$qty,0,0,0,0,0,0,0,'HT',0,'','',9,$rang, TSubtotal::$module_number, 0, null, 0, $label);
+			}
 			/**
 			 * @var $object Commande fournisseur
 			 */
@@ -68,7 +81,9 @@ 
 			/**
 			 * @var $object Facturerec
 			 */
-			else if($object->element=='facturerec') $res =  $object->addline($desc, 0,$qty, 0, 0, 0, 0, 0, 'HT', 0, '', 0, 9, $rang, TSubtotal::$module_number,$label); 
+			else if($object->element=='facturerec') {
+				$res =  $object->addline($desc, 0,$qty, 0, 0, 0, 0, 0, 'HT', 0, '', 0, 9, $rang, TSubtotal::$module_number,$label);
+			}
 			
 		}
 	
@@ -90,8 +105,9 @@ 
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = GETPOST('lang_id', 'alpha');
-			if (! empty($conf->global->MAIN_MULTILANGS) && empty($newlang))
-				$newlang = !empty($object->client) ? $object->client->default_lang : $object->thirdparty->default_lang;
+			if (! empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) {
+							$newlang = !empty($object->client) ? $object->client->default_lang : $object->thirdparty->default_lang;
+			}
 			if (! empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
@@ -100,13 +116,18 @@ 
 			$ret = $object->fetch($object->id); // Reload to get new records
 			if ((float) DOL_VERSION <= 3.6)
 			{
-				if ($object->element == 'propal') propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-				elseif ($object->element == 'commande') commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-				elseif ($object->element == 'facture') facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			}
-			else
+				if ($object->element == 'propal') {
+					propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				} elseif ($object->element == 'commande') {
+					commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				} elseif ($object->element == 'facture') {
+					facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				}
+			} else
 			{
-				if ($object->element!= 'facturerec') $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				if ($object->element!= 'facturerec') {
+					$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				}
 			}
 		}
 	}
@@ -120,7 +141,9 @@ 
 	 */
 	public static function updateRang(&$object, $rang_start, $move_to=1)
 	{
-		if (!class_exists('GenericObject')) require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
+		if (!class_exists('GenericObject')) {
+			require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
+		}
 		
 		$row=new GenericObject($object->db);
 		$row->table_element_line = $object->table_element_line;
@@ -129,7 +152,9 @@ 
 		
 		foreach ($object->lines as &$line)
 		{
-			if ($line->rang < $rang_start) continue;
+			if ($line->rang < $rang_start) {
+				continue;
+			}
 			
 			$row->updateRangOfLine($line->id, $line->rang+$move_to);
 		}
@@ -152,21 +177,28 @@ 
 		foreach ($TTitle_reverse as $k => $title_line)
 		{
 			$title_niveau = self::getNiveau($title_line);
-			if ($title_niveau < $level_new_title) break;
+			if ($title_niveau < $level_new_title) {
+				break;
+			}
 			
 			$rang_to_add = self::titleHasTotalLine($object, $title_line, true, true);
 			
 			if (is_numeric($rang_to_add)) 
 			{
-				if ($rang_to_add != -1) self::updateRang($object, $rang_to_add);
+				if ($rang_to_add != -1) {
+					self::updateRang($object, $rang_to_add);
+				}
 				
 				self::addSubTotalLine($object, $langs->trans('SubTotal'), 100-$title_niveau, $rang_to_add);
 				
 				$object->lines[] = $object->line; // ajout de la ligne dans le tableau de ligne (Dolibarr ne le fait pas)
 				if ($rang_to_add != -1) 
 				{
-					if (method_exists($object, 'fetch_lines')) $object->fetch_lines();
-					else $object->fetch($object->id);
+					if (method_exists($object, 'fetch_lines')) {
+						$object->fetch_lines();
+					} else {
+						$object->fetch($object->id);
+					}
 				}
 			}
 		}
@@ -196,7 +228,9 @@ 
 		
 		foreach ($TTitle as $k => $title_line)
 		{
-			if (self::titleHasTotalLine($object, $title_line)) unset($TTitle[$k]);
+			if (self::titleHasTotalLine($object, $title_line)) {
+				unset($TTitle[$k]);
+			}
 		}
 		
 		return $TTitle;
@@ -213,23 +247,41 @@ 
 	 */
 	public static function titleHasTotalLine(&$object, &$title_line, $strict_mode=false, $return_rang_on_false=false)
 	{
-		if (empty($object->lines) || !is_array($object->lines)) return false;
+		if (empty($object->lines) || !is_array($object->lines)) {
+			return false;
+		}
 		
 		$title_niveau = self::getNiveau($title_line);
 		foreach ($object->lines as &$line)
 		{
-			if ($line->rang <= $title_line->rang) continue;
-			if (self::isTitle($line) && self::getNiveau($line) <= $title_niveau) return false; // Oups on croise un titre d'un niveau inférieur ou égale (exemple : je croise un titre niveau 2 alors que je suis sur un titre de niveau 3) pas lieu de continuer car un nouveau bloc commence
-			if (!self::isSubtotal($line)) continue;
+			if ($line->rang <= $title_line->rang) {
+				continue;
+			}
+			if (self::isTitle($line) && self::getNiveau($line) <= $title_niveau) {
+				return false;
+			}
+			// Oups on croise un titre d'un niveau inférieur ou égale (exemple : je croise un titre niveau 2 alors que je suis sur un titre de niveau 3) pas lieu de continuer car un nouveau bloc commence
+			if (!self::isSubtotal($line)) {
+				continue;
+			}
 			
 			$subtotal_niveau = self::getNiveau($line);
 			
 			// Comparaison du niveau de la ligne de sous-total avec celui du titre
-			if ($subtotal_niveau == $title_niveau) return true; // niveau égale => Ok mon titre a un sous-total
-			elseif ($subtotal_niveau < $title_niveau) // niveau inférieur trouvé (exemple : sous-total de niveau 1 contre mon titre de niveau 3)
+			if ($subtotal_niveau == $title_niveau) {
+				return true;
+			}
+			// niveau égale => Ok mon titre a un sous-total
+			elseif ($subtotal_niveau < $title_niveau) {
+				// niveau inférieur trouvé (exemple : sous-total de niveau 1 contre mon titre de niveau 3)
 			{
-				if ($strict_mode) return ($return_rang_on_false) ? $line->rang : false; // mode strict niveau pas égale donc faux
-				else return true; // mode libre => OK je considère que mon titre à un sous-total
+				if ($strict_mode) return ($return_rang_on_false) ? $line->rang : false;
+			}
+			// mode strict niveau pas égale donc faux
+				else {
+					return true;
+				}
+				// mode libre => OK je considère que mon titre à un sous-total
 			}
 		}
 		
@@ -277,16 +329,19 @@ 
 		
 		foreach ($object->lines as &$l)
 		{
-			if ($l->rang <= $line->rang) continue;
-			elseif (self::isSubtotal($l) && self::getNiveau($l) <= self::getNiveau($line)) break;
-			elseif ($breakOnTitle && self::isTitle($l) && self::getNiveau($l) <= self::getNiveau($line)) break;
+			if ($l->rang <= $line->rang) {
+				continue;
+			} elseif (self::isSubtotal($l) && self::getNiveau($l) <= self::getNiveau($line)) {
+				break;
+			} elseif ($breakOnTitle && self::isTitle($l) && self::getNiveau($l) <= self::getNiveau($line)) {
+				break;
+			}
 			
 			if (!empty($l->array_options['options_subtotal_nc']))
 			{
 				$tabprice = calcul_price_total($l->qty, $l->subprice, $l->remise_percent, $l->tva_tx, $l->localtax1_tx, $l->localtax2_tx, 0, 'HT', $l->info_bits, $l->product_type);
 				$TTot['total_options'] += $tabprice[0]; // total ht
-			}
-			else
+			} else
 			{
 				$TTot['total_pa_ht'] += $l->pa_ht * $l->qty;
 				$TTot['total_subprice'] += $l->subprice * $l->qty;
@@ -306,29 +361,41 @@ 
 
 	public static function getOrderIdFromLineId(&$db, $fk_commandedet)
 	{
-		if (empty($fk_commandedet)) return false;
+		if (empty($fk_commandedet)) {
+			return false;
+		}
 		
 		$sql = 'SELECT fk_commande FROM '.MAIN_DB_PREFIX.'commandedet WHERE rowid = '.$fk_commandedet;
 		$resql = $db->query($sql);
 		
-		if ($resql && ($row = $db->fetch_object($resql))) return $row->fk_commande;
-		else return false;
+		if ($resql && ($row = $db->fetch_object($resql))) {
+			return $row->fk_commande;
+		} else {
+			return false;
+		}
 	}
 	
 	public static function getLastLineOrderId(&$db, $fk_commande)
 	{
-		if (empty($fk_commande)) return false;
+		if (empty($fk_commande)) {
+			return false;
+		}
 		
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'commandedet WHERE fk_commande = '.$fk_commande.' ORDER BY rang DESC LIMIT 1';
 		$resql = $db->query($sql);
 		
-		if ($resql && ($row = $db->fetch_object($resql))) return $row->rowid;
-		else return false;
+		if ($resql && ($row = $db->fetch_object($resql))) {
+			return $row->rowid;
+		} else {
+			return false;
+		}
 	}
 	
 	public static function getParentTitleOfLine(&$object, $i)
 	{
-		if ($i <= 0) return false;
+		if ($i <= 0) {
+			return false;
+		}
 		
 		$skip_title = 0;
 		// Je parcours les lignes précédentes
@@ -347,8 +414,7 @@ 
 				//@INFO J'ai ma ligne titre qui contient ma ligne, par contre je check pas s'il y a un sous-total
 				return $line;
 				break;
-			}
-			elseif ($line->product_type == 9 && $line->qty >= 90 && $line->qty <= 99)
+			} elseif ($line->product_type == 9 && $line->qty >= 90 && $line->qty <= 99)
 			{
 				// Il s'agit d'un sous-total, ça veut dire que le prochain titre théoriquement doit être ignorer (je travail avec un incrément au cas ou je croise plusieurs sous-totaux)
 				$skip_title++;
@@ -363,7 +429,9 @@ 
 		$res = $line->special_code == self::$module_number && $line->product_type == 9 && $line->qty <= 9;
 		if($res && $level > -1) {
 			return $line->qty == $level;
-		} else return $res;
+		} else {
+			return $res;
+		}
 		
 	}
 	
@@ -372,7 +440,9 @@ 
 	    $res = $line->special_code == self::$module_number && $line->product_type == 9 && $line->qty >= 90;
 	    if($res && $level > -1) {
 	        return self::getNiveau($line) == $level;
-	    } else return $res;
+	    } else {
+	    	return $res;
+	    }
 	}
 	
 	public static function isFreeText(&$line)
@@ -393,10 +463,14 @@ 
 		// editeur wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$nbrows=ROWS_2;
-		if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+		if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) {
+			$nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+		}
 		$enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
 		$toolbarname='dolibarr_details';
-		if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes';
+		if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) {
+			$toolbarname='dolibarr_notes';
+		}
 		$text = !empty($line->description)?$line->description:$line->label;
 		$doleditor=new DolEditor('line-description',$text,'',164,$toolbarname,'',false,true,$enable,$nbrows,'98%', $readonly);
 		return $doleditor->Create(1);
@@ -411,12 +485,10 @@ 
 		{
 		    $object->statut = 0; // hack for facture rec
 		    $createRight = $user->rights->facture->creer;
-		}
-		elseif($object->element == 'order_supplier' )
+		} elseif($object->element == 'order_supplier' )
 		{
 		    $createRight = $user->rights->fournisseur->commande->creer;
-		}
-		elseif($object->element == 'invoice_supplier' )
+		} elseif($object->element == 'invoice_supplier' )
 		{
 		    $createRight = $user->rights->fournisseur->facture->creer;
 		}
@@ -427,11 +499,16 @@ 
 
             if(!empty($object->lines)) {
                 foreach($object->lines as $line) {
-                    if($line->id == $lineid) $duplicateLine = $line;
+                    if($line->id == $lineid) {
+                    	$duplicateLine = $line;
+                    }
                 }
             }
-            if(!empty($duplicateLine) && !self::isModSubtotalLine($duplicateLine)) $TLine = array($duplicateLine);
-            else $TLine = self::getLinesFromTitleId($object, $lineid, $withBlockLine);
+            if(!empty($duplicateLine) && !self::isModSubtotalLine($duplicateLine)) {
+            	$TLine = array($duplicateLine);
+            } else {
+            	$TLine = self::getLinesFromTitleId($object, $lineid, $withBlockLine);
+            }
 
 			if (!empty($TLine))
 			{
@@ -495,8 +572,9 @@ 
 
 					$TLineAdded[] = $object->line;
 					// Error from addline
-					if ($res <= 0) break;
-					else
+					if ($res <= 0) {
+						break;
+					} else
 					{
 						$object->line_from = $line;
 						// Call trigger
@@ -518,8 +596,7 @@ 
 					    _updateLineNC($object->element, $object->id, $line->id, $line->array_options['options_subtotal_nc']);
 					}
 					return count($TLineAdded);
-				}
-				else
+				} else
 				{
 					$object->db->rollback();
 					return -1;
@@ -535,10 +612,14 @@ 
 		global $langs;
 		
 		// Besoin de comparer sur les 2 formes d'écriture
-		if (!$key_is_id) $TTitle_search = array($langs->trans($key_trad), $langs->transnoentitiesnoconv($key_trad));
+		if (!$key_is_id) {
+			$TTitle_search = array($langs->trans($key_trad), $langs->transnoentitiesnoconv($key_trad));
+		}
 		
 		$TTitle_under_search = array();
-		if (!empty($under_title)) $TTitle_under_search = array($langs->trans($under_title), $langs->transnoentitiesnoconv($under_title));
+		if (!empty($under_title)) {
+			$TTitle_under_search = array($langs->trans($under_title), $langs->transnoentitiesnoconv($under_title));
+		}
 		
 		$TLine = array();
 		$add_line = false;
@@ -548,28 +629,37 @@ 
 		{
 			if (!$under_title_found && !empty($TTitle_under_search))
 			{
-				if ($line->product_type == 9 && (in_array($line->desc, $TTitle_under_search) || in_array($line->label, $TTitle_under_search)) ) $under_title_found = true;
-			}
-			else
+				if ($line->product_type == 9 && (in_array($line->desc, $TTitle_under_search) || in_array($line->label, $TTitle_under_search)) ) {
+					$under_title_found = true;
+				}
+			} else
 			{
 				if ( ($key_is_id && $line->id == $key_trad) || (!$key_is_id && $line->product_type == 9 && $line->qty == $level && (in_array($line->desc, $TTitle_search) || in_array($line->label, $TTitle_search) )))
 				{
-					if ($key_is_id) $level = $line->qty;
+					if ($key_is_id) {
+						$level = $line->qty;
+					}
 					
 					$add_line = true;
-					if ($withBlockLine) $TLine[] = $line;
+					if ($withBlockLine) {
+						$TLine[] = $line;
+					}
 					continue;
-				}
-				elseif ($add_line && TSubtotal::isModSubtotalLine($line) && TSubtotal::getNiveau($line) == $level) // Si on tombe sur un sous-total, il faut que ce soit un du même niveau que le titre
+				} elseif ($add_line && TSubtotal::isModSubtotalLine($line) && TSubtotal::getNiveau($line) == $level) {
+					// Si on tombe sur un sous-total, il faut que ce soit un du même niveau que le titre
 				{
 					if ($withBlockLine) $TLine[] = $line;
+				}
 					break;
 				}
 				
 				if ($add_line)
 				{
-					if (!$withBlockLine && (self::isTitle($line) || self::isSubtotal($line)) ) continue;
-					else $TLine[] = $line;
+					if (!$withBlockLine && (self::isTitle($line) || self::isSubtotal($line)) ) {
+						continue;
+					} else {
+						$TLine[] = $line;
+					}
 				}
 			}
 		}
@@ -603,7 +693,9 @@ 
 				
 			case 'order_supplier':
 			    $object->special_code = SELF::$module_number;
-			    if (empty($desc)) $desc = $label;
+			    if (empty($desc)) {
+			    	$desc = $label;
+			    }
 			    $res = $object->updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type, 0, $date_start, $date_end, $array_options, $fk_unit);
 			    break;
 			
@@ -613,7 +705,9 @@ 
 				
 			case 'invoice_supplier':
 			    $object->special_code = SELF::$module_number;
-			    if (empty($desc)) $desc = $label;
+			    if (empty($desc)) {
+			    	$desc = $label;
+			    }
 			    $res = $object->updateline($rowid, $desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, 0, $price_base_type, $info_bits, $type, $remise_percent, 0, $date_start, $date_end, $array_options, $fk_unit);
 			    break;
 				
@@ -630,8 +724,11 @@ 
 				break;
 		}
 		
-		if ($res <= 0) $object->db->rollback();
-		else $object->db->commit();
+		if ($res <= 0) {
+			$object->db->rollback();
+		} else {
+			$object->db->commit();
+		}
 		
 		return $res;
 	}
@@ -641,24 +738,20 @@ 
 		global $db, $object;
 		
 		$TTitle = array();
-		if(! empty($object->id) && in_array($object->element, array('propal', 'commande', 'facture'))) {}
-		else {
+		if(! empty($object->id) && in_array($object->element, array('propal', 'commande', 'facture'))) {} else {
 			if ($origin_line->element == 'propaldet')
 			{
 				$object = new Propal($db);
 				$object->fetch($origin_line->fk_propal);
-			}
-			else if ($origin_line->element == 'commandedet')
+			} else if ($origin_line->element == 'commandedet')
 			{
 				$object = new Commande($db);
 				$object->fetch($origin_line->fk_commande);
-			}
-			else if ($origin_line->element == 'facturedet')
+			} else if ($origin_line->element == 'facturedet')
 			{
 				$object = new Facture($db);
 				$object->fetch($origin_line->fk_facture);
-			}
-			else
+			} else
 			{
 				return $TTitle;
 			}
@@ -668,8 +761,11 @@ 
 		$i = 0;
 		foreach ($object->lines as &$line)
 		{
-			if ($origin_line->id == $line->id) break;
-			else $i++;
+			if ($origin_line->id == $line->id) {
+				break;
+			} else {
+				$i++;
+			}
 		}
 		
 		$i--; // Skip la ligne d'origine
@@ -684,35 +780,43 @@ 
 				if (self::isSubtotal($object->lines[$y]))
 				{
 					$next_title_lvl_to_skip = self::getNiveau($object->lines[$y]);
-				}
-				elseif (self::isTitle($object->lines[$y]))
+				} elseif (self::isTitle($object->lines[$y]))
 				{
 					if ($object->lines[$y]->qty == $next_title_lvl_to_skip)
 					{
 						$next_title_lvl_to_skip = 0;
 						continue;
-					}
-					else
+					} else
 					{
-						if (empty($object->lines[$y]->array_options)) $object->lines[$y]->fetch_optionals();
+						if (empty($object->lines[$y]->array_options)) {
+							$object->lines[$y]->fetch_optionals();
+						}
 						$TTitle[$object->lines[$y]->id] = $object->lines[$y];
 						
-						if ($object->lines[$y]->qty == 1) break;
+						if ($object->lines[$y]->qty == 1) {
+							break;
+						}
 					}
 				}
 			}
 		}
 		
-		if ($reverse) $TTitle = array_reverse($TTitle, true);
+		if ($reverse) {
+			$TTitle = array_reverse($TTitle, true);
+		}
 		
 		return $TTitle;
 	}
 	
 	public static function getNiveau(&$line)
 	{
-		if (self::isTitle($line)) return $line->qty;
-		elseif (self::isSubtotal($line)) return 100 - $line->qty;
-		else return 0;
+		if (self::isTitle($line)) {
+			return $line->qty;
+		} elseif (self::isSubtotal($line)) {
+			return 100 - $line->qty;
+		} else {
+			return 0;
+		}
 	}
 	
 	/**
@@ -737,10 +841,16 @@ 
 		$objmarge->marge_droite = 10;
 		
 		$objectref = dol_sanitizeFileName($object->ref);
-		if ($object->element == 'propal') $dir = $conf->propal->dir_output . '/' . $objectref;
-		elseif ($object->element == 'commande') $dir = $conf->commande->dir_output . '/' . $objectref;
-		elseif ($object->element == 'facture') $dir = $conf->facture->dir_output . '/' . $objectref;
-		elseif ($object->element == 'facturerec') return; // no PDF for facturerec
+		if ($object->element == 'propal') {
+			$dir = $conf->propal->dir_output . '/' . $objectref;
+		} elseif ($object->element == 'commande') {
+			$dir = $conf->commande->dir_output . '/' . $objectref;
+		} elseif ($object->element == 'facture') {
+			$dir = $conf->facture->dir_output . '/' . $objectref;
+		} elseif ($object->element == 'facturerec') {
+			return;
+		}
+		// no PDF for facturerec
 		else
 		{
 			setEventMessage($langs->trans('warning_subtotal_recap_object_element_unknown', $object->element), 'warnings');
@@ -775,7 +885,9 @@ 
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 		$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("subtotalRecap")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+			$pdf->SetCompression(false);
+		}
 
 		$pdf->SetMargins($objmarge->marge_gauche, $objmarge->marge_haute, $objmarge->marge_droite);   // Left, Top, Right
 
@@ -785,7 +897,9 @@ 
 			
 		// New page
 		$pdf->AddPage();
-		if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+		if (! empty($tplidx)) {
+			$pdf->useTemplate($tplidx);
+		}
 		$pagenb++;
 		
 		
@@ -841,8 +955,10 @@ 
 					{
 						$TTot['TTotal_tva_multicurrency'][$tx] += $amount;
 					}	
+				} else {
+					$pdf->SetFont('','', $default_font_size - 1);
 				}
-				else $pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
+				// Into loop to work with multipage
 				
 				$pdf->SetTextColor(0,0,0);
 				
@@ -864,9 +980,11 @@ 
 				$pdf->startTransaction();
 				$pdf->writeHTMLCell($posx_options-$posx_designation-$decalage, 3, $posx_designation+$decalage, $curY, $outputlangs->convToOutputCharset($label), 0, 1, false, true, 'J',true);
 				$pageposafter=$pdf->getPage();
-				if ($pageposafter > $pageposbefore)	// There is a pagebreak
+				if ($pageposafter > $pageposbefore) {
+					// There is a pagebreak
 				{
 					$pdf->rollbackTransaction(true);
+				}
 					$pageposafter=$pageposbefore;
 					//print $pageposafter.'-'.$pageposbefore;exit;
 					$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
@@ -875,23 +993,27 @@ 
 					$pageposafter=$pdf->getPage();
 					$posyafter=$pdf->GetY();
 					//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-					if ($posyafter > ($objmarge->page_hauteur - ($heightforfooter+$heightforinfotot)))	// There is no space left for total+free text
+					if ($posyafter > ($objmarge->page_hauteur - ($heightforfooter+$heightforinfotot))) {
+						// There is no space left for total+free text
 					{
 						if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
 						{
 							$pdf->AddPage('','',true);
-							if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) self::pagehead($objmarge, $pdf, $object, 0, $outputlangs);
+					}
+							if (! empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								self::pagehead($objmarge, $pdf, $object, 0, $outputlangs);
+							}
 							$pdf->setPage($pageposafter+1);
 						}
-					}
-					else
+					} else
 					{
 						// We found a page break
 						$showpricebeforepagebreak=0;
 					}
-				}
-				else	// No pagebreak
+				} else	// No pagebreak
 				{
 					$pdf->commitTransaction();
 				}
@@ -931,8 +1053,7 @@ 
 					if ($pagenb == 1)
 					{
 						self::tableau($objmarge, $pdf, $posx_designation, $posx_options, $posx_montant, $tab_top, $objmarge->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-					}
-					else
+					} else
 					{
 						self::tableau($objmarge, $pdf, $posx_designation, $posx_options, $posx_montant, $tab_top_newpage, $objmarge->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
 					}
@@ -940,7 +1061,9 @@ 
 					$pagenb++;
 					$pdf->setPage($pagenb);
 					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-					if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) self::pagehead($objmarge, $pdf, $object, 0, $outputlangs);
+					if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						self::pagehead($objmarge, $pdf, $object, 0, $outputlangs);
+					}
 				}
 			}
 		}
@@ -950,8 +1073,7 @@ 
 		{
 			self::tableau($objmarge, $pdf, $posx_designation, $posx_options, $posx_montant, $tab_top, $objmarge->page_hauteur - $tab_top - $heightforinfotot - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 			$bottomlasttab=$objmarge->page_hauteur - $heightforinfotot - $heightforfooter + 1;
-		}
-		else
+		} else
 		{
 			self::tableau($objmarge, $pdf, $posx_designation, $posx_options, $posx_montant, $tab_top_newpage, $objmarge->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
 			$bottomlasttab=$objmarge->page_hauteur - $heightforinfotot - $heightforfooter + 1;
@@ -965,7 +1087,9 @@ 
 		
 		$pagecount = self::concat($outputlangs, array($origin_file, $file), $origin_file);
 		
-		if (empty($conf->global->SUBTOTAL_KEEP_RECAP_FILE)) unlink($file);
+		if (empty($conf->global->SUBTOTAL_KEEP_RECAP_FILE)) {
+			unlink($file);
+		}
 	}
 	
 	private static function printLevel($objmarge, $pdf, $line, $curY, $posx_designation)
@@ -1008,8 +1132,7 @@ 
 			{
 			    $height=pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $objmarge->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-			}
-			else
+			} else
 			{
 				$pdf->SetTextColor(200,0,0);
 				$pdf->SetFont('','B',$default_font_size - 2);
@@ -1018,8 +1141,7 @@ 
 			}
 			
 			$posy+=35;
-		}
-		else
+		} else
 		{
 			$text=$mysoc->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
@@ -1033,9 +1155,13 @@ 
 		$pdf->SetXY($objmarge->marge_gauche,$posy);
 		
 		$key = 'subtotalPropalTitle';
-		if ($object->element == 'commande') $key = 'subtotalCommandeTitle';
-		elseif ($object->element == 'facture') $key = 'subtotalInvoiceTitle';
-		elseif ($object->element == 'facturerec') $key = 'subtotalInvoiceTitle';
+		if ($object->element == 'commande') {
+			$key = 'subtotalCommandeTitle';
+		} elseif ($object->element == 'facture') {
+			$key = 'subtotalInvoiceTitle';
+		} elseif ($object->element == 'facturerec') {
+			$key = 'subtotalInvoiceTitle';
+		}
 		
 		$pdf->MultiCell(150, 4, $outputlangs->transnoentities($key, $object->ref, $object->thirdparty->name), '', 'L');
 		
@@ -1070,7 +1196,9 @@ 
 		
 		// Force to disable hidetop and hidebottom
 		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
+		if ($hidetop) {
+			$hidetop=-1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1085,7 +1213,9 @@ 
 			$pdf->SetXY($objmarge->page_largeur - $objmarge->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4.5);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 			
-			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($objmarge->marge_gauche, $tab_top, $objmarge->page_largeur-$objmarge->marge_droite-$objmarge->marge_gauche, 8, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+				$pdf->Rect($objmarge->marge_gauche, $tab_top, $objmarge->page_largeur-$objmarge->marge_droite-$objmarge->marge_gauche, 8, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			}
 			
 			
 			$pdf->line($objmarge->marge_gauche, $tab_top, $objmarge->page_largeur-$objmarge->marge_droite, $tab_top);	// line prend une position y en 2eme param et 4eme param
@@ -1098,8 +1228,7 @@ 
 			$pdf->MultiCell($objmarge->page_largeur - $objmarge->marge_droite - $posx_montant,2, $outputlangs->transnoentities("Amount"),'','R');
 			
 			$pdf->line($objmarge->marge_gauche, $tab_top+8, $objmarge->page_largeur-$objmarge->marge_droite, $tab_top+8);	// line prend une position y en 2eme param et 4eme param
-		}
-		else
+		} else
 		{
 			$pdf->line($objmarge->marge_gauche, $tab_top-2, $objmarge->page_largeur-$objmarge->marge_droite, $tab_top-2);	// line prend une position y en 2eme param et 4eme param
 		}
@@ -1120,10 +1249,12 @@ 
 
 		// Tableau total
 		$col1x = 120; $col2x = 170;
-		if ($objmarge->page_largeur < 210) // To work with US executive format
+		if ($objmarge->page_largeur < 210) {
+			// To work with US executive format
 		{
 			$col2x-=20;
 		}
+		}
 		$largcol2 = ($objmarge->page_largeur - $objmarge->marge_droite - $col2x);
 
 		$useborder=0;
@@ -1145,9 +1276,11 @@ 
 		$atleastoneratenotnull=0;
 		foreach($TTot['TTotal_tva'] as $tvakey => $tvaval)
 		{
-			if ($tvakey != 0)    // On affiche pas taux 0
+			if ($tvakey != 0) {
+				// On affiche pas taux 0
 			{
 				$atleastoneratenotnull++;
+			}
 
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -1200,9 +1333,13 @@ 
 	 */
     private static function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0)
     {
-	    if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y);
+	    if (empty($hidetop) || $hidetop==-1) {
+	    	$pdf->line($x, $y, $x+$l, $y);
+	    }
 	    $pdf->line($x+$l, $y, $x+$l, $y+$h);
-	    if (empty($hidebottom)) $pdf->line($x+$l, $y+$h, $x, $y+$h);
+	    if (empty($hidebottom)) {
+	    	$pdf->line($x+$l, $y+$h, $x, $y+$h);
+	    }
 	    $pdf->line($x, $y+$h, $x, $y);
     }
 	
@@ -1211,7 +1348,9 @@ 
 	{
 		global $conf;
 		
-		if (empty($fileoutput)) $fileoutput = $file[0];
+		if (empty($fileoutput)) {
+			$fileoutput = $file[0];
+		}
 		
 		$pdf=pdf_getInstance();
         if (class_exists('TCPDF'))
@@ -1221,7 +1360,9 @@ 
         }
         $pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-        if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+        if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+        	$pdf->SetCompression(false);
+        }
 
 		
 		foreach($files as $file)
@@ -1237,7 +1378,9 @@ 
 		}
 		
 		$pdf->Output($fileoutput,'F');
-		if (! empty($conf->global->MAIN_UMASK)) @chmod($file, octdec($conf->global->MAIN_UMASK));
+		if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($file, octdec($conf->global->MAIN_UMASK));
+		}
 
 		return $pagecount;
 	}
@@ -1250,7 +1393,9 @@ 
 	 */
 	public static function hasNcTitle(&$line)
 	{
-		if(isset($line->has_nc_title)) return $line->has_nc_title;
+		if(isset($line->has_nc_title)) {
+			return $line->has_nc_title;
+		}
 
 		$TTitle = self::getAllTitleFromLine($line);
 		foreach ($TTitle as &$line_title)
@@ -1275,7 +1420,9 @@ 
 	public static function getTitleLabel($line)
 	{
 		$title = $line->label;
-		if (empty($title)) $title = !empty($line->description) ? $line->description : $line->desc;
+		if (empty($title)) {
+			$title = !empty($line->description) ? $line->description : $line->desc;
+		}
 		return $title;
 	}
 }

class/actions_subtotal.class.php

Braces +521 added lines, -312 removed lines

@@ -45,7 +45,9 @@ 
 				$value = '';
 				$sql = 'SELECT content FROM '.MAIN_DB_PREFIX.'c_subtotal_free_text WHERE rowid = '.GETPOST('rowid');
 				$resql = $this->db->query($sql);
-				if ($resql && ($obj = $this->db->fetch_object($resql))) $value = $obj->content;
+				if ($resql && ($obj = $this->db->fetch_object($resql))) {
+					$value = $obj->content;
+				}
 			}
 			
 			?>
@@ -124,8 +126,7 @@ 
 			} elseif($object->element == 'invoice_supplier' )
 			{
 			    $createRight = $user->rights->fournisseur->facture->creer;
-			}
-			elseif($object->element == 'shipping')
+			} elseif($object->element == 'shipping')
 			{
 				$createRight = true; // No rights management for shipments
 			}
@@ -133,8 +134,11 @@ 
 			if ($object->statut == 0  && $createRight) {
 			
 
-				if($object->element=='facture')$idvar = 'facid';
-				else $idvar='id';
+				if($object->element=='facture') {
+					$idvar = 'facid';
+				} else {
+					$idvar='id';
+				}
 				
 				if(in_array($action, array('add_title_line', 'add_total_line', 'add_subtitle_line', 'add_subtotal_line', 'add_free_text')) )
 				{
@@ -142,10 +146,11 @@ 
 					
 					if($action=='add_title_line') {
 						$title = GETPOST('title');
-						if(empty($title)) $title = $langs->trans('title');
+						if(empty($title)) {
+							$title = $langs->trans('title');
+						}
 						$qty = $level<1 ? 1 : $level ;
-					}
-					else if($action=='add_free_text') {
+					} else if($action=='add_free_text') {
 						$title = GETPOST('title');
 
 						if (empty($title)) {
@@ -157,29 +162,31 @@ 
 								}
 							}
 						}
-						if(empty($title)) $title = $langs->trans('subtotalAddLineDescription');
+						if(empty($title)) {
+							$title = $langs->trans('subtotalAddLineDescription');
+						}
 						$qty = 50;
-					}
-					else if($action=='add_subtitle_line') {
+					} else if($action=='add_subtitle_line') {
 						$title = GETPOST('title');
-						if(empty($title)) $title = $langs->trans('subtitle');
+						if(empty($title)) {
+							$title = $langs->trans('subtitle');
+						}
 						$qty = 2;
-					}
-					else if($action=='add_subtotal_line') {
+					} else if($action=='add_subtotal_line') {
 						$title = $langs->trans('SubSubTotal');
 						$qty = 98;
-					}
-					else {
+					} else {
 						$title = GETPOST('title') ? GETPOST('title') : $langs->trans('SubTotal');
 						$qty = $level ? 100-$level : 99;
 					}
 					dol_include_once('/subtotal/class/subtotal.class.php');
 					
-					if (!empty($conf->global->SUBTOTAL_AUTO_ADD_SUBTOTAL_ON_ADDING_NEW_TITLE) && $qty < 10) TSubtotal::addSubtotalMissing($object, $qty);
+					if (!empty($conf->global->SUBTOTAL_AUTO_ADD_SUBTOTAL_ON_ADDING_NEW_TITLE) && $qty < 10) {
+						TSubtotal::addSubtotalMissing($object, $qty);
+					}
 					
 	    			TSubtotal::addSubTotalLine($object, $title, $qty);
-				}
-				else if($action==='ask_deleteallline') {
+				} else if($action==='ask_deleteallline') {
 						$form=new Form($db);
 
 						$lineid = GETPOST('lineid','integer');
@@ -202,8 +209,7 @@ 
 					$this->printNewFormat($object, $conf, $langs, $idvar);
 				}
 			}
-		}
-		elseif ((!empty($parameters['currentcontext']) && $parameters['currentcontext'] == 'orderstoinvoice') || in_array('orderstoinvoice',$contexts))
+		} elseif ((!empty($parameters['currentcontext']) && $parameters['currentcontext'] == 'orderstoinvoice') || in_array('orderstoinvoice',$contexts))
 		{
 			?>
 			<script type="text/javascript">
@@ -221,8 +227,13 @@ 
      
 	function printNewFormat(&$object, &$conf, &$langs, $idvar)
 	{
-		if (empty($conf->global->SUBTOTAL_ALLOW_ADD_BLOCK)) return false;
-		if ($line->fk_prev_id != null && !empty($line->fk_prev_id)) return false; // Si facture de situation
+		if (empty($conf->global->SUBTOTAL_ALLOW_ADD_BLOCK)) {
+			return false;
+		}
+		if ($line->fk_prev_id != null && !empty($line->fk_prev_id)) {
+			return false;
+		}
+		// Si facture de situation
 		?>
 		 	<script type="text/javascript">
 				$(document).ready(function() {
@@ -508,8 +519,7 @@ 
 				}
 				
 				
-			}	
-			else{
+			} else{
 				$substitutionarray['line_not_modsubtotal'] = true;
 				$substitutionarray['line_modsubtotal'] = 0;
 			}
@@ -567,8 +577,11 @@ 
 		
 		$showBlockExtrafields = GETPOST('showBlockExtrafields');
 		
-		if($object->element=='facture') $idvar = 'facid';
-		else $idvar = 'id';
+		if($object->element=='facture') {
+			$idvar = 'facid';
+		} else {
+			$idvar = 'id';
+		}
 			
 		if ($action == 'updateligne' || $action == 'updateline')
 		{
@@ -598,8 +611,7 @@ 
 				header('Location: '.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id);
 				exit; // Surtout ne pas laisser Dolibarr faire du traitement sur le updateligne sinon ça plante les données de la ligne
 			}
-		}
-		else if($action === 'builddoc') {
+		} else if($action === 'builddoc') {
 			
 			if (
 				in_array('invoicecard',explode(':',$parameters['context']))
@@ -614,33 +626,27 @@ 
 					$sessname = 'subtotal_hideInnerLines_facture';	
 					$sessname2 = 'subtotal_hidedetails_facture';
 					$sessname3 = 'subtotal_hideprices_facture';
-				}
-				elseif(in_array('invoicesuppliercard',explode(':',$parameters['context']))) {
+				} elseif(in_array('invoicesuppliercard',explode(':',$parameters['context']))) {
 				    $sessname = 'subtotal_hideInnerLines_facture_fournisseur';
 				    $sessname2 = 'subtotal_hidedetails_facture_fournisseur';
 				    $sessname3 = 'subtotal_hideprices_facture_fournisseur';
-				}
-				elseif(in_array('propalcard',explode(':',$parameters['context']))) {
+				} elseif(in_array('propalcard',explode(':',$parameters['context']))) {
 					$sessname = 'subtotal_hideInnerLines_propal';
 					$sessname2 = 'subtotal_hidedetails_propal';	
 					$sessname3 = 'subtotal_hideprices_propal';
-				}
-				elseif(in_array('supplier_proposalcard',explode(':',$parameters['context']))) {
+				} elseif(in_array('supplier_proposalcard',explode(':',$parameters['context']))) {
 				    $sessname = 'subtotal_hideInnerLines_supplier_proposal';
 				    $sessname2 = 'subtotal_hidedetails_supplier_proposal';
 				    $sessname3 = 'subtotal_hideprices_supplier_proposal';
-				}
-				elseif(in_array('ordercard',explode(':',$parameters['context']))) {
+				} elseif(in_array('ordercard',explode(':',$parameters['context']))) {
 					$sessname = 'subtotal_hideInnerLines_commande';
 					$sessname2 = 'subtotal_hidedetails_commande';	
 					$sessname3 = 'subtotal_hideprices_commande';
-				}
-				elseif(in_array('ordersuppliercard',explode(':',$parameters['context']))) {
+				} elseif(in_array('ordersuppliercard',explode(':',$parameters['context']))) {
 				    $sessname = 'subtotal_hideInnerLines_commande_fournisseur';
 				    $sessname2 = 'subtotal_hidedetails_commande_fournisseur';
 				    $sessname3 = 'subtotal_hideprices_commande_fournisseur';
-				}
-				else {
+				} else {
 					$sessname = 'subtotal_hideInnerLines_unknown';
 					$sessname2 = 'subtotal_hidedetails_unknown';
 					$sessname3 = 'subtotal_hideprices_unknown';
@@ -649,15 +655,24 @@ 
 				global $hideprices;
 				
 				$hideInnerLines = (int)GETPOST('hideInnerLines');
-				if(!empty($_SESSION[$sessname]) && !is_array($_SESSION[$sessname][$object->id]) ) $_SESSION[$sessname] = array(); // prevent old system
+				if(!empty($_SESSION[$sessname]) && !is_array($_SESSION[$sessname][$object->id]) ) {
+					$_SESSION[$sessname] = array();
+				}
+				// prevent old system
 				$_SESSION[$sessname][$object->id] = $hideInnerLines;		
 				
 				$hidedetails= (int)GETPOST('hidedetails');
-				if(!empty($_SESSION[$sessname2]) && !is_array($_SESSION[$sessname2][$object->id]) ) $_SESSION[$sessname2] = array(); // prevent old system
+				if(!empty($_SESSION[$sessname2]) && !is_array($_SESSION[$sessname2][$object->id]) ) {
+					$_SESSION[$sessname2] = array();
+				}
+				// prevent old system
 				$_SESSION[$sessname2][$object->id] = $hidedetails;
 				
 				$hideprices= (int)GETPOST('hideprices');
-				if(!empty($_SESSION[$sessname3]) && !is_array($_SESSION[$sessname3][$object->id]) ) $_SESSION[$sessname3] = array(); // prevent old system
+				if(!empty($_SESSION[$sessname3]) && !is_array($_SESSION[$sessname3][$object->id]) ) {
+					$_SESSION[$sessname3] = array();
+				}
+				// prevent old system
 				$_SESSION[$sessname3][$object->id] = $hideprices;
 				
 				foreach($object->lines as &$line) {
@@ -665,8 +680,7 @@ 
 					    
                         if($line->qty>=90) {
                             $line->modsubtotal_total = 1;
-                        }
-                        else{
+                        } else{
                             $line->modsubtotal_title = 1;
                         }
                         
@@ -675,8 +689,7 @@ 
 	        	}
 	        }
 			
-		}
-		else if($action === 'confirm_delete_all_lines' && GETPOST('confirm')=='yes') {
+		} else if($action === 'confirm_delete_all_lines' && GETPOST('confirm')=='yes') {
 			
 			$Tab = $this->getArrayOfLineForAGroup($object, GETPOST('lineid'));
 			
@@ -684,7 +697,9 @@ 
 				/**
 				 * @var $object Facture
 				 */
-				if($object->element=='facture') $object->deleteline($idLine);
+				if($object->element=='facture') {
+					$object->deleteline($idLine);
+				}
 				/**
 				 * @var $object Facture fournisseur
 				 */
@@ -695,18 +710,25 @@ 
 				/**
 				 * @var $object Propal
 				 */
-				else if($object->element=='propal') $object->deleteline($idLine);
+				else if($object->element=='propal') {
+					$object->deleteline($idLine);
+				}
 				/**
 				 * @var $object Propal Fournisseur
 				 */
-				else if($object->element=='supplier_proposal') $object->deleteline($idLine);
+				else if($object->element=='supplier_proposal') {
+					$object->deleteline($idLine);
+				}
 				/**
 				 * @var $object Commande
 				 */
 				else if($object->element=='commande') 
 				{
-					if ((float) DOL_VERSION >= 5.0) $object->deleteline($user, $idLine);
-					else $object->deleteline($idLine);
+					if ((float) DOL_VERSION >= 5.0) {
+						$object->deleteline($user, $idLine);
+					} else {
+						$object->deleteline($idLine);
+					}
 				}
 				/**
 				 * @var $object Commande fournisseur
@@ -718,25 +740,32 @@ 
 				/**
 				 * @var $object Facturerec
 				 */
-				else if($object->element=='facturerec') $object->deleteline($idLine);
+				else if($object->element=='facturerec') {
+					$object->deleteline($idLine);
+				}
 				/**
 				 * @var $object Expedition
 				 */
-				else if($object->element=='shipping') $object->deleteline($user, $idLine);
+				else if($object->element=='shipping') {
+					$object->deleteline($user, $idLine);
+				}
 			}
 			
 			header('location:?id='.$object->id);
 			exit;
 			
-		}
-		else if ($action == 'duplicate')
+		} else if ($action == 'duplicate')
 		{
 			$lineid = GETPOST('lineid', 'int');
 			$nbDuplicate = TSubtotal::duplicateLines($object, $lineid, true);
 			
-			if ($nbDuplicate > 0) setEventMessage($langs->trans('subtotal_duplicate_success', $nbDuplicate));
-			elseif ($nbDuplicate == 0) setEventMessage($langs->trans('subtotal_duplicate_lineid_not_found'), 'warnings');
-			else setEventMessage($langs->trans('subtotal_duplicate_error'), 'errors');
+			if ($nbDuplicate > 0) {
+				setEventMessage($langs->trans('subtotal_duplicate_success', $nbDuplicate));
+			} elseif ($nbDuplicate == 0) {
+				setEventMessage($langs->trans('subtotal_duplicate_lineid_not_found'), 'warnings');
+			} else {
+				setEventMessage($langs->trans('subtotal_duplicate_error'), 'errors');
+			}
 			
 			header('Location: ?id='.$object->id);
 			exit;
@@ -754,21 +783,26 @@ 
 		global $conf;
 		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && !empty($object->table_element_line) && in_array($object->element, array('commande', 'facture', 'propal')))
 		{
-			if ($object->element == 'commande')
-				$obj = new OrderLine($object->db);
-			if ($object->element == 'propal')
-				$obj = new PropaleLigne($object->db);
-			if ($object->element == 'facture')
-				$obj = new FactureLigne($object->db);
+			if ($object->element == 'commande') {
+							$obj = new OrderLine($object->db);
+			}
+			if ($object->element == 'propal') {
+							$obj = new PropaleLigne($object->db);
+			}
+			if ($object->element == 'facture') {
+							$obj = new FactureLigne($object->db);
+			}
 			if (!empty($parameters['fk_element']))
 			{
 				
 				if($obj->fetch($parameters['fk_element'])){
 					$obj->id= $obj->rowid;
-					if (empty($obj->array_options))
-						$obj->fetch_optionals();
-					if (!empty($obj->array_options['options_subtotal_nc']))
-						return 1;
+					if (empty($obj->array_options)) {
+											$obj->fetch_optionals();
+					}
+					if (!empty($obj->array_options['options_subtotal_nc'])) {
+											return 1;
+					}
 				}
 			}
 		}
@@ -840,27 +874,33 @@ 
 		$TTotal_tva = array();
 		
 		$sign=1;
-		if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+		if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+			$sign=-1;
+		}
 		
-		if (GETPOST('action') == 'builddoc') $builddoc = true;
-		else $builddoc = false;
+		if (GETPOST('action') == 'builddoc') {
+			$builddoc = true;
+		} else {
+			$builddoc = false;
+		}
 		
 		dol_include_once('/subtotal/class/subtotal.class.php');
 		foreach($object->lines as $l) {
 			//print $l->rang.'>='.$rang.' '.$total.'<br/>';
 			if($l->rang>=$rang) {
 				//echo 'return!<br>';
-				if (!$return_all) return $total;
-				else return array($total, $total_tva, $total_ttc, $TTotal_tva);
-			}
-			else if(TSubtotal::isTitle($l, 100 - $qty_line)) 
+				if (!$return_all) {
+					return $total;
+				} else {
+					return array($total, $total_tva, $total_ttc, $TTotal_tva);
+				}
+			} else if(TSubtotal::isTitle($l, 100 - $qty_line)) 
 		  	{
 				$total = 0;
 				$total_tva = 0;
 				$total_ttc = 0;
 				$TTotal_tva = array();
-			}
-			elseif(!TSubtotal::isTitle($l) && !TSubtotal::isSubtotal($l)) {
+			} elseif(!TSubtotal::isTitle($l) && !TSubtotal::isSubtotal($l)) {
 				
 				// TODO retirer le test avec $builddoc quand Dolibarr affichera le total progression sur la card et pas seulement dans le PDF
 				if ($builddoc && $object->element == 'facture' && $object->type==Facture::TYPE_SITUATION)
@@ -882,8 +922,7 @@ 
 						$TTotal_tva[$l->tva_tx] += $sign * ($l->total_tva / ($l->situation_percent / 100)) * $progress;
 						$total_ttc += $sign * ($l->total_tva / ($l->total_ttc / 100)) * $progress;
 					}
-				}
-				else
+				} else
 				{
 					$total += $l->total_ht;
 					$total_tva += $l->total_tva;
@@ -893,8 +932,11 @@ 
 			}
 			
 		}
-		if (!$return_all) return $total;
-		else return array($total, $total_tva, $total_ttc, $TTotal_tva);
+		if (!$return_all) {
+			return $total;
+		} else {
+			return array($total, $total_tva, $total_ttc, $TTotal_tva);
+		}
 	}
 
 	/**
@@ -941,15 +983,18 @@ 
 		}
 		
 			
-		if($line->qty==99)
-			$pdf->SetFillColor(220,220,220);
-		elseif ($line->qty==98)
-			$pdf->SetFillColor(230,230,230);
-		else
-			$pdf->SetFillColor(240,240,240);
+		if($line->qty==99) {
+					$pdf->SetFillColor(220,220,220);
+		} elseif ($line->qty==98) {
+					$pdf->SetFillColor(230,230,230);
+		} else {
+					$pdf->SetFillColor(240,240,240);
+		}
 		
 		$style = 'B';
-		if (!empty($conf->global->SUBTOTAL_SUBTOTAL_STYLE)) $style = $conf->global->SUBTOTAL_SUBTOTAL_STYLE;
+		if (!empty($conf->global->SUBTOTAL_SUBTOTAL_STYLE)) {
+			$style = $conf->global->SUBTOTAL_SUBTOTAL_STYLE;
+		}
 		
 		$pdf->SetFont('', $style, 9);
 		
@@ -991,8 +1036,7 @@ 
 //					$line->total_tva
 //					$line->total
 //					$line->total_ttc
-				}
-				else
+				} else
 				{
 					list($total, $total_tva, $total_ttc, $TTotal_tva) = $this->getTotalLineFromObject($object, $line, '', 1);
 					$total_to_print = price($total);
@@ -1005,11 +1049,14 @@ 
 			}
 
 			$pdf->SetXY($pdf->postotalht, $posy);
-			if($set_pagebreak_margin) $pdf->SetAutoPageBreak( $pageBreakOriginalValue , $bMargin);
+			if($set_pagebreak_margin) {
+				$pdf->SetAutoPageBreak( $pageBreakOriginalValue , $bMargin);
+			}
 			$pdf->MultiCell($pdf->page_largeur-$pdf->marge_droite-$pdf->postotalht, 3, $total_to_print, 0, 'R', 0);
-		}
-		else{
-			if($set_pagebreak_margin) $pdf->SetAutoPageBreak( $pageBreakOriginalValue , $bMargin);
+		} else{
+			if($set_pagebreak_margin) {
+				$pdf->SetAutoPageBreak( $pageBreakOriginalValue , $bMargin);
+			}
 		}
 		
 		$posy = $posy + $cell_height;
@@ -1041,25 +1088,40 @@ 
 		
  
 		$style = ($line->qty==1) ? 'BU' : 'BUI';
-		if (!empty($conf->global->SUBTOTAL_TITLE_STYLE)) $style = $conf->global->SUBTOTAL_TITLE_STYLE;
+		if (!empty($conf->global->SUBTOTAL_TITLE_STYLE)) {
+			$style = $conf->global->SUBTOTAL_TITLE_STYLE;
+		}
 		
 		if($hideInnerLines) {
-			if($line->qty==1)$pdf->SetFont('', $style, 9);
-			else 
+			if($line->qty==1) {
+				$pdf->SetFont('', $style, 9);
+			} else 
 			{
-				if (!empty($conf->global->SUBTOTAL_STYLE_TITRES_SI_LIGNES_CACHEES)) $style = $conf->global->SUBTOTAL_STYLE_TITRES_SI_LIGNES_CACHEES;
+				if (!empty($conf->global->SUBTOTAL_STYLE_TITRES_SI_LIGNES_CACHEES)) {
+					$style = $conf->global->SUBTOTAL_STYLE_TITRES_SI_LIGNES_CACHEES;
+				}
 				$pdf->SetFont('', $style, 9);
 			}
-		}
-		else {
+		} else {
 
-			if($line->qty==1)$pdf->SetFont('', $style, 9); //TODO if super utile
-			else $pdf->SetFont('', $style, 9);
+			if($line->qty==1) {
+				$pdf->SetFont('', $style, 9);
+			}
+			//TODO if super utile
+			else {
+				$pdf->SetFont('', $style, 9);
+			}
 			
 		}
 		
-		if ($label === strip_tags($label) && $label === dol_html_entity_decode($label, ENT_QUOTES)) $pdf->MultiCell($w, $h, $label, 0, 'L'); // Pas de HTML dans la chaine
-		else $pdf->writeHTMLCell($w, $h, $posx, $posy, $label, 0, 1, false, true, 'J',true); // et maintenant avec du HTML
+		if ($label === strip_tags($label) && $label === dol_html_entity_decode($label, ENT_QUOTES)) {
+			$pdf->MultiCell($w, $h, $label, 0, 'L');
+		}
+		// Pas de HTML dans la chaine
+		else {
+			$pdf->writeHTMLCell($w, $h, $posx, $posy, $label, 0, 1, false, true, 'J',true);
+		}
+		// et maintenant avec du HTML
 		
 		if($description && !$hidedesc) {
 			$posy = $pdf->GetY();
@@ -1083,8 +1145,7 @@ 
 		
 		if(is_array($parameters)) {
 			$i = & $parameters['i'];	
-		}
-		else {
+		} else {
 			$i = (int)$parameters;
 		}
 
@@ -1114,17 +1175,14 @@ 
 			
 			if((float)DOL_VERSION<=3.6) {
 				return '';
-			}
-			else if((float)DOL_VERSION>=3.8) {
+			} else if((float)DOL_VERSION>=3.8) {
 				return 1;
 			}
 			
-		}
-		elseif(!empty($hideprices)) {
+		} elseif(!empty($hideprices)) {
 			$this->resprints = $object->lines[$parameters['i']]->qty;
 			return 1;
-		}
-		elseif (!empty($conf->global->SUBTOTAL_IF_HIDE_PRICES_SHOW_QTY))
+		} elseif (!empty($conf->global->SUBTOTAL_IF_HIDE_PRICES_SHOW_QTY))
 		{
 			$hideInnerLines = (int)GETPOST('hideInnerLines');
 			$hidedetails = (int)GETPOST('hidedetails');
@@ -1134,12 +1192,20 @@ 
 			}
 		}
 		
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if(is_array($parameters)) {
+			$i = & $parameters['i'];
+		} else {
+			$i = (int)$parameters;
+		}
 
-		if (empty($object->lines[$i])) return 0; // hideInnerLines => override $object->lines et Dolibarr ne nous permet pas de mettre à jour la variable qui conditionne la boucle sur les lignes (PR faite pour 6.0)
+		if (empty($object->lines[$i])) {
+			return 0;
+		}
+		// hideInnerLines => override $object->lines et Dolibarr ne nous permet pas de mettre à jour la variable qui conditionne la boucle sur les lignes (PR faite pour 6.0)
 		
-		if(empty($object->lines[$i]->array_options)) $object->lines[$i]->fetch_optionals();
+		if(empty($object->lines[$i]->array_options)) {
+			$object->lines[$i]->fetch_optionals();
+		}
 
 		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
 		{
@@ -1156,8 +1222,11 @@ 
 	function pdf_getlinetotalexcltax($parameters=array(), &$object, &$action='') {
 	    global $conf, $hideprices, $hookmanager;
 		
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if(is_array($parameters)) {
+			$i = & $parameters['i'];
+		} else {
+			$i = (int)$parameters;
+		}
 			
 		if($this->isModSubtotalLine($parameters,$object) ){
 			
@@ -1165,13 +1234,11 @@ 
 			
 			if((float)DOL_VERSION<=3.6) {
 				return '';
-			}
-			else if((float)DOL_VERSION>=3.8) {
+			} else if((float)DOL_VERSION>=3.8) {
 				return 1;
 			}
 			
-		}
-		elseif (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS))
+		} elseif (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS))
 		{
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
 			{
@@ -1243,12 +1310,10 @@ 
 			$this->error = $hookmanager->error;
 			$this->errors = $hookmanager->errors;
 			return -1;
-		}
-		elseif (empty($reshook))
+		} elseif (empty($reshook))
 		{
 			$this->resprints .= $hookmanager->resprints;
-		}
-		else
+		} else
 		{
 			$this->resprints = $hookmanager->resprints;
 
@@ -1271,14 +1336,16 @@ 
 		
 			if((float)DOL_VERSION<=3.6) {
 				return '';
-			}
-			else if((float)DOL_VERSION>=3.8) {
+			} else if((float)DOL_VERSION>=3.8) {
 				return 1;
 			}
 		}
 		
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if(is_array($parameters)) {
+			$i = & $parameters['i'];
+		} else {
+			$i = (int)$parameters;
+		}
 		
 		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) ) 
 		{
@@ -1300,14 +1367,16 @@ 
 		
 			if((float)DOL_VERSION<=3.6) {
 				return '';
-			}
-			else if((float)DOL_VERSION>=3.8) {
+			} else if((float)DOL_VERSION>=3.8) {
 				return 1;
 			}
 		}
 		
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if(is_array($parameters)) {
+			$i = & $parameters['i'];
+		} else {
+			$i = (int)$parameters;
+		}
 			
 		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
 		{
@@ -1324,8 +1393,11 @@ 
 	function pdf_getlineupexcltax($parameters=array(), &$object, &$action='') {
 	    global $conf,$hideprices,$hookmanager;
 
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if(is_array($parameters)) {
+			$i = & $parameters['i'];
+		} else {
+			$i = (int)$parameters;
+		}
 
 		if($this->isModSubtotalLine($parameters,$object) ) {
 			$this->resprints = ' ';
@@ -1336,7 +1408,9 @@ 
             if(TSubtotal::isSubtotal($line)) {
                 $parentTitle = TSubtotal::getParentTitleOfLine($object, $i);
 
-                if(is_object($parentTitle) && empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
+                if(is_object($parentTitle) && empty($parentTitle->array_options)) {
+                	$parentTitle->fetch_optionals();
+                }
                 if(! empty($parentTitle->array_options['options_show_total_ht'])) {
                     $TTotal = TSubtotal::getTotalBlockFromTitle($object, $parentTitle);
                     $this->resprints = price($TTotal['total_subprice']);
@@ -1345,8 +1419,7 @@ 
 		
 			if((float)DOL_VERSION<=3.6) {
 				return '';
-			}
-			else if((float)DOL_VERSION>=3.8) {
+			} else if((float)DOL_VERSION>=3.8) {
 				return 1;
 			}
 		}
@@ -1391,8 +1464,11 @@ 
 	function pdf_getlineremisepercent($parameters=array(), &$object, &$action='') {
 	    global $conf,$hideprices,$hookmanager;
 
-        if(is_array($parameters)) $i = & $parameters['i'];
-        else $i = (int) $parameters;
+        if(is_array($parameters)) {
+        	$i = & $parameters['i'];
+        } else {
+        	$i = (int) $parameters;
+        }
 
 		if($this->isModSubtotalLine($parameters,$object) ) {
 			$this->resprints = ' ';
@@ -1403,7 +1479,9 @@ 
             if(TSubtotal::isSubtotal($line)) {
                 $parentTitle = TSubtotal::getParentTitleOfLine($object, $i);
 
-                if(empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
+                if(empty($parentTitle->array_options)) {
+                	$parentTitle->fetch_optionals();
+                }
                 if(! empty($parentTitle->array_options['options_show_reduc'])) {
                     $TTotal = TSubtotal::getTotalBlockFromTitle($object, $parentTitle);
                     $this->resprints = price((1-$TTotal['total_ht'] / $TTotal['total_subprice'])*100, 0, '', 1, 2, 2).'%';
@@ -1412,12 +1490,10 @@ 
 		
 			if((float)DOL_VERSION<=3.6) {
 				return '';
-			}
-			else if((float)DOL_VERSION>=3.8) {
+			} else if((float)DOL_VERSION>=3.8) {
 				return 1;
 			}
-		}
-		elseif (!empty($hideprices)
+		} elseif (!empty($hideprices)
 		        || (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
 		        )
 		    {
@@ -1438,14 +1514,16 @@ 
 			$this->resprints = ' ';
 			if((float)DOL_VERSION<=3.6) {
 				return '';
-			}
-			else if((float)DOL_VERSION>=3.8) {
+			} else if((float)DOL_VERSION>=3.8) {
 				return 1;
 			}
 		}
 		
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if(is_array($parameters)) {
+			$i = & $parameters['i'];
+		} else {
+			$i = (int)$parameters;
+		}
 			
 		if (!empty($hideprices)
 				|| (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
@@ -1469,16 +1547,21 @@ 
 			
 			if((float)DOL_VERSION<=3.6) {
 				return '';
-			}
-			else if((float)DOL_VERSION>=3.8) {
+			} else if((float)DOL_VERSION>=3.8) {
 				return 1;
 			}
 		}
 		
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if(is_array($parameters)) {
+			$i = & $parameters['i'];
+		} else {
+			$i = (int)$parameters;
+		}
 		
-		if (empty($object->lines[$i])) return 0; // hideInnerLines => override $object->lines et Dolibarr ne nous permet pas de mettre à jour la variable qui conditionne la boucle sur les lignes (PR faite pour 6.0)
+		if (empty($object->lines[$i])) {
+			return 0;
+		}
+		// hideInnerLines => override $object->lines et Dolibarr ne nous permet pas de mettre à jour la variable qui conditionne la boucle sur les lignes (PR faite pour 6.0)
 
 		$object->lines[$i]->fetch_optionals();
 		// Si la gestion C/NC est active et que je suis sur un ligne dont l'extrafield est coché
@@ -1524,14 +1607,16 @@ 
 			$this->resprints = ' ';
 			if((float)DOL_VERSION<=3.6) {
 				return '';
-			}
-			else if((float)DOL_VERSION>=3.8) {
+			} else if((float)DOL_VERSION>=3.8) {
 				return 1;
 			}
 		}
 		
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if(is_array($parameters)) {
+			$i = & $parameters['i'];
+		} else {
+			$i = (int)$parameters;
+		}
 			
 		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
 		{
@@ -1561,7 +1646,9 @@ 
 				}
 			}
 			
-			if (!empty($TLineTitle)) $TTitleNumeroted = $this->formatNumerotation($TLineTitle);
+			if (!empty($TLineTitle)) {
+				$TTitleNumeroted = $this->formatNumerotation($TLineTitle);
+			}
 		}
 		
 	}
@@ -1575,8 +1662,12 @@ 
 		$j=0;
 		foreach ($TLineTitle as $k => &$line)
 		{
-			if (!empty($line_reference) && $line->rang <= $line_reference->rang) continue;
-			if (!empty($line_reference) && $line->qty <= $line_reference->qty) break;
+			if (!empty($line_reference) && $line->rang <= $line_reference->rang) {
+				continue;
+			}
+			if (!empty($line_reference) && $line->qty <= $line_reference->qty) {
+				break;
+			}
 			
 			if ($line->qty == $level)
 			{
@@ -1610,7 +1701,9 @@ 
 		
 		$hidedetails = (int)GETPOST('hidedetails');
 		
-		if(empty($hidedetails)) return false;
+		if(empty($hidedetails)) {
+			return false;
+		}
 		
 		// TODO can't add VAT to document without lines... :-/
 		
@@ -1638,7 +1731,9 @@ 
         foreach($object->lines as $k => &$l) {
             if(TSubtotal::isSubtotal($l)) {
                 $parentTitle = TSubtotal::getParentTitleOfLine($object, $k);
-                if(is_object($parentTitle) && empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
+                if(is_object($parentTitle) && empty($parentTitle->array_options)) {
+                	$parentTitle->fetch_optionals();
+                }
                 if(! empty($parentTitle->id) && ! empty($parentTitle->array_options['options_show_total_ht'])) {
                     $l->remise_percent = 100;    // Affichage de la réduction sur la ligne de sous-total
                 }
@@ -1680,7 +1775,9 @@ 
 						*/
 						list($total, $total_tva, $total_ttc, $TTotal_tva) = $this->getTotalLineFromObject($object, $line, '', 1);
 						
-						if (TSubtotal::getNiveau($line) == 1) $line->TTotal_tva = $TTotal_tva;
+						if (TSubtotal::getNiveau($line) == 1) {
+							$line->TTotal_tva = $TTotal_tva;
+						}
 						$line->total_ht = $total;
 						$line->total_tva = $total_tva;
 						$line->total = $line->total_ht;
@@ -1744,8 +1841,7 @@ 
 				    }
 				    
 					
-				}
-				elseif ($hidedetails)
+				} elseif ($hidedetails)
 				{
 					$TLines[] = $line; //Cas où je cache uniquement les prix des produits	
 				}
@@ -1816,13 +1912,17 @@ 
 				
 				if(!empty($hideprices)) {
 					foreach($object->lines as &$line) {
-						if($line->fk_product_type!=9) $line->fk_parent_line = -1;	
+						if($line->fk_product_type!=9) {
+							$line->fk_parent_line = -1;
+						}
 					}
 				}
 			
 				$line = &$object->lines[$i];
 
-				if($object->element == 'delivery' && ! empty($object->commande->expeditions[$line->fk_origin_line])) unset($object->commande->expeditions[$line->fk_origin_line]);
+				if($object->element == 'delivery' && ! empty($object->commande->expeditions[$line->fk_origin_line])) {
+					unset($object->commande->expeditions[$line->fk_origin_line]);
+				}
 
 				if($line->info_bits>0) { // PAGE BREAK
 					$pdf->addPage();
@@ -1838,7 +1938,9 @@ 
 				}
 
 				if($line->qty>90) {
-					if ($conf->global->SUBTOTAL_USE_NEW_FORMAT)	$label .= ' '.$this->getTitle($object, $line);
+					if ($conf->global->SUBTOTAL_USE_NEW_FORMAT) {
+						$label .= ' '.$this->getTitle($object, $line);
+					}
 					
 					$pageBefore = $pdf->getPage();
 					$this->pdf_add_total($pdf,$object, $line, $label, $description,$posx, $posy, $w, $h);
@@ -1876,8 +1978,7 @@ 
 				
 					$posy = $pdf->GetY();
 					return 1;
-				}	
-				else if ($line->qty < 10) {
+				} else if ($line->qty < 10) {
 					$pageBefore = $pdf->getPage();
 
 					$this->pdf_add_title($pdf,$object, $line, $label, $description,$posx, $posy, $w, $h); 
@@ -1907,8 +2008,7 @@ 
 //	if($line->rowid==47) exit;
 			
 			return 0;
-		}
-		elseif (empty($object->lines[$parameters['i']]))
+		} elseif (empty($object->lines[$parameters['i']]))
 		{
 			$this->resprints = -1;
 		}
@@ -1941,7 +2041,9 @@ 
 		
 		foreach ($object->lines as $line)
 		{
-			if ($line->id == $currentLine->id) break;
+			if ($line->id == $currentLine->id) {
+				break;
+			}
 			
 			$qty_search = 100 - $currentLine->qty;
 			
@@ -1980,22 +2082,18 @@ 
 		{
 			$object->statut = 0; // hack for facture rec
 			$createRight = $user->rights->facture->creer;
-		}
-		elseif($object->element == 'order_supplier' )
+		} elseif($object->element == 'order_supplier' )
 		{
 		    $createRight = $user->rights->fournisseur->commande->creer;
-		}
-		elseif($object->element == 'invoice_supplier' )
+		} elseif($object->element == 'invoice_supplier' )
 		{
 		    $createRight = $user->rights->fournisseur->facture->creer;
-		}
-		elseif($object->element == 'commande' && in_array('ordershipmentcard', $contexts))
+		} elseif($object->element == 'commande' && in_array('ordershipmentcard', $contexts))
 		{
 			// H4cK 4n0nYm0u$-style : $line n'est pas un objet instancié mais provient d'un fetch_object d'une requête SQL
 			$line->id = $line->rowid;
 			$line->product_type = $line->type;
-		}
-		elseif($object->element == 'shipping' || $object->element == 'delivery')
+		} elseif($object->element == 'shipping' || $object->element == 'delivery')
 		{
 			if(empty($line->origin_line_id) && ! empty($line->fk_origin_line))
 			{
@@ -2015,8 +2113,11 @@ 
 
 			$line = $originline;
 		}
- 		if($object->element=='facture')$idvar = 'facid';
-        else $idvar='id';
+ 		if($object->element=='facture') {
+ 			$idvar = 'facid';
+ 		} else {
+        	$idvar='id';
+        }
 		if($line->special_code!=$this->module_number || $line->product_type!=9) {
 			if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_LINE) && $object->element !== 'invoice_supplier')
             {
@@ -2034,8 +2135,7 @@ 
 
             }
 			return 0;
-		}
-		else if (in_array('invoicecard',$contexts) || in_array('invoicesuppliercard',$contexts) || in_array('propalcard',$contexts) || in_array('supplier_proposalcard',$contexts) || in_array('ordercard',$contexts) || in_array('ordersuppliercard',$contexts) || in_array('invoicereccard',$contexts)) 
+		} else if (in_array('invoicecard',$contexts) || in_array('invoicesuppliercard',$contexts) || in_array('propalcard',$contexts) || in_array('supplier_proposalcard',$contexts) || in_array('ordercard',$contexts) || in_array('ordersuppliercard',$contexts) || in_array('invoicereccard',$contexts)) 
         {
 
 
@@ -2063,22 +2163,44 @@ 
 				<?php
 			}
 			
-			if(empty($line->description)) $line->description = $line->desc;
+			if(empty($line->description)) {
+				$line->description = $line->desc;
+			}
 			
 			$colspan = 5;
-			if($object->element == 'facturerec' ) $colspan = 3;
-			if($object->element == 'order_supplier') (float) DOL_VERSION < 7.0 ? $colspan = 3 : $colspan = 6;
-			if($object->element == 'invoice_supplier') (float) DOL_VERSION < 7.0 ? $colspan = 4: $colspan = 7;
-			if($object->element == 'supplier_proposal') (float) DOL_VERSION < 6.0 ? $colspan = 4 : $colspan = 3;
+			if($object->element == 'facturerec' ) {
+				$colspan = 3;
+			}
+			if($object->element == 'order_supplier') {
+				(float) DOL_VERSION < 7.0 ? $colspan = 3 : $colspan = 6;
+			}
+			if($object->element == 'invoice_supplier') {
+				(float) DOL_VERSION < 7.0 ? $colspan = 4: $colspan = 7;
+			}
+			if($object->element == 'supplier_proposal') {
+				(float) DOL_VERSION < 6.0 ? $colspan = 4 : $colspan = 3;
+			}
 			if(!empty($conf->multicurrency->enabled) && ((float) DOL_VERSION < 8.0 || $object->multicurrency_code != $conf->currency)) {
 				$colspan++; // Colonne PU Devise
 			}
-			if($object->element == 'commande' && $object->statut < 3 && !empty($conf->shippableorder->enabled)) $colspan++;
-			if(!empty($conf->margin->enabled)) $colspan++;
-			if(!empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
-			if(!empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
-			if($object->element == 'facture' && !empty($conf->global->INVOICE_USE_SITUATION) && $object->type == Facture::TYPE_SITUATION) $colspan++;
-			if(!empty($conf->global->PRODUCT_USE_UNITS)) $colspan++;
+			if($object->element == 'commande' && $object->statut < 3 && !empty($conf->shippableorder->enabled)) {
+				$colspan++;
+			}
+			if(!empty($conf->margin->enabled)) {
+				$colspan++;
+			}
+			if(!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+				$colspan++;
+			}
+			if(!empty($conf->global->DISPLAY_MARK_RATES)) {
+				$colspan++;
+			}
+			if($object->element == 'facture' && !empty($conf->global->INVOICE_USE_SITUATION) && $object->type == Facture::TYPE_SITUATION) {
+				$colspan++;
+			}
+			if(!empty($conf->global->PRODUCT_USE_UNITS)) {
+				$colspan++;
+			}
 					
 			/* Titre */
 			//var_dump($line);
@@ -2091,23 +2213,36 @@ 
 			<tr <?php echo $bc[$var]; $var=!$var; echo $data; ?> rel="subtotal" id="row-<?php echo $line->id ?>" style="<?php
 					if (!empty($conf->global->SUBTOTAL_USE_NEW_FORMAT))
 					{
-						if($line->qty==99) print 'background:#adadcf';
-						else if($line->qty==98) print 'background:#ddddff;';
-						else if($line->qty<=97 && $line->qty>=91) print 'background:#eeeeff;';
-						else if($line->qty==1) print 'background:#adadcf;';
-						else if($line->qty==2) print 'background:#ddddff;';
-						else if($line->qty==50) print '';
-						else print 'background:#eeeeff;';
+						if($line->qty==99) {
+							print 'background:#adadcf';
+						} else if($line->qty==98) {
+							print 'background:#ddddff;';
+						} else if($line->qty<=97 && $line->qty>=91) {
+							print 'background:#eeeeff;';
+						} else if($line->qty==1) {
+							print 'background:#adadcf;';
+						} else if($line->qty==2) {
+							print 'background:#ddddff;';
+						} else if($line->qty==50) {
+							print '';
+						} else {
+							print 'background:#eeeeff;';
+						}
 
 						//A compléter si on veux plus de nuances de couleurs avec les niveau 4,5,6,7,8 et 9
-					}
-					else 
+					} else 
 					{
-						if($line->qty==99) print 'background:#ddffdd';
-						else if($line->qty==98) print 'background:#ddddff;';
-						else if($line->qty==2) print 'background:#eeeeff; ';
-						else if($line->qty==50) print '';
-						else print 'background:#eeffee;' ;
+						if($line->qty==99) {
+							print 'background:#ddffdd';
+						} else if($line->qty==98) {
+							print 'background:#ddddff;';
+						} else if($line->qty==2) {
+							print 'background:#eeeeff; ';
+						} else if($line->qty==50) {
+							print '';
+						} else {
+							print 'background:#eeffee;' ;
+						}
 					}
 
 			?>;">
@@ -2134,13 +2269,11 @@ 
 							$qty_displayed = $line->qty;
 							print img_picto('', 'subsubtotal@subtotal').'<span style="font-size:9px;margin-left:-3px;color:#0075DE;">'.$qty_displayed.'</span>&nbsp;&nbsp;';
 							
-						}
-						else if (TSubtotal::isSubtotal($line))
+						} else if (TSubtotal::isSubtotal($line))
 						{
 							$qty_displayed = 100 - $line->qty;
 							print img_picto('', 'subsubtotal2@subtotal').'<span style="font-size:9px;margin-left:-1px;color:#0075DE;">'.$qty_displayed.'</span>&nbsp;&nbsp;';
-						}
-						else
+						} else
 						{
 							$isFreeText = true;
 						}
@@ -2161,9 +2294,13 @@ 
 						}
 
 						$readonlyForSituation = '';
-						if (!empty($line->fk_prev_id) && $line->fk_prev_id != null) $readonlyForSituation = 'readonly';
+						if (!empty($line->fk_prev_id) && $line->fk_prev_id != null) {
+							$readonlyForSituation = 'readonly';
+						}
 						
-						if (!$isFreeText) echo '<input type="text" name="line-title" id-line="'.$line->id.'" value="'.$newlabel.'" size="80" '.$readonlyForSituation.'/>&nbsp;';
+						if (!$isFreeText) {
+							echo '<input type="text" name="line-title" id-line="'.$line->id.'" value="'.$newlabel.'" size="80" '.$readonlyForSituation.'/>&nbsp;';
+						}
 						
 						if (!empty($conf->global->SUBTOTAL_USE_NEW_FORMAT) && (TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line)) )
 						{
@@ -2171,8 +2308,12 @@ 
 							for ($j=1; $j<10; $j++)
 							{
 								if (!empty($readonlyForSituation)) {
-									if ($qty_displayed == $j) $select .= '<option selected="selected" value="'.$j.'">'.$langs->trans('Level').' '.$j.'</option>';
-								} else $select .= '<option '.($qty_displayed == $j ? 'selected="selected"' : '').' value="'.$j.'">'.$langs->trans('Level').' '.$j.'</option>';
+									if ($qty_displayed == $j) {
+										$select .= '<option selected="selected" value="'.$j.'">'.$langs->trans('Level').' '.$j.'</option>';
+									}
+								} else {
+									$select .= '<option '.($qty_displayed == $j ? 'selected="selected"' : '').' value="'.$j.'">'.$langs->trans('Level').' '.$j.'</option>';
+								}
 							}
 							$select .= '</select>&nbsp;';
 
@@ -2192,7 +2333,9 @@ 
                             echo '<div>';
                             echo '<label for="subtotal_tva_tx">'.$form->textwithpicto($langs->trans('subtotal_apply_default_tva'), $langs->trans('subtotal_apply_default_tva_help')).'</label>';
                             echo '<select id="subtotal_tva_tx" name="subtotal_tva_tx" class="flat"><option selected="selected" value="">-</option>';
-                            if (empty($readonlyForSituation)) echo str_replace('selected', '', $form->load_tva('subtotal_tva_tx', '', $parameters['seller'], $parameters['buyer'], 0, 0, '', true));
+                            if (empty($readonlyForSituation)) {
+                            	echo str_replace('selected', '', $form->load_tva('subtotal_tva_tx', '', $parameters['seller'], $parameters['buyer'], 0, 0, '', true));
+                            }
                             echo '</select>';
                             echo '</div>';
 
@@ -2211,8 +2354,9 @@ 
                             echo '<input style="vertical-align:sub;"  type="checkbox" name="line-showReduc" id="subtotal-showReduc" value="1" '.(($line->array_options['options_show_reduc'] > 0) ? 'checked="checked"' : '') .' />&nbsp;';
                             echo '<label for="subtotal-showReduc">'.$langs->trans('ShowReducOnSubtotalBlock').'</label>';
                             echo '</div>';
+                        } else if ($isFreeText) {
+                        	echo TSubtotal::getFreeTextHtml($line, (bool) $readonlyForSituation);
                         }
-                        else if ($isFreeText) echo TSubtotal::getFreeTextHtml($line, (bool) $readonlyForSituation);
 						echo '</div>';
 
 						if($line->qty<10) {
@@ -2232,8 +2376,7 @@ 
 							$doleditor->Create();
 						}
 						
-					}
-					else {
+					} else {
 
 						 if ($conf->global->SUBTOTAL_USE_NEW_FORMAT)
 						 {
@@ -2241,14 +2384,19 @@ 
 							{
 								echo str_repeat('&nbsp;&nbsp;&nbsp;', $line->qty-1);
 								
-								if (TSubtotal::isTitle($line)) print img_picto('', 'subtotal@subtotal').'<span style="font-size:9px;margin-left:-3px;">'.$line->qty.'</span>&nbsp;&nbsp;';
-								else print img_picto('', 'subtotal2@subtotal').'<span style="font-size:9px;margin-left:-1px;">'.(100-$line->qty).'</span>&nbsp;&nbsp;';
+								if (TSubtotal::isTitle($line)) {
+									print img_picto('', 'subtotal@subtotal').'<span style="font-size:9px;margin-left:-3px;">'.$line->qty.'</span>&nbsp;&nbsp;';
+								} else {
+									print img_picto('', 'subtotal2@subtotal').'<span style="font-size:9px;margin-left:-1px;">'.(100-$line->qty).'</span>&nbsp;&nbsp;';
+								}
 							}
-						 }
-						 else 
+						 } else 
 						 {
-							if($line->qty<=1) print img_picto('', 'subtotal@subtotal');
-							else if($line->qty==2) print img_picto('', 'subsubtotal@subtotal').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'; 
+							if($line->qty<=1) {
+								print img_picto('', 'subtotal@subtotal');
+							} else if($line->qty==2) {
+								print img_picto('', 'subsubtotal@subtotal').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+							}
 						 }
 						 
 						 
@@ -2258,21 +2406,26 @@ 
 						 $titleStyleUnderline =  strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'U') === false ? '' : ' text-decoration: underline;';
 						 
 						 if (empty($line->label)) {
-							if ($line->qty >= 91 && $line->qty <= 99 && $conf->global->SUBTOTAL_USE_NEW_FORMAT) print  $line->description.' '.$this->getTitle($object, $line);
-							else print  $line->description;
-						 } 
-						 else {
+							if ($line->qty >= 91 && $line->qty <= 99 && $conf->global->SUBTOTAL_USE_NEW_FORMAT) {
+								print  $line->description.' '.$this->getTitle($object, $line);
+							} else {
+								print  $line->description;
+							}
+						 } else {
 
 							if (! empty($conf->global->PRODUIT_DESC_IN_FORM) && !empty($line->description)) {
 								print '<span class="subtotal_label" style="'.$titleStyleItalic.$titleStyleBold.$titleStyleUnderline.'" >'.$line->label.'</span><br><div class="subtotal_desc">'.dol_htmlentitiesbr($line->description).'</div>';
-							}
-							else{
+							} else{
 								print '<span class="subtotal_label classfortooltip '.$titleStyleItalic.$titleStyleBold.$titleStyleUnderline.'" title="'.$line->description.'">'.$line->label.'</span>';    
 							}
 
 						 } 
-						if($line->qty>90) print ' : ';
-						if($line->info_bits > 0) echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal');
+						if($line->qty>90) {
+							print ' : ';
+						}
+						if($line->info_bits > 0) {
+							echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal');
+						}
 
 						 
 
@@ -2315,11 +2468,12 @@ 
 						</script>
 						<?php
 						
-					}
-					else{
+					} else{
 						if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK) && $object->element !== 'invoice_supplier')
 						{
-							if(TSubtotal::isTitle($line) && ( $line->fk_prev_id === null )) echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=duplicate&lineid='.$line->id.'">'. img_picto($langs->trans('Duplicate'), 'duplicate@subtotal').'</a>';
+							if(TSubtotal::isTitle($line) && ( $line->fk_prev_id === null )) {
+								echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=duplicate&lineid='.$line->id.'">'. img_picto($langs->trans('Duplicate'), 'duplicate@subtotal').'</a>';
+							}
 						}
 
 						if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_EDIT_BLOCK)) 
@@ -2409,7 +2563,9 @@ 
 				$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
 				
 				$colspan+=3; $mode = 'view';
-				if($action === 'editline' && $line->rowid == GETPOST('lineid')) $mode = 'edit';
+				if($action === 'editline' && $line->rowid == GETPOST('lineid')) {
+					$mode = 'edit';
+				}
 				
 				$ex_element = $line->element;
 				$line->element = 'tr_extrafield_title '.$line->element; // Pour pouvoir manipuler ces tr
@@ -2468,8 +2624,7 @@ 
 			
 			return 1;	
 			
-		}
-		elseif(($object->element == 'commande' && in_array('ordershipmentcard', $contexts)) || (in_array('expeditioncard', $contexts) && $action == 'create'))
+		} elseif(($object->element == 'commande' && in_array('ordershipmentcard', $contexts)) || (in_array('expeditioncard', $contexts) && $action == 'create'))
 		{
 			$colspan = 4;
 
@@ -2479,23 +2634,36 @@ 
 			<tr <?php echo $bc[$var]; $var=!$var; echo $data; ?> rel="subtotal" id="row-<?php echo $line->id ?>" style="<?php
 					if (!empty($conf->global->SUBTOTAL_USE_NEW_FORMAT))
 					{
-						if($line->qty==99) print 'background:#adadcf';
-						else if($line->qty==98) print 'background:#ddddff;';
-						else if($line->qty<=97 && $line->qty>=91) print 'background:#eeeeff;';
-						else if($line->qty==1) print 'background:#adadcf;';
-						else if($line->qty==2) print 'background:#ddddff;';
-						else if($line->qty==50) print '';
-						else print 'background:#eeeeff;';
+						if($line->qty==99) {
+							print 'background:#adadcf';
+						} else if($line->qty==98) {
+							print 'background:#ddddff;';
+						} else if($line->qty<=97 && $line->qty>=91) {
+							print 'background:#eeeeff;';
+						} else if($line->qty==1) {
+							print 'background:#adadcf;';
+						} else if($line->qty==2) {
+							print 'background:#ddddff;';
+						} else if($line->qty==50) {
+							print '';
+						} else {
+							print 'background:#eeeeff;';
+						}
 
 						//A compléter si on veux plus de nuances de couleurs avec les niveau 4,5,6,7,8 et 9
-					}
-					else
+					} else
 					{
-						if($line->qty==99) print 'background:#ddffdd';
-						else if($line->qty==98) print 'background:#ddddff;';
-						else if($line->qty==2) print 'background:#eeeeff; ';
-						else if($line->qty==50) print '';
-						else print 'background:#eeffee;' ;
+						if($line->qty==99) {
+							print 'background:#ddffdd';
+						} else if($line->qty==98) {
+							print 'background:#ddddff;';
+						} else if($line->qty==2) {
+							print 'background:#eeeeff; ';
+						} else if($line->qty==50) {
+							print '';
+						} else {
+							print 'background:#eeffee;' ;
+						}
 					}
 
 			?>;">
@@ -2509,14 +2677,19 @@ 
 							{
 								echo str_repeat('&nbsp;&nbsp;&nbsp;', $line->qty-1);
 
-								if (TSubtotal::isTitle($line)) print img_picto('', 'subtotal@subtotal').'<span style="font-size:9px;margin-left:-3px;">'.$line->qty.'</span>&nbsp;&nbsp;';
-								else print img_picto('', 'subtotal2@subtotal').'<span style="font-size:9px;margin-left:-1px;">'.(100-$line->qty).'</span>&nbsp;&nbsp;';
+								if (TSubtotal::isTitle($line)) {
+									print img_picto('', 'subtotal@subtotal').'<span style="font-size:9px;margin-left:-3px;">'.$line->qty.'</span>&nbsp;&nbsp;';
+								} else {
+									print img_picto('', 'subtotal2@subtotal').'<span style="font-size:9px;margin-left:-1px;">'.(100-$line->qty).'</span>&nbsp;&nbsp;';
+								}
 							}
-						 }
-						 else
+						 } else
 						 {
-							if($line->qty<=1) print img_picto('', 'subtotal@subtotal');
-							else if($line->qty==2) print img_picto('', 'subsubtotal@subtotal').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+							if($line->qty<=1) {
+								print img_picto('', 'subtotal@subtotal');
+							} else if($line->qty==2) {
+								print img_picto('', 'subsubtotal@subtotal').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+							}
 						 }
 
 
@@ -2526,21 +2699,24 @@ 
 						 $titleStyleUnderline =  strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'U') === false ? '' : ' text-decoration: underline;';
 
 						 if (empty($line->label)) {
-							if ($line->qty >= 91 && $line->qty <= 99 && $conf->global->SUBTOTAL_USE_NEW_FORMAT) print  $line->description.' '.$this->getTitle($object, $line);
-							else print  $line->description;
-						 }
-						 else {
+							if ($line->qty >= 91 && $line->qty <= 99 && $conf->global->SUBTOTAL_USE_NEW_FORMAT) {
+								print  $line->description.' '.$this->getTitle($object, $line);
+							} else {
+								print  $line->description;
+							}
+						 } else {
 
 							if (! empty($conf->global->PRODUIT_DESC_IN_FORM) && !empty($line->description)) {
 								print '<span class="subtotal_label" style="'.$titleStyleItalic.$titleStyleBold.$titleStyleUnderline.'" >'.$line->label.'</span><br><div class="subtotal_desc">'.dol_htmlentitiesbr($line->description).'</div>';
-							}
-							else{
+							} else{
 								print '<span class="subtotal_label classfortooltip '.$titleStyleItalic.$titleStyleBold.$titleStyleUnderline.'" title="'.$line->description.'">'.$line->label.'</span>';
 							}
 
 						 }
 						//if($line->qty>90) print ' : ';
-						if($line->info_bits > 0) echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal');
+						if($line->info_bits > 0) {
+							echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal');
+						}
 
 			?>
 				</td>
@@ -2563,8 +2739,7 @@ 
 			</tr>
 <?php
 			return 1;
-		}
-		elseif ($object->element == 'shipping' || $object->element == 'delivery')
+		} elseif ($object->element == 'shipping' || $object->element == 'delivery')
 		{
 			global $form;
 
@@ -2576,13 +2751,25 @@ 
 			$extralabelslines=$extrafieldsline->fetch_name_optionals_label($object->table_element_line);
 
 			$colspan = 4;
-			if($object->origin && $object->origin_id > 0) $colspan++;
-			if(! empty($conf->stock->enabled)) $colspan++;
-			if(! empty($conf->productbatch->enabled)) $colspan++;
-			if($object->statut == 0) $colspan++;
-			if($object->statut == 0 && empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK)) $colspan++;
+			if($object->origin && $object->origin_id > 0) {
+				$colspan++;
+			}
+			if(! empty($conf->stock->enabled)) {
+				$colspan++;
+			}
+			if(! empty($conf->productbatch->enabled)) {
+				$colspan++;
+			}
+			if($object->statut == 0) {
+				$colspan++;
+			}
+			if($object->statut == 0 && empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK)) {
+				$colspan++;
+			}
 
-			if($object->element == 'delivery') $colspan = 2;
+			if($object->element == 'delivery') {
+				$colspan = 2;
+			}
 
 			print '<!-- origin line id = '.$line->origin_line_id.' -->'; // id of order line
 
@@ -2592,23 +2779,36 @@ 
 			<tr <?php echo $bc[$var]; $var=!$var; echo $data; ?> rel="subtotal" id="row-<?php echo $line->id ?>" style="<?php
 					if (!empty($conf->global->SUBTOTAL_USE_NEW_FORMAT))
 					{
-						if($line->qty==99) print 'background:#adadcf';
-						else if($line->qty==98) print 'background:#ddddff;';
-						else if($line->qty<=97 && $line->qty>=91) print 'background:#eeeeff;';
-						else if($line->qty==1) print 'background:#adadcf;';
-						else if($line->qty==2) print 'background:#ddddff;';
-						else if($line->qty==50) print '';
-						else print 'background:#eeeeff;';
+						if($line->qty==99) {
+							print 'background:#adadcf';
+						} else if($line->qty==98) {
+							print 'background:#ddddff;';
+						} else if($line->qty<=97 && $line->qty>=91) {
+							print 'background:#eeeeff;';
+						} else if($line->qty==1) {
+							print 'background:#adadcf;';
+						} else if($line->qty==2) {
+							print 'background:#ddddff;';
+						} else if($line->qty==50) {
+							print '';
+						} else {
+							print 'background:#eeeeff;';
+						}
 
 						//A compléter si on veux plus de nuances de couleurs avec les niveau 4,5,6,7,8 et 9
-					}
-					else 
+					} else 
 					{
-						if($line->qty==99) print 'background:#ddffdd';
-						else if($line->qty==98) print 'background:#ddddff;';
-						else if($line->qty==2) print 'background:#eeeeff; ';
-						else if($line->qty==50) print '';
-						else print 'background:#eeffee;' ;
+						if($line->qty==99) {
+							print 'background:#ddffdd';
+						} else if($line->qty==98) {
+							print 'background:#ddddff;';
+						} else if($line->qty==2) {
+							print 'background:#eeeeff; ';
+						} else if($line->qty==50) {
+							print '';
+						} else {
+							print 'background:#eeffee;' ;
+						}
 					}
 
 			?>;">
@@ -2630,14 +2830,19 @@ 
 				{
 					echo str_repeat('&nbsp;&nbsp;&nbsp;', $line->qty-1);
 
-					if (TSubtotal::isTitle($line)) print img_picto('', 'subtotal@subtotal').'<span style="font-size:9px;margin-left:-3px;">'.$line->qty.'</span>&nbsp;&nbsp;';
-					else print img_picto('', 'subtotal2@subtotal').'<span style="font-size:9px;margin-left:-1px;">'.(100-$line->qty).'</span>&nbsp;&nbsp;';
+					if (TSubtotal::isTitle($line)) {
+						print img_picto('', 'subtotal@subtotal').'<span style="font-size:9px;margin-left:-3px;">'.$line->qty.'</span>&nbsp;&nbsp;';
+					} else {
+						print img_picto('', 'subtotal2@subtotal').'<span style="font-size:9px;margin-left:-1px;">'.(100-$line->qty).'</span>&nbsp;&nbsp;';
+					}
 				}
-			}
-			else
+			} else
 			{
-				if($line->qty<=1) print img_picto('', 'subtotal@subtotal');
-				else if($line->qty==2) print img_picto('', 'subsubtotal@subtotal').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+				if($line->qty<=1) {
+					print img_picto('', 'subtotal@subtotal');
+				} else if($line->qty==2) {
+					print img_picto('', 'subsubtotal@subtotal').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+				}
 			}
 
 
@@ -2647,19 +2852,22 @@ 
 			$titleStyleUnderline =  strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'U') === false ? '' : ' text-decoration: underline;';
 
 			if (empty($line->label)) {
-				if ($line->qty >= 91 && $line->qty <= 99 && $conf->global->SUBTOTAL_USE_NEW_FORMAT) print  $line->description.' '.$this->getTitle($object, $line);
-				else print  $line->description;
-			}
-			else {
+				if ($line->qty >= 91 && $line->qty <= 99 && $conf->global->SUBTOTAL_USE_NEW_FORMAT) {
+					print  $line->description.' '.$this->getTitle($object, $line);
+				} else {
+					print  $line->description;
+				}
+			} else {
 				if (! empty($conf->global->PRODUIT_DESC_IN_FORM) && !empty($line->description)) {
 					print '<span class="subtotal_label" style="'.$titleStyleItalic.$titleStyleBold.$titleStyleUnderline.'" >'.$line->label.'</span><br><div class="subtotal_desc">'.dol_htmlentitiesbr($line->description).'</div>';
-				}
-				else{
+				} else{
 					print '<span class="subtotal_label classfortooltip '.$titleStyleItalic.$titleStyleBold.$titleStyleUnderline.'" title="'.$line->description.'">'.$line->label.'</span>';
 				}
 			}
 			//if($line->qty>90) print ' : ';
-			if($line->info_bits > 0) echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal');
+			if($line->info_bits > 0) {
+				echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal');
+			}
 
 			?>
 				</td>
@@ -2839,10 +3047,9 @@ 
 	    
 	    if(TSubtotal::isTitle($line)){
 	        $ThtmlData['data-issubtotal'] = 'title';
-	    }elseif(TSubtotal::isSubtotal($line)){
+	    } elseif(TSubtotal::isSubtotal($line)){
 	        $ThtmlData['data-issubtotal'] = 'subtotal';
-	    }
-	    else{
+	    } else{
 	        $ThtmlData['data-issubtotal'] = 'freetext';
 	    }
 	    
@@ -2852,7 +3059,9 @@ 
 	    
 	    // hook 
 	    $reshook = $hookmanager->executeHooks('subtotalLineHtmlData',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
-	    if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	    if ($reshook < 0) {
+	    	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	    }
 	    if ($reshook>0)
 	    {
 	        $ThtmlData = $hookmanager->resArray;