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 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();

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("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>';

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 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();

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("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>';

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 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();

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 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();

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 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();

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

@ -36,7 +36,7 @@ if (!$user->rights->banque->configurer)
/*
* Actions ajout cat<EFBFBD>gorie
* Actions ajout catégorie
*/
if ($_POST["action"] == 'add')
{
@ -101,7 +101,7 @@ if ( $_REQUEST['action'] == 'delete' )
/*
* Affichage liste des cat<EFBFBD>éories
* Affichage liste des catégories
*/
llxHeader();

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

@ -181,3 +181,16 @@ HelpAddThisServiceCard=Aquesta opció permet crear o clonar una fitxa de servei
CurrentProductPrice=Preu actual
AlwaysUseNewPrice=Utilitzar sempre el preu actual
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
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

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

@ -181,3 +181,16 @@ HelpAddThisServiceCard=Esta opción permite crear o clonar una ficha de servicio
CurrentProductPrice=Precio actual
AlwaysUseNewPrice=Usar siempre el precio actual
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é
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

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

@ -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

7
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 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)
@ -537,7 +538,11 @@ 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";