ATM-Consulting / dolibarr_module_subtotal

core/triggers/interface_90_modSubtotal_subtotaltrigger.class.php

Braces +73 added lines, -32 removed lines

@@ -89,12 +89,14 @@ 
 
         if ($this->version == 'development') {
             return $langs->trans("Development");
-        } elseif ($this->version == 'experimental')
-
+        } elseif ($this->version == 'experimental') {
+        
                 return $langs->trans("Experimental");
-        elseif ($this->version == 'dolibarr') return DOL_VERSION;
-        elseif ($this->version) return $this->version;
-        else {
+        } elseif ($this->version == 'dolibarr') {
+        	return DOL_VERSION;
+        } elseif ($this->version) {
+        	return $this->version;
+        } else {
             return $langs->trans("Unknown");
         }
     }
@@ -122,14 +124,18 @@ 
 		$subtotal_line_found = false;
 		foreach ($parent->lines as $k => &$line)
 		{
-			if ($line->rang < $rang) continue;
-			elseif ($line->rang == $rang) // Je suis sur la ligne de titre où je souhaite ajouter ma nouvelle ligne en fin de bloc
+			if ($line->rang < $rang) {
+				continue;
+			} elseif ($line->rang == $rang) {
+				// Je suis sur la ligne de titre où je souhaite ajouter ma nouvelle ligne en fin de bloc
 			{
 				$title_level = $line->qty;
 			}
-			elseif (!$subtotal_line_found && $title_level > -1 && ($line->qty == 100 - $title_level)) // Le level de mon titre a été trouvé avant, donc maintenant je vais m'arrêter jusqu'à trouver un sous-total
+			} elseif (!$subtotal_line_found && $title_level > -1 && ($line->qty == 100 - $title_level)) {
+				// Le level de mon titre a été trouvé avant, donc maintenant je vais m'arrêter jusqu'à trouver un sous-total
 			{
 				$subtotal_line_found = true;
+			}
 				$rang = $line->rang;
 			}
 			
@@ -191,8 +197,11 @@ 
 						break;
 				}
 				
-				if (!empty($conf->global->SUBTOTAL_ADD_LINE_UNDER_TITLE_AT_END_BLOCK)) $this->addToEnd($parent, $object, $rang);
-				else $this->addToBegin($parent, $object, $rang);
+				if (!empty($conf->global->SUBTOTAL_ADD_LINE_UNDER_TITLE_AT_END_BLOCK)) {
+					$this->addToEnd($parent, $object, $rang);
+				} else {
+					$this->addToBegin($parent, $object, $rang);
+				}
 				
 			}
 			
@@ -220,7 +229,9 @@ 
 						$commande->fetch($current_fk_commande);
 						
 						$label = $conf->global->SUBTOTAL_TEXT_FOR_TITLE_ORDETSTOINVOICE;
-						if (empty($label)) $label = 'Commande [__REFORDER__] - Référence client : [__REFCUSTOMER__]';
+						if (empty($label)) {
+							$label = 'Commande [__REFORDER__] - Référence client : [__REFCUSTOMER__]';
+						}
 						$label = str_replace(array('__REFORDER__', '__REFCUSTOMER__'), array($commande->ref, $commande->ref_client), $label);
 
                         if(!empty($current_fk_commande)) {
@@ -257,7 +268,9 @@ 
 		
 		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && in_array($action, array('LINEPROPAL_INSERT', 'LINEPROPAL_UPDATE', 'LINEORDER_INSERT', 'LINEORDER_UPDATE', 'LINEBILL_INSERT', 'LINEBILL_UPDATE')))
 		{
-            if(! function_exists('_updateLineNC')) dol_include_once('/subtotal/lib/subtotal.lib.php');
+            if(! function_exists('_updateLineNC')) {
+            	dol_include_once('/subtotal/lib/subtotal.lib.php');
+            }
 
 			$doli_action = GETPOST('action');
 			$set = GETPOST('set');
@@ -275,32 +288,50 @@ 
 						$object->total_ht = $object->total_tva = $object->total_ttc = $object->total_localtax1 = $object->total_localtax2 = 
 							$object->multicurrency_total_ht = $object->multicurrency_total_tva = $object->multicurrency_total_ttc = 0;
 
-						if ($object->element == 'propal') $res = $object->update(1);
-						else $res = $object->update($user, 1);
+						if ($object->element == 'propal') {
+							$res = $object->update(1);
+						} else {
+							$res = $object->update($user, 1);
+						}
 						
-						if ($res > 0) setEventMessage($langs->trans('subtotal_update_nc_success'));
+						if ($res > 0) {
+							setEventMessage($langs->trans('subtotal_update_nc_success'));
+						}
 						break;
 					}
 				}
 
 				// $object correspond à la ligne ajoutée
-				if(empty($object->array_options)) $object->fetch_optionals();
+				if(empty($object->array_options)) {
+					$object->fetch_optionals();
+				}
 
 				if(! empty($object->array_options['options_subtotal_nc'])) {
 					$object->total_ht = $object->total_tva = $object->total_ttc = $object->total_localtax1 = $object->total_localtax2 = 
 							$object->multicurrency_total_ht = $object->multicurrency_total_tva = $object->multicurrency_total_ttc = 0;
 
-					if ($object->element == 'propaldet') $res = $object->update(1);
-					else $res = $object->update($user, 1);
+					if ($object->element == 'propaldet') {
+						$res = $object->update(1);
+					} else {
+						$res = $object->update($user, 1);
+					}
 
-					if ($res > 0) setEventMessage($langs->trans('subtotal_update_nc_success'));
+					if ($res > 0) {
+						setEventMessage($langs->trans('subtotal_update_nc_success'));
+					}
 				}
 
 				// Correction d'un bug lors de la création d'une commande depuis une propale qui a, au moins, une ligne NC
 				$parent_element = '';
-				if($object->element == 'propaldet') $parent_element = 'propal';
-				if($object->element == 'commandedet') $parent_element = 'commande';
-				if($object->element == 'facturedet') $parent_element = 'facture';
+				if($object->element == 'propaldet') {
+					$parent_element = 'propal';
+				}
+				if($object->element == 'commandedet') {
+					$parent_element = 'commande';
+				}
+				if($object->element == 'facturedet') {
+					$parent_element = 'facture';
+				}
 
 				if(! empty($parent_element) && ! empty($object->array_options['options_subtotal_nc'])) {
 					_updateLineNC($parent_element, $object->{'fk_'.$parent_element}, $object->id, $object->array_options['options_subtotal_nc'], 1);
@@ -500,26 +531,38 @@ 
 				);
 				
 				// En fonction de l'objet et de la version, les lignes conservent l'id de l'objet d'origine
-				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);
+				}
 			
 				foreach ($object->lines as &$line)
 				{
-					if (empty($line->array_options)) $line->fetch_optionals();
+					if (empty($line->array_options)) {
+						$line->fetch_optionals();
+					}
 					
 					if (!TSubtotal::isModSubtotalLine($line) && !empty($line->array_options['options_subtotal_nc']))
 					{
 						$line->total_ht = $line->total_tva = $line->total_ttc = $line->total_localtax1 = $line->total_localtax2 = 
 							$line->multicurrency_total_ht = $line->multicurrency_total_tva = $line->multicurrency_total_ttc = 0;
 
-						if ($line->element == 'propaldet') $res = $line->update(1);
-						else $res = $line->update($user, 1);
+						if ($line->element == 'propaldet') {
+							$res = $line->update(1);
+						} else {
+							$res = $line->update($user, 1);
+						}
 						
-						if ($res > 0) setEventMessage($langs->trans('subtotal_update_nc_success'));
+						if ($res > 0) {
+							setEventMessage($langs->trans('subtotal_update_nc_success'));
+						}
 					}
 				}
 				
-				if (!empty($line)) $object->update_price(1);
+				if (!empty($line)) {
+					$object->update_price(1);
+				}
 			}
 			
         } elseif ($action == 'PROPAL_MODIFY') {
@@ -589,9 +632,7 @@ 
             dol_syslog(
                 "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
             );
-        }
-
-		elseif ($action == 'BILL_MODIFY') {
+        } elseif ($action == 'BILL_MODIFY') {
             dol_syslog(
                 "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
             );

class/actions_subtotal.class.php

Braces +527 added lines, -314 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() {
@@ -515,8 +526,7 @@ 
 				}
 				
 				
-			}	
-			else{
+			} else{
 				$substitutionarray['line_not_modsubtotal'] = true;
 				$substitutionarray['line_modsubtotal'] = 0;
 			}
@@ -574,8 +584,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')
 		{
@@ -605,8 +618,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']))
@@ -621,33 +633,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';
@@ -656,15 +662,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) {
@@ -672,8 +687,7 @@ 
 					    
                         if($line->qty>=90) {
                             $line->modsubtotal_total = 1;
-                        }
-                        else{
+                        } else{
                             $line->modsubtotal_title = 1;
                         }
                         
@@ -682,8 +696,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'));
 			
@@ -691,7 +704,9 @@ 
 				/**
 				 * @var $object Facture
 				 */
-				if($object->element=='facture') $object->deleteline($idLine);
+				if($object->element=='facture') {
+					$object->deleteline($idLine);
+				}
 				/**
 				 * @var $object Facture fournisseur
 				 */
@@ -702,18 +717,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
@@ -725,25 +747,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;
@@ -761,21 +790,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;
+					}
 				}
 			}
 		}
@@ -847,27 +881,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)
@@ -889,8 +929,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;
@@ -900,8 +939,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);
+		}
 	}
 
 	/**
@@ -948,15 +990,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);
 		
@@ -998,8 +1043,7 @@ 
 //					$line->total_tva
 //					$line->total
 //					$line->total_ttc
-				}
-				else
+				} else
 				{
 					//					list($total, $total_tva, $total_ttc, $TTotal_tva) = $this->getTotalLineFromObject($object, $line, '', 1);
 					
@@ -1009,17 +1053,22 @@ 
 
                     $line->total_ht = $TInfo[0];
 					$line->total = $TInfo[0];
-					if (!TSubtotal::isModSubtotalLine($line)) $line->total_tva = $TInfo[1];
+					if (!TSubtotal::isModSubtotalLine($line)) {
+						$line->total_tva = $TInfo[1];
+					}
 					$line->total_ttc = $TInfo[2];
 				}
 			}
 
 			$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;
@@ -1051,25 +1100,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();
@@ -1093,8 +1157,7 @@ 
 		
 		if(is_array($parameters)) {
 			$i = & $parameters['i'];	
-		}
-		else {
+		} else {
 			$i = (int)$parameters;
 		}
 
@@ -1124,17 +1187,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');
@@ -1144,12 +1204,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])) )
 		{
@@ -1166,8 +1234,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) ){
 			
@@ -1175,13 +1246,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)))
 			{
@@ -1253,12 +1322,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;
 
@@ -1281,14 +1348,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])) ) 
 		{
@@ -1310,14 +1379,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])) )
 		{
@@ -1334,8 +1405,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 = ' ';
@@ -1346,7 +1420,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_unit_subprice']);
@@ -1355,8 +1431,7 @@ 
 		
 			if((float)DOL_VERSION<=3.6) {
 				return '';
-			}
-			else if((float)DOL_VERSION>=3.8) {
+			} else if((float)DOL_VERSION>=3.8) {
 				return 1;
 			}
 		}
@@ -1401,8 +1476,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 = ' ';
@@ -1413,7 +1491,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).'%';
@@ -1422,12 +1502,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])) )
 		        )
 		    {
@@ -1448,14 +1526,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])) )
@@ -1479,16 +1559,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é
@@ -1534,14 +1619,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])) )
 		{
@@ -1571,7 +1658,9 @@ 
 				}
 			}
 			
-			if (!empty($TLineTitle)) $TTitleNumeroted = $this->formatNumerotation($TLineTitle);
+			if (!empty($TLineTitle)) {
+				$TTitleNumeroted = $this->formatNumerotation($TLineTitle);
+			}
 		}
 		
 	}
@@ -1585,8 +1674,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)
 			{
@@ -1620,7 +1713,9 @@ 
 		
 		$hidedetails = (int)GETPOST('hidedetails');
 		
-		if(empty($hidedetails)) return false;
+		if(empty($hidedetails)) {
+			return false;
+		}
 		
 		// TODO can't add VAT to document without lines... :-/
 		
@@ -1648,7 +1743,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_reduc'])) {
                     $l->remise_percent = 100;    // Affichage de la réduction sur la ligne de sous-total
                 }
@@ -1692,7 +1789,9 @@ 
 						
 						$TInfo = $this->getTotalLineFromObject($object, $line, '', 1);
 
-						if (TSubtotal::getNiveau($line) == 1) $line->TTotal_tva = $TInfo[3];
+						if (TSubtotal::getNiveau($line) == 1) {
+							$line->TTotal_tva = $TInfo[3];
+						}
 						$line->total_ht = $TInfo[0];
 						$line->total_tva = $TInfo[1];
 						$line->total = $line->total_ht;
@@ -1756,8 +1855,7 @@ 
 				    }
 				    
 					
-				}
-				elseif ($hidedetails)
+				} elseif ($hidedetails)
 				{
 					$TLines[] = $line; //Cas où je cache uniquement les prix des produits	
 				}
@@ -1828,13 +1926,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();
@@ -1850,7 +1952,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);
@@ -1888,8 +1992,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); 
@@ -1919,8 +2022,7 @@ 
 //	if($line->rowid==47) exit;
 			
 			return 0;
-		}
-		elseif (empty($object->lines[$parameters['i']]))
+		} elseif (empty($object->lines[$parameters['i']]))
 		{
 			$this->resprints = -1;
 		}
@@ -1953,7 +2055,9 @@ 
 		
 		foreach ($object->lines as $line)
 		{
-			if ($line->id == $currentLine->id) break;
+			if ($line->id == $currentLine->id) {
+				break;
+			}
 			
 			$qty_search = 100 - $currentLine->qty;
 			
@@ -1984,7 +2088,9 @@ 
 		$var = &$parameters['var'];
 
 		$contexts = explode(':',$parameters['context']);
-		if($parameters['currentcontext'] === 'paiementcard') return 0;
+		if($parameters['currentcontext'] === 'paiementcard') {
+			return 0;
+		}
 		$originline = null;
 
 		$createRight = $user->rights->{$object->element}->creer;
@@ -1992,22 +2098,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))
 			{
@@ -2027,8 +2129,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')
             {
@@ -2046,8 +2151,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)) 
         {
 
 
@@ -2075,22 +2179,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);
@@ -2103,23 +2229,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;' ;
+						}
 					}
 
 			?>;">
@@ -2146,13 +2285,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;
 						}
@@ -2173,9 +2310,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)) )
 						{
@@ -2183,8 +2324,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;';
 
@@ -2204,7 +2349,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>';
 
@@ -2223,8 +2370,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) {
@@ -2244,8 +2392,7 @@ 
 							$doleditor->Create();
 						}
 						
-					}
-					else {
+					} else {
 
 						 if ($conf->global->SUBTOTAL_USE_NEW_FORMAT)
 						 {
@@ -2253,14 +2400,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;';
+							}
 						 }
 						 
 						 
@@ -2270,21 +2422,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');
+						}
 
 						 
 
@@ -2327,11 +2484,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)) 
@@ -2421,7 +2579,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
@@ -2480,8 +2640,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;
 
@@ -2491,23 +2650,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;' ;
+						}
 					}
 
 			?>;">
@@ -2521,14 +2693,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;';
+							}
 						 }
 
 
@@ -2538,21 +2715,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>
@@ -2575,8 +2755,7 @@ 
 			</tr>
 <?php
 			return 1;
-		}
-		elseif ($object->element == 'shipping' || $object->element == 'delivery')
+		} elseif ($object->element == 'shipping' || $object->element == 'delivery')
 		{
 			global $form;
 
@@ -2588,13 +2767,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
 
@@ -2604,23 +2795,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;' ;
+						}
 					}
 
 			?>;">
@@ -2642,14 +2846,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;';
+				}
 			}
 
 
@@ -2659,19 +2868,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>
@@ -2851,10 +3063,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';
 	    }
 	    
@@ -2864,7 +3075,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;