From e538910feeb733233cd2cfe33db757f77e1fd596 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 1 Feb 2005 21:26:19 +0000 Subject: [PATCH] Trad: Et encore des traductions (stock, factures) --- htdocs/compta/index.php | 56 +++++++++++++++++-------------- htdocs/langs/en_US/bills.lang | 7 ++++ htdocs/langs/en_US/companies.lang | 2 +- htdocs/langs/fr_FR/bills.lang | 9 ++++- 4 files changed, 47 insertions(+), 27 deletions(-) diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index a3bed8036bc..2ee39dc42e5 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -122,7 +122,7 @@ if ($conf->facture->enabled) { $obj = $db->fetch_object(); $var=!$var; - print ''.img_file().' '; + print ''.img_object($langs->trans("ShowBill"),"bill").' '; print ''.$obj->facnumber.''; print ''.$obj->nom.''; $i++; @@ -196,7 +196,7 @@ if ( $db->query($sql) ) if ($num) { print ''; - print "\n"; + print "\n"; $var = True; while ($i < $num) { @@ -204,8 +204,7 @@ if ( $db->query($sql) ) $var = !$var; print ""; print ''; - print ''; + print ''; print ''; $i++; } @@ -244,8 +243,8 @@ if ($conf->commande->enabled && $user->rights->commande->lire) { $var=!$var; $obj = $db->fetch_object(); - print ""; + print ""; print ''; $i++; } @@ -283,7 +282,8 @@ if ($conf->facture->enabled) if ($num) { print '
Bookmark
".$langs->trans("Bookmarks")."
'.$obj->nom.''; - print 'Supprimer'.img_delete().'
rowid\">".img_file().""; - print " rowid\">$obj->ref
rowid\">".img_object($langs->trans("ShowOrder"),"order").""; + print " rowid\">$obj->ref'.$obj->nom.'
'; - print ''; + print ''; + print ''; $var = True; $total_ttc = $totalam = $total = 0; while ($i < $num) @@ -293,9 +293,10 @@ if ($conf->facture->enabled) if ($i < 20) { $var=!$var; - print ''; - print ''; + print ''; + print ''; print ''; print ''; print ''; @@ -306,8 +307,6 @@ if ($conf->facture->enabled) $i++; } $var=!$var; -# print '"; -# print ''; print '"; print "
Factures clients impayées ('.$num.')Montant HTMontant TTCReçu
'.$langs->trans("BillsCustomersUnpayed").' ('.$num.')'.$langs->trans("AmountHT").''.$langs->trans("AmountTTC").''.$langs->trans("Received").'
'.img_file().''; - print ' '.$obj->facnumber.''.$obj->nom.'
'.img_object($langs->trans("ShowBill"),"bill").''; + print ' '.$obj->facnumber.''.img_object($langs->trans("ShowCustomer"),"company").''; + print ' '.$obj->nom.''.price($obj->total).''.price($obj->total_ttc).''.price($obj->am).'
'.$langs->trans("Total").':'.price($total)."".price($total_ttc)."".price($totalam)."
Reste à encaisser:'.price($total_ttc-$totalam).' 
'.$langs->trans("Total").'   (Reste à encaisser: '.price($total_ttc-$totalam).')'.price($total)."".price($total_ttc)."".price($totalam)."

"; } @@ -325,7 +324,7 @@ $result = 0; if ( $result ) { print ''; - print ''; + print ''; print "\n"; $var = True; $i = 0; @@ -349,36 +348,43 @@ if ($conf->facture->enabled) { if ($user->societe_id == 0) { - $sql = "SELECT ff.rowid, ff.facnumber, ff.libelle, ff.total_ttc"; - $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as ff"; - $sql .= " WHERE ff.paye=0"; + $sql = "SELECT ff.rowid, ff.facnumber, ff.libelle, ff.total_ht, ff.total_ttc, s.nom, s.idp"; + $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff"; + $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(); if ($num) { print '
Actions à faire
'.$langs->trans("TasksToDo").'
'; - print ''; + print ''; + print ''; + print ''; print "\n"; $i = 0; $var = True; - $total = $totalam = 0; + $total = $total_ttc = $totalam = 0; while ($i < $num) { - $obj = $db->fetch_object(); + $obj = $db->fetch_object($result); $var = !$var; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; - $total += $obj->total_ttc; + $total += $obj->total_ht; + $total_ttc += $obj->total_ttc; $totalam += $obj->am; $i++; } $var=!$var; - print ''; + print ''; print '
Factures fournisseurs à payer ('.$num.')Montant TTC
'.$langs->trans("BillsSuppliersUnpayed").' ('.$num.')'.$langs->trans("AmountHT").''.$langs->trans("AmountTTC").'
'.img_file().''; + print '
'.img_object($langs->trans("ShowBill"),"bill").''; print ' '.$obj->facnumber.''.$obj->libelle.''.price($obj->total_ttc).''.img_object($langs->trans("ShowSupplier"),"company").''; + print ' '.$obj->nom.''.price($obj->total_ht).''.price($obj->total_ttc).'
Reste à payer : '.price($total-$totalam).''.price($total).'
'.$langs->trans("Total").'   (Reste à payer : '.price($total_ttc-$totalam).')'.price($total).''.price($total_ttc).'

'; } } diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 40e0e2c1777..f0672a8fb83 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -3,6 +3,10 @@ Bill=Bill Bills=Bills BillsCustomers=Customers' bills BillsSuppliers=Suppliers' bills +BillsCustomersUnpayed=Unpayed customers' bills +BillsSuppliersUnpayed=Unpayed suppliers' bills +BillsUnpayed=Unpayed +BillsStatistics=Bills statistics CardBill=Bill card Payment=Payment Payments=Payments @@ -45,4 +49,7 @@ DraftBills=Draft bills Unpayed=Unpayed ConfirmDeleteBill=Are you sure you want to delete this bill ? GlobalDiscount=Global discount +NumberOfBills=Nb of bills +NumberOfBillsByMonth=Nb of bills by month +ShowBill=Show bill diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index b1c7b5d1d24..435e85bb1be 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -42,7 +42,7 @@ AddContact=Add new contact AddCompany=Add company DeleteACompany=Delete a company PersonalInformations=Personal data -AccountancyCode=Code comptable +AccountancyCode=Accountancy code CustomerCode=Customer code SupplierCode=Supplier code CustomerAccount=Customer account diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index 7b5c2b84dba..4f9746fd693 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -3,6 +3,10 @@ Bill=Facture Bills=Factures BillsCustomers=Factures clients BillsSuppliers=Factures fournisseurs +BillsCustomersUnpayed=Factures clients impayées +BillsSuppliersUnpayed=Factures fournisseurs impayées +BillsUnpayed=Impayées +BillsStatistics=Statistiques factures CardBill=Fiche facture Payment=Paiement Payments=Paiements @@ -44,4 +48,7 @@ AllBills=Toutes les factures DraftBills=Factures brouillons Unpayed=Impayées ConfirmDeleteBill=Etes-vous sur de vouloir supprimer cette facture ? -GlobalDiscount=Remise globale \ No newline at end of file +GlobalDiscount=Remise globale +NumberOfBills=Nb de factures +NumberOfBillsByMonth=Nb de factures par mois +ShowBill=Afficher facture \ No newline at end of file