Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Trad: Encore de la traduction

Browse Source
This commit is contained in:
Laurent Destailleur 2004-10-22 23:34:25 +00:00
parent e5aea1fecd
commit c96d972dac
12 changed files with 85 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/langs/en_US/main.lang
View File

@ -118,6 +118,7 @@ Filter=Filter
RemoveFilter=Remove filter
ChartGenerated=Chart generated
ChartNotGenerated=Chart not generated
GeneratedOn=Build on %s
Duration=Duration
Summary=Summary
NotYetAvailable=Not yet available
@ -129,4 +130,5 @@ From=From
to=to
Quantity=Quantity
Qty=Qty
ChangedBy=Changed by
ChangedBy=Changed by
ReCalculate=Rebuild

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

@ -10,6 +10,7 @@ ServiceCode=Service code
ProductsAndServices=Products and Services
ProductsAndServicesOnSell=Products and Services on sell
ProductsAndServicesNotOnSell=Products and Services out of sell
ProductsAndServicesStatistics=Products and Services statistics
ProductsOnSell=Products on sell
ProductsNotOnSell=Products out of sell
ServicesOnSell=Services on sell
@ -25,6 +26,7 @@ NotOnSell=Out of Sell
UpdatePrice=Update price
AppliedPricesFrom=Applied prices from
SellingPrice=Selling price
CurrentPrice=Current price
NewPrice=New price
ContractStatus=Contract status
ContractStatusClosed=Closed

4
htdocs/langs/en_US/suppliers.lang
View File

@ -1,2 +1,4 @@
# Dolibarr language file - en_US - suppliers
Suppliers=Suppliers
Suppliers=Suppliers
AddSupplier=Add a supplier
SupplierRemoved=Supplier removed

1
htdocs/langs/fr_BE/main.lang
View File

@ -107,6 +107,7 @@ Filter=Filtre
RemoveFilter=Supprimer le filtre
ChartGenerated=Graphiques générés
ChartNotGenerated=Graphique non généré
GeneratedOnGénéré le %s
Duration=Durée
Summary=Résumé
NotYetAvailable=Pas encore disponible

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

@ -119,6 +119,7 @@ Filter=Filtre
RemoveFilter=Supprimer filtre
ChartGenerated=Graphiques générés
ChartNotGenerated=Graphique non généré
GeneratedOn=Généré le %s
Duration=Durée
Summary=Résumé
NotYetAvailable=Pas encore disponible
@ -131,3 +132,4 @@ to=au
Quantity=Quantité
Qty=Qté
ChangedBy=Modifié par
ReCalculate=Re-calculer

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

@ -10,6 +10,7 @@ ServiceCode=Code service
ProductsAndServices=Produits et Services
ProductsAndServicesOnSell=Produits et Services en vente
ProductsAndServicesNotOnSell=Produits et Services hors vente
ProductsAndServicesStatistics=Statistiques produits et services
ProductsOnSell=Produits en vente
ProductsNotOnSell=Produits hors vente
ServicesOnSell=Services en vente
@ -25,6 +26,7 @@ NotOnSell=Hors vente
UpdatePrice=Changer le prix
AppliedPricesFrom=Prix de vente pratiqués à partir du
SellingPrice=Prix de vente
CurrentPrice=Prix actuel
NewPrice=Nouveau prix
ContractStatus=Statut du contrat
ContractStatusClosed=Cloturé

4
htdocs/langs/fr_FR/suppliers.lang
View File

@ -1,2 +1,4 @@
# Dolibarr language file - fr_FR - suppliers
Suppliers=Fournisseurs
Suppliers=Fournisseurs
AddSupplier=Ajouter un fournisseur
SupplierRemoved=Founisseur supprimé

37
htdocs/product/fiche.php
View File

@ -183,7 +183,7 @@ if ($_GET["action"] == 'remove_fourn')
if ($product->remove_fournisseur($user, $_GET["id_fourn"]) > 0)
{
$_GET["action"] = '';
$mesg = 'Founisseur supprimé';
$mesg = $langs->trans("SupplierRemoved");
}
else
{
@ -249,7 +249,7 @@ if ($_GET["action"] == 'create')
if ($_GET["type"]==1) { print $langs->trans("NewService"); }
print '</div><br>'."\n";
print '<table class="border" width="100%" cellspacing="0" cellpadding="3">';
print '<table class="border" width="100%">';
print '<tr>';
print '<td>'.$langs->trans("Ref").'</td><td><input name="ref" size="20" value="'.$product->ref.'">';
if ($_error == 1)
@ -258,7 +258,7 @@ if ($_GET["action"] == 'create')
}
print '</td></tr>';
print '<tr><td>'.$langs->trans("Label").'</td><td><input name="libelle" size="40" value="'.$product->libelle.'"></td></tr>';
print '<tr><td>Prix de vente</td><TD><input name="price" size="10" value="'.$product->price.'"></td></tr>';
print '<tr><td>'.$langs->trans("SellingPrice").'</td><td><input name="price" size="10" value="'.$product->price.'"></td></tr>';
$langs->load("bills");
print '<tr><td>'.$langs->trans("VATRate").'</td><td>';
@ -358,7 +358,7 @@ else
print '<td width="40%">';
if ($product->envente)
{
print "En vente";
print $langs->trans("OnSell");
}
else
{
@ -366,7 +366,7 @@ else
}
print '</td></tr>';
print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$product->libelle.'</td></tr>';
print '<tr><td>Prix de vente</td><td>'.price($product->price).'</td>';
print '<tr><td>'.$langs->trans("SellingPrice").'</td><td>'.price($product->price).'</td>';
if ($product->type == 0)
{
$nblignefour=4;
@ -398,7 +398,7 @@ else
print '<td><a href="../fourn/fiche.php?socid='.$objp->idp.'">'.$objp->nom.'</a></td>';
print '<td align="right">';
print '<a href="fiche.php?id='.$product->id.'&amp;action=remove_fourn&amp;id_fourn='.$objp->idp.'">';
print '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/editdelete.png" border="0"></a></td></tr>';
print img_disable($langs->trans("Remove")).'</a></td></tr>';
$i++;
}
print '</table>';
@ -433,14 +433,14 @@ else
if ($product->type == 1)
{
print '<tr><td>'.$langs->trans("Duration").'</td><TD>'.$product->duration_value.'&nbsp;';
print '<tr><td>'.$langs->trans("Duration").'</td><td>'.$product->duration_value.'&nbsp;';
if ($product->duration_value > 1)
{
$dur=array("d"=>"Days","w","Weeks","m","Months","y"=>"Years");
$dur=array("d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years"));
}
else {
$dur=array("d"=>"Day","w","Week","m","Month","y"=>"Year");
$dur=array("d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year"));
}
print $langs->trans($dur[$product->duration_unit])."&nbsp;";
@ -476,7 +476,9 @@ else
*/
if ($_GET["action"] == 'ajout_fourn' && $user->rights->produit->creer)
{
print_titre ("Ajouter un fournisseur");
$langs->load("suppliers");
print_titre($langs->trans("AddSupplier"));
print '<form action="fiche.php?id='.$product->id.'" method="post">';
print '<input type="hidden" name="action" value="add_fourn">';
print '<input type="hidden" name="id" value="'.$product->id.'">';
@ -510,13 +512,10 @@ else
/*
* Fiche en mode edition
*/
if (($_GET["action"] == 'edit' || $_GET["action"] == 're-edit') && $user->rights->produit->creer)
{
print_fiche_titre('Edition de la fiche '.$types[$product->type].' : '.$product->ref, $mesg);
print "<form action=\"fiche.php\" method=\"post\">\n";
print '<input type="hidden" name="action" value="update">';
print '<input type="hidden" name="id" value="'.$product->id.'">';
@ -619,7 +618,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente)
$htmls = new Form($db);
$propal = New Propal($db);
print '<table width="100%" border="0" cellpadding="3" cellspacing="0">';
print '<table width="100%" class="noborder">';
if($user->rights->propale->creer)
{
print "<tr>".'<td width="50%" valign="top">';
@ -639,13 +638,13 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente)
{
$num = $db->num_rows();
$i = 0;
print '<TABLE border="0" width="100%" cellspacing="0" cellpadding="4">';
print '<table class="noborder" width="100%">';
$var=True;
while ($i < $num)
{
$objp = $db->fetch_object($i);
$var=!$var;
print "<TR $bc[$var]>";
print "<tr $bc[$var]>";
print "<td><a href=\"../comm/propal.php?propalid=$objp->propalid\">$objp->ref</a></TD>\n";
print "<td><a href=\"../comm/fiche.php?socid=$objp->idp\">$objp->nom</a></TD>\n";
print "<td>". strftime("%d %b",$objp->dp)."</td>\n";
@ -676,7 +675,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente)
{
print '<form method="POST" action="fiche.php?id='.$product->id.'">';
print '<input type="hidden" name="action" value="addinpropal">';
print '<table class="border" width="100%" cellpadding="3" cellspacing="0">';
print '<table class="border" width="100%">';
print "<tr>".'<td>Autres Propositions</td><td>';
$htmls->select_array("propalid", $otherprop);
print '</td><td>';
@ -711,7 +710,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente)
{
$num = $db->num_rows();
$i = 0;
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
print '<table class="noborder" width="100%">';
$var=True;
while ($i < $num)
{
@ -738,7 +737,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente)
}
else
{
print $db->error() . "<br>" . $sql;
dolibarr_print_error($db);
}
print '</td><td width="50%" valign="top">';
print '</td></tr></table>';

18
htdocs/product/index.php
View File

@ -20,9 +20,18 @@
* $Source$
*
*/
/*!
\file htdocs/product/index.php
\ingroup product
\brief Page accueil des produits et services
\version $Revision$
*/
require("./pre.inc.php");
$user->getrights('produit');
$langs->load("products");
@ -30,15 +39,16 @@ if (!$user->rights->produit->lire)
accessforbidden();
if ($action == 'update')
if ($_POST["action"] == 'update')
{
$sql = "UPDATE ".MAIN_DB_PREFIX."product SET description='$desc' where rowid = $rowid";
$sql = "UPDATE ".MAIN_DB_PREFIX."product SET description='".$_POST["desc"]."' where rowid = ".$_POST["rowid"];
$db->query($sql);
}
/*
*
* Affichage page accueil
*
*/
@ -53,7 +63,7 @@ print '</form></div>';
print_titre($langs->trans("ProductsAndServices"));
print '<table border="0" width="100%" cellspacing="0" cellpadding="3">';
print '<table border="0" width="100%">';
print '<tr><td valign="top" width="30%">';

25
htdocs/product/liste.php
View File

@ -20,6 +20,14 @@
* $Source$
*
*/
/*!
\file htdocs/product/liste.php
\ingroup product
\brief Page liste des produits ou services
\version $Revision$
*/
require("./pre.inc.php");
$user->getrights('produit');
@ -33,6 +41,7 @@ if (!$user->rights->produit->lire)
*
*
*/
$type=$_GET["type"];
$page = $_GET["page"];
@ -124,8 +133,8 @@ if ($result)
if (isset($envente) && $envente == 0)
{
if (isset($_POST["type"]) || isset($_GET["type"])) {
if ($type) { $texte = $langs->trans("ProductsNotOnSell"); }
else { $texte = $langs->trans("ServicesNotOnSell"); }
if ($type) { $texte = $langs->trans("ServicesNotOnSell"); }
else { $texte = $langs->trans("ProductsNotOnSell"); }
} else {
$texte = $langs->trans("ProductsAndServicesNotOnSell");
}
@ -134,8 +143,8 @@ if ($result)
{
$envente=1;
if (isset($_POST["type"]) || isset($_GET["type"])) {
if ($type) { $texte = $langs->trans("ProductsOnSell"); }
else { $texte = $langs->trans("ServicesOnSell"); }
if ($type) { $texte = $langs->trans("ServicesOnSell"); }
else { $texte = $langs->trans("ProductsOnSell"); }
} else {
$texte = $langs->trans("ProductsAndServicesOnSell");
}
@ -152,21 +161,21 @@ if ($result)
print_barre_liste($texte, $page, "liste.php", "&sref=$sref&snom=$snom&fourn_id=$fourn_id&amp;type=$type", $sortfield, $sortorder,'',$num);
}
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="3">';
print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\"><td>";
print_liste_field_titre($langs->trans("Ref"),"liste.php", "p.ref","&amp;envente=$envente&amp;type=$type&fourn_id=$fourn_id");
print "</td><td>";
print_liste_field_titre($langs->trans("Label"),"liste.php", "p.label","&envente=$envente&type=$type&fourn_id=$fourn_id");
print "</td><td align=\"right\">";
print_liste_field_titre("Prix de vente","liste.php", "p.price","&envente=$envente&type=$type&fourn_id=$fourn_id");
print_liste_field_titre($langs->trans("SellingPrice"),"liste.php", "p.price","&envente=$envente&type=$type&fourn_id=$fourn_id");
print "</td></tr>\n";
print '<tr class="liste_titre">';
print '<form action="liste.php?type='.$type.'" method="post">';
print '<td><input class="flat" type="text" size="10" name="sref">&nbsp;<input class="flat" type="submit" value="go"></td>';
print '<td><input class="flat" type="text" size="10" name="sref">&nbsp;<input class="flat" type="submit" value="'.$langs->trans("Go").'"></td>';
print '</form><form action="liste.php" method="post">';
print '<td><input class="flat" type="text" size="20" name="snom">&nbsp;<input class="flat" type="submit" value="go"></td>';
print '<td><input class="flat" type="text" size="20" name="snom">&nbsp;<input class="flat" type="submit" value="'.$langs->trans("Go").'"></td>';
print '</form><td>&nbsp;</td></tr>';

29
htdocs/product/stats/fiche.php
View File

@ -32,6 +32,7 @@ require("./pre.inc.php");
require("../../propal.class.php");
$langs->load("products");
$langs->load("bills");
$types[0] = $langs->trans("Product");
$types[1] = $langs->trans("Service");
@ -107,8 +108,8 @@ if ($_GET["id"])
print '<div class="formsearch">';
print '<form action="../liste.php" method="post">';
print '<input type="hidden" name="type" value="'.$product->type.'">';
print $langs->trans("Ref").': <input class="flat" type="text" size="10" name="sref">&nbsp;<input class="flat" type="submit" value="go"> &nbsp;';
print $langs->trans("Label").': <input class="flat" type="text" size="20" name="snom">&nbsp;<input class="flat" type="submit" value="go">';
print $langs->trans("Ref").': <input class="flat" type="text" size="10" name="sref">&nbsp;<input class="flat" type="submit" value="'.$langs->trans("Go").'"> &nbsp;';
print $langs->trans("Label").': <input class="flat" type="text" size="20" name="snom">&nbsp;<input class="flat" type="submit" value="'.$langs->trans("Go").'">';
print '</form></div>';
@ -138,19 +139,19 @@ if ($_GET["id"])
dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref);
print '<table class="border" width="100%" cellspacing="0" cellpadding="3"><tr>';
print '<table class="border" width="100%"><tr>';
print '<td width="20%">'.$langs->trans("Ref").'</td><td width="40%"><a href="../fiche.php?id='.$product->id.'">'.$product->ref.'</a></td>';
print '<td>'.$langs->trans("Statistics").'</td></tr>';
print "<tr><td>".$langs->trans("Label")."</td><td>$product->libelle</td>";
print '<td valign="top" rowspan="2">';
print '<a href="propal.php?id='.$product->id.'">Propositions commerciales</a> : '.$product->count_propale($socid);
print "<br>Proposé à <b>".$product->count_propale_client($socid)."</b> clients";
print '<br><a href="facture.php?id='.$product->id.'">Factures</a> : '.$product->count_facture($socid);
print '<br><a href="facture.php?id='.$product->id.'">'.$langs->trans("Bills").'</a> : '.$product->count_facture($socid);
print '</td></tr>';
print '<tr><td>Prix actuel</td><td>'.price($product->price).'</td></tr>';
print '<tr><td>'.$langs->trans("CurrentPrice").'</td><td>'.price($product->price).'</td></tr>';
print "</table>";
print '<br><table class="border" width="100%" cellspacing="0" cellpadding="3">';
print '<br><table class="border" width="100%">';
print '<tr class="liste_titre"><td width="50%" colspan="2" align="center">Nombre de ventes<br>sur les 12 derniers mois</td>';
print '<td align="center" width="50%" colspan="2">Nombre de pièces vendues</td></tr>';
print '<tr><td align="center" colspan="2">';
@ -163,22 +164,22 @@ if ($_GET["id"])
print '</td></tr><tr>';
if (file_exists($filenbvente) && filemtime($filenbvente))
{
print '<td>Généré le '.dolibarr_print_date(filemtime($filenbvente),"%d %b %Y %H:%M:%S").'</td>';
print '<td>'.$langs->trans("GeneratedOn",dolibarr_print_date(filemtime($filenbvente),"%d %b %Y %H:%M:%S")).'</td>';
}
else
{
print '<td>'.$langs->trans("ChartNotGenerated").'</td>';
}
print '<td align="center">[<a href="fiche.php?id='.$product->id.'&amp;action=recalcul">Re-calculer</a>]</td>';
print '<td align="center">[<a href="fiche.php?id='.$product->id.'&amp;action=recalcul">'.$langs->trans("ReCalculate").'</a>]</td>';
if (file_exists($filenbpiece) && filemtime($filenbpiece))
{
print '<td>Généré le '.dolibarr_print_date(filemtime($filenbpiece),"%d %b %Y %H:%M:%S").'</td>';
print '<td>'.$langs->trans("GeneratedOn",dolibarr_print_date(filemtime($filenbpiece),"%d %b %Y %H:%M:%S")).'</td>';
}
else
{
print '<td>'.$langs->trans("ChartNotGenerated").'</td>';
}
print '<td align="center">[<a href="fiche.php?id='.$product->id.'&amp;action=recalcul">Re-calculer</a>]</td></tr>';
print '<td align="center">[<a href="fiche.php?id='.$product->id.'&amp;action=recalcul">'.$langs->trans("ReCalculate").'</a>]</td></tr>';
print '<tr><td colspan="4">Statistiques effectuées sur les factures payées uniquement</td></tr>';
print '<tr class="liste_titre"><td width="50%" colspan="2" align="center">Nombre de propositions commerciales<br>sur les 12 derniers mois</td>';
@ -193,22 +194,22 @@ if ($_GET["id"])
print '</td></tr><tr>';
if (file_exists($filenbpropal) && filemtime($filenbpropal))
{
print '<td>Généré le '.dolibarr_print_date(filemtime($filenbpropal),"%d %b %Y %H:%M:%S").'</td>';
print '<td>'.$langs->trans("GeneratedOn",dolibarr_print_date(filemtime($filenbpropal),"%d %b %Y %H:%M:%S")).'</td>';
}
else
{
print '<td>'.$langs->trans("ChartNotGenerated").'</td>';
}
print '<td align="center">[<a href="fiche.php?id='.$product->id.'&amp;action=recalcul">Re-calculer</a>]</td>';
print '<td align="center">[<a href="fiche.php?id='.$product->id.'&amp;action=recalcul">'.$langs->trans("ReCalculate").'</a>]</td>';
if (file_exists($filenbpiece) && filemtime($filenbpiece33))
{
print '<td>Généré le '.dolibarr_print_date(filemtime($filenbpiece),"%d %b %Y %H:%M:%S").'</td>';
print '<td>'.$langs->trans("GeneratedOn",dolibarr_print_date(filemtime($filenbpiece),"%d %b %Y %H:%M:%S")).'</td>';
}
else
{
print '<td>'.$langs->trans("ChartNotGenerated").'</td>';
}
print '<td align="center">[<a href="fiche.php?id='.$product->id.'&amp;action=recalcul">Re-calculer</a>]</td></tr>';
print '<td align="center">[<a href="fiche.php?id='.$product->id.'&amp;action=recalcul">'.$langs->trans("ReCalculate").'</a>]</td></tr>';
print '</table><br>';

10
htdocs/product/stats/index.php
View File

@ -52,13 +52,13 @@ if ($db->query($sql))
}
$db->free();
print_fiche_titre('Statistiques produits et services', $mesg);
print_fiche_titre($langs->trans("ProductsAndServicesStatistics"), $mesg);
print '<br>';
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\">";
print "<td>Résumé</td><td>Valeur</TD>";
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Summary").'</td><td>'.$langs->trans("Value").'</td>';
print "</tr>\n";
$var=True;
@ -127,7 +127,7 @@ if ($db->query($sql))
}
}
else {
print $db->error()." $sql";
dolibarr_print_error($db);
}
print "</table>\n";
$db->free();