ATM-Consulting / dolibarr_module_subtotal

class/subtotal.class.php

Indentation +60 added lines, -60 removed lines

@@ -41,9 +41,9 @@ 
 			 * @var $object Facture fournisseur
 			 */
 			else if($object->element=='invoice_supplier') {
-			    $object->special_code = TSubtotal::$module_number;
-                if( (float)DOL_VERSION < 6 ) $rang = $object->line_max() + 1;
-			    $res = $object->addline($label,0,0,0,0,$qty,0,0,'','',0,0,'HT',9,$rang);
+				$object->special_code = TSubtotal::$module_number;
+				if( (float)DOL_VERSION < 6 ) $rang = $object->line_max() + 1;
+				$res = $object->addline($label,0,0,0,0,$qty,0,0,'','',0,0,'HT',9,$rang);
 			}
 			/**
 			 * @var $object Propal
@@ -62,8 +62,8 @@ 
 			 * @var $object Commande fournisseur
 			 */
 			else if($object->element=='order_supplier') {
-			    $object->special_code = TSubtotal::$module_number;
-			    $res = $object->addline($label, 0,$qty,0,0,0,0,0,'',0,'HT', 0, 9);
+				$object->special_code = TSubtotal::$module_number;
+				$res = $object->addline($label, 0,$qty,0,0,0,0,0,'',0,'HT', 0, 9);
 			}
 			/**
 			 * @var $object Facturerec
@@ -323,8 +323,8 @@ 
 	{
 		if (empty($fk_commande)) return false;
 
-        $table = 'commandedet';
-        if ($supplier) $table = 'commande_fournisseurdet';
+		$table = 'commandedet';
+		if ($supplier) $table = 'commande_fournisseurdet';
 
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$table.' WHERE fk_commande = '.$fk_commande.' ORDER BY rang DESC LIMIT 1';
 		$resql = $db->query($sql);
@@ -376,10 +376,10 @@ 
 	
 	public static function isSubtotal(&$line, $level=-1)
 	{
-	    $res = $line->special_code == self::$module_number && $line->product_type == 9 && $line->qty >= 90;
-	    if($res && $level > -1) {
-	        return self::getNiveau($line) == $level;
-	    } else return $res;
+		$res = $line->special_code == self::$module_number && $line->product_type == 9 && $line->qty >= 90;
+		if($res && $level > -1) {
+			return self::getNiveau($line) == $level;
+		} else return $res;
 	}
 	
 	public static function isFreeText(&$line)
@@ -416,29 +416,29 @@ 
 		$createRight = $user->rights->{$object->element}->creer;
 		if($object->element == 'facturerec' )
 		{
-		    $object->statut = 0; // hack for facture rec
-		    $createRight = $user->rights->facture->creer;
+			$object->statut = 0; // hack for facture rec
+			$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 && (!empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK) || !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_LINE)))
 		{
 			dol_include_once('/subtotal/lib/subtotal.lib.php');
 
-            if(!empty($object->lines)) {
-                foreach($object->lines as $line) {
-                    if($line->id == $lineid) $duplicateLine = $line;
-                }
-            }
-            if(!empty($duplicateLine) && !self::isModSubtotalLine($duplicateLine)) $TLine = array($duplicateLine);
-            else $TLine = self::getLinesFromTitleId($object, $lineid, $withBlockLine);
+			if(!empty($object->lines)) {
+				foreach($object->lines as $line) {
+					if($line->id == $lineid) $duplicateLine = $line;
+				}
+			}
+			if(!empty($duplicateLine) && !self::isModSubtotalLine($duplicateLine)) $TLine = array($duplicateLine);
+			else $TLine = self::getLinesFromTitleId($object, $lineid, $withBlockLine);
 
 			if (!empty($TLine))
 			{
@@ -456,8 +456,8 @@ 
 							break;
 							
 						case 'supplier_proposal':
-						    $res = $object->addline($line->desc, $line->subprice, $line->qty, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->fk_product, $line->remise_percent, 'HT', 0, $line->info_bits, $line->product_type, -1, $line->special_code, 0, 0, $line->pa_ht, $line->label, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->origin, $line->origin_id);
-						    break;
+							$res = $object->addline($line->desc, $line->subprice, $line->qty, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->fk_product, $line->remise_percent, 'HT', 0, $line->info_bits, $line->product_type, -1, $line->special_code, 0, 0, $line->pa_ht, $line->label, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->origin, $line->origin_id);
+							break;
 							
 						case 'commande':
 							//$desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='',$array_options=0, $fk_unit=null, $origin='', $origin_id=0)
@@ -465,10 +465,10 @@ 
 							break;
 							
 						case 'order_supplier':
-						    $object->line = $line;
-						    $object->line->fk_commande = $object->id;
-						    $object->line->rang = $object->line_max() +1;
-						    $res = $object->line->insert(1);
+							$object->line = $line;
+							$object->line->fk_commande = $object->id;
+							$object->line->rang = $object->line_max() +1;
+							$res = $object->line->insert(1);
 							break;
 							
 						case 'facture':
@@ -521,8 +521,8 @@ 
 					$object->db->commit();
 					foreach ($TLineAdded as &$line)
 					{
-					    // ça peut paraitre non optimisé de déclancher la fonction sur toutes les lignes mais ceci est nécessaire pour réappliquer l'état exact de chaque ligne
-					    _updateLineNC($object->element, $object->id, $line->id, $line->array_options['options_subtotal_nc']);
+						// ça peut paraitre non optimisé de déclancher la fonction sur toutes les lignes mais ceci est nécessaire pour réappliquer l'état exact de chaque ligne
+						_updateLineNC($object->element, $object->id, $line->id, $line->array_options['options_subtotal_nc']);
 					}
 					return count($TLineAdded);
 				}
@@ -596,33 +596,33 @@ 
 		
 		switch ($object->element) 
 		{
-		    case 'propal':
-		        $res = $object->updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $desc, $price_base_type, $info_bits, $special_code, $fk_parent_line, $skip_update_total, $fk_fournprice, $pa_ht, $label, $type, $date_start, $date_end, $array_options, $fk_unit, 0, $notrigger);
-		        break;
+			case 'propal':
+				$res = $object->updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $desc, $price_base_type, $info_bits, $special_code, $fk_parent_line, $skip_update_total, $fk_fournprice, $pa_ht, $label, $type, $date_start, $date_end, $array_options, $fk_unit, 0, $notrigger);
+				break;
 		        
-		    case 'supplier_proposal':
-		        $res = $object->updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $desc, $price_base_type, $info_bits, $special_code, $fk_parent_line, $skip_update_total, $fk_fournprice, $pa_ht, $label, $type, $array_options,'', $fk_unit);
-		        break;
+			case 'supplier_proposal':
+				$res = $object->updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $desc, $price_base_type, $info_bits, $special_code, $fk_parent_line, $skip_update_total, $fk_fournprice, $pa_ht, $label, $type, $array_options,'', $fk_unit);
+				break;
 		        
 			case 'commande':
 				$res = $object->updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $date_start, $date_end, $type, $fk_parent_line, $skip_update_total, $fk_fournprice, $pa_ht, $label, $special_code, $array_options, $fk_unit, 0, $notrigger);
 				break;
 				
 			case 'order_supplier':
-			    $object->special_code = SELF::$module_number;
-			    if (empty($desc)) $desc = $label;
-			    $res = $object->updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type, 0, $date_start, $date_end, $array_options, $fk_unit);
-			    break;
+				$object->special_code = SELF::$module_number;
+				if (empty($desc)) $desc = $label;
+				$res = $object->updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type, 0, $date_start, $date_end, $array_options, $fk_unit);
+				break;
 			
 			case 'facture':
 				$res = $object->updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type, $fk_parent_line, $skip_update_total, $fk_fournprice, $pa_ht, $label, $special_code, $array_options, $situation_percent, $fk_unit, 0, $notrigger);
 				break;
 				
 			case 'invoice_supplier':
-			    $object->special_code = SELF::$module_number;
-			    if (empty($desc)) $desc = $label;
-			    $res = $object->updateline($rowid, $desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, 0, $price_base_type, $info_bits, $type, $remise_percent, 0, $date_start, $date_end, $array_options, $fk_unit);
-			    break;
+				$object->special_code = SELF::$module_number;
+				if (empty($desc)) $desc = $label;
+				$res = $object->updateline($rowid, $desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, 0, $price_base_type, $info_bits, $type, $remise_percent, 0, $date_start, $date_end, $array_options, $fk_unit);
+				break;
 				
 			case 'facturerec':
 				// Add extrafields and get rang
@@ -1013,8 +1013,8 @@ 
 		{
 			if (is_readable($logo))
 			{
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $objmarge->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+				$height=pdf_getHeightForLogo($logo);
+				$pdf->Image($logo, $objmarge->marge_gauche, $posy, 0, $height);	// width=0 (auto)
 			}
 			else
 			{
@@ -1205,13 +1205,13 @@ 
 	 * @param	int		$hidebottom		Hide bottom
 	 * @return	void
 	 */
-    private static function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0)
-    {
-	    if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y);
-	    $pdf->line($x+$l, $y, $x+$l, $y+$h);
-	    if (empty($hidebottom)) $pdf->line($x+$l, $y+$h, $x, $y+$h);
-	    $pdf->line($x, $y+$h, $x, $y);
-    }
+	private static function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0)
+	{
+		if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y);
+		$pdf->line($x+$l, $y, $x+$l, $y+$h);
+		if (empty($hidebottom)) $pdf->line($x+$l, $y+$h, $x, $y+$h);
+		$pdf->line($x, $y+$h, $x, $y);
+	}
 	
 	
 	public static function concat(&$outputlangs, $files, $fileoutput='')
@@ -1221,14 +1221,14 @@ 
 		if (empty($fileoutput)) $fileoutput = $file[0];
 		
 		$pdf=pdf_getInstance();
-        if (class_exists('TCPDF'))
-        {
-            $pdf->setPrintHeader(false);
-            $pdf->setPrintFooter(false);
-        }
-        $pdf->SetFont(pdf_getPDFFont($outputlangs));
+		if (class_exists('TCPDF'))
+		{
+			$pdf->setPrintHeader(false);
+			$pdf->setPrintFooter(false);
+		}
+		$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-        if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
 		
 		foreach($files as $file)

Spacing +197 added lines, -197 removed lines

@@ -5,30 +5,30 @@ 
 	
 	static $module_number = 104777;
 	
-	static function addSubTotalLine(&$object, $label, $qty, $rang=-1) {
+	static function addSubTotalLine(&$object, $label, $qty, $rang = -1) {
 		
 		$res = 0;
 		
-		if( (float)DOL_VERSION <= 3.4 ) {
+		if ((float) DOL_VERSION <= 3.4) {
 			/**
 			 * @var $object Facture
 			 */
-			if($object->element=='facture') $res =  $object->addline($object->id, $label, 0,$qty,0,0,0,0,0,'','',0,0,'','HT',0,9,-1, TSubtotal::$module_number);
+			if ($object->element == 'facture') $res = $object->addline($object->id, $label, 0, $qty, 0, 0, 0, 0, 0, '', '', 0, 0, '', 'HT', 0, 9, -1, TSubtotal::$module_number);
 			/**
 			 * @var $object Propal
 			 */
-			else if($object->element=='propal') $res =  $object->addline($object->id,$label, 0,$qty,0,0,0,0,0,'HT',0,0,9,-1, TSubtotal::$module_number);
+			else if ($object->element == 'propal') $res = $object->addline($object->id, $label, 0, $qty, 0, 0, 0, 0, 0, 'HT', 0, 0, 9, -1, TSubtotal::$module_number);
 			/**
 			 * @var $object Commande
 			 */
-			else if($object->element=='commande') $res =  $object->addline($object->id,$label, 0,$qty,0,0,0,0,0,0,0,'HT',0,'','',9,-1, TSubtotal::$module_number);
+			else if ($object->element == 'commande') $res = $object->addline($object->id, $label, 0, $qty, 0, 0, 0, 0, 0, 0, 0, 'HT', 0, '', '', 9, -1, TSubtotal::$module_number);
 
 		}
 		else {
 			$desc = '';
 			
-			$TNotElements = array ('invoice_supplier', 'order_supplier');
-			if ((float) DOL_VERSION < 6  || $qty==50 && !in_array($object->element, $TNotElements) ) {
+			$TNotElements = array('invoice_supplier', 'order_supplier');
+			if ((float) DOL_VERSION < 6 || $qty == 50 && !in_array($object->element, $TNotElements)) {
 				$desc = $label;
 				$label = '';
 			}
@@ -36,39 +36,39 @@ 
 			/**
 			 * @var $object Facture
 			 */
-			if($object->element=='facture') $res =  $object->addline($desc, 0,$qty,0,0,0,0,0,'','',0,0,'','HT',0,9,$rang, TSubtotal::$module_number, '', 0, 0, null, 0, $label);
+			if ($object->element == 'facture') $res = $object->addline($desc, 0, $qty, 0, 0, 0, 0, 0, '', '', 0, 0, '', 'HT', 0, 9, $rang, TSubtotal::$module_number, '', 0, 0, null, 0, $label);
 			/**
 			 * @var $object Facture fournisseur
 			 */
-			else if($object->element=='invoice_supplier') {
+			else if ($object->element == 'invoice_supplier') {
 			    $object->special_code = TSubtotal::$module_number;
-                if( (float)DOL_VERSION < 6 ) $rang = $object->line_max() + 1;
-			    $res = $object->addline($label,0,0,0,0,$qty,0,0,'','',0,0,'HT',9,$rang);
+                if ((float) DOL_VERSION < 6) $rang = $object->line_max() + 1;
+			    $res = $object->addline($label, 0, 0, 0, 0, $qty, 0, 0, '', '', 0, 0, 'HT', 9, $rang);
 			}
 			/**
 			 * @var $object Propal
 			 */
-			else if($object->element=='propal') $res = $object->addline($desc, 0,$qty,0,0,0,0,0,'HT',0,0,9,$rang, TSubtotal::$module_number, 0, 0, 0, $label);
+			else if ($object->element == 'propal') $res = $object->addline($desc, 0, $qty, 0, 0, 0, 0, 0, 'HT', 0, 0, 9, $rang, TSubtotal::$module_number, 0, 0, 0, $label);
 			/**
 			 * @var $object Propal Fournisseur
 			 */
-			else if($object->element=='supplier_proposal') $res = $object->addline($desc, 0,$qty,0,0,0,0,0,'HT',0,0,9,$rang, TSubtotal::$module_number, 0, 0, 0, $label);
+			else if ($object->element == 'supplier_proposal') $res = $object->addline($desc, 0, $qty, 0, 0, 0, 0, 0, 'HT', 0, 0, 9, $rang, TSubtotal::$module_number, 0, 0, 0, $label);
 			
 			/**
 			 * @var $object Commande
 			 */
-			else if($object->element=='commande') $res =  $object->addline($desc, 0,$qty,0,0,0,0,0,0,0,'HT',0,'','',9,$rang, TSubtotal::$module_number, 0, null, 0, $label);
+			else if ($object->element == 'commande') $res = $object->addline($desc, 0, $qty, 0, 0, 0, 0, 0, 0, 0, 'HT', 0, '', '', 9, $rang, TSubtotal::$module_number, 0, null, 0, $label);
 			/**
 			 * @var $object Commande fournisseur
 			 */
-			else if($object->element=='order_supplier') {
+			else if ($object->element == 'order_supplier') {
 			    $object->special_code = TSubtotal::$module_number;
-			    $res = $object->addline($label, 0,$qty,0,0,0,0,0,'',0,'HT', 0, 9);
+			    $res = $object->addline($label, 0, $qty, 0, 0, 0, 0, 0, '', 0, 'HT', 0, 9);
 			}
 			/**
 			 * @var $object Facturerec
 			 */
-			else if($object->element=='facturerec') $res =  $object->addline($desc, 0,$qty, 0, 0, 0, 0, 0, 'HT', 0, '', 0, 9, $rang, TSubtotal::$module_number,$label); 
+			else if ($object->element == 'facturerec') $res = $object->addline($desc, 0, $qty, 0, 0, 0, 0, 0, 'HT', 0, '', 0, 9, $rang, TSubtotal::$module_number, $label); 
 			
 		}
 	
@@ -79,20 +79,20 @@ 
 
 	public static function generateDoc(&$object)
 	{
-		global $conf,$langs,$db;
+		global $conf, $langs, $db;
 		
 		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 		{
-			$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
-			$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
-			$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
+			$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
+			$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
+			$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
 			
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = GETPOST('lang_id', 'alpha');
-			if (! empty($conf->global->MAIN_MULTILANGS) && empty($newlang))
+			if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang))
 				$newlang = !empty($object->client) ? $object->client->default_lang : $object->thirdparty->default_lang;
-			if (! empty($newlang)) {
+			if (!empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
 			}
@@ -106,7 +106,7 @@ 
 			}
 			else
 			{
-				if ($object->element!= 'facturerec') $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				if ($object->element != 'facturerec') $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
 	}
@@ -118,11 +118,11 @@ 
 	 * @param type $rang_start
 	 * @param type $move_to
 	 */
-	public static function updateRang(&$object, $rang_start, $move_to=1)
+	public static function updateRang(&$object, $rang_start, $move_to = 1)
 	{
 		if (!class_exists('GenericObject')) require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 		
-		$row=new GenericObject($object->db);
+		$row = new GenericObject($object->db);
 		$row->table_element_line = $object->table_element_line;
 		$row->fk_element = $object->fk_element;
 		$row->id = $object->id;
@@ -131,7 +131,7 @@ 
 		{
 			if ($line->rang < $rang_start) continue;
 			
-			$row->updateRangOfLine($line->id, $line->rang+$move_to);
+			$row->updateRangOfLine($line->id, $line->rang + $move_to);
 		}
 	}
 	
@@ -160,7 +160,7 @@ 
 			{
 				if ($rang_to_add != -1) self::updateRang($object, $rang_to_add);
 				
-				self::addSubTotalLine($object, $langs->trans('SubTotal'), 100-$title_niveau, $rang_to_add);
+				self::addSubTotalLine($object, $langs->trans('SubTotal'), 100 - $title_niveau, $rang_to_add);
 				
 				$object->lines[] = $object->line; // ajout de la ligne dans le tableau de ligne (Dolibarr ne le fait pas)
 				if ($rang_to_add != -1) 
@@ -172,14 +172,14 @@ 
 		}
 	}
 	
-	public static function addTitle(&$object, $label, $level, $rang=-1)
+	public static function addTitle(&$object, $label, $level, $rang = -1)
 	{
 		self::addSubTotalLine($object, $label, $level, $rang);
 	}
 	
-	public static function addTotal(&$object, $label, $level, $rang=-1)
+	public static function addTotal(&$object, $label, $level, $rang = -1)
 	{
-		self::addSubTotalLine($object, $label, (100-$level), $rang);
+		self::addSubTotalLine($object, $label, (100 - $level), $rang);
 	}
 
 	/**
@@ -190,7 +190,7 @@ 
 	 * 
 	 * @return array
 	 */
-	public static function getAllTitleWithoutTotalFromDocument(&$object, $get_block_total=false)
+	public static function getAllTitleWithoutTotalFromDocument(&$object, $get_block_total = false)
 	{
 		$TTitle = self::getAllTitleFromDocument($object, $get_block_total);
 		
@@ -211,7 +211,7 @@ 
 	 * @param boolean								$return_rang_on_false	si true alors renvoi le rang où devrait ce trouver le sous-total
 	 * @return boolean
 	 */
-	public static function titleHasTotalLine(&$object, &$title_line, $strict_mode=false, $return_rang_on_false=false)
+	public static function titleHasTotalLine(&$object, &$title_line, $strict_mode = false, $return_rang_on_false = false)
 	{
 		if (empty($object->lines) || !is_array($object->lines)) return false;
 		
@@ -237,7 +237,7 @@ 
 		return ($return_rang_on_false) ? -1 : false;
 	}
 	
-	public static function getAllTitleFromDocument(&$object, $get_block_total=false)
+	public static function getAllTitleFromDocument(&$object, $get_block_total = false)
 	{
 		$TRes = array();
 		if (!empty($object->lines))
@@ -365,19 +365,19 @@ 
 		return false;
 	}
 	
-	public static function isTitle(&$line, $level=-1)
+	public static function isTitle(&$line, $level = -1)
 	{
 		$res = $line->special_code == self::$module_number && $line->product_type == 9 && $line->qty <= 9;
-		if($res && $level > -1) {
+		if ($res && $level > -1) {
 			return $line->qty == $level;
 		} else return $res;
 		
 	}
 	
-	public static function isSubtotal(&$line, $level=-1)
+	public static function isSubtotal(&$line, $level = -1)
 	{
 	    $res = $line->special_code == self::$module_number && $line->product_type == 9 && $line->qty >= 90;
-	    if($res && $level > -1) {
+	    if ($res && $level > -1) {
 	        return self::getNiveau($line) == $level;
 	    } else return $res;
 	}
@@ -392,52 +392,52 @@ 
 		return self::isTitle($line) || self::isSubtotal($line) || self::isFreeText($line);
 	}
 
-	public static function getFreeTextHtml(&$line, $readonly=0)
+	public static function getFreeTextHtml(&$line, $readonly = 0)
 	{
 		global $conf;
 		
 		// Copie du fichier "objectline_edit.tpl.php"
 		// editeur wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$nbrows=ROWS_2;
-		if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-		$enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
-		$toolbarname='dolibarr_details';
-		if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes';
-		$text = !empty($line->description)?$line->description:$line->label;
-		$doleditor=new DolEditor('line-description',$text,'',164,$toolbarname,'',false,true,$enable,$nbrows,'98%', $readonly);
+		$nbrows = ROWS_2;
+		if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
+		$enable = (isset($conf->global->FCKEDITOR_ENABLE_DETAILS) ? $conf->global->FCKEDITOR_ENABLE_DETAILS : 0);
+		$toolbarname = 'dolibarr_details';
+		if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname = 'dolibarr_notes';
+		$text = !empty($line->description) ? $line->description : $line->label;
+		$doleditor = new DolEditor('line-description', $text, '', 164, $toolbarname, '', false, true, $enable, $nbrows, '98%', $readonly);
 		return $doleditor->Create(1);
 	}
 	
-	public static function duplicateLines(&$object, $lineid, $withBlockLine=false)
+	public static function duplicateLines(&$object, $lineid, $withBlockLine = false)
 	{
-		global $db,$user,$conf;
+		global $db, $user, $conf;
 
 		$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 && (!empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK) || !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_LINE)))
+		if ($object->statut == 0 && $createRight && (!empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK) || !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_LINE)))
 		{
 			dol_include_once('/subtotal/lib/subtotal.lib.php');
 
-            if(!empty($object->lines)) {
-                foreach($object->lines as $line) {
-                    if($line->id == $lineid) $duplicateLine = $line;
+            if (!empty($object->lines)) {
+                foreach ($object->lines as $line) {
+                    if ($line->id == $lineid) $duplicateLine = $line;
                 }
             }
-            if(!empty($duplicateLine) && !self::isModSubtotalLine($duplicateLine)) $TLine = array($duplicateLine);
+            if (!empty($duplicateLine) && !self::isModSubtotalLine($duplicateLine)) $TLine = array($duplicateLine);
             else $TLine = self::getLinesFromTitleId($object, $lineid, $withBlockLine);
 
 			if (!empty($TLine))
@@ -467,7 +467,7 @@ 
 						case 'order_supplier':
 						    $object->line = $line;
 						    $object->line->fk_commande = $object->id;
-						    $object->line->rang = $object->line_max() +1;
+						    $object->line->rang = $object->line_max() + 1;
 						    $res = $object->line->insert(1);
 							break;
 							
@@ -507,7 +507,7 @@ 
 					{
 						$object->line_from = $line;
 						// Call trigger
-						$result=$object->call_trigger('LINE_DUPLICATE',$user); // $object->line
+						$result = $object->call_trigger('LINE_DUPLICATE', $user); // $object->line
 						if ($result < 0)
 						{
 							$object->db->rollback();
@@ -537,7 +537,7 @@ 
 		}
 	}
 	
-	public static function getLinesFromTitle(&$object, $key_trad, $level=1, $under_title='', $withBlockLine=false, $key_is_id=false)
+	public static function getLinesFromTitle(&$object, $key_trad, $level = 1, $under_title = '', $withBlockLine = false, $key_is_id = false)
 	{
 		global $langs;
 		
@@ -549,17 +549,17 @@ 
 		
 		$TLine = array();
 		$add_line = false;
-		$under_title_found=false;
+		$under_title_found = false;
 		
 		foreach ($object->lines as $key => &$line)
 		{
 			if (!$under_title_found && !empty($TTitle_under_search))
 			{
-				if ($line->product_type == 9 && (in_array($line->desc, $TTitle_under_search) || in_array($line->label, $TTitle_under_search)) ) $under_title_found = true;
+				if ($line->product_type == 9 && (in_array($line->desc, $TTitle_under_search) || in_array($line->label, $TTitle_under_search))) $under_title_found = true;
 			}
 			else
 			{
-				if ( ($key_is_id && $line->id == $key_trad) || (!$key_is_id && $line->product_type == 9 && $line->qty == $level && (in_array($line->desc, $TTitle_search) || in_array($line->label, $TTitle_search) )))
+				if (($key_is_id && $line->id == $key_trad) || (!$key_is_id && $line->product_type == 9 && $line->qty == $level && (in_array($line->desc, $TTitle_search) || in_array($line->label, $TTitle_search))))
 				{
 					if ($key_is_id) $level = $line->qty;
 					
@@ -575,7 +575,7 @@ 
 				
 				if ($add_line)
 				{
-					if (!$withBlockLine && (self::isTitle($line) || self::isSubtotal($line)) ) continue;
+					if (!$withBlockLine && (self::isTitle($line) || self::isSubtotal($line))) continue;
 					else $TLine[] = $line;
 				}
 			}
@@ -584,12 +584,12 @@ 
 		return $TLine;
 	}
 	
-	public static function getLinesFromTitleId(&$object, $lineid, $withBlockLine=false)
+	public static function getLinesFromTitleId(&$object, $lineid, $withBlockLine = false)
 	{
 		return self::getLinesFromTitle($object, $lineid, '', '', $withBlockLine, true);
 	}
 	
-	public static function doUpdateLine(&$object, $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $type, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_options=0, $situation_percent=0, $fk_unit = null, $notrigger = 0)
+	public static function doUpdateLine(&$object, $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $type, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $info_bits = 0, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $special_code = 0, $array_options = 0, $situation_percent = 0, $fk_unit = null, $notrigger = 0)
 	{
 		$res = 0;
 		$object->db->begin();
@@ -601,7 +601,7 @@ 
 		        break;
 		        
 		    case 'supplier_proposal':
-		        $res = $object->updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $desc, $price_base_type, $info_bits, $special_code, $fk_parent_line, $skip_update_total, $fk_fournprice, $pa_ht, $label, $type, $array_options,'', $fk_unit);
+		        $res = $object->updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $desc, $price_base_type, $info_bits, $special_code, $fk_parent_line, $skip_update_total, $fk_fournprice, $pa_ht, $label, $type, $array_options, '', $fk_unit);
 		        break;
 		        
 			case 'commande':
@@ -630,9 +630,9 @@ 
 				$factureRecLine->fetch($rowid);
 				$factureRecLine->array_options = $array_options;
 				$factureRecLine->insertExtraFields();
-				$rang=$factureRecLine->rang;
+				$rang = $factureRecLine->rang;
 				
-				$fk_product=0; $fk_remise_except=''; $pu_ttc=0;	
+				$fk_product = 0; $fk_remise_except = ''; $pu_ttc = 0;	
 				$res = $object->updateline($rowid, $desc, $pu, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $price_base_type, $info_bits, $fk_remise_except, $pu_ttc, $type, $rang, $special_code, $label, $fk_unit);
 				break;
 		}
@@ -648,7 +648,7 @@ 
 		global $db, $object;
 		
 		$TTitle = array();
-		if(! empty($object->id) && in_array($object->element, array('propal', 'commande', 'facture'))) {}
+		if (!empty($object->id) && in_array($object->element, array('propal', 'commande', 'facture'))) {}
 		else {
 			if ($origin_line->element == 'propaldet')
 			{
@@ -728,7 +728,7 @@ 
 	 */
 	public static function addRecapPage(&$parameters, &$origin_pdf)
 	{
-		global $user,$conf,$langs;
+		global $user, $conf, $langs;
 		
 		$origin_file = $parameters['file'];
 		$outputlangs = $parameters['outputlangs'];
@@ -744,21 +744,21 @@ 
 		$objmarge->marge_droite = 10;
 		
 		$objectref = dol_sanitizeFileName($object->ref);
-		if ($object->element == 'propal') $dir = $conf->propal->dir_output . '/' . $objectref;
-		elseif ($object->element == 'commande') $dir = $conf->commande->dir_output . '/' . $objectref;
-		elseif ($object->element == 'facture') $dir = $conf->facture->dir_output . '/' . $objectref;
+		if ($object->element == 'propal') $dir = $conf->propal->dir_output.'/'.$objectref;
+		elseif ($object->element == 'commande') $dir = $conf->commande->dir_output.'/'.$objectref;
+		elseif ($object->element == 'facture') $dir = $conf->facture->dir_output.'/'.$objectref;
 		elseif ($object->element == 'facturerec') return; // no PDF for facturerec
 		else
 		{
 			setEventMessage($langs->trans('warning_subtotal_recap_object_element_unknown', $object->element), 'warnings');
 			return -1;
 		}
-		$file = $dir . '/' . $objectref . '_recap.pdf';
+		$file = $dir.'/'.$objectref.'_recap.pdf';
 
 //		$pdf=pdf_getInstance($origin_pdf->format);
-		$pdf=pdf_getInstance(array(210, 297)); // Format A4 Portrait
-		$default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
-		$pdf->SetAutoPageBreak(1,0);
+		$pdf = pdf_getInstance(array(210, 297)); // Format A4 Portrait
+		$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+		$pdf->SetAutoPageBreak(1, 0);
 	             
 		if (class_exists('TCPDF'))
 		{
@@ -767,49 +767,49 @@ 
 		}
 		$pdf->SetFont(pdf_getPDFFont($outputlangs));
 		// Set path to the background PDF File
-		if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+		if (empty($conf->global->MAIN_DISABLE_FPDI) && !empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
 		{
 			$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 			$tplidx = $pdf->importPage(1);
 		}
 
 		$pdf->Open();
-		$pagenb=0;
-		$pdf->SetDrawColor(128,128,128);
+		$pagenb = 0;
+		$pdf->SetDrawColor(128, 128, 128);
 
 		$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 		$pdf->SetSubject($outputlangs->transnoentities("subtotalRecap"));
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 		$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("subtotalRecap")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-		$pdf->SetMargins($objmarge->marge_gauche, $objmarge->marge_haute, $objmarge->marge_droite);   // Left, Top, Right
+		$pdf->SetMargins($objmarge->marge_gauche, $objmarge->marge_haute, $objmarge->marge_droite); // Left, Top, Right
 
-		$pagenb=0;
-		$pdf->SetDrawColor(128,128,128);
+		$pagenb = 0;
+		$pdf->SetDrawColor(128, 128, 128);
 
 			
 		// New page
 		$pdf->AddPage();
-		if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+		if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 		$pagenb++;
 		
 		
 		self::pagehead($objmarge, $pdf, $object, 1, $outputlangs);
-		$pdf->SetFont('','', $default_font_size - 1);
-		$pdf->MultiCell(0, 3, '');		// Set interline to 3
-		$pdf->SetTextColor(0,0,0);
+		$pdf->SetFont('', '', $default_font_size - 1);
+		$pdf->MultiCell(0, 3, ''); // Set interline to 3
+		$pdf->SetTextColor(0, 0, 0);
 		
-		$heightforinfotot = 25;	// Height reserved to output the info and total part
-		$heightforfooter = $objmarge->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
+		$heightforinfotot = 25; // Height reserved to output the info and total part
+		$heightforfooter = $objmarge->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
 		
 		$posx_designation = 25;
 		$posx_options = 150;
 		$posx_montant = 170;
 		
 		$tab_top = 72;
-		$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?72:20); // TODO à vérifier
+		$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 72 : 20); // TODO à vérifier
 		
 		$TTot = array('total_ht' => 0, 'total_ttc' => 0, 'TTotal_tva' => array());
 		
@@ -823,14 +823,14 @@ 
 			$nexY = $tab_top + 10;
 			
 			$nblignes = count($TLine);
-			foreach($TLine as $i => &$line)
+			foreach ($TLine as $i => &$line)
 			{
 				$curY = $nexY;
 				
 				if (self::getNiveau($line) == 1) 
 				{
-					$pdf->SetFont('','B', $default_font_size - 1);   // Into loop to work with multipage
-					$curY+=2;
+					$pdf->SetFont('', 'B', $default_font_size - 1); // Into loop to work with multipage
+					$curY += 2;
 					
 					$TTot['total_ht'] += $line->total_ht;
 					$TTot['total_tva'] += $line->total_tva;
@@ -849,67 +849,67 @@ 
 						$TTot['TTotal_tva_multicurrency'][$tx] += $amount;
 					}	
 				}
-				else $pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
+				else $pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 				
-				$pdf->SetTextColor(0,0,0);
+				$pdf->SetTextColor(0, 0, 0);
 				
 				$pdf->setTopMargin($tab_top_newpage + 10);
-				$pdf->setPageOrientation('', 1, $heightforfooter+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
-				$pageposbefore=$pdf->getPage();
+				$pdf->setPageOrientation('', 1, $heightforfooter + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+				$pageposbefore = $pdf->getPage();
 				
-				$showpricebeforepagebreak=1;
+				$showpricebeforepagebreak = 1;
 				
 				$decalage = (self::getNiveau($line) - 1) * 2;
 				
 				// Print: Designation
 				$label = $line->label;
-				if( (float)DOL_VERSION < 6 ) {
+				if ((float) DOL_VERSION < 6) {
 					$label = !empty($line->label) ? $line->label : $line->desc;
 				}
 				
 				
 				$pdf->startTransaction();
-				$pdf->writeHTMLCell($posx_options-$posx_designation-$decalage, 3, $posx_designation+$decalage, $curY, $outputlangs->convToOutputCharset($label), 0, 1, false, true, 'J',true);
-				$pageposafter=$pdf->getPage();
+				$pdf->writeHTMLCell($posx_options - $posx_designation - $decalage, 3, $posx_designation + $decalage, $curY, $outputlangs->convToOutputCharset($label), 0, 1, false, true, 'J', true);
+				$pageposafter = $pdf->getPage();
 				if ($pageposafter > $pageposbefore)	// There is a pagebreak
 				{
 					$pdf->rollbackTransaction(true);
-					$pageposafter=$pageposbefore;
+					$pageposafter = $pageposbefore;
 					//print $pageposafter.'-'.$pageposbefore;exit;
-					$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-					$pdf->writeHTMLCell($posx_options-$posx_designation-$decalage, 3, $posx_designation+$decalage, $curY, $outputlangs->convToOutputCharset($label), 0, 1, false, true, 'J',true);
+					$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+					$pdf->writeHTMLCell($posx_options - $posx_designation - $decalage, 3, $posx_designation + $decalage, $curY, $outputlangs->convToOutputCharset($label), 0, 1, false, true, 'J', true);
 
-					$pageposafter=$pdf->getPage();
-					$posyafter=$pdf->GetY();
+					$pageposafter = $pdf->getPage();
+					$posyafter = $pdf->GetY();
 					//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-					if ($posyafter > ($objmarge->page_hauteur - ($heightforfooter+$heightforinfotot)))	// There is no space left for total+free text
+					if ($posyafter > ($objmarge->page_hauteur - ($heightforfooter + $heightforinfotot)))	// There is no space left for total+free text
 					{
-						if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
+						if ($i == ($nblignes - 1))	// No more lines, and no space left to show total, so we create a new page
 						{
-							$pdf->AddPage('','',true);
-							if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+							$pdf->AddPage('', '', true);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) self::pagehead($objmarge, $pdf, $object, 0, $outputlangs);
-							$pdf->setPage($pageposafter+1);
+							$pdf->setPage($pageposafter + 1);
 						}
 					}
 					else
 					{
 						// We found a page break
-						$showpricebeforepagebreak=0;
+						$showpricebeforepagebreak = 0;
 					}
 				}
 				else	// No pagebreak
 				{
 					$pdf->commitTransaction();
 				}
-				$posYAfterDescription=$pdf->GetY();
+				$posYAfterDescription = $pdf->GetY();
 
 				$nexY = $pdf->GetY();
-				$pageposafter=$pdf->getPage();
+				$pageposafter = $pdf->getPage();
 
 				$pdf->setPage($pageposbefore);
 				$pdf->setTopMargin($objmarge->marge_haute);
-				$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+				$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 
 				// We suppose that a too long description or photo were moved completely on next page
 				if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
@@ -922,14 +922,14 @@ 
 				if (!empty($line->total_options))
 				{
 					$pdf->SetXY($posx_options, $curY);
-					$pdf->MultiCell($posx_montant-$posx_options-0.8, 3, price($line->total_options, 0, $outputlangs), 0, 'R', 0);
+					$pdf->MultiCell($posx_montant - $posx_options - 0.8, 3, price($line->total_options, 0, $outputlangs), 0, 'R', 0);
 				}
 				
 				// Print: Montant
 				$pdf->SetXY($posx_montant, $curY);
-				$pdf->MultiCell($objmarge->page_largeur-$objmarge->marge_droite-$posx_montant-0.8, 3, price($line->total_ht, 0, $outputlangs), 0, 'R', 0);
+				$pdf->MultiCell($objmarge->page_largeur - $objmarge->marge_droite - $posx_montant - 0.8, 3, price($line->total_ht, 0, $outputlangs), 0, 'R', 0);
 				
-				$nexY+=2;    // Passe espace entre les lignes
+				$nexY += 2; // Passe espace entre les lignes
 
 				// Detect if some page were added automatically and output _tableau for past pages
 				while ($pagenb < $pageposafter)
@@ -946,7 +946,7 @@ 
 					
 					$pagenb++;
 					$pdf->setPage($pagenb);
-					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 					if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) self::pagehead($objmarge, $pdf, $object, 0, $outputlangs);
 				}
 			}
@@ -956,19 +956,19 @@ 
 		if ($pagenb == 1)
 		{
 			self::tableau($objmarge, $pdf, $posx_designation, $posx_options, $posx_montant, $tab_top, $objmarge->page_hauteur - $tab_top - $heightforinfotot - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
-			$bottomlasttab=$objmarge->page_hauteur - $heightforinfotot - $heightforfooter + 1;
+			$bottomlasttab = $objmarge->page_hauteur - $heightforinfotot - $heightforfooter + 1;
 		}
 		else
 		{
 			self::tableau($objmarge, $pdf, $posx_designation, $posx_options, $posx_montant, $tab_top_newpage, $objmarge->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
-			$bottomlasttab=$objmarge->page_hauteur - $heightforinfotot - $heightforfooter + 1;
+			$bottomlasttab = $objmarge->page_hauteur - $heightforinfotot - $heightforfooter + 1;
 		}
 		
 		// Affiche zone totaux
-		$posy=self::tableau_tot($objmarge, $pdf, $object, $bottomlasttab, $outputlangs, $TTot);
+		$posy = self::tableau_tot($objmarge, $pdf, $object, $bottomlasttab, $outputlangs, $TTot);
 		
 		$pdf->Close();
-		$pdf->Output($file,'F');
+		$pdf->Output($file, 'F');
 		
 		$pagecount = self::concat($outputlangs, array($origin_file, $file), $origin_file);
 		
@@ -980,7 +980,7 @@ 
 		$level = $line->qty; // TODO à améliorer
 		
 		$pdf->SetXY($objmarge->marge_gauche, $curY);
-		$pdf->MultiCell($posx_designation-$objmarge->marge_gauche-0.8, 5, $level, 0, 'L', 0);
+		$pdf->MultiCell($posx_designation - $objmarge->marge_gauche - 0.8, 5, $level, 0, 'L', 0);
 	}
 	
 	/**
@@ -994,50 +994,50 @@ 
 	 */
 	private static function pagehead(&$objmarge, &$pdf, &$object, $showdetail, $outputlangs)
 	{
-		global $conf,$mysoc;
+		global $conf, $mysoc;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		pdf_pagehead($pdf,$outputlangs,$objmarge->page_hauteur);
+		pdf_pagehead($pdf, $outputlangs, $objmarge->page_hauteur);
 
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
 
-		$posy=$objmarge->marge_haute;
-		$posx=$objmarge->page_largeur-$objmarge->marge_droite-100;
+		$posy = $objmarge->marge_haute;
+		$posx = $objmarge->page_largeur - $objmarge->marge_droite - 100;
 		
-		$pdf->SetXY($objmarge->marge_gauche,$posy);
+		$pdf->SetXY($objmarge->marge_gauche, $posy);
 
-		$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+		$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 		if ($mysoc->logo)
 		{
 			if (is_readable($logo))
 			{
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $objmarge->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+			    $height = pdf_getHeightForLogo($logo);
+			    $pdf->Image($logo, $objmarge->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
 			else
 			{
-				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B',$default_font_size - 2);
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+				$pdf->SetTextColor(200, 0, 0);
+				$pdf->SetFont('', 'B', $default_font_size - 2);
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
 			
-			$posy+=35;
+			$posy += 35;
 		}
 		else
 		{
-			$text=$mysoc->name;
+			$text = $mysoc->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			
-			$posy+=15;
+			$posy += 15;
 		}
 		
 		
-		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','B', $default_font_size + 2);
-		$pdf->SetXY($objmarge->marge_gauche,$posy);
+		$pdf->SetTextColor(0, 0, 0);
+		$pdf->SetFont('', 'B', $default_font_size + 2);
+		$pdf->SetXY($objmarge->marge_gauche, $posy);
 		
 		$key = 'subtotalPropalTitle';
 		if ($object->element == 'commande') $key = 'subtotalCommandeTitle';
@@ -1046,14 +1046,14 @@ 
 		
 		$pdf->MultiCell(150, 4, $outputlangs->transnoentities($key, $object->ref, $object->thirdparty->name), '', 'L');
 		
-		$pdf->SetFont('','', $default_font_size);
-		$pdf->SetXY($objmarge->page_largeur-$objmarge->marge_droite-40,$posy);
+		$pdf->SetFont('', '', $default_font_size);
+		$pdf->SetXY($objmarge->page_largeur - $objmarge->marge_droite - 40, $posy);
 		$pdf->MultiCell(40, 4, dol_print_date($object->date, 'daytext'), '', 'R');
 		
 		$posy += 8;
 			
-		$pdf->SetFont('','B', $default_font_size + 2);
-		$pdf->SetXY($objmarge->marge_gauche,$posy);
+		$pdf->SetFont('', 'B', $default_font_size + 2);
+		$pdf->SetXY($objmarge->marge_gauche, $posy);
 		$pdf->MultiCell(70, 4, $outputlangs->transnoentities('subtotalRecapLot'), '', 'L');
 		
 	}
@@ -1071,44 +1071,44 @@ 
 	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	private static function tableau(&$objmarge, &$pdf, $posx_designation, $posx_options, $posx_montant, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
+	private static function tableau(&$objmarge, &$pdf, $posx_designation, $posx_options, $posx_montant, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
 		global $conf;
 		
 		// Force to disable hidetop and hidebottom
-		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
+		$hidebottom = 0;
+		if ($hidetop) $hidetop = -1;
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		// Amount in (at tab_top - 1)
-		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','',$default_font_size);
+		$pdf->SetTextColor(0, 0, 0);
+		$pdf->SetFont('', '', $default_font_size);
 
 		if (empty($hidetop))
 		{
-			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
-			$pdf->SetXY($objmarge->page_largeur - $objmarge->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4.5);
+			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
+			$pdf->SetXY($objmarge->page_largeur - $objmarge->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4.5);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 			
-			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($objmarge->marge_gauche, $tab_top, $objmarge->page_largeur-$objmarge->marge_droite-$objmarge->marge_gauche, 8, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($objmarge->marge_gauche, $tab_top, $objmarge->page_largeur - $objmarge->marge_droite - $objmarge->marge_gauche, 8, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
 			
 			
-			$pdf->line($objmarge->marge_gauche, $tab_top, $objmarge->page_largeur-$objmarge->marge_droite, $tab_top);	// line prend une position y en 2eme param et 4eme param
+			$pdf->line($objmarge->marge_gauche, $tab_top, $objmarge->page_largeur - $objmarge->marge_droite, $tab_top); // line prend une position y en 2eme param et 4eme param
 
-			$pdf->SetXY($posx_designation, $tab_top+2);
-			$pdf->MultiCell($posx_options - $posx_designation,2, $outputlangs->transnoentities("Designation"),'','L');
-			$pdf->SetXY($posx_options, $tab_top+2);
-			$pdf->MultiCell($posx_montant - $posx_options,2, $outputlangs->transnoentities("Options"),'','R');
-			$pdf->SetXY($posx_montant, $tab_top+2);
-			$pdf->MultiCell($objmarge->page_largeur - $objmarge->marge_droite - $posx_montant,2, $outputlangs->transnoentities("Amount"),'','R');
+			$pdf->SetXY($posx_designation, $tab_top + 2);
+			$pdf->MultiCell($posx_options - $posx_designation, 2, $outputlangs->transnoentities("Designation"), '', 'L');
+			$pdf->SetXY($posx_options, $tab_top + 2);
+			$pdf->MultiCell($posx_montant - $posx_options, 2, $outputlangs->transnoentities("Options"), '', 'R');
+			$pdf->SetXY($posx_montant, $tab_top + 2);
+			$pdf->MultiCell($objmarge->page_largeur - $objmarge->marge_droite - $posx_montant, 2, $outputlangs->transnoentities("Amount"), '', 'R');
 			
-			$pdf->line($objmarge->marge_gauche, $tab_top+8, $objmarge->page_largeur-$objmarge->marge_droite, $tab_top+8);	// line prend une position y en 2eme param et 4eme param
+			$pdf->line($objmarge->marge_gauche, $tab_top + 8, $objmarge->page_largeur - $objmarge->marge_droite, $tab_top + 8); // line prend une position y en 2eme param et 4eme param
 		}
 		else
 		{
-			$pdf->line($objmarge->marge_gauche, $tab_top-2, $objmarge->page_largeur-$objmarge->marge_droite, $tab_top-2);	// line prend une position y en 2eme param et 4eme param
+			$pdf->line($objmarge->marge_gauche, $tab_top - 2, $objmarge->page_largeur - $objmarge->marge_droite, $tab_top - 2); // line prend une position y en 2eme param et 4eme param
 		}
 		
 	}
@@ -1117,29 +1117,29 @@ 
 	{
 		global $conf;
 		
-		$pdf->line($objmarge->marge_gauche, $posy, $objmarge->page_largeur-$objmarge->marge_droite, $posy);	// line prend une position y en 2eme param et 4eme param
+		$pdf->line($objmarge->marge_gauche, $posy, $objmarge->page_largeur - $objmarge->marge_droite, $posy); // line prend une position y en 2eme param et 4eme param
 		
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 		
-		$tab2_top = $posy+2;
+		$tab2_top = $posy + 2;
 		$tab2_hl = 4;
-		$pdf->SetFont('','', $default_font_size - 1);
+		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// Tableau total
 		$col1x = 120; $col2x = 170;
 		if ($objmarge->page_largeur < 210) // To work with US executive format
 		{
-			$col2x-=20;
+			$col2x -= 20;
 		}
 		$largcol2 = ($objmarge->page_largeur - $objmarge->marge_droite - $col2x);
 
-		$useborder=0;
+		$useborder = 0;
 		$index = 0;
 
 		// Total HT
-		$pdf->SetFillColor(255,255,255);
+		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + 0);
-		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 
 		// $total_ht = ($conf->multicurrency->enabled && $object->mylticurrency_tx != 1) ? $TTot['multicurrency_total_ht'] : $TTot['total_ht'];
 		$total_ht = $TTot['total_ht'];
@@ -1147,10 +1147,10 @@ 
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht, 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
-		$pdf->SetFillColor(248,248,248);
+		$pdf->SetFillColor(248, 248, 248);
 		
-		$atleastoneratenotnull=0;
-		foreach($TTot['TTotal_tva'] as $tvakey => $tvaval)
+		$atleastoneratenotnull = 0;
+		foreach ($TTot['TTotal_tva'] as $tvakey => $tvaval)
 		{
 			if ($tvakey != 0)    // On affiche pas taux 0
 			{
@@ -1159,15 +1159,15 @@ 
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
-				$tvacompl='';
-				if (preg_match('/\*/',$tvakey))
+				$tvacompl = '';
+				if (preg_match('/\*/', $tvakey))
 				{
-					$tvakey=str_replace('*','',$tvakey);
+					$tvakey = str_replace('*', '', $tvakey);
 					$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 				}
-				$totalvat =$outputlangs->transnoentities("TotalVAT").' ';
-				$totalvat.=vatrate($tvakey,1).$tvacompl;
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+				$totalvat = $outputlangs->transnoentities("TotalVAT").' ';
+				$totalvat .= vatrate($tvakey, 1).$tvacompl;
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
@@ -1177,16 +1177,16 @@ 
 		// Total TTC
 		$index++;
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFillColor(224,224,224);
-		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetFillColor(224, 224, 224);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
 
 		// $total_ttc = ($conf->multicurrency->enabled && $object->multiccurency_tx != 1) ? $TTot['multicurrency_total_ttc'] : $TTot['total_ttc'];
 		$total_ttc = $TTot['total_ttc'];
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', 1);
 
-		$pdf->SetTextColor(0,0,0);
+		$pdf->SetTextColor(0, 0, 0);
 				
 		$index++;
 		return ($tab2_top + ($tab2_hl * $index));
@@ -1205,22 +1205,22 @@ 
 	 * @param	int		$hidebottom		Hide bottom
 	 * @return	void
 	 */
-    private static function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0)
+    private static function printRect($pdf, $x, $y, $l, $h, $hidetop = 0, $hidebottom = 0)
     {
-	    if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y);
-	    $pdf->line($x+$l, $y, $x+$l, $y+$h);
-	    if (empty($hidebottom)) $pdf->line($x+$l, $y+$h, $x, $y+$h);
-	    $pdf->line($x, $y+$h, $x, $y);
+	    if (empty($hidetop) || $hidetop == -1) $pdf->line($x, $y, $x + $l, $y);
+	    $pdf->line($x + $l, $y, $x + $l, $y + $h);
+	    if (empty($hidebottom)) $pdf->line($x + $l, $y + $h, $x, $y + $h);
+	    $pdf->line($x, $y + $h, $x, $y);
     }
 	
 	
-	public static function concat(&$outputlangs, $files, $fileoutput='')
+	public static function concat(&$outputlangs, $files, $fileoutput = '')
 	{
 		global $conf;
 		
 		if (empty($fileoutput)) $fileoutput = $file[0];
 		
-		$pdf=pdf_getInstance();
+		$pdf = pdf_getInstance();
         if (class_exists('TCPDF'))
         {
             $pdf->setPrintHeader(false);
@@ -1228,10 +1228,10 @@ 
         }
         $pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-        if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+        if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
 		
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
 			$pagecount = $pdf->setSourceFile($file);
 			for ($i = 1; $i <= $pagecount; $i++)
@@ -1243,8 +1243,8 @@ 
 			}
 		}
 		
-		$pdf->Output($fileoutput,'F');
-		if (! empty($conf->global->MAIN_UMASK)) @chmod($file, octdec($conf->global->MAIN_UMASK));
+		$pdf->Output($fileoutput, 'F');
+		if (!empty($conf->global->MAIN_UMASK)) @chmod($file, octdec($conf->global->MAIN_UMASK));
 
 		return $pagecount;
 	}
@@ -1257,7 +1257,7 @@ 
 	 */
 	public static function hasNcTitle(&$line)
 	{
-		if(isset($line->has_nc_title)) return $line->has_nc_title;
+		if (isset($line->has_nc_title)) return $line->has_nc_title;
 
 		$TTitle = self::getAllTitleFromLine($line);
 		foreach ($TTitle as &$line_title)

Braces +294 added lines, -141 removed lines

@@ -13,18 +13,23 @@ 
 			/**
 			 * @var $object Facture
 			 */
-			if($object->element=='facture') $res =  $object->addline($object->id, $label, 0,$qty,0,0,0,0,0,'','',0,0,'','HT',0,9,-1, TSubtotal::$module_number);
+			if($object->element=='facture') {
+				$res =  $object->addline($object->id, $label, 0,$qty,0,0,0,0,0,'','',0,0,'','HT',0,9,-1, TSubtotal::$module_number);
+			}
 			/**
 			 * @var $object Propal
 			 */
-			else if($object->element=='propal') $res =  $object->addline($object->id,$label, 0,$qty,0,0,0,0,0,'HT',0,0,9,-1, TSubtotal::$module_number);
+			else if($object->element=='propal') {
+				$res =  $object->addline($object->id,$label, 0,$qty,0,0,0,0,0,'HT',0,0,9,-1, TSubtotal::$module_number);
+			}
 			/**
 			 * @var $object Commande
 			 */
-			else if($object->element=='commande') $res =  $object->addline($object->id,$label, 0,$qty,0,0,0,0,0,0,0,'HT',0,'','',9,-1, TSubtotal::$module_number);
+			else if($object->element=='commande') {
+				$res =  $object->addline($object->id,$label, 0,$qty,0,0,0,0,0,0,0,'HT',0,'','',9,-1, TSubtotal::$module_number);
+			}
 
-		}
-		else {
+		} else {
 			$desc = '';
 			
 			$TNotElements = array ('invoice_supplier', 'order_supplier');
@@ -36,28 +41,38 @@ 
 			/**
 			 * @var $object Facture
 			 */
-			if($object->element=='facture') $res =  $object->addline($desc, 0,$qty,0,0,0,0,0,'','',0,0,'','HT',0,9,$rang, TSubtotal::$module_number, '', 0, 0, null, 0, $label);
+			if($object->element=='facture') {
+				$res =  $object->addline($desc, 0,$qty,0,0,0,0,0,'','',0,0,'','HT',0,9,$rang, TSubtotal::$module_number, '', 0, 0, null, 0, $label);
+			}
 			/**
 			 * @var $object Facture fournisseur
 			 */
 			else if($object->element=='invoice_supplier') {
 			    $object->special_code = TSubtotal::$module_number;
-                if( (float)DOL_VERSION < 6 ) $rang = $object->line_max() + 1;
+                if( (float)DOL_VERSION < 6 ) {
+                	$rang = $object->line_max() + 1;
+                }
 			    $res = $object->addline($label,0,0,0,0,$qty,0,0,'','',0,0,'HT',9,$rang);
 			}
 			/**
 			 * @var $object Propal
 			 */
-			else if($object->element=='propal') $res = $object->addline($desc, 0,$qty,0,0,0,0,0,'HT',0,0,9,$rang, TSubtotal::$module_number, 0, 0, 0, $label);
+			else if($object->element=='propal') {
+				$res = $object->addline($desc, 0,$qty,0,0,0,0,0,'HT',0,0,9,$rang, TSubtotal::$module_number, 0, 0, 0, $label);
+			}
 			/**
 			 * @var $object Propal Fournisseur
 			 */
-			else if($object->element=='supplier_proposal') $res = $object->addline($desc, 0,$qty,0,0,0,0,0,'HT',0,0,9,$rang, TSubtotal::$module_number, 0, 0, 0, $label);
+			else if($object->element=='supplier_proposal') {
+				$res = $object->addline($desc, 0,$qty,0,0,0,0,0,'HT',0,0,9,$rang, TSubtotal::$module_number, 0, 0, 0, $label);
+			}
 			
 			/**
 			 * @var $object Commande
 			 */
-			else if($object->element=='commande') $res =  $object->addline($desc, 0,$qty,0,0,0,0,0,0,0,'HT',0,'','',9,$rang, TSubtotal::$module_number, 0, null, 0, $label);
+			else if($object->element=='commande') {
+				$res =  $object->addline($desc, 0,$qty,0,0,0,0,0,0,0,'HT',0,'','',9,$rang, TSubtotal::$module_number, 0, null, 0, $label);
+			}
 			/**
 			 * @var $object Commande fournisseur
 			 */
@@ -68,7 +83,9 @@ 
 			/**
 			 * @var $object Facturerec
 			 */
-			else if($object->element=='facturerec') $res =  $object->addline($desc, 0,$qty, 0, 0, 0, 0, 0, 'HT', 0, '', 0, 9, $rang, TSubtotal::$module_number,$label); 
+			else if($object->element=='facturerec') {
+				$res =  $object->addline($desc, 0,$qty, 0, 0, 0, 0, 0, 'HT', 0, '', 0, 9, $rang, TSubtotal::$module_number,$label);
+			}
 			
 		}
 	
@@ -90,8 +107,9 @@ 
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = GETPOST('lang_id', 'alpha');
-			if (! empty($conf->global->MAIN_MULTILANGS) && empty($newlang))
-				$newlang = !empty($object->client) ? $object->client->default_lang : $object->thirdparty->default_lang;
+			if (! empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) {
+							$newlang = !empty($object->client) ? $object->client->default_lang : $object->thirdparty->default_lang;
+			}
 			if (! empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
@@ -100,13 +118,18 @@ 
 			$ret = $object->fetch($object->id); // Reload to get new records
 			if ((float) DOL_VERSION <= 3.6)
 			{
-				if ($object->element == 'propal') propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-				elseif ($object->element == 'commande') commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-				elseif ($object->element == 'facture') facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			}
-			else
+				if ($object->element == 'propal') {
+					propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				} elseif ($object->element == 'commande') {
+					commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				} elseif ($object->element == 'facture') {
+					facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				}
+			} else
 			{
-				if ($object->element!= 'facturerec') $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				if ($object->element!= 'facturerec') {
+					$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				}
 			}
 		}
 	}
@@ -120,7 +143,9 @@ 
 	 */
 	public static function updateRang(&$object, $rang_start, $move_to=1)
 	{
-		if (!class_exists('GenericObject')) require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
+		if (!class_exists('GenericObject')) {
+			require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
+		}
 		
 		$row=new GenericObject($object->db);
 		$row->table_element_line = $object->table_element_line;
@@ -129,7 +154,9 @@ 
 		
 		foreach ($object->lines as &$line)
 		{
-			if ($line->rang < $rang_start) continue;
+			if ($line->rang < $rang_start) {
+				continue;
+			}
 			
 			$row->updateRangOfLine($line->id, $line->rang+$move_to);
 		}
@@ -152,21 +179,28 @@ 
 		foreach ($TTitle_reverse as $k => $title_line)
 		{
 			$title_niveau = self::getNiveau($title_line);
-			if ($title_niveau < $level_new_title) break;
+			if ($title_niveau < $level_new_title) {
+				break;
+			}
 			
 			$rang_to_add = self::titleHasTotalLine($object, $title_line, true, true);
 			
 			if (is_numeric($rang_to_add)) 
 			{
-				if ($rang_to_add != -1) self::updateRang($object, $rang_to_add);
+				if ($rang_to_add != -1) {
+					self::updateRang($object, $rang_to_add);
+				}
 				
 				self::addSubTotalLine($object, $langs->trans('SubTotal'), 100-$title_niveau, $rang_to_add);
 				
 				$object->lines[] = $object->line; // ajout de la ligne dans le tableau de ligne (Dolibarr ne le fait pas)
 				if ($rang_to_add != -1) 
 				{
-					if (method_exists($object, 'fetch_lines')) $object->fetch_lines();
-					else $object->fetch($object->id);
+					if (method_exists($object, 'fetch_lines')) {
+						$object->fetch_lines();
+					} else {
+						$object->fetch($object->id);
+					}
 				}
 			}
 		}
@@ -196,7 +230,9 @@ 
 		
 		foreach ($TTitle as $k => $title_line)
 		{
-			if (self::titleHasTotalLine($object, $title_line)) unset($TTitle[$k]);
+			if (self::titleHasTotalLine($object, $title_line)) {
+				unset($TTitle[$k]);
+			}
 		}
 		
 		return $TTitle;
@@ -213,23 +249,41 @@ 
 	 */
 	public static function titleHasTotalLine(&$object, &$title_line, $strict_mode=false, $return_rang_on_false=false)
 	{
-		if (empty($object->lines) || !is_array($object->lines)) return false;
+		if (empty($object->lines) || !is_array($object->lines)) {
+			return false;
+		}
 		
 		$title_niveau = self::getNiveau($title_line);
 		foreach ($object->lines as &$line)
 		{
-			if ($line->rang <= $title_line->rang) continue;
-			if (self::isTitle($line) && self::getNiveau($line) <= $title_niveau) return false; // Oups on croise un titre d'un niveau inférieur ou égale (exemple : je croise un titre niveau 2 alors que je suis sur un titre de niveau 3) pas lieu de continuer car un nouveau bloc commence
-			if (!self::isSubtotal($line)) continue;
+			if ($line->rang <= $title_line->rang) {
+				continue;
+			}
+			if (self::isTitle($line) && self::getNiveau($line) <= $title_niveau) {
+				return false;
+			}
+			// Oups on croise un titre d'un niveau inférieur ou égale (exemple : je croise un titre niveau 2 alors que je suis sur un titre de niveau 3) pas lieu de continuer car un nouveau bloc commence
+			if (!self::isSubtotal($line)) {
+				continue;
+			}
 			
 			$subtotal_niveau = self::getNiveau($line);
 			
 			// Comparaison du niveau de la ligne de sous-total avec celui du titre
-			if ($subtotal_niveau == $title_niveau) return true; // niveau égale => Ok mon titre a un sous-total
-			elseif ($subtotal_niveau < $title_niveau) // niveau inférieur trouvé (exemple : sous-total de niveau 1 contre mon titre de niveau 3)
+			if ($subtotal_niveau == $title_niveau) {
+				return true;
+			}
+			// niveau égale => Ok mon titre a un sous-total
+			elseif ($subtotal_niveau < $title_niveau) {
+				// niveau inférieur trouvé (exemple : sous-total de niveau 1 contre mon titre de niveau 3)
 			{
-				if ($strict_mode) return ($return_rang_on_false) ? $line->rang : false; // mode strict niveau pas égale donc faux
-				else return true; // mode libre => OK je considère que mon titre à un sous-total
+				if ($strict_mode) return ($return_rang_on_false) ? $line->rang : false;
+			}
+			// mode strict niveau pas égale donc faux
+				else {
+					return true;
+				}
+				// mode libre => OK je considère que mon titre à un sous-total
 			}
 		}
 		
@@ -277,16 +331,19 @@ 
 		
 		foreach ($object->lines as &$l)
 		{
-			if ($l->rang <= $line->rang) continue;
-			elseif (self::isSubtotal($l) && self::getNiveau($l) <= self::getNiveau($line)) break;
-			elseif ($breakOnTitle && self::isTitle($l) && self::getNiveau($l) <= self::getNiveau($line)) break;
+			if ($l->rang <= $line->rang) {
+				continue;
+			} elseif (self::isSubtotal($l) && self::getNiveau($l) <= self::getNiveau($line)) {
+				break;
+			} elseif ($breakOnTitle && self::isTitle($l) && self::getNiveau($l) <= self::getNiveau($line)) {
+				break;
+			}
 			
 			if (!empty($l->array_options['options_subtotal_nc']))
 			{
 				$tabprice = calcul_price_total($l->qty, $l->subprice, $l->remise_percent, $l->tva_tx, $l->localtax1_tx, $l->localtax2_tx, 0, 'HT', $l->info_bits, $l->product_type);
 				$TTot['total_options'] += $tabprice[0]; // total ht
-			}
-			else
+			} else
 			{
 				$TTot['total_pa_ht'] += $l->pa_ht * $l->qty;
 				$TTot['total_subprice'] += $l->subprice * $l->qty;
@@ -307,35 +364,51 @@ 
 
 	public static function getOrderIdFromLineId(&$db, $fk_commandedet, $supplier = false)
 	{
-		if (empty($fk_commandedet)) return false;
+		if (empty($fk_commandedet)) {
+			return false;
+		}
 
 		$table = 'commandedet';
-		if ($supplier) $table = 'commande_fournisseurdet';
+		if ($supplier) {
+			$table = 'commande_fournisseurdet';
+		}
 
 		$sql = 'SELECT fk_commande FROM '.MAIN_DB_PREFIX.$table.' WHERE rowid = '.$fk_commandedet;
 		$resql = $db->query($sql);
 
-		if ($resql && ($row = $db->fetch_object($resql))) return $row->fk_commande;
-		else return false;
+		if ($resql && ($row = $db->fetch_object($resql))) {
+			return $row->fk_commande;
+		} else {
+			return false;
+		}
 	}
 	
 	public static function getLastLineOrderId(&$db, $fk_commande, $supplier = false)
 	{
-		if (empty($fk_commande)) return false;
+		if (empty($fk_commande)) {
+			return false;
+		}
 
         $table = 'commandedet';
-        if ($supplier) $table = 'commande_fournisseurdet';
+        if ($supplier) {
+        	$table = 'commande_fournisseurdet';
+        }
 
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$table.' WHERE fk_commande = '.$fk_commande.' ORDER BY rang DESC LIMIT 1';
 		$resql = $db->query($sql);
 		
-		if ($resql && ($row = $db->fetch_object($resql))) return $row->rowid;
-		else return false;
+		if ($resql && ($row = $db->fetch_object($resql))) {
+			return $row->rowid;
+		} else {
+			return false;
+		}
 	}
 	
 	public static function getParentTitleOfLine(&$object, $i)
 	{
-		if ($i <= 0) return false;
+		if ($i <= 0) {
+			return false;
+		}
 		
 		$skip_title = 0;
 		// Je parcours les lignes précédentes
@@ -354,8 +427,7 @@ 
 				//@INFO J'ai ma ligne titre qui contient ma ligne, par contre je check pas s'il y a un sous-total
 				return $line;
 				break;
-			}
-			elseif ($line->product_type == 9 && $line->qty >= 90 && $line->qty <= 99)
+			} elseif ($line->product_type == 9 && $line->qty >= 90 && $line->qty <= 99)
 			{
 				// Il s'agit d'un sous-total, ça veut dire que le prochain titre théoriquement doit être ignorer (je travail avec un incrément au cas ou je croise plusieurs sous-totaux)
 				$skip_title++;
@@ -370,7 +442,9 @@ 
 		$res = $line->special_code == self::$module_number && $line->product_type == 9 && $line->qty <= 9;
 		if($res && $level > -1) {
 			return $line->qty == $level;
-		} else return $res;
+		} else {
+			return $res;
+		}
 		
 	}
 	
@@ -379,7 +453,9 @@ 
 	    $res = $line->special_code == self::$module_number && $line->product_type == 9 && $line->qty >= 90;
 	    if($res && $level > -1) {
 	        return self::getNiveau($line) == $level;
-	    } else return $res;
+	    } else {
+	    	return $res;
+	    }
 	}
 	
 	public static function isFreeText(&$line)
@@ -400,10 +476,14 @@ 
 		// editeur wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$nbrows=ROWS_2;
-		if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+		if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) {
+			$nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+		}
 		$enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
 		$toolbarname='dolibarr_details';
-		if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes';
+		if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) {
+			$toolbarname='dolibarr_notes';
+		}
 		$text = !empty($line->description)?$line->description:$line->label;
 		$doleditor=new DolEditor('line-description',$text,'',164,$toolbarname,'',false,true,$enable,$nbrows,'98%', $readonly);
 		return $doleditor->Create(1);
@@ -418,12 +498,10 @@ 
 		{
 		    $object->statut = 0; // hack for facture rec
 		    $createRight = $user->rights->facture->creer;
-		}
-		elseif($object->element == 'order_supplier' )
+		} elseif($object->element == 'order_supplier' )
 		{
 		    $createRight = $user->rights->fournisseur->commande->creer;
-		}
-		elseif($object->element == 'invoice_supplier' )
+		} elseif($object->element == 'invoice_supplier' )
 		{
 		    $createRight = $user->rights->fournisseur->facture->creer;
 		}
@@ -434,11 +512,16 @@ 
 
             if(!empty($object->lines)) {
                 foreach($object->lines as $line) {
-                    if($line->id == $lineid) $duplicateLine = $line;
+                    if($line->id == $lineid) {
+                    	$duplicateLine = $line;
+                    }
                 }
             }
-            if(!empty($duplicateLine) && !self::isModSubtotalLine($duplicateLine)) $TLine = array($duplicateLine);
-            else $TLine = self::getLinesFromTitleId($object, $lineid, $withBlockLine);
+            if(!empty($duplicateLine) && !self::isModSubtotalLine($duplicateLine)) {
+            	$TLine = array($duplicateLine);
+            } else {
+            	$TLine = self::getLinesFromTitleId($object, $lineid, $withBlockLine);
+            }
 
 			if (!empty($TLine))
 			{
@@ -502,8 +585,9 @@ 
 
 					$TLineAdded[] = $object->line;
 					// Error from addline
-					if ($res <= 0) break;
-					else
+					if ($res <= 0) {
+						break;
+					} else
 					{
 						$object->line_from = $line;
 						// Call trigger
@@ -525,8 +609,7 @@ 
 					    _updateLineNC($object->element, $object->id, $line->id, $line->array_options['options_subtotal_nc']);
 					}
 					return count($TLineAdded);
-				}
-				else
+				} else
 				{
 					$object->db->rollback();
 					return -1;
@@ -542,10 +625,14 @@ 
 		global $langs;
 		
 		// Besoin de comparer sur les 2 formes d'écriture
-		if (!$key_is_id) $TTitle_search = array($langs->trans($key_trad), $langs->transnoentitiesnoconv($key_trad));
+		if (!$key_is_id) {
+			$TTitle_search = array($langs->trans($key_trad), $langs->transnoentitiesnoconv($key_trad));
+		}
 		
 		$TTitle_under_search = array();
-		if (!empty($under_title)) $TTitle_under_search = array($langs->trans($under_title), $langs->transnoentitiesnoconv($under_title));
+		if (!empty($under_title)) {
+			$TTitle_under_search = array($langs->trans($under_title), $langs->transnoentitiesnoconv($under_title));
+		}
 		
 		$TLine = array();
 		$add_line = false;
@@ -555,28 +642,37 @@ 
 		{
 			if (!$under_title_found && !empty($TTitle_under_search))
 			{
-				if ($line->product_type == 9 && (in_array($line->desc, $TTitle_under_search) || in_array($line->label, $TTitle_under_search)) ) $under_title_found = true;
-			}
-			else
+				if ($line->product_type == 9 && (in_array($line->desc, $TTitle_under_search) || in_array($line->label, $TTitle_under_search)) ) {
+					$under_title_found = true;
+				}
+			} else
 			{
 				if ( ($key_is_id && $line->id == $key_trad) || (!$key_is_id && $line->product_type == 9 && $line->qty == $level && (in_array($line->desc, $TTitle_search) || in_array($line->label, $TTitle_search) )))
 				{
-					if ($key_is_id) $level = $line->qty;
+					if ($key_is_id) {
+						$level = $line->qty;
+					}
 					
 					$add_line = true;
-					if ($withBlockLine) $TLine[] = $line;
+					if ($withBlockLine) {
+						$TLine[] = $line;
+					}
 					continue;
-				}
-				elseif ($add_line && TSubtotal::isModSubtotalLine($line) && TSubtotal::getNiveau($line) == $level) // Si on tombe sur un sous-total, il faut que ce soit un du même niveau que le titre
+				} elseif ($add_line && TSubtotal::isModSubtotalLine($line) && TSubtotal::getNiveau($line) == $level) {
+					// Si on tombe sur un sous-total, il faut que ce soit un du même niveau que le titre
 				{
 					if ($withBlockLine) $TLine[] = $line;
+				}
 					break;
 				}
 				
 				if ($add_line)
 				{
-					if (!$withBlockLine && (self::isTitle($line) || self::isSubtotal($line)) ) continue;
-					else $TLine[] = $line;
+					if (!$withBlockLine && (self::isTitle($line) || self::isSubtotal($line)) ) {
+						continue;
+					} else {
+						$TLine[] = $line;
+					}
 				}
 			}
 		}
@@ -610,7 +706,9 @@ 
 				
 			case 'order_supplier':
 			    $object->special_code = SELF::$module_number;
-			    if (empty($desc)) $desc = $label;
+			    if (empty($desc)) {
+			    	$desc = $label;
+			    }
 			    $res = $object->updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type, 0, $date_start, $date_end, $array_options, $fk_unit);
 			    break;
 			
@@ -620,7 +718,9 @@ 
 				
 			case 'invoice_supplier':
 			    $object->special_code = SELF::$module_number;
-			    if (empty($desc)) $desc = $label;
+			    if (empty($desc)) {
+			    	$desc = $label;
+			    }
 			    $res = $object->updateline($rowid, $desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, 0, $price_base_type, $info_bits, $type, $remise_percent, 0, $date_start, $date_end, $array_options, $fk_unit);
 			    break;
 				
@@ -637,8 +737,11 @@ 
 				break;
 		}
 		
-		if ($res <= 0) $object->db->rollback();
-		else $object->db->commit();
+		if ($res <= 0) {
+			$object->db->rollback();
+		} else {
+			$object->db->commit();
+		}
 		
 		return $res;
 	}
@@ -648,24 +751,20 @@ 
 		global $db, $object;
 		
 		$TTitle = array();
-		if(! empty($object->id) && in_array($object->element, array('propal', 'commande', 'facture'))) {}
-		else {
+		if(! empty($object->id) && in_array($object->element, array('propal', 'commande', 'facture'))) {} else {
 			if ($origin_line->element == 'propaldet')
 			{
 				$object = new Propal($db);
 				$object->fetch($origin_line->fk_propal);
-			}
-			else if ($origin_line->element == 'commandedet')
+			} else if ($origin_line->element == 'commandedet')
 			{
 				$object = new Commande($db);
 				$object->fetch($origin_line->fk_commande);
-			}
-			else if ($origin_line->element == 'facturedet')
+			} else if ($origin_line->element == 'facturedet')
 			{
 				$object = new Facture($db);
 				$object->fetch($origin_line->fk_facture);
-			}
-			else
+			} else
 			{
 				return $TTitle;
 			}
@@ -675,8 +774,11 @@ 
 		$i = 0;
 		foreach ($object->lines as &$line)
 		{
-			if ($origin_line->id == $line->id) break;
-			else $i++;
+			if ($origin_line->id == $line->id) {
+				break;
+			} else {
+				$i++;
+			}
 		}
 		
 		$i--; // Skip la ligne d'origine
@@ -691,35 +793,43 @@ 
 				if (self::isSubtotal($object->lines[$y]))
 				{
 					$next_title_lvl_to_skip = self::getNiveau($object->lines[$y]);
-				}
-				elseif (self::isTitle($object->lines[$y]))
+				} elseif (self::isTitle($object->lines[$y]))
 				{
 					if ($object->lines[$y]->qty == $next_title_lvl_to_skip)
 					{
 						$next_title_lvl_to_skip = 0;
 						continue;
-					}
-					else
+					} else
 					{
-						if (empty($object->lines[$y]->array_options)) $object->lines[$y]->fetch_optionals();
+						if (empty($object->lines[$y]->array_options)) {
+							$object->lines[$y]->fetch_optionals();
+						}
 						$TTitle[$object->lines[$y]->id] = $object->lines[$y];
 						
-						if ($object->lines[$y]->qty == 1) break;
+						if ($object->lines[$y]->qty == 1) {
+							break;
+						}
 					}
 				}
 			}
 		}
 		
-		if ($reverse) $TTitle = array_reverse($TTitle, true);
+		if ($reverse) {
+			$TTitle = array_reverse($TTitle, true);
+		}
 		
 		return $TTitle;
 	}
 	
 	public static function getNiveau(&$line)
 	{
-		if (self::isTitle($line)) return $line->qty;
-		elseif (self::isSubtotal($line)) return 100 - $line->qty;
-		else return 0;
+		if (self::isTitle($line)) {
+			return $line->qty;
+		} elseif (self::isSubtotal($line)) {
+			return 100 - $line->qty;
+		} else {
+			return 0;
+		}
 	}
 	
 	/**
@@ -744,10 +854,16 @@ 
 		$objmarge->marge_droite = 10;
 		
 		$objectref = dol_sanitizeFileName($object->ref);
-		if ($object->element == 'propal') $dir = $conf->propal->dir_output . '/' . $objectref;
-		elseif ($object->element == 'commande') $dir = $conf->commande->dir_output . '/' . $objectref;
-		elseif ($object->element == 'facture') $dir = $conf->facture->dir_output . '/' . $objectref;
-		elseif ($object->element == 'facturerec') return; // no PDF for facturerec
+		if ($object->element == 'propal') {
+			$dir = $conf->propal->dir_output . '/' . $objectref;
+		} elseif ($object->element == 'commande') {
+			$dir = $conf->commande->dir_output . '/' . $objectref;
+		} elseif ($object->element == 'facture') {
+			$dir = $conf->facture->dir_output . '/' . $objectref;
+		} elseif ($object->element == 'facturerec') {
+			return;
+		}
+		// no PDF for facturerec
 		else
 		{
 			setEventMessage($langs->trans('warning_subtotal_recap_object_element_unknown', $object->element), 'warnings');
@@ -782,7 +898,9 @@ 
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 		$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("subtotalRecap")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+			$pdf->SetCompression(false);
+		}
 
 		$pdf->SetMargins($objmarge->marge_gauche, $objmarge->marge_haute, $objmarge->marge_droite);   // Left, Top, Right
 
@@ -792,7 +910,9 @@ 
 			
 		// New page
 		$pdf->AddPage();
-		if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+		if (! empty($tplidx)) {
+			$pdf->useTemplate($tplidx);
+		}
 		$pagenb++;
 		
 		
@@ -848,8 +968,10 @@ 
 					{
 						$TTot['TTotal_tva_multicurrency'][$tx] += $amount;
 					}	
+				} else {
+					$pdf->SetFont('','', $default_font_size - 1);
 				}
-				else $pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
+				// Into loop to work with multipage
 				
 				$pdf->SetTextColor(0,0,0);
 				
@@ -871,9 +993,11 @@ 
 				$pdf->startTransaction();
 				$pdf->writeHTMLCell($posx_options-$posx_designation-$decalage, 3, $posx_designation+$decalage, $curY, $outputlangs->convToOutputCharset($label), 0, 1, false, true, 'J',true);
 				$pageposafter=$pdf->getPage();
-				if ($pageposafter > $pageposbefore)	// There is a pagebreak
+				if ($pageposafter > $pageposbefore) {
+					// There is a pagebreak
 				{
 					$pdf->rollbackTransaction(true);
+				}
 					$pageposafter=$pageposbefore;
 					//print $pageposafter.'-'.$pageposbefore;exit;
 					$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
@@ -882,23 +1006,27 @@ 
 					$pageposafter=$pdf->getPage();
 					$posyafter=$pdf->GetY();
 					//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-					if ($posyafter > ($objmarge->page_hauteur - ($heightforfooter+$heightforinfotot)))	// There is no space left for total+free text
+					if ($posyafter > ($objmarge->page_hauteur - ($heightforfooter+$heightforinfotot))) {
+						// There is no space left for total+free text
 					{
 						if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
 						{
 							$pdf->AddPage('','',true);
-							if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) self::pagehead($objmarge, $pdf, $object, 0, $outputlangs);
+					}
+							if (! empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								self::pagehead($objmarge, $pdf, $object, 0, $outputlangs);
+							}
 							$pdf->setPage($pageposafter+1);
 						}
-					}
-					else
+					} else
 					{
 						// We found a page break
 						$showpricebeforepagebreak=0;
 					}
-				}
-				else	// No pagebreak
+				} else	// No pagebreak
 				{
 					$pdf->commitTransaction();
 				}
@@ -938,8 +1066,7 @@ 
 					if ($pagenb == 1)
 					{
 						self::tableau($objmarge, $pdf, $posx_designation, $posx_options, $posx_montant, $tab_top, $objmarge->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-					}
-					else
+					} else
 					{
 						self::tableau($objmarge, $pdf, $posx_designation, $posx_options, $posx_montant, $tab_top_newpage, $objmarge->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
 					}
@@ -947,7 +1074,9 @@ 
 					$pagenb++;
 					$pdf->setPage($pagenb);
 					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-					if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) self::pagehead($objmarge, $pdf, $object, 0, $outputlangs);
+					if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						self::pagehead($objmarge, $pdf, $object, 0, $outputlangs);
+					}
 				}
 			}
 		}
@@ -957,8 +1086,7 @@ 
 		{
 			self::tableau($objmarge, $pdf, $posx_designation, $posx_options, $posx_montant, $tab_top, $objmarge->page_hauteur - $tab_top - $heightforinfotot - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 			$bottomlasttab=$objmarge->page_hauteur - $heightforinfotot - $heightforfooter + 1;
-		}
-		else
+		} else
 		{
 			self::tableau($objmarge, $pdf, $posx_designation, $posx_options, $posx_montant, $tab_top_newpage, $objmarge->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
 			$bottomlasttab=$objmarge->page_hauteur - $heightforinfotot - $heightforfooter + 1;
@@ -972,7 +1100,9 @@ 
 		
 		$pagecount = self::concat($outputlangs, array($origin_file, $file), $origin_file);
 		
-		if (empty($conf->global->SUBTOTAL_KEEP_RECAP_FILE)) unlink($file);
+		if (empty($conf->global->SUBTOTAL_KEEP_RECAP_FILE)) {
+			unlink($file);
+		}
 	}
 	
 	private static function printLevel($objmarge, $pdf, $line, $curY, $posx_designation)
@@ -1015,8 +1145,7 @@ 
 			{
 			    $height=pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $objmarge->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-			}
-			else
+			} else
 			{
 				$pdf->SetTextColor(200,0,0);
 				$pdf->SetFont('','B',$default_font_size - 2);
@@ -1025,8 +1154,7 @@ 
 			}
 			
 			$posy+=35;
-		}
-		else
+		} else
 		{
 			$text=$mysoc->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
@@ -1040,9 +1168,13 @@ 
 		$pdf->SetXY($objmarge->marge_gauche,$posy);
 		
 		$key = 'subtotalPropalTitle';
-		if ($object->element == 'commande') $key = 'subtotalCommandeTitle';
-		elseif ($object->element == 'facture') $key = 'subtotalInvoiceTitle';
-		elseif ($object->element == 'facturerec') $key = 'subtotalInvoiceTitle';
+		if ($object->element == 'commande') {
+			$key = 'subtotalCommandeTitle';
+		} elseif ($object->element == 'facture') {
+			$key = 'subtotalInvoiceTitle';
+		} elseif ($object->element == 'facturerec') {
+			$key = 'subtotalInvoiceTitle';
+		}
 		
 		$pdf->MultiCell(150, 4, $outputlangs->transnoentities($key, $object->ref, $object->thirdparty->name), '', 'L');
 		
@@ -1077,7 +1209,9 @@ 
 		
 		// Force to disable hidetop and hidebottom
 		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
+		if ($hidetop) {
+			$hidetop=-1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1092,7 +1226,9 @@ 
 			$pdf->SetXY($objmarge->page_largeur - $objmarge->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4.5);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 			
-			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($objmarge->marge_gauche, $tab_top, $objmarge->page_largeur-$objmarge->marge_droite-$objmarge->marge_gauche, 8, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+				$pdf->Rect($objmarge->marge_gauche, $tab_top, $objmarge->page_largeur-$objmarge->marge_droite-$objmarge->marge_gauche, 8, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			}
 			
 			
 			$pdf->line($objmarge->marge_gauche, $tab_top, $objmarge->page_largeur-$objmarge->marge_droite, $tab_top);	// line prend une position y en 2eme param et 4eme param
@@ -1105,8 +1241,7 @@ 
 			$pdf->MultiCell($objmarge->page_largeur - $objmarge->marge_droite - $posx_montant,2, $outputlangs->transnoentities("Amount"),'','R');
 			
 			$pdf->line($objmarge->marge_gauche, $tab_top+8, $objmarge->page_largeur-$objmarge->marge_droite, $tab_top+8);	// line prend une position y en 2eme param et 4eme param
-		}
-		else
+		} else
 		{
 			$pdf->line($objmarge->marge_gauche, $tab_top-2, $objmarge->page_largeur-$objmarge->marge_droite, $tab_top-2);	// line prend une position y en 2eme param et 4eme param
 		}
@@ -1127,10 +1262,12 @@ 
 
 		// Tableau total
 		$col1x = 120; $col2x = 170;
-		if ($objmarge->page_largeur < 210) // To work with US executive format
+		if ($objmarge->page_largeur < 210) {
+			// To work with US executive format
 		{
 			$col2x-=20;
 		}
+		}
 		$largcol2 = ($objmarge->page_largeur - $objmarge->marge_droite - $col2x);
 
 		$useborder=0;
@@ -1152,9 +1289,11 @@ 
 		$atleastoneratenotnull=0;
 		foreach($TTot['TTotal_tva'] as $tvakey => $tvaval)
 		{
-			if ($tvakey != 0)    // On affiche pas taux 0
+			if ($tvakey != 0) {
+				// On affiche pas taux 0
 			{
 				$atleastoneratenotnull++;
+			}
 
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -1207,9 +1346,13 @@ 
 	 */
     private static function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0)
     {
-	    if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y);
+	    if (empty($hidetop) || $hidetop==-1) {
+	    	$pdf->line($x, $y, $x+$l, $y);
+	    }
 	    $pdf->line($x+$l, $y, $x+$l, $y+$h);
-	    if (empty($hidebottom)) $pdf->line($x+$l, $y+$h, $x, $y+$h);
+	    if (empty($hidebottom)) {
+	    	$pdf->line($x+$l, $y+$h, $x, $y+$h);
+	    }
 	    $pdf->line($x, $y+$h, $x, $y);
     }
 	
@@ -1218,7 +1361,9 @@ 
 	{
 		global $conf;
 		
-		if (empty($fileoutput)) $fileoutput = $file[0];
+		if (empty($fileoutput)) {
+			$fileoutput = $file[0];
+		}
 		
 		$pdf=pdf_getInstance();
         if (class_exists('TCPDF'))
@@ -1228,7 +1373,9 @@ 
         }
         $pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-        if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+        if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+        	$pdf->SetCompression(false);
+        }
 
 		
 		foreach($files as $file)
@@ -1244,7 +1391,9 @@ 
 		}
 		
 		$pdf->Output($fileoutput,'F');
-		if (! empty($conf->global->MAIN_UMASK)) @chmod($file, octdec($conf->global->MAIN_UMASK));
+		if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($file, octdec($conf->global->MAIN_UMASK));
+		}
 
 		return $pagecount;
 	}
@@ -1257,7 +1406,9 @@ 
 	 */
 	public static function hasNcTitle(&$line)
 	{
-		if(isset($line->has_nc_title)) return $line->has_nc_title;
+		if(isset($line->has_nc_title)) {
+			return $line->has_nc_title;
+		}
 
 		$TTitle = self::getAllTitleFromLine($line);
 		foreach ($TTitle as &$line_title)
@@ -1282,7 +1433,9 @@ 
 	public static function getTitleLabel($line)
 	{
 		$title = $line->label;
-		if (empty($title)) $title = !empty($line->description) ? $line->description : $line->desc;
+		if (empty($title)) {
+			$title = !empty($line->description) ? $line->description : $line->desc;
+		}
 		return $title;
 	}
 }