Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into translations-develop

Conflicts: htdocs/admin/commande.php htdocs/admin/expedition.php htdocs/admin/facture.php htdocs/admin/fichinter.php htdocs/admin/livraison.php htdocs/admin/supplier_invoice.php htdocs/admin/supplier_order.php htdocs/societe/admin/societe.php
2025-02-20 13:46:52 +01:00 · 2013-05-08 15:37:41 +02:00 · 2013-05-08 15:37:41 +02:00 · edfcfb9bbd
commit edfcfb9bbd
parent 54a2d3ca72 b9583d389e
14 changed files with 248 additions and 193 deletions
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@ -367,7 +367,8 @@ print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Status")."</td>\n";
 print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
-print '<td align="center" width="38" colspan="2">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="38">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="38">'.$langs->trans("Preview").'</td>';
 print "</tr>\n";

 clearstatcache();
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@ -362,6 +362,7 @@ print '<td>'.$langs->trans("Description").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Default").'</td>';
 print '<td align="center" width="80" class="nowrap">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="80" class="nowrap">'.$langs->trans("Preview").'</td>';
 print "</tr>\n";

 clearstatcache();
@ -428,8 +429,13 @@ foreach ($dirmodels as $reldir)
 	    			$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
 	    			$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
 	    			print '<td align="center">';
+	    			print $form->textwithpicto('',$htmltooltip,-1,0);
+	    			print '</td>';
+
+	    			// Preview
 	    			$link='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"),'sending').'</a>';
-	    			print $form->textwithpicto(' &nbsp; &nbsp; '.$link,$htmltooltip,-1,0);
+	    			print '<td align="center">';
+	    			print $link;
 	    			print '</td>';

 	    			print '</tr>';
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@ -486,7 +486,8 @@ print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Default").'</td>';
-print '<td align="center" width="32" colspan="2">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="32">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="32">'.$langs->trans("Preview").'</td>';
 print "</tr>\n";

 clearstatcache();
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@ -346,6 +346,7 @@ print '<td>'.$langs->trans("Description").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Status")."</td>\n";
 print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
 print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
 print "</tr>\n";

 clearstatcache();
@ -416,8 +417,13 @@ foreach ($dirmodels as $reldir)
 		    		$htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1);
 		    		$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1);
 		    		print '<td align="center">';
+		    		print $form->textwithpicto('',$htmltooltip,-1,0);
+		    		print '</td>';
+		    		
+		    		// Preview
 		    		$link='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'intervention').'</a>';
-		    		print $form->textwithpicto(' &nbsp; &nbsp; '.$link,$htmltooltip,-1,0);
+		    		print '<td align="center">';
+		    		print $link;
 		    		print '</td>';

 		    		print '</tr>';
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@ -347,7 +347,8 @@ print '<td width="140">'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Default").'</td>';
-print '<td align="center" width="32" colspan="2">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="32">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="32">'.$langs->trans("Preview").'</td>';
 print "</tr>\n";

 clearstatcache();
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@ -346,7 +346,8 @@ print '<td width="100">'.$langs->trans("Name").'</td>'."\n";
 print '<td>'.$langs->trans("Description").'</td>'."\n";
 print '<td align="center" width="60">'.$langs->trans("Status").'</td>'."\n";
 print '<td align="center" width="60">'.$langs->trans("Default").'</td>'."\n";
-print '<td align="center" width="40" colspan="2">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="40">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="40">'.$langs->trans("Preview").'</td>';
 print '</tr>'."\n";

 clearstatcache();
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@ -344,7 +344,8 @@ print '<td width="100">'.$langs->trans("Name").'</td>'."\n";
 print '<td>'.$langs->trans("Description").'</td>'."\n";
 print '<td align="center" width="60">'.$langs->trans("Status").'</td>'."\n";
 print '<td align="center" width="60">'.$langs->trans("Default").'</td>'."\n";
-print '<td align="center" width="40" colspan="2">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="40">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="40">'.$langs->trans("Preview").'</td>';
 print '</tr>'."\n";

 clearstatcache();
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@ -1,179 +1,179 @@
-<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copytight (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copytight (C) 2013      Charles-Fr BENKE		<charles.fr@benke.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *      \file       htdocs/compta/bank/categ.php
- *      \ingroup    compta
- *      \brief      Page ajout de categories bancaires
- */
-
-require('../../main.inc.php');
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
-
-if (!$user->rights->banque->configurer)
-  accessforbidden();
-
-
-
-/*
-* Actions ajout cat<EFBFBD>gorie
-*/
-if ($_POST["action"] == 'add')
-{
-	if ($_POST["label"])
-	{
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_categ (";
-		$sql.= "label";
-		$sql.= ", entity";
-		$sql.= ") VALUES (";
-		$sql.= "'".$db->escape($_POST["label"])."'";
-		$sql.= ", ".$conf->entity;
-		$sql.= ")";
-
-		$result = $db->query($sql);
-
-		if (!$result)
-		{
-			dol_print_error($db);
-		}
-	}
-}
-
-/*
-* Action modification catégorie
-*/
-if ($_POST["action"] == 'update')
-{
-	if ($_POST["label"])
-	{
-		$sql = "UPDATE ".MAIN_DB_PREFIX."bank_categ ";
-		$sql.= "set label='".$db->escape($_POST["label"])."'";;
-		$sql.= " WHERE rowid = '".$_REQUEST['categid']."'";
-		$sql.= " AND entity = ".$conf->entity;
-		$result = $db->query($sql);
-
-		if (!$result)
-		{
-			dol_print_error($db);
-		}
-	}
-}
-/*
-* Action suppression catégorie
-*/
-if ( $_REQUEST['action'] == 'delete' )
-{
-	if ( $_REQUEST['categid'] )
-	{
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_categ";
-		$sql.= " WHERE rowid = '".$_REQUEST['categid']."'";
-		$sql.= " AND entity = ".$conf->entity;
-
-		$result = $db->query($sql);
-
-		if (!$result)
-		{
-			dol_print_error($db);
-		}
-	}
-}
-
-
-
-/*
- * Affichage liste des cat<EFBFBD>éories
- */
-
-llxHeader();
-
-
-print_fiche_titre($langs->trans("Rubriques"));
-
-
-
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Ref").'</td><td colspan="2">'.$langs->trans("Label").'</td>';
-print "</tr>\n";
-
-$sql = "SELECT rowid, label";
-$sql.= " FROM ".MAIN_DB_PREFIX."bank_categ";
-$sql.= " WHERE entity = ".$conf->entity;
-$sql.= " ORDER BY label";
-
-$result = $db->query($sql);
-if ($result)
-{
-  $num = $db->num_rows($result);
-  $i = 0; $total = 0;
-
-  $var=True;
-  while ($i < $num)
-    {
-      $objp = $db->fetch_object($result);
-      $var=!$var;
-      print "<tr $bc[$var]>";
-      print '<td><a href="'.DOL_URL_ROOT.'/compta/bank/budget.php?bid='.$objp->rowid.'">'.$objp->rowid.'</a></td>';
-		if (GETPOST("action") == 'edit' && GETPOST("categid")== $objp->rowid)
-		{
-			print "<td colspan=2>";
-			print '<form method="post" action="categ.php">';
-			print '<input type="hidden" name="action" value="update">';
-			print '<input type="hidden" name="categid" value="'.$objp->rowid.'">';
-			print '<input name="label" type="text" size=45 value="'.$objp->label.'">';
-			print '<input type="submit" class="button" value="'.$langs->trans("Edit").'">';
-
-			print "</form>";
-			print "</td>";
-		}
-		else
-		{
-			print "<td >".$objp->label."</td>";
-			print '<td style="text-align: center;">';
-			print '<a href="categ.php?categid='.$objp->rowid.'&amp;action=edit">'.img_edit().'</a>&nbsp;&nbsp;';
-			print '<a href="categ.php?categid='.$objp->rowid.'&amp;action=delete">'.img_delete().'</a></td>';
-		}
-		print "</tr>";
-      $i++;
-    }
-  $db->free($result);
-}
-
-/*
- * Affichage ligne ajout de categorie
- */
-$var=!$var;
-print '<form method="post" action="categ.php">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print "<input type=\"hidden\" name=\"action\" value=\"add\">";
-print "<tr $bc[$var]>";
-print "<td>&nbsp;</td><td><input name=\"label\" type=\"text\" size=45></td>";
-print '<td align="center"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>';
-print "</form>";
-print "</table>";
-
-
-$db->close();
-
-llxFooter();
-?>
+<?php
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copytight (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copytight (C) 2013      Charles-Fr BENKE		<charles.fr@benke.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/compta/bank/categ.php
+ *      \ingroup    compta
+ *      \brief      Page ajout de categories bancaires
+ */
+
+require('../../main.inc.php');
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
+
+if (!$user->rights->banque->configurer)
+  accessforbidden();
+
+
+
+/*
+* Actions ajout catégorie
+*/
+if ($_POST["action"] == 'add')
+{
+	if ($_POST["label"])
+	{
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_categ (";
+		$sql.= "label";
+		$sql.= ", entity";
+		$sql.= ") VALUES (";
+		$sql.= "'".$db->escape($_POST["label"])."'";
+		$sql.= ", ".$conf->entity;
+		$sql.= ")";
+
+		$result = $db->query($sql);
+
+		if (!$result)
+		{
+			dol_print_error($db);
+		}
+	}
+}
+
+/*
+* Action modification catégorie
+*/
+if ($_POST["action"] == 'update')
+{
+	if ($_POST["label"])
+	{
+		$sql = "UPDATE ".MAIN_DB_PREFIX."bank_categ ";
+		$sql.= "set label='".$db->escape($_POST["label"])."'";;
+		$sql.= " WHERE rowid = '".$_REQUEST['categid']."'";
+		$sql.= " AND entity = ".$conf->entity;
+		$result = $db->query($sql);
+
+		if (!$result)
+		{
+			dol_print_error($db);
+		}
+	}
+}
+/*
+* Action suppression catégorie
+*/
+if ( $_REQUEST['action'] == 'delete' )
+{
+	if ( $_REQUEST['categid'] )
+	{
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_categ";
+		$sql.= " WHERE rowid = '".$_REQUEST['categid']."'";
+		$sql.= " AND entity = ".$conf->entity;
+
+		$result = $db->query($sql);
+
+		if (!$result)
+		{
+			dol_print_error($db);
+		}
+	}
+}
+
+
+
+/*
+ * Affichage liste des catégories
+ */
+
+llxHeader();
+
+
+print_fiche_titre($langs->trans("Rubriques"));
+
+
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Ref").'</td><td colspan="2">'.$langs->trans("Label").'</td>';
+print "</tr>\n";
+
+$sql = "SELECT rowid, label";
+$sql.= " FROM ".MAIN_DB_PREFIX."bank_categ";
+$sql.= " WHERE entity = ".$conf->entity;
+$sql.= " ORDER BY label";
+
+$result = $db->query($sql);
+if ($result)
+{
+  $num = $db->num_rows($result);
+  $i = 0; $total = 0;
+
+  $var=True;
+  while ($i < $num)
+    {
+      $objp = $db->fetch_object($result);
+      $var=!$var;
+      print "<tr $bc[$var]>";
+      print '<td><a href="'.DOL_URL_ROOT.'/compta/bank/budget.php?bid='.$objp->rowid.'">'.$objp->rowid.'</a></td>';
+		if (GETPOST("action") == 'edit' && GETPOST("categid")== $objp->rowid)
+		{
+			print "<td colspan=2>";
+			print '<form method="post" action="categ.php">';
+			print '<input type="hidden" name="action" value="update">';
+			print '<input type="hidden" name="categid" value="'.$objp->rowid.'">';
+			print '<input name="label" type="text" size=45 value="'.$objp->label.'">';
+			print '<input type="submit" class="button" value="'.$langs->trans("Edit").'">';
+
+			print "</form>";
+			print "</td>";
+		}
+		else
+		{
+			print "<td >".$objp->label."</td>";
+			print '<td style="text-align: center;">';
+			print '<a href="categ.php?categid='.$objp->rowid.'&amp;action=edit">'.img_edit().'</a>&nbsp;&nbsp;';
+			print '<a href="categ.php?categid='.$objp->rowid.'&amp;action=delete">'.img_delete().'</a></td>';
+		}
+		print "</tr>";
+      $i++;
+    }
+  $db->free($result);
+}
+
+/*
+ * Affichage ligne ajout de categorie
+ */
+$var=!$var;
+print '<form method="post" action="categ.php">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print "<input type=\"hidden\" name=\"action\" value=\"add\">";
+print "<tr $bc[$var]>";
+print "<td>&nbsp;</td><td><input name=\"label\" type=\"text\" size=45></td>";
+print '<td align="center"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>';
+print "</form>";
+print "</table>";
+
+
+$db->close();
+
+llxFooter();
+?>
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@ -180,4 +180,17 @@ AddThisServiceCard=Crear fitxa servei
 HelpAddThisServiceCard=Aquesta opció permet crear o clonar una fitxa de servei en cas que no hi hagi
 CurrentProductPrice=Preu actual
 AlwaysUseNewPrice=Utilitzar sempre el preu actual
-AlwaysUseFixedPrice=Utilitzar el preu fixat
+AlwaysUseFixedPrice=Utilitzar el preu fixat
+PriceByQuantity=Preu per quantitat
+PriceByQuantityRange=Rang quantitat
+ProductsDashboard=Resum Productes/Serveis
+UpdateOriginalProductLabel=Canviar etiqueta original
+HelpUpdateOriginalProductLabel=Permet editar el nom del producte
+### composition fabrication
+Building=Fabricació
+Build=Fabricar
+BuildIt=Llançar la fabricació
+BuildindListInfo=Cantitat disponible per magatzem, si indica zero no es fabricaran.
+QtyNeed=Cantitat
+UnitPmp=Preu de compra unitari
+CostPmpHT=Cost de compra sense IVA
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@ -184,6 +184,8 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Price by quantity
 PriceByQuantityRange=Quantity range
 ProductsDashboard=Products/Services summary
+UpdateOriginalProductLabel=Modify original label
+HelpUpdateOriginalProductLabel=Allows to edit the name of the product
 ### composition fabrication
 Building=Production and items dispatchment
 Build=Produce
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@ -180,4 +180,17 @@ AddThisServiceCard=Crear ficha servicio
 HelpAddThisServiceCard=Esta opción permite crear o clonar una ficha de servicio en caso de que no exista
 CurrentProductPrice=Precio actual
 AlwaysUseNewPrice=Usar siempre el precio actual
-AlwaysUseFixedPrice=Usar el precio fijado
+AlwaysUseFixedPrice=Usar el precio fijado
+PriceByQuantity=Precio por cantidad
+PriceByQuantityRange=Rango cantidad
+ProductsDashboard=Resumen Productos/Servicios
+UpdateOriginalProductLabel=Modificar etiqueta original
+HelpUpdateOriginalProductLabel=Permite editar el nombre del producto
+### composition fabrication
+Building=Fabricación
+Build=Fabricar
+BuildIt=Lanzar la fabricación
+BuildindListInfo=Cantidad disponible por almacén, si indica cero no se fabricarán.
+QtyNeed=Cantidad
+UnitPmp=Precio de compra unitario
+CostPmpHT=Coste de compra sin IVA
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@ -184,6 +184,8 @@ AlwaysUseFixedPrice=Utiliser le prix fixé
 PriceByQuantity=Prix par quantité
 PriceByQuantityRange=Grille de quantités
 ProductsDashboard=Synthèse produits/services
+UpdateOriginalProductLabel=Modifier étiquette d'origine
+HelpUpdateOriginalProductLabel=Permet modifier le nom du produit
 ### composition fabrication
 Building=Fabrication
 Build=Fabriquer
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@ -5,6 +5,7 @@
 * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
 * Copyright (C) 2007-2011 Jean Heimburger      <jean@tiaris.info>
 * Copyright (C) 2010-2011 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2013	   Cedric GROSS	        <c.gross@kreiz-it.fr>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@ -586,8 +587,12 @@ class Product extends CommonObject

 		$error=0;

-		if ($user->rights->produit->supprimer)
+		if (($this->type==0 && !$user->rights->produit->supprimer) || ($this->type==1 && !$user->rights->service->supprimer))
 		{
+			$this->error = "ErrorForbidden";
+			return 0;
+		}
+
 			$objectisused = $this->isObjectUsed($id);
 			if (empty($objectisused))
 			{
@ -697,8 +702,6 @@ class Product extends CommonObject
 				return 0;
 			}
 		}
-		return 0;
-	}

 	/**
 	 *	Update ou cree les traductions des infos produits
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@ -453,6 +453,7 @@ print '<td width="140">'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td align="center" width="80">'.$langs->trans("Status").'</td>';
 print '<td align="center" width="60">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Preview").'</td>';
 print "</tr>\n";

 foreach ($dirsociete as $dirroot)
@ -536,8 +537,12 @@ foreach ($dirsociete as $dirroot)
 					}
 					$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
 					$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraft").': '.yn((! empty($module->option_draft_watermark)?$module->option_draft_watermark:''), 1, 1);
+					
+					print '<td align="center" class="nowrap">';
+					print $form->textwithpicto('',$htmltooltip,1,0);
+					print '</td>';

-
+					// Preview
 					print '<td align="center" class="nowrap">';
 					if ($module->type == 'pdf')
 					{
@ -547,7 +552,7 @@ foreach ($dirsociete as $dirroot)
 					{
 						$linkspec=img_object($langs->trans("PreviewNotAvailable"),'generic');
 					}
-					print $form->textwithpicto(' &nbsp; '.$linkspec,$htmltooltip,1,0);
+					print $linkspec;
 					print '</td>';

 					print "</tr>\n";