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

Trad: Et de la traduction...

Browse Source
This commit is contained in:
Laurent Destailleur 2005-02-13 18:34:29 +00:00
parent 5520f1780b
commit 1e5d0c9d46
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
htdocs/comm/index.php
View File

@ -334,7 +334,7 @@ else
* Derniers contrat * Derniers contrat
* *
*/ */
if ($conf->contrat->enabled && 0) // TODO A REFAIRE DEPUIS NOUVEAU CONTRAT if ($conf->contrat->enabled && 0) // \todo A REFAIRE DEPUIS NOUVEAU CONTRAT
{ {
$langs->load("contracts"); $langs->load("contracts");
@ -385,27 +385,25 @@ if ($conf->contrat->enabled && 0) // TODO A REFAIRE DEPUIS NOUVEAU CONTRAT
if ($conf->propal->enabled) { if ($conf->propal->enabled) {
$sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price, p.ref,".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid"; $sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price, p.ref,".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c WHERE p.fk_soc = s.idp AND p.fk_statut = c.id AND p.fk_statut = 1"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";
if ($socidp) $sql .= " WHERE p.fk_soc = s.idp AND p.fk_statut = c.id AND p.fk_statut = 1";
{ if ($socidp) $sql .= " AND s.idp = $socidp";
$sql .= " AND s.idp = $socidp";
}
$sql .= " ORDER BY p.rowid DESC"; $sql .= " ORDER BY p.rowid DESC";
// $sql .= $db->plimit(5, 0);
if ( $db->query($sql) ) $result=$db->query($sql);
if ($result)
{ {
$total = 0; $total = 0;
$num = $db->num_rows(); $num = $db->num_rows($result);
$i = 0; $i = 0;
if ($num > 0) if ($num > 0)
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="4">Propositions commerciales ouvertes et validées</td></tr>'; print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("ProposalsOpened").'</td></tr>';
$var=false; $var=false;
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object(); $obj = $db->fetch_object($result);
print "<tr $bc[$var]><td width=\"15%\"><a href=\"propal.php?propalid=".$obj->propalid."\">".img_object($langs->trans("ShowPropal"),"propal")." ".$obj->ref."</a></td>"; print "<tr $bc[$var]><td width=\"15%\"><a href=\"propal.php?propalid=".$obj->propalid."\">".img_object($langs->trans("ShowPropal"),"propal")." ".$obj->ref."</a></td>";
print "<td width=\"30%\"><a href=\"fiche.php?socid=$obj->idp\">".img_object($langs->trans("ShowCompany"),"company")." ".$obj->nom."</a></td>\n"; print "<td width=\"30%\"><a href=\"fiche.php?socid=$obj->idp\">".img_object($langs->trans("ShowCompany"),"company")." ".$obj->nom."</a></td>\n";
print "<td align=\"right\">"; print "<td align=\"right\">";
@ -430,15 +428,17 @@ if ($conf->propal->enabled) {
*/ */
if ($conf->propal->enabled) { if ($conf->propal->enabled) {
$NBMAX=5;
$sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price, p.ref,".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid"; $sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price, p.ref,".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c WHERE p.fk_soc = s.idp AND p.fk_statut = c.id AND p.fk_statut > 1"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";
$sql .= " WHERE p.fk_soc = s.idp AND p.fk_statut = c.id AND p.fk_statut > 1";
if ($socidp) if ($socidp)
{ {
$sql .= " AND s.idp = $socidp"; $sql .= " AND s.idp = $socidp";
} }
$sql .= " ORDER BY p.rowid DESC"; $sql .= " ORDER BY p.rowid DESC";
$sql .= $db->plimit(5, 0); $sql .= $db->plimit($NBMAX, 0);
if ( $db->query($sql) ) if ( $db->query($sql) )
{ {
@ -446,7 +446,7 @@ if ($conf->propal->enabled) {
$i = 0; $i = 0;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="6">Les 5 dernières propositions commerciales fermées</td></tr>'; print '<tr class="liste_titre"><td colspan="6">'.$langs->trans("LastClosedProposals",$NBMAX).'</td></tr>';
$var=False; $var=False;
while ($i < $num) while ($i < $num)
{ {
@ -455,7 +455,7 @@ if ($conf->propal->enabled) {
print '<td width="15%">'; print '<td width="15%">';
print '<a href="propal.php?propalid='.$objp->propalid.'">'.img_file().'</a>'; print '<a href="propal.php?propalid='.$objp->propalid.'">'.img_file().'</a>';
print '&nbsp;<a href="propal.php?propalid='.$objp->propalid.'">'.$objp->ref.'</a></td>'; print '&nbsp;<a href="propal.php?propalid='.$objp->propalid.'">'.$objp->ref.'</a></td>';
print "<td width=\"30%\"><a href=\"fiche.php?socid=$objp->idp\">$objp->nom</a></TD>\n"; print "<td width=\"30%\"><a href=\"fiche.php?socid=$objp->idp\">$objp->nom</a></td>\n";
$now = time(); $now = time();
$lim = 3600 * 24 * 15 ; $lim = 3600 * 24 * 15 ;

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

@ -3,6 +3,7 @@ Proposals=Commercial proposals
Proposal=Commercial proposal Proposal=Commercial proposal
ProposalsDraft=Draft commercial proposals ProposalsDraft=Draft commercial proposals
ProposalDraft=Draft commercial proposal ProposalDraft=Draft commercial proposal
ProposalsOpened=Opened commercial proposals
Prop=Commercial proposals Prop=Commercial proposals
NewProp=New commercial proposal NewProp=New commercial proposal
Prospect=Prospect Prospect=Prospect
@ -11,6 +12,7 @@ DeleteProp=Delete commercial proposal
AddProp=Add proposal AddProp=Add proposal
ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ? ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ?
LastPropals=Last %s proposals LastPropals=Last %s proposals
LastClosedProposals=Last %s closed proposals
AllPropals=All proposals AllPropals=All proposals
SearchAProposal=Search a proposal SearchAProposal=Search a proposal
ProposalsStatistics=Commercial proposals' statistics ProposalsStatistics=Commercial proposals' statistics

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

@ -4,6 +4,7 @@ Proposal=Proposition commerciale
ProposalsDraft=Propositions commerciales brouillons ProposalsDraft=Propositions commerciales brouillons
ProposalDraft=Proposition commerciale brouillon ProposalDraft=Proposition commerciale brouillon
Prop=Propositions commerc. Prop=Propositions commerc.
ProposalsOpened=Propositions commerciales ouvertes
NewProp=Nouvelle proposition commerciale NewProp=Nouvelle proposition commerciale
Prospect=Prospect Prospect=Prospect
ProspectList=Liste des prospects ProspectList=Liste des prospects
@ -11,6 +12,7 @@ DeleteProp=Supprimer proposition
AddProp=Créer proposition AddProp=Créer proposition
ConfirmDeleteProp=Etes-vous sûr de vouloir effacer cette proposition commerciale ? ConfirmDeleteProp=Etes-vous sûr de vouloir effacer cette proposition commerciale ?
LastPropals=Les %s dernieres propales LastPropals=Les %s dernieres propales
LastClosedProposals=Les %s dernières propositions commerciales fermées
AllPropals=Toutes les propales AllPropals=Toutes les propales
SearchAProposal=Rechercher une propale SearchAProposal=Rechercher une propale
ProposalsStatistics=Statistiques des propositions commerciales ProposalsStatistics=Statistiques des propositions commerciales