lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Marcos García 2013-05-08 15:37:41 +02:00
commit edfcfb9bbd
14 changed files with 248 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/admin/commande.php
View File

@ -367,7 +367,8 @@ print '<td>'.$langs->trans("Name").'</td>';
print '<td>'.$langs->trans("Description").'</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("Status")."</td>\n";
print '<td align="center" width="60">'.$langs->trans("Default")."</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"; print "</tr>\n";
clearstatcache(); clearstatcache();

8
htdocs/admin/expedition.php
View File

@ -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("Status").'</td>';
print '<td align="center" width="60">'.$langs->trans("Default").'</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("ShortInfo").'</td>';
print '<td align="center" width="80" class="nowrap">'.$langs->trans("Preview").'</td>';
print "</tr>\n"; print "</tr>\n";
clearstatcache(); clearstatcache();
@ -428,8 +429,13 @@ foreach ($dirmodels as $reldir)
$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>'; $htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); $htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
print '<td align="center">'; 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>'; $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 '</td>';
print '</tr>'; print '</tr>';

3
htdocs/admin/facture.php
View File

@ -486,7 +486,8 @@ print '<td>'.$langs->trans("Name").'</td>';
print '<td>'.$langs->trans("Description").'</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("Status").'</td>';
print '<td align="center" width="60">'.$langs->trans("Default").'</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"; print "</tr>\n";
clearstatcache(); clearstatcache();

8
htdocs/admin/fichinter.php
View File

@ -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("Status")."</td>\n";
print '<td align="center" width="60">'.$langs->trans("Default")."</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("ShortInfo").'</td>';
print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
print "</tr>\n"; print "</tr>\n";
clearstatcache(); clearstatcache();
@ -416,8 +417,13 @@ foreach ($dirmodels as $reldir)
$htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1); $htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1);
$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1); $htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1);
print '<td align="center">'; 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>'; $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 '</td>';
print '</tr>'; print '</tr>';

3
htdocs/admin/livraison.php
View File

@ -347,7 +347,8 @@ print '<td width="140">'.$langs->trans("Name").'</td>';
print '<td>'.$langs->trans("Description").'</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("Status").'</td>';
print '<td align="center" width="60">'.$langs->trans("Default").'</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"; print "</tr>\n";
clearstatcache(); clearstatcache();

3
htdocs/admin/supplier_invoice.php
View File

@ -346,7 +346,8 @@ print '<td width="100">'.$langs->trans("Name").'</td>'."\n";
print '<td>'.$langs->trans("Description").'</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("Status").'</td>'."\n";
print '<td align="center" width="60">'.$langs->trans("Default").'</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"; print '</tr>'."\n";
clearstatcache(); clearstatcache();

3
htdocs/admin/supplier_order.php
View File

@ -344,7 +344,8 @@ print '<td width="100">'.$langs->trans("Name").'</td>'."\n";
print '<td>'.$langs->trans("Description").'</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("Status").'</td>'."\n";
print '<td align="center" width="60">'.$langs->trans("Default").'</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"; print '</tr>'."\n";
clearstatcache(); clearstatcache();

358
htdocs/compta/bank/categ.php
View File

@ -1,179 +1,179 @@
<?php <?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copytight (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com> * Copytight (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
* Copytight (C) 2013 Charles-Fr BENKE <charles.fr@benke.fr> * Copytight (C) 2013 Charles-Fr BENKE <charles.fr@benke.fr>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
* \file htdocs/compta/bank/categ.php * \file htdocs/compta/bank/categ.php
* \ingroup compta * \ingroup compta
* \brief Page ajout de categories bancaires * \brief Page ajout de categories bancaires
*/ */
require('../../main.inc.php'); require('../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$langs->load("banks"); $langs->load("banks");
$langs->load("categories"); $langs->load("categories");
if (!$user->rights->banque->configurer) if (!$user->rights->banque->configurer)
accessforbidden(); accessforbidden();
/* /*
* Actions ajout cat<EFBFBD>gorie * Actions ajout catégorie
*/ */
if ($_POST["action"] == 'add') if ($_POST["action"] == 'add')
{ {
if ($_POST["label"]) if ($_POST["label"])
{ {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_categ ("; $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_categ (";
$sql.= "label"; $sql.= "label";
$sql.= ", entity"; $sql.= ", entity";
$sql.= ") VALUES ("; $sql.= ") VALUES (";
$sql.= "'".$db->escape($_POST["label"])."'"; $sql.= "'".$db->escape($_POST["label"])."'";
$sql.= ", ".$conf->entity; $sql.= ", ".$conf->entity;
$sql.= ")"; $sql.= ")";
$result = $db->query($sql); $result = $db->query($sql);
if (!$result) if (!$result)
{ {
dol_print_error($db); dol_print_error($db);
} }
} }
} }
/* /*
* Action modification catégorie * Action modification catégorie
*/ */
if ($_POST["action"] == 'update') if ($_POST["action"] == 'update')
{ {
if ($_POST["label"]) if ($_POST["label"])
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."bank_categ "; $sql = "UPDATE ".MAIN_DB_PREFIX."bank_categ ";
$sql.= "set label='".$db->escape($_POST["label"])."'";; $sql.= "set label='".$db->escape($_POST["label"])."'";;
$sql.= " WHERE rowid = '".$_REQUEST['categid']."'"; $sql.= " WHERE rowid = '".$_REQUEST['categid']."'";
$sql.= " AND entity = ".$conf->entity; $sql.= " AND entity = ".$conf->entity;
$result = $db->query($sql); $result = $db->query($sql);
if (!$result) if (!$result)
{ {
dol_print_error($db); dol_print_error($db);
} }
} }
} }
/* /*
* Action suppression catégorie * Action suppression catégorie
*/ */
if ( $_REQUEST['action'] == 'delete' ) if ( $_REQUEST['action'] == 'delete' )
{ {
if ( $_REQUEST['categid'] ) if ( $_REQUEST['categid'] )
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_categ"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_categ";
$sql.= " WHERE rowid = '".$_REQUEST['categid']."'"; $sql.= " WHERE rowid = '".$_REQUEST['categid']."'";
$sql.= " AND entity = ".$conf->entity; $sql.= " AND entity = ".$conf->entity;
$result = $db->query($sql); $result = $db->query($sql);
if (!$result) if (!$result)
{ {
dol_print_error($db); dol_print_error($db);
} }
} }
} }
/* /*
* Affichage liste des cat<EFBFBD>éories * Affichage liste des catégories
*/ */
llxHeader(); llxHeader();
print_fiche_titre($langs->trans("Rubriques")); print_fiche_titre($langs->trans("Rubriques"));
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Ref").'</td><td colspan="2">'.$langs->trans("Label").'</td>'; print '<td>'.$langs->trans("Ref").'</td><td colspan="2">'.$langs->trans("Label").'</td>';
print "</tr>\n"; print "</tr>\n";
$sql = "SELECT rowid, label"; $sql = "SELECT rowid, label";
$sql.= " FROM ".MAIN_DB_PREFIX."bank_categ"; $sql.= " FROM ".MAIN_DB_PREFIX."bank_categ";
$sql.= " WHERE entity = ".$conf->entity; $sql.= " WHERE entity = ".$conf->entity;
$sql.= " ORDER BY label"; $sql.= " ORDER BY label";
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0; $total = 0; $i = 0; $total = 0;
$var=True; $var=True;
while ($i < $num) while ($i < $num)
{ {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td><a href="'.DOL_URL_ROOT.'/compta/bank/budget.php?bid='.$objp->rowid.'">'.$objp->rowid.'</a></td>'; 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) if (GETPOST("action") == 'edit' && GETPOST("categid")== $objp->rowid)
{ {
print "<td colspan=2>"; print "<td colspan=2>";
print '<form method="post" action="categ.php">'; print '<form method="post" action="categ.php">';
print '<input type="hidden" name="action" value="update">'; print '<input type="hidden" name="action" value="update">';
print '<input type="hidden" name="categid" value="'.$objp->rowid.'">'; print '<input type="hidden" name="categid" value="'.$objp->rowid.'">';
print '<input name="label" type="text" size=45 value="'.$objp->label.'">'; print '<input name="label" type="text" size=45 value="'.$objp->label.'">';
print '<input type="submit" class="button" value="'.$langs->trans("Edit").'">'; print '<input type="submit" class="button" value="'.$langs->trans("Edit").'">';
print "</form>"; print "</form>";
print "</td>"; print "</td>";
} }
else else
{ {
print "<td >".$objp->label."</td>"; print "<td >".$objp->label."</td>";
print '<td style="text-align: center;">'; 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=edit">'.img_edit().'</a>&nbsp;&nbsp;';
print '<a href="categ.php?categid='.$objp->rowid.'&amp;action=delete">'.img_delete().'</a></td>'; print '<a href="categ.php?categid='.$objp->rowid.'&amp;action=delete">'.img_delete().'</a></td>';
} }
print "</tr>"; print "</tr>";
$i++; $i++;
} }
$db->free($result); $db->free($result);
} }
/* /*
* Affichage ligne ajout de categorie * Affichage ligne ajout de categorie
*/ */
$var=!$var; $var=!$var;
print '<form method="post" action="categ.php">'; print '<form method="post" action="categ.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print "<input type=\"hidden\" name=\"action\" value=\"add\">"; print "<input type=\"hidden\" name=\"action\" value=\"add\">";
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print "<td>&nbsp;</td><td><input name=\"label\" type=\"text\" size=45></td>"; 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 '<td align="center"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>';
print "</form>"; print "</form>";
print "</table>"; print "</table>";
$db->close(); $db->close();
llxFooter(); llxFooter();
?> ?>

15
htdocs/langs/ca_ES/products.lang
View File

@ -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 HelpAddThisServiceCard=Aquesta opció permet crear o clonar una fitxa de servei en cas que no hi hagi
CurrentProductPrice=Preu actual CurrentProductPrice=Preu actual
AlwaysUseNewPrice=Utilitzar sempre el 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

2
htdocs/langs/en_US/products.lang
View File

@ -184,6 +184,8 @@ AlwaysUseFixedPrice=Use the fixed price
PriceByQuantity=Price by quantity PriceByQuantity=Price by quantity
PriceByQuantityRange=Quantity range PriceByQuantityRange=Quantity range
ProductsDashboard=Products/Services summary ProductsDashboard=Products/Services summary
UpdateOriginalProductLabel=Modify original label
HelpUpdateOriginalProductLabel=Allows to edit the name of the product
### composition fabrication ### composition fabrication
Building=Production and items dispatchment Building=Production and items dispatchment
Build=Produce Build=Produce

15
htdocs/langs/es_ES/products.lang
View File

@ -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 HelpAddThisServiceCard=Esta opción permite crear o clonar una ficha de servicio en caso de que no exista
CurrentProductPrice=Precio actual CurrentProductPrice=Precio actual
AlwaysUseNewPrice=Usar siempre el 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

2
htdocs/langs/fr_FR/products.lang
View File

@ -184,6 +184,8 @@ AlwaysUseFixedPrice=Utiliser le prix fixé
PriceByQuantity=Prix par quantité PriceByQuantity=Prix par quantité
PriceByQuantityRange=Grille de quantités PriceByQuantityRange=Grille de quantités
ProductsDashboard=Synthèse produits/services ProductsDashboard=Synthèse produits/services
UpdateOriginalProductLabel=Modifier étiquette d'origine
HelpUpdateOriginalProductLabel=Permet modifier le nom du produit
### composition fabrication ### composition fabrication
Building=Fabrication Building=Fabrication
Build=Fabriquer Build=Fabriquer

9
htdocs/product/class/product.class.php
View File

@ -5,6 +5,7 @@
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr> * Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2007-2011 Jean Heimburger <jean@tiaris.info> * Copyright (C) 2007-2011 Jean Heimburger <jean@tiaris.info>
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es> * 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 * 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 * it under the terms of the GNU General Public License as published by
@ -586,8 +587,12 @@ class Product extends CommonObject
$error=0; $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); $objectisused = $this->isObjectUsed($id);
if (empty($objectisused)) if (empty($objectisused))
{ {
@ -697,8 +702,6 @@ class Product extends CommonObject
return 0; return 0;
} }
} }
return 0;
}
/** /**
* Update ou cree les traductions des infos produits * Update ou cree les traductions des infos produits

9
htdocs/societe/admin/societe.php
View File

@ -453,6 +453,7 @@ print '<td width="140">'.$langs->trans("Name").'</td>';
print '<td>'.$langs->trans("Description").'</td>'; print '<td>'.$langs->trans("Description").'</td>';
print '<td align="center" width="80">'.$langs->trans("Status").'</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("ShortInfo").'</td>';
print '<td align="center" width="60">'.$langs->trans("Preview").'</td>';
print "</tr>\n"; print "</tr>\n";
foreach ($dirsociete as $dirroot) foreach ($dirsociete as $dirroot)
@ -536,8 +537,12 @@ foreach ($dirsociete as $dirroot)
} }
$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>'; $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); $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">'; print '<td align="center" class="nowrap">';
if ($module->type == 'pdf') if ($module->type == 'pdf')
{ {
@ -547,7 +552,7 @@ foreach ($dirsociete as $dirroot)
{ {
$linkspec=img_object($langs->trans("PreviewNotAvailable"),'generic'); $linkspec=img_object($langs->trans("PreviewNotAvailable"),'generic');
} }
print $form->textwithpicto(' &nbsp; '.$linkspec,$htmltooltip,1,0); print $linkspec;
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";