ATM-Consulting / dolibarr_module_subtotal

class/actions_subtotal.class.php

Indentation +296 added lines, -296 removed lines

@@ -101,11 +101,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');
 		
@@ -120,10 +120,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) {
@@ -173,7 +173,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);
@@ -395,36 +395,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']][$object->id] ) ?  $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id] : 0;
-	            $hidedetails	= isset( $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id] ) ?  $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id] : 0;
+			{	
+				$hideInnerLines	= isset( $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id] ) ?  $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id] : 0;
+				$hidedetails	= isset( $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id] ) ?  $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id] : 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']][$object->id] ) ?  $_SESSION['subtotal_hideprices_'.$parameters['modulepart']][$object->id] : $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="hideprices">'.$langs->trans('SubTotalhidePrice').'</label>
 		     				<input type="checkbox" id="hideprices" name="hideprices" value="1" '.(( $hideprices ) ? 'checked="checked"' : '' ).' />
@@ -436,9 +436,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 ))
 				)
 				{
@@ -457,19 +457,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;
@@ -518,11 +518,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']))
 		) {
 			
@@ -601,20 +601,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';
@@ -622,9 +622,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';
@@ -632,9 +632,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';
@@ -659,17 +659,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') {
@@ -686,7 +686,7 @@ 
 				 */
 				else if($object->element=='invoice_supplier')
 				{
-				    $object->deleteline($idLine);
+					$object->deleteline($idLine);
 				}
 				/**
 				 * @var $object Propal
@@ -709,7 +709,7 @@ 
 				 */
 				else if($object->element=='order_supplier')
 				{
-				    $object->deleteline($idLine);
+					$object->deleteline($idLine);
 				}
 				/**
 				 * @var $object Facturerec
@@ -780,7 +780,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;
@@ -789,7 +789,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
@@ -868,17 +868,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);
 	}
@@ -910,7 +910,7 @@ 
 		if(method_exists('Closure','bind')) {
 			$pageBreakOriginalValue = $pdf->AcceptPageBreak();
 			$sweetsThief = function ($pdf) {
-		    		return $pdf->bMargin ;
+					return $pdf->bMargin ;
 			};
 			$sweetsThief = Closure::bind($sweetsThief, null, $pdf);
 	
@@ -973,11 +973,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;
@@ -1128,7 +1128,7 @@ 
 	}
 	
 	function pdf_getlinetotalexcltax($parameters=array(), &$object, &$action='') {
-	    global $conf, $hideprices, $hookmanager;
+		global $conf, $hideprices, $hookmanager;
 		
 		if(is_array($parameters)) $i = & $parameters['i'];
 		else $i = (int)$parameters;
@@ -1167,7 +1167,7 @@ 
 			}
 		}
 		if ((int)GETPOST('hideInnerLines') && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES)){
-		    $this->resprints = price($object->lines[$i]->total_ht);
+			$this->resprints = price($object->lines[$i]->total_ht);
 		}
 		
 		// Si la gestion C/NC est active et que je suis sur un ligne dont l'extrafield est coché
@@ -1296,7 +1296,7 @@ 
 	}
 	
 	function pdf_getlineupexcltax($parameters=array(), &$object, &$action='') {
-	    global $conf,$hideprices,$hookmanager;
+		global $conf,$hideprices,$hookmanager;
 
 		if(is_array($parameters)) $i = & $parameters['i'];
 		else $i = (int)$parameters;
@@ -1304,17 +1304,17 @@ 
 		if($this->isModSubtotalLine($parameters,$object) ) {
 			$this->resprints = ' ';
 
-            $line = $object->lines[$i];
+			$line = $object->lines[$i];
 
-            // On récupère les montants du bloc pour les afficher dans la ligne de sous-total
-            if(TSubtotal::isSubtotal($line)) {
-                $parentTitle = TSubtotal::getParentTitleOfLine($object, $i);
+			// On récupère les montants du bloc pour les afficher dans la ligne de sous-total
+			if(TSubtotal::isSubtotal($line)) {
+				$parentTitle = TSubtotal::getParentTitleOfLine($object, $i);
 
-                if(! empty($parentTitle->array_options['options_show_total_ht'])) {
-                    $TTotal = TSubtotal::getTotalBlockFromTitle($object, $parentTitle);
-                    $this->resprints = price($TTotal['total_subprice']);
-                }
-            }
+				if(! empty($parentTitle->array_options['options_show_total_ht'])) {
+					$TTotal = TSubtotal::getTotalBlockFromTitle($object, $parentTitle);
+					$this->resprints = price($TTotal['total_subprice']);
+				}
+			}
 		
 			if((float)DOL_VERSION<=3.6) {
 				return '';
@@ -1330,57 +1330,57 @@ 
 		(!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i]))
 		)
 		{
-		    // alors je dois vérifier si la méthode fait partie de la conf qui l'exclue
-		    if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
-		    {
-		        $this->resprints = ' ';
+			// alors je dois vérifier si la méthode fait partie de la conf qui l'exclue
+			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
+			{
+				$this->resprints = ' ';
 		        
-		        // currentcontext à modifier celon l'appel
-		        $params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlineupexcltax', 'currentcontext'=>'subtotal_hide_nc', 'i' => $i);
-		        return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
+				// currentcontext à modifier celon l'appel
+				$params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlineupexcltax', 'currentcontext'=>'subtotal_hide_nc', 'i' => $i);
+				return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
 		        
-		    }
+			}
 		}
 		// Cache le prix pour les lignes standards dolibarr qui sont dans un ensemble
 		else if (!empty($hideprices))
 		{
 		    
-		    // Check if a title exist for this line && if the title have subtotal
-		    $lineTitle = TSubtotal::getParentTitleOfLine($object, $i);
-		    if(TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
-		    {
+			// Check if a title exist for this line && if the title have subtotal
+			$lineTitle = TSubtotal::getParentTitleOfLine($object, $i);
+			if(TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
+			{
 		        
-		        $this->resprints = ' ';
+				$this->resprints = ' ';
 		        
-		        // currentcontext à modifier celon l'appel
-		        $params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlineupexcltax', 'currentcontext'=>'subtotal_hideprices', 'i' => $i);
-		        return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
-		    }
+				// currentcontext à modifier celon l'appel
+				$params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlineupexcltax', 'currentcontext'=>'subtotal_hideprices', 'i' => $i);
+				return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
+			}
 		}
 		
 		return 0;
 	}
 	
 	function pdf_getlineremisepercent($parameters=array(), &$object, &$action='') {
-	    global $conf,$hideprices,$hookmanager;
+		global $conf,$hideprices,$hookmanager;
 
-        if(is_array($parameters)) $i = & $parameters['i'];
-        else $i = (int) $parameters;
+		if(is_array($parameters)) $i = & $parameters['i'];
+		else $i = (int) $parameters;
 
 		if($this->isModSubtotalLine($parameters,$object) ) {
 			$this->resprints = ' ';
 
-            $line = $object->lines[$i];
+			$line = $object->lines[$i];
 
-            // Affichage de la remise 
-            if(TSubtotal::isSubtotal($line)) {
-                $parentTitle = TSubtotal::getParentTitleOfLine($object, $i);
+			// Affichage de la remise 
+			if(TSubtotal::isSubtotal($line)) {
+				$parentTitle = TSubtotal::getParentTitleOfLine($object, $i);
 
-                if(! empty($parentTitle->array_options['options_show_reduc'])) {
-                    $TTotal = TSubtotal::getTotalBlockFromTitle($object, $parentTitle);
-                    $this->resprints = price($TTotal['total_ht'] / $TTotal['total_subprice']*100, 0, '', 1, 2, 2).'%';
-                }
-            }
+				if(! empty($parentTitle->array_options['options_show_reduc'])) {
+					$TTotal = TSubtotal::getTotalBlockFromTitle($object, $parentTitle);
+					$this->resprints = price($TTotal['total_ht'] / $TTotal['total_subprice']*100, 0, '', 1, 2, 2).'%';
+				}
+			}
 		
 			if((float)DOL_VERSION<=3.6) {
 				return '';
@@ -1390,15 +1390,15 @@ 
 			}
 		}
 		elseif (!empty($hideprices)
-		        || (!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;
-		        }
-		    }
+				|| (!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;
+				}
+			}
 		
 		return 0;
 	}
@@ -1434,7 +1434,7 @@ 
 	}
 	
 	function pdf_getlinevatrate($parameters=array(), &$object, &$action='') {
-	    global $conf,$hideprices,$hookmanager;
+		global $conf,$hideprices,$hookmanager;
 	    
 		if($this->isModSubtotalLine($parameters,$object) ){
 			$this->resprints = ' ';
@@ -1459,31 +1459,31 @@ 
 		(!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i]))
 		)
 		{
-		    // alors je dois vérifier si la méthode fait partie de la conf qui l'exclue
-		    if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
-		    {
-		        $this->resprints = ' ';
+			// alors je dois vérifier si la méthode fait partie de la conf qui l'exclue
+			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
+			{
+				$this->resprints = ' ';
 		        
-		        // currentcontext à modifier celon l'appel
-		        $params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlinevatrate', 'currentcontext'=>'subtotal_hide_nc', 'i' => $i);
-		        return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
-		    }
+				// currentcontext à modifier celon l'appel
+				$params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlinevatrate', 'currentcontext'=>'subtotal_hide_nc', 'i' => $i);
+				return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
+			}
 		}
 		// Cache le prix pour les lignes standards dolibarr qui sont dans un ensemble
 		else if (!empty($hideprices))
 		{
 		    
-		    // Check if a title exist for this line && if the title have subtotal
-		    $lineTitle = TSubtotal::getParentTitleOfLine($object, $i);
-		    if(TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
-		    {
+			// Check if a title exist for this line && if the title have subtotal
+			$lineTitle = TSubtotal::getParentTitleOfLine($object, $i);
+			if(TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
+			{
 		        
-		        $this->resprints = ' ';
+				$this->resprints = ' ';
 		        
-		        // currentcontext à modifier celon l'appel
-		        $params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlinevatrate', 'currentcontext'=>'subtotal_hideprices', 'i' => $i);
-		        return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
-		    }
+				// currentcontext à modifier celon l'appel
+				$params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlinevatrate', 'currentcontext'=>'subtotal_hideprices', 'i' => $i);
+				return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
+			}
 		}
 		
 		return 0;
@@ -1607,24 +1607,24 @@ 
 		
 		$this->add_numerotation($object);	
 		
-        foreach($object->lines as $k => &$l) {
-            if(TSubtotal::isSubtotal($l)) {
-                $parentTitle = TSubtotal::getParentTitleOfLine($object, $k);
-                if(! empty($parentTitle->id) && ! empty($parentTitle->array_options['options_show_total_ht'])) {
-                    $l->remise_percent = 100;    // Affichage de la réduction sur la ligne de sous-total
-                }
-            }
-        }
+		foreach($object->lines as $k => &$l) {
+			if(TSubtotal::isSubtotal($l)) {
+				$parentTitle = TSubtotal::getParentTitleOfLine($object, $k);
+				if(! empty($parentTitle->id) && ! empty($parentTitle->array_options['options_show_total_ht'])) {
+					$l->remise_percent = 100;    // Affichage de la réduction sur la ligne de sous-total
+				}
+			}
+		}
 
 		$hideInnerLines = (int)GETPOST('hideInnerLines');
 		$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) 
 			{
@@ -1663,48 +1663,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; 
+						}
+					}
 				    
 					
 				}
@@ -1729,20 +1729,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;
@@ -1754,7 +1754,7 @@ 
 				$this->resprints = '';
 				return 0;
 			}
-	    }
+		}
 		
 		return 0;
 	}
@@ -1917,18 +1917,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';
 			
@@ -1977,7 +1977,7 @@ 
 			//var_dump($line);
             
 			// HTML 5 data for js
-            $data = $this->_getHtmlData($parameters, $object, $action, $hookmanager);
+			$data = $this->_getHtmlData($parameters, $object, $action, $hookmanager);
             
 			
 			?>
@@ -2039,8 +2039,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) {
@@ -2074,38 +2074,38 @@ 
 						
 
 						echo '<div class="subtotal_underline" style="margin-left:24px; line-height: 25px;">';
-                        echo '<div>';
-                        echo '<input style="vertical-align:sub;"  type="checkbox" name="line-pagebreak" id="subtotal-pagebreak" value="8" '.(($line->info_bits > 0) ? 'checked="checked"' : '') .' />&nbsp;';
-                        echo '<label for="subtotal-pagebreak">'.$langs->trans('AddBreakPageBefore').'</label>';
-                        echo '</div>';
-
-                        if (TSubtotal::isTitle($line))
-                        {
-                            $form = new Form($db);
-                            echo '<div>';
-                            echo '<label for="subtotal_tva_tx">'.$form->textwithpicto($langs->trans('subtotal_apply_default_tva'), $langs->trans('subtotal_apply_default_tva_help')).'</label>';
-                            echo '<select id="subtotal_tva_tx" name="subtotal_tva_tx" class="flat"><option selected="selected" value="">-</option>';
-                            if (empty($readonlyForSituation)) echo str_replace('selected', '', $form->load_tva('subtotal_tva_tx', '', $parameters['seller'], $parameters['buyer'], 0, 0, '', true));
-                            echo '</select>';
-                            echo '</div>';
-
-                            if (!empty($conf->global->INVOICE_USE_SITUATION) && $object->element == 'facture' && $object->type == Facture::TYPE_SITUATION)
-                            {
-                                echo '<div>';
-                                echo '<label for="subtotal_progress">'.$langs->trans('subtotal_apply_progress').'</label> <input id="subtotal_progress" name="subtotal_progress" value="" size="1" />%';
-                                echo '</div>';
-                            }
-                            echo '<div>';
-                            echo '<input style="vertical-align:sub;"  type="checkbox" name="line-showTotalHT" id="subtotal-showTotalHT" value="9" '.(($line->array_options['options_show_total_ht'] > 0) ? 'checked="checked"' : '') .' />&nbsp;';
-                            echo '<label for="subtotal-showTotalHT">'.$langs->trans('ShowTotalHTOnSubtotalBlock').'</label>';
-                            echo '</div>';
-
-                            echo '<div>';
-                            echo '<input style="vertical-align:sub;"  type="checkbox" name="line-showReduc" id="subtotal-showReduc" value="1" '.(($line->array_options['options_show_reduc'] > 0) ? 'checked="checked"' : '') .' />&nbsp;';
-                            echo '<label for="subtotal-showReduc">'.$langs->trans('ShowReducOnSubtotalBlock').'</label>';
-                            echo '</div>';
-                        }
-                        else if ($isFreeText) echo TSubtotal::getFreeTextHtml($line, (bool) $readonlyForSituation);
+						echo '<div>';
+						echo '<input style="vertical-align:sub;"  type="checkbox" name="line-pagebreak" id="subtotal-pagebreak" value="8" '.(($line->info_bits > 0) ? 'checked="checked"' : '') .' />&nbsp;';
+						echo '<label for="subtotal-pagebreak">'.$langs->trans('AddBreakPageBefore').'</label>';
+						echo '</div>';
+
+						if (TSubtotal::isTitle($line))
+						{
+							$form = new Form($db);
+							echo '<div>';
+							echo '<label for="subtotal_tva_tx">'.$form->textwithpicto($langs->trans('subtotal_apply_default_tva'), $langs->trans('subtotal_apply_default_tva_help')).'</label>';
+							echo '<select id="subtotal_tva_tx" name="subtotal_tva_tx" class="flat"><option selected="selected" value="">-</option>';
+							if (empty($readonlyForSituation)) echo str_replace('selected', '', $form->load_tva('subtotal_tva_tx', '', $parameters['seller'], $parameters['buyer'], 0, 0, '', true));
+							echo '</select>';
+							echo '</div>';
+
+							if (!empty($conf->global->INVOICE_USE_SITUATION) && $object->element == 'facture' && $object->type == Facture::TYPE_SITUATION)
+							{
+								echo '<div>';
+								echo '<label for="subtotal_progress">'.$langs->trans('subtotal_apply_progress').'</label> <input id="subtotal_progress" name="subtotal_progress" value="" size="1" />%';
+								echo '</div>';
+							}
+							echo '<div>';
+							echo '<input style="vertical-align:sub;"  type="checkbox" name="line-showTotalHT" id="subtotal-showTotalHT" value="9" '.(($line->array_options['options_show_total_ht'] > 0) ? 'checked="checked"' : '') .' />&nbsp;';
+							echo '<label for="subtotal-showTotalHT">'.$langs->trans('ShowTotalHTOnSubtotalBlock').'</label>';
+							echo '</div>';
+
+							echo '<div>';
+							echo '<input style="vertical-align:sub;"  type="checkbox" name="line-showReduc" id="subtotal-showReduc" value="1" '.(($line->array_options['options_show_reduc'] > 0) ? 'checked="checked"' : '') .' />&nbsp;';
+							echo '<label for="subtotal-showReduc">'.$langs->trans('ShowReducOnSubtotalBlock').'</label>';
+							echo '</div>';
+						}
+						else if ($isFreeText) echo TSubtotal::getFreeTextHtml($line, (bool) $readonlyForSituation);
 						echo '</div>';
 
 						if($line->qty<10) {
@@ -2373,17 +2373,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)
@@ -2474,80 +2474,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">

admin/subtotal_setup.php

Indentation +13 added lines, -13 removed lines

@@ -28,7 +28,7 @@ 
 // Dolibarr environment
 $res = @include("../../main.inc.php"); // From htdocs directory
 if (! $res) {
-    $res = @include("../../../main.inc.php"); // From "custom" directory
+	$res = @include("../../../main.inc.php"); // From "custom" directory
 }
 
 // Libraries
@@ -39,7 +39,7 @@ 
 
 // Access control
 if (! $user->admin) {
-    accessforbidden();
+	accessforbidden();
 }
 
 // Parameters
@@ -91,11 +91,11 @@ 
 // Configuration header
 $head = subtotalAdminPrepareHead();
 dol_fiche_head(
-    $head,
-    'settings',
-    $langs->trans("Module104777Name"),
-    0,
-    "subtotal@subtotal"
+	$head,
+	'settings',
+	$langs->trans("Module104777Name"),
+	0,
+	"subtotal@subtotal"
 );
 
 showParameters();
@@ -259,12 +259,12 @@ 
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="set_SUBTOTAL_TFIELD_TO_KEEP_WITH_NC">';
 		$TField = array(
-		    'pdf_getlineqty' => $langs->trans('Qty'), 
-		    'pdf_getlinevatrate' => $langs->trans('VAT'), 
-		    'pdf_getlineupexcltax' => $langs->trans('PriceUHT'), 
-		    'pdf_getlinetotalexcltax' => $langs->trans('TotalHT'), 
-		    'pdf_getlineunit' => $langs->trans('Unit'),
-		    'pdf_getlineremisepercent' => $langs->trans('Discount')
+			'pdf_getlineqty' => $langs->trans('Qty'), 
+			'pdf_getlinevatrate' => $langs->trans('VAT'), 
+			'pdf_getlineupexcltax' => $langs->trans('PriceUHT'), 
+			'pdf_getlinetotalexcltax' => $langs->trans('TotalHT'), 
+			'pdf_getlineunit' => $langs->trans('Unit'),
+			'pdf_getlineremisepercent' => $langs->trans('Discount')
 		);
 		print $html->multiselectarray('SUBTOTAL_TFIELD_TO_KEEP_WITH_NC', $TField, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC), 0, 0, '', 0, 0, 'style="min-width:100px"');
 		print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';