alxarafe / alixar

dolibarr/htdocs/core/tpl/objectline_create.tpl.php

Braces +139 added lines, -75 removed lines

@@ -46,19 +46,36 @@ 
     $usemargins=1;
 }
 
-if (! isset($dateSelector)) global $dateSelector;	// Take global var only if not already defined into function calling (for example formAddObjectLine)
+if (! isset($dateSelector)) {
+    global $dateSelector;
+}
+// Take global var only if not already defined into function calling (for example formAddObjectLine)
 global $forceall, $forcetoshowtitlelines, $senderissupplier, $inputalsopricewithtax;
 
-if (! isset($dateSelector)) $dateSelector=1;    // For backward compatibility
-elseif (empty($dateSelector)) $dateSelector=0;
-if (empty($forceall)) $forceall=0;
-if (empty($senderissupplier)) $senderissupplier=0;
-if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
+if (! isset($dateSelector)) {
+    $dateSelector=1;
+}
+// For backward compatibility
+elseif (empty($dateSelector)) {
+    $dateSelector=0;
+}
+if (empty($forceall)) {
+    $forceall=0;
+}
+if (empty($senderissupplier)) {
+    $senderissupplier=0;
+}
+if (empty($inputalsopricewithtax)) {
+    $inputalsopricewithtax=0;
+}
 
 
 // Define colspan for button Add
 $colspan = 3;	// Col total ht + col edit + col delete
-if (in_array($object->element,array('propal','commande','order','facture','facturerec','invoice','supplier_proposal','order_supplier','invoice_supplier'))) $colspan++;	// With this, there is a column move button
+if (in_array($object->element,array('propal','commande','order','facture','facturerec','invoice','supplier_proposal','order_supplier','invoice_supplier'))) {
+    $colspan++;
+}
+// With this, there is a column move button
 //print $object->element;
 
 // Lines for extrafield
@@ -67,26 +84,19 @@ 
 {
 	if ($this->table_element_line=='commandedet') {
 		$objectline = new OrderLine($this->db);
-	}
-	elseif ($this->table_element_line=='propaldet') {
+	} elseif ($this->table_element_line=='propaldet') {
 		$objectline = new PropaleLigne($this->db);
-	}
-	elseif ($this->table_element_line=='supplier_proposaldet') {
+	} elseif ($this->table_element_line=='supplier_proposaldet') {
 		$objectline = new SupplierProposalLine($this->db);
-	}
-	elseif ($this->table_element_line=='facturedet') {
+	} elseif ($this->table_element_line=='facturedet') {
 		$objectline = new FactureLigne($this->db);
-	}
-	elseif ($this->table_element_line=='contratdet') {
+	} elseif ($this->table_element_line=='contratdet') {
 		$objectline = new ContratLigne($this->db);
-	}
-	elseif ($this->table_element_line=='commande_fournisseurdet') {
+	} elseif ($this->table_element_line=='commande_fournisseurdet') {
 		$objectline = new CommandeFournisseurLigne($this->db);
-	}
-	elseif ($this->table_element_line=='facture_fourn_det') {
+	} elseif ($this->table_element_line=='facture_fourn_det') {
 		$objectline = new SupplierInvoiceLine($this->db);
-	}
-	elseif ($this->table_element_line=='facturedet_rec') {
+	} elseif ($this->table_element_line=='facturedet_rec') {
 		$objectline = new FactureLigneRec($this->db);
 	}
 }
@@ -106,10 +116,13 @@ 
 	<div id="add"></div><span class="hideonsmartphone"><?php echo $langs->trans('AddNewLine'); ?></span><?php // echo $langs->trans("FreeZone"); ?>
 	</td>
 	<?php
-	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
+	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') {
+	    // We must have same test in printObjectLines
 	{
 	?>
-		<td class="linecolrefsupplier"><span id="title_fourn_ref"><?php echo $langs->trans('SupplierRef'); ?></span></td>
+		<td class="linecolrefsupplier"><span id="title_fourn_ref"><?php echo $langs->trans('SupplierRef');
+	}
+	?></span></td>
 	<?php } ?>
 	<td class="linecolvat" align="right"><span id="title_vat"><?php echo $langs->trans('VAT'); ?></span></td>
 	<td class="linecoluht" align="right"><span id="title_up_ht"><?php echo $langs->trans('PriceUHT'); ?></span></td>
@@ -140,18 +153,24 @@ 
 		?>
 		<td align="right" class="margininfos linecolmargin1">
 		<?php
+		} else {
+		    $colspan++;
 		}
-		else $colspan++;
 
-		if ($conf->global->MARGIN_TYPE == "1")
-			echo $langs->trans('BuyingPrice');
-		else
-			echo $langs->trans('CostPrice');
+		if ($conf->global->MARGIN_TYPE == "1") {
+					echo $langs->trans('BuyingPrice');
+		} else {
+					echo $langs->trans('CostPrice');
+		}
 		?>
 		</td>
 		<?php
-		if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARGIN_RATES)) echo '<td align="right" class="margininfos linecolmargin2"><span class="np_marginRate">'.$langs->trans('MarginRate').'</span></td>';
-		if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARK_RATES)) 	echo '<td align="right" class="margininfos linecolmargin2"><span class="np_markRate">'.$langs->trans('MarkRate').'</span></td>';
+		if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+		    echo '<td align="right" class="margininfos linecolmargin2"><span class="np_marginRate">'.$langs->trans('MarginRate').'</span></td>';
+		}
+		if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARK_RATES)) {
+		    echo '<td align="right" class="margininfos linecolmargin2"><span class="np_markRate">'.$langs->trans('MarkRate').'</span></td>';
+		}
 	}
 	?>
 	<td class="linecoledit" colspan="<?php echo $colspan; ?>">&nbsp;</td>
@@ -167,8 +186,7 @@ 
 	?>
 	<td class="nobottom linecolnum" align="center" width="5"></td>
 	<?php
-}
-else {
+} else {
 	$coldisplay=0;
 }
 ?>
@@ -184,8 +202,13 @@ 
 		$forceall=1;	// We always force all type for free lines (module product or service means we use predefined product or service)
 		if ($object->element == 'contrat')
 		{
-			if (empty($conf->product->enabled) && empty($conf->service->enabled) && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $forceall=-1;	// With contract, by default, no choice at all, except if CONTRACT_SUPPORT_PRODUCTS is set
-			else if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $forceall=3;
+			if (empty($conf->product->enabled) && empty($conf->service->enabled) && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) {
+			    $forceall=-1;
+			}
+			// With contract, by default, no choice at all, except if CONTRACT_SUPPORT_PRODUCTS is set
+			else if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) {
+			    $forceall=3;
+			}
 		}
 
 		// Free line
@@ -202,15 +225,17 @@ 
 			echo $langs->trans("FreeLineOfType");
 			echo '</label>';
 			echo ' ';
-		}
-		else
+		} else
 		{
 			echo '<input type="hidden" id="prod_entry_mode_free" name="prod_entry_mode" value="free">';
 			// Show type selector
 			if ($forceall >= 0)
 			{
-			    if (empty($conf->product->enabled) || empty($conf->service->enabled)) echo $langs->trans("Type");
-				else echo $langs->trans("FreeLineOfType");
+			    if (empty($conf->product->enabled) || empty($conf->service->enabled)) {
+			        echo $langs->trans("Type");
+			    } else {
+				    echo $langs->trans("FreeLineOfType");
+				}
 				echo ' ';
 			}
 		}
@@ -223,27 +248,38 @@ 
 	// Predefined product/service
 	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
 	{
-		if ($forceall >= 0 && $freelines) echo '<br>';
+		if ($forceall >= 0 && $freelines) {
+		    echo '<br>';
+		}
 		echo '<span class="prod_entry_mode_predef">';
 		echo '<label for="prod_entry_mode_predef">';
 		echo '<input type="radio" class="prod_entry_mode_predef" name="prod_entry_mode" id="prod_entry_mode_predef" value="predef"'.(GETPOST('prod_entry_mode')=='predef'?' checked':'').'> ';
 		if (empty($senderissupplier))
 		{
-			if (! empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToSell');
-			else if ((empty($conf->product->enabled) && ! empty($conf->service->enabled)) || ($object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))) echo $langs->trans('PredefinedServicesToSell');
-			else echo $langs->trans('PredefinedProductsAndServicesToSell');
-		}
-		else
+			if (! empty($conf->product->enabled) && empty($conf->service->enabled)) {
+			    echo $langs->trans('PredefinedProductsToSell');
+			} else if ((empty($conf->product->enabled) && ! empty($conf->service->enabled)) || ($object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))) {
+			    echo $langs->trans('PredefinedServicesToSell');
+			} else {
+			    echo $langs->trans('PredefinedProductsAndServicesToSell');
+			}
+		} else
 		{
-			if (! empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToPurchase');
-			else if (empty($conf->product->enabled) && ! empty($conf->service->enabled)) echo $langs->trans('PredefinedServicesToPurchase');
-			else echo $langs->trans('PredefinedProductsAndServicesToPurchase');
+			if (! empty($conf->product->enabled) && empty($conf->service->enabled)) {
+			    echo $langs->trans('PredefinedProductsToPurchase');
+			} else if (empty($conf->product->enabled) && ! empty($conf->service->enabled)) {
+			    echo $langs->trans('PredefinedServicesToPurchase');
+			} else {
+			    echo $langs->trans('PredefinedProductsAndServicesToPurchase');
+			}
 		}
 		echo '</label>';
 		echo ' ';
 
 		$filtertype='';
-		if (! empty($object->element) && $object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $filtertype='1';
+		if (! empty($object->element) && $object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) {
+		    $filtertype='1';
+		}
 
 		if (empty($senderissupplier))
 		{
@@ -251,13 +287,11 @@ 
 			{
 				// hide products in closed warehouse, but show products for internal transfer
 				$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth300', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
-			}
-			else
+			} else
 			{
 				$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth300', 0, '', GETPOST('combinations', 'array'));
 			}
-		}
-		else
+		} else
 		{
 			// $senderissupplier=2 is same than 1 but disable test on minimum qty and disable autofill qty with minimum
 		    if ($senderissupplier != 2)
@@ -268,8 +302,7 @@ 
     					'warning' => $langs->trans("NoPriceDefinedForThisSupplier") // translation of an error saved into var 'warning' (for exemple shown we select a disabled option into combo)
     			);
     			$alsoproductwithnosupplierprice=0;
-		    }
-		    else
+		    } else
 		    {
 		        $ajaxoptions = array();
 		        $alsoproductwithnosupplierprice=1;
@@ -312,9 +345,13 @@ 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$nbrows=ROWS_2;
 	$enabled=(! empty($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
-	if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+	if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) {
+	    $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+	}
 	$toolbarname='dolibarr_details';
-	if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes';
+	if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) {
+	    $toolbarname='dolibarr_notes';
+	}
 	$doleditor=new DolEditor('dp_desc',GETPOST('dp_desc'),'',100,$toolbarname,'',false,true,$enabled,$nbrows,'98%');
 	$doleditor->Create();
 
@@ -333,15 +370,21 @@ 
 	</td>
 
 	<?php
-	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
+	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') {
+	    // We must have same test in printObjectLines
 	{
 	?>
-		<td class="nobottom linecolresupplier"><input id="fourn_ref" name="fourn_ref" class="flat maxwidth75" value="<?php echo (isset($_POST["fourn_ref"])?GETPOST("fourn_ref",'alpha',2):''); ?>"></td>
+		<td class="nobottom linecolresupplier"><input id="fourn_ref" name="fourn_ref" class="flat maxwidth75" value="<?php echo (isset($_POST["fourn_ref"])?GETPOST("fourn_ref",'alpha',2):'');
+	}
+	?>"></td>
 	<?php } ?>
 
 	<td class="nobottom linecolvat" align="right"><?php
-	if ($seller->tva_assuj == "0") echo '<input type="hidden" name="tva_tx" id="tva_tx" value="0">'.vatrate(0, true);
-	else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?GETPOST("tva_tx",'alpha',2):-1), $seller, $buyer, 0, 0, '', false, 1);
+	if ($seller->tva_assuj == "0") {
+	    echo '<input type="hidden" name="tva_tx" id="tva_tx" value="0">'.vatrate(0, true);
+	} else {
+	    echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?GETPOST("tva_tx",'alpha',2):-1), $seller, $buyer, 0, 0, '', false, 1);
+	}
 	?>
 	</td>
 	<td class="nobottom linecoluht" align="right">
@@ -407,11 +450,14 @@ 
 				echo '<td align="right" class="nobottom nowrap margininfos"><input class="flat right" type="text" size="2" id="np_markRate" name="np_markRate" value="'.(isset($_POST["np_markRate"])?GETPOST("np_markRate",'alpha',2):'').'"><span class="np_markRate hideonsmartphone">%</span></td>';
 				$coldisplay++;
 			}
-		}
-		else
+		} else
 		{
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $coldisplay++;
-			if (! empty($conf->global->DISPLAY_MARK_RATES))   $coldisplay++;
+			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+			    $coldisplay++;
+			}
+			if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+			    $coldisplay++;
+			}
 		}
 	}
 	?>
@@ -427,14 +473,18 @@ 
 ?>
 
 <?php
-if ((! empty($conf->service->enabled) || ($object->element == 'contrat')) && $dateSelector && GETPOST('type') != '0')	// We show date field if required
+if ((! empty($conf->service->enabled) || ($object->element == 'contrat')) && $dateSelector && GETPOST('type') != '0') {
+    // We show date field if required
 {
 	$colspan = 6;
+}
 
-	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
+	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') {
+	    // We must have same test in printObjectLines
 	{
 		$colspan++;
 	}
+	}
 	if ($this->situation_cycle_ref) {
 		$colspan++;
 	}
@@ -465,13 +515,22 @@ 
 		}
 	}
 
-	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) $colspan+=2;
+	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+	    $colspan+=2;
+	}
 
 	if (! empty($usemargins))
 	{
-		if (!empty($user->rights->margins->creer)) $colspan++; // For the buying price
-		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
-		if (! empty($conf->global->DISPLAY_MARK_RATES))   $colspan++;
+		if (!empty($user->rights->margins->creer)) {
+		    $colspan++;
+		}
+		// For the buying price
+		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+		    $colspan++;
+		}
+		if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+		    $colspan++;
+		}
 	}
 	?>
 
@@ -487,8 +546,7 @@ 
 		print $form->selectDate($date_start,"date_start",$usehm,$usehm,1,"addproduct");
 		print ' &nbsp; '.$langs->trans("DateEndPlanned").' ';
 		print $form->selectDate($date_end,"date_end",$usehm,$usehm,1,"addproduct");
-	}
-	else
+	} else
 	{
 		echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
 		print $form->selectDate($date_start, 'date_start', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1, 1, "addproduct", 1, 0);
@@ -675,9 +733,15 @@ 
     	      		var defaultbuyprice = '<?php
     	      		if (isset($conf->global->MARGIN_TYPE))
     	      		{
-    	      		    if ($conf->global->MARGIN_TYPE == '1')   print 'bestsupplierprice';
-    	      		    if ($conf->global->MARGIN_TYPE == 'pmp') print 'pmp';
-    	      		    if ($conf->global->MARGIN_TYPE == 'costprice') print 'costprice';
+    	      		    if ($conf->global->MARGIN_TYPE == '1') {
+    	      		        print 'bestsupplierprice';
+    	      		    }
+    	      		    if ($conf->global->MARGIN_TYPE == 'pmp') {
+    	      		        print 'pmp';
+    	      		    }
+    	      		    if ($conf->global->MARGIN_TYPE == 'costprice') {
+    	      		        print 'costprice';
+    	      		    }
     	      		} ?>';
     	      		console.log("we will set the field for margin. defaultbuyprice="+defaultbuyprice);
 

dolibarr/htdocs/core/tpl/bloc_showhide.tpl.php

Braces +6 added lines, -2 removed lines

@@ -25,8 +25,12 @@
 }
 
 $hide = true;	// Hide by default
-if (isset($parameters['showblocbydefault'])) $hide=(empty($parameters['showblocbydefault']) ? true : false);
-if (isset($object->extraparams[$blocname]['showhide'])) $hide = (empty($object->extraparams[$blocname]['showhide']) ? true : false);
+if (isset($parameters['showblocbydefault'])) {
+    $hide=(empty($parameters['showblocbydefault']) ? true : false);
+}
+if (isset($object->extraparams[$blocname]['showhide'])) {
+    $hide = (empty($object->extraparams[$blocname]['showhide']) ? true : false);
+}
 
 ?>
 <!-- BEGIN PHP TEMPLATE bloc_showhide.tpl.php -->

dolibarr/htdocs/core/tpl/extrafields_list_print_fields.tpl.php

Braces +19 added lines, -8 removed lines

@@ -7,10 +7,13 @@ 
 	exit;
 }
 
-if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey=$object->table_element;
+if (empty($extrafieldsobjectkey) && is_object($object)) {
+    $extrafieldsobjectkey=$object->table_element;
+}
 
 // Loop to show all columns of extrafields from $obj, $extrafields and $db
-if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
+if (! empty($extrafieldsobjectkey)) {
+    // $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
 	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
 	{
@@ -19,27 +22,33 @@ 
 			if (! empty($arrayfields["ef.".$key]['checked']))
 			{
 				$align=$extrafields->getAlignFlag($key, $extrafieldsobjectkey);
+}
 				print '<td';
-				if ($align) print ' align="'.$align.'"';
+				if ($align) {
+				    print ' align="'.$align.'"';
+				}
 				print '>';
 				$tmpkey='options_'.$key;
 				if (in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$key], array('date', 'datetime', 'timestamp')) && !is_numeric($obj->$tmpkey))
 				{
 					$datenotinstring = $obj->$tmpkey;
-					if (! is_numeric($obj->$tmpkey))	// For backward compatibility
+					if (! is_numeric($obj->$tmpkey)) {
+					    // For backward compatibility
 					{
 						$datenotinstring = $db->jdate($datenotinstring);
 					}
+					}
 					$value = $datenotinstring;
-				}
-				else
+				} else
 				{
 					$value = $obj->$tmpkey;
 				}
 
 				print $extrafields->showOutputField($key, $value, '', $extrafieldsobjectkey);
 				print '</td>';
-				if (! $i) $totalarray['nbfield']++;
+				if (! $i) {
+				    $totalarray['nbfield']++;
+				}
 
                 if ($extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key]) {
                     if (! $i) {
@@ -50,7 +59,9 @@ 
                 }
 				if (! empty($val['isameasure']))
 				{
-					if (! $i) $totalarray['pos'][$totalarray['nbfield']]='ef.'.$tmpkey;
+					if (! $i) {
+					    $totalarray['pos'][$totalarray['nbfield']]='ef.'.$tmpkey;
+					}
 					$totalarray['val']['ef.'.$tmpkey] += $obj->$tmpkey;
 				}
 			}

dolibarr/htdocs/core/tpl/contacts.tpl.php

Braces +31 added lines, -20 removed lines

@@ -35,20 +35,10 @@ 
 $module = $object->element;
 
 // Special cases
-if ($module == 'propal')				{ $permission=$user->rights->propale->creer; }
-elseif ($module == 'fichinter')			{ $permission=$user->rights->ficheinter->creer; }
-elseif ($module == 'order_supplier')	{ $permission=$user->rights->fournisseur->commande->creer; }
-elseif ($module == 'invoice_supplier')	{ $permission=$user->rights->fournisseur->facture->creer; }
-elseif ($module == 'project')		{ $permission=$user->rights->projet->creer; }
-elseif ($module == 'action')		{ $permission=$user->rights->agenda->myactions->create; }
-elseif ($module == 'shipping')		{ $permission=$user->rights->expedition->creer; }
-elseif ($module == 'reception')		{ $permission=$user->rights->reception->creer; }
-elseif ($module == 'project_task')	{ $permission=$user->rights->projet->creer; }
-elseif (! isset($permission) && isset($user->rights->$module->creer))
+if ($module == 'propal')				{ $permission=$user->rights->propale->creer; } elseif ($module == 'fichinter')			{ $permission=$user->rights->ficheinter->creer; } elseif ($module == 'order_supplier')	{ $permission=$user->rights->fournisseur->commande->creer; } elseif ($module == 'invoice_supplier')	{ $permission=$user->rights->fournisseur->facture->creer; } elseif ($module == 'project')		{ $permission=$user->rights->projet->creer; } elseif ($module == 'action')		{ $permission=$user->rights->agenda->myactions->create; } elseif ($module == 'shipping')		{ $permission=$user->rights->expedition->creer; } elseif ($module == 'reception')		{ $permission=$user->rights->reception->creer; } elseif ($module == 'project_task')	{ $permission=$user->rights->projet->creer; } elseif (! isset($permission) && isset($user->rights->$module->creer))
 {
 	$permission=$user->rights->$module->creer;
-}
-elseif (! isset($permission)  && isset($user->rights->$module->write))
+} elseif (! isset($permission)  && isset($user->rights->$module->write))
 {
 	$permission=$user->rights->$module->write;
 }
@@ -88,14 +78,19 @@ 
 	<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
 	<input type="hidden" name="action" value="addcontact" />
 	<input type="hidden" name="source" value="internal" />
-	<?php if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">'; ?>
+	<?php if ($withproject) {
+    print '<input type="hidden" name="withproject" value="'.$withproject.'">';
+}
+?>
 		<div class="nowrap tagtd"><?php echo img_object('','user').' '.$langs->trans("Users"); ?></div>
 		<div class="tagtd"><?php echo $conf->global->MAIN_INFO_SOCIETE_NOM; ?></div>
 		<div class="tagtd maxwidthonsmartphone"><?php echo $form->select_dolusers($user->id, 'userid', 0, (! empty($userAlreadySelected)?$userAlreadySelected:null), 0, null, null, 0, 56, '', 0, '', 'minwidth200imp'); ?></div>
 		<div class="tagtd maxwidthonsmartphone">
 		<?php
 		$tmpobject=$object;
-		if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
+		if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) {
+		    $tmpobject=$objectsrc;
+		}
 		echo $formcompany->selectTypeContact($tmpobject, '', 'type','internal');
 		?></div>
 		<div class="tagtd">&nbsp;</div>
@@ -115,7 +110,10 @@ 
 	<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
 	<input type="hidden" name="action" value="addcontact" />
 	<input type="hidden" name="source" value="external" />
-	<?php if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">'; ?>
+	<?php if ($withproject) {
+    print '<input type="hidden" name="withproject" value="'.$withproject.'">';
+}
+?>
 		<div class="tagtd nowrap noborderbottom"><?php echo img_object('','contact').' '.$langs->trans("ThirdPartyContacts"); ?></div>
 		<div class="tagtd nowrap maxwidthonsmartphone noborderbottom">
 			<?php $selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$object->socid; ?>
@@ -134,12 +132,17 @@ 
 		<div class="tagtd maxwidthonsmartphone noborderbottom">
 			<?php
 			$tmpobject=$object;
-			if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
+			if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) {
+			    $tmpobject=$objectsrc;
+			}
 			$formcompany->selectTypeContact($tmpobject, '', 'type','external', 'position', 0, 'minwidth100imp'); ?>
 		</div>
 		<div class="tagtd noborderbottom">&nbsp;</div>
 		<div class="tagtd center noborderbottom">
-			<input type="submit" id="add-customer-contact" class="button" value="<?php echo $langs->trans("Add"); ?>"<?php if (! $nbofcontacts) echo ' disabled'; ?>>
+			<input type="submit" id="add-customer-contact" class="button" value="<?php echo $langs->trans("Add"); ?>"<?php if (! $nbofcontacts) {
+    echo ' disabled';
+}
+?>>
 		</div>
 	</form>
 
@@ -162,7 +165,9 @@ 
 	foreach($arrayofsource as $source) {
 
 		$tmpobject=$object;
-		if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
+		if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) {
+		    $tmpobject=$objectsrc;
+		}
 
 		$tab = $tmpobject->liste_contact(-1,$source);
 		$num=count($tab);
@@ -173,8 +178,14 @@ 
 
 	<form class="tagtr oddeven">
 		<div class="tagtd" align="left">
-			<?php if ($tab[$i]['source']=='internal') echo $langs->trans("User"); ?>
-			<?php if ($tab[$i]['source']=='external') echo $langs->trans("ThirdPartyContact"); ?>
+			<?php if ($tab[$i]['source']=='internal') {
+    echo $langs->trans("User");
+}
+?>
+			<?php if ($tab[$i]['source']=='external') {
+    echo $langs->trans("ThirdPartyContact");
+}
+?>
 		</div>
 		<div class="tagtd" align="left">
 			<?php

dolibarr/htdocs/core/tpl/card_presend.tpl.php

Braces +10 added lines, -10 removed lines

@@ -119,9 +119,11 @@ 
 		$formmail->fromid = $user->id;
 	}
 	$formmail->trackid=$trackid;
-	if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
+	if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) {
+	    // If bit 2 is set
 	{
 		include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+	}
 		$formmail->frommail=dolAddEmailTrackId($formmail->frommail, $trackid);
 	}
 	$formmail->withfrom = 1;
@@ -133,22 +135,18 @@ 
 		$fuser = new User($db);
 		$fuser->fetch($object->fk_user_author);
 		$liste['thirdparty'] = $fuser->getFullName($langs)." <".$fuser->email.">";
-	}
-	elseif ($object->element == 'societe')
+	} elseif ($object->element == 'societe')
 	{
 		foreach ($object->thirdparty_and_contact_email_array(1) as $key => $value) {
 			$liste[$key] = $value;
 		}
-	}
-	elseif ($object->element == 'contact')
+	} elseif ($object->element == 'contact')
 	{
 		$liste['contact'] = $object->getFullName($langs)." <".$object->email.">";
-	}
-	elseif ($object->element == 'user' || $object->element == 'member')
+	} elseif ($object->element == 'user' || $object->element == 'member')
 	{
 		$liste['thirdparty'] = $object->getFullName($langs)." <".$object->email.">";
-	}
-	else
+	} else
 	{
 		if (is_object($object->thirdparty))
 		{
@@ -185,7 +183,9 @@ 
 	$formmail->withcancel = 1;
 
 	//$arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...);
-	if (! isset($arrayoffamiliestoexclude)) $arrayoffamiliestoexclude=null;
+	if (! isset($arrayoffamiliestoexclude)) {
+	    $arrayoffamiliestoexclude=null;
+	}
 
 	// Make substitution in email content
 	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);

dolibarr/htdocs/core/tpl/advtarget.tpl.php

Braces +3 added lines, -1 removed lines

@@ -447,7 +447,9 @@
 			$extrafields = new ExtraFields($db);
 			$extralabels = $extrafields->fetch_name_optionals_label('socpeople');
             foreach($extrafields->attribute_type as $key=>&$value) {
-                if($value == 'radio')$value = 'select';
+                if($value == 'radio') {
+                    $value = 'select';
+                }
             }
 
 

dolibarr/htdocs/core/tpl/filemanager.tpl.php

Braces +21 added lines, -11 removed lines

@@ -34,7 +34,9 @@ 
 
 require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 
-if (empty($module)) $module='ecm';
+if (empty($module)) {
+    $module='ecm';
+}
 
 $permtoadd = 0;
 $permtoupload = 0;
@@ -77,8 +79,7 @@ 
 	print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).($websitekey?'&website='.$websitekey:'').($pageid?'&pageid='.$pageid:'').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid).'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
     print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
     print '</a>';
-}
-else
+} else
 {
     print '<a href="#" class="inline-block valignmiddle toolbarbutton" title="'.$langs->trans("NotAllowed").'">';
     print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
@@ -116,8 +117,9 @@ 
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
     $formfile=new FormFile($db);
     $formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section?$section:-1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile, '', $sectiondir);
+} else {
+    print '&nbsp;';
 }
-else print '&nbsp;';
 
 print '</div>';
 // End "Add new file" area
@@ -173,11 +175,12 @@ 
     	// Show filemanager tree (will be filled by a call of ajax /ecm/tpl/enablefiletreeajax.tpl.php, later, that executes ajaxdirtree.php)
 	    print '<div id="filetree" class="ecmfiletree"></div>';
 
-	    if ($action == 'deletefile') print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');
+	    if ($action == 'deletefile') {
+	        print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');
+	    }
 
 	    print '</td></tr>';
-    }
-    else	// Show filtree when ajax is disabled (rare)
+    } else	// Show filtree when ajax is disabled (rare)
     {
         print '<tr><td style="padding-left: 20px">';
 
@@ -192,7 +195,9 @@ 
         // $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']
         // $_POST['dir']
         $mode='noajax';
-        if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
+        if (empty($url)) {
+            $url=DOL_URL_ROOT.'/ecm/index.php';
+        }
         include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirtree.php';
 
     	print '</div>';
@@ -215,7 +220,9 @@ 
 
 
 $mode='noajax';
-if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
+if (empty($url)) {
+    $url=DOL_URL_ROOT.'/ecm/index.php';
+}
 include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php';	// Show content of a directory on right side
 
 
@@ -229,14 +236,17 @@ 
 <?php
 
 
-if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) // Show filtree when ajax is enabled
+if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+    // Show filtree when ajax is enabled
 {
 	//var_dump($modulepart);
 	// Variables that may be defined:
 	// $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']
 	// $_POST['dir']
 	// $_POST['section_dir'], $_POST['section_id'], $_POST['token'], $_POST['max_file_size'], $_POST['sendit']
-	if (GETPOST('section_dir','alpha')) { $preopened=GETPOST('section_dir','alpha'); }
+	if (GETPOST('section_dir','alpha')) { $preopened=GETPOST('section_dir','alpha');
+}
+}
 
 	include DOL_DOCUMENT_ROOT.'/ecm/tpl/enablefiletreeajax.tpl.php';
 }

dolibarr/htdocs/core/tpl/commonfields_view.tpl.php

Braces +56 added lines, -17 removed lines

@@ -29,7 +29,9 @@ 
 	print "Error, template page can't be called as URL";
 	exit;
 }
-if (! is_object($form)) $form=new Form($db);
+if (! is_object($form)) {
+    $form=new Form($db);
+}
 
 ?>
 <!-- BEGIN PHP TEMPLATE commonfields_view.tpl.php -->
@@ -40,20 +42,35 @@ 
 foreach($object->fields as $key => $val)
 {
 	// Discard if extrafield is a hidden field on form
-	if (abs($val['visible']) != 1) continue;
+	if (abs($val['visible']) != 1) {
+	    continue;
+	}
 
-	if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! verifCond($val['enabled'])) continue;	// We don't want this field
-	if (in_array($key, array('ref','status'))) continue;	// Ref and status are already in dol_banner
+	if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! verifCond($val['enabled'])) {
+	    continue;
+	}
+	// We don't want this field
+	if (in_array($key, array('ref','status'))) {
+	    continue;
+	}
+	// Ref and status are already in dol_banner
 
 	$value=$object->$key;
 
 	print '<tr><td';
 	print ' class="titlefield';
-	if ($val['notnull'] > 0) print ' fieldrequired';
-	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
+	if ($val['notnull'] > 0) {
+	    print ' fieldrequired';
+	}
+	if ($val['type'] == 'text' || $val['type'] == 'html') {
+	    print ' tdtop';
+	}
 	print '">';
-	if (! empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
-	else print $langs->trans($val['label']);
+	if (! empty($val['help'])) {
+	    print $form->textwithpicto($langs->trans($val['label']), $val['help']);
+	} else {
+	    print $langs->trans($val['label']);
+	}
 	print '</td>';
 	print '<td>';
 	print $object->showOutputField($val, $key, $value, '', '', '', 0);
@@ -61,7 +78,10 @@ 
 	print '</td>';
 	print '</tr>';
 
-	if (! empty($keyforbreak) && $key == $keyforbreak) break;						// key used for break on second column
+	if (! empty($keyforbreak) && $key == $keyforbreak) {
+	    break;
+	}
+	// key used for break on second column
 }
 
 print '</table>';
@@ -76,23 +96,42 @@ 
 {
 	if ($alreadyoutput)
 	{
-		if (! empty($keyforbreak) && $key == $keyforbreak) $alreadyoutput = 0;		// key used for break on second column
+		if (! empty($keyforbreak) && $key == $keyforbreak) {
+		    $alreadyoutput = 0;
+		}
+		// key used for break on second column
 		continue;
 	}
 
-	if (abs($val['visible']) != 1) continue;	// Discard such field from form
-	if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! $val['enabled']) continue;	// We don't want this field
-	if (in_array($key, array('ref','status'))) continue;	// Ref and status are already in dol_banner
+	if (abs($val['visible']) != 1) {
+	    continue;
+	}
+	// Discard such field from form
+	if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! $val['enabled']) {
+	    continue;
+	}
+	// We don't want this field
+	if (in_array($key, array('ref','status'))) {
+	    continue;
+	}
+	// Ref and status are already in dol_banner
 
 	$value=$object->$key;
 
 	print '<tr><td';
 	print ' class="titlefield';
-	if ($val['notnull'] > 0) print ' fieldrequired';
-	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
+	if ($val['notnull'] > 0) {
+	    print ' fieldrequired';
+	}
+	if ($val['type'] == 'text' || $val['type'] == 'html') {
+	    print ' tdtop';
+	}
 	print '">';
-	if (! empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
-	else print $langs->trans($val['label']);
+	if (! empty($val['help'])) {
+	    print $form->textwithpicto($langs->trans($val['label']), $val['help']);
+	} else {
+	    print $langs->trans($val['label']);
+	}
 	print '</td>';
 	print '<td>';
 	print $object->showOutputField($val, $key, $value, '', '', '', 0);

dolibarr/htdocs/core/tpl/objectline_view.tpl.php

Braces +80 added lines, -40 removed lines

@@ -48,13 +48,25 @@ 
 global $forceall, $senderissupplier, $inputalsopricewithtax, $outputalsopricetotalwithtax;
 
 $usemargins=0;
-if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;
+if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) {
+    $usemargins=1;
+}
 
-if (empty($dateSelector)) $dateSelector=0;
-if (empty($forceall)) $forceall=0;
-if (empty($senderissupplier)) $senderissupplier=0;
-if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
-if (empty($outputalsopricetotalwithtax)) $outputalsopricetotalwithtax=0;
+if (empty($dateSelector)) {
+    $dateSelector=0;
+}
+if (empty($forceall)) {
+    $forceall=0;
+}
+if (empty($senderissupplier)) {
+    $senderissupplier=0;
+}
+if (empty($inputalsopricewithtax)) {
+    $inputalsopricewithtax=0;
+}
+if (empty($outputalsopricetotalwithtax)) {
+    $outputalsopricetotalwithtax=0;
+}
 
 // add html5 elements
 $domData  = ' data-element="'.$line->element.'"';
@@ -78,9 +90,13 @@ 
 		<?php
 		$txt='';
 		print img_object($langs->trans("ShowReduc"),'reduc').' ';
-		if ($line->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
-		elseif ($line->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
-		elseif ($line->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
+		if ($line->description == '(DEPOSIT)') {
+		    $txt=$langs->trans("Deposit");
+		} elseif ($line->description == '(EXCESS RECEIVED)') {
+		    $txt=$langs->trans("ExcessReceived");
+		} elseif ($line->description == '(EXCESS PAID)') {
+		    $txt=$langs->trans("ExcessPaid");
+		}
 		//else $txt=$langs->trans("Discount");
 		print $txt;
 		?>
@@ -93,66 +109,77 @@ 
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
-			}
-			elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)
+			} elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)
 			{
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
 				// Add date of deposit
-				if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE))
-				    echo ' ('.dol_print_date($discount->datec).')';
-			}
-			elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
+				if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) {
+								    echo ' ('.dol_print_date($discount->datec).')';
+				}
+			} elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
 			{
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
-			}
-			elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
+			} elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
 			{
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
-			}
-			else
+			} else
 			{
 				echo ($txt?' - ':'').dol_htmlentitiesbr($line->description);
 			}
 		}
-	}
-	else
+	} else
 	{
 		$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE?'dayhour':'day';
 
 	    if ($line->fk_product > 0)
 		{
 			echo $form->textwithtooltip($text,$description,3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
-		}
-		else
+		} else
 		{
-			if ($type==1) $text = img_object($langs->trans('Service'),'service');
-			else $text = img_object($langs->trans('Product'),'product');
+			if ($type==1) {
+			    $text = img_object($langs->trans('Service'),'service');
+			} else {
+			    $text = img_object($langs->trans('Product'),'product');
+			}
 
 			if (! empty($line->label)) {
 				$text.= ' <strong>'.$line->label.'</strong>';
 				echo $form->textwithtooltip($text,dol_htmlentitiesbr($line->description),3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
 			} else {
-				if (! empty($line->fk_parent_line)) echo img_picto('', 'rightarrow');
+				if (! empty($line->fk_parent_line)) {
+				    echo img_picto('', 'rightarrow');
+				}
 				echo $text.' '.dol_htmlentitiesbr($line->description);
 			}
 		}
 
 		// Show date range
 		if ($line->element == 'facturedetrec') {
-			if ($line->date_start_fill || $line->date_end_fill) echo '<br><div class="clearboth nowraponall">';
-			if ($line->date_start_fill) echo $langs->trans('AutoFillDateFromShort').': '.yn($line->date_start_fill);
-			if ($line->date_start_fill && $line->date_end_fill) echo ' - ';
-			if ($line->date_end_fill) echo $langs->trans('AutoFillDateToShort').': '.yn($line->date_end_fill);
-			if ($line->date_start_fill || $line->date_end_fill) echo '</div>';
-		}
-		else {
-			if ($line->date_start || $line->date_end) echo '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
+			if ($line->date_start_fill || $line->date_end_fill) {
+			    echo '<br><div class="clearboth nowraponall">';
+			}
+			if ($line->date_start_fill) {
+			    echo $langs->trans('AutoFillDateFromShort').': '.yn($line->date_start_fill);
+			}
+			if ($line->date_start_fill && $line->date_end_fill) {
+			    echo ' - ';
+			}
+			if ($line->date_end_fill) {
+			    echo $langs->trans('AutoFillDateToShort').': '.yn($line->date_end_fill);
+			}
+			if ($line->date_start_fill || $line->date_end_fill) {
+			    echo '</div>';
+			}
+		} else {
+			if ($line->date_start || $line->date_end) {
+			    echo '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
+			}
 			//echo get_date_range($line->date_start, $line->date_end, $format);
 		}
 
@@ -173,11 +200,13 @@ 
 	?>
 	</td>
 	<?php
-	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
+	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') {
+	    // We must have same test in printObjectLines
 	{
 	?>
 		<td class="linecolrefsupplier"><?php
 		echo ($line->ref_fourn?$line->ref_fourn:$line->ref_supplier);
+	}
 		?></td>
 	<?php
 	}
@@ -185,10 +214,18 @@ 
 	?>
 	<td align="right" class="linecolvat nowrap"><?php $coldisplay++; ?><?php
 	$positiverates='';
-	if (price2num($line->tva_tx))          $positiverates.=($positiverates?'/':'').price2num($line->tva_tx);
-	if (price2num($line->total_localtax1)) $positiverates.=($positiverates?'/':'').price2num($line->localtax1_tx);
-	if (price2num($line->total_localtax2)) $positiverates.=($positiverates?'/':'').price2num($line->localtax2_tx);
-	if (empty($positiverates)) $positiverates='0';
+	if (price2num($line->tva_tx)) {
+	    $positiverates.=($positiverates?'/':'').price2num($line->tva_tx);
+	}
+	if (price2num($line->total_localtax1)) {
+	    $positiverates.=($positiverates?'/':'').price2num($line->localtax1_tx);
+	}
+	if (price2num($line->total_localtax2)) {
+	    $positiverates.=($positiverates?'/':'').price2num($line->localtax2_tx);
+	}
+	if (empty($positiverates)) {
+	    $positiverates='0';
+	}
 	echo vatrate($positiverates.($line->vat_src_code?' ('.$line->vat_src_code.')':''), '%', $line->info_bits);
 	//echo vatrate($line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), '%', $line->info_bits);
 	?></td>
@@ -210,7 +247,10 @@ 
 			// must also not be output for most entities (proposal, intervention, ...)
 			//if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
 			echo $line->qty;
-		} else echo '&nbsp;';	?>
+		} else {
+		    echo '&nbsp;';
+		}
+		?>
 	</td>
 
 	<?php