ATM-Consulting / dolibarr_module_subtotal

admin/subtotal_about.php

Spacing +5 added lines, -5 removed lines

@@ -24,19 +24,19 @@ 
  */
 // Dolibarr environment
 $res = @include("../../main.inc.php"); // From htdocs directory
-if (! $res) {
+if (!$res) {
     $res = @include("../../../main.inc.php"); // From "custom" directory
 }
 
 // Libraries
-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once '../lib/subtotal.lib.php';
 
 // Translations
 $langs->load("subtotal@subtotal");
 
 // Access control
-if (! $user->admin) {
+if (!$user->admin) {
     accessforbidden();
 }
 
@@ -47,8 +47,8 @@ 
 llxHeader('', $langs->trans($page_name));
 
 // Subheader
-$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">'
-    . $langs->trans("BackToModuleList") . '</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'
+    . $langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans($page_name), $linkback);
 
 // Configuration header

admin/subtotal_setup.php

Spacing +42 added lines, -42 removed lines

@@ -27,37 +27,37 @@ 
 // Change this following line to use the correct relative path (../, ../../, etc)
 // Dolibarr environment
 $res = @include("../../main.inc.php"); // From htdocs directory
-if (! $res) {
+if (!$res) {
     $res = @include("../../../main.inc.php"); // From "custom" directory
 }
 
 // Libraries
-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once '../lib/subtotal.lib.php';
 
 $langs->load("subtotal@subtotal");
 
 // Access control
-if (! $user->admin) {
+if (!$user->admin) {
     accessforbidden();
 }
 
 // Parameters
 $action = GETPOST('action', 'alpha');
 
-if($action=='save') {
+if ($action == 'save') {
 	
-	foreach($_REQUEST['TDivers'] as $name=>$param) {
+	foreach ($_REQUEST['TDivers'] as $name=>$param) {
 		
-		dolibarr_set_const($db, $name, $param,'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, $name, $param, 'chaine', 0, '', $conf->entity);
 		
 	}
 	
 }
 
-if (preg_match('/set_(.*)/',$action,$reg))
+if (preg_match('/set_(.*)/', $action, $reg))
 {
-	$code=$reg[1];
+	$code = $reg[1];
 	$value = GETPOST($code);
 	if ($code == 'SUBTOTAL_TFIELD_TO_KEEP_WITH_NC') $value = implode(',', $value);
 	
@@ -83,10 +83,10 @@ 
 
 
 
-llxHeader('','Gestion de sous-total, à propos','');
+llxHeader('', 'Gestion de sous-total, à propos', '');
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre('Gestion de subtotal',$linkback,'setup');
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print_fiche_titre('Gestion de subtotal', $linkback, 'setup');
 
 // Configuration header
 $head = subtotalAdminPrepareHead();
@@ -101,11 +101,11 @@ 
 showParameters();
 
 function showParameters() {
-	global $db,$conf,$langs,$bc;
+	global $db, $conf, $langs, $bc;
 	
-	$html=new Form($db);
+	$html = new Form($db);
 	
-	$var=false;
+	$var = false;
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Parameters").'</td>'."\n";
@@ -113,7 +113,7 @@ 
 	print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
 	print '</tr>';
 	
-	$var=!$var;
+	$var = !$var;
 	print '<tr '.$bc[$var].'>';
 	print '<td>'.$langs->trans("SUBTOTAL_USE_NEW_FORMAT").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -121,9 +121,9 @@ 
 	print ajax_constantonoff('SUBTOTAL_USE_NEW_FORMAT');
 	print '</td></tr>';
 	
-	if((float)DOL_VERSION>=3.8)
+	if ((float) DOL_VERSION >= 3.8)
 	{
-		$var=!$var;
+		$var = !$var;
 		print '<tr '.$bc[$var].'>';
 		print '<td>'.$langs->trans("SUBTOTAL_USE_NUMEROTATION").'</td>';
 		print '<td align="center" width="20">&nbsp;</td>';
@@ -132,7 +132,7 @@ 
 		print '</td></tr>';	
 	}
 	
-	$var=!$var;
+	$var = !$var;
 	print '<tr '.$bc[$var].'>';
 	print '<td>'.$langs->trans("SUBTOTAL_ALLOW_ADD_BLOCK").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -140,7 +140,7 @@ 
 	print ajax_constantonoff('SUBTOTAL_ALLOW_ADD_BLOCK');
 	print '</td></tr>';
 	
-	$var=!$var;
+	$var = !$var;
 	print '<tr '.$bc[$var].'>';
 	print '<td>'.$langs->trans("SUBTOTAL_ALLOW_EDIT_BLOCK").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -148,7 +148,7 @@ 
 	print ajax_constantonoff('SUBTOTAL_ALLOW_EDIT_BLOCK');
 	print '</td></tr>';
 	
-	$var=!$var;
+	$var = !$var;
 	print '<tr '.$bc[$var].'>';
 	print '<td>'.$langs->trans("SUBTOTAL_ALLOW_REMOVE_BLOCK").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -156,7 +156,7 @@ 
 	print ajax_constantonoff('SUBTOTAL_ALLOW_REMOVE_BLOCK');
 	print '</td></tr>';
 	
-	$var=!$var;
+	$var = !$var;
 	print '<tr '.$bc[$var].'>';
 	print '<td>'.$langs->trans("SUBTOTAL_ALLOW_DUPLICATE_BLOCK").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -164,7 +164,7 @@ 
 	print ajax_constantonoff('SUBTOTAL_ALLOW_DUPLICATE_BLOCK');
 	print '</td></tr>';
 	
-	$var=!$var;
+	$var = !$var;
 	print '<tr '.$bc[$var].'>';
 	print '<td>'.$langs->trans("SUBTOTAL_ALLOW_ADD_LINE_UNDER_TITLE").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -172,7 +172,7 @@ 
 	print ajax_constantonoff('SUBTOTAL_ALLOW_ADD_LINE_UNDER_TITLE');
 	print '</td></tr>';
 	
-	$var=!$var;
+	$var = !$var;
 	print '<tr '.$bc[$var].'>';
 	print '<td>'.$langs->trans("SUBTOTAL_ADD_LINE_UNDER_TITLE_AT_END_BLOCK").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -180,7 +180,7 @@ 
 	print ajax_constantonoff('SUBTOTAL_ADD_LINE_UNDER_TITLE_AT_END_BLOCK');
 	print '</td></tr>';
 
-	$var=!$var;
+	$var = !$var;
 	print '<tr '.$bc[$var].'>';
 	print '<td>'.$html->textwithpicto($langs->trans("SUBTOTAL_TEXT_FOR_TITLE_ORDETSTOINVOICE"), $langs->trans("SUBTOTAL_TEXT_FOR_TITLE_ORDETSTOINVOICE_info")).'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -193,7 +193,7 @@ 
 	print '</form>';
 	print '</td></tr>';
 	
-	$var=!$var;
+	$var = !$var;
 	print '<tr '.$bc[$var].'>';
 	print '<td>'.$langs->trans("SUBTOTAL_TITLE_STYLE").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -206,7 +206,7 @@ 
 	print '</form>';
 	print '</td></tr>';
 	
-	$var=!$var;
+	$var = !$var;
 	print '<tr '.$bc[$var].'>';
 	print '<td>'.$langs->trans("SUBTOTAL_SUBTOTAL_STYLE").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -219,7 +219,7 @@ 
 	print '</form>';
 	print '</td></tr>';
 	
-	$var=!$var;
+	$var = !$var;
 	print '<tr '.$bc[$var].'>';
 	print '<td>'.$langs->trans("SUBTOTAL_ONE_LINE_IF_HIDE_INNERLINES", $langs->transnoentitiesnoconv('HideInnerLines')).'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -227,7 +227,7 @@ 
 	print ajax_constantonoff('SUBTOTAL_ONE_LINE_IF_HIDE_INNERLINES');
 	print '</td></tr>';
 	
-	$var=!$var;
+	$var = !$var;
 	print '<tr '.$bc[$var].'>';
 	print '<td>'.$langs->trans("SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES", $langs->transnoentitiesnoconv('HideInnerLines')).'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -237,7 +237,7 @@ 
 	
 	if ((double) DOL_VERSION >= 4.0)
 	{
-		$var=!$var;
+		$var = !$var;
 		print '<tr '.$bc[$var].'>';
 		print '<td>'.$langs->trans("SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS").'</td>';
 		print '<td align="center" width="20">&nbsp;</td>';
@@ -245,12 +245,12 @@ 
 		print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="set_SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS">';
-		print $html->selectyesno("SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS",$conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS,1);
+		print $html->selectyesno("SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS", $conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS, 1);
 		print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 		print '</form>';
 		print '</td></tr>';
 		
-		$var=!$var;
+		$var = !$var;
 		print '<tr '.$bc[$var].'>';
 		print '<td>'.$langs->trans("SUBTOTAL_TFIELD_TO_KEEP_WITH_NC").'</td>';
 		print '<td align="center" width="20">&nbsp;</td>';
@@ -265,7 +265,7 @@ 
 		print '</td></tr>';
 	}
 	
-	$var=!$var;
+	$var = !$var;
 	print '<tr '.$bc[$var].'>';
 	print '<td>'.$langs->trans('SUBTOTAL_AUTO_ADD_SUBTOTAL_ON_ADDING_NEW_TITLE').'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -273,7 +273,7 @@ 
 	print ajax_constantonoff('SUBTOTAL_AUTO_ADD_SUBTOTAL_ON_ADDING_NEW_TITLE');
 	print '</td></tr>';
 	
-	$var=!$var;
+	$var = !$var;
 	print '<tr '.$bc[$var].'>';
 	print '<td>'.$langs->trans('SUBTOTAL_ALLOW_EXTRAFIELDS_ON_TITLE').'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -285,7 +285,7 @@ 
 	
 	
 	
-	$var=false;
+	$var = false;
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("RecapGeneration").'</td>'."\n";
@@ -293,7 +293,7 @@ 
 	print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
 	print '</tr>';
 	
-	$var=!$var;
+	$var = !$var;
 	print '<tr '.$bc[$var].'>';
 	print '<td>'.$langs->trans('SUBTOTAL_KEEP_RECAP_FILE').'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -301,7 +301,7 @@ 
 	print ajax_constantonoff('SUBTOTAL_KEEP_RECAP_FILE');
 	print '</td></tr>';
 	
-	$var=!$var;
+	$var = !$var;
 	print '<tr '.$bc[$var].'>';
 	print '<td>'.$langs->trans('SUBTOTAL_PROPAL_ADD_RECAP').'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -309,7 +309,7 @@ 
 	print ajax_constantonoff('SUBTOTAL_PROPAL_ADD_RECAP');
 	print '</td></tr>';
 	
-	$var=!$var;
+	$var = !$var;
 	print '<tr '.$bc[$var].'>';
 	print '<td>'.$langs->trans('SUBTOTAL_COMMANDE_ADD_RECAP').'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -318,7 +318,7 @@ 
 	print '</td></tr>';
 	
 	
-	$var=!$var;
+	$var = !$var;
 	print '<tr '.$bc[$var].'>';
 	print '<td>'.$langs->trans('SUBTOTAL_INVOICE_ADD_RECAP').'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -342,7 +342,7 @@ 
 				<form method="POST" action="<?php echo $_SERVER['PHP_SELF'] ?>">
 					<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken'] ?>">
 					<input type="hidden" name="action" value="set_SUBTOTAL_IF_HIDE_PRICES_SHOW_QTY" />
-					<?php echo $html->selectyesno("SUBTOTAL_IF_HIDE_PRICES_SHOW_QTY",$conf->global->SUBTOTAL_IF_HIDE_PRICES_SHOW_QTY,1); ?>
+					<?php echo $html->selectyesno("SUBTOTAL_IF_HIDE_PRICES_SHOW_QTY", $conf->global->SUBTOTAL_IF_HIDE_PRICES_SHOW_QTY, 1); ?>
 					<input type="submit" class="button" value="<?php echo $langs->trans("Modify") ?>">
 				</form>
 			</td>				
@@ -354,7 +354,7 @@ 
 				<form method="POST" action="<?php echo $_SERVER['PHP_SELF'] ?>">
 					<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken'] ?>">
 					<input type="hidden" name="action" value="set_SUBTOTAL_HIDE_DOCUMENT_TOTAL" />
-					<?php echo $html->selectyesno("SUBTOTAL_HIDE_DOCUMENT_TOTAL",$conf->global->SUBTOTAL_HIDE_DOCUMENT_TOTAL,1); ?>
+					<?php echo $html->selectyesno("SUBTOTAL_HIDE_DOCUMENT_TOTAL", $conf->global->SUBTOTAL_HIDE_DOCUMENT_TOTAL, 1); ?>
 					<input type="submit" class="button" value="<?php echo $langs->trans("Modify") ?>">
 				</form>
 			</td>				
@@ -367,7 +367,7 @@ 
 					<form method="POST" action="<?php echo $_SERVER['PHP_SELF'] ?>">
 						<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken'] ?>">
 						<input type="hidden" name="action" value="set_SUBTOTAL_SHOW_QTY_ON_TITLES" />
-						<?php echo $html->selectyesno("SUBTOTAL_SHOW_QTY_ON_TITLES",$conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES,1); ?>
+						<?php echo $html->selectyesno("SUBTOTAL_SHOW_QTY_ON_TITLES", $conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES, 1); ?>
 						<input type="submit" class="button" value="<?php echo $langs->trans("Modify") ?>">
 					</form>
 				</td>				
@@ -379,7 +379,7 @@ 
 					<form method="POST" action="<?php echo $_SERVER['PHP_SELF'] ?>">
 						<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken'] ?>">
 						<input type="hidden" name="action" value="set_SUBTOTAL_ONLY_HIDE_SUBPRODUCTS_PRICES" />
-						<?php echo $html->selectyesno("SUBTOTAL_ONLY_HIDE_SUBPRODUCTS_PRICES",$conf->global->SUBTOTAL_ONLY_HIDE_SUBPRODUCTS_PRICES,1); ?>
+						<?php echo $html->selectyesno("SUBTOTAL_ONLY_HIDE_SUBPRODUCTS_PRICES", $conf->global->SUBTOTAL_ONLY_HIDE_SUBPRODUCTS_PRICES, 1); ?>
 						<input type="submit" class="button" value="<?php echo $langs->trans("Modify") ?>">
 					</form>
 				</td>				

class/actions_subtotal.class.php

Spacing +355 added lines, -355 removed lines

@@ -51,37 +51,37 @@ 
     
     function formObjectOptions($parameters, &$object, &$action, $hookmanager) 
     {
-      	global $langs,$db,$user, $conf;
+      	global $langs, $db, $user, $conf;
 		
 		$langs->load('subtotal@subtotal');
 		
-		$contexts = explode(':',$parameters['context']);
+		$contexts = explode(':', $parameters['context']);
 		
-		if(in_array('ordercard',$contexts) || in_array('propalcard',$contexts) || in_array('invoicecard',$contexts) || in_array('invoicereccard',$contexts)) {
+		if (in_array('ordercard', $contexts) || in_array('propalcard', $contexts) || in_array('invoicecard', $contexts) || in_array('invoicereccard', $contexts)) {
 			
 			$createRight = $user->rights->{$object->element}->creer;
-			if($object->element == 'facturerec' )
+			if ($object->element == 'facturerec')
 			{
 				$object->statut = 0; // hack for facture rec
 				$createRight = $user->rights->facture->creer;
 			}
 			
-			if ($object->statut == 0  && $createRight) {
+			if ($object->statut == 0 && $createRight) {
 			
 
-				if($object->element=='facture')$idvar = 'facid';
-				else $idvar='id';
+				if ($object->element == 'facture')$idvar = 'facid';
+				else $idvar = 'id';
 				
-				if(in_array($action, array('add_title_line', 'add_total_line', 'add_subtitle_line', 'add_subtotal_line', 'add_free_text')) )
+				if (in_array($action, array('add_title_line', 'add_total_line', 'add_subtitle_line', 'add_subtotal_line', 'add_free_text')))
 				{
 					$level = GETPOST('level', 'int'); //New avec SUBTOTAL_USE_NEW_FORMAT
 					
-					if($action=='add_title_line') {
+					if ($action == 'add_title_line') {
 						$title = GETPOST('title');
-						if(empty($title)) $title = $langs->trans('title');
-						$qty = $level<1 ? 1 : $level ;
+						if (empty($title)) $title = $langs->trans('title');
+						$qty = $level < 1 ? 1 : $level;
 					}
-					else if($action=='add_free_text') {
+					else if ($action == 'add_free_text') {
 						$title = GETPOST('title');
 
 						if (empty($title)) {
@@ -93,21 +93,21 @@ 
 								}
 							}
 						}
-						if(empty($title)) $title = $langs->trans('subtotalAddLineDescription');
+						if (empty($title)) $title = $langs->trans('subtotalAddLineDescription');
 						$qty = 50;
 					}
-					else if($action=='add_subtitle_line') {
+					else if ($action == 'add_subtitle_line') {
 						$title = GETPOST('title');
-						if(empty($title)) $title = $langs->trans('subtitle');
+						if (empty($title)) $title = $langs->trans('subtitle');
 						$qty = 2;
 					}
-					else if($action=='add_subtotal_line') {
+					else if ($action == 'add_subtotal_line') {
 						$title = $langs->trans('SubSubTotal');
 						$qty = 98;
 					}
 					else {
 						$title = GETPOST('title') ? GETPOST('title') : $langs->trans('SubTotal');
-						$qty = $level ? 100-$level : 99;
+						$qty = $level ? 100 - $level : 99;
 					}
 					dol_include_once('/subtotal/class/subtotal.class.php');
 					
@@ -115,15 +115,15 @@ 
 					
 	    			TSubtotal::addSubTotalLine($object, $title, $qty);
 				}
-				else if($action==='ask_deleteallline') {
-						$form=new Form($db);
+				else if ($action === 'ask_deleteallline') {
+						$form = new Form($db);
 						
-						$lineid = GETPOST('lineid','integer');
+						$lineid = GETPOST('lineid', 'integer');
 						$TIdForGroup = $this->getArrayOfLineForAGroup($object, $lineid);
 					
 						$nbLines = count($TIdForGroup);
 					
-						$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('deleteWithAllLines'), $langs->trans('ConfirmDeleteAllThisLines',$nbLines), 'confirm_delete_all_lines','',0,1);
+						$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('deleteWithAllLines'), $langs->trans('ConfirmDeleteAllThisLines', $nbLines), 'confirm_delete_all_lines', '', 0, 1);
 						print $formconfirm;
 				}
 
@@ -133,13 +133,13 @@ 
 				}
 
 				
-				if($action!='editline') {
+				if ($action != 'editline') {
 					// New format is for 3.8
 					$this->printNewFormat($object, $conf, $langs, $idvar);
 				}
 			}
 		}
-		elseif ((!empty($parameters['currentcontext']) && $parameters['currentcontext'] == 'orderstoinvoice') || in_array('orderstoinvoice',$contexts))
+		elseif ((!empty($parameters['currentcontext']) && $parameters['currentcontext'] == 'orderstoinvoice') || in_array('orderstoinvoice', $contexts))
 		{
 			?>
 			<script type="text/javascript">
@@ -164,7 +164,7 @@ 
 				$(document).ready(function() {
 					$('div.fiche div.tabsAction').append('<br />');
 					
-					$('div.fiche div.tabsAction').append('<div class="inline-block divButAction"><a id="add_title_line" rel="add_title_line" href="javascript:;" class="butAction"><?php echo  $langs->trans('AddTitle' )?></a></div>');
+					$('div.fiche div.tabsAction').append('<div class="inline-block divButAction"><a id="add_title_line" rel="add_title_line" href="javascript:;" class="butAction"><?php echo  $langs->trans('AddTitle')?></a></div>');
 					$('div.fiche div.tabsAction').append('<div class="inline-block divButAction"><a id="add_total_line" rel="add_total_line" href="javascript:;" class="butAction"><?php echo  $langs->trans('AddSubTotal')?></a></div>');
 					$('div.fiche div.tabsAction').append('<div class="inline-block divButAction"><a id="add_free_text" rel="add_free_text" href="javascript:;" class="butAction"><?php echo  $langs->trans('AddFreeText')?></a></div>');
 
@@ -215,9 +215,9 @@ 
 						$('body').append(dialog_html);
 
 						<?php 
-						$editorTool = empty($conf->global->FCKEDITOR_EDITORNAME)?'ckeditor':$conf->global->FCKEDITOR_EDITORNAME;
-						$editorConf = empty($conf->global->FCKEDITOR_ENABLE_DETAILS)?false:$conf->global->FCKEDITOR_ENABLE_DETAILS;
-						if($editorConf && in_array($editorTool,array('textarea','ckeditor'))){ 
+						$editorTool = empty($conf->global->FCKEDITOR_EDITORNAME) ? 'ckeditor' : $conf->global->FCKEDITOR_EDITORNAME;
+						$editorConf = empty($conf->global->FCKEDITOR_ENABLE_DETAILS) ?false:$conf->global->FCKEDITOR_ENABLE_DETAILS;
+						if ($editorConf && in_array($editorTool, array('textarea', 'ckeditor'))) { 
 						?>
 						if (action == 'addTitle' || action == 'addFreeTxt')
 						{
@@ -332,57 +332,57 @@ 
 		global $conf, $langs, $bc;
 			
 		$action = GETPOST('action');	
-		$TContext = explode(':',$parameters['context']);
+		$TContext = explode(':', $parameters['context']);
 		if (
-				in_array('invoicecard',$TContext)
-				|| in_array('propalcard',$TContext)
-				|| in_array('ordercard',$TContext)
-				|| in_array('invoicereccard',$TContext)
+				in_array('invoicecard', $TContext)
+				|| in_array('propalcard', $TContext)
+				|| in_array('ordercard', $TContext)
+				|| in_array('invoicereccard', $TContext)
 			)
 	        {	
-				$hideInnerLines	= isset( $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']] ) ?  $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']] : 0;
-				$hidedetails	= isset( $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']] ) ?  $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']] : 0;
-				$hideprices= isset( $_SESSION['subtotal_hideprices_'.$parameters['modulepart']] ) ?  $_SESSION['subtotal_hideprices_'.$parameters['modulepart']] : 0;
+				$hideInnerLines = isset($_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']]) ? $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']] : 0;
+				$hidedetails = isset($_SESSION['subtotal_hidedetails_'.$parameters['modulepart']]) ? $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']] : 0;
+				$hideprices = isset($_SESSION['subtotal_hideprices_'.$parameters['modulepart']]) ? $_SESSION['subtotal_hideprices_'.$parameters['modulepart']] : 0;
 				
-				$var=false;
-		     	$out.= '<tr '.$bc[$var].'>
+				$var = false;
+		     	$out .= '<tr '.$bc[$var].'>
 		     			<td colspan="4" align="right">
 		     				<label for="hideInnerLines">'.$langs->trans('HideInnerLines').'</label>
-		     				<input type="checkbox" onclick="if($(this).is(\':checked\')) { $(\'#hidedetails\').prop(\'checked\', \'checked\')  }" id="hideInnerLines" name="hideInnerLines" value="1" '.(( $hideInnerLines ) ? 'checked="checked"' : '' ).' />
+		     				<input type="checkbox" onclick="if($(this).is(\':checked\')) { $(\'#hidedetails\').prop(\'checked\', \'checked\')  }" id="hideInnerLines" name="hideInnerLines" value="1" '.(($hideInnerLines) ? 'checked="checked"' : '').' />
 		     			</td>
 		     			</tr>';
 				
-		     	$var=!$var;
-		     	$out.= '<tr '.$bc[$var].'>
+		     	$var = !$var;
+		     	$out .= '<tr '.$bc[$var].'>
 		     			<td colspan="4" align="right">
 		     				<label for="hidedetails">'.$langs->trans('SubTotalhidedetails').'</label>
-		     				<input type="checkbox" id="hidedetails" name="hidedetails" value="1" '.(( $hidedetails ) ? 'checked="checked"' : '' ).' />
+		     				<input type="checkbox" id="hidedetails" name="hidedetails" value="1" '.(($hidedetails) ? 'checked="checked"' : '').' />
 		     			</td>
 		     			</tr>';
 		     	
-		     	$var=!$var;
-		     	$out.= '<tr '.$bc[$var].'>
+		     	$var = !$var;
+		     	$out .= '<tr '.$bc[$var].'>
 		     			<td colspan="4" align="right">
 		     				<label for="hidedetails">'.$langs->trans('SubTotalhidePrice').'</label>
-		     				<input type="checkbox" id="hideprices" name="hideprices" value="1" '.(( $hideprices ) ? 'checked="checked"' : '' ).' />
+		     				<input type="checkbox" id="hideprices" name="hideprices" value="1" '.(($hideprices) ? 'checked="checked"' : '').' />
 		     			</td>
 		     			</tr>';
 		     	
 		     	
 				 
 				if ( 
-					(in_array('propalcard',$TContext) && !empty($conf->global->SUBTOTAL_PROPAL_ADD_RECAP))
-					|| (in_array('ordercard',$TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
-					|| (in_array('invoicecard',$TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
-					|| (in_array('invoicereccard',$TContext)  && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP ))
+					(in_array('propalcard', $TContext) && !empty($conf->global->SUBTOTAL_PROPAL_ADD_RECAP))
+					|| (in_array('ordercard', $TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
+					|| (in_array('invoicecard', $TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
+					|| (in_array('invoicereccard', $TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
 				)
 				{
-					$var=!$var;
-					$out.= '
+					$var = !$var;
+					$out .= '
 						<tr '.$bc[$var].'>
 							<td colspan="4" align="right">
 								<label for="subtotal_add_recap">'.$langs->trans('subtotal_add_recap').'</label>
-								<input type="checkbox" id="subtotal_add_recap" name="subtotal_add_recap" value="1" '.( GETPOST('subtotal_add_recap') ? 'checked="checked"' : '' ).' />
+								<input type="checkbox" id="subtotal_add_recap" name="subtotal_add_recap" value="1" '.(GETPOST('subtotal_add_recap') ? 'checked="checked"' : '').' />
 							</td>
 						</tr>';
 				}
@@ -398,7 +398,7 @@ 
     function formEditProductOptions($parameters, &$object, &$action, $hookmanager) 
     {
 		
-    	if (in_array('invoicecard',explode(':',$parameters['context'])))
+    	if (in_array('invoicecard', explode(':', $parameters['context'])))
         {
         	
         }
@@ -409,13 +409,13 @@ 
 	function ODTSubstitutionLine(&$parameters, &$object, $action, $hookmanager) {
 		global $conf;
 		
-		if($action === 'builddoc') {
+		if ($action === 'builddoc') {
 			
 			$line = &$parameters['line'];
 			$object = &$parameters['object'];
 			$substitutionarray = &$parameters['substitutionarray'];
 			
-			if($line->product_type == 9 && $line->special_code == $this->module_number) {
+			if ($line->product_type == 9 && $line->special_code == $this->module_number) {
 				$substitutionarray['line_modsubtotal'] = 1;	
 				
 				$substitutionarray['line_price_ht']
@@ -426,7 +426,7 @@ 
 					 = $substitutionarray['line_up'] 
 					 = '';
 				
-				if($line->qty>90) {
+				if ($line->qty > 90) {
 					$substitutionarray['line_modsubtotal_total'] = true;
 					
 					list($total, $total_tva, $total_ttc, $TTotal_tva) = $this->getTotalLineFromObject($object, $line, '', 1);
@@ -440,7 +440,7 @@ 
 				
 				
 			}	
-			else{
+			else {
 				$substitutionarray['line_not_modsubtotal'] = true;
 				$substitutionarray['line_modsubtotal'] = 0;
 			}
@@ -452,26 +452,26 @@ 
 	function createFrom($parameters, &$object, $action, $hookmanager) {
 	
 		if (
-				in_array('invoicecard',explode(':',$parameters['context']))
-				|| in_array('propalcard',explode(':',$parameters['context']))
-				|| in_array('ordercard',explode(':',$parameters['context']))
-				|| in_array('invoicereccard',explode(':',$parameters['context']))
+				in_array('invoicecard', explode(':', $parameters['context']))
+				|| in_array('propalcard', explode(':', $parameters['context']))
+				|| in_array('ordercard', explode(':', $parameters['context']))
+				|| in_array('invoicereccard', explode(':', $parameters['context']))
 		) {
 			
 			global $db;
 			
 			$objFrom = $parameters['objFrom'];
 			
-			foreach($objFrom->lines as $k=> &$lineOld) {
+			foreach ($objFrom->lines as $k=> &$lineOld) {
 				
-					if($lineOld->product_type == 9 && $lineOld->info_bits > 0 ) {
+					if ($lineOld->product_type == 9 && $lineOld->info_bits > 0) {
 							
 							$line = & $object->lines[$k];
 				
 							$idLine = (int) ($line->id ? $line->id : $line->rowid); 
 				
 							$db->query("UPDATE ".MAIN_DB_PREFIX.$line->table_element."
-							SET info_bits=".(int)$lineOld->info_bits."
+							SET info_bits=".(int) $lineOld->info_bits."
 							WHERE rowid = ".$idLine."
 							");
 						
@@ -487,15 +487,15 @@ 
 	
 	function doActions($parameters, &$object, $action, $hookmanager)
 	{
-		global $db, $conf, $langs,$user;
+		global $db, $conf, $langs, $user;
 		
 		dol_include_once('/subtotal/class/subtotal.class.php');
 		dol_include_once('/subtotal/lib/subtotal.lib.php');
-		require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		
 		$showBlockExtrafields = GETPOST('showBlockExtrafields');
 		
-		if($object->element=='facture') $idvar = 'facid';
+		if ($object->element == 'facture') $idvar = 'facid';
 		else $idvar = 'id';
 			
 		if ($action == 'updateligne' || $action == 'updateline')
@@ -508,7 +508,7 @@ 
 				if ($line->id == $lineid && TSubtotal::isModSubtotalLine($line))
 				{
 					$found = true;
-					if(TSubtotal::isTitle($line) && !empty($showBlockExtrafields)) {
+					if (TSubtotal::isTitle($line) && !empty($showBlockExtrafields)) {
 						$extrafieldsline = new ExtraFields($db);
 						$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
 						$extrafieldsline->setOptionalsFromPost($extralabelsline, $line);
@@ -527,25 +527,25 @@ 
 				exit; // Surtout ne pas laisser Dolibarr faire du traitement sur le updateligne sinon ça plante les données de la ligne
 			}
 		}
-		else if($action === 'builddoc') {
+		else if ($action === 'builddoc') {
 			
 			if (
-				in_array('invoicecard',explode(':',$parameters['context']))
-				|| in_array('propalcard',explode(':',$parameters['context']))
-				|| in_array('ordercard',explode(':',$parameters['context']))
+				in_array('invoicecard', explode(':', $parameters['context']))
+				|| in_array('propalcard', explode(':', $parameters['context']))
+				|| in_array('ordercard', explode(':', $parameters['context']))
 			)
 	        {								
-				if(in_array('invoicecard',explode(':',$parameters['context']))) {
+				if (in_array('invoicecard', explode(':', $parameters['context']))) {
 					$sessname = 'subtotal_hideInnerLines_facture';	
 					$sessname2 = 'subtotal_hidedetails_facture';
 					$sessname3 = 'subtotal_hideprices_facture';
 				}
-				elseif(in_array('propalcard',explode(':',$parameters['context']))) {
+				elseif (in_array('propalcard', explode(':', $parameters['context']))) {
 					$sessname = 'subtotal_hideInnerLines_propal';
 					$sessname2 = 'subtotal_hidedetails_propal';	
 					$sessname3 = 'subtotal_hideprices_propal';
 				}
-				elseif(in_array('ordercard',explode(':',$parameters['context']))) {
+				elseif (in_array('ordercard', explode(':', $parameters['context']))) {
 					$sessname = 'subtotal_hideInnerLines_commande';
 					$sessname2 = 'subtotal_hidedetails_commande';	
 					$sessname3 = 'subtotal_hideprices_commande';
@@ -558,22 +558,22 @@ 
 					
 				global $hideprices;
 				
-				$hideInnerLines = (int)GETPOST('hideInnerLines');
+				$hideInnerLines = (int) GETPOST('hideInnerLines');
 				$_SESSION[$sessname] = $hideInnerLines;		
 				
-				$hidedetails= (int)GETPOST('hidedetails');
+				$hidedetails = (int) GETPOST('hidedetails');
 				$_SESSION[$sessname2] = $hidedetails;
 				
-				$hideprices= (int)GETPOST('hideprices');
+				$hideprices = (int) GETPOST('hideprices');
 				$_SESSION[$sessname3] = $hideprices;
 				
-				foreach($object->lines as &$line) {
+				foreach ($object->lines as &$line) {
 					if ($line->product_type == 9 && $line->special_code == $this->module_number) {
 					    
-                        if($line->qty>=90) {
+                        if ($line->qty >= 90) {
                             $line->modsubtotal_total = 1;
                         }
-                        else{
+                        else {
                             $line->modsubtotal_title = 1;
                         }
                         
@@ -583,23 +583,23 @@ 
 	        }
 			
 		}
-		else if($action === 'confirm_delete_all_lines' && GETPOST('confirm')=='yes') {
+		else if ($action === 'confirm_delete_all_lines' && GETPOST('confirm') == 'yes') {
 			
 			$Tab = $this->getArrayOfLineForAGroup($object, GETPOST('lineid'));
 			
-			foreach($Tab as $idLine) {
+			foreach ($Tab as $idLine) {
 				/**
 				 * @var $object Facture
 				 */
-				if($object->element=='facture') $object->deleteline($idLine);
+				if ($object->element == 'facture') $object->deleteline($idLine);
 				/**
 				 * @var $object Propal
 				 */
-				else if($object->element=='propal') $object->deleteline($idLine);
+				else if ($object->element == 'propal') $object->deleteline($idLine);
 				/**
 				 * @var $object Commande
 				 */
-				else if($object->element=='commande') 
+				else if ($object->element == 'commande') 
 				{
 					if ((float) DOL_VERSION >= 5.0) $object->deleteline($user, $idLine);
 					else $object->deleteline($idLine);
@@ -607,7 +607,7 @@ 
 				/**
 				 * @var $object Facturerec
 				 */
-				else if($object->element=='facturerec') $object->deleteline($idLine);
+				else if ($object->element == 'facturerec') $object->deleteline($idLine);
 			}
 			
 			header('location:?id='.$object->id);
@@ -630,7 +630,7 @@ 
 		return 0;
 	}
 	
-	function formAddObjectLine ($parameters, &$object, &$action, $hookmanager) {
+	function formAddObjectLine($parameters, &$object, &$action, $hookmanager) {
 		return 0;
 	}
 
@@ -642,20 +642,20 @@ 
 		
 		$found = false;
 
-		$Tab= array();
+		$Tab = array();
 		
-		foreach($object->lines as $l) {
+		foreach ($object->lines as $l) {
 		
-			if($l->rowid == $lineid) {
+			if ($l->rowid == $lineid) {
 				$found = true;
 				$qty_line = $l->qty;
 			}
 			
-			if($found) {
+			if ($found) {
 				
 				$Tab[] = $l->rowid;
 				
-				if($l->special_code==$this->module_number && (($l->qty==99 && $qty_line==1) || ($l->qty==98 && $qty_line==2))   ) {
+				if ($l->special_code == $this->module_number && (($l->qty == 99 && $qty_line == 1) || ($l->qty == 98 && $qty_line == 2))) {
 					break; // end of story
 				}
 			}
@@ -684,7 +684,7 @@ 
 	 * 
 	 * @param	$use_level		isn't used anymore
 	 */
-	function getTotalLineFromObject(&$object, &$line, $use_level=false, $return_all=0) {
+	function getTotalLineFromObject(&$object, &$line, $use_level = false, $return_all = 0) {
 		
 		$rang = $line->rang;
 		$qty_line = $line->qty;
@@ -695,21 +695,21 @@ 
 		$TTotal_tva = array();
 		
 		dol_include_once('/subtotal/class/subtotal.class.php');
-		foreach($object->lines as $l) {
+		foreach ($object->lines as $l) {
 			//print $l->rang.'>='.$rang.' '.$total.'<br/>';
-			if($l->rang>=$rang) {
+			if ($l->rang >= $rang) {
 				//echo 'return!<br>';
 				if (!$return_all) return $total;
 				else return array($total, $total_tva, $total_ttc, $TTotal_tva);
 			}
-			else if(TSubtotal::isTitle($l, 100 - $qty_line)) 
+			else if (TSubtotal::isTitle($l, 100 - $qty_line)) 
 		  	{
 				$total = 0;
 				$total_tva = 0;
 				$total_ttc = 0;
 				$TTotal_tva = array();
 			}
-			elseif(!TSubtotal::isTitle($l) && !TSubtotal::isSubtotal($l)) {
+			elseif (!TSubtotal::isTitle($l) && !TSubtotal::isSubtotal($l)) {
 				$total += $l->total_ht;
 				$total_tva += $l->total_tva;
 				$TTotal_tva[$l->tva_tx] += $l->total_tva;
@@ -728,18 +728,18 @@ 
 		
 		$rang = $line->rang;
 		$total = 0;
-		foreach($object->lines as $l) {
-			if($l->rang>=$rang) {
+		foreach ($object->lines as $l) {
+			if ($l->rang >= $rang) {
 				return price($total);
 			}
-                        if (TSubtotal::isSubtotal($l)){
+                        if (TSubtotal::isSubtotal($l)) {
                             $total = 0;
-                        } else  if ($l->situation_percent > 0 ){
+                        } else  if ($l->situation_percent > 0) {
                            
         	
 		 	$prev_progress = $l->get_prev_progress($object->id);
-		 	$progress = ($l->situation_percent - $prev_progress) /100;
-                        $total += ($l->total_ht/($l->situation_percent/100)) * $progress;
+		 	$progress = ($l->situation_percent - $prev_progress) / 100;
+                        $total += ($l->total_ht / ($l->situation_percent / 100)) * $progress;
                         
                     }
                 }
@@ -758,10 +758,10 @@ 
 	 * @param $w            float               width
 	 * @param $h            float               height
 	 */
-	function pdf_add_total(&$pdf,&$object, &$line, $label, $description,$posx, $posy, $w, $h) {
-		global $conf,$subtotal_last_title_posy;
+	function pdf_add_total(&$pdf, &$object, &$line, $label, $description, $posx, $posy, $w, $h) {
+		global $conf, $subtotal_last_title_posy;
 		
-		$hideInnerLines = (int)GETPOST('hideInnerLines');
+		$hideInnerLines = (int) GETPOST('hideInnerLines');
 		if (!empty($conf->global->SUBTOTAL_ONE_LINE_IF_HIDE_INNERLINES) && $hideInnerLines && !empty($subtotal_last_title_posy))
 		{
 			$posy = $subtotal_last_title_posy;
@@ -771,34 +771,34 @@ 
 		$hidePriceOnSubtotalLines = (int) GETPOST('hide_price_on_subtotal_lines');
 		
 		$set_pagebreak_margin = false;
-		if(method_exists('Closure','bind')) {
+		if (method_exists('Closure', 'bind')) {
 			$pageBreakOriginalValue = $pdf->AcceptPageBreak();
-			$sweetsThief = function ($pdf) {
-		    		return $pdf->bMargin ;
+			$sweetsThief = function($pdf) {
+		    		return $pdf->bMargin;
 			};
 			$sweetsThief = Closure::bind($sweetsThief, null, $pdf);
 	
-			$bMargin  = $sweetsThief($pdf);
+			$bMargin = $sweetsThief($pdf);
 	
-			$pdf->SetAutoPageBreak( false );
+			$pdf->SetAutoPageBreak(false);
 
 			$set_pagebreak_margin = true;			
 		}
 		
 			
-		if($line->qty==99)
-			$pdf->SetFillColor(220,220,220);
-		elseif ($line->qty==98)
-			$pdf->SetFillColor(230,230,230);
+		if ($line->qty == 99)
+			$pdf->SetFillColor(220, 220, 220);
+		elseif ($line->qty == 98)
+			$pdf->SetFillColor(230, 230, 230);
 		else
-			$pdf->SetFillColor(240,240,240);
+			$pdf->SetFillColor(240, 240, 240);
 		
 		$style = 'B';
 		if (!empty($conf->global->SUBTOTAL_SUBTOTAL_STYLE)) $style = $conf->global->SUBTOTAL_SUBTOTAL_STYLE;
 		
 		$pdf->SetFont('', $style, 9);
 		
-		$pdf->writeHTMLCell($w, $h, $posx, $posy, $label, 0, 1, false, true, 'R',true);
+		$pdf->writeHTMLCell($w, $h, $posx, $posy, $label, 0, 1, false, true, 'R', true);
 //		var_dump($bMargin);
 		$pageAfter = $pdf->getPage();
 		
@@ -823,7 +823,7 @@ 
 				}
 			}
 			
-			if($total_to_print) {
+			if ($total_to_print) {
 				
 				if (GETPOST('hideInnerLines'))
 				{
@@ -837,7 +837,7 @@ 
 				else
 				{
 					list($total, $total_tva, $total_ttc, $TTotal_tva) = $this->getTotalLineFromObject($object, $line, '', 1);
-                                        if(get_class($object) == 'Facture' && $object->type==Facture::TYPE_SITUATION){//Facture de situation
+                                        if (get_class($object) == 'Facture' && $object->type == Facture::TYPE_SITUATION) {//Facture de situation
                                                 $total_to_print = $this->getTotalToPrintSituation($object, $line);
                                         } else {
                                             	$total_to_print = price($total);
@@ -851,11 +851,11 @@ 
 			}
 
 			$pdf->SetXY($pdf->postotalht, $posy);
-			if($set_pagebreak_margin) $pdf->SetAutoPageBreak( $pageBreakOriginalValue , $bMargin);
-			$pdf->MultiCell($pdf->page_largeur-$pdf->marge_droite-$pdf->postotalht, 3, $total_to_print, 0, 'R', 0);
+			if ($set_pagebreak_margin) $pdf->SetAutoPageBreak($pageBreakOriginalValue, $bMargin);
+			$pdf->MultiCell($pdf->page_largeur - $pdf->marge_droite - $pdf->postotalht, 3, $total_to_print, 0, 'R', 0);
 		}
-		else{
-			if($set_pagebreak_margin) $pdf->SetAutoPageBreak( $pageBreakOriginalValue , $bMargin);
+		else {
+			if ($set_pagebreak_margin) $pdf->SetAutoPageBreak($pageBreakOriginalValue, $bMargin);
 		}
 		
 		$posy = $posy + $cell_height;
@@ -875,22 +875,22 @@ 
 	 * @param $w            float               width
 	 * @param $h            float               height
 	 */
-	function pdf_add_title(&$pdf,&$object, &$line, $label, $description,$posx, $posy, $w, $h) {
+	function pdf_add_title(&$pdf, &$object, &$line, $label, $description, $posx, $posy, $w, $h) {
 		
-		global $db,$conf,$subtotal_last_title_posy;
+		global $db, $conf, $subtotal_last_title_posy;
 		
 		$subtotal_last_title_posy = $posy;
-		$pdf->SetXY ($posx, $posy);
+		$pdf->SetXY($posx, $posy);
 		
-		$hideInnerLines = (int)GETPOST('hideInnerLines');
+		$hideInnerLines = (int) GETPOST('hideInnerLines');
 		
 		
  
-		$style = ($line->qty==1) ? 'BU' : 'BUI';
+		$style = ($line->qty == 1) ? 'BU' : 'BUI';
 		if (!empty($conf->global->SUBTOTAL_TITLE_STYLE)) $style = $conf->global->SUBTOTAL_TITLE_STYLE;
 		
-		if($hideInnerLines) {
-			if($line->qty==1)$pdf->SetFont('', $style, 9);
+		if ($hideInnerLines) {
+			if ($line->qty == 1)$pdf->SetFont('', $style, 9);
 			else 
 			{
 				if (!empty($conf->global->SUBTOTAL_STYLE_TITRES_SI_LIGNES_CACHEES)) $style = $conf->global->SUBTOTAL_STYLE_TITRES_SI_LIGNES_CACHEES;
@@ -899,43 +899,43 @@ 
 		}
 		else {
 
-			if($line->qty==1)$pdf->SetFont('', $style, 9); //TODO if super utile
+			if ($line->qty == 1)$pdf->SetFont('', $style, 9); //TODO if super utile
 			else $pdf->SetFont('', $style, 9);
 			
 		}
 		
 		if ($label === strip_tags($label) && $label === dol_html_entity_decode($label, ENT_QUOTES)) $pdf->MultiCell($w, $h, $label, 0, 'L'); // Pas de HTML dans la chaine
-		else $pdf->writeHTMLCell($w, $h, $posx, $posy, $label, 0, 1, false, true, 'J',true); // et maintenant avec du HTML
+		else $pdf->writeHTMLCell($w, $h, $posx, $posy, $label, 0, 1, false, true, 'J', true); // et maintenant avec du HTML
 		
-		if($description && !$hidedesc) {
+		if ($description && !$hidedesc) {
 			$posy = $pdf->GetY();
 			
 			$pdf->SetFont('', '', 8);
 			
-			$pdf->writeHTMLCell($w, $h, $posx, $posy, $description, 0, 1, false, true, 'J',true);
+			$pdf->writeHTMLCell($w, $h, $posx, $posy, $description, 0, 1, false, true, 'J', true);
 
 		}
 		
 	}
 
-	function pdf_writelinedesc_ref($parameters=array(), &$object, &$action='') {
+	function pdf_writelinedesc_ref($parameters = array(), &$object, &$action = '') {
 	// ultimate PDF hook O_o
 		
-		return $this->pdf_writelinedesc($parameters,$object,$action);
+		return $this->pdf_writelinedesc($parameters, $object, $action);
 		
 	}
 
 	function isModSubtotalLine(&$parameters, &$object) {
 		
-		if(is_array($parameters)) {
+		if (is_array($parameters)) {
 			$i = & $parameters['i'];	
 		}
 		else {
-			$i = (int)$parameters;
+			$i = (int) $parameters;
 		}
 		
 		
-		if($object->lines[$i]->special_code == $this->module_number && $object->lines[$i]->product_type == 9) {
+		if ($object->lines[$i]->special_code == $this->module_number && $object->lines[$i]->product_type == 9) {
 			return true;
 		}
 		
@@ -943,42 +943,42 @@ 
 		
 	}
 
-	function pdf_getlineqty($parameters=array(), &$object, &$action='') {
-		global $conf,$hideprices;
+	function pdf_getlineqty($parameters = array(), &$object, &$action = '') {
+		global $conf, $hideprices;
 		
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			
 			$this->resprints = ' ';
 			
-			if((float)DOL_VERSION<=3.6) {
+			if ((float) DOL_VERSION <= 3.6) {
 				return '';
 			}
-			else if((float)DOL_VERSION>=3.8) {
+			else if ((float) DOL_VERSION >= 3.8) {
 				return 1;
 			}
 			
 		}
-		elseif(!empty($hideprices)) {
+		elseif (!empty($hideprices)) {
 			$this->resprints = $object->lines[$parameters['i']]->qty;
 			return 1;
 		}
 		elseif (!empty($conf->global->SUBTOTAL_IF_HIDE_PRICES_SHOW_QTY))
 		{
-			$hideInnerLines = (int)GETPOST('hideInnerLines');
-			$hidedetails = (int)GETPOST('hidedetails');
+			$hideInnerLines = (int) GETPOST('hideInnerLines');
+			$hidedetails = (int) GETPOST('hidedetails');
 			if (empty($hideInnerLines) && !empty($hidedetails))
 			{
 				$this->resprints = $object->lines[$parameters['i']]->qty;
 			}
 		}
 		
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if (is_array($parameters)) $i = & $parameters['i'];
+		else $i = (int) $parameters;
 
 		if (empty($object->lines[$i])) return 0; // hideInnerLines => override $object->lines et Dolibarr ne nous permet pas de mettre à jour la variable qui conditionne la boucle sur les lignes (PR faite pour 6.0)
 		
 		$object->lines[$i]->fetch_optionals();
-		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
+		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		{
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
 			{
@@ -990,25 +990,25 @@ 
 		return 0;
 	}
 	
-	function pdf_getlinetotalexcltax($parameters=array(), &$object, &$action='') {
+	function pdf_getlinetotalexcltax($parameters = array(), &$object, &$action = '') {
 		global $conf, $hideprices;
 		
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			
 			$this->resprints = ' ';
 			
-			if((float)DOL_VERSION<=3.6) {
+			if ((float) DOL_VERSION <= 3.6) {
 				return '';
 			}
-			else if((float)DOL_VERSION>=3.8) {
+			else if ((float) DOL_VERSION >= 3.8) {
 				return 1;
 			}
 			
 		}
 		elseif (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS))
 		{
-			if(is_array($parameters)) $i = & $parameters['i'];
-			else $i = (int)$parameters;
+			if (is_array($parameters)) $i = & $parameters['i'];
+			else $i = (int) $parameters;
 			
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
 			{
@@ -1029,13 +1029,13 @@ 
 				}
 			}
 		}
-		if ((int)GETPOST('hideInnerLines') && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES)){
-		    if(is_array($parameters)) $i = & $parameters['i'];
-		    else $i = (int)$parameters;
+		if ((int) GETPOST('hideInnerLines') && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES)) {
+		    if (is_array($parameters)) $i = & $parameters['i'];
+		    else $i = (int) $parameters;
 		    $this->resprints = price($object->lines[$i]->total_ht);
 		}
 		if (!empty($hideprices)
-		    || (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
+		    || (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		    )
 		{
 		    if (!empty($hideprices) || !in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
@@ -1048,25 +1048,25 @@ 
 		return 0;
 	}
 	
-	function pdf_getlinetotalwithtax($parameters=array(), &$object, &$action='') {
+	function pdf_getlinetotalwithtax($parameters = array(), &$object, &$action = '') {
 		global $conf;
 		
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			
 			$this->resprints = ' ';
 		
-			if((float)DOL_VERSION<=3.6) {
+			if ((float) DOL_VERSION <= 3.6) {
 				return '';
 			}
-			else if((float)DOL_VERSION>=3.8) {
+			else if ((float) DOL_VERSION >= 3.8) {
 				return 1;
 			}
 		}
 		
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if (is_array($parameters)) $i = & $parameters['i'];
+		else $i = (int) $parameters;
 		
-		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) ) 
+		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i]))) 
 		{
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
 			{
@@ -1078,24 +1078,24 @@ 
 		return 0;
 	}
 	
-	function pdf_getlineunit($parameters=array(), &$object, &$action='') {
+	function pdf_getlineunit($parameters = array(), &$object, &$action = '') {
 		global $conf;
 		
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			$this->resprints = ' ';
 		
-			if((float)DOL_VERSION<=3.6) {
+			if ((float) DOL_VERSION <= 3.6) {
 				return '';
 			}
-			else if((float)DOL_VERSION>=3.8) {
+			else if ((float) DOL_VERSION >= 3.8) {
 				return 1;
 			}
 		}
 		
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if (is_array($parameters)) $i = & $parameters['i'];
+		else $i = (int) $parameters;
 			
-		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
+		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		{
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
 			{
@@ -1107,24 +1107,24 @@ 
 		return 0;
 	}
 	
-	function pdf_getlineupexcltax($parameters=array(), &$object, &$action='') {
-		global $conf,$hideprices;
+	function pdf_getlineupexcltax($parameters = array(), &$object, &$action = '') {
+		global $conf, $hideprices;
 
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			$this->resprints = ' ';
 		
-			if((float)DOL_VERSION<=3.6) {
+			if ((float) DOL_VERSION <= 3.6) {
 				return '';
 			}
-			else if((float)DOL_VERSION>=3.8) {
+			else if ((float) DOL_VERSION >= 3.8) {
 				return 1;
 			}
 		}
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if (is_array($parameters)) $i = & $parameters['i'];
+		else $i = (int) $parameters;
 		
 		if (!empty($hideprices) 
-				|| (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
+				|| (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		)
 		{
 			if (!empty($hideprices) || !in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
@@ -1137,24 +1137,24 @@ 
 		return 0;
 	}
 	
-	function pdf_getlineupwithtax($parameters=array(), &$object, &$action='') {
-		global $conf,$hideprices;
+	function pdf_getlineupwithtax($parameters = array(), &$object, &$action = '') {
+		global $conf, $hideprices;
 		
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			$this->resprints = ' ';
-			if((float)DOL_VERSION<=3.6) {
+			if ((float) DOL_VERSION <= 3.6) {
 				return '';
 			}
-			else if((float)DOL_VERSION>=3.8) {
+			else if ((float) DOL_VERSION >= 3.8) {
 				return 1;
 			}
 		}
 		
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if (is_array($parameters)) $i = & $parameters['i'];
+		else $i = (int) $parameters;
 			
 		if (!empty($hideprices)
-				|| (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
+				|| (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		)
 		{
 			if (!empty($hideprices) || !in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
@@ -1167,27 +1167,27 @@ 
 		return 0;
 	}
 	
-	function pdf_getlinevatrate($parameters=array(), &$object, &$action='') {
+	function pdf_getlinevatrate($parameters = array(), &$object, &$action = '') {
 		global $conf;
 		
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			$this->resprints = ' ';
 			
-			if((float)DOL_VERSION<=3.6) {
+			if ((float) DOL_VERSION <= 3.6) {
 				return '';
 			}
-			else if((float)DOL_VERSION>=3.8) {
+			else if ((float) DOL_VERSION >= 3.8) {
 				return 1;
 			}
 		}
 		
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if (is_array($parameters)) $i = & $parameters['i'];
+		else $i = (int) $parameters;
 		
 		if (empty($object->lines[$i])) return 0; // hideInnerLines => override $object->lines et Dolibarr ne nous permet pas de mettre à jour la variable qui conditionne la boucle sur les lignes (PR faite pour 6.0)
 
 		$object->lines[$i]->fetch_optionals();
-		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
+		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		{
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
 			{
@@ -1199,23 +1199,23 @@ 
 		return 0;
 	}
 		
-	function pdf_getlineprogress($parameters=array(), &$object, &$action) {
+	function pdf_getlineprogress($parameters = array(), &$object, &$action) {
 		global $conf;
 		
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			$this->resprints = ' ';
-			if((float)DOL_VERSION<=3.6) {
+			if ((float) DOL_VERSION <= 3.6) {
 				return '';
 			}
-			else if((float)DOL_VERSION>=3.8) {
+			else if ((float) DOL_VERSION >= 3.8) {
 				return 1;
 			}
 		}
 		
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if (is_array($parameters)) $i = & $parameters['i'];
+		else $i = (int) $parameters;
 			
-		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
+		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		{
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
 			{
@@ -1230,12 +1230,12 @@ 
 	function add_numerotation(&$object) {
 		global $conf;
 		
-		if(!empty($conf->global->SUBTOTAL_USE_NUMEROTATION)) {
+		if (!empty($conf->global->SUBTOTAL_USE_NUMEROTATION)) {
 		
 			$TLevelTitre = array();
 			$prevlevel = 0;
 		
-			foreach($object->lines as $k=>&$line) 
+			foreach ($object->lines as $k=>&$line) 
 			{
 				if ($line->id > 0 && $this->isModSubtotalLine($k, $object) && $line->qty <= 10)
 				{
@@ -1249,12 +1249,12 @@ 
 	}
 
 	// TODO ne gère pas encore la numération des lignes "Totaux"
-	private function formatNumerotation(&$TLineTitle, $line_reference='', $level=1, $prefix_num=0)
+	private function formatNumerotation(&$TLineTitle, $line_reference = '', $level = 1, $prefix_num = 0)
 	{
 		$TTitle = array();
 		
-		$i=1;
-		$j=0;
+		$i = 1;
+		$j = 0;
 		foreach ($TLineTitle as $k => &$line)
 		{
 			if (!empty($line_reference) && $line->rang <= $line_reference->rang) continue;
@@ -1264,7 +1264,7 @@ 
 			{
 				$TTitle[$j]['numerotation'] = ($prefix_num == 0) ? $i : $prefix_num.'.'.$i;
 				//var_dump('Prefix == '.$prefix_num.' // '.$line->desc.' ==> numerotation == '.$TTitle[$j]['numerotation'].'   ###    '.$line->qty .'=='. $level);
-				if (empty($line->label) && (float)DOL_VERSION < 6)
+				if (empty($line->label) && (float) DOL_VERSION < 6)
 				{
 					$line->label = !empty($line->desc) ? $line->desc : $line->description;
 					$line->desc = $line->description = '';
@@ -1290,26 +1290,26 @@ 
 	
 	function setDocTVA(&$pdf, &$object) {
 		
-		$hidedetails = (int)GETPOST('hidedetails');
+		$hidedetails = (int) GETPOST('hidedetails');
 		
-		if(empty($hidedetails)) return false;
+		if (empty($hidedetails)) return false;
 		
 		// TODO can't add VAT to document without lines... :-/
 		
 		return true;
 	}
 	
-	function beforePDFCreation($parameters=array(), &$object, &$action)
+	function beforePDFCreation($parameters = array(), &$object, &$action)
 	{
 		/**
 		 * @var $pdf    TCPDF
 		 */
-		global $pdf,$conf, $langs;
+		global $pdf, $conf, $langs;
 
 		// var_dump($object->lines);
 		dol_include_once('/subtotal/class/subtotal.class.php');
 
-		foreach($parameters as $key=>$value) {
+		foreach ($parameters as $key=>$value) {
 			${$key} = $value;
 		}
 		
@@ -1318,25 +1318,25 @@ 
 		$this->add_numerotation($object);	
 		
 		
-		$hideInnerLines = (int)GETPOST('hideInnerLines');
-		$hidedetails = (int)GETPOST('hidedetails');
+		$hideInnerLines = (int) GETPOST('hideInnerLines');
+		$hidedetails = (int) GETPOST('hidedetails');
 		
 		if ($hideInnerLines) { // si c une ligne de titre
-	    	$fk_parent_line=0;
-			$TLines =array();
+	    	$fk_parent_line = 0;
+			$TLines = array();
 		
-			$original_count=count($object->lines);
+			$original_count = count($object->lines);
 		    $TTvas = array(); // tableau de tva
 		    
-			foreach($object->lines as $k=>&$line) 
+			foreach ($object->lines as $k=>&$line) 
 			{
 			    
-				if($line->product_type==9 && $line->rowid>0) 
+				if ($line->product_type == 9 && $line->rowid > 0) 
 				{
 					$fk_parent_line = $line->rowid;
 					
 					// Fix tk7201 - si on cache le détail, la TVA est renseigné au niveau du sous-total, l'erreur c'est s'il y a plusieurs sous-totaux pour les même lignes, ça va faire la somme
-					if(TSubtotal::isSubtotal($line)) 
+					if (TSubtotal::isSubtotal($line)) 
 					{
 						/*$total = $this->getTotalLineFromObject($object, $line, '');
 						
@@ -1356,27 +1356,27 @@ 
 			
 				if ($hideInnerLines)
 				{
-				    if(!empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
+				    if (!empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
 				    {
-				        if($line->tva_tx != '0.000' && $line->product_type!=9){
+				        if ($line->tva_tx != '0.000' && $line->product_type != 9) {
 				            
     				        // on remplit le tableau de tva pour substituer les lignes cachées
     				        $TTvas[$line->tva_tx]['total_tva'] += $line->total_tva;
     				        $TTvas[$line->tva_tx]['total_ht'] += $line->total_ht;
     				        $TTvas[$line->tva_tx]['total_ttc'] += $line->total_ttc; 
     				    }
-    					if($line->product_type==9 && $line->rowid>0)
+    					if ($line->product_type == 9 && $line->rowid > 0)
     					{
     					    //Cas où je doit cacher les produits et afficher uniquement les sous-totaux avec les titres
     					    // génère des lignes d'affichage des montants HT soumis à tva
     					    $nbtva = count($TTvas);
-    					    if(!empty($nbtva)){
-    					        foreach ($TTvas as $tx =>$val){
+    					    if (!empty($nbtva)) {
+    					        foreach ($TTvas as $tx =>$val) {
     					            $l = clone $line;
     					            $l->product_type = 1;
     					            $l->special_code = '';
     					            $l->qty = 1;
-    					            $l->desc = 'Montant HT soumis à '.$langs->trans('VAT').' '. price($tx) .' %';
+    					            $l->desc = 'Montant HT soumis à '.$langs->trans('VAT').' '.price($tx).' %';
     					            $l->tva_tx = $tx;
     					            $l->total_ht = $val['total_ht'];
     					            $l->total_tva = $val['total_tva'];
@@ -1392,7 +1392,7 @@ 
     					}
 				    } else {
 				        
-				        if($line->product_type==9 && $line->rowid>0)
+				        if ($line->product_type == 9 && $line->rowid > 0)
 				        {
 				            // ajoute la ligne de sous-total
 				            $TLines[] = $line; 
@@ -1420,14 +1420,14 @@ 
 			
 			// cas incongru où il y aurait des produits en dessous du dernier sous-total
 			$nbtva = count($TTvas);
-			if(!empty($nbtva) && $hideInnerLines && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
+			if (!empty($nbtva) && $hideInnerLines && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
 			{
-			    foreach ($TTvas as $tx =>$val){
+			    foreach ($TTvas as $tx =>$val) {
 			        $l = clone $line;
 			        $l->product_type = 1;
 			        $l->special_code = '';
 			        $l->qty = 1;
-			        $l->desc = 'Montant HT soumis à '.$langs->trans('VAT').' '. price($tx) .' %';
+			        $l->desc = 'Montant HT soumis à '.$langs->trans('VAT').' '.price($tx).' %';
 			        $l->tva_tx = $tx;
 			        $l->total_ht = $val['total_ht'];
 			        $l->total_tva = $val['total_tva'];
@@ -1439,11 +1439,11 @@ 
 			}
 			
 			global $nblignes;
-			$nblignes=count($TLines);
+			$nblignes = count($TLines);
 
 			$object->lines = $TLines;
 			
-			if($i>count($object->lines)) {
+			if ($i > count($object->lines)) {
 				$this->resprints = '';
 				return 0;
 			}
@@ -1452,59 +1452,59 @@ 
 		return 0;
 	}
 
-	function pdf_writelinedesc($parameters=array(), &$object, &$action)
+	function pdf_writelinedesc($parameters = array(), &$object, &$action)
 	{
 		/**
 		 * @var $pdf    TCPDF
 		 */
-		global $pdf,$conf;
+		global $pdf, $conf;
 
-		foreach($parameters as $key=>$value) {
+		foreach ($parameters as $key=>$value) {
 			${$key} = $value;
 		}
 		
-		$hideInnerLines = (int)GETPOST('hideInnerLines');
-		$hidedetails = (int)GETPOST('hidedetails');
+		$hideInnerLines = (int) GETPOST('hideInnerLines');
+		$hidedetails = (int) GETPOST('hidedetails');
 		
-		if($this->isModSubtotalLine($parameters,$object) ){			
+		if ($this->isModSubtotalLine($parameters, $object)) {			
 		
 				global $hideprices;
 				
-				if(!empty($hideprices)) {
-					foreach($object->lines as &$line) {
-						if($line->fk_product_type!=9) $line->fk_parent_line = -1;	
+				if (!empty($hideprices)) {
+					foreach ($object->lines as &$line) {
+						if ($line->fk_product_type != 9) $line->fk_parent_line = -1;	
 					}
 				}
 			
 				$line = &$object->lines[$i];
 				
-				if($line->info_bits>0) { // PAGE BREAK
+				if ($line->info_bits > 0) { // PAGE BREAK
 					$pdf->addPage();
 					$posy = $pdf->GetY();
 				}
 				
 				$label = $line->label;
-				$description= !empty($line->desc) ? $outputlangs->convToOutputCharset($line->desc) : $outputlangs->convToOutputCharset($line->description);
+				$description = !empty($line->desc) ? $outputlangs->convToOutputCharset($line->desc) : $outputlangs->convToOutputCharset($line->description);
 				
-				if(empty($label)) {
+				if (empty($label)) {
 					$label = $description;
-					$description='';
+					$description = '';
 				}
 				
-				if($line->qty>90) {
+				if ($line->qty > 90) {
 					
 					if ($conf->global->SUBTOTAL_USE_NEW_FORMAT)	$label .= ' '.$this->getTitle($object, $line);
 					
 					$pageBefore = $pdf->getPage();
-					$this->pdf_add_total($pdf,$object, $line, $label, $description,$posx, $posy, $w, $h);
+					$this->pdf_add_total($pdf, $object, $line, $label, $description, $posx, $posy, $w, $h);
 					$pageAfter = $pdf->getPage();	
 
-					if($pageAfter>$pageBefore) {
+					if ($pageAfter > $pageBefore) {
 						//print "ST $pageAfter>$pageBefore<br>";
 						$pdf->rollbackTransaction(true);	
-						$pdf->addPage('','', true);
+						$pdf->addPage('', '', true);
 						$posy = $pdf->GetY();
-						$this->pdf_add_total($pdf,$object, $line, $label, $description,$posx, $posy, $w, $h);
+						$this->pdf_add_total($pdf, $object, $line, $label, $description, $posx, $posy, $w, $h);
 						$posy = $pdf->GetY();
 						//print 'add ST'.$pdf->getPage().'<br />';
 					}
@@ -1515,7 +1515,7 @@ 
 				else if ($line->qty < 10) {
 					$pageBefore = $pdf->getPage();
 
-					$this->pdf_add_title($pdf,$object, $line, $label, $description,$posx, $posy, $w, $h); 
+					$this->pdf_add_title($pdf, $object, $line, $label, $description, $posx, $posy, $w, $h); 
 					$pageAfter = $pdf->getPage();	
 
 					
@@ -1590,9 +1590,9 @@ 
 	 * @param $hookmanager  HookManager
 	 * @return int
 	 */
-	function printObjectLine ($parameters, &$object, &$action, $hookmanager){
+	function printObjectLine($parameters, &$object, &$action, $hookmanager) {
 		
-		global $conf,$langs,$user,$db,$bc;
+		global $conf, $langs, $user, $db, $bc;
 		
 		$num = &$parameters['num'];
 		$line = &$parameters['line'];
@@ -1600,24 +1600,24 @@ 
 		
 		$var = &$parameters['var'];
 
-		$contexts = explode(':',$parameters['context']);
+		$contexts = explode(':', $parameters['context']);
 
 		$createRight = $user->rights->{$object->element}->creer;
-		if($object->element == 'facturerec' )
+		if ($object->element == 'facturerec')
 		{
 			$object->statut = 0; // hack for facture rec
 			$createRight = $user->rights->facture->creer;
 		}
 		
-		if($line->special_code!=$this->module_number || $line->product_type!=9) {
+		if ($line->special_code != $this->module_number || $line->product_type != 9) {
 			null;
 		}	
-		else if (in_array('invoicecard',$contexts) || in_array('propalcard',$contexts) || in_array('ordercard',$contexts) || in_array('invoicereccard',$contexts)) 
+		else if (in_array('invoicecard', $contexts) || in_array('propalcard', $contexts) || in_array('ordercard', $contexts) || in_array('invoicereccard', $contexts)) 
         {
-			if($object->element=='facture')$idvar = 'facid';
-			else $idvar='id';
+			if ($object->element == 'facture')$idvar = 'facid';
+			else $idvar = 'id';
 			
-			if((float)DOL_VERSION <= 3.4)
+			if ((float) DOL_VERSION <= 3.4)
 			{
 				?>
 				<script type="text/javascript">
@@ -1641,18 +1641,18 @@ 
 				<?php
 			}
 			
-			if(empty($line->description)) $line->description = $line->desc;
+			if (empty($line->description)) $line->description = $line->desc;
 			
 			$colspan = 5;
-			if($object->element == 'facturerec' ) $colspan = 3;
-
-			if(!empty($conf->multicurrency->enabled)) $colspan+=2;
-			if($object->element == 'commande' && $object->statut < 3 && !empty($conf->shippableorder->enabled)) $colspan++;
-			if(!empty($conf->margin->enabled)) $colspan++;
-			if(!empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
-			if(!empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
-			if($object->element == 'facture' && !empty($conf->global->INVOICE_USE_SITUATION) && $object->type == Facture::TYPE_SITUATION) $colspan++;
-			if(!empty($conf->global->PRODUCT_USE_UNITS)) $colspan++;
+			if ($object->element == 'facturerec') $colspan = 3;
+
+			if (!empty($conf->multicurrency->enabled)) $colspan += 2;
+			if ($object->element == 'commande' && $object->statut < 3 && !empty($conf->shippableorder->enabled)) $colspan++;
+			if (!empty($conf->margin->enabled)) $colspan++;
+			if (!empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
+			if (!empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
+			if ($object->element == 'facture' && !empty($conf->global->INVOICE_USE_SITUATION) && $object->type == Facture::TYPE_SITUATION) $colspan++;
+			if (!empty($conf->global->PRODUCT_USE_UNITS)) $colspan++;
 					
 			/* Titre */
 			//var_dump($line);
@@ -1662,35 +1662,35 @@ 
             
 			
 			?>
-			<tr <?php echo $bc[$var]; $var=!$var; echo $data; ?> rel="subtotal" id="row-<?php echo $line->id ?>" style="<?php
+			<tr <?php echo $bc[$var]; $var = !$var; echo $data; ?> rel="subtotal" id="row-<?php echo $line->id ?>" style="<?php
 					if (!empty($conf->global->SUBTOTAL_USE_NEW_FORMAT))
 					{
-						if($line->qty==99) print 'background:#adadcf';
-						else if($line->qty==98) print 'background:#ddddff;';
-						else if($line->qty<=97 && $line->qty>=91) print 'background:#eeeeff;';
-						else if($line->qty==1) print 'background:#adadcf;';
-						else if($line->qty==2) print 'background:#ddddff;';
-						else if($line->qty==50) print '';
+						if ($line->qty == 99) print 'background:#adadcf';
+						else if ($line->qty == 98) print 'background:#ddddff;';
+						else if ($line->qty <= 97 && $line->qty >= 91) print 'background:#eeeeff;';
+						else if ($line->qty == 1) print 'background:#adadcf;';
+						else if ($line->qty == 2) print 'background:#ddddff;';
+						else if ($line->qty == 50) print '';
 						else print 'background:#eeeeff;';
 
 						//A compléter si on veux plus de nuances de couleurs avec les niveau 4,5,6,7,8 et 9
 					}
 					else 
 					{
-						if($line->qty==99) print 'background:#ddffdd';
-						else if($line->qty==98) print 'background:#ddddff;';
-						else if($line->qty==2) print 'background:#eeeeff; ';
-						else if($line->qty==50) print '';
-						else print 'background:#eeffee;' ;
+						if ($line->qty == 99) print 'background:#ddffdd';
+						else if ($line->qty == 98) print 'background:#ddddff;';
+						else if ($line->qty == 2) print 'background:#eeeeff; ';
+						else if ($line->qty == 50) print '';
+						else print 'background:#eeffee;';
 					}
 
 			?>;">
 			
-				<td colspan="<?php echo $colspan; ?>" style="<?php TSubtotal::isFreeText($line) ? '' : 'font-weight:bold;'; ?>  <?php echo ($line->qty>90)?'text-align:right':'' ?> "><?php
-					if($action=='editline' && GETPOST('lineid') == $line->id && TSubtotal::isModSubtotalLine($line) ) {
+				<td colspan="<?php echo $colspan; ?>" style="<?php TSubtotal::isFreeText($line) ? '' : 'font-weight:bold;'; ?>  <?php echo ($line->qty > 90) ? 'text-align:right' : '' ?> "><?php
+					if ($action == 'editline' && GETPOST('lineid') == $line->id && TSubtotal::isModSubtotalLine($line)) {
 
-						$params=array('line'=>$line);
-						$reshook=$hookmanager->executeHooks('formEditProductOptions',$params,$object,$action);
+						$params = array('line'=>$line);
+						$reshook = $hookmanager->executeHooks('formEditProductOptions', $params, $object, $action);
 						
 						echo '<div id="line_'.$line->id.'"></div>'; // Imitation Dolibarr
 						echo '<input type="hidden" value="'.$line->id.'" name="lineid">';
@@ -1698,7 +1698,7 @@ 
 						echo '<input id="product_id" type="hidden" value="'.$line->fk_product.'" name="type">';
 						echo '<input id="special_code" type="hidden" value="'.$line->special_code.'" name="type">';
 
-						$isFreeText=false;
+						$isFreeText = false;
 						if (TSubtotal::isTitle($line))
 						{
 							$qty_displayed = $line->qty;
@@ -1716,13 +1716,13 @@ 
 						}
 						
 						$newlabel = $line->label;
-						if($line->label=='' && !$isFreeText) {
-							if(TSubtotal::isSubtotal($line)) {
+						if ($line->label == '' && !$isFreeText) {
+							if (TSubtotal::isSubtotal($line)) {
 								$newlabel = $line->description.' '.$this->getTitle($object, $line);
-								$line->description='';
-							} elseif( (float)DOL_VERSION < 6 ) {
-								$newlabel= $line->description;
-								$line->description='';
+								$line->description = '';
+							} elseif ((float) DOL_VERSION < 6) {
+								$newlabel = $line->description;
+								$line->description = '';
 							}
 						}
 
@@ -1731,10 +1731,10 @@ 
 						
 						if (!$isFreeText) echo '<input type="text" name="line-title" id-line="'.$line->id.'" value="'.$newlabel.'" size="80" '.$readonlyForSituation.'/>&nbsp;';
 						
-						if (!empty($conf->global->SUBTOTAL_USE_NEW_FORMAT) && (TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line)) )
+						if (!empty($conf->global->SUBTOTAL_USE_NEW_FORMAT) && (TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line)))
 						{
 							$select = '<select name="subtotal_level">';
-							for ($j=1; $j<10; $j++)
+							for ($j = 1; $j < 10; $j++)
 							{
 								if (!empty($readonlyForSituation)) {
 									if ($qty_displayed == $j) $select .= '<option selected="selected" value="'.$j.'">'.$langs->trans('Level').' '.$j.'</option>';
@@ -1747,7 +1747,7 @@ 
 						
 
 						echo '<div class="subtotal_underline" style="margin-left:24px;">';
-							echo '<label for="subtotal-pagebreak">'.$langs->trans('AddBreakPageBefore').'</label> <input style="vertical-align:sub;"  type="checkbox" name="line-pagebreak" id="subtotal-pagebreak" value="8" '.(($line->info_bits > 0) ? 'checked="checked"' : '') .' />&nbsp;&nbsp;';
+							echo '<label for="subtotal-pagebreak">'.$langs->trans('AddBreakPageBefore').'</label> <input style="vertical-align:sub;"  type="checkbox" name="line-pagebreak" id="subtotal-pagebreak" value="8" '.(($line->info_bits > 0) ? 'checked="checked"' : '').' />&nbsp;&nbsp;';
 
 							if (TSubtotal::isTitle($line))
 							{
@@ -1765,9 +1765,9 @@ 
 							else if ($isFreeText) echo TSubtotal::getFreeTextHtml($line, (bool) $readonlyForSituation);
 						echo '</div>';
 
-						if($line->qty<10) {
+						if ($line->qty < 10) {
 							// WYSIWYG editor
-							require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+							require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 							$nbrows = ROWS_2;
 							$cked_enabled = (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS) ? $conf->global->FCKEDITOR_ENABLE_DETAILS : 0);
 							if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) {
@@ -1787,25 +1787,25 @@ 
 
 						 if ($conf->global->SUBTOTAL_USE_NEW_FORMAT)
 						 {
-							if(TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line)) 
+							if (TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line)) 
 							{
-								echo str_repeat('&nbsp;&nbsp;&nbsp;', $line->qty-1);
+								echo str_repeat('&nbsp;&nbsp;&nbsp;', $line->qty - 1);
 								
 								if (TSubtotal::isTitle($line)) print img_picto('', 'subtotal@subtotal').'<span style="font-size:9px;margin-left:-3px;">'.$line->qty.'</span>&nbsp;&nbsp;';
-								else print img_picto('', 'subtotal2@subtotal').'<span style="font-size:9px;margin-left:-1px;">'.(100-$line->qty).'</span>&nbsp;&nbsp;';
+								else print img_picto('', 'subtotal2@subtotal').'<span style="font-size:9px;margin-left:-1px;">'.(100 - $line->qty).'</span>&nbsp;&nbsp;';
 							}
 						 }
 						 else 
 						 {
-							if($line->qty<=1) print img_picto('', 'subtotal@subtotal');
-							else if($line->qty==2) print img_picto('', 'subsubtotal@subtotal').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'; 
+							if ($line->qty <= 1) print img_picto('', 'subtotal@subtotal');
+							else if ($line->qty == 2) print img_picto('', 'subsubtotal@subtotal').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'; 
 						 }
 						 
 						 
 						 // Get display styles and apply them
 						 $titleStyleItalic = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'I') === false ? '' : ' font-style: italic;';
-						 $titleStyleBold =  strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'B') === false ? '' : ' font-weight:bold;';
-						 $titleStyleUnderline =  strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'U') === false ? '' : ' text-decoration: underline;';
+						 $titleStyleBold = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'B') === false ? '' : ' font-weight:bold;';
+						 $titleStyleUnderline = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'U') === false ? '' : ' text-decoration: underline;';
 						 
 						 if (empty($line->label)) {
 							if ($line->qty >= 91 && $line->qty <= 99 && $conf->global->SUBTOTAL_USE_NEW_FORMAT) print  $line->description.' '.$this->getTitle($object, $line);
@@ -1813,16 +1813,16 @@ 
 						 } 
 						 else {
 
-							if (! empty($conf->global->PRODUIT_DESC_IN_FORM) && !empty($line->description)) {
+							if (!empty($conf->global->PRODUIT_DESC_IN_FORM) && !empty($line->description)) {
 								print '<span class="subtotal_label" style="'.$titleStyleItalic.$titleStyleBold.$titleStyleUnderline.'" >'.$line->label.'</span><br><div class="subtotal_desc">'.dol_htmlentitiesbr($line->description).'</div>';
 							}
-							else{
+							else {
 								print '<span class="subtotal_label classfortooltip '.$titleStyleItalic.$titleStyleBold.$titleStyleUnderline.'" title="'.$line->description.'">'.$line->label.'</span>';    
 							}
 
 						 } 
-						if($line->qty>90) print ' : ';
-						if($line->info_bits > 0) echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal');
+						if ($line->qty > 90) print ' : ';
+						if ($line->info_bits > 0) echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal');
 
 						 
 
@@ -1831,7 +1831,7 @@ 
 			?></td>
 					 
 			<?php
-				if($line->qty>90) {
+				if ($line->qty > 90) {
 					/* Total */
 					$total_line = $this->getTotalLineFromObject($object, $line, '');
 					echo '<td class="nowrap liencolht" align="right" style="font-weight:bold;" rel="subtotal_total">'.price($total_line).'</td>';
@@ -1844,7 +1844,7 @@ 
 				<?php
 				if ($action != 'selectlines') {
 				
-					if($action=='editline' && GETPOST('lineid') == $line->id && TSubtotal::isModSubtotalLine($line) ) {
+					if ($action == 'editline' && GETPOST('lineid') == $line->id && TSubtotal::isModSubtotalLine($line)) {
 						?>
 						<input id="savelinebutton" class="button" type="submit" name="save" value="<?php echo $langs->trans('Save') ?>" />
 						<br />
@@ -1860,13 +1860,13 @@ 
 						<?php
 						
 					}
-					else{
-						if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK))
+					else {
+						if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK))
 						{
-							if(TSubtotal::isTitle($line) && ($object->situation_counter == 1 || !$object->situation_cycle_ref) ) echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=duplicate&lineid='.$line->id.'">'. img_picto($langs->trans('Duplicate'), 'duplicate@subtotal').'</a>';
+							if (TSubtotal::isTitle($line) && ($object->situation_counter == 1 || !$object->situation_cycle_ref)) echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=duplicate&lineid='.$line->id.'">'.img_picto($langs->trans('Duplicate'), 'duplicate@subtotal').'</a>';
 						}
 
-						if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_EDIT_BLOCK)) 
+						if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_EDIT_BLOCK)) 
 						{
 							echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=editline&lineid='.$line->id.'">'.img_edit().'</a>';
 						}								
@@ -1881,7 +1881,7 @@ 
 				<?php
 
 				if ($action != 'editline' && $action != 'selectlines') {
-						if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK))
+						if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK))
 						{
 
 							if ($object->situation_counter == 1 || !$object->situation_cycle_ref)
@@ -1889,7 +1889,7 @@ 
 								echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=ask_deleteline&lineid='.$line->id.'">'.img_delete().'</a>';
 							}
 
-							if(TSubtotal::isTitle($line) && ($object->situation_counter == 1 || !$object->situation_cycle_ref) )
+							if (TSubtotal::isTitle($line) && ($object->situation_counter == 1 || !$object->situation_cycle_ref))
 							{
 								$img_delete = ((float) DOL_VERSION >= 3.8) ? img_picto($langs->trans('deleteWithAllLines'), 'delete_all.3.8@subtotal') : img_picto($langs->trans('deleteWithAllLines'), 'delete_all@subtotal');
 								echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=ask_deleteallline&lineid='.$line->id.'">'.$img_delete.'</a>';
@@ -1900,7 +1900,7 @@ 
 			</td>
 			
 			<?php 
-			if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && TSubtotal::isTitle($line) && $action != 'editline')
+			if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && TSubtotal::isTitle($line) && $action != 'editline')
 			{
 				echo '<td class="subtotal_nc">';
 				echo '<input id="subtotal_nc-'.$line->id.'" class="subtotal_nc_chkbx" data-lineid="'.$line->id.'" type="checkbox" name="subtotal_nc" value="1" '.(!empty($line->array_options['options_subtotal_nc']) ? 'checked="checked"' : '').' />';
@@ -1911,11 +1911,11 @@ 
 			<td align="center" class="tdlineupdown">
 			</td>
 			<?php } else { ?>
-			<td align="center"<?php echo ((empty($conf->browser->phone) && ($object->statut == 0  && $createRight ))?' class="tdlineupdown"':''); ?>></td>
+			<td align="center"<?php echo ((empty($conf->browser->phone) && ($object->statut == 0 && $createRight)) ? ' class="tdlineupdown"' : ''); ?>></td>
 			<?php } ?>
 
-			<?php  if($action == 'selectlines'){ // dolibarr 8 ?>
-			<td class="linecolcheck" align="center"><input type="checkbox" class="linecheckbox" name="line_checkbox[<?php echo $i+1; ?>]" value="<?php echo $line->id; ?>" ></td>
+			<?php  if ($action == 'selectlines') { // dolibarr 8 ?>
+			<td class="linecolcheck" align="center"><input type="checkbox" class="linecheckbox" name="line_checkbox[<?php echo $i + 1; ?>]" value="<?php echo $line->id; ?>" ></td>
 			<?php } ?>
 
 			</tr>
@@ -1923,29 +1923,29 @@ 
 			
 			
 			// Affichage des extrafields à la Dolibarr (car sinon non affiché sur les titres)
-			if(TSubtotal::isTitle($line) && !empty($conf->global->SUBTOTAL_ALLOW_EXTRAFIELDS_ON_TITLE)) {
+			if (TSubtotal::isTitle($line) && !empty($conf->global->SUBTOTAL_ALLOW_EXTRAFIELDS_ON_TITLE)) {
 				
-				require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 				
 				// Extrafields
 				$extrafieldsline = new ExtraFields($db);
 				$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
 				
-				$colspan+=3; $mode = 'view';
-				if($action === 'editline' && $line->rowid == GETPOST('lineid')) $mode = 'edit';
+				$colspan += 3; $mode = 'view';
+				if ($action === 'editline' && $line->rowid == GETPOST('lineid')) $mode = 'edit';
 				
 				$ex_element = $line->element;
 				$line->element = 'tr_extrafield_title '.$line->element; // Pour pouvoir manipuler ces tr
-				print $line->showOptionals($extrafieldsline, $mode, array('style'=>' style="background:#eeffee;" ','colspan'=>$colspan));
+				print $line->showOptionals($extrafieldsline, $mode, array('style'=>' style="background:#eeffee;" ', 'colspan'=>$colspan));
 				$isExtraSelected = false;
-				foreach($line->array_options as $option) {
-					if(!empty($option) && $option != "-1") {
+				foreach ($line->array_options as $option) {
+					if (!empty($option) && $option != "-1") {
 						$isExtraSelected = true;
 						break;
 					}
 				}
 				
-				if($mode === 'edit') {
+				if ($mode === 'edit') {
 					?>
 					<script>
 						$(document).ready(function(){
@@ -1953,7 +1953,7 @@ 
 							var all_tr_extrafields = $("tr.tr_extrafield_title");
 							<?php 
 							// Si un extrafield est rempli alors on affiche directement les extrafields
-							if(!$isExtraSelected) {
+							if (!$isExtraSelected) {
 								echo 'all_tr_extrafields.hide();';
 								echo 'var trad = "'.$langs->trans('showExtrafields').'";';
 								echo 'var extra = 0;';
@@ -1999,7 +1999,7 @@ 
 
 	
 	function addMoreActionsButtons($parameters, &$object, &$action, $hookmanager) {
-		global $conf,$langs;
+		global $conf, $langs;
 		 
 		if ($object->statut == 0 && !empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && $action != 'editline')
 		{
@@ -2094,23 +2094,23 @@ 
 	    $ThtmlData['data-qty']          = 0; //$line->qty;
 	    $ThtmlData['data-level']        = TSubtotal::getNiveau($line);
 	    
-	    if(TSubtotal::isTitle($line)){
+	    if (TSubtotal::isTitle($line)) {
 	        $ThtmlData['data-issubtotal'] = 'title';
-	    }elseif(TSubtotal::isSubtotal($line)){
+	    }elseif (TSubtotal::isSubtotal($line)) {
 	        $ThtmlData['data-issubtotal'] = 'subtotal';
 	    }
-	    else{
+	    else {
 	        $ThtmlData['data-issubtotal'] = 'freetext';
 	    }
 	    
 	    
 	    // Change or add data  from hooks
-	    $parameters = array_replace($parameters , array(  'ThtmlData' => $ThtmlData )  );
+	    $parameters = array_replace($parameters, array('ThtmlData' => $ThtmlData));
 	    
 	    // hook 
-	    $reshook = $hookmanager->executeHooks('subtotalLineHtmlData',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+	    $reshook = $hookmanager->executeHooks('subtotalLineHtmlData', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	    if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    if ($reshook>0)
+	    if ($reshook > 0)
 	    {
 	        $ThtmlData = $hookmanager->resArray;
 	    }
@@ -2123,14 +2123,14 @@ 
 	function implodeHtmlData($ThtmlData = array())
 	{
 	    $data = '';
-	    foreach($ThtmlData as $k => $h )
+	    foreach ($ThtmlData as $k => $h)
 	    {
-	        if(is_array($h))
+	        if (is_array($h))
 	        {
 	            $h = json_encode($h);
 	        }
 	        
-	        $data .= $k . '="'.dol_htmlentities($h, ENT_QUOTES).'" ';
+	        $data .= $k.'="'.dol_htmlentities($h, ENT_QUOTES).'" ';
 	    }
 	    
 	    return $data;
@@ -2138,26 +2138,26 @@ 
 	
 	function _ajax_block_order_js($object)
 	{
-	    global $conf,$tagidfortablednd,$filepath,$langs;
+	    global $conf, $tagidfortablednd, $filepath, $langs;
 	    
 	    /*
 	     * this part of js is base on dolibarr htdocs/core/tpl/ajaxrow.tpl.php 
 	     * for compatibility reasons we don't use tableDnD but jquery sortable
 	     */
 	    
-	    $id=$object->id;
-	    $nboflines=(isset($object->lines)?count($object->lines):0);
-	    $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
+	    $id = $object->id;
+	    $nboflines = (isset($object->lines) ?count($object->lines) : 0);
+	    $forcereloadpage = empty($conf->global->MAIN_FORCE_RELOAD_PAGE) ? 0 : 1;
 	    
-	    $id=$object->id;
-	    $fk_element=$object->fk_element;
-	    $table_element_line=$object->table_element_line;
-	    $nboflines=(isset($object->lines)?count($object->lines):(empty($nboflines)?0:$nboflines));
-	    $tagidfortablednd=(empty($tagidfortablednd)?'tablelines':$tagidfortablednd);
-	    $filepath=(empty($filepath)?'':$filepath);
+	    $id = $object->id;
+	    $fk_element = $object->fk_element;
+	    $table_element_line = $object->table_element_line;
+	    $nboflines = (isset($object->lines) ?count($object->lines) : (empty($nboflines) ? 0 : $nboflines));
+	    $tagidfortablednd = (empty($tagidfortablednd) ? 'tablelines' : $tagidfortablednd);
+	    $filepath = (empty($filepath) ? '' : $filepath);
 	    
 	    
-	    if (GETPOST('action','aZ09') != 'editline' && $nboflines > 1)
+	    if (GETPOST('action', 'aZ09') != 'editline' && $nboflines > 1)
 	    {
 	        
 	        ?>
@@ -2175,7 +2175,7 @@ 
 				moveBlockCol.disableSelection(); // prevent selection
 
 				// apply some graphical stuff
-				moveBlockCol.css("background-image",'url(<?php echo dol_buildpath('subtotal/img/grip_all.png',2);  ?>)');
+				moveBlockCol.css("background-image",'url(<?php echo dol_buildpath('subtotal/img/grip_all.png', 2); ?>)');
 				moveBlockCol.css("background-repeat","no-repeat");
 				moveBlockCol.css("background-position","center center");
 				moveBlockCol.css("cursor","move");

class/subtotal.class.php

Spacing +177 added lines, -177 removed lines

@@ -5,23 +5,23 @@ 
 	
 	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 {
@@ -34,19 +34,19 @@ 
 			/**
 			 * @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); 
 			
 		}
 	
@@ -57,20 +57,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);
 			}
@@ -84,7 +84,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);
 			}
 		}
 	}
@@ -96,11 +96,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;
@@ -109,7 +109,7 @@ 
 		{
 			if ($line->rang < $rang_start) continue;
 			
-			$row->updateRangOfLine($line->id, $line->rang+$move_to);
+			$row->updateRangOfLine($line->id, $line->rang + $move_to);
 		}
 	}
 	
@@ -138,7 +138,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) 
@@ -150,14 +150,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);
 	}
 
 	/**
@@ -168,7 +168,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);
 		
@@ -189,7 +189,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;
 		
@@ -215,7 +215,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))
@@ -335,10 +335,10 @@ 
 		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;
 		
@@ -359,28 +359,28 @@ 
 		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;
 
-		if ($object->statut == 0  && $user->rights->{$object->element}->creer && !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK))
+		if ($object->statut == 0 && $user->rights->{$object->element}->creer && !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK))
 		{
 			dol_include_once('/subtotal/lib/subtotal.lib.php');
 			
@@ -421,7 +421,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();
@@ -452,7 +452,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;
 		
@@ -464,17 +464,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;
 					
@@ -482,7 +482,7 @@ 
 					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;
@@ -490,7 +490,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;
 				}
 			}
@@ -499,12 +499,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)
+	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)
 	{
 		$res = 0;
 		$object->db->begin();
@@ -529,9 +529,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;
 		}
@@ -624,7 +624,7 @@ 
 	 */
 	public static function addRecapPage(&$parameters, &$origin_pdf)
 	{
-		global $user,$conf,$langs;
+		global $user, $conf, $langs;
 		
 		$origin_file = $parameters['file'];
 		$outputlangs = $parameters['outputlangs'];
@@ -640,21 +640,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'))
 		{
@@ -663,49 +663,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());
 		
@@ -719,14 +719,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;
@@ -745,67 +745,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)) {
@@ -818,14 +818,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)
@@ -842,7 +842,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);
 				}
 			}
@@ -852,19 +852,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);
 		
@@ -876,7 +876,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);
 	}
 	
 	/**
@@ -890,50 +890,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';
@@ -942,14 +942,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');
 		
 	}
@@ -967,44 +967,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
 		}
 		
 	}
@@ -1013,29 +1013,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'];
@@ -1043,10 +1043,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
 			{
@@ -1055,15 +1055,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);
@@ -1073,16 +1073,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));
@@ -1101,22 +1101,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);
@@ -1124,10 +1124,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++)
@@ -1139,8 +1139,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;
 	}

config.php

Spacing +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
 
 		
-	if(is_file('../main.inc.php'))$dir = '../';
-	else  if(is_file('../../../main.inc.php'))$dir = '../../../';
+	if (is_file('../main.inc.php'))$dir = '../';
+	else  if (is_file('../../../main.inc.php'))$dir = '../../../';
 	else $dir = '../../';
 
 	include($dir."main.inc.php");

script/import-from-milestone.php

Spacing +9 added lines, -9 removed lines

@@ -42,12 +42,12 @@ 
 
 
 	$res = $db->query("SELECT DISTINCT(fk_propal) as fk_propal FROM ".MAIN_DB_PREFIX."propaldet WHERE special_code=104777");
-	while($obj = $db->fetch_object($res)) {
+	while ($obj = $db->fetch_object($res)) {
 		$resLine = $db->query("SELECT rowid FROM  ".MAIN_DB_PREFIX."propaldet WHERE fk_propal=".$obj->fk_propal." ORDER BY rang ");
 		$k = 1;
-		while($objLine = $db->fetch_object($resLine)) {
+		while ($objLine = $db->fetch_object($resLine)) {
 
-			$sql="UPDATE ".MAIN_DB_PREFIX."propaldet SET rang=".$k.",fk_parent_line=NULL WHERE rowid=".$objLine->rowid;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."propaldet SET rang=".$k.",fk_parent_line=NULL WHERE rowid=".$objLine->rowid;
 
 			 print $sql.";<br />";
 			$k++;
@@ -57,12 +57,12 @@ 
 
 
         $res = $db->query("SELECT DISTINCT(fk_facture) as fk_facture FROM ".MAIN_DB_PREFIX."facturedet WHERE special_code=104777");
-        while($obj = $db->fetch_object($res)) {
+        while ($obj = $db->fetch_object($res)) {
                 $resLine = $db->query("SELECT rowid FROM  ".MAIN_DB_PREFIX."facturedet WHERE fk_facture=".$obj->fk_propal." ORDER BY rang ");
                 $k = 1;
-                while($objLine = $db->fetch_object($resLine)) {
+                while ($objLine = $db->fetch_object($resLine)) {
 
-                        $sql="UPDATE ".MAIN_DB_PREFIX."facturedet SET rang=".$k.",fk_parent_line=NULL WHERE rowid=".$objLine->rowid;
+                        $sql = "UPDATE ".MAIN_DB_PREFIX."facturedet SET rang=".$k.",fk_parent_line=NULL WHERE rowid=".$objLine->rowid;
 
                          print $sql.";<br />";
                         $k++;
@@ -71,12 +71,12 @@ 
         }
 
         $res = $db->query("SELECT DISTINCT(fk_commande) as fk_commande FROM ".MAIN_DB_PREFIX."commandedet WHERE special_code=104777");
-        while($obj = $db->fetch_object($res)) {
+        while ($obj = $db->fetch_object($res)) {
                 $resLine = $db->query("SELECT rowid FROM  ".MAIN_DB_PREFIX."commandedet WHERE fk_commande=".$obj->fk_propal." ORDER BY rang ");
                 $k = 1;
-                while($objLine = $db->fetch_object($resLine)) {
+                while ($objLine = $db->fetch_object($resLine)) {
 
-                        $sql="UPDATE ".MAIN_DB_PREFIX."commandedet SET rang=".$k.",fk_parent_line=NULL WHERE rowid=".$objLine->rowid;
+                        $sql = "UPDATE ".MAIN_DB_PREFIX."commandedet SET rang=".$k.",fk_parent_line=NULL WHERE rowid=".$objLine->rowid;
 
                          print $sql.";<br />";
                         $k++;

script/interface.php

Spacing +3 added lines, -3 removed lines

@@ -7,8 +7,8 @@ 
 	dol_include_once('/commande/class/commande.class.php');
 	dol_include_once('/compta/facture/class/facture.class.php');
 	
-	$get=GETPOST('get');
-	$set=GETPOST('set');
+	$get = GETPOST('get');
+	$set = GETPOST('set');
 	
 	switch ($get) {
 		default:
@@ -17,7 +17,7 @@ 
 	
 	switch ($set) {
 		case 'updateLineNC': // Gestion du Compris/Non Compris via les titres et/ou lignes
-			echo json_encode( _updateLineNC(GETPOST('element'), GETPOST('elementid'), GETPOST('lineid'), GETPOST('subtotal_nc')) );
+			echo json_encode(_updateLineNC(GETPOST('element'), GETPOST('elementid'), GETPOST('lineid'), GETPOST('subtotal_nc')));
 			
 			break;
 		default:

htdocs_38/core/lib/pdf.lib.php

Spacing +432 added lines, -432 removed lines

@@ -39,36 +39,36 @@ 
  *	@param		Translate	$outputlangs		Output lang to use to autodetect output format if setup not done
  *  @return     array							Array('width'=>w,'height'=>h,'unit'=>u);
  */
-function pdf_getFormat($outputlangs='')
+function pdf_getFormat($outputlangs = '')
 {
-	global $conf,$db;
+	global $conf, $db;
 
 	// Default value if setup was not done and/or entry into c_paper_format not defined
-	$width=210; $height=297; $unit='mm';
+	$width = 210; $height = 297; $unit = 'mm';
 
 	if (empty($conf->global->MAIN_PDF_FORMAT))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$pdfformat=dol_getDefaultFormat($outputlangs);
+		$pdfformat = dol_getDefaultFormat($outputlangs);
 	}
-	else $pdfformat=$conf->global->MAIN_PDF_FORMAT;
+	else $pdfformat = $conf->global->MAIN_PDF_FORMAT;
 
-	$sql="SELECT code, label, width, height, unit FROM ".MAIN_DB_PREFIX."c_paper_format";
-	$sql.=" WHERE code = '".$pdfformat."'";
-	$resql=$db->query($sql);
+	$sql = "SELECT code, label, width, height, unit FROM ".MAIN_DB_PREFIX."c_paper_format";
+	$sql .= " WHERE code = '".$pdfformat."'";
+	$resql = $db->query($sql);
 	if ($resql)
 	{
-		$obj=$db->fetch_object($resql);
+		$obj = $db->fetch_object($resql);
 		if ($obj)
 		{
-			$width=(int) $obj->width;
-			$height=(int) $obj->height;
-			$unit=$obj->unit;
+			$width = (int) $obj->width;
+			$height = (int) $obj->height;
+			$unit = $obj->unit;
 		}
 	}
 
 	//print "pdfformat=".$pdfformat." width=".$width." height=".$height." unit=".$unit;
-	return array('width'=>$width,'height'=>$height,'unit'=>$unit);
+	return array('width'=>$width, 'height'=>$height, 'unit'=>$unit);
 }
 
 /**
@@ -79,14 +79,14 @@ 
  *      @param  string		$pagetype       'P' or 'l'
  *      @return TPDF						PDF object
  */
-function pdf_getInstance($format='',$metric='mm',$pagetype='P')
+function pdf_getInstance($format = '', $metric = 'mm', $pagetype = 'P')
 {
 	global $conf;
 
 	// Define constant for TCPDF
-	if (! defined('K_TCPDF_EXTERNAL_CONFIG'))
+	if (!defined('K_TCPDF_EXTERNAL_CONFIG'))
 	{
-		define('K_TCPDF_EXTERNAL_CONFIG',1);	// this avoid using tcpdf_config file
+		define('K_TCPDF_EXTERNAL_CONFIG', 1); // this avoid using tcpdf_config file
 		define('K_PATH_CACHE', DOL_DATA_ROOT.'/admin/temp/');
 		define('K_PATH_URL_CACHE', DOL_DATA_ROOT.'/admin/temp/');
 		dol_mkdir(K_PATH_CACHE);
@@ -113,13 +113,13 @@ 
 		define('HEAD_MAGNIFICATION', 1.1);
 		define('K_CELL_HEIGHT_RATIO', 1.25);
 		define('K_TITLE_MAGNIFICATION', 1.3);
-		define('K_SMALL_RATIO', 2/3);
+		define('K_SMALL_RATIO', 2 / 3);
 		define('K_THAI_TOPCHARS', true);
 		define('K_TCPDF_CALLS_IN_HTML', true);
 		define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
 	}
 
-	if (! empty($conf->global->MAIN_USE_FPDF) && ! empty($conf->global->MAIN_DISABLE_FPDI))
+	if (!empty($conf->global->MAIN_USE_FPDF) && !empty($conf->global->MAIN_DISABLE_FPDI))
 		return "Error MAIN_USE_FPDF and MAIN_DISABLE_FPDI can't be set together";
 
 	// We use by default TCPDF else FPDF
@@ -135,7 +135,7 @@ 
 	//$metric=$arrayformat['unit'];
 
 	// Protection and encryption of pdf
-	if (empty($conf->global->MAIN_USE_FPDF) && ! empty($conf->global->PDF_SECURITY_ENCRYPTION))
+	if (empty($conf->global->MAIN_USE_FPDF) && !empty($conf->global->PDF_SECURITY_ENCRYPTION))
 	{
 		/* Permission supported by TCPDF
 		- print : Print the document;
@@ -148,25 +148,25 @@ 
 		- print-high : Print the document to a representation from which a faithful digital copy of the PDF content could be generated. When this is not set, printing is limited to a low-level representation of the appearance, possibly of degraded quality.
 		- owner : (inverted logic - only for public-key) when set permits change of encryption and enables all other permissions.
 		*/
-		if (class_exists('TCPDI')) $pdf = new TCPDI($pagetype,$metric,$format);
-		else if (class_exists('FPDI')) $pdf = new FPDI($pagetype,$metric,$format);
-		else $pdf = new TCPDF($pagetype,$metric,$format);
+		if (class_exists('TCPDI')) $pdf = new TCPDI($pagetype, $metric, $format);
+		else if (class_exists('FPDI')) $pdf = new FPDI($pagetype, $metric, $format);
+		else $pdf = new TCPDF($pagetype, $metric, $format);
 		// For TCPDF, we specify permission we want to block
-		$pdfrights = array('modify','copy');
+		$pdfrights = array('modify', 'copy');
 
 		$pdfuserpass = ''; // Password for the end user
 		$pdfownerpass = NULL; // Password of the owner, created randomly if not defined
-		$pdf->SetProtection($pdfrights,$pdfuserpass,$pdfownerpass);
+		$pdf->SetProtection($pdfrights, $pdfuserpass, $pdfownerpass);
 	}
 	else
 	{
-		if (class_exists('TCPDI')) $pdf = new TCPDI($pagetype,$metric,$format);
-		else if (class_exists('FPDI')) $pdf = new FPDI($pagetype,$metric,$format);
-		else $pdf = new TCPDF($pagetype,$metric,$format);
+		if (class_exists('TCPDI')) $pdf = new TCPDI($pagetype, $metric, $format);
+		else if (class_exists('FPDI')) $pdf = new FPDI($pagetype, $metric, $format);
+		else $pdf = new TCPDF($pagetype, $metric, $format);
 	}
 
 	// If we use FPDF class, we may need to add method writeHTMLCell
-	if (! empty($conf->global->MAIN_USE_FPDF) && ! method_exists($pdf, 'writeHTMLCell'))
+	if (!empty($conf->global->MAIN_USE_FPDF) && !method_exists($pdf, 'writeHTMLCell'))
 	{
 		// Declare here a class to overwrite FPDI to add method writeHTMLCell
 		/**
@@ -207,17 +207,17 @@ 
 			 */
 			public function writeHTMLCell($w, $h, $x, $y, $html = '', $border = 0, $ln = 0, $fill = false, $reseth = true, $align = '', $autopadding = true)
 			{
-				$this->SetXY($x,$y);
-				$val=str_replace('<br>',"\n",$html);
+				$this->SetXY($x, $y);
+				$val = str_replace('<br>', "\n", $html);
 				//$val=dol_string_nohtmltag($val,false,'ISO-8859-1');
-				$val=dol_string_nohtmltag($val,false,'UTF-8');
-				$this->MultiCell($w,$h,$val,$border,$align,$fill);
+				$val = dol_string_nohtmltag($val, false, 'UTF-8');
+				$this->MultiCell($w, $h, $val, $border, $align, $fill);
 			}
 		}
 
-		$pdf2=new FPDI_DolExtended($pagetype,$metric,$format);
+		$pdf2 = new FPDI_DolExtended($pagetype, $metric, $format);
 		unset($pdf);
-		$pdf=$pdf2;
+		$pdf = $pdf2;
 	}
 
 	return $pdf;
@@ -234,14 +234,14 @@ 
 {
 	global $conf;
 
-	if (! empty($conf->global->MAIN_PDF_FORCE_FONT)) return $conf->global->MAIN_PDF_FORCE_FONT;
+	if (!empty($conf->global->MAIN_PDF_FORCE_FONT)) return $conf->global->MAIN_PDF_FORCE_FONT;
 
-	$font='Helvetica'; // By default, for FPDI, or ISO language on TCPDF
+	$font = 'Helvetica'; // By default, for FPDI, or ISO language on TCPDF
 	if (class_exists('TCPDF'))  // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
 	{
-		if ($outputlangs->trans('FONTFORPDF')!='FONTFORPDF')
+		if ($outputlangs->trans('FONTFORPDF') != 'FONTFORPDF')
 		{
-			$font=$outputlangs->trans('FONTFORPDF');
+			$font = $outputlangs->trans('FONTFORPDF');
 		}
 	}
 	return $font;
@@ -255,10 +255,10 @@ 
  */
 function pdf_getPDFFontSize($outputlangs)
 {
-	$size=10;                   // By default, for FPDI or ISO language on TCPDF
+	$size = 10; // By default, for FPDI or ISO language on TCPDF
 	if (class_exists('TCPDF'))  // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
 	{
-		if ($outputlangs->trans('FONTSIZEFORPDF')!='FONTSIZEFORPDF')
+		if ($outputlangs->trans('FONTSIZEFORPDF') != 'FONTSIZEFORPDF')
 		{
 			$size = (int) $outputlangs->trans('FONTSIZEFORPDF');
 		}
@@ -277,14 +277,14 @@ 
 function pdf_getHeightForLogo($logo, $url = false)
 {
 	global $conf;
-	$height=(empty($conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT)?22:$conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT);
-	$maxwidth=130;
+	$height = (empty($conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT) ? 22 : $conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT);
+	$maxwidth = 130;
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-	$tmp=dol_getImageSize($logo, $url);
+	$tmp = dol_getImageSize($logo, $url);
 	if ($tmp['height'])
 	{
-		$width=round($height*$tmp['width']/$tmp['height']);
-		if ($width > $maxwidth) $height=$height*$maxwidth/$width;
+		$width = round($height * $tmp['width'] / $tmp['height']);
+		if ($width > $maxwidth) $height = $height * $maxwidth / $width;
 	}
 	//print $tmp['width'].' '.$tmp['height'].' '.$width; exit;
 	return $height;
@@ -328,36 +328,36 @@ 
  * 		@param	int			$mode				Address type ('source', 'target', 'targetwithdetails')
  * 		@return	string							String with full address
  */
-function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$targetcontact='',$usecontact=0,$mode='source')
+function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $targetcontact = '', $usecontact = 0, $mode = 'source')
 {
 	global $conf;
 	$stringaddress = '';
 
-	if ($mode == 'source' && ! is_object($sourcecompany)) return -1;
-	if ($mode == 'target' && ! is_object($targetcompany)) return -1;
-	if ($mode == 'delivery' && ! is_object($deliverycompany)) return -1;
+	if ($mode == 'source' && !is_object($sourcecompany)) return -1;
+	if ($mode == 'target' && !is_object($targetcompany)) return -1;
+	if ($mode == 'delivery' && !is_object($deliverycompany)) return -1;
 
-	if (! empty($sourcecompany->state_id) && empty($sourcecompany->departement)) $sourcecompany->departement=getState($sourcecompany->state_id); //TODO: Deprecated
-	if (! empty($sourcecompany->state_id) && empty($sourcecompany->state)) $sourcecompany->state=getState($sourcecompany->state_id);
-	if (! empty($targetcompany->state_id) && empty($targetcompany->departement)) $targetcompany->departement=getState($targetcompany->state_id);
+	if (!empty($sourcecompany->state_id) && empty($sourcecompany->departement)) $sourcecompany->departement = getState($sourcecompany->state_id); //TODO: Deprecated
+	if (!empty($sourcecompany->state_id) && empty($sourcecompany->state)) $sourcecompany->state = getState($sourcecompany->state_id);
+	if (!empty($targetcompany->state_id) && empty($targetcompany->departement)) $targetcompany->departement = getState($targetcompany->state_id);
 
 	if ($mode == 'source')
 	{
 		$withCountry = 0;
 		if (!empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) $withCountry = 1;
 
-		$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($sourcecompany, $withCountry, "\n", $outputlangs))."\n";
+		$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($sourcecompany, $withCountry, "\n", $outputlangs))."\n";
 
 		if (empty($conf->global->MAIN_PDF_DISABLESOURCEDETAILS))
 		{
 			// Phone
-			if ($sourcecompany->phone) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
+			if ($sourcecompany->phone) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
 			// Fax
-			if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
+			if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
 			// EMail
-			if ($sourcecompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);
+			if ($sourcecompany->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);
 			// Web
-			if ($sourcecompany->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);
+			if ($sourcecompany->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);
 		}
 	}
 
@@ -365,88 +365,88 @@ 
 	{
 		if ($usecontact)
 		{
-			$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($targetcontact->getFullName($outputlangs,1));
+			$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($targetcontact->getFullName($outputlangs, 1));
 
 			if (!empty($targetcontact->address)) {
-				$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcontact))."\n";
-			}else {
-				$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcompany))."\n";
+				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcontact))."\n";
+			} else {
+				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcompany))."\n";
 			}
 			// Country
 			if (!empty($targetcontact->country_code) && $targetcontact->country_code != $sourcecompany->country_code) {
-				$stringaddress.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code))."\n";
+				$stringaddress .= $outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code))."\n";
 			}
 			else if (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
-				$stringaddress.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code))."\n";
+				$stringaddress .= $outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code))."\n";
 			}
 
-			if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails')
+			if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails')
 			{
 				// Phone
-				if (! empty($targetcontact->phone_pro) || ! empty($targetcontact->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
-				if (! empty($targetcontact->phone_pro)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
-				if (! empty($targetcontact->phone_pro) && ! empty($targetcontact->phone_mobile)) $stringaddress .= " / ";
-				if (! empty($targetcontact->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
+				if (!empty($targetcontact->phone_pro) || !empty($targetcontact->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
+				if (!empty($targetcontact->phone_pro)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
+				if (!empty($targetcontact->phone_pro) && !empty($targetcontact->phone_mobile)) $stringaddress .= " / ";
+				if (!empty($targetcontact->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
 				// Fax
-				if ($targetcontact->fax) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);
+				if ($targetcontact->fax) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);
 				// EMail
-				if ($targetcontact->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);
+				if ($targetcontact->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);
 				// Web
-				if ($targetcontact->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
+				if ($targetcontact->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
 			}
 		}
 		else
 		{
-			$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcompany))."\n";
+			$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcompany))."\n";
 			// Country
-			if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code))."\n";
+			if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress .= $outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code))."\n";
 
-			if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails')
+			if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails')
 			{
 				// Phone
-				if (! empty($targetcompany->phone) || ! empty($targetcompany->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
-				if (! empty($targetcompany->phone)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
-				if (! empty($targetcompany->phone) && ! empty($targetcompany->phone_mobile)) $stringaddress .= " / ";
-				if (! empty($targetcompany->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
+				if (!empty($targetcompany->phone) || !empty($targetcompany->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
+				if (!empty($targetcompany->phone)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
+				if (!empty($targetcompany->phone) && !empty($targetcompany->phone_mobile)) $stringaddress .= " / ";
+				if (!empty($targetcompany->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
 				// Fax
-				if ($targetcompany->fax) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
+				if ($targetcompany->fax) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
 				// EMail
-				if ($targetcompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
+				if ($targetcompany->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
 				// Web
-				if ($targetcompany->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
+				if ($targetcompany->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
 			}
 		}
 
 		// Intra VAT
 		if (empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))
 		{
-			if ($targetcompany->tva_intra) $stringaddress.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
+			if ($targetcompany->tva_intra) $stringaddress .= "\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
 		}
 
 		// Professionnal Ids
-		if (! empty($conf->global->MAIN_PROFID1_IN_ADDRESS) && ! empty($targetcompany->idprof1))
+		if (!empty($conf->global->MAIN_PROFID1_IN_ADDRESS) && !empty($targetcompany->idprof1))
 		{
-			$tmp=$outputlangs->transcountrynoentities("ProfId1",$targetcompany->country_code);
-			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-			$stringaddress.="\n".$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof1);
+			$tmp = $outputlangs->transcountrynoentities("ProfId1", $targetcompany->country_code);
+			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+			$stringaddress .= "\n".$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof1);
 		}
-		if (! empty($conf->global->MAIN_PROFID2_IN_ADDRESS) && ! empty($targetcompany->idprof2))
+		if (!empty($conf->global->MAIN_PROFID2_IN_ADDRESS) && !empty($targetcompany->idprof2))
 		{
-			$tmp=$outputlangs->transcountrynoentities("ProfId2",$targetcompany->country_code);
-			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-			$stringaddress.="\n".$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof2);
+			$tmp = $outputlangs->transcountrynoentities("ProfId2", $targetcompany->country_code);
+			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+			$stringaddress .= "\n".$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof2);
 		}
-		if (! empty($conf->global->MAIN_PROFID3_IN_ADDRESS) && ! empty($targetcompany->idprof3))
+		if (!empty($conf->global->MAIN_PROFID3_IN_ADDRESS) && !empty($targetcompany->idprof3))
 		{
-			$tmp=$outputlangs->transcountrynoentities("ProfId3",$targetcompany->country_code);
-			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-			$stringaddress.="\n".$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof3);
+			$tmp = $outputlangs->transcountrynoentities("ProfId3", $targetcompany->country_code);
+			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+			$stringaddress .= "\n".$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof3);
 		}
-		if (! empty($conf->global->MAIN_PROFID4_IN_ADDRESS) && ! empty($targetcompany->idprof4))
+		if (!empty($conf->global->MAIN_PROFID4_IN_ADDRESS) && !empty($targetcompany->idprof4))
 		{
-			$tmp=$outputlangs->transcountrynoentities("ProfId4",$targetcompany->country_code);
-			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-			$stringaddress.="\n".$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof4);
+			$tmp = $outputlangs->transcountrynoentities("ProfId4", $targetcompany->country_code);
+			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+			$stringaddress .= "\n".$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof4);
 		}
 	}
 
@@ -462,16 +462,16 @@ 
  * 		@param		int			$page_height	Height of page
  *      @return	void
  */
-function pdf_pagehead(&$pdf,$outputlangs,$page_height)
+function pdf_pagehead(&$pdf, $outputlangs, $page_height)
 {
 	global $conf;
 
 	// Add a background image on document
-	if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF))		// Warning, this option make TCPDF generation beeing crazy and some content disappeared behin the image
+	if (!empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF))		// Warning, this option make TCPDF generation beeing crazy and some content disappeared behin the image
 	{
-		$pdf->SetAutoPageBreak(0,0);	// Disable auto pagebreak before adding image
-		$pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_X:0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y:0), 0, $page_height);
-		$pdf->SetAutoPageBreak(1,0);	// Restore pagebreak
+		$pdf->SetAutoPageBreak(0, 0); // Disable auto pagebreak before adding image
+		$pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_X : 0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y : 0), 0, $page_height);
+		$pdf->SetAutoPageBreak(1, 0); // Restore pagebreak
 	}
 }
 
@@ -489,29 +489,29 @@ 
 function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text)
 {
 	// Print Draft Watermark
-	if ($unit=='pt') $k=1;
-	elseif ($unit=='mm') $k=72/25.4;
-	elseif ($unit=='cm') $k=72/2.54;
-	elseif ($unit=='in') $k=72;
-
-	$savx=$pdf->getX(); $savy=$pdf->getY();
-
-	$watermark_angle=atan($h/$w)/2;
-	$watermark_x_pos=0;
-	$watermark_y_pos=$h/3;
-	$watermark_x=$w/2;
-	$watermark_y=$h/3;
-	$pdf->SetFont('','B',40);
-	$pdf->SetTextColor(255,192,203);
+	if ($unit == 'pt') $k = 1;
+	elseif ($unit == 'mm') $k = 72 / 25.4;
+	elseif ($unit == 'cm') $k = 72 / 2.54;
+	elseif ($unit == 'in') $k = 72;
+
+	$savx = $pdf->getX(); $savy = $pdf->getY();
+
+	$watermark_angle = atan($h / $w) / 2;
+	$watermark_x_pos = 0;
+	$watermark_y_pos = $h / 3;
+	$watermark_x = $w / 2;
+	$watermark_y = $h / 3;
+	$pdf->SetFont('', 'B', 40);
+	$pdf->SetTextColor(255, 192, 203);
 	//rotate
-	$pdf->_out(sprintf('q %.5F %.5F %.5F %.5F %.2F %.2F cm 1 0 0 1 %.2F %.2F cm',cos($watermark_angle),sin($watermark_angle),-sin($watermark_angle),cos($watermark_angle),$watermark_x*$k,($h-$watermark_y)*$k,-$watermark_x*$k,-($h-$watermark_y)*$k));
+	$pdf->_out(sprintf('q %.5F %.5F %.5F %.5F %.2F %.2F cm 1 0 0 1 %.2F %.2F cm', cos($watermark_angle), sin($watermark_angle), -sin($watermark_angle), cos($watermark_angle), $watermark_x * $k, ($h - $watermark_y) * $k, -$watermark_x * $k, -($h - $watermark_y) * $k));
 	//print watermark
-	$pdf->SetXY($watermark_x_pos,$watermark_y_pos);
-	$pdf->Cell($w-20,25,$outputlangs->convToOutputCharset($text),"",2,"C",0);
+	$pdf->SetXY($watermark_x_pos, $watermark_y_pos);
+	$pdf->Cell($w - 20, 25, $outputlangs->convToOutputCharset($text), "", 2, "C", 0);
 	//antirotate
 	$pdf->_out('Q');
 
-	$pdf->SetXY($savx,$savy);
+	$pdf->SetXY($savx, $savy);
 }
 
 
@@ -527,41 +527,41 @@ 
  *  @param	int			$default_font_size		Default font size
  *  @return	float                               The Y PDF position
  */
-function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default_font_size=10)
+function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0, $default_font_size = 10)
 {
 	global $mysoc, $conf;
 
-	$diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE);
-	$diffsizecontent=(empty($conf->global->PDF_DIFFSIZE_CONTENT)?4:$conf->global->PDF_DIFFSIZE_CONTENT);
+	$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
+	$diffsizecontent = (empty($conf->global->PDF_DIFFSIZE_CONTENT) ? 4 : $conf->global->PDF_DIFFSIZE_CONTENT);
 	$pdf->SetXY($curx, $cury);
 
 	if (empty($onlynumber))
 	{
-		$pdf->SetFont('','B',$default_font_size - $diffsizetitle);
+		$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0);
-		$cury+=4;
+		$cury += 4;
 	}
 
 	$outputlangs->load("banks");
 
 	// Use correct name of bank id according to country
-	$bickey="BICNumber";
-	if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
+	$bickey = "BICNumber";
+	if ($account->getCountryCode() == 'IN') $bickey = "SWIFT";
 
 	// Get format of bank account according to its country
-	$usedetailedbban=$account->useDetailedBBAN();
+	$usedetailedbban = $account->useDetailedBBAN();
 
 	//$onlynumber=0; $usedetailedbban=1; // For tests
 	if ($usedetailedbban)
 	{
-		$savcurx=$curx;
+		$savcurx = $curx;
 
 		if (empty($onlynumber))
 		{
-			$pdf->SetFont('','',$default_font_size - $diffsizecontent);
+			$pdf->SetFont('', '', $default_font_size - $diffsizecontent);
 			$pdf->SetXY($curx, $cury);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
-			$cury+=3;
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': '.$outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
+			$cury += 3;
 		}
 
 		/*
@@ -632,69 +632,69 @@ 
 	}
 	else
 	{
-		$pdf->SetFont('','B',$default_font_size - $diffsizecontent);
+		$pdf->SetFont('', 'B', $default_font_size - $diffsizecontent);
 		$pdf->SetXY($curx, $cury);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
-		$cury+=3;
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': '.$outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
+		$cury += 3;
 
-		$pdf->SetFont('','B',$default_font_size - $diffsizecontent);
+		$pdf->SetFont('', 'B', $default_font_size - $diffsizecontent);
 		$pdf->SetXY($curx, $cury);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("BankAccountNumber").': ' . $outputlangs->convToOutputCharset($account->number), 0, 'L', 0);
-		$cury+=3;
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("BankAccountNumber").': '.$outputlangs->convToOutputCharset($account->number), 0, 'L', 0);
+		$cury += 3;
 
-		if ($diffsizecontent <= 2) $cury+=1;
+		if ($diffsizecontent <= 2) $cury += 1;
 	}
 
-	$pdf->SetFont('','',$default_font_size - $diffsizecontent);
+	$pdf->SetFont('', '', $default_font_size - $diffsizecontent);
 
-	if (empty($onlynumber) && ! empty($account->domiciliation))
+	if (empty($onlynumber) && !empty($account->domiciliation))
 	{
 		$pdf->SetXY($curx, $cury);
-		$val=$outputlangs->transnoentities("Residence").': ' . $outputlangs->convToOutputCharset($account->domiciliation);
+		$val = $outputlangs->transnoentities("Residence").': '.$outputlangs->convToOutputCharset($account->domiciliation);
 		$pdf->MultiCell(100, 3, $val, 0, 'L', 0);
 		//$nboflines=dol_nboflines_bis($val,120);
 		//$cury+=($nboflines*3)+2;
-		$tmpy=$pdf->getStringHeight(100, $val);
-		$cury+=$tmpy;
+		$tmpy = $pdf->getStringHeight(100, $val);
+		$cury += $tmpy;
 	}
 
-	if (! empty($account->proprio))
+	if (!empty($account->proprio))
 	{
 		$pdf->SetXY($curx, $cury);
-		$val=$outputlangs->transnoentities("BankAccountOwner").': ' . $outputlangs->convToOutputCharset($account->proprio);
+		$val = $outputlangs->transnoentities("BankAccountOwner").': '.$outputlangs->convToOutputCharset($account->proprio);
 		$pdf->MultiCell(100, 3, $val, 0, 'L', 0);
-		$tmpy=$pdf->getStringHeight(100, $val);
-		$cury+=$tmpy;
+		$tmpy = $pdf->getStringHeight(100, $val);
+		$cury += $tmpy;
 	}
 
-	else if (! $usedetailedbban) $cury+=1;
+	else if (!$usedetailedbban) $cury += 1;
 
 	// Use correct name of bank id according to country
-	$ibankey="IBANNumber";
-	if ($account->getCountryCode() == 'IN') $ibankey="IFSC";
-	if (! empty($account->iban))
+	$ibankey = "IBANNumber";
+	if ($account->getCountryCode() == 'IN') $ibankey = "IFSC";
+	if (!empty($account->iban))
 	{
 		//Remove whitespaces to ensure we are dealing with the format we expect
 		$ibanDisplay_temp = str_replace(' ', '', $outputlangs->convToOutputCharset($account->iban));
 		$ibanDisplay = "";
 
-		for($i = 0; $i < dol_strlen($ibanDisplay_temp); $i++)
+		for ($i = 0; $i < dol_strlen($ibanDisplay_temp); $i++)
 		{
 			$ibanDisplay .= $ibanDisplay_temp[$i];
-			if($i%4 == 3 && $i > 0)	$ibanDisplay .= " ";
+			if ($i % 4 == 3 && $i > 0)	$ibanDisplay .= " ";
 		}
 
-		$pdf->SetFont('','B',$default_font_size - 3);
+		$pdf->SetFont('', 'B', $default_font_size - 3);
 		$pdf->SetXY($curx, $cury);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': ' . $ibanDisplay, 0, 'L', 0);
-		$cury+=3;
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': '.$ibanDisplay, 0, 'L', 0);
+		$cury += 3;
 	}
 
-	if (! empty($account->bic))
+	if (!empty($account->bic))
 	{
-		$pdf->SetFont('','B',$default_font_size - 3);
+		$pdf->SetFont('', 'B', $default_font_size - 3);
 		$pdf->SetXY($curx, $cury);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($bickey).': ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($bickey).': '.$outputlangs->convToOutputCharset($account->bic), 0, 'L', 0);
 	}
 
 	return $pdf->getY();
@@ -715,76 +715,76 @@ 
  *  @param	int			$hidefreetext	1=Hide free text, 0=Show free text
  * 	@return	int							Return height of bottom margin including footer text
  */
-function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_basse,$marge_gauche,$page_hauteur,$object,$showdetails=0,$hidefreetext=0)
+function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_basse, $marge_gauche, $page_hauteur, $object, $showdetails = 0, $hidefreetext = 0)
 {
-	global $conf,$user;
+	global $conf, $user;
 
 	$outputlangs->load("dict");
-	$line='';
+	$line = '';
 
-	$dims=$pdf->getPageDimensions();
+	$dims = $pdf->getPageDimensions();
 
 	// Line of free text
-	if (empty($hidefreetext) && ! empty($conf->global->$paramfreetext))
+	if (empty($hidefreetext) && !empty($conf->global->$paramfreetext))
 	{
 		// Make substitution
-		$substitutionarray=array(
+		$substitutionarray = array(
 			'__FROM_NAME__' => $fromcompany->name,
 			'__FROM_EMAIL__' => $fromcompany->email,
 			'__TOTAL_TTC__' => $object->total_ttc,
 			'__TOTAL_HT__' => $object->total_ht,
 			'__TOTAL_VAT__' => $object->total_vat
 		);
-		complete_substitutions_array($substitutionarray,$outputlangs,$object);
-		$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
-		$line.=$outputlangs->convToOutputCharset($newfreetext);
+		complete_substitutions_array($substitutionarray, $outputlangs, $object);
+		$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
+		$line .= $outputlangs->convToOutputCharset($newfreetext);
 	}
 
 	// First line of company infos
-	$line1=""; $line2=""; $line3=""; $line4="";
+	$line1 = ""; $line2 = ""; $line3 = ""; $line4 = "";
 
 	if ($showdetails)
 	{
 		// Company name
 		if ($fromcompany->name)
 		{
-			$line1.=($line1?" - ":"").$outputlangs->transnoentities("RegisteredOffice").": ".$fromcompany->name;
+			$line1 .= ($line1 ? " - " : "").$outputlangs->transnoentities("RegisteredOffice").": ".$fromcompany->name;
 		}
 		// Address
 		if ($fromcompany->address)
 		{
-			$line1.=($line1?" - ":"").$fromcompany->address;
+			$line1 .= ($line1 ? " - " : "").$fromcompany->address;
 		}
 		// Zip code
 		if ($fromcompany->zip)
 		{
-			$line1.=($line1?" - ":"").$fromcompany->zip;
+			$line1 .= ($line1 ? " - " : "").$fromcompany->zip;
 		}
 		// Town
 		if ($fromcompany->town)
 		{
-			$line1.=($line1?" ":"").$fromcompany->town;
+			$line1 .= ($line1 ? " " : "").$fromcompany->town;
 		}
 		// Phone
 		if ($fromcompany->phone)
 		{
-			$line1.=($line1?" - ":"").$outputlangs->transnoentities("Phone").": ".$fromcompany->phone;
+			$line1 .= ($line1 ? " - " : "").$outputlangs->transnoentities("Phone").": ".$fromcompany->phone;
 		}
 		// Fax
 		if ($fromcompany->fax)
 		{
-			$line1.=($line1?" - ":"").$outputlangs->transnoentities("Fax").": ".$fromcompany->fax;
+			$line1 .= ($line1 ? " - " : "").$outputlangs->transnoentities("Fax").": ".$fromcompany->fax;
 		}
 
 		// URL
 		if ($fromcompany->url)
 		{
-			$line2.=($line2?" - ":"").$fromcompany->url;
+			$line2 .= ($line2 ? " - " : "").$fromcompany->url;
 		}
 		// Email
 		if ($fromcompany->email)
 		{
-			$line2.=($line2?" - ":"").$fromcompany->email;
+			$line2 .= ($line2 ? " - " : "").$fromcompany->email;
 		}
 	}
 	if ($showdetails || ($fromcompany->country_code == 'DE'))
@@ -792,7 +792,7 @@ 
 		// Managers
 		if ($fromcompany->managers)
 		{
-			$line2.=($line2?" - ":"").$fromcompany->managers;
+			$line2 .= ($line2 ? " - " : "").$fromcompany->managers;
 		}
 	}
 
@@ -800,114 +800,114 @@ 
 	// Juridical status
 	if ($fromcompany->forme_juridique_code)
 	{
-		$line3.=($line3?" - ":"").$outputlangs->convToOutputCharset(getFormeJuridiqueLabel($fromcompany->forme_juridique_code));
+		$line3 .= ($line3 ? " - " : "").$outputlangs->convToOutputCharset(getFormeJuridiqueLabel($fromcompany->forme_juridique_code));
 	}
 	// Capital
 	if ($fromcompany->capital)
 	{
 		$tmpamounttoshow = price2num($fromcompany->capital); // This field is a free string
-		if (is_numeric($tmpamounttoshow) && $tmpamounttoshow > 0) $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",price($tmpamounttoshow, 0, $outputlangs, 0, 0, 0, $conf->currency));
-		else $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",$tmpamounttoshow,$outputlangs);
+		if (is_numeric($tmpamounttoshow) && $tmpamounttoshow > 0) $line3 .= ($line3 ? " - " : "").$outputlangs->transnoentities("CapitalOf", price($tmpamounttoshow, 0, $outputlangs, 0, 0, 0, $conf->currency));
+		else $line3 .= ($line3 ? " - " : "").$outputlangs->transnoentities("CapitalOf", $tmpamounttoshow, $outputlangs);
 	}
 	// Prof Id 1
-	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
+	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2))
 	{
-		$field=$outputlangs->transcountrynoentities("ProfId1",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line3.=($line3?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof1);
+		$field = $outputlangs->transcountrynoentities("ProfId1", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line3 .= ($line3 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof1);
 	}
 	// Prof Id 2
 	if ($fromcompany->idprof2)
 	{
-		$field=$outputlangs->transcountrynoentities("ProfId2",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line3.=($line3?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof2);
+		$field = $outputlangs->transcountrynoentities("ProfId2", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line3 .= ($line3 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof2);
 	}
 
 	// Line 4 of company infos
 	// Prof Id 3
 	if ($fromcompany->idprof3)
 	{
-		$field=$outputlangs->transcountrynoentities("ProfId3",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof3);
+		$field = $outputlangs->transcountrynoentities("ProfId3", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof3);
 	}
 	// Prof Id 4
 	if ($fromcompany->idprof4)
 	{
-		$field=$outputlangs->transcountrynoentities("ProfId4",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof4);
+		$field = $outputlangs->transcountrynoentities("ProfId4", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof4);
 	}
 	// IntraCommunautary VAT
 	if ($fromcompany->tva_intra != '')
 	{
-		$line4.=($line4?" - ":"").$outputlangs->transnoentities("VATIntraShort").": ".$outputlangs->convToOutputCharset($fromcompany->tva_intra);
+		$line4 .= ($line4 ? " - " : "").$outputlangs->transnoentities("VATIntraShort").": ".$outputlangs->convToOutputCharset($fromcompany->tva_intra);
 	}
 
-	$pdf->SetFont('','',7);
-	$pdf->SetDrawColor(224,224,224);
+	$pdf->SetFont('', '', 7);
+	$pdf->SetDrawColor(224, 224, 224);
 
 	// The start of the bottom of this page footer is positioned according to # of lines
-	$freetextheight=0;
+	$freetextheight = 0;
 	if ($line)	// Free text
 	{
-		$width=20000; $align='L';	// By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
-		if (! empty($conf->global->MAIN_USE_AUTOWRAP_ON_FREETEXT)) {
-			$width=200; $align='C';
+		$width = 20000; $align = 'L'; // By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
+		if (!empty($conf->global->MAIN_USE_AUTOWRAP_ON_FREETEXT)) {
+			$width = 200; $align = 'C';
 		}
-		$freetextheight=$pdf->getStringHeight($width,$line);
+		$freetextheight = $pdf->getStringHeight($width, $line);
 	}
 
-	$marginwithfooter=$marge_basse + $freetextheight + (! empty($line1)?3:0) + (! empty($line2)?3:0) + (! empty($line3)?3:0) + (! empty($line4)?3:0);
-	$posy=$marginwithfooter+0;
+	$marginwithfooter = $marge_basse + $freetextheight + (!empty($line1) ? 3 : 0) + (!empty($line2) ? 3 : 0) + (!empty($line3) ? 3 : 0) + (!empty($line4) ? 3 : 0);
+	$posy = $marginwithfooter + 0;
 
 	if ($line)	// Free text
 	{
-		$pdf->SetXY($dims['lm'],-$posy);
+		$pdf->SetXY($dims['lm'], -$posy);
 		$pdf->MultiCell(0, 3, $line, 0, $align, 0);
-		$posy-=$freetextheight;
+		$posy -= $freetextheight;
 	}
 
 	$pdf->SetY(-$posy);
-	$pdf->line($dims['lm'], $dims['hk']-$posy, $dims['wk']-$dims['rm'], $dims['hk']-$posy);
+	$pdf->line($dims['lm'], $dims['hk'] - $posy, $dims['wk'] - $dims['rm'], $dims['hk'] - $posy);
 	$posy--;
 
-	if (! empty($line1))
+	if (!empty($line1))
 	{
-		$pdf->SetFont('','B',7);
-		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell($dims['wk']-$dims['rm'], 2, $line1, 0, 'C', 0);
-		$posy-=3;
-		$pdf->SetFont('','',7);
+		$pdf->SetFont('', 'B', 7);
+		$pdf->SetXY($dims['lm'], -$posy);
+		$pdf->MultiCell($dims['wk'] - $dims['rm'], 2, $line1, 0, 'C', 0);
+		$posy -= 3;
+		$pdf->SetFont('', '', 7);
 	}
 
-	if (! empty($line2))
+	if (!empty($line2))
 	{
-		$pdf->SetFont('','B',7);
-		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell($dims['wk']-$dims['rm'], 2, $line2, 0, 'C', 0);
-		$posy-=3;
-		$pdf->SetFont('','',7);
+		$pdf->SetFont('', 'B', 7);
+		$pdf->SetXY($dims['lm'], -$posy);
+		$pdf->MultiCell($dims['wk'] - $dims['rm'], 2, $line2, 0, 'C', 0);
+		$posy -= 3;
+		$pdf->SetFont('', '', 7);
 	}
 
-	if (! empty($line3))
+	if (!empty($line3))
 	{
-		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell($dims['wk']-$dims['rm'], 2, $line3, 0, 'C', 0);
+		$pdf->SetXY($dims['lm'], -$posy);
+		$pdf->MultiCell($dims['wk'] - $dims['rm'], 2, $line3, 0, 'C', 0);
 	}
 
-	if (! empty($line4))
+	if (!empty($line4))
 	{
-		$posy-=3;
-		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell($dims['wk']-$dims['rm'], 2, $line4, 0, 'C', 0);
+		$posy -= 3;
+		$pdf->SetXY($dims['lm'], -$posy);
+		$pdf->MultiCell($dims['wk'] - $dims['rm'], 2, $line4, 0, 'C', 0);
 	}
 
 	// Show page nb only on iso languages (so default Helvetica font)
 	if (strtolower(pdf_getPDFFont($outputlangs)) == 'helvetica')
 	{
-		$pdf->SetXY(-20,-$posy);
+		$pdf->SetXY(-20, -$posy);
 		//print 'xxx'.$pdf->PageNo().'-'.$pdf->getAliasNbPages().'-'.$pdf->getAliasNumPage();exit;
 		if (empty($conf->global->MAIN_USE_FPDF)) $pdf->MultiCell(13, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
 		else $pdf->MultiCell(13, 2, $pdf->PageNo().'/{nb}', 0, 'R', 0);
@@ -930,22 +930,22 @@ 
  *	@param	string		$default_font_size	Font size
  *	@return	float                           The Y PDF position
  */
-function pdf_writeLinkedObjects(&$pdf,$object,$outputlangs,$posx,$posy,$w,$h,$align,$default_font_size)
+function pdf_writeLinkedObjects(&$pdf, $object, $outputlangs, $posx, $posy, $w, $h, $align, $default_font_size)
 {
-	$linkedobjects = pdf_getLinkedObjects($object,$outputlangs);
-	if (! empty($linkedobjects))
+	$linkedobjects = pdf_getLinkedObjects($object, $outputlangs);
+	if (!empty($linkedobjects))
 	{
-		foreach($linkedobjects as $linkedobject)
+		foreach ($linkedobjects as $linkedobject)
 		{
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetFont('','', $default_font_size - 2);
+			$posy += 3;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->MultiCell($w, $h, $linkedobject["ref_title"].' : '.$linkedobject["ref_value"], '', $align);
 
-			if (! empty($linkedobject["date_title"]) && ! empty($linkedobject["date_value"]))
+			if (!empty($linkedobject["date_title"]) && !empty($linkedobject["date_value"]))
 			{
-				$posy+=3;
-				$pdf->SetXY($posx,$posy);
+				$posy += 3;
+				$pdf->SetXY($posx, $posy);
 				$pdf->MultiCell($w, $h, $linkedobject["date_title"].' : '.$linkedobject["date_value"], '', $align);
 			}
 		}
@@ -970,24 +970,24 @@ 
  * 	@param	int				$issupplierline		Is it a line for a supplier object ?
  * 	@return	string|null
  */
-function pdf_writelinedesc(&$pdf,$object,$i,$outputlangs,$w,$h,$posx,$posy,$hideref=0,$hidedesc=0,$issupplierline=0)
+function pdf_writelinedesc(&$pdf, $object, $i, $outputlangs, $w, $h, $posx, $posy, $hideref = 0, $hidedesc = 0, $issupplierline = 0)
 {
 	global $db, $conf, $langs, $hookmanager;
 
-	$reshook=0;
-	if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	$reshook = 0;
+	if (is_object($hookmanager) && ((isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('pdf'=>$pdf,'i'=>$i,'outputlangs'=>$outputlangs,'w'=>$w,'h'=>$h,'posx'=>$posx,'posy'=>$posy,'hideref'=>$hideref,'hidedesc'=>$hidedesc,'issupplierline'=>$issupplierline,'special_code'=>$special_code);
-		$action='';
-		$reshook=$hookmanager->executeHooks('pdf_writelinedesc',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('pdf'=>$pdf, 'i'=>$i, 'outputlangs'=>$outputlangs, 'w'=>$w, 'h'=>$h, 'posx'=>$posx, 'posy'=>$posy, 'hideref'=>$hideref, 'hidedesc'=>$hidedesc, 'issupplierline'=>$issupplierline, 'special_code'=>$special_code);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('pdf_writelinedesc', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 	}
 	if (empty($reshook))
 	{
-		$labelproductservice=pdf_getlinedesc($object,$i,$outputlangs,$hideref,$hidedesc,$issupplierline);
+		$labelproductservice = pdf_getlinedesc($object, $i, $outputlangs, $hideref, $hidedesc, $issupplierline);
 		// Description
-		$pdf->writeHTMLCell($w, $h, $posx, $posy, $outputlangs->convToOutputCharset($labelproductservice), 0, 1, false, true, 'J',true);
+		$pdf->writeHTMLCell($w, $h, $posx, $posy, $outputlangs->convToOutputCharset($labelproductservice), 0, 1, false, true, 'J', true);
 		return $labelproductservice;
 	}
 }
@@ -1003,16 +1003,16 @@ 
  *  @param  int			$issupplierline      Is it a line for a supplier object ?
  *  @return string       				     String with line
  */
-function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issupplierline=0)
+function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, $issupplierline = 0)
 {
 	global $db, $conf, $langs;
 
-	$idprod=(! empty($object->lines[$i]->fk_product)?$object->lines[$i]->fk_product:false);
-	$label=(! empty($object->lines[$i]->label)?$object->lines[$i]->label:(! empty($object->lines[$i]->product_label)?$object->lines[$i]->product_label:''));
-	$desc=(! empty($object->lines[$i]->desc)?$object->lines[$i]->desc:(! empty($object->lines[$i]->description)?$object->lines[$i]->description:''));
-	$ref_supplier=(! empty($object->lines[$i]->ref_supplier)?$object->lines[$i]->ref_supplier:(! empty($object->lines[$i]->ref_fourn)?$object->lines[$i]->ref_fourn:''));    // TODO Not yet saved for supplier invoices, only supplier orders
-	$note=(! empty($object->lines[$i]->note)?$object->lines[$i]->note:'');
-	$dbatch=(! empty($object->lines[$i]->detail_batch)?$object->lines[$i]->detail_batch:false);
+	$idprod = (!empty($object->lines[$i]->fk_product) ? $object->lines[$i]->fk_product : false);
+	$label = (!empty($object->lines[$i]->label) ? $object->lines[$i]->label : (!empty($object->lines[$i]->product_label) ? $object->lines[$i]->product_label : ''));
+	$desc = (!empty($object->lines[$i]->desc) ? $object->lines[$i]->desc : (!empty($object->lines[$i]->description) ? $object->lines[$i]->description : ''));
+	$ref_supplier = (!empty($object->lines[$i]->ref_supplier) ? $object->lines[$i]->ref_supplier : (!empty($object->lines[$i]->ref_fourn) ? $object->lines[$i]->ref_fourn : '')); // TODO Not yet saved for supplier invoices, only supplier orders
+	$note = (!empty($object->lines[$i]->note) ? $object->lines[$i]->note : '');
+	$dbatch = (!empty($object->lines[$i]->detail_batch) ? $object->lines[$i]->detail_batch : false);
 
 	if ($issupplierline) $prodser = new ProductFournisseur($db);
 	else $prodser = new Product($db);
@@ -1021,9 +1021,9 @@ 
 	{
 		$prodser->fetch($idprod);
 		// If a predefined product and multilang and on other lang, we renamed label with label translated
-		if (! empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))
+		if (!empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))
 		{
-			$translatealsoifmodified=(! empty($conf->global->MAIN_MULTILANG_TRANSLATE_EVEN_IF_MODIFIED));	// By default if value was modified manually, we keep it (no translation because we don't have it)
+			$translatealsoifmodified = (!empty($conf->global->MAIN_MULTILANG_TRANSLATE_EVEN_IF_MODIFIED)); // By default if value was modified manually, we keep it (no translation because we don't have it)
 
 			// TODO Instead of making a compare to see if param was modified, check that content contains reference translation. If yes, add the added part to the new translation
 			// ($textwasmodified is replaced with $textwasmodifiedorcompleted and we add completion).
@@ -1031,59 +1031,59 @@ 
 			// Set label
 			// If we want another language, and if label is same than default language (we did force it to a specific value), we can use translation.
 			//var_dump($outputlangs->defaultlang.' - '.$langs->defaultlang.' - '.$label.' - '.$prodser->label);exit;
-			$textwasmodified=($label == $prodser->label);
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasmodified || $translatealsoifmodified))     $label=$prodser->multilangs[$outputlangs->defaultlang]["label"];
+			$textwasmodified = ($label == $prodser->label);
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasmodified || $translatealsoifmodified))     $label = $prodser->multilangs[$outputlangs->defaultlang]["label"];
 
 			// Set desc
 			// Manage HTML entities description test because $prodser->description is store with htmlentities but $desc no
-			$textwasmodified=false;
+			$textwasmodified = false;
 			if (!empty($desc) && dol_textishtml($desc) && !empty($prodser->description) && dol_textishtml($prodser->description)) {
-				$textwasmodified=(strpos(dol_html_entity_decode($desc,ENT_QUOTES | ENT_HTML401),dol_html_entity_decode($prodser->description,ENT_QUOTES | ENT_HTML401))!==false);
+				$textwasmodified = (strpos(dol_html_entity_decode($desc, ENT_QUOTES | ENT_HTML401), dol_html_entity_decode($prodser->description, ENT_QUOTES | ENT_HTML401)) !== false);
 			} else {
-				$textwasmodified=($desc == $prodser->description);
+				$textwasmodified = ($desc == $prodser->description);
 			}
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && ($textwasmodified || $translatealsoifmodified))  $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"];
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && ($textwasmodified || $translatealsoifmodified))  $desc = $prodser->multilangs[$outputlangs->defaultlang]["description"];
 
 			// Set note
-			$textwasmodified=($note == $prodser->note);
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified))  $note=$prodser->multilangs[$outputlangs->defaultlang]["note"];
+			$textwasmodified = ($note == $prodser->note);
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified))  $note = $prodser->multilangs[$outputlangs->defaultlang]["note"];
 		}
 	}
 
 	// Description short of product line
-	$libelleproduitservice=$label;
+	$libelleproduitservice = $label;
 
 	// Description long of product line
-	if (! empty($desc) && ($desc != $label))
+	if (!empty($desc) && ($desc != $label))
 	{
 		if ($libelleproduitservice && empty($hidedesc))
 		{
-			$libelleproduitservice.='__N__';
+			$libelleproduitservice .= '__N__';
 		}
 
 		if ($desc == '(CREDIT_NOTE)' && $object->lines[$i]->fk_remise_except)
 		{
-			$discount=new DiscountAbsolute($db);
+			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromCreditNote",$discount->ref_facture_source);
+			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromCreditNote", $discount->ref_facture_source);
 		}
 		elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except)
 		{
-			$discount=new DiscountAbsolute($db);
+			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromDeposit",$discount->ref_facture_source);
+			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromDeposit", $discount->ref_facture_source);
 			// Add date of deposit
-			if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec,'day','',$outputlangs).')';
+			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
 		}
 		else
 		{
 			if ($idprod)
 			{
-				if (empty($hidedesc)) $libelleproduitservice.=$desc;
+				if (empty($hidedesc)) $libelleproduitservice .= $desc;
 			}
 			else
 			{
-				$libelleproduitservice.=$desc;
+				$libelleproduitservice .= $desc;
 			}
 		}
 	}
@@ -1096,7 +1096,7 @@ 
 		{
 			$prefix_prodserv = "";
 			$ref_prodserv = "";
-			if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS))   // In standard mode, we do not show this
+			if (!empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS))   // In standard mode, we do not show this
 			{
 				if ($prodser->isservice())
 				{
@@ -1110,71 +1110,71 @@ 
 
 			if (empty($hideref))
 			{
-				if ($issupplierline) $ref_prodserv = $prodser->ref.($ref_supplier ? ' ('.$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.')' : '');   // Show local ref and supplier ref
+				if ($issupplierline) $ref_prodserv = $prodser->ref.($ref_supplier ? ' ('.$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.')' : ''); // Show local ref and supplier ref
 				else $ref_prodserv = $prodser->ref; // Show local ref only
 
-				if (! empty($libelleproduitservice)) $ref_prodserv .= " - ";
+				if (!empty($libelleproduitservice)) $ref_prodserv .= " - ";
 			}
 
-			$libelleproduitservice=$prefix_prodserv.$ref_prodserv.$libelleproduitservice;
+			$libelleproduitservice = $prefix_prodserv.$ref_prodserv.$libelleproduitservice;
 		}
 	}
 
 	// Add an additional description for the category products
-	if (! empty($conf->global->CATEGORY_ADD_DESC_INTO_DOC) && $idprod && ! empty($conf->categorie->enabled))
+	if (!empty($conf->global->CATEGORY_ADD_DESC_INTO_DOC) && $idprod && !empty($conf->categorie->enabled))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$categstatic=new Categorie($db);
+		$categstatic = new Categorie($db);
 		// recovering the list of all the categories linked to product
-		$tblcateg=$categstatic->containing($idprod, Categorie::TYPE_PRODUCT);
+		$tblcateg = $categstatic->containing($idprod, Categorie::TYPE_PRODUCT);
 		foreach ($tblcateg as $cate)
 		{
 			// Adding the descriptions if they are filled
-			$desccateg=$cate->add_description;
+			$desccateg = $cate->add_description;
 			if ($desccateg)
-				$libelleproduitservice.='__N__'.$desccateg;
+				$libelleproduitservice .= '__N__'.$desccateg;
 		}
 	}
 
-	if (! empty($object->lines[$i]->date_start) || ! empty($object->lines[$i]->date_end))
+	if (!empty($object->lines[$i]->date_start) || !empty($object->lines[$i]->date_end))
 	{
-		$format='day';
+		$format = 'day';
 		// Show duration if exists
 		if ($object->lines[$i]->date_start && $object->lines[$i]->date_end)
 		{
-			$period='('.$outputlangs->transnoentitiesnoconv('DateFromTo',dol_print_date($object->lines[$i]->date_start, $format, false, $outputlangs),dol_print_date($object->lines[$i]->date_end, $format, false, $outputlangs)).')';
+			$period = '('.$outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($object->lines[$i]->date_start, $format, false, $outputlangs), dol_print_date($object->lines[$i]->date_end, $format, false, $outputlangs)).')';
 		}
-		if ($object->lines[$i]->date_start && ! $object->lines[$i]->date_end)
+		if ($object->lines[$i]->date_start && !$object->lines[$i]->date_end)
 		{
-			$period='('.$outputlangs->transnoentitiesnoconv('DateFrom',dol_print_date($object->lines[$i]->date_start, $format, false, $outputlangs)).')';
+			$period = '('.$outputlangs->transnoentitiesnoconv('DateFrom', dol_print_date($object->lines[$i]->date_start, $format, false, $outputlangs)).')';
 		}
-		if (! $object->lines[$i]->date_start && $object->lines[$i]->date_end)
+		if (!$object->lines[$i]->date_start && $object->lines[$i]->date_end)
 		{
-			$period='('.$outputlangs->transnoentitiesnoconv('DateUntil',dol_print_date($object->lines[$i]->date_end, $format, false, $outputlangs)).')';
+			$period = '('.$outputlangs->transnoentitiesnoconv('DateUntil', dol_print_date($object->lines[$i]->date_end, $format, false, $outputlangs)).')';
 		}
 		//print '>'.$outputlangs->charset_output.','.$period;
-		$libelleproduitservice.="__N__".$period;
+		$libelleproduitservice .= "__N__".$period;
 		//print $libelleproduitservice;
 	}
 
 	if ($dbatch)
 	{
-		$format='day';
+		$format = 'day';
 		foreach ($dbatch as $detail)
 		{
-			$dte=array();
-			if ($detail->eatby) $dte[]=$outputlangs->transnoentitiesnoconv('printEatby',dol_print_date($detail->eatby, $format, false, $outputlangs));
-			if ($detail->sellby) $dte[]=$outputlangs->transnoentitiesnoconv('printSellby',dol_print_date($detail->sellby, $format, false, $outputlangs));
-			if ($detail->batch) $dte[]=$outputlangs->transnoentitiesnoconv('printBatch',$detail->batch);
-			$dte[]=$outputlangs->transnoentitiesnoconv('printQty',$detail->dluo_qty);
-			$libelleproduitservice.= "__N__  ".implode($dte,"-");
+			$dte = array();
+			if ($detail->eatby) $dte[] = $outputlangs->transnoentitiesnoconv('printEatby', dol_print_date($detail->eatby, $format, false, $outputlangs));
+			if ($detail->sellby) $dte[] = $outputlangs->transnoentitiesnoconv('printSellby', dol_print_date($detail->sellby, $format, false, $outputlangs));
+			if ($detail->batch) $dte[] = $outputlangs->transnoentitiesnoconv('printBatch', $detail->batch);
+			$dte[] = $outputlangs->transnoentitiesnoconv('printQty', $detail->dluo_qty);
+			$libelleproduitservice .= "__N__  ".implode($dte, "-");
 		}
 	}
 
 	// Now we convert \n into br
-	if (dol_textishtml($libelleproduitservice)) $libelleproduitservice=preg_replace('/__N__/','<br>',$libelleproduitservice);
-	else $libelleproduitservice=preg_replace('/__N__/',"\n",$libelleproduitservice);
-	$libelleproduitservice=dol_htmlentitiesbr($libelleproduitservice,1);
+	if (dol_textishtml($libelleproduitservice)) $libelleproduitservice = preg_replace('/__N__/', '<br>', $libelleproduitservice);
+	else $libelleproduitservice = preg_replace('/__N__/', "\n", $libelleproduitservice);
+	$libelleproduitservice = dol_htmlentitiesbr($libelleproduitservice, 1);
 
 	return $libelleproduitservice;
 }
@@ -1188,14 +1188,14 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  * 	@return	null|string
  */
-function pdf_getlinenum($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlinenum($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $hookmanager;
 
-	if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
+	if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		// TODO add hook function
 	}
 	else
@@ -1214,14 +1214,14 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  * 	@return	null|string
  */
-function pdf_getlineref($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlineref($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $hookmanager;
 
-	if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
+	if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		// TODO add hook function
 	}
 	else
@@ -1239,14 +1239,14 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  * 	@return	null|string
  */
-function pdf_getlineref_supplier($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlineref_supplier($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $hookmanager;
 
-	if (is_object($hookmanager) && ( ($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		// TODO add hook function
 	}
 	else
@@ -1264,24 +1264,24 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  * 	@return	string
  */
-function pdf_getlinevatrate($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $hookmanager;
 
-	if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
+	if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlinevatrate',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('pdf_getlinevatrate', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		
-		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 		else return $reshook;
 	}
 	else
 	{
-		if (empty($hidedetails) || $hidedetails > 1) return vatrate($object->lines[$i]->tva_tx,1,$object->lines[$i]->info_bits,1);
+		if (empty($hidedetails) || $hidedetails > 1) return vatrate($object->lines[$i]->tva_tx, 1, $object->lines[$i]->info_bits, 1);
 	}
 }
 
@@ -1294,22 +1294,22 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  * 	@return	string
  */
-function pdf_getlineupexcltax($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $conf, $hookmanager;
 
-	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+	$sign = 1;
+	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
 
-	if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
+	if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineupexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('pdf_getlineupexcltax', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		
-		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 		else return $reshook;
 	}
 	else
@@ -1327,22 +1327,22 @@ 
  *  @param	int			$hidedetails		Hide value (0 = no,	1 = yes, 2 = just special lines)
  *  @return	void
  */
-function pdf_getlineupwithtax($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlineupwithtax($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $hookmanager;
 
-	if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
+	if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		foreach($object->hooks as $modules)
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		foreach ($object->hooks as $modules)
 		{
-			if (method_exists($modules[$special_code],'pdf_getlineupwithtax')) return $modules[$special_code]->pdf_getlineupwithtax($object,$i,$outputlangs,$hidedetails);
+			if (method_exists($modules[$special_code], 'pdf_getlineupwithtax')) return $modules[$special_code]->pdf_getlineupwithtax($object, $i, $outputlangs, $hidedetails);
 		}
 	}
 	else
 	{
-		if (empty($hidedetails) || $hidedetails > 1) return price(($object->lines[$i]->subprice) + ($object->lines[$i]->subprice)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
+		if (empty($hidedetails) || $hidedetails > 1) return price(($object->lines[$i]->subprice) + ($object->lines[$i]->subprice) * ($object->lines[$i]->tva_tx) / 100, 0, $outputlangs);
 	}
 }
 
@@ -1355,21 +1355,21 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  *  @return	string
  */
-function pdf_getlineqty($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlineqty($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $hookmanager;
 
 	if ($object->lines[$i]->special_code != 3)
 	{
-		if (is_object($hookmanager) && (( $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
+		if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
 		{
 			$special_code = $object->lines[$i]->special_code;
-			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-			$action='';
-			$reshook = $hookmanager->executeHooks('pdf_getlineqty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+			$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+			$action = '';
+			$reshook = $hookmanager->executeHooks('pdf_getlineqty', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 			
-			if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+			if (!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 			else return $reshook;
 			
 		}
@@ -1389,21 +1389,21 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  * 	@return	string
  */
-function pdf_getlineqty_asked($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlineqty_asked($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $hookmanager;
 
 	if ($object->lines[$i]->special_code != 3)
 	{
-		if (is_object($hookmanager) && (( $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
+		if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
 		{
 			$special_code = $object->lines[$i]->special_code;
-			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-			$action='';
-			$reshook = $hookmanager->executeHooks('pdf_getlineqty_asked',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+			$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+			$action = '';
+			$reshook = $hookmanager->executeHooks('pdf_getlineqty_asked', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		
-			if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+			if (!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 			else return $reshook;
 		}
 		else
@@ -1422,21 +1422,21 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  * 	@return	string
  */
-function pdf_getlineqty_shipped($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlineqty_shipped($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $hookmanager;
 
 	if ($object->lines[$i]->special_code != 3)
 	{
-		if (is_object($hookmanager) && (( $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
+		if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
 		{
 			$special_code = $object->lines[$i]->special_code;
-			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-			$action='';
-			$reshook = $hookmanager->executeHooks('pdf_getlineqty_shipped',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+			$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+			$action = '';
+			$reshook = $hookmanager->executeHooks('pdf_getlineqty_shipped', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 			
-			if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+			if (!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 			else return $reshook;
 		}
 		else
@@ -1455,21 +1455,21 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  * 	@return	void
  */
-function pdf_getlineqty_keeptoship($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlineqty_keeptoship($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $hookmanager;
 
 	if ($object->lines[$i]->special_code != 3)
 	{
-		if (is_object($hookmanager) && (( $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
+		if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
 		{
 			$special_code = $object->lines[$i]->special_code;
-			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-			$action='';
-			$reshook = $hookmanager->executeHooks('pdf_getlineqty_keeptoship',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+			$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+			$action = '';
+			$reshook = $hookmanager->executeHooks('pdf_getlineqty_keeptoship', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 			
-			if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+			if (!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 			else return $reshook;
 		}
 		else
@@ -1506,9 +1506,9 @@ 
 			);
 			$action = '';
 			$reshook = $hookmanager->executeHooks('pdf_getlineunit', $parameters, $object,
-				$action);    // Note that $action and $object may have been modified by some hooks
+				$action); // Note that $action and $object may have been modified by some hooks
 				
-			if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+			if (!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 			else return $reshook;
 				
 		} else {
@@ -1529,7 +1529,7 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  * 	@return	string
  */
-function pdf_getlineremisepercent($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $hookmanager;
 
@@ -1537,20 +1537,20 @@ 
 
 	if ($object->lines[$i]->special_code != 3)
 	{
-		if (is_object($hookmanager) && ( ($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
+		if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
 		{
 			$special_code = $object->lines[$i]->special_code;
-			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-			$action='';
-			$reshook = $hookmanager->executeHooks('pdf_getlineremisepercent',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+			$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+			$action = '';
+			$reshook = $hookmanager->executeHooks('pdf_getlineremisepercent', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 			
-			if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+			if (!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 			else return $reshook;
 		}
 		else
 		{
-			if (empty($hidedetails) || $hidedetails > 1) return dol_print_reduction($object->lines[$i]->remise_percent,$outputlangs);
+			if (empty($hidedetails) || $hidedetails > 1) return dol_print_reduction($object->lines[$i]->remise_percent, $outputlangs);
 		}
 	}
 }
@@ -1575,12 +1575,12 @@ 
 			if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 			$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
 			$action = '';
-			$reshook = $hookmanager->executeHooks('pdf_getlineprogress', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('pdf_getlineprogress', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 			
-			if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+			if (!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 			else return $reshook;
 		} else {
-			if (empty($hidedetails) || $hidedetails > 1) return $object->lines[$i]->situation_percent . '%';
+			if (empty($hidedetails) || $hidedetails > 1) return $object->lines[$i]->situation_percent.'%';
 		}
 	}
 }
@@ -1594,12 +1594,12 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  * 	@return	string							Return total of line excl tax
  */
-function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $conf, $hookmanager;
 
-	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+	$sign = 1;
+	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
 
 	if ($object->lines[$i]->special_code == 3)
 	{
@@ -1607,15 +1607,15 @@ 
 	}
 	else
 	{
-		if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
+		if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
 		{
 			$special_code = $object->lines[$i]->special_code;
-			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-			$action='';
-			$reshook = $hookmanager->executeHooks('pdf_getlinetotalexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+			$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+			$action = '';
+			$reshook = $hookmanager->executeHooks('pdf_getlinetotalexcltax', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 			
-			if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+			if (!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 			else return $reshook;
 		}
 		else
@@ -1635,7 +1635,7 @@ 
  *  @param	int			$hidedetails		Hide value (0 = no, 1 = yes, 2 = just special lines)
  *  @return	string							Return total of line incl tax
  */
-function pdf_getlinetotalwithtax($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $hookmanager;
 
@@ -1645,20 +1645,20 @@ 
 	}
 	else
 	{
-		if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
+		if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
 		{
 			$special_code = $object->lines[$i]->special_code;
-			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-			$action='';
-			$reshook = $hookmanager->executeHooks('pdf_getlinetotalwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+			$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+			$action = '';
+			$reshook = $hookmanager->executeHooks('pdf_getlinetotalwithtax', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 			
-			if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+			if (!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 			else return $reshook;
 		}
 		else
 		{
-			if (empty($hidedetails) || $hidedetails > 1) return price(($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
+			if (empty($hidedetails) || $hidedetails > 1) return price(($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht) * ($object->lines[$i]->tva_tx) / 100, 0, $outputlangs);
 		}
 	}
 	return '';
@@ -1672,33 +1672,33 @@ 
  *  @param  Translate	$outputlangs		Object langs for output
  * 	@return	integer
  */
-function pdf_getTotalQty($object,$type,$outputlangs)
+function pdf_getTotalQty($object, $type, $outputlangs)
 {
 	global $hookmanager;
 
-	$total=0;
-	$nblignes=count($object->lines);
+	$total = 0;
+	$nblignes = count($object->lines);
 
 	// Loop on each lines
-	for ($i = 0 ; $i < $nblignes ; $i++)
+	for ($i = 0; $i < $nblignes; $i++)
 	{
 		if ($object->lines[$i]->special_code != 3)
 		{
-			if ($type=='all')
+			if ($type == 'all')
 			{
 				$total += $object->lines[$i]->qty;
 			}
-			else if ($type==9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
+			else if ($type == 9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
 			{
 				$special_code = $object->lines[$i]->special_code;
-				if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+				if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 				// TODO add hook function
 			}
-			else if ($type==0 && $object->lines[$i]->product_type == 0)
+			else if ($type == 0 && $object->lines[$i]->product_type == 0)
 			{
 				$total += $object->lines[$i]->qty;
 			}
-			else if ($type==1 && $object->lines[$i]->product_type == 1)
+			else if ($type == 1 && $object->lines[$i]->product_type == 1)
 			{
 				$total += $object->lines[$i]->qty;
 			}
@@ -1715,74 +1715,74 @@ 
  * 	@param	Translate	$outputlangs	Object lang for output
  * 	@return	array   Linked objects
  */
-function pdf_getLinkedObjects($object,$outputlangs)
+function pdf_getLinkedObjects($object, $outputlangs)
 {
 	global $hookmanager;
 
-	$linkedobjects=array();
+	$linkedobjects = array();
 
 	$object->fetchObjectLinked();
 
-	foreach($object->linkedObjects as $objecttype => $objects)
+	foreach ($object->linkedObjects as $objecttype => $objects)
 	{
 		if ($objecttype == 'propal')
 		{
 			$outputlangs->load('propal');
 			
-			foreach($objects as $elementobject)
+			foreach ($objects as $elementobject)
 			{
 				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefProposal");
 				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref);
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DatePropal");
-				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date,'day','',$outputlangs);
+				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date, 'day', '', $outputlangs);
 			}
 		}
 		else if ($objecttype == 'commande')
 		{
 			$outputlangs->load('orders');
-			foreach($objects as $elementobject)
+			foreach ($objects as $elementobject)
 			{
 				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder");
-				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref) . ($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '');
+				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref).($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '');
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate");
-				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date,'day','',$outputlangs);
+				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date, 'day', '', $outputlangs);
 			}
 		}
 		else if ($objecttype == 'contrat')
 		{
 			$outputlangs->load('contracts');
-			foreach($objects as $elementobject)
+			foreach ($objects as $elementobject)
 			{
 				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefContract");
 				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref);
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateContract");
-				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date_contrat,'day','',$outputlangs);
+				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date_contrat, 'day', '', $outputlangs);
 			}
 		}
 		else if ($objecttype == 'shipping')
 		{
 			$outputlangs->load('orders');
 			$outputlangs->load('sendings');
-			foreach($objects as $elementobject)
+			foreach ($objects as $elementobject)
 			{
 				$elementobject->fetchObjectLinked();
 				$order = $elementobject->linkedObjects['commande'][0];
 
-				if (! empty($object->linkedObjects['commande']))	// There is already a link to order so we show only info of shipment
+				if (!empty($object->linkedObjects['commande']))	// There is already a link to order so we show only info of shipment
 				{
 					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
-					$linkedobjects[$objecttype]['ref_value'].= $outputlangs->transnoentities($elementobject->ref);
+					$linkedobjects[$objecttype]['ref_value'] .= $outputlangs->transnoentities($elementobject->ref);
 					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateSending");
-					$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
+					$linkedobjects[$objecttype]['date_value'] .= dol_print_date($elementobject->date_delivery, 'day', '', $outputlangs);
 				}
 				else	// We show both info of order and shipment
 				{
-					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
-					$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
-					$linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($elementobject->ref);
-					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ' / ' . $outputlangs->transnoentities("DateSending");
-					$linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
-					$linkedobjects[$objecttype]['date_value'].= ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
+					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending");
+					$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '');
+					$linkedobjects[$objecttype]['ref_value'] .= ' / '.$outputlangs->transnoentities($elementobject->ref);
+					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate").' / '.$outputlangs->transnoentities("DateSending");
+					$linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date, 'day', '', $outputlangs);
+					$linkedobjects[$objecttype]['date_value'] .= ' / '.dol_print_date($elementobject->date_delivery, 'day', '', $outputlangs);
 				}
 			}
 		}
@@ -1792,9 +1792,9 @@ 
 	if (is_object($hookmanager))
 	{
 		$parameters = array('linkedobjects' => $linkedobjects, 'outputlangs'=>$outputlangs);
-		$action='';
-		$hookmanager->executeHooks('pdf_getLinkedObjects',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		if (! empty($hookmanager->resArray)) $linkedobjects = $hookmanager->resArray;
+		$action = '';
+		$hookmanager->executeHooks('pdf_getLinkedObjects', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+		if (!empty($hookmanager->resArray)) $linkedobjects = $hookmanager->resArray;
 	}
 
 	return $linkedobjects;
@@ -1811,23 +1811,23 @@ 
 {
 	global $conf;
 
-	$maxwidth=(empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);
-	$maxheight=(empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT)?32:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT);
+	$maxwidth = (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);
+	$maxheight = (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT) ? 32 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT);
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-	$tmp=dol_getImageSize($realpath);
+	$tmp = dol_getImageSize($realpath);
 	if ($tmp['height'])
 	{
-		$width=(int) round($maxheight*$tmp['width']/$tmp['height']);	// I try to use maxheight
+		$width = (int) round($maxheight * $tmp['width'] / $tmp['height']); // I try to use maxheight
 		if ($width > $maxwidth)	// Pb with maxheight, so i use maxwidth
 		{
-			$width=$maxwidth;
-			$height=(int) round($maxwidth*$tmp['height']/$tmp['width']);
+			$width = $maxwidth;
+			$height = (int) round($maxwidth * $tmp['height'] / $tmp['width']);
 		}
 		else	// No pb with maxheight
 		{
-			$height=$maxheight;
+			$height = $maxheight;
 		}
 	}
-	return array('width'=>$width,'height'=>$height);
+	return array('width'=>$width, 'height'=>$height);
 }
 

lib/subtotal.lib.php

Spacing +19 added lines, -19 removed lines

@@ -41,21 +41,21 @@ 
     $head[$h][2] = 'about';
     $h++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'subtotal', $showLabel=false);
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'subtotal', $showLabel = false);
 
     return $head;
 }
 
-function getHtmlSelectTitle(&$object, $showLabel=false)
+function getHtmlSelectTitle(&$object, $showLabel = false)
 {
 	global $langs;
 	
-	require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 	dol_include_once('/subtotal/class/subtotal.class.php');
 	$TTitle = TSubtotal::getAllTitleFromDocument($object);
 	$html = '';
-	if ($showLabel) $html.= '<label for="under_title">'.$langs->trans('subtotalLabelForUnderTitle').'</label>';
-	$html.= '<select onChange="$(\'select[name=under_title]\').val(this.value);" name="under_title" class="under_title minwidth200"><option value="-1"></option>';
+	if ($showLabel) $html .= '<label for="under_title">'.$langs->trans('subtotalLabelForUnderTitle').'</label>';
+	$html .= '<select onChange="$(\'select[name=under_title]\').val(this.value);" name="under_title" class="under_title minwidth200"><option value="-1"></option>';
 	
 	$nbsp = '&nbsp;';
 	foreach ($TTitle as &$line)
@@ -70,7 +70,7 @@ 
 
 function getTFreeText()
 {
-	global $db,$conf;
+	global $db, $conf;
 	
 	$TFreeText = array();
 	
@@ -88,19 +88,19 @@ 
 	return $TFreeText;
 }
 
-function getHtmlSelectFreeText($withEmpty=true)
+function getHtmlSelectFreeText($withEmpty = true)
 {
 	global $langs;
 	
 	$TFreeText = getTFreeText();
 	$html = '<label for="free_text">'.$langs->trans('subtotalLabelForFreeText').'</label>';
-	$html.= '<select onChange="getTFreeText($(this));" name="free_text" class="minwidth200">';
-	if ($withEmpty) $html.= '<option value=""></option>';
+	$html .= '<select onChange="getTFreeText($(this));" name="free_text" class="minwidth200">';
+	if ($withEmpty) $html .= '<option value=""></option>';
 
 	$TFreeTextContents = array();
 	foreach ($TFreeText as $id => $tab)
 	{
-		$html.= '<option value="'.$id.'">'.$tab->label.'</option>';
+		$html .= '<option value="'.$id.'">'.$tab->label.'</option>';
 		$TFreeTextContents[$id] = $tab->content;
 	}
 
@@ -128,7 +128,7 @@ 
 function _updateSubtotalLine(&$object, &$line)
 {
 	$label = GETPOST('line-title');
-	$description = ($line->qty>90) ? '' : GETPOST('line-description');
+	$description = ($line->qty > 90) ? '' : GETPOST('line-description');
 	$pagebreak = (int) GETPOST('line-pagebreak');
 
 	$level = GETPOST('subtotal_level', 'int');
@@ -145,7 +145,7 @@ 
 
 function _updateSubtotalBloc($object, $line)
 {
-	global $conf,$langs;
+	global $conf, $langs;
 	
 	$subtotal_tva_tx = $subtotal_tva_tx_init = GETPOST('subtotal_tva_tx', 'int');
 	$subtotal_progress = $subtotal_progress_init = GETPOST('subtotal_progress', 'int');
@@ -221,9 +221,9 @@ 
  * @param	$lineid			= title lineid
  * @param	$subtotal_nc	0 = "Compris" prise en compte des totaux des lignes; 1 = "Non compris" non prise en compte des totaux du bloc; null = update de toutes les lignes 
  */
-function _updateLineNC($element, $elementid, $lineid, $subtotal_nc=null)
+function _updateLineNC($element, $elementid, $lineid, $subtotal_nc = null)
 {
-	global $db,$langs,$tmp_object_nc;
+	global $db, $langs, $tmp_object_nc;
 	
 	$error = 0;
 	if (empty($element)) $error++;
@@ -248,7 +248,7 @@ 
 	{
 		foreach ($object->lines as &$l)
 		{
-			if($l->id == $lineid) {
+			if ($l->id == $lineid) {
 				$line = $l;
 				break;
 			}
@@ -258,12 +258,12 @@ 
 		{
 			$db->begin();
 			
-			if(TSubtotal::isModSubtotalLine($line))
+			if (TSubtotal::isModSubtotalLine($line))
 			{
-				if(TSubtotal::isTitle($line)) {
+				if (TSubtotal::isTitle($line)) {
 					// Update le contenu du titre (ainsi que le titre lui même)
 					$TTitleBlock = TSubtotal::getLinesFromTitleId($object, $lineid, true);
-					foreach($TTitleBlock as &$line_block)
+					foreach ($TTitleBlock as &$line_block)
 					{
 						$res = doUpdate($object, $line_block, $subtotal_nc);
 					}
@@ -295,7 +295,7 @@ 
 {
 	if (TSubtotal::isFreeText($line) || TSubtotal::isSubtotal($line)) return 1;
 	// Update extrafield et total
-	if(! empty($subtotal_nc)) {
+	if (!empty($subtotal_nc)) {
 		$line->total_ht = $line->total_tva = $line->total_ttc = $line->total_localtax1 = $line->total_localtax2 = 
 			$line->multicurrency_total_ht = $line->multicurrency_total_tva = $line->multicurrency_total_ttc = 0;