ATM-Consulting / dolibarr_module_subtotal

class/actions_subtotal.class.php

Indentation +196 added lines, -196 removed lines

@@ -47,11 +47,11 @@ 
 	 * @return     void
 	 */
     
-    var $module_number = 104777;
+	var $module_number = 104777;
     
-    function formObjectOptions($parameters, &$object, &$action, $hookmanager) 
-    {
-      	global $langs,$db,$user, $conf;
+	function formObjectOptions($parameters, &$object, &$action, $hookmanager) 
+	{
+	  	global $langs,$db,$user, $conf;
 		
 		$langs->load('subtotal@subtotal');
 		
@@ -66,10 +66,10 @@ 
 				$createRight = $user->rights->facture->creer;
 			} elseif($object->element == 'order_supplier' )
 			{
-			    $createRight = $user->rights->fournisseur->commande->creer;
+				$createRight = $user->rights->fournisseur->commande->creer;
 			} elseif($object->element == 'invoice_supplier' )
 			{
-			    $createRight = $user->rights->fournisseur->facture->creer;
+				$createRight = $user->rights->fournisseur->facture->creer;
 			}
 			
 			if ($object->statut == 0  && $createRight) {
@@ -119,7 +119,7 @@ 
 					
 					if (!empty($conf->global->SUBTOTAL_AUTO_ADD_SUBTOTAL_ON_ADDING_NEW_TITLE) && $qty < 10) TSubtotal::addSubtotalMissing($object, $qty);
 					
-	    			TSubtotal::addSubTotalLine($object, $title, $qty);
+					TSubtotal::addSubTotalLine($object, $title, $qty);
 				}
 				else if($action==='ask_deleteallline') {
 						$form=new Form($db);
@@ -341,36 +341,36 @@ 
 		$TContext = explode(':',$parameters['context']);
 		if (
 				in_array('invoicecard',$TContext)
-		        || in_array('invoicesuppliercard',$TContext)
+				|| in_array('invoicesuppliercard',$TContext)
 				|| in_array('propalcard',$TContext)
 				|| in_array('ordercard',$TContext)
-		        || in_array('ordersuppliercard',$TContext)
+				|| in_array('ordersuppliercard',$TContext)
 				|| in_array('invoicereccard',$TContext)
 			)
-	        {	
+			{	
 				$hideInnerLines	= isset( $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']] ) ?  $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']] : 0;
 				$hidedetails	= isset( $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']] ) ?  $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']] : 0;
 				$hidepricesDefaultConf = !empty($conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED)?$conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED:0;
 				$hideprices= isset( $_SESSION['subtotal_hideprices_'.$parameters['modulepart']] ) ?  $_SESSION['subtotal_hideprices_'.$parameters['modulepart']] : $hidepricesDefaultConf;
 				
 				$var=false;
-		     	$out.= '<tr '.$bc[$var].'>
+			 	$out.= '<tr '.$bc[$var].'>
 		     			<td colspan="4" align="right">
 		     				<label for="hideInnerLines">'.$langs->trans('HideInnerLines').'</label>
 		     				<input type="checkbox" onclick="if($(this).is(\':checked\')) { $(\'#hidedetails\').prop(\'checked\', \'checked\')  }" id="hideInnerLines" name="hideInnerLines" value="1" '.(( $hideInnerLines ) ? 'checked="checked"' : '' ).' />
 		     			</td>
 		     			</tr>';
 				
-		     	$var=!$var;
-		     	$out.= '<tr '.$bc[$var].'>
+			 	$var=!$var;
+			 	$out.= '<tr '.$bc[$var].'>
 		     			<td colspan="4" align="right">
 		     				<label for="hidedetails">'.$langs->trans('SubTotalhidedetails').'</label>
 		     				<input type="checkbox" id="hidedetails" name="hidedetails" value="1" '.(( $hidedetails ) ? 'checked="checked"' : '' ).' />
 		     			</td>
 		     			</tr>';
 		     	
-		     	$var=!$var;
-		     	$out.= '<tr '.$bc[$var].'>
+			 	$var=!$var;
+			 	$out.= '<tr '.$bc[$var].'>
 		     			<td colspan="4" align="right">
 		     				<label for="hidedetails">'.$langs->trans('SubTotalhidePrice').'</label>
 		     				<input type="checkbox" id="hideprices" name="hideprices" value="1" '.(( $hideprices ) ? 'checked="checked"' : '' ).' />
@@ -382,9 +382,9 @@ 
 				if ( 
 					(in_array('propalcard',$TContext) && !empty($conf->global->SUBTOTAL_PROPAL_ADD_RECAP))
 					|| (in_array('ordercard',$TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
-				    || (in_array('ordersuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
+					|| (in_array('ordersuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
 					|| (in_array('invoicecard',$TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
-				    || (in_array('invoicesuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
+					|| (in_array('invoicesuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
 					|| (in_array('invoicereccard',$TContext)  && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP ))
 				)
 				{
@@ -403,19 +403,19 @@ 
 			}
 			
 		
-        return 1;
+		return 1;
 	} 
 	 
-    function formEditProductOptions($parameters, &$object, &$action, $hookmanager) 
-    {
+	function formEditProductOptions($parameters, &$object, &$action, $hookmanager) 
+	{
 		
-    	if (in_array('invoicecard',explode(':',$parameters['context'])))
-        {
+		if (in_array('invoicecard',explode(':',$parameters['context'])))
+		{
         	
-        }
+		}
 		
-        return 0;
-    }
+		return 0;
+	}
 	
 	function ODTSubstitutionLine(&$parameters, &$object, $action, $hookmanager) {
 		global $conf;
@@ -464,11 +464,11 @@ 
 	
 		if (
 				in_array('invoicecard',explode(':',$parameters['context']))
-		        || in_array('invoicesuppliercard',explode(':',$parameters['context']))
+				|| in_array('invoicesuppliercard',explode(':',$parameters['context']))
 				|| in_array('propalcard',explode(':',$parameters['context']))
-		        || in_array('supplier_proposalcard',explode(':',$parameters['context']))
+				|| in_array('supplier_proposalcard',explode(':',$parameters['context']))
 				|| in_array('ordercard',explode(':',$parameters['context']))
-		        || in_array('ordersuppliercard',explode(':',$parameters['context']))
+				|| in_array('ordersuppliercard',explode(':',$parameters['context']))
 				|| in_array('invoicereccard',explode(':',$parameters['context']))
 		) {
 			
@@ -547,20 +547,20 @@ 
 				in_array('invoicecard',explode(':',$parameters['context']))
 				|| in_array('propalcard',explode(':',$parameters['context']))
 				|| in_array('ordercard',explode(':',$parameters['context']))
-			    || in_array('ordersuppliercard',explode(':',$parameters['context']))
-			    || in_array('invoicesuppliercard',explode(':',$parameters['context']))
-			    || in_array('supplier_proposalcard',explode(':',$parameters['context']))
+				|| in_array('ordersuppliercard',explode(':',$parameters['context']))
+				|| in_array('invoicesuppliercard',explode(':',$parameters['context']))
+				|| in_array('supplier_proposalcard',explode(':',$parameters['context']))
 			)
-	        {								
+			{								
 				if(in_array('invoicecard',explode(':',$parameters['context']))) {
 					$sessname = 'subtotal_hideInnerLines_facture';	
 					$sessname2 = 'subtotal_hidedetails_facture';
 					$sessname3 = 'subtotal_hideprices_facture';
 				}
 				elseif(in_array('invoicesuppliercard',explode(':',$parameters['context']))) {
-				    $sessname = 'subtotal_hideInnerLines_facture_fournisseur';
-				    $sessname2 = 'subtotal_hidedetails_facture_fournisseur';
-				    $sessname3 = 'subtotal_hideprices_facture_fournisseur';
+					$sessname = 'subtotal_hideInnerLines_facture_fournisseur';
+					$sessname2 = 'subtotal_hidedetails_facture_fournisseur';
+					$sessname3 = 'subtotal_hideprices_facture_fournisseur';
 				}
 				elseif(in_array('propalcard',explode(':',$parameters['context']))) {
 					$sessname = 'subtotal_hideInnerLines_propal';
@@ -568,9 +568,9 @@ 
 					$sessname3 = 'subtotal_hideprices_propal';
 				}
 				elseif(in_array('supplier_proposalcard',explode(':',$parameters['context']))) {
-				    $sessname = 'subtotal_hideInnerLines_supplier_proposal';
-				    $sessname2 = 'subtotal_hidedetails_supplier_proposal';
-				    $sessname3 = 'subtotal_hideprices_supplier_proposal';
+					$sessname = 'subtotal_hideInnerLines_supplier_proposal';
+					$sessname2 = 'subtotal_hidedetails_supplier_proposal';
+					$sessname3 = 'subtotal_hideprices_supplier_proposal';
 				}
 				elseif(in_array('ordercard',explode(':',$parameters['context']))) {
 					$sessname = 'subtotal_hideInnerLines_commande';
@@ -578,9 +578,9 @@ 
 					$sessname3 = 'subtotal_hideprices_commande';
 				}
 				elseif(in_array('ordersuppliercard',explode(':',$parameters['context']))) {
-				    $sessname = 'subtotal_hideInnerLines_commande_fournisseur';
-				    $sessname2 = 'subtotal_hidedetails_commande_fournisseur';
-				    $sessname3 = 'subtotal_hideprices_commande_fournisseur';
+					$sessname = 'subtotal_hideInnerLines_commande_fournisseur';
+					$sessname2 = 'subtotal_hidedetails_commande_fournisseur';
+					$sessname3 = 'subtotal_hideprices_commande_fournisseur';
 				}
 				else {
 					$sessname = 'subtotal_hideInnerLines_unknown';
@@ -602,17 +602,17 @@ 
 				foreach($object->lines as &$line) {
 					if ($line->product_type == 9 && $line->special_code == $this->module_number) {
 					    
-                        if($line->qty>=90) {
-                            $line->modsubtotal_total = 1;
-                        }
-                        else{
-                            $line->modsubtotal_title = 1;
-                        }
+						if($line->qty>=90) {
+							$line->modsubtotal_total = 1;
+						}
+						else{
+							$line->modsubtotal_title = 1;
+						}
                         
 						$line->total_ht = $this->getTotalLineFromObject($object, $line, '');
 					}
-	        	}
-	        }
+				}
+			}
 			
 		}
 		else if($action === 'confirm_delete_all_lines' && GETPOST('confirm')=='yes') {
@@ -629,7 +629,7 @@ 
 				 */
 				else if($object->element=='invoice_supplier')
 				{
-				    $object->deleteline($idLine);
+					$object->deleteline($idLine);
 				}
 				/**
 				 * @var $object Propal
@@ -652,7 +652,7 @@ 
 				 */
 				else if($object->element=='order_supplier')
 				{
-				    $object->deleteline($idLine);
+					$object->deleteline($idLine);
 				}
 				/**
 				 * @var $object Facturerec
@@ -696,7 +696,7 @@ 
 		
 		foreach($object->lines as $l) {
 		
-		    $lid = (!empty($l->rowid) ? $l->rowid : $l->id);
+			$lid = (!empty($l->rowid) ? $l->rowid : $l->id);
 			if($lid == $lineid) {
 
 				$found = true;
@@ -705,7 +705,7 @@ 
 			
 			if($found) {
 				
-			    $Tab[] = (!empty($l->rowid) ? $l->rowid : $l->id);
+				$Tab[] = (!empty($l->rowid) ? $l->rowid : $l->id);
 				
 				if($l->special_code==$this->module_number && (($l->qty==99 && $qty_line==1) || ($l->qty==98 && $qty_line==2))   ) {
 					break; // end of story
@@ -784,17 +784,17 @@ 
 			if($l->rang>=$rang) {
 				return price($total);
 			}
-                        if (TSubtotal::isSubtotal($l)){
-                            $total = 0;
-                        } else  if ($l->situation_percent > 0 ){
+						if (TSubtotal::isSubtotal($l)){
+							$total = 0;
+						} else  if ($l->situation_percent > 0 ){
                            
         	
 		 	$prev_progress = $l->get_prev_progress($object->id);
 		 	$progress = ($l->situation_percent - $prev_progress) /100;
-                        $total += ($l->total_ht/($l->situation_percent/100)) * $progress;
+						$total += ($l->total_ht/($l->situation_percent/100)) * $progress;
                         
-                    }
-                }
+					}
+				}
                 
 		return price($total);
 	}
@@ -826,7 +826,7 @@ 
 		if(method_exists('Closure','bind')) {
 			$pageBreakOriginalValue = $pdf->AcceptPageBreak();
 			$sweetsThief = function ($pdf) {
-		    		return $pdf->bMargin ;
+					return $pdf->bMargin ;
 			};
 			$sweetsThief = Closure::bind($sweetsThief, null, $pdf);
 	
@@ -889,11 +889,11 @@ 
 				else
 				{
 					list($total, $total_tva, $total_ttc, $TTotal_tva) = $this->getTotalLineFromObject($object, $line, '', 1);
-                                        if(get_class($object) == 'Facture' && $object->type==Facture::TYPE_SITUATION){//Facture de situation
-                                                $total_to_print = $this->getTotalToPrintSituation($object, $line);
-                                        } else {
-                                            	$total_to_print = price($total);
-                                        }
+										if(get_class($object) == 'Facture' && $object->type==Facture::TYPE_SITUATION){//Facture de situation
+												$total_to_print = $this->getTotalToPrintSituation($object, $line);
+										} else {
+												$total_to_print = price($total);
+										}
                                             
 					$line->total_ht = $total;
 					$line->total = $total;
@@ -1083,19 +1083,19 @@ 
 			}
 		}
 		if ((int)GETPOST('hideInnerLines') && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES)){
-		    if(is_array($parameters)) $i = & $parameters['i'];
-		    else $i = (int)$parameters;
-		    $this->resprints = price($object->lines[$i]->total_ht);
+			if(is_array($parameters)) $i = & $parameters['i'];
+			else $i = (int)$parameters;
+			$this->resprints = price($object->lines[$i]->total_ht);
 		}
 		if (!empty($hideprices)
-		    || (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
-		    )
+			|| (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
+			)
 		{
-		    if (!empty($hideprices) || !in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
-		    {
-		        $this->resprints = ' ';
-		        return 1;
-		    }
+			if (!empty($hideprices) || !in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
+			{
+				$this->resprints = ' ';
+				return 1;
+			}
 		}
         
 		return 0;
@@ -1375,11 +1375,11 @@ 
 		$hidedetails = (int)GETPOST('hidedetails');
 		
 		if ($hideInnerLines) { // si c une ligne de titre
-	    	$fk_parent_line=0;
+			$fk_parent_line=0;
 			$TLines =array();
 		
 			$original_count=count($object->lines);
-		    $TTvas = array(); // tableau de tva
+			$TTvas = array(); // tableau de tva
 		    
 			foreach($object->lines as $k=>&$line) 
 			{
@@ -1409,48 +1409,48 @@ 
 			
 				if ($hideInnerLines)
 				{
-				    if(!empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
-				    {
-				        if($line->tva_tx != '0.000' && $line->product_type!=9){
+					if(!empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
+					{
+						if($line->tva_tx != '0.000' && $line->product_type!=9){
 				            
-    				        // on remplit le tableau de tva pour substituer les lignes cachées
-    				        $TTvas[$line->tva_tx]['total_tva'] += $line->total_tva;
-    				        $TTvas[$line->tva_tx]['total_ht'] += $line->total_ht;
-    				        $TTvas[$line->tva_tx]['total_ttc'] += $line->total_ttc; 
-    				    }
-    					if($line->product_type==9 && $line->rowid>0)
-    					{
-    					    //Cas où je doit cacher les produits et afficher uniquement les sous-totaux avec les titres
-    					    // génère des lignes d'affichage des montants HT soumis à tva
-    					    $nbtva = count($TTvas);
-    					    if(!empty($nbtva)){
-    					        foreach ($TTvas as $tx =>$val){
-    					            $l = clone $line;
-    					            $l->product_type = 1;
-    					            $l->special_code = '';
-    					            $l->qty = 1;
-    					            $l->desc = $langs->trans('AmountBeforeTaxesSubjectToVATX%', $langs->transnoentitiesnoconv('VAT'), price($tx));
-    					            $l->tva_tx = $tx;
-    					            $l->total_ht = $val['total_ht'];
-    					            $l->total_tva = $val['total_tva'];
-    					            $l->total = $line->total_ht;
-    					            $l->total_ttc = $val['total_ttc'];
-    					            $TLines[] = $l;
-    					            array_shift($TTvas);
-    					       }
-    					    }
+							// on remplit le tableau de tva pour substituer les lignes cachées
+							$TTvas[$line->tva_tx]['total_tva'] += $line->total_tva;
+							$TTvas[$line->tva_tx]['total_ht'] += $line->total_ht;
+							$TTvas[$line->tva_tx]['total_ttc'] += $line->total_ttc; 
+						}
+						if($line->product_type==9 && $line->rowid>0)
+						{
+							//Cas où je doit cacher les produits et afficher uniquement les sous-totaux avec les titres
+							// génère des lignes d'affichage des montants HT soumis à tva
+							$nbtva = count($TTvas);
+							if(!empty($nbtva)){
+								foreach ($TTvas as $tx =>$val){
+									$l = clone $line;
+									$l->product_type = 1;
+									$l->special_code = '';
+									$l->qty = 1;
+									$l->desc = $langs->trans('AmountBeforeTaxesSubjectToVATX%', $langs->transnoentitiesnoconv('VAT'), price($tx));
+									$l->tva_tx = $tx;
+									$l->total_ht = $val['total_ht'];
+									$l->total_tva = $val['total_tva'];
+									$l->total = $line->total_ht;
+									$l->total_ttc = $val['total_ttc'];
+									$TLines[] = $l;
+									array_shift($TTvas);
+							   }
+							}
     					    
-    					    // ajoute la ligne de sous-total
-    					    $TLines[] = $line; 
-    					}
-				    } else {
+							// ajoute la ligne de sous-total
+							$TLines[] = $line; 
+						}
+					} else {
 				        
-				        if($line->product_type==9 && $line->rowid>0)
-				        {
-				            // ajoute la ligne de sous-total
-				            $TLines[] = $line; 
-				        }
-				    }
+						if($line->product_type==9 && $line->rowid>0)
+						{
+							// ajoute la ligne de sous-total
+							$TLines[] = $line; 
+						}
+					}
 				    
 					
 				}
@@ -1475,20 +1475,20 @@ 
 			$nbtva = count($TTvas);
 			if(!empty($nbtva) && $hideInnerLines && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
 			{
-			    foreach ($TTvas as $tx =>$val){
-			        $l = clone $line;
-			        $l->product_type = 1;
-			        $l->special_code = '';
-			        $l->qty = 1;
-			        $l->desc = $langs->trans('AmountBeforeTaxesSubjectToVATX%', $langs->transnoentitiesnoconv('VAT'), price($tx));
-			        $l->tva_tx = $tx;
-			        $l->total_ht = $val['total_ht'];
-			        $l->total_tva = $val['total_tva'];
-			        $l->total = $line->total_ht;
-			        $l->total_ttc = $val['total_ttc'];
-			        $TLines[] = $l;
-			        array_shift($TTvas);
-			    }
+				foreach ($TTvas as $tx =>$val){
+					$l = clone $line;
+					$l->product_type = 1;
+					$l->special_code = '';
+					$l->qty = 1;
+					$l->desc = $langs->trans('AmountBeforeTaxesSubjectToVATX%', $langs->transnoentitiesnoconv('VAT'), price($tx));
+					$l->tva_tx = $tx;
+					$l->total_ht = $val['total_ht'];
+					$l->total_tva = $val['total_tva'];
+					$l->total = $line->total_ht;
+					$l->total_ttc = $val['total_ttc'];
+					$TLines[] = $l;
+					array_shift($TTvas);
+				}
 			}
 			
 			global $nblignes;
@@ -1500,7 +1500,7 @@ 
 				$this->resprints = '';
 				return 0;
 			}
-	    }
+		}
 		
 		return 0;
 	}
@@ -1663,18 +1663,18 @@ 
 		}
 		elseif($object->element == 'order_supplier' )
 		{
-		    $createRight = $user->rights->fournisseur->commande->creer;
+			$createRight = $user->rights->fournisseur->commande->creer;
 		}
 		elseif($object->element == 'invoice_supplier' )
 		{
-		    $createRight = $user->rights->fournisseur->facture->creer;
+			$createRight = $user->rights->fournisseur->facture->creer;
 		}
 		
 		if($line->special_code!=$this->module_number || $line->product_type!=9) {
 			null;
 		}	
 		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)) 
-        {
+		{
 			if($object->element=='facture')$idvar = 'facid';
 			else $idvar='id';
 			
@@ -1721,7 +1721,7 @@ 
 			//var_dump($line);
             
 			// HTML 5 data for js
-            $data = $this->_getHtmlData($parameters, $object, $action, $hookmanager);
+			$data = $this->_getHtmlData($parameters, $object, $action, $hookmanager);
             
 			
 			?>
@@ -1779,8 +1779,8 @@ 
 						}
 						
 						if ($object->element == 'order_supplier' || $object->element == 'invoice_supplier') {
-						    $line->label = !empty($line->description) ? $line->description : $line->desc;
-						    $line->description = '';
+							$line->label = !empty($line->description) ? $line->description : $line->desc;
+							$line->description = '';
 						}
 						$newlabel = $line->label;
 						if($line->label=='' && !$isFreeText) {
@@ -2071,17 +2071,17 @@ 
 		if ($object->statut == 0 && !empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && $action != 'editline')
 		{
 		    
-		    if($object->element == 'invoice_supplier' || $object->element == 'order_supplier')
-		    {
-		        foreach ($object->lines as $line)
-		        {
-		            // fetch optionals attributes and labels
-		            require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-		            $extrafields=new ExtraFields($this->db);
-		            $extralabels=$extrafields->fetch_name_optionals_label($object->table_element_line,true);
-		            $line->fetch_optionals($line->id,$extralabels);
-		        }
-		    }
+			if($object->element == 'invoice_supplier' || $object->element == 'order_supplier')
+			{
+				foreach ($object->lines as $line)
+				{
+					// fetch optionals attributes and labels
+					require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
+					$extrafields=new ExtraFields($this->db);
+					$extralabels=$extrafields->fetch_name_optionals_label($object->table_element_line,true);
+					$line->fetch_optionals($line->id,$extralabels);
+				}
+			}
 		    
 			$TSubNc = array();
 			foreach ($object->lines as &$l)
@@ -2172,80 +2172,80 @@ 
 	{
 		dol_include_once('/subtotal/class/subtotal.class.php');
 
-	    $line = &$parameters['line'];
+		$line = &$parameters['line'];
 	    
-	    $ThtmlData['data-id']           = $line->id;
-	    $ThtmlData['data-product_type'] = $line->product_type;
-	    $ThtmlData['data-qty']          = 0; //$line->qty;
-	    $ThtmlData['data-level']        = TSubtotal::getNiveau($line);
+		$ThtmlData['data-id']           = $line->id;
+		$ThtmlData['data-product_type'] = $line->product_type;
+		$ThtmlData['data-qty']          = 0; //$line->qty;
+		$ThtmlData['data-level']        = TSubtotal::getNiveau($line);
 	    
-	    if(TSubtotal::isTitle($line)){
-	        $ThtmlData['data-issubtotal'] = 'title';
-	    }elseif(TSubtotal::isSubtotal($line)){
-	        $ThtmlData['data-issubtotal'] = 'subtotal';
-	    }
-	    else{
-	        $ThtmlData['data-issubtotal'] = 'freetext';
-	    }
+		if(TSubtotal::isTitle($line)){
+			$ThtmlData['data-issubtotal'] = 'title';
+		}elseif(TSubtotal::isSubtotal($line)){
+			$ThtmlData['data-issubtotal'] = 'subtotal';
+		}
+		else{
+			$ThtmlData['data-issubtotal'] = 'freetext';
+		}
 	    
 	    
-	    // Change or add data  from hooks
-	    $parameters = array_replace($parameters , array(  'ThtmlData' => $ThtmlData )  );
+		// Change or add data  from hooks
+		$parameters = array_replace($parameters , array(  'ThtmlData' => $ThtmlData )  );
 	    
-	    // 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)
-	    {
-	        $ThtmlData = $hookmanager->resArray;
-	    }
-
-	    return $this->implodeHtmlData($ThtmlData);
+		// 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)
+		{
+			$ThtmlData = $hookmanager->resArray;
+		}
+
+		return $this->implodeHtmlData($ThtmlData);
 	
 	}
 	
 	
 	function implodeHtmlData($ThtmlData = array())
 	{
-	    $data = '';
-	    foreach($ThtmlData as $k => $h )
-	    {
-	        if(is_array($h))
-	        {
-	            $h = json_encode($h);
-	        }
+		$data = '';
+		foreach($ThtmlData as $k => $h )
+		{
+			if(is_array($h))
+			{
+				$h = json_encode($h);
+			}
 	        
-	        $data .= $k . '="'.dol_htmlentities($h, ENT_QUOTES).'" ';
-	    }
+			$data .= $k . '="'.dol_htmlentities($h, ENT_QUOTES).'" ';
+		}
 	    
-	    return $data;
+		return $data;
 	}
 	
 	function _ajax_block_order_js($object)
 	{
-	    global $conf,$tagidfortablednd,$filepath,$langs;
+		global $conf,$tagidfortablednd,$filepath,$langs;
 	    
-	    /*
+		/*
 	     * this part of js is base on dolibarr htdocs/core/tpl/ajaxrow.tpl.php 
 	     * for compatibility reasons we don't use tableDnD but jquery sortable
 	     */
 	    
-	    $id=$object->id;
-	    $nboflines=(isset($object->lines)?count($object->lines):0);
-	    $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
+		$id=$object->id;
+		$nboflines=(isset($object->lines)?count($object->lines):0);
+		$forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 	    
-	    $id=$object->id;
-	    $fk_element=$object->fk_element;
-	    $table_element_line=$object->table_element_line;
-	    $nboflines=(isset($object->lines)?count($object->lines):(empty($nboflines)?0:$nboflines));
-	    $tagidfortablednd=(empty($tagidfortablednd)?'tablelines':$tagidfortablednd);
-	    $filepath=(empty($filepath)?'':$filepath);
+		$id=$object->id;
+		$fk_element=$object->fk_element;
+		$table_element_line=$object->table_element_line;
+		$nboflines=(isset($object->lines)?count($object->lines):(empty($nboflines)?0:$nboflines));
+		$tagidfortablednd=(empty($tagidfortablednd)?'tablelines':$tagidfortablednd);
+		$filepath=(empty($filepath)?'':$filepath);
 	    
 	    
-	    if (GETPOST('action','aZ09') != 'editline' && $nboflines > 1)
-	    {
+		if (GETPOST('action','aZ09') != 'editline' && $nboflines > 1)
+		{
 	        
-	        ?>
+			?>
 		
 		
 			<script type="text/javascript">

Spacing +381 added lines, -381 removed lines

@@ -51,43 +51,43 @@ 
     
     function formObjectOptions($parameters, &$object, &$action, $hookmanager) 
     {
-      	global $langs,$db,$user, $conf;
+      	global $langs, $db, $user, $conf;
 		
 		$langs->load('subtotal@subtotal');
 		
-		$contexts = explode(':',$parameters['context']);
+		$contexts = explode(':', $parameters['context']);
 		
-		if(in_array('ordercard',$contexts) || in_array('ordersuppliercard',$contexts) || in_array('propalcard',$contexts) || in_array('supplier_proposalcard',$contexts) || in_array('invoicecard',$contexts) || in_array('invoicesuppliercard',$contexts) || in_array('invoicereccard',$contexts)) {
+		if (in_array('ordercard', $contexts) || in_array('ordersuppliercard', $contexts) || in_array('propalcard', $contexts) || in_array('supplier_proposalcard', $contexts) || in_array('invoicecard', $contexts) || in_array('invoicesuppliercard', $contexts) || in_array('invoicereccard', $contexts)) {
 			
 			$createRight = $user->rights->{$object->element}->creer;
-			if($object->element == 'facturerec' )
+			if ($object->element == 'facturerec')
 			{
 				$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;
 			}
 			
-			if ($object->statut == 0  && $createRight) {
+			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')) )
+				if (in_array($action, array('add_title_line', 'add_total_line', 'add_subtitle_line', 'add_subtotal_line', 'add_free_text')))
 				{
 					$level = GETPOST('level', 'int'); //New avec SUBTOTAL_USE_NEW_FORMAT
 					
-					if($action=='add_title_line') {
+					if ($action == 'add_title_line') {
 						$title = GETPOST('title');
-						if(empty($title)) $title = $langs->trans('title');
-						$qty = $level<1 ? 1 : $level ;
+						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)) {
@@ -99,21 +99,21 @@ 
 								}
 							}
 						}
-						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 {
 						$title = GETPOST('title') ? GETPOST('title') : $langs->trans('SubTotal');
-						$qty = $level ? 100-$level : 99;
+						$qty = $level ? 100 - $level : 99;
 					}
 					dol_include_once('/subtotal/class/subtotal.class.php');
 					
@@ -121,15 +121,15 @@ 
 					
 	    			TSubtotal::addSubTotalLine($object, $title, $qty);
 				}
-				else if($action==='ask_deleteallline') {
-						$form=new Form($db);
+				else if ($action === 'ask_deleteallline') {
+						$form = new Form($db);
 						
-						$lineid = GETPOST('lineid','integer');
+						$lineid = GETPOST('lineid', 'integer');
 						$TIdForGroup = $this->getArrayOfLineForAGroup($object, $lineid);
 					
 						$nbLines = count($TIdForGroup);
 					
-						$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('deleteWithAllLines'), $langs->trans('ConfirmDeleteAllThisLines',$nbLines), 'confirm_delete_all_lines','',0,1);
+						$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('deleteWithAllLines'), $langs->trans('ConfirmDeleteAllThisLines', $nbLines), 'confirm_delete_all_lines', '', 0, 1);
 						print $formconfirm;
 				}
 
@@ -139,13 +139,13 @@ 
 				}
 
 				
-				if($action!='editline') {
+				if ($action != 'editline') {
 					// New format is for 3.8
 					$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">
@@ -170,7 +170,7 @@ 
 				$(document).ready(function() {
 					$('div.fiche div.tabsAction').append('<br />');
 					
-					$('div.fiche div.tabsAction').append('<div class="inline-block divButAction"><a id="add_title_line" rel="add_title_line" href="javascript:;" class="butAction"><?php echo  $langs->trans('AddTitle' )?></a></div>');
+					$('div.fiche div.tabsAction').append('<div class="inline-block divButAction"><a id="add_title_line" rel="add_title_line" href="javascript:;" class="butAction"><?php echo  $langs->trans('AddTitle')?></a></div>');
 					$('div.fiche div.tabsAction').append('<div class="inline-block divButAction"><a id="add_total_line" rel="add_total_line" href="javascript:;" class="butAction"><?php echo  $langs->trans('AddSubTotal')?></a></div>');
 					$('div.fiche div.tabsAction').append('<div class="inline-block divButAction"><a id="add_free_text" rel="add_free_text" href="javascript:;" class="butAction"><?php echo  $langs->trans('AddFreeText')?></a></div>');
 
@@ -221,9 +221,9 @@ 
 						$('body').append(dialog_html);
 
 						<?php 
-						$editorTool = empty($conf->global->FCKEDITOR_EDITORNAME)?'ckeditor':$conf->global->FCKEDITOR_EDITORNAME;
-						$editorConf = empty($conf->global->FCKEDITOR_ENABLE_DETAILS)?false:$conf->global->FCKEDITOR_ENABLE_DETAILS;
-						if($editorConf && in_array($editorTool,array('textarea','ckeditor'))){ 
+						$editorTool = empty($conf->global->FCKEDITOR_EDITORNAME) ? 'ckeditor' : $conf->global->FCKEDITOR_EDITORNAME;
+						$editorConf = empty($conf->global->FCKEDITOR_ENABLE_DETAILS) ?false:$conf->global->FCKEDITOR_ENABLE_DETAILS;
+						if ($editorConf && in_array($editorTool, array('textarea', 'ckeditor'))) { 
 						?>
 						if (action == 'addTitle' || action == 'addFreeTxt')
 						{
@@ -338,62 +338,62 @@ 
 		global $conf, $langs, $bc;
 			
 		$action = GETPOST('action');	
-		$TContext = explode(':',$parameters['context']);
+		$TContext = explode(':', $parameters['context']);
 		if (
-				in_array('invoicecard',$TContext)
-		        || in_array('invoicesuppliercard',$TContext)
-				|| in_array('propalcard',$TContext)
-				|| in_array('ordercard',$TContext)
-		        || in_array('ordersuppliercard',$TContext)
-				|| in_array('invoicereccard',$TContext)
+				in_array('invoicecard', $TContext)
+		        || in_array('invoicesuppliercard', $TContext)
+				|| in_array('propalcard', $TContext)
+				|| in_array('ordercard', $TContext)
+		        || in_array('ordersuppliercard', $TContext)
+				|| in_array('invoicereccard', $TContext)
 			)
 	        {	
-				$hideInnerLines	= isset( $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']] ) ?  $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']] : 0;
-				$hidedetails	= isset( $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']] ) ?  $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']] : 0;
-				$hidepricesDefaultConf = !empty($conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED)?$conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED:0;
-				$hideprices= isset( $_SESSION['subtotal_hideprices_'.$parameters['modulepart']] ) ?  $_SESSION['subtotal_hideprices_'.$parameters['modulepart']] : $hidepricesDefaultConf;
+				$hideInnerLines = isset($_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']]) ? $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']] : 0;
+				$hidedetails = isset($_SESSION['subtotal_hidedetails_'.$parameters['modulepart']]) ? $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']] : 0;
+				$hidepricesDefaultConf = !empty($conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED) ? $conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED : 0;
+				$hideprices = isset($_SESSION['subtotal_hideprices_'.$parameters['modulepart']]) ? $_SESSION['subtotal_hideprices_'.$parameters['modulepart']] : $hidepricesDefaultConf;
 				
-				$var=false;
-		     	$out.= '<tr '.$bc[$var].'>
+				$var = false;
+		     	$out .= '<tr '.$bc[$var].'>
 		     			<td colspan="4" align="right">
 		     				<label for="hideInnerLines">'.$langs->trans('HideInnerLines').'</label>
-		     				<input type="checkbox" onclick="if($(this).is(\':checked\')) { $(\'#hidedetails\').prop(\'checked\', \'checked\')  }" id="hideInnerLines" name="hideInnerLines" value="1" '.(( $hideInnerLines ) ? 'checked="checked"' : '' ).' />
+		     				<input type="checkbox" onclick="if($(this).is(\':checked\')) { $(\'#hidedetails\').prop(\'checked\', \'checked\')  }" id="hideInnerLines" name="hideInnerLines" value="1" '.(($hideInnerLines) ? 'checked="checked"' : '').' />
 		     			</td>
 		     			</tr>';
 				
-		     	$var=!$var;
-		     	$out.= '<tr '.$bc[$var].'>
+		     	$var = !$var;
+		     	$out .= '<tr '.$bc[$var].'>
 		     			<td colspan="4" align="right">
 		     				<label for="hidedetails">'.$langs->trans('SubTotalhidedetails').'</label>
-		     				<input type="checkbox" id="hidedetails" name="hidedetails" value="1" '.(( $hidedetails ) ? 'checked="checked"' : '' ).' />
+		     				<input type="checkbox" id="hidedetails" name="hidedetails" value="1" '.(($hidedetails) ? 'checked="checked"' : '').' />
 		     			</td>
 		     			</tr>';
 		     	
-		     	$var=!$var;
-		     	$out.= '<tr '.$bc[$var].'>
+		     	$var = !$var;
+		     	$out .= '<tr '.$bc[$var].'>
 		     			<td colspan="4" align="right">
 		     				<label for="hidedetails">'.$langs->trans('SubTotalhidePrice').'</label>
-		     				<input type="checkbox" id="hideprices" name="hideprices" value="1" '.(( $hideprices ) ? 'checked="checked"' : '' ).' />
+		     				<input type="checkbox" id="hideprices" name="hideprices" value="1" '.(($hideprices) ? 'checked="checked"' : '').' />
 		     			</td>
 		     			</tr>';
 		     	
 		     	
 				 
 				if ( 
-					(in_array('propalcard',$TContext) && !empty($conf->global->SUBTOTAL_PROPAL_ADD_RECAP))
-					|| (in_array('ordercard',$TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
-				    || (in_array('ordersuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
-					|| (in_array('invoicecard',$TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
-				    || (in_array('invoicesuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
-					|| (in_array('invoicereccard',$TContext)  && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP ))
+					(in_array('propalcard', $TContext) && !empty($conf->global->SUBTOTAL_PROPAL_ADD_RECAP))
+					|| (in_array('ordercard', $TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
+				    || (in_array('ordersuppliercard', $TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
+					|| (in_array('invoicecard', $TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
+				    || (in_array('invoicesuppliercard', $TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
+					|| (in_array('invoicereccard', $TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
 				)
 				{
-					$var=!$var;
-					$out.= '
+					$var = !$var;
+					$out .= '
 						<tr '.$bc[$var].'>
 							<td colspan="4" align="right">
 								<label for="subtotal_add_recap">'.$langs->trans('subtotal_add_recap').'</label>
-								<input type="checkbox" id="subtotal_add_recap" name="subtotal_add_recap" value="1" '.( GETPOST('subtotal_add_recap') ? 'checked="checked"' : '' ).' />
+								<input type="checkbox" id="subtotal_add_recap" name="subtotal_add_recap" value="1" '.(GETPOST('subtotal_add_recap') ? 'checked="checked"' : '').' />
 							</td>
 						</tr>';
 				}
@@ -409,7 +409,7 @@ 
     function formEditProductOptions($parameters, &$object, &$action, $hookmanager) 
     {
 		
-    	if (in_array('invoicecard',explode(':',$parameters['context'])))
+    	if (in_array('invoicecard', explode(':', $parameters['context'])))
         {
         	
         }
@@ -420,13 +420,13 @@ 
 	function ODTSubstitutionLine(&$parameters, &$object, $action, $hookmanager) {
 		global $conf;
 		
-		if($action === 'builddoc') {
+		if ($action === 'builddoc') {
 			
 			$line = &$parameters['line'];
 			$object = &$parameters['object'];
 			$substitutionarray = &$parameters['substitutionarray'];
 			
-			if($line->product_type == 9 && $line->special_code == $this->module_number) {
+			if ($line->product_type == 9 && $line->special_code == $this->module_number) {
 				$substitutionarray['line_modsubtotal'] = 1;	
 				
 				$substitutionarray['line_price_ht']
@@ -437,7 +437,7 @@ 
 					 = $substitutionarray['line_up'] 
 					 = '';
 				
-				if($line->qty>90) {
+				if ($line->qty > 90) {
 					$substitutionarray['line_modsubtotal_total'] = true;
 					
 					list($total, $total_tva, $total_ttc, $TTotal_tva) = $this->getTotalLineFromObject($object, $line, '', 1);
@@ -451,7 +451,7 @@ 
 				
 				
 			}	
-			else{
+			else {
 				$substitutionarray['line_not_modsubtotal'] = true;
 				$substitutionarray['line_modsubtotal'] = 0;
 			}
@@ -463,29 +463,29 @@ 
 	function createFrom($parameters, &$object, $action, $hookmanager) {
 	
 		if (
-				in_array('invoicecard',explode(':',$parameters['context']))
-		        || in_array('invoicesuppliercard',explode(':',$parameters['context']))
-				|| in_array('propalcard',explode(':',$parameters['context']))
-		        || in_array('supplier_proposalcard',explode(':',$parameters['context']))
-				|| in_array('ordercard',explode(':',$parameters['context']))
-		        || in_array('ordersuppliercard',explode(':',$parameters['context']))
-				|| in_array('invoicereccard',explode(':',$parameters['context']))
+				in_array('invoicecard', explode(':', $parameters['context']))
+		        || in_array('invoicesuppliercard', explode(':', $parameters['context']))
+				|| in_array('propalcard', explode(':', $parameters['context']))
+		        || in_array('supplier_proposalcard', explode(':', $parameters['context']))
+				|| in_array('ordercard', explode(':', $parameters['context']))
+		        || in_array('ordersuppliercard', explode(':', $parameters['context']))
+				|| in_array('invoicereccard', explode(':', $parameters['context']))
 		) {
 			
 			global $db;
 			
 			$objFrom = $parameters['objFrom'];
 			
-			foreach($objFrom->lines as $k=> &$lineOld) {
+			foreach ($objFrom->lines as $k=> &$lineOld) {
 				
-					if($lineOld->product_type == 9 && $lineOld->info_bits > 0 ) {
+					if ($lineOld->product_type == 9 && $lineOld->info_bits > 0) {
 							
 							$line = & $object->lines[$k];
 				
 							$idLine = (int) ($line->id ? $line->id : $line->rowid); 
 				
 							$db->query("UPDATE ".MAIN_DB_PREFIX.$line->table_element."
-							SET info_bits=".(int)$lineOld->info_bits."
+							SET info_bits=".(int) $lineOld->info_bits."
 							WHERE rowid = ".$idLine."
 							");
 						
@@ -501,15 +501,15 @@ 
 	
 	function doActions($parameters, &$object, $action, $hookmanager)
 	{
-		global $db, $conf, $langs,$user;
+		global $db, $conf, $langs, $user;
 		
 		dol_include_once('/subtotal/class/subtotal.class.php');
 		dol_include_once('/subtotal/lib/subtotal.lib.php');
-		require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		
 		$showBlockExtrafields = GETPOST('showBlockExtrafields');
 		
-		if($object->element=='facture') $idvar = 'facid';
+		if ($object->element == 'facture') $idvar = 'facid';
 		else $idvar = 'id';
 			
 		if ($action == 'updateligne' || $action == 'updateline')
@@ -522,7 +522,7 @@ 
 				if ($line->id == $lineid && TSubtotal::isModSubtotalLine($line))
 				{
 					$found = true;
-					if(TSubtotal::isTitle($line) && !empty($showBlockExtrafields)) {
+					if (TSubtotal::isTitle($line) && !empty($showBlockExtrafields)) {
 						$extrafieldsline = new ExtraFields($db);
 						$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
 						$extrafieldsline->setOptionalsFromPost($extralabelsline, $line);
@@ -541,43 +541,43 @@ 
 				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']))
-				|| in_array('propalcard',explode(':',$parameters['context']))
-				|| in_array('ordercard',explode(':',$parameters['context']))
-			    || in_array('ordersuppliercard',explode(':',$parameters['context']))
-			    || in_array('invoicesuppliercard',explode(':',$parameters['context']))
-			    || in_array('supplier_proposalcard',explode(':',$parameters['context']))
+				in_array('invoicecard', explode(':', $parameters['context']))
+				|| in_array('propalcard', explode(':', $parameters['context']))
+				|| in_array('ordercard', explode(':', $parameters['context']))
+			    || in_array('ordersuppliercard', explode(':', $parameters['context']))
+			    || in_array('invoicesuppliercard', explode(':', $parameters['context']))
+			    || in_array('supplier_proposalcard', explode(':', $parameters['context']))
 			)
 	        {								
-				if(in_array('invoicecard',explode(':',$parameters['context']))) {
+				if (in_array('invoicecard', explode(':', $parameters['context']))) {
 					$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';
@@ -590,22 +590,22 @@ 
 					
 				global $hideprices;
 				
-				$hideInnerLines = (int)GETPOST('hideInnerLines');
+				$hideInnerLines = (int) GETPOST('hideInnerLines');
 				$_SESSION[$sessname] = $hideInnerLines;		
 				
-				$hidedetails= (int)GETPOST('hidedetails');
+				$hidedetails = (int) GETPOST('hidedetails');
 				$_SESSION[$sessname2] = $hidedetails;
 				
-				$hideprices= (int)GETPOST('hideprices');
+				$hideprices = (int) GETPOST('hideprices');
 				$_SESSION[$sessname3] = $hideprices;
 				
-				foreach($object->lines as &$line) {
+				foreach ($object->lines as &$line) {
 					if ($line->product_type == 9 && $line->special_code == $this->module_number) {
 					    
-                        if($line->qty>=90) {
+                        if ($line->qty >= 90) {
                             $line->modsubtotal_total = 1;
                         }
-                        else{
+                        else {
                             $line->modsubtotal_title = 1;
                         }
                         
@@ -615,34 +615,34 @@ 
 	        }
 			
 		}
-		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'));
 			
-			foreach($Tab as $idLine) {
+			foreach ($Tab as $idLine) {
 				/**
 				 * @var $object Facture
 				 */
-				if($object->element=='facture') $object->deleteline($idLine);
+				if ($object->element == 'facture') $object->deleteline($idLine);
 				/**
 				 * @var $object Facture fournisseur
 				 */
-				else if($object->element=='invoice_supplier')
+				else if ($object->element == 'invoice_supplier')
 				{
 				    $object->deleteline($idLine);
 				}
 				/**
 				 * @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') 
+				else if ($object->element == 'commande') 
 				{
 					if ((float) DOL_VERSION >= 5.0) $object->deleteline($user, $idLine);
 					else $object->deleteline($idLine);
@@ -650,14 +650,14 @@ 
 				/**
 				 * @var $object Commande fournisseur
 				 */
-				else if($object->element=='order_supplier')
+				else if ($object->element == 'order_supplier')
 				{
 				    $object->deleteline($idLine);
 				}
 				/**
 				 * @var $object Facturerec
 				 */
-				else if($object->element=='facturerec') $object->deleteline($idLine);
+				else if ($object->element == 'facturerec') $object->deleteline($idLine);
 			}
 			
 			header('location:?id='.$object->id);
@@ -680,7 +680,7 @@ 
 		return 0;
 	}
 	
-	function formAddObjectLine ($parameters, &$object, &$action, $hookmanager) {
+	function formAddObjectLine($parameters, &$object, &$action, $hookmanager) {
 		return 0;
 	}
 
@@ -692,22 +692,22 @@ 
 		
 		$found = false;
 
-		$Tab= array();
+		$Tab = array();
 		
-		foreach($object->lines as $l) {
+		foreach ($object->lines as $l) {
 		
 		    $lid = (!empty($l->rowid) ? $l->rowid : $l->id);
-			if($lid == $lineid) {
+			if ($lid == $lineid) {
 
 				$found = true;
 				$qty_line = $l->qty;
 			}
 			
-			if($found) {
+			if ($found) {
 				
 			    $Tab[] = (!empty($l->rowid) ? $l->rowid : $l->id);
 				
-				if($l->special_code==$this->module_number && (($l->qty==99 && $qty_line==1) || ($l->qty==98 && $qty_line==2))   ) {
+				if ($l->special_code == $this->module_number && (($l->qty == 99 && $qty_line == 1) || ($l->qty == 98 && $qty_line == 2))) {
 					break; // end of story
 				}
 			}
@@ -736,7 +736,7 @@ 
 	 * 
 	 * @param	$use_level		isn't used anymore
 	 */
-	function getTotalLineFromObject(&$object, &$line, $use_level=false, $return_all=0) {
+	function getTotalLineFromObject(&$object, &$line, $use_level = false, $return_all = 0) {
 		
 		$rang = $line->rang;
 		$qty_line = $line->qty;
@@ -747,21 +747,21 @@ 
 		$TTotal_tva = array();
 		
 		dol_include_once('/subtotal/class/subtotal.class.php');
-		foreach($object->lines as $l) {
+		foreach ($object->lines as $l) {
 			//print $l->rang.'>='.$rang.' '.$total.'<br/>';
-			if($l->rang>=$rang) {
+			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)) 
+			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)) {
 				$total += $l->total_ht;
 				$total_tva += $l->total_tva;
 				$TTotal_tva[$l->tva_tx] += $l->total_tva;
@@ -780,18 +780,18 @@ 
 		
 		$rang = $line->rang;
 		$total = 0;
-		foreach($object->lines as $l) {
-			if($l->rang>=$rang) {
+		foreach ($object->lines as $l) {
+			if ($l->rang >= $rang) {
 				return price($total);
 			}
-                        if (TSubtotal::isSubtotal($l)){
+                        if (TSubtotal::isSubtotal($l)) {
                             $total = 0;
-                        } else  if ($l->situation_percent > 0 ){
+                        } else  if ($l->situation_percent > 0) {
                            
         	
 		 	$prev_progress = $l->get_prev_progress($object->id);
-		 	$progress = ($l->situation_percent - $prev_progress) /100;
-                        $total += ($l->total_ht/($l->situation_percent/100)) * $progress;
+		 	$progress = ($l->situation_percent - $prev_progress) / 100;
+                        $total += ($l->total_ht / ($l->situation_percent / 100)) * $progress;
                         
                     }
                 }
@@ -810,10 +810,10 @@ 
 	 * @param $w            float               width
 	 * @param $h            float               height
 	 */
-	function pdf_add_total(&$pdf,&$object, &$line, $label, $description,$posx, $posy, $w, $h) {
-		global $conf,$subtotal_last_title_posy;
+	function pdf_add_total(&$pdf, &$object, &$line, $label, $description, $posx, $posy, $w, $h) {
+		global $conf, $subtotal_last_title_posy;
 		
-		$hideInnerLines = (int)GETPOST('hideInnerLines');
+		$hideInnerLines = (int) GETPOST('hideInnerLines');
 		if (!empty($conf->global->SUBTOTAL_ONE_LINE_IF_HIDE_INNERLINES) && $hideInnerLines && !empty($subtotal_last_title_posy))
 		{
 			$posy = $subtotal_last_title_posy;
@@ -823,34 +823,34 @@ 
 		$hidePriceOnSubtotalLines = (int) GETPOST('hide_price_on_subtotal_lines');
 		
 		$set_pagebreak_margin = false;
-		if(method_exists('Closure','bind')) {
+		if (method_exists('Closure', 'bind')) {
 			$pageBreakOriginalValue = $pdf->AcceptPageBreak();
-			$sweetsThief = function ($pdf) {
-		    		return $pdf->bMargin ;
+			$sweetsThief = function($pdf) {
+		    		return $pdf->bMargin;
 			};
 			$sweetsThief = Closure::bind($sweetsThief, null, $pdf);
 	
-			$bMargin  = $sweetsThief($pdf);
+			$bMargin = $sweetsThief($pdf);
 	
-			$pdf->SetAutoPageBreak( false );
+			$pdf->SetAutoPageBreak(false);
 
 			$set_pagebreak_margin = true;			
 		}
 		
 			
-		if($line->qty==99)
-			$pdf->SetFillColor(220,220,220);
-		elseif ($line->qty==98)
-			$pdf->SetFillColor(230,230,230);
+		if ($line->qty == 99)
+			$pdf->SetFillColor(220, 220, 220);
+		elseif ($line->qty == 98)
+			$pdf->SetFillColor(230, 230, 230);
 		else
-			$pdf->SetFillColor(240,240,240);
+			$pdf->SetFillColor(240, 240, 240);
 		
 		$style = 'B';
 		if (!empty($conf->global->SUBTOTAL_SUBTOTAL_STYLE)) $style = $conf->global->SUBTOTAL_SUBTOTAL_STYLE;
 		
 		$pdf->SetFont('', $style, 9);
 		
-		$pdf->writeHTMLCell($w, $h, $posx, $posy, $label, 0, 1, false, true, 'R',true);
+		$pdf->writeHTMLCell($w, $h, $posx, $posy, $label, 0, 1, false, true, 'R', true);
 //		var_dump($bMargin);
 		$pageAfter = $pdf->getPage();
 		
@@ -875,7 +875,7 @@ 
 				}
 			}
 			
-			if($total_to_print) {
+			if ($total_to_print) {
 				
 				if (GETPOST('hideInnerLines'))
 				{
@@ -889,7 +889,7 @@ 
 				else
 				{
 					list($total, $total_tva, $total_ttc, $TTotal_tva) = $this->getTotalLineFromObject($object, $line, '', 1);
-                                        if(get_class($object) == 'Facture' && $object->type==Facture::TYPE_SITUATION){//Facture de situation
+                                        if (get_class($object) == 'Facture' && $object->type == Facture::TYPE_SITUATION) {//Facture de situation
                                                 $total_to_print = $this->getTotalToPrintSituation($object, $line);
                                         } else {
                                             	$total_to_print = price($total);
@@ -903,11 +903,11 @@ 
 			}
 
 			$pdf->SetXY($pdf->postotalht, $posy);
-			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);
+			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;
@@ -927,22 +927,22 @@ 
 	 * @param $w            float               width
 	 * @param $h            float               height
 	 */
-	function pdf_add_title(&$pdf,&$object, &$line, $label, $description,$posx, $posy, $w, $h) {
+	function pdf_add_title(&$pdf, &$object, &$line, $label, $description, $posx, $posy, $w, $h) {
 		
-		global $db,$conf,$subtotal_last_title_posy;
+		global $db, $conf, $subtotal_last_title_posy;
 		
 		$subtotal_last_title_posy = $posy;
-		$pdf->SetXY ($posx, $posy);
+		$pdf->SetXY($posx, $posy);
 		
-		$hideInnerLines = (int)GETPOST('hideInnerLines');
+		$hideInnerLines = (int) GETPOST('hideInnerLines');
 		
 		
  
-		$style = ($line->qty==1) ? 'BU' : 'BUI';
+		$style = ($line->qty == 1) ? 'BU' : 'BUI';
 		if (!empty($conf->global->SUBTOTAL_TITLE_STYLE)) $style = $conf->global->SUBTOTAL_TITLE_STYLE;
 		
-		if($hideInnerLines) {
-			if($line->qty==1)$pdf->SetFont('', $style, 9);
+		if ($hideInnerLines) {
+			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;
@@ -951,43 +951,43 @@ 
 		}
 		else {
 
-			if($line->qty==1)$pdf->SetFont('', $style, 9); //TODO if super utile
+			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
+		else $pdf->writeHTMLCell($w, $h, $posx, $posy, $label, 0, 1, false, true, 'J', true); // et maintenant avec du HTML
 		
-		if($description && !$hidedesc) {
+		if ($description && !$hidedesc) {
 			$posy = $pdf->GetY();
 			
 			$pdf->SetFont('', '', 8);
 			
-			$pdf->writeHTMLCell($w, $h, $posx, $posy, $description, 0, 1, false, true, 'J',true);
+			$pdf->writeHTMLCell($w, $h, $posx, $posy, $description, 0, 1, false, true, 'J', true);
 
 		}
 		
 	}
 
-	function pdf_writelinedesc_ref($parameters=array(), &$object, &$action='') {
+	function pdf_writelinedesc_ref($parameters = array(), &$object, &$action = '') {
 	// ultimate PDF hook O_o
 		
-		return $this->pdf_writelinedesc($parameters,$object,$action);
+		return $this->pdf_writelinedesc($parameters, $object, $action);
 		
 	}
 
 	function isModSubtotalLine(&$parameters, &$object) {
 		
-		if(is_array($parameters)) {
+		if (is_array($parameters)) {
 			$i = & $parameters['i'];	
 		}
 		else {
-			$i = (int)$parameters;
+			$i = (int) $parameters;
 		}
 		
 		
-		if($object->lines[$i]->special_code == $this->module_number && $object->lines[$i]->product_type == 9) {
+		if ($object->lines[$i]->special_code == $this->module_number && $object->lines[$i]->product_type == 9) {
 			return true;
 		}
 		
@@ -995,43 +995,43 @@ 
 		
 	}
 
-	function pdf_getlineqty($parameters=array(), &$object, &$action='') {
-		global $conf,$hideprices;
+	function pdf_getlineqty($parameters = array(), &$object, &$action = '') {
+		global $conf, $hideprices;
 		
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			
 			$this->resprints = ' ';
 			
-			if((float)DOL_VERSION<=3.6) {
+			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))
 		{
-			$hideInnerLines = (int)GETPOST('hideInnerLines');
-			$hidedetails = (int)GETPOST('hidedetails');
+			$hideInnerLines = (int) GETPOST('hideInnerLines');
+			$hidedetails = (int) GETPOST('hidedetails');
 			if (empty($hideInnerLines) && !empty($hidedetails))
 			{
 				$this->resprints = $object->lines[$parameters['i']]->qty;
 			}
 		}
 		
-		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]->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])) )
+		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		{
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
 			{
@@ -1043,25 +1043,25 @@ 
 		return 0;
 	}
 	
-	function pdf_getlinetotalexcltax($parameters=array(), &$object, &$action='') {
+	function pdf_getlinetotalexcltax($parameters = array(), &$object, &$action = '') {
 		global $conf, $hideprices;
 		
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			
 			$this->resprints = ' ';
 			
-			if((float)DOL_VERSION<=3.6) {
+			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))
 		{
-			if(is_array($parameters)) $i = & $parameters['i'];
-			else $i = (int)$parameters;
+			if (is_array($parameters)) $i = & $parameters['i'];
+			else $i = (int) $parameters;
 			
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
 			{
@@ -1082,13 +1082,13 @@ 
 				}
 			}
 		}
-		if ((int)GETPOST('hideInnerLines') && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES)){
-		    if(is_array($parameters)) $i = & $parameters['i'];
-		    else $i = (int)$parameters;
+		if ((int) GETPOST('hideInnerLines') && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES)) {
+		    if (is_array($parameters)) $i = & $parameters['i'];
+		    else $i = (int) $parameters;
 		    $this->resprints = price($object->lines[$i]->total_ht);
 		}
 		if (!empty($hideprices)
-		    || (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
+		    || (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		    )
 		{
 		    if (!empty($hideprices) || !in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
@@ -1101,25 +1101,25 @@ 
 		return 0;
 	}
 	
-	function pdf_getlinetotalwithtax($parameters=array(), &$object, &$action='') {
+	function pdf_getlinetotalwithtax($parameters = array(), &$object, &$action = '') {
 		global $conf;
 		
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			
 			$this->resprints = ' ';
 		
-			if((float)DOL_VERSION<=3.6) {
+			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])) ) 
+		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i]))) 
 		{
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
 			{
@@ -1131,24 +1131,24 @@ 
 		return 0;
 	}
 	
-	function pdf_getlineunit($parameters=array(), &$object, &$action='') {
+	function pdf_getlineunit($parameters = array(), &$object, &$action = '') {
 		global $conf;
 		
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			$this->resprints = ' ';
 		
-			if((float)DOL_VERSION<=3.6) {
+			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])) )
+		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		{
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
 			{
@@ -1160,24 +1160,24 @@ 
 		return 0;
 	}
 	
-	function pdf_getlineupexcltax($parameters=array(), &$object, &$action='') {
-		global $conf,$hideprices;
+	function pdf_getlineupexcltax($parameters = array(), &$object, &$action = '') {
+		global $conf, $hideprices;
 
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			$this->resprints = ' ';
 		
-			if((float)DOL_VERSION<=3.6) {
+			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])) )
+				|| (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		)
 		{
 			if (!empty($hideprices) || !in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
@@ -1190,24 +1190,24 @@ 
 		return 0;
 	}
 	
-	function pdf_getlineupwithtax($parameters=array(), &$object, &$action='') {
-		global $conf,$hideprices;
+	function pdf_getlineupwithtax($parameters = array(), &$object, &$action = '') {
+		global $conf, $hideprices;
 		
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			$this->resprints = ' ';
-			if((float)DOL_VERSION<=3.6) {
+			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])) )
+				|| (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		)
 		{
 			if (!empty($hideprices) || !in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
@@ -1220,27 +1220,27 @@ 
 		return 0;
 	}
 	
-	function pdf_getlinevatrate($parameters=array(), &$object, &$action='') {
+	function pdf_getlinevatrate($parameters = array(), &$object, &$action = '') {
 		global $conf;
 		
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			$this->resprints = ' ';
 			
-			if((float)DOL_VERSION<=3.6) {
+			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)
 
 		$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])) )
+		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		{
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
 			{
@@ -1252,23 +1252,23 @@ 
 		return 0;
 	}
 		
-	function pdf_getlineprogress($parameters=array(), &$object, &$action) {
+	function pdf_getlineprogress($parameters = array(), &$object, &$action) {
 		global $conf;
 		
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			$this->resprints = ' ';
-			if((float)DOL_VERSION<=3.6) {
+			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])) )
+		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		{
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
 			{
@@ -1283,12 +1283,12 @@ 
 	function add_numerotation(&$object) {
 		global $conf;
 		
-		if(!empty($conf->global->SUBTOTAL_USE_NUMEROTATION)) {
+		if (!empty($conf->global->SUBTOTAL_USE_NUMEROTATION)) {
 		
 			$TLevelTitre = array();
 			$prevlevel = 0;
 		
-			foreach($object->lines as $k=>&$line) 
+			foreach ($object->lines as $k=>&$line) 
 			{
 				if ($line->id > 0 && $this->isModSubtotalLine($k, $object) && $line->qty <= 10)
 				{
@@ -1302,12 +1302,12 @@ 
 	}
 
 	// TODO ne gère pas encore la numération des lignes "Totaux"
-	private function formatNumerotation(&$TLineTitle, $line_reference='', $level=1, $prefix_num=0)
+	private function formatNumerotation(&$TLineTitle, $line_reference = '', $level = 1, $prefix_num = 0)
 	{
 		$TTitle = array();
 		
-		$i=1;
-		$j=0;
+		$i = 1;
+		$j = 0;
 		foreach ($TLineTitle as $k => &$line)
 		{
 			if (!empty($line_reference) && $line->rang <= $line_reference->rang) continue;
@@ -1317,7 +1317,7 @@ 
 			{
 				$TTitle[$j]['numerotation'] = ($prefix_num == 0) ? $i : $prefix_num.'.'.$i;
 				//var_dump('Prefix == '.$prefix_num.' // '.$line->desc.' ==> numerotation == '.$TTitle[$j]['numerotation'].'   ###    '.$line->qty .'=='. $level);
-				if (empty($line->label) && (float)DOL_VERSION < 6)
+				if (empty($line->label) && (float) DOL_VERSION < 6)
 				{
 					$line->label = !empty($line->desc) ? $line->desc : $line->description;
 					$line->desc = $line->description = '';
@@ -1343,26 +1343,26 @@ 
 	
 	function setDocTVA(&$pdf, &$object) {
 		
-		$hidedetails = (int)GETPOST('hidedetails');
+		$hidedetails = (int) GETPOST('hidedetails');
 		
-		if(empty($hidedetails)) return false;
+		if (empty($hidedetails)) return false;
 		
 		// TODO can't add VAT to document without lines... :-/
 		
 		return true;
 	}
 	
-	function beforePDFCreation($parameters=array(), &$object, &$action)
+	function beforePDFCreation($parameters = array(), &$object, &$action)
 	{
 		/**
 		 * @var $pdf    TCPDF
 		 */
-		global $pdf,$conf, $langs;
+		global $pdf, $conf, $langs;
 
 		// var_dump($object->lines);
 		dol_include_once('/subtotal/class/subtotal.class.php');
 
-		foreach($parameters as $key=>$value) {
+		foreach ($parameters as $key=>$value) {
 			${$key} = $value;
 		}
 		
@@ -1371,25 +1371,25 @@ 
 		$this->add_numerotation($object);	
 		
 		
-		$hideInnerLines = (int)GETPOST('hideInnerLines');
-		$hidedetails = (int)GETPOST('hidedetails');
+		$hideInnerLines = (int) GETPOST('hideInnerLines');
+		$hidedetails = (int) GETPOST('hidedetails');
 		
 		if ($hideInnerLines) { // si c une ligne de titre
-	    	$fk_parent_line=0;
-			$TLines =array();
+	    	$fk_parent_line = 0;
+			$TLines = array();
 		
-			$original_count=count($object->lines);
+			$original_count = count($object->lines);
 		    $TTvas = array(); // tableau de tva
 		    
-			foreach($object->lines as $k=>&$line) 
+			foreach ($object->lines as $k=>&$line) 
 			{
 			    
-				if($line->product_type==9 && $line->rowid>0) 
+				if ($line->product_type == 9 && $line->rowid > 0) 
 				{
 					$fk_parent_line = $line->rowid;
 					
 					// Fix tk7201 - si on cache le détail, la TVA est renseigné au niveau du sous-total, l'erreur c'est s'il y a plusieurs sous-totaux pour les même lignes, ça va faire la somme
-					if(TSubtotal::isSubtotal($line)) 
+					if (TSubtotal::isSubtotal($line)) 
 					{
 						/*$total = $this->getTotalLineFromObject($object, $line, '');
 						
@@ -1409,22 +1409,22 @@ 
 			
 				if ($hideInnerLines)
 				{
-				    if(!empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
+				    if (!empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
 				    {
-				        if($line->tva_tx != '0.000' && $line->product_type!=9){
+				        if ($line->tva_tx != '0.000' && $line->product_type != 9) {
 				            
     				        // on remplit le tableau de tva pour substituer les lignes cachées
     				        $TTvas[$line->tva_tx]['total_tva'] += $line->total_tva;
     				        $TTvas[$line->tva_tx]['total_ht'] += $line->total_ht;
     				        $TTvas[$line->tva_tx]['total_ttc'] += $line->total_ttc; 
     				    }
-    					if($line->product_type==9 && $line->rowid>0)
+    					if ($line->product_type == 9 && $line->rowid > 0)
     					{
     					    //Cas où je doit cacher les produits et afficher uniquement les sous-totaux avec les titres
     					    // génère des lignes d'affichage des montants HT soumis à tva
     					    $nbtva = count($TTvas);
-    					    if(!empty($nbtva)){
-    					        foreach ($TTvas as $tx =>$val){
+    					    if (!empty($nbtva)) {
+    					        foreach ($TTvas as $tx =>$val) {
     					            $l = clone $line;
     					            $l->product_type = 1;
     					            $l->special_code = '';
@@ -1445,7 +1445,7 @@ 
     					}
 				    } else {
 				        
-				        if($line->product_type==9 && $line->rowid>0)
+				        if ($line->product_type == 9 && $line->rowid > 0)
 				        {
 				            // ajoute la ligne de sous-total
 				            $TLines[] = $line; 
@@ -1473,9 +1473,9 @@ 
 			
 			// cas incongru où il y aurait des produits en dessous du dernier sous-total
 			$nbtva = count($TTvas);
-			if(!empty($nbtva) && $hideInnerLines && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
+			if (!empty($nbtva) && $hideInnerLines && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
 			{
-			    foreach ($TTvas as $tx =>$val){
+			    foreach ($TTvas as $tx =>$val) {
 			        $l = clone $line;
 			        $l->product_type = 1;
 			        $l->special_code = '';
@@ -1492,11 +1492,11 @@ 
 			}
 			
 			global $nblignes;
-			$nblignes=count($TLines);
+			$nblignes = count($TLines);
 
 			$object->lines = $TLines;
 			
-			if($i>count($object->lines)) {
+			if ($i > count($object->lines)) {
 				$this->resprints = '';
 				return 0;
 			}
@@ -1505,59 +1505,59 @@ 
 		return 0;
 	}
 
-	function pdf_writelinedesc($parameters=array(), &$object, &$action)
+	function pdf_writelinedesc($parameters = array(), &$object, &$action)
 	{
 		/**
 		 * @var $pdf    TCPDF
 		 */
-		global $pdf,$conf;
+		global $pdf, $conf;
 
-		foreach($parameters as $key=>$value) {
+		foreach ($parameters as $key=>$value) {
 			${$key} = $value;
 		}
 		
-		$hideInnerLines = (int)GETPOST('hideInnerLines');
-		$hidedetails = (int)GETPOST('hidedetails');
+		$hideInnerLines = (int) GETPOST('hideInnerLines');
+		$hidedetails = (int) GETPOST('hidedetails');
 		
-		if($this->isModSubtotalLine($parameters,$object) ){			
+		if ($this->isModSubtotalLine($parameters, $object)) {			
 		
 				global $hideprices;
 				
-				if(!empty($hideprices)) {
-					foreach($object->lines as &$line) {
-						if($line->fk_product_type!=9) $line->fk_parent_line = -1;	
+				if (!empty($hideprices)) {
+					foreach ($object->lines as &$line) {
+						if ($line->fk_product_type != 9) $line->fk_parent_line = -1;	
 					}
 				}
 			
 				$line = &$object->lines[$i];
 				
-				if($line->info_bits>0) { // PAGE BREAK
+				if ($line->info_bits > 0) { // PAGE BREAK
 					$pdf->addPage();
 					$posy = $pdf->GetY();
 				}
 				
 				$label = $line->label;
-				$description= !empty($line->desc) ? $outputlangs->convToOutputCharset($line->desc) : $outputlangs->convToOutputCharset($line->description);
+				$description = !empty($line->desc) ? $outputlangs->convToOutputCharset($line->desc) : $outputlangs->convToOutputCharset($line->description);
 				
-				if(empty($label)) {
+				if (empty($label)) {
 					$label = $description;
-					$description='';
+					$description = '';
 				}
 				
-				if($line->qty>90) {
+				if ($line->qty > 90) {
 					
 					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);
+					$this->pdf_add_total($pdf, $object, $line, $label, $description, $posx, $posy, $w, $h);
 					$pageAfter = $pdf->getPage();	
 
-					if($pageAfter>$pageBefore) {
+					if ($pageAfter > $pageBefore) {
 						//print "ST $pageAfter>$pageBefore<br>";
 						$pdf->rollbackTransaction(true);	
-						$pdf->addPage('','', true);
+						$pdf->addPage('', '', true);
 						$posy = $pdf->GetY();
-						$this->pdf_add_total($pdf,$object, $line, $label, $description,$posx, $posy, $w, $h);
+						$this->pdf_add_total($pdf, $object, $line, $label, $description, $posx, $posy, $w, $h);
 						$posy = $pdf->GetY();
 						//print 'add ST'.$pdf->getPage().'<br />';
 					}
@@ -1568,7 +1568,7 @@ 
 				else if ($line->qty < 10) {
 					$pageBefore = $pdf->getPage();
 
-					$this->pdf_add_title($pdf,$object, $line, $label, $description,$posx, $posy, $w, $h); 
+					$this->pdf_add_title($pdf, $object, $line, $label, $description, $posx, $posy, $w, $h); 
 					$pageAfter = $pdf->getPage();	
 
 					
@@ -1643,9 +1643,9 @@ 
 	 * @param $hookmanager  HookManager
 	 * @return int
 	 */
-	function printObjectLine ($parameters, &$object, &$action, $hookmanager){
+	function printObjectLine($parameters, &$object, &$action, $hookmanager) {
 		
-		global $conf,$langs,$user,$db,$bc;
+		global $conf, $langs, $user, $db, $bc;
 		
 		$num = &$parameters['num'];
 		$line = &$parameters['line'];
@@ -1653,32 +1653,32 @@ 
 		
 		$var = &$parameters['var'];
 
-		$contexts = explode(':',$parameters['context']);
+		$contexts = explode(':', $parameters['context']);
 
 		$createRight = $user->rights->{$object->element}->creer;
-		if($object->element == 'facturerec' )
+		if ($object->element == 'facturerec')
 		{
 			$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;
 		}
 		
-		if($line->special_code!=$this->module_number || $line->product_type!=9) {
+		if ($line->special_code != $this->module_number || $line->product_type != 9) {
 			null;
 		}	
-		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)) 
         {
-			if($object->element=='facture')$idvar = 'facid';
-			else $idvar='id';
+			if ($object->element == 'facture')$idvar = 'facid';
+			else $idvar = 'id';
 			
-			if((float)DOL_VERSION <= 3.4)
+			if ((float) DOL_VERSION <= 3.4)
 			{
 				?>
 				<script type="text/javascript">
@@ -1702,20 +1702,20 @@ 
 				<?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') $colspan = 3;
-			if($object->element == 'invoice_supplier') $colspan = 4;
-			if($object->element == 'supplier_proposal') $colspan = 4;
-			if(!empty($conf->multicurrency->enabled)) $colspan+=2;
-			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 == 'facturerec') $colspan = 3;
+			if ($object->element == 'order_supplier') $colspan = 3;
+			if ($object->element == 'invoice_supplier') $colspan = 4;
+			if ($object->element == 'supplier_proposal') $colspan = 4;
+			if (!empty($conf->multicurrency->enabled)) $colspan += 2;
+			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);
@@ -1725,35 +1725,35 @@ 
             
 			
 			?>
-			<tr <?php echo $bc[$var]; $var=!$var; echo $data; ?> rel="subtotal" id="row-<?php echo $line->id ?>" style="<?php
+			<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 '';
+						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 
 					{
-						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;';
 					}
 
 			?>;">
 			
-				<td colspan="<?php echo $colspan; ?>" style="<?php TSubtotal::isFreeText($line) ? '' : 'font-weight:bold;'; ?>  <?php echo ($line->qty>90)?'text-align:right':'' ?> "><?php
-					if($action=='editline' && GETPOST('lineid') == $line->id && TSubtotal::isModSubtotalLine($line) ) {
+				<td colspan="<?php echo $colspan; ?>" style="<?php TSubtotal::isFreeText($line) ? '' : 'font-weight:bold;'; ?>  <?php echo ($line->qty > 90) ? 'text-align:right' : '' ?> "><?php
+					if ($action == 'editline' && GETPOST('lineid') == $line->id && TSubtotal::isModSubtotalLine($line)) {
 
-						$params=array('line'=>$line);
-						$reshook=$hookmanager->executeHooks('formEditProductOptions',$params,$object,$action);
+						$params = array('line'=>$line);
+						$reshook = $hookmanager->executeHooks('formEditProductOptions', $params, $object, $action);
 						
 						echo '<div id="line_'.$line->id.'"></div>'; // Imitation Dolibarr
 						echo '<input type="hidden" value="'.$line->id.'" name="lineid">';
@@ -1761,7 +1761,7 @@ 
 						echo '<input id="product_id" type="hidden" value="'.$line->fk_product.'" name="type">';
 						echo '<input id="special_code" type="hidden" value="'.$line->special_code.'" name="type">';
 
-						$isFreeText=false;
+						$isFreeText = false;
 						if (TSubtotal::isTitle($line))
 						{
 							$qty_displayed = $line->qty;
@@ -1783,13 +1783,13 @@ 
 						    $line->description = '';
 						}
 						$newlabel = $line->label;
-						if($line->label=='' && !$isFreeText) {
-							if(TSubtotal::isSubtotal($line)) {
+						if ($line->label == '' && !$isFreeText) {
+							if (TSubtotal::isSubtotal($line)) {
 								$newlabel = $line->description.' '.$this->getTitle($object, $line);
-								$line->description='';
-							} elseif( (float)DOL_VERSION < 6 ) {
-								$newlabel= $line->description;
-								$line->description='';
+								$line->description = '';
+							} elseif ((float) DOL_VERSION < 6) {
+								$newlabel = $line->description;
+								$line->description = '';
 							}
 						}
 
@@ -1798,10 +1798,10 @@ 
 						
 						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)) )
+						if (!empty($conf->global->SUBTOTAL_USE_NEW_FORMAT) && (TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line)))
 						{
 							$select = '<select name="subtotal_level">';
-							for ($j=1; $j<10; $j++)
+							for ($j = 1; $j < 10; $j++)
 							{
 								if (!empty($readonlyForSituation)) {
 									if ($qty_displayed == $j) $select .= '<option selected="selected" value="'.$j.'">'.$langs->trans('Level').' '.$j.'</option>';
@@ -1814,7 +1814,7 @@ 
 						
 
 						echo '<div class="subtotal_underline" style="margin-left:24px;">';
-							echo '<label for="subtotal-pagebreak">'.$langs->trans('AddBreakPageBefore').'</label> <input style="vertical-align:sub;"  type="checkbox" name="line-pagebreak" id="subtotal-pagebreak" value="8" '.(($line->info_bits > 0) ? 'checked="checked"' : '') .' />&nbsp;&nbsp;';
+							echo '<label for="subtotal-pagebreak">'.$langs->trans('AddBreakPageBefore').'</label> <input style="vertical-align:sub;"  type="checkbox" name="line-pagebreak" id="subtotal-pagebreak" value="8" '.(($line->info_bits > 0) ? 'checked="checked"' : '').' />&nbsp;&nbsp;';
 
 							if (TSubtotal::isTitle($line))
 							{
@@ -1832,9 +1832,9 @@ 
 							else if ($isFreeText) echo TSubtotal::getFreeTextHtml($line, (bool) $readonlyForSituation);
 						echo '</div>';
 
-						if($line->qty<10) {
+						if ($line->qty < 10) {
 							// WYSIWYG editor
-							require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+							require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 							$nbrows = ROWS_2;
 							$cked_enabled = (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS) ? $conf->global->FCKEDITOR_ENABLE_DETAILS : 0);
 							if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) {
@@ -1854,25 +1854,25 @@ 
 
 						 if ($conf->global->SUBTOTAL_USE_NEW_FORMAT)
 						 {
-							if(TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line)) 
+							if (TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line)) 
 							{
-								echo str_repeat('&nbsp;&nbsp;&nbsp;', $line->qty-1);
+								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;';
+								else print img_picto('', 'subtotal2@subtotal').'<span style="font-size:9px;margin-left:-1px;">'.(100 - $line->qty).'</span>&nbsp;&nbsp;';
 							}
 						 }
 						 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;'; 
 						 }
 						 
 						 
 						 // Get display styles and apply them
 						 $titleStyleItalic = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'I') === false ? '' : ' font-style: italic;';
-						 $titleStyleBold =  strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'B') === false ? '' : ' font-weight:bold;';
-						 $titleStyleUnderline =  strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'U') === false ? '' : ' text-decoration: underline;';
+						 $titleStyleBold = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'B') === false ? '' : ' font-weight:bold;';
+						 $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);
@@ -1880,16 +1880,16 @@ 
 						 } 
 						 else {
 
-							if (! empty($conf->global->PRODUIT_DESC_IN_FORM) && !empty($line->description)) {
+							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');
 
 						 
 
@@ -1898,7 +1898,7 @@ 
 			?></td>
 					 
 			<?php
-				if($line->qty>90) {
+				if ($line->qty > 90) {
 					/* Total */
 					$total_line = $this->getTotalLineFromObject($object, $line, '');
 					echo '<td class="nowrap liencolht" align="right" style="font-weight:bold;" rel="subtotal_total">'.price($total_line).'</td>';
@@ -1911,7 +1911,7 @@ 
 				<?php
 				if ($action != 'selectlines') {
 				
-					if($action=='editline' && GETPOST('lineid') == $line->id && TSubtotal::isModSubtotalLine($line) ) {
+					if ($action == 'editline' && GETPOST('lineid') == $line->id && TSubtotal::isModSubtotalLine($line)) {
 						?>
 						<input id="savelinebutton" class="button" type="submit" name="save" value="<?php echo $langs->trans('Save') ?>" />
 						<br />
@@ -1927,13 +1927,13 @@ 
 						<?php
 						
 					}
-					else{
-						if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK) && $object->element !== 'invoice_supplier')
+					else {
+						if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK) && $object->element !== 'invoice_supplier')
 						{
-							if(TSubtotal::isTitle($line) && ($object->situation_counter == 1 || !$object->situation_cycle_ref) ) 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) && ($object->situation_counter == 1 || !$object->situation_cycle_ref)) 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)) 
+						if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_EDIT_BLOCK)) 
 						{
 							echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=editline&lineid='.$line->id.'">'.img_edit().'</a>';
 						}								
@@ -1948,7 +1948,7 @@ 
 				<?php
 
 				if ($action != 'editline' && $action != 'selectlines') {
-						if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK))
+						if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK))
 						{
 
 							if ($object->situation_counter == 1 || !$object->situation_cycle_ref)
@@ -1956,7 +1956,7 @@ 
 								echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=ask_deleteline&lineid='.$line->id.'">'.img_delete().'</a>';
 							}
 
-							if(TSubtotal::isTitle($line) && ($object->situation_counter == 1 || !$object->situation_cycle_ref) )
+							if (TSubtotal::isTitle($line) && ($object->situation_counter == 1 || !$object->situation_cycle_ref))
 							{
 								$img_delete = ((float) DOL_VERSION >= 3.8) ? img_picto($langs->trans('deleteWithAllLines'), 'delete_all.3.8@subtotal') : img_picto($langs->trans('deleteWithAllLines'), 'delete_all@subtotal');
 								echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=ask_deleteallline&lineid='.$line->id.'">'.$img_delete.'</a>';
@@ -1967,7 +1967,7 @@ 
 			</td>
 			
 			<?php 
-			if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && TSubtotal::isTitle($line) && $action != 'editline')
+			if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && TSubtotal::isTitle($line) && $action != 'editline')
 			{
 				echo '<td class="subtotal_nc">';
 				echo '<input id="subtotal_nc-'.$line->id.'" class="subtotal_nc_chkbx" data-lineid="'.$line->id.'" type="checkbox" name="subtotal_nc" value="1" '.(!empty($line->array_options['options_subtotal_nc']) ? 'checked="checked"' : '').' />';
@@ -1978,11 +1978,11 @@ 
 			<td align="center" class="tdlineupdown">
 			</td>
 			<?php } else { ?>
-			<td align="center"<?php echo ((empty($conf->browser->phone) && ($object->statut == 0  && $createRight ))?' class="tdlineupdown"':''); ?>></td>
+			<td align="center"<?php echo ((empty($conf->browser->phone) && ($object->statut == 0 && $createRight)) ? ' class="tdlineupdown"' : ''); ?>></td>
 			<?php } ?>
 
-			<?php  if($action == 'selectlines'){ // dolibarr 8 ?>
-			<td class="linecolcheck" align="center"><input type="checkbox" class="linecheckbox" name="line_checkbox[<?php echo $i+1; ?>]" value="<?php echo $line->id; ?>" ></td>
+			<?php  if ($action == 'selectlines') { // dolibarr 8 ?>
+			<td class="linecolcheck" align="center"><input type="checkbox" class="linecheckbox" name="line_checkbox[<?php echo $i + 1; ?>]" value="<?php echo $line->id; ?>" ></td>
 			<?php } ?>
 
 			</tr>
@@ -1990,29 +1990,29 @@ 
 			
 			
 			// Affichage des extrafields à la Dolibarr (car sinon non affiché sur les titres)
-			if(TSubtotal::isTitle($line) && !empty($conf->global->SUBTOTAL_ALLOW_EXTRAFIELDS_ON_TITLE)) {
+			if (TSubtotal::isTitle($line) && !empty($conf->global->SUBTOTAL_ALLOW_EXTRAFIELDS_ON_TITLE)) {
 				
-				require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 				
 				// Extrafields
 				$extrafieldsline = new ExtraFields($db);
 				$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
 				
-				$colspan+=3; $mode = 'view';
-				if($action === 'editline' && $line->rowid == GETPOST('lineid')) $mode = 'edit';
+				$colspan += 3; $mode = 'view';
+				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
-				print $line->showOptionals($extrafieldsline, $mode, array('style'=>' style="background:#eeffee;" ','colspan'=>$colspan));
+				print $line->showOptionals($extrafieldsline, $mode, array('style'=>' style="background:#eeffee;" ', 'colspan'=>$colspan));
 				$isExtraSelected = false;
-				foreach($line->array_options as $option) {
-					if(!empty($option) && $option != "-1") {
+				foreach ($line->array_options as $option) {
+					if (!empty($option) && $option != "-1") {
 						$isExtraSelected = true;
 						break;
 					}
 				}
 				
-				if($mode === 'edit') {
+				if ($mode === 'edit') {
 					?>
 					<script>
 						$(document).ready(function(){
@@ -2020,7 +2020,7 @@ 
 							var all_tr_extrafields = $("tr.tr_extrafield_title");
 							<?php 
 							// Si un extrafield est rempli alors on affiche directement les extrafields
-							if(!$isExtraSelected) {
+							if (!$isExtraSelected) {
 								echo 'all_tr_extrafields.hide();';
 								echo 'var trad = "'.$langs->trans('showExtrafields').'";';
 								echo 'var extra = 0;';
@@ -2066,20 +2066,20 @@ 
 
 	
 	function addMoreActionsButtons($parameters, &$object, &$action, $hookmanager) {
-		global $conf,$langs;
+		global $conf, $langs;
 		 
 		if ($object->statut == 0 && !empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && $action != 'editline')
 		{
 		    
-		    if($object->element == 'invoice_supplier' || $object->element == 'order_supplier')
+		    if ($object->element == 'invoice_supplier' || $object->element == 'order_supplier')
 		    {
 		        foreach ($object->lines as $line)
 		        {
 		            // fetch optionals attributes and labels
 		            require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-		            $extrafields=new ExtraFields($this->db);
-		            $extralabels=$extrafields->fetch_name_optionals_label($object->table_element_line,true);
-		            $line->fetch_optionals($line->id,$extralabels);
+		            $extrafields = new ExtraFields($this->db);
+		            $extralabels = $extrafields->fetch_name_optionals_label($object->table_element_line, true);
+		            $line->fetch_optionals($line->id, $extralabels);
 		        }
 		    }
 		    
@@ -2179,23 +2179,23 @@ 
 	    $ThtmlData['data-qty']          = 0; //$line->qty;
 	    $ThtmlData['data-level']        = TSubtotal::getNiveau($line);
 	    
-	    if(TSubtotal::isTitle($line)){
+	    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';
 	    }
 	    
 	    
 	    // Change or add data  from hooks
-	    $parameters = array_replace($parameters , array(  'ThtmlData' => $ThtmlData )  );
+	    $parameters = array_replace($parameters, array('ThtmlData' => $ThtmlData));
 	    
 	    // hook 
-	    $reshook = $hookmanager->executeHooks('subtotalLineHtmlData',$parameters,$object,$action); // Note that $action and $object may have been modified by 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)
+	    if ($reshook > 0)
 	    {
 	        $ThtmlData = $hookmanager->resArray;
 	    }
@@ -2208,14 +2208,14 @@ 
 	function implodeHtmlData($ThtmlData = array())
 	{
 	    $data = '';
-	    foreach($ThtmlData as $k => $h )
+	    foreach ($ThtmlData as $k => $h)
 	    {
-	        if(is_array($h))
+	        if (is_array($h))
 	        {
 	            $h = json_encode($h);
 	        }
 	        
-	        $data .= $k . '="'.dol_htmlentities($h, ENT_QUOTES).'" ';
+	        $data .= $k.'="'.dol_htmlentities($h, ENT_QUOTES).'" ';
 	    }
 	    
 	    return $data;
@@ -2223,26 +2223,26 @@ 
 	
 	function _ajax_block_order_js($object)
 	{
-	    global $conf,$tagidfortablednd,$filepath,$langs;
+	    global $conf, $tagidfortablednd, $filepath, $langs;
 	    
 	    /*
 	     * this part of js is base on dolibarr htdocs/core/tpl/ajaxrow.tpl.php 
 	     * for compatibility reasons we don't use tableDnD but jquery sortable
 	     */
 	    
-	    $id=$object->id;
-	    $nboflines=(isset($object->lines)?count($object->lines):0);
-	    $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
+	    $id = $object->id;
+	    $nboflines = (isset($object->lines) ?count($object->lines) : 0);
+	    $forcereloadpage = empty($conf->global->MAIN_FORCE_RELOAD_PAGE) ? 0 : 1;
 	    
-	    $id=$object->id;
-	    $fk_element=$object->fk_element;
-	    $table_element_line=$object->table_element_line;
-	    $nboflines=(isset($object->lines)?count($object->lines):(empty($nboflines)?0:$nboflines));
-	    $tagidfortablednd=(empty($tagidfortablednd)?'tablelines':$tagidfortablednd);
-	    $filepath=(empty($filepath)?'':$filepath);
+	    $id = $object->id;
+	    $fk_element = $object->fk_element;
+	    $table_element_line = $object->table_element_line;
+	    $nboflines = (isset($object->lines) ?count($object->lines) : (empty($nboflines) ? 0 : $nboflines));
+	    $tagidfortablednd = (empty($tagidfortablednd) ? 'tablelines' : $tagidfortablednd);
+	    $filepath = (empty($filepath) ? '' : $filepath);
 	    
 	    
-	    if (GETPOST('action','aZ09') != 'editline' && $nboflines > 1)
+	    if (GETPOST('action', 'aZ09') != 'editline' && $nboflines > 1)
 	    {
 	        
 	        ?>
@@ -2260,7 +2260,7 @@ 
 				moveBlockCol.disableSelection(); // prevent selection
 <?php if ($object->statut == 0) { ?>
 				// apply some graphical stuff
-				moveBlockCol.css("background-image",'url(<?php echo dol_buildpath('subtotal/img/grip_all.png',2);  ?>)');
+				moveBlockCol.css("background-image",'url(<?php echo dol_buildpath('subtotal/img/grip_all.png', 2); ?>)');
 				moveBlockCol.css("background-repeat","no-repeat");
 				moveBlockCol.css("background-position","center center");
 				moveBlockCol.css("cursor","move");