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

Trad: Traductions messages diverses

Browse Source
This commit is contained in:
Laurent Destailleur 2005-03-15 16:00:00 +00:00
parent bf461773df
commit 74ec2a2529
8 changed files with 222 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/en_US/bills.lang
View File

@ -62,3 +62,4 @@ RemainderToTake=Remainder to take
CreateDraft=Create draft CreateDraft=Create draft
SendBillRef=Send bill %s SendBillRef=Send bill %s
SendReminderBillRef=Send bill %s (reminder) SendReminderBillRef=Send bill %s (reminder)
NoOtherBills=No other drafts bills

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

@ -184,3 +184,6 @@ NextStep=Next step
PreviousStep=Previous step PreviousStep=Previous step
None=None None=None
Late=Late Late=Late
Photo=Picture
Photos=Pictures
AddPhoto=Add picture

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

@ -25,3 +25,5 @@ PropalStatusDraft=Draft (need to be validated)
PropalStatusValidated=Validated (proposal is opened) PropalStatusValidated=Validated (proposal is opened)
ListOfProposals=List of commercial proposals ListOfProposals=List of commercial proposals
ActionsOnPropal=Tasks on proposal ActionsOnPropal=Tasks on proposal
NoOpenedPropals=No opened commercial proposals
NoOtherOpenedPropals=No other opened commercial proposals

1
htdocs/langs/fr_FR/bills.lang
View File

@ -65,3 +65,4 @@ SendReminderBillRef=Relance facture %s
ShowBill=Afficher facture ShowBill=Afficher facture
StandingOrders=Prélèvements StandingOrders=Prélèvements
StandingOrder=Prélèvement StandingOrder=Prélèvement
NoOtherBills=Pas d'autres factures brouillons

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

@ -185,3 +185,6 @@ NextStep=Etape suivante
PreviousStep=Etape précédente PreviousStep=Etape précédente
None=Aucun None=Aucun
Late=Retard Late=Retard
Photo=Photo
Photos=Photos
AddPhoto=Ajouter photo

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

@ -25,3 +25,5 @@ PropalStatusDraft=Brouillon (
PropalStatusValidated=Validée (propale ouverte) PropalStatusValidated=Validée (propale ouverte)
ListOfProposals=Liste des devis/propositions commerciales ListOfProposals=Liste des devis/propositions commerciales
ActionsOnPropal=Actions sur la proposition ActionsOnPropal=Actions sur la proposition
NoOpenedPropals=Pas de propositions ouvertes
NoOtherOpenedPropals=Pas d'autres propositions ouvertes

317
htdocs/product/fiche.php
View File

@ -424,15 +424,16 @@ else
$sql .=" WHERE pf.fk_soc = s.idp AND pf.fk_product = ".$product->id; $sql .=" WHERE pf.fk_soc = s.idp AND pf.fk_product = ".$product->id;
$sql .= " ORDER BY lower(s.nom)"; $sql .= " ORDER BY lower(s.nom)";
if ( $db->query($sql) ) $result=$db->query($sql);
if ($result)
{ {
$num_fournisseur = $db->num_rows(); $num_fournisseur = $db->num_rows($result);
$i = 0; $i = 0;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
$var=True; $var=True;
while ($i < $num_fournisseur) while ($i < $num_fournisseur)
{ {
$objp = $db->fetch_object($i); $objp = $db->fetch_object($result);
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td><a href="../fourn/fiche.php?socid='.$objp->idp.'">'.$objp->nom.'</a></td>'; print '<td><a href="../fourn/fiche.php?socid='.$objp->idp.'">'.$objp->nom.'</a></td>';
@ -442,7 +443,7 @@ else
$i++; $i++;
} }
print '</table>'; print '</table>';
$db->free(); $db->free($result);
} }
print '</td></tr>'; print '</td></tr>';
@ -691,150 +692,228 @@ if ($_GET["action"] == '')
print '<a class="tabAction" href="fiche.php?action=edit&amp;id='.$product->id.'">'.$langs->trans("Edit").'</a>'; print '<a class="tabAction" href="fiche.php?action=edit&amp;id='.$product->id.'">'.$langs->trans("Edit").'</a>';
} }
if ($product->type == 0 && $conf->stock->enabled)
{
print '<a class="tabAction" href="stock/product.php?id='.$product->id.'&amp;action=correction">'.$langs->trans("CorrectStock").'</a>';
}
} }
print "\n</div>\n"; print "\n</div>\n";
/* /*
* Photo * Photo
* *
*/ */
if ($_GET["id"] && $_GET["action"]=='') if ($_GET["id"] && $_GET["action"]=='')
{ {
print $product->show_photo($conf->produit->dir_output); print $product->show_photo($conf->produit->dir_output);
} }
if ($_GET["id"] && $_GET["action"] == '' && $product->envente) if ($_GET["id"] && $_GET["action"] == '' && $product->envente)
{ {
$htmls = new Form($db); $htmls = new Form($db);
$propal = New Propal($db); $propal = New Propal($db);
print '<table width="100%" class="noborder">'; print '<table width="100%" class="noborder">';
if($user->rights->propale->creer)
// Propals
if($user->rights->propale->creer)
{ {
print "<tr>".'<td width="50%" valign="top">'; $langs->load("propal");
print_titre($langs->trans("AddToMyProposals")) . '</td>';
print '<td width="50%" valign="top">';
print_titre($langs->trans("AddToOtherProposals")) . '</td>';
print '</tr>';
print "<tr>".'<td width="50%" valign="top">'; print '<tr><td width="50%" valign="top">';
$sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.ref,".$db->pdate("p.datep")." as dp"; print_titre($langs->trans("AddToMyProposals")) . '</td>';
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p"; print '<td width="50%" valign="top">';
$sql .=" WHERE p.fk_soc = s.idp AND p.fk_statut = 0 AND p.fk_user_author = ".$user->id; print_titre($langs->trans("AddToOtherProposals")) . '</td>';
$sql .= " ORDER BY p.datec DESC, tms DESC"; print '</tr>';
if ( $db->query($sql) ) // Liste de "Mes propals"
{ print '<tr><td width="50%" valign="top">';
$num = $db->num_rows(); $sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.ref,".$db->pdate("p.datep")." as dp";
$i = 0; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
print '<table class="noborder" width="100%">'; $sql .=" WHERE p.fk_soc = s.idp AND p.fk_statut = 0 AND p.fk_user_author = ".$user->id;
$var=True; $sql .= " ORDER BY p.datec DESC, tms DESC";
while ($i < $num)
{
$objp = $db->fetch_object($i);
$var=!$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";
print '<form method="POST" action="fiche.php?id='.$product->id.'">';
print '<input type="hidden" name="action" value="addinpropal">';
print '<td><input type="hidden" name="propalid" value="'.$objp->propalid.'">';
print '<input type="text" name="qty" size="2" value="1"></td><td>Rem.';
print '<input type="text" name="remise_percent" size="1" value="0">%';
print " ".$product->stock_proposition;
print '</td><td align="right">';
print '<input type="submit" value="'.$langs->trans("Add").'">';
print "</td>";
print '</form></tr>';
$i++;
}
print "</table>";
$db->free();
}
print '</td>'; $result=$db->query($sql);
print '<td width="50%" valign="top">'; if ($result)
{
$num = $db->num_rows($result);
if ($num) {
$i = 0;
print '<table class="noborder" width="100%">';
$var=true;
while ($i < $num)
{
$objp = $db->fetch_object($result);
$var=!$var;
print '<form method="POST" action="fiche.php?id='.$product->id.'">';
print "<tr $bc[$var]>";
print "<td nowrap><a href=\"../comm/propal.php?propalid=$objp->propalid\">".img_object($langs->trans("ShowPropal"),"propal")." ".$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";
print '<input type="hidden" name="action" value="addinpropal">';
print '<td><input type="hidden" name="propalid" value="'.$objp->propalid.'">';
print '<input type="text" name="qty" size="2" value="1"></td><td nowrap>'.$langs->trans("Discount");
print '<input type="text" name="remise_percent" size="1" value="0">%';
print " ".$product->stock_proposition;
print '</td><td align="right">';
print '<input type="submit" value="'.$langs->trans("Add").'">';
print '</td>';
print '</tr>';
print '</form>';
$i++;
}
print "</table>";
}
else {
print $langs->trans("NoOpenedPropals");
}
$db->free($result);
}
$otherprop = $propal->liste_array(1, '<>'.$user->id); print '</td>';
if (sizeof($otherprop))
{
print '<form method="POST" action="fiche.php?id='.$product->id.'">';
print '<input type="hidden" name="action" value="addinpropal">';
print '<table class="border" width="100%">';
print "<tr>".'<td>Autres Propositions</td><td>';
$htmls->select_array("propalid", $otherprop);
print '</td><td>';
print '<input type="text" name="qty" size="2" value="1"></td><td>Rem.';
print '<input type="text" name="remise_percent" size="1" value="0">%';
print '</td><td align="right">';
print '<input type="submit" value="'.$langs->trans("Add").'">';
print '</td></tr>';
print '</table></form>';
}
print '</td>';
print '</tr>'; // Liste de "Other propals"
print '<td width="50%" valign="top">';
$otherprop = $propal->liste_array(1, ' <> s'.$user->id);
if (is_array($otherprop) && sizeof($otherprop))
{
$var=false;
print '<form method="POST" action="fiche.php?id='.$product->id.'">';
print '<table class="noborder" width="100%">'.$otherprop;
print '<input type="hidden" name="action" value="addinpropal">';
print '<tr '.$bc[$var].'><td colspan="3">'.$langs->trans("OtherPropals").'</td><td>';
$htmls->select_array("propalid", $otherprop);
print '</td></tr>';
print '<tr '.$bc[$var].'><td>'. strftime("%d %b",$objp->dp)."</td><td nowrap>\n";
print '<input type="text" name="qty" size="2" value="1"></td><td nowrap>'.$langs->trans("Discount");
print '<input type="text" name="remise_percent" size="1" value="0">%';
print '</td><td align="right">';
print '<input type="submit" value="'.$langs->trans("Add").'">';
print '</td></tr>';
print '</table>';
print '</form>';
}
else {
print $langs->trans("NoOtherOpenedPropals");
}
print '</td>';
print '</tr>';
} }
if($user->rights->facture->creer) // Factures
if($user->rights->facture->creer)
{ {
$langs->load("bills"); $langs->load("bills");
print "<tr>".'<td width="50%" valign="top">'; print '<tr><td width="50%" valign="top">';
print_titre($langs->trans("AddToMyBills")); print_titre($langs->trans("AddToMyBills"));
print '</td><td width="50%" valign="top">'; print '</td><td width="50%" valign="top">';
print_titre($langs->trans("AddToOtherBills")); print_titre($langs->trans("AddToOtherBills"));
print '</td></tr>'; print '</td></tr>';
print "<tr>".'<td width="50%" valign="top">'; // Liste de Mes factures
$sql = "SELECT s.nom, s.idp, f.rowid as factureid, f.facnumber,".$db->pdate("f.datef")." as df"; print '<tr><td width="50%" valign="top">';
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f"; $sql = "SELECT s.nom, s.idp, f.rowid as factureid, f.facnumber,".$db->pdate("f.datef")." as df";
$sql .=" WHERE f.fk_soc = s.idp AND f.fk_statut = 0 AND f.fk_user_author = ".$user->id; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
$sql .= " ORDER BY f.datec DESC, f.rowid DESC"; $sql .=" WHERE f.fk_soc = s.idp AND f.fk_statut = 0 AND f.fk_user_author = ".$user->id;
$sql .= " ORDER BY f.datec DESC, f.rowid DESC";
if ( $db->query($sql) ) $result=$db->query($sql);
{ if ($result)
$num = $db->num_rows(); {
$i = 0; $num = $db->num_rows($result);
print '<table class="noborder" width="100%">'; if ($num) {
$var=True; $i = 0;
while ($i < $num) print '<table class="noborder" width="100%">';
{ $var=true;
$objp = $db->fetch_object( $i); while ($i < $num)
{
$objp = $db->fetch_object($result);
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print '<form method="POST" action="fiche.php?id='.$product->id.'">';
print "<td><a href=\"../compta/facture.php?facid=$objp->factureid\">$objp->facnumber</a></td>\n"; print "<tr $bc[$var]>";
print "<td><a href=\"../comm/fiche.php?socid=$objp->idp\">$objp->nom</a></td>\n"; print "<td nowrap><a href=\"../compta/facture.php?facid=$objp->factureid\">".img_object($langs->trans("ShowBills"),"bill")." ".$objp->facnumber."</a></td>\n";
print "<td>". strftime("%d %b",$objp->df)."</td>\n"; print "<td><a href=\"../comm/fiche.php?socid=$objp->idp\">$objp->nom</a></td>\n";
print '<form method="POST" action="fiche.php?id='.$product->id.'">'; print "<td>". strftime("%d %b",$objp->df)."</td>\n";
print '<input type="hidden" name="action" value="addinfacture">'; print '<input type="hidden" name="action" value="addinfacture">';
print '<td><input type="hidden" name="factureid" value="'.$objp->factureid.'">'; print '<td><input type="hidden" name="factureid" value="'.$objp->factureid.'">';
print '<input type="text" name="qty" size="2" value="1"></td><td>Rem.'; print '<input type="text" name="qty" size="2" value="1"></td><td nowrap>'.$langs->trans("Discount");
print '<input type="text" name="remise_percent" size="2" value="0">%'; print '<input type="text" name="remise_percent" size="2" value="0">%';
print '</td><td align="right">'; print '</td><td align="right">';
print '<input type="submit" value="'.$langs->trans("Add").'">'; print '<input type="submit" value="'.$langs->trans("Add").'">';
print "</td>"; print '</td>';
print '</form></tr>'; print '</tr>';
$i++; print '</form>';
} $i++;
print "</table>"; }
$db->free(); print "</table>";
} }
else else {
{ print $langs->trans("NoBills");
dolibarr_print_error($db); }
} $db->free($result);
print '</td><td width="50%" valign="top">'; }
// \todo Ajouter liste des factures autres else
print '</td></tr></table>'; {
dolibarr_print_error($db);
}
print '</td><td width="50%" valign="top">';
// Liste de Autres factures
$var=true;
$sql = "SELECT s.nom, s.idp, f.rowid as factureid, f.facnumber,".$db->pdate("f.datef")." as df";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
$sql .=" WHERE f.fk_soc = s.idp AND f.fk_statut = 0 AND f.fk_user_author <> ".$user->id;
$sql .= " ORDER BY f.datec DESC, f.rowid DESC";
$result=$db->query($sql);
if ($result)
{
$num = $db->num_rows($result);
if ($num) {
$i = 0;
print '<table class="noborder" width="100%">';
$var=true;
while ($i < $num)
{
$objp = $db->fetch_object($result);
$var=!$var;
print '<form method="POST" action="fiche.php?id='.$product->id.'">';
print "<tr $bc[$var]>";
print "<td><a href=\"../compta/facture.php?facid=$objp->factureid\">$objp->facnumber</a></td>\n";
print "<td><a href=\"../comm/fiche.php?socid=$objp->idp\">$objp->nom</a></td>\n";
print "<td>". strftime("%d %b",$objp->df)."</td>\n";
print '<input type="hidden" name="action" value="addinfacture">';
print '<td><input type="hidden" name="factureid" value="'.$objp->factureid.'">';
print '<input type="text" name="qty" size="2" value="1"></td><td nowrap>'.$langs->trans("Discount");
print '<input type="text" name="remise_percent" size="2" value="0">%';
print '</td><td align="right">';
print '<input type="submit" value="'.$langs->trans("Add").'">';
print '</td>';
print '</tr>';
print '</form>';
$i++;
}
print "</table>";
}
else {
print $langs->trans("NoOtherBills");
}
$db->free($result);
}
else
{
dolibarr_print_error($db);
}
print '</td></tr>';
} }
print '</table>';
} }

16
htdocs/product/photos.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* 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
@ -22,10 +22,10 @@
*/ */
/** /**
\file htdocs/product/fiche.php \file htdocs/product/photos.php
\ingroup product \ingroup product
\brief Page de la fiche produit \brief Onglet photos de la fiche produit
\version $Revision$ \version $Revision$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -78,11 +78,9 @@ if ($_GET["id"])
$product = new Product($db); $product = new Product($db);
$result = $product->fetch($_GET["id"]); $result = $product->fetch($_GET["id"]);
if ( $result ) if ( $result )
{ {
/* /*
* En mode visu * En mode visu
*/ */
@ -162,10 +160,6 @@ else
$db->close(); $db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>"); llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");