diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index f81d3a88750..7acec1b1b40 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-2005 Laurent Destailleur * Copyright (C) 2004 Christophe Combelles * * This program is free software; you can redistribute it and/or modify @@ -416,7 +416,7 @@ else */ print ''; print ""; - print "\n"; + print "\n"; print ""; print '\n"; print '"; - print "\n"; + print "\n"; print "\n"; print ''; print '
".$langs->trans("Company")."socidp\">$fac->socnomsocidp\">Autres facturessocidp\">".$langs->trans("OtherBills")."
'.$langs->trans("Date")."".dolibarr_print_date($fac->datep,"%A %d %B %Y")."
'.$langs->trans("Label").''; diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php index 42cc3367248..d4bd54daedc 100644 --- a/htdocs/fourn/facture/index.php +++ b/htdocs/fourn/facture/index.php @@ -155,8 +155,8 @@ if ($result) $var=!$var; print "
facid\">".img_file()."\n"; - print " facid\">$obj->facnumberfacid\">".img_object($langs->trans("ShowBill"),"bill")."\n"; + print " facid\">$obj->facnumber".strftime("%d %b %Y",$obj->datef)."'.stripslashes("$obj->libelle").''; diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index 2b92b8dc280..24a54c8e058 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -62,7 +62,7 @@ if ( $societe->fetch($socid) ) $addons[0][1] = $societe->nom; - llxHeader('','Fiche Fournisseur : '.$societe->nom, $addons); + llxHeader('',$langs->trans("SupplierCard").' : '.$societe->nom, $addons); /* * Affichage onglets @@ -121,7 +121,7 @@ if ( $societe->fetch($socid) ) * * */ - print ''; + print '
'; print '
'; /* * @@ -146,10 +146,11 @@ if ( $societe->fetch($socid) ) * */ if ($conf->produit->enabled || $conf->service->enabled) { + $langs->load("products"); print ''; $var=!$var; print ""; - print ''; + print ''; print '
Liste des produits et services
'.$langs->trans("ProductsAndServices").'

'; } @@ -172,7 +173,7 @@ if ( $societe->fetch($socid) ) { print ''; print ""; - print ""; + print ""; } while ($i < $num && $i < 5) { @@ -212,9 +213,13 @@ if ( $societe->fetch($socid) ) * Liste des factures associées * */ + $langs->load("bills"); + + $max=5; + $sql = "SELECT p.rowid,p.libelle,p.facnumber,".$db->pdate("p.datef")." as df, total_ttc as amount, paye"; $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as p WHERE p.fk_soc = $societe->id"; - $sql .= " ORDER BY p.datef DESC LIMIT 4"; + $sql .= " ORDER BY p.datef"; if ( $db->query($sql) ) { $var=!$var; @@ -224,9 +229,11 @@ if ( $societe->fetch($socid) ) { print '
id\">Dernières commandes ($num)
id\">".$langs->trans("LastOrders",$num)."
'; print ""; - print ""; + print ""; } - while ($i < $num && $i < 5) + while ($i < $num && $i < $max) { $obj = $db->fetch_object(); $var=!$var; @@ -234,7 +241,7 @@ if ( $societe->fetch($socid) ) print ""; print ''; + print img_object($langs->trans("ShowBill"),"bill")." ".$obj->facnumber.' '.substr($obj->libelle,0,40).'...'; print ""; print ''; $fac = new FactureFourn($db); diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index f0672a8fb83..543e1a397dd 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -44,7 +44,10 @@ NewBill=New bill Prélèvements=Prelevment Prélèvements=Prelevments LastBills=Last %s bills +LastCustomersBills=Last %s customers bills +LastSuppliersBills=Last %s suppliers bills AllBills=All bills +OtherBills=Other bills DraftBills=Draft bills Unpayed=Unpayed ConfirmDeleteBill=Are you sure you want to delete this bill ? diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index 4f9746fd693..ff1ce33cf62 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -44,7 +44,10 @@ NewBill=Nouvelle facture Prélèvements=Prélèvement Prélèvements=Prélèvements LastBills=Les %s dernieres factures +LastCustomersBills=Les %s dernieres factures clientes +LastSuppliersBills=Les %s dernieres factures fournisseurs AllBills=Toutes les factures +OtherBills=Autres factures DraftBills=Factures brouillons Unpayed=Impayées ConfirmDeleteBill=Etes-vous sur de vouloir supprimer cette facture ?
id\">Dernières factures fournisseurs ($num)
"; + print "
".$langs->trans("LastSuppliersBills",min($num,$max))."id\">".$langs->trans("AllBills")." (".$num.")
"; + print "
'; print ''; - print $obj->facnumber.' '.substr($obj->libelle,0,40).'...".dolibarr_print_date($obj->df)."'.$obj->amount.'