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

Trad: Et encore des traductions (stock, factures)

Browse Source
This commit is contained in:
Laurent Destailleur 2005-02-01 21:26:19 +00:00
parent 52eecabbea
commit e538910fee
4 changed files with 47 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
htdocs/compta/index.php
View File

@ -122,7 +122,7 @@ if ($conf->facture->enabled)
{ {
$obj = $db->fetch_object(); $obj = $db->fetch_object();
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td width="92"><a href="facture.php?facid='.$obj->rowid.'">'.img_file().'</a>&nbsp;'; print '<tr '.$bc[$var].'><td width="92"><a href="facture.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),"bill").'</a> ';
print '<a href="facture.php?facid='.$obj->rowid.'">'.$obj->facnumber.'</a></td>'; print '<a href="facture.php?facid='.$obj->rowid.'">'.$obj->facnumber.'</a></td>';
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>'; print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>';
$i++; $i++;
@ -196,7 +196,7 @@ if ( $db->query($sql) )
if ($num) if ($num)
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\"><td colspan=\"2\">Bookmark</td></tr>\n"; print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("Bookmarks")."</td></tr>\n";
$var = True; $var = True;
while ($i < $num) while ($i < $num)
{ {
@ -204,8 +204,7 @@ if ( $db->query($sql) )
$var = !$var; $var = !$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td>'; print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td>';
print '<td align="right"><a href="index.php?action=del_bookmark&amp;bid='.$obj->bid.'">'; print '<td align="right"><a href="index.php?action=del_bookmark&amp;bid='.$obj->bid.'">'.img_delete().'</a></td>';
print '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/editdelete.png" alt="Supprimer" border="0"></a></td>';
print '</tr>'; print '</tr>';
$i++; $i++;
} }
@ -244,8 +243,8 @@ if ($conf->commande->enabled && $user->rights->commande->lire)
{ {
$var=!$var; $var=!$var;
$obj = $db->fetch_object(); $obj = $db->fetch_object();
print "<tr $bc[$var]><td width=\"20%\"><a href=\"commande.php?id=$obj->rowid\">".img_file()."</a>"; print "<tr $bc[$var]><td width=\"20%\"><a href=\"commande.php?id=$obj->rowid\">".img_object($langs->trans("ShowOrder"),"order")."</a>";
print "&nbsp;<a href=\"commande.php?id=$obj->rowid\">$obj->ref</a></td>"; print " <a href=\"commande.php?id=$obj->rowid\">$obj->ref</a></td>";
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>'; print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>';
$i++; $i++;
} }
@ -283,7 +282,8 @@ if ($conf->facture->enabled)
if ($num) if ($num)
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="2">Factures clients impayées ('.$num.')</td><td align="right">Montant HT</td><td align="right">Montant TTC</td><td align="right">Reçu</td></tr>'; print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("BillsCustomersUnpayed").' ('.$num.')</td>';
print '<td align="right">'.$langs->trans("AmountHT").'</td><td align="right">'.$langs->trans("AmountTTC").'</td><td align="right">'.$langs->trans("Received").'</td></tr>';
$var = True; $var = True;
$total_ttc = $totalam = $total = 0; $total_ttc = $totalam = $total = 0;
while ($i < $num) while ($i < $num)
@ -293,9 +293,10 @@ if ($conf->facture->enabled)
if ($i < 20) if ($i < 20)
{ {
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td width="20%"><a href="facture.php?facid='.$obj->rowid.'">'.img_file().'</a>'; print '<tr '.$bc[$var].'><td width="20%"><a href="facture.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),"bill").'</a>';
print '&nbsp;<a href="facture.php?facid='.$obj->rowid.'">'.$obj->facnumber.'</a></td>'; print ' <a href="facture.php?facid='.$obj->rowid.'">'.$obj->facnumber.'</a></td>';
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td>'; print '<td><a href="fiche.php?socid='.$obj->idp.'">'.img_object($langs->trans("ShowCustomer"),"company").'</a>';
print ' <a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td>';
print '<td align="right">'.price($obj->total).'</td>'; print '<td align="right">'.price($obj->total).'</td>';
print '<td align="right">'.price($obj->total_ttc).'</td>'; print '<td align="right">'.price($obj->total_ttc).'</td>';
print '<td align="right">'.price($obj->am).'</td></tr>'; print '<td align="right">'.price($obj->am).'</td></tr>';
@ -306,8 +307,6 @@ if ($conf->facture->enabled)
$i++; $i++;
} }
$var=!$var; $var=!$var;
# print '<tr '.$bc[$var].'><td colspan="2" align="left"><i>'.$langs->trans("Total").':</i></td><td align="right"><i>'.price($total)."</i></td><td align=\"right\"><i>".price($total_ttc)."</i></td><td align=\"right\"><i>".price($totalam)."</i></td></tr>";
# print '<tr '.$bc[!$var].'><td colspan="3" align="left"><i>Reste à encaisser:</i></td><td align="right"><i>'.price($total_ttc-$totalam).'</i></td><td>&nbsp;</td></tr>';
print '<tr '.$bc[$var].'><td colspan="2" align="left"><i>'.$langs->trans("Total").' &nbsp; (Reste à encaisser: '.price($total_ttc-$totalam).')</i></td><td align="right"><i>'.price($total)."</i></td><td align=\"right\"><i>".price($total_ttc)."</i></td><td align=\"right\"><i>".price($totalam)."</i></td></tr>"; print '<tr '.$bc[$var].'><td colspan="2" align="left"><i>'.$langs->trans("Total").' &nbsp; (Reste à encaisser: '.price($total_ttc-$totalam).')</i></td><td align="right"><i>'.price($total)."</i></td><td align=\"right\"><i>".price($total_ttc)."</i></td><td align=\"right\"><i>".price($totalam)."</i></td></tr>";
print "</table><br>"; print "</table><br>";
} }
@ -325,7 +324,7 @@ $result = 0;
if ( $result ) if ( $result )
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="2">Actions à faire</td>'; print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("TasksToDo").'</td>';
print "</tr>\n"; print "</tr>\n";
$var = True; $var = True;
$i = 0; $i = 0;
@ -349,36 +348,43 @@ if ($conf->facture->enabled) {
if ($user->societe_id == 0) if ($user->societe_id == 0)
{ {
$sql = "SELECT ff.rowid, ff.facnumber, ff.libelle, ff.total_ttc"; $sql = "SELECT ff.rowid, ff.facnumber, ff.libelle, ff.total_ht, ff.total_ttc, s.nom, s.idp";
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as ff"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";
$sql .= " WHERE ff.paye=0"; $sql .= " WHERE s.idp = ff.fk_soc";
$sql .= " AND ff.paye=0";
if ( $db->query($sql) ) $result=$db->query($sql);
if ($result)
{ {
$num = $db->num_rows(); $num = $db->num_rows();
if ($num) if ($num)
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="2">Factures fournisseurs à payer ('.$num.')</td><td align="right">Montant TTC</td></tr>'; print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("BillsSuppliersUnpayed").' ('.$num.')</td>';
print '<td align="right">'.$langs->trans("AmountHT").'</td>';
print '<td align="right">'.$langs->trans("AmountTTC").'</td></tr>';
print "</tr>\n"; print "</tr>\n";
$i = 0; $i = 0;
$var = True; $var = True;
$total = $totalam = 0; $total = $total_ttc = $totalam = 0;
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object(); $obj = $db->fetch_object($result);
$var = !$var; $var = !$var;
print '<tr '.$bc[$var].'><td width="20%"><a href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$obj->rowid.'">'.img_file().'</a>'; print '<tr '.$bc[$var].'><td width="20%"><a href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),"bill").'</a>';
print '&nbsp;<a href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$obj->rowid.'">'.$obj->facnumber.'</a></td>'; print '&nbsp;<a href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$obj->rowid.'">'.$obj->facnumber.'</a></td>';
print '<td><a href="../fourn/facture/fiche.php?facid='.$obj->rowid.'">'.$obj->libelle.'</a></td>'; print '<td><a href="fiche.php?socid='.$obj->idp.'">'.img_object($langs->trans("ShowSupplier"),"company").'</a>';
print '<td align="right">'.price($obj->total_ttc).'</td>'; print ' <a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td>';
print '<td align="right">'.price($obj->total_ht).'</td>';
print '<td align="right">'.price($obj->total_ttc).'</td>';
print '</tr>'; print '</tr>';
$total += $obj->total_ttc; $total += $obj->total_ht;
$total_ttc += $obj->total_ttc;
$totalam += $obj->am; $totalam += $obj->am;
$i++; $i++;
} }
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td colspan="2" align="left">Reste à payer : '.price($total-$totalam).'</td><td align="right">'.price($total).'</td></tr>'; print '<tr '.$bc[$var].'><td colspan="2" align="left"><i>'.$langs->trans("Total").' &nbsp; (Reste à payer : '.price($total_ttc-$totalam).')</td><td align="right">'.price($total).'</td><td align="right">'.price($total_ttc).'</td></tr>';
print '</table><br>'; print '</table><br>';
} }
} }

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

@ -3,6 +3,10 @@ Bill=Bill
Bills=Bills Bills=Bills
BillsCustomers=Customers' bills BillsCustomers=Customers' bills
BillsSuppliers=Suppliers' bills BillsSuppliers=Suppliers' bills
BillsCustomersUnpayed=Unpayed customers' bills
BillsSuppliersUnpayed=Unpayed suppliers' bills
BillsUnpayed=Unpayed
BillsStatistics=Bills statistics
CardBill=Bill card CardBill=Bill card
Payment=Payment Payment=Payment
Payments=Payments Payments=Payments
@ -45,4 +49,7 @@ DraftBills=Draft bills
Unpayed=Unpayed Unpayed=Unpayed
ConfirmDeleteBill=Are you sure you want to delete this bill ? ConfirmDeleteBill=Are you sure you want to delete this bill ?
GlobalDiscount=Global discount GlobalDiscount=Global discount
NumberOfBills=Nb of bills
NumberOfBillsByMonth=Nb of bills by month
ShowBill=Show bill

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

@ -42,7 +42,7 @@ AddContact=Add new contact
AddCompany=Add company AddCompany=Add company
DeleteACompany=Delete a company DeleteACompany=Delete a company
PersonalInformations=Personal data PersonalInformations=Personal data
AccountancyCode=Code comptable AccountancyCode=Accountancy code
CustomerCode=Customer code CustomerCode=Customer code
SupplierCode=Supplier code SupplierCode=Supplier code
CustomerAccount=Customer account CustomerAccount=Customer account

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

@ -3,6 +3,10 @@ Bill=Facture
Bills=Factures Bills=Factures
BillsCustomers=Factures clients BillsCustomers=Factures clients
BillsSuppliers=Factures fournisseurs BillsSuppliers=Factures fournisseurs
BillsCustomersUnpayed=Factures clients impayées
BillsSuppliersUnpayed=Factures fournisseurs impayées
BillsUnpayed=Impayées
BillsStatistics=Statistiques factures
CardBill=Fiche facture CardBill=Fiche facture
Payment=Paiement Payment=Paiement
Payments=Paiements Payments=Paiements
@ -44,4 +48,7 @@ AllBills=Toutes les factures
DraftBills=Factures brouillons DraftBills=Factures brouillons
Unpayed=Impayées Unpayed=Impayées
ConfirmDeleteBill=Etes-vous sur de vouloir supprimer cette facture ? ConfirmDeleteBill=Etes-vous sur de vouloir supprimer cette facture ?
GlobalDiscount=Remise globale GlobalDiscount=Remise globale
NumberOfBills=Nb de factures
NumberOfBillsByMonth=Nb de factures par mois
ShowBill=Afficher facture