ATM-Consulting / dolibarr_module_subtotal

class/subtotal.class.php

Braces +263 added lines, -127 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 = '';
 			if ((float) DOL_VERSION < 6  || $qty==50) {
 				$desc = $label;
@@ -34,19 +39,27 @@ 
 			/**
 			 * @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 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 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 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);
+			}
 			
 		}
 	
@@ -68,8 +81,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);
@@ -78,13 +92,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);
+				}
 			}
 		}
 	}
@@ -98,7 +117,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;
@@ -107,7 +128,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);
 		}
@@ -130,21 +153,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);
+					}
 				}
 			}
 		}
@@ -174,7 +204,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;
@@ -191,23 +223,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
 			}
 		}
 		
@@ -255,16 +305,19 @@ 
 		
 		foreach ($object->lines as &$l)
 		{
-			if ($l->rang <= $line->rang) continue;
-			elseif (self::isSubtotal($l) && self::getNiveau($l) == $line->qty) break;
-			elseif (self::isModSubtotalLine($l)) continue;
+			if ($l->rang <= $line->rang) {
+				continue;
+			} elseif (self::isSubtotal($l) && self::getNiveau($l) == $line->qty) {
+				break;
+			} elseif (self::isModSubtotalLine($l)) {
+				continue;
+			}
 			
 			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_ht'] += $l->total_ht;
@@ -283,29 +336,41 @@ 
 
 	public static function getOrderIdFromLineId(&$db, $fk_commandedet)
 	{
-		if (empty($fk_commandedet)) return false;
+		if (empty($fk_commandedet)) {
+			return false;
+		}
 		
 		$sql = 'SELECT fk_commande FROM '.MAIN_DB_PREFIX.'commandedet WHERE rowid = '.$fk_commandedet;
 		$resql = $db->query($sql);
 		
-		if ($resql && ($row = $db->fetch_object($resql))) return $row->fk_commande;
-		else return false;
+		if ($resql && ($row = $db->fetch_object($resql))) {
+			return $row->fk_commande;
+		} else {
+			return false;
+		}
 	}
 	
 	public static function getLastLineOrderId(&$db, $fk_commande)
 	{
-		if (empty($fk_commande)) return false;
+		if (empty($fk_commande)) {
+			return false;
+		}
 		
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'commandedet WHERE fk_commande = '.$fk_commande.' ORDER BY rang DESC LIMIT 1';
 		$resql = $db->query($sql);
 		
-		if ($resql && ($row = $db->fetch_object($resql))) return $row->rowid;
-		else return false;
+		if ($resql && ($row = $db->fetch_object($resql))) {
+			return $row->rowid;
+		} else {
+			return false;
+		}
 	}
 	
 	public static function getParentTitleOfLine(&$object, $i)
 	{
-		if ($i <= 0) return false;
+		if ($i <= 0) {
+			return false;
+		}
 		
 		$skip_title = 0;
 		// Je parcours les lignes précédentes
@@ -324,8 +389,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++;
@@ -340,7 +404,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;
+		}
 		
 	}
 	
@@ -367,10 +433,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);
@@ -416,8 +486,9 @@ 
 
 					$TLineAdded[] = $object->line;
 					// Error from addline
-					if ($res <= 0) break;
-					else
+					if ($res <= 0) {
+						break;
+					} else
 					{
 						$object->line_from = $line;
 						// Call trigger
@@ -440,8 +511,7 @@ 
 				{
 					$object->db->commit();
 					return count($TLine);
-				}
-				else
+				} else
 				{
 					$object->db->rollback();
 					return -1;
@@ -457,10 +527,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;
@@ -470,28 +544,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 && $line->product_type == 9 && (100 - $line->qty == $level) ) // Si on tombe sur un sous-total, il faut que ce soit un du même niveau que le titre
+				} elseif ($add_line && $line->product_type == 9 && (100 - $line->qty == $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;
+					}
 				}
 			}
 		}
@@ -536,8 +619,11 @@ 
 				break;
 		}
 		
-		if ($res <= 0) $object->db->rollback();
-		else $object->db->commit();
+		if ($res <= 0) {
+			$object->db->rollback();
+		} else {
+			$object->db->commit();
+		}
 		
 		return $res;
 	}
@@ -547,24 +633,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;
 			}
@@ -574,8 +656,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
@@ -590,35 +675,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;
+		}
 	}
 	
 	/**
@@ -643,10 +736,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');
@@ -681,7 +780,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
 
@@ -691,7 +792,9 @@ 
 			
 		// New page
 		$pdf->AddPage();
-		if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+		if (! empty($tplidx)) {
+			$pdf->useTemplate($tplidx);
+		}
 		$pagenb++;
 		
 		
@@ -747,8 +850,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);
 				
@@ -770,9 +875,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.
@@ -781,23 +888,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();
 				}
@@ -837,8 +948,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);
 					}
@@ -846,7 +956,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);
+					}
 				}
 			}
 		}
@@ -856,8 +968,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;
@@ -871,7 +982,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)
@@ -914,8 +1027,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);
@@ -924,8 +1036,7 @@ 
 			}
 			
 			$posy+=35;
-		}
-		else
+		} else
 		{
 			$text=$mysoc->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
@@ -939,9 +1050,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');
 		
@@ -976,7 +1091,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);
@@ -991,7 +1108,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
@@ -1004,8 +1123,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
 		}
@@ -1026,10 +1144,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;
@@ -1051,9 +1171,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);
@@ -1106,9 +1228,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);
     }
 	
@@ -1117,7 +1243,9 @@ 
 	{
 		global $conf;
 		
-		if (empty($fileoutput)) $fileoutput = $file[0];
+		if (empty($fileoutput)) {
+			$fileoutput = $file[0];
+		}
 		
 		$pdf=pdf_getInstance();
         if (class_exists('TCPDF'))
@@ -1127,7 +1255,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)
@@ -1143,7 +1273,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;
 	}
@@ -1156,7 +1288,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)
@@ -1181,7 +1315,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;
 	}
 }