Skip to content
Snippets Groups Projects
Commit 74ec2a25 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Trad: Traductions messages diverses

parent bf461773
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
htdocs/langs/en_US/bills.lang
+ 1
− 0
View file @ 74ec2a25
......@@ -62,3 +62,4 @@ RemainderToTake=Remainder to take
CreateDraft=Create draft
SendBillRef=Send bill %s
SendReminderBillRef=Send bill %s (reminder)
NoOtherBills=No other drafts bills
htdocs/langs/en_US/main.lang
+ 4
− 1
View file @ 74ec2a25
......@@ -183,4 +183,7 @@ Preview=Preview
NextStep=Next step
PreviousStep=Previous step
None=None
Late=Late
\ No newline at end of file
Late=Late
Photo=Picture
Photos=Pictures
AddPhoto=Add picture
\ No newline at end of file
htdocs/langs/en_US/propal.lang
+ 3
− 1
View file @ 74ec2a25
......@@ -24,4 +24,6 @@ PropalsOpened=Opened
PropalStatusDraft=Draft (need to be validated)
PropalStatusValidated=Validated (proposal is opened)
ListOfProposals=List of commercial proposals
ActionsOnPropal=Tasks on proposal
\ No newline at end of file
ActionsOnPropal=Tasks on proposal
NoOpenedPropals=No opened commercial proposals
NoOtherOpenedPropals=No other opened commercial proposals
\ No newline at end of file
htdocs/langs/fr_FR/bills.lang
+ 2
− 1
View file @ 74ec2a25
......@@ -64,4 +64,5 @@ SendBillRef=Envoi facture %s
SendReminderBillRef=Relance facture %s
ShowBill=Afficher facture
StandingOrders=Prlvements
StandingOrder=Prlvement
\ No newline at end of file
StandingOrder=Prlvement
NoOtherBills=Pas d'autres factures brouillons
\ No newline at end of file
htdocs/langs/fr_FR/main.lang
+ 4
− 1
View file @ 74ec2a25
......@@ -184,4 +184,7 @@ Preview=Aper
NextStep=Etape suivante
PreviousStep=Etape précédente
None=Aucun
Late=Retard
\ No newline at end of file
Late=Retard
Photo=Photo
Photos=Photos
AddPhoto=Ajouter photo
\ No newline at end of file
htdocs/langs/fr_FR/propal.lang
+ 2
− 0
View file @ 74ec2a25
......@@ -25,3 +25,5 @@ PropalStatusDraft=Brouillon (
PropalStatusValidated=Validée (propale ouverte)
ListOfProposals=Liste des devis/propositions commerciales
ActionsOnPropal=Actions sur la proposition
NoOpenedPropals=Pas de propositions ouvertes
NoOtherOpenedPropals=Pas d'autres propositions ouvertes
\ No newline at end of file
htdocs/product/fiche.php
+ 207
− 128
View file @ 74ec2a25
......@@ -424,15 +424,16 @@ else
$sql .=" WHERE pf.fk_soc = s.idp AND pf.fk_product = ".$product->id;
$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;
print '<table class="noborder" width="100%">';
$var=True;
while ($i < $num_fournisseur)
{
$objp = $db->fetch_object($i);
$objp = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]>";
print '<td><a href="../fourn/fiche.php?socid='.$objp->idp.'">'.$objp->nom.'</a></td>';
......@@ -442,7 +443,7 @@ else
$i++;
}
print '</table>';
$db->free();
$db->free($result);
}
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>';
}
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";
/*
* Photo
*
*/
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)
{
$htmls = new Form($db);
$propal = New Propal($db);
print '<table width="100%" class="noborder">';
if($user->rights->propale->creer)
{
print "<tr>".'<td width="50%" valign="top">';
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">';
$sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.ref,".$db->pdate("p.datep")." as dp";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
$sql .=" WHERE p.fk_soc = s.idp AND p.fk_statut = 0 AND p.fk_user_author = ".$user->id;
$sql .= " ORDER BY p.datec DESC, tms DESC";
if ( $db->query($sql) )
{
$num = $db->num_rows();
$i = 0;
print '<table class="noborder" width="100%">';
$var=True;
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>';
print '<td width="50%" valign="top">';
$htmls = new Form($db);
$propal = New Propal($db);
$otherprop = $propal->liste_array(1, '<>'.$user->id);
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 '<table width="100%" class="noborder">';
print '</tr>';
// Propals
if($user->rights->propale->creer)
{
$langs->load("propal");
print '<tr><td width="50%" valign="top">';
print_titre($langs->trans("AddToMyProposals")) . '</td>';
print '<td width="50%" valign="top">';
print_titre($langs->trans("AddToOtherProposals")) . '</td>';
print '</tr>';
// Liste de "Mes propals"
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";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
$sql .=" WHERE p.fk_soc = s.idp AND p.fk_statut = 0 AND p.fk_user_author = ".$user->id;
$sql .= " ORDER BY p.datec DESC, tms 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 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);
}
print '</td>';
// 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");
print "<tr>".'<td width="50%" valign="top">';
print_titre($langs->trans("AddToMyBills"));
print '</td><td width="50%" valign="top">';
print_titre($langs->trans("AddToOtherBills"));
print '</td></tr>';
print "<tr>".'<td width="50%" valign="top">';
$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";
if ( $db->query($sql) )
{
$num = $db->num_rows();
$i = 0;
print '<table class="noborder" width="100%">';
$var=True;
while ($i < $num)
{
$objp = $db->fetch_object( $i);
$var=!$var;
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 '<form method="POST" action="fiche.php?id='.$product->id.'">';
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>Rem.';
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 '</form></tr>';
$i++;
}
print "</table>";
$db->free();
}
else
{
dolibarr_print_error($db);
}
print '</td><td width="50%" valign="top">';
// \todo Ajouter liste des factures autres
print '</td></tr></table>';
$langs->load("bills");
print '<tr><td width="50%" valign="top">';
print_titre($langs->trans("AddToMyBills"));
print '</td><td width="50%" valign="top">';
print_titre($langs->trans("AddToOtherBills"));
print '</td></tr>';
// Liste de Mes factures
print '<tr><td width="50%" valign="top">';
$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 nowrap><a href=\"../compta/facture.php?facid=$objp->factureid\">".img_object($langs->trans("ShowBills"),"bill")." ".$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("NoBills");
}
$db->free($result);
}
else
{
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>';
}
......
htdocs/product/photos.php
+ 5
− 11
View file @ 74ec2a25
<?php
/* 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
* it under the terms of the GNU General Public License as published by
......@@ -22,10 +22,10 @@
*/
/**
\file htdocs/product/fiche.php
\ingroup product
\brief Page de la fiche produit
\version $Revision$
\file htdocs/product/photos.php
\ingroup product
\brief Onglet photos de la fiche produit
\version $Revision$
*/
require("./pre.inc.php");
......@@ -78,10 +78,8 @@ if ($_GET["id"])
$product = new Product($db);
$result = $product->fetch($_GET["id"]);
if ( $result )
{
/*
* En mode visu
......@@ -162,10 +160,6 @@ else
$db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment