diff --git a/htdocs/compta/exercices.php3 b/htdocs/compta/exercices.php3 index e800644ee01..65a3941b399 100644 --- a/htdocs/compta/exercices.php3 +++ b/htdocs/compta/exercices.php3 @@ -264,7 +264,6 @@ function ppt ($db, $year, $socidp) { print "CA $year"; print "Delta"; - print ""; $sql = "SELECT sum(f.amount) as sum, round(date_format(f.datef, '%m')) as dm"; @@ -306,7 +305,7 @@ function ppt ($db, $year, $socidp) { $deltat = $deltat + $delta ; print ""; print "".strftime("%B",mktime(12,0,0,$b, 1, $year))."\n"; - print "".price($delta)."\n"; + print "".price($delta)."\n"; print "\n"; } diff --git a/htdocs/compta/fiche.php3 b/htdocs/compta/fiche.php3 index 74124e1304a..790361d0c8b 100644 --- a/htdocs/compta/fiche.php3 +++ b/htdocs/compta/fiche.php3 @@ -166,7 +166,7 @@ if ($socid > 0) { print "
Fiche client : $objsoc->nom
"; print "idp&action=add\">[Bookmark]"; print "idp&action=create\">[Projet]"; - print "idp&action=create\">[Propal]"; + print "idp\">".translate("Bill").""; print "idp\">Notes"; print "[idp&action=edit\">Editer]"; print ""; diff --git a/htdocs/compta/index.php3 b/htdocs/compta/index.php3 index 6cad197ac93..ba6d4fe04d4 100644 --- a/htdocs/compta/index.php3 +++ b/htdocs/compta/index.php3 @@ -53,7 +53,7 @@ if ($action == 'del_bookmark') { $result = $db->query($sql); } -print_titre("Espace compta"); +print_titre(translate("Espace compta")); print ''; @@ -94,7 +94,7 @@ if ( $db->query($sql) ) { */ print '
'; print ""; -print ""; +print ''; print "\n"; $sql = "SELECT count(*) FROM llx_propal WHERE fk_statut = 2"; @@ -109,7 +109,7 @@ print "
Propositions commerciales'.translate("Propositions commerciales").'

"; */ print ''; print ""; -print ""; +print ''; print "\n"; $sql = "SELECT count(*) FROM llx_facture WHERE paye = 0"; diff --git a/htdocs/compta/propal.php3 b/htdocs/compta/propal.php3 index b880d53d1b3..ce3d3658f61 100644 --- a/htdocs/compta/propal.php3 +++ b/htdocs/compta/propal.php3 @@ -1,8 +1,5 @@ - * - * $Id$ - * $Source$ * * 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 @@ -18,6 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * $Id$ + * $Source$ + * */ require("./pre.inc.php3"); diff --git a/htdocs/info.php3 b/htdocs/info.php3 index 0f7751e3bfc..955076d96b9 100644 --- a/htdocs/info.php3 +++ b/htdocs/info.php3 @@ -58,5 +58,7 @@ print '
Factures'.translate("Bills").'
'; $db = new Db(); +?> phpinfo diff --git a/htdocs/langs/fr b/htdocs/langs/fr index 1b0ff9a35bd..5e36d71e7a2 100644 --- a/htdocs/langs/fr +++ b/htdocs/langs/fr @@ -1,7 +1,14 @@ #do not change next line please ! #{@"htmltagoption"=>"nothing","charset"=>"iso-8859-1","name"=>"Français","translator_0"=>"Éric SEIGNE "} Please choose your language=Choisissez votre langue +Add=Ajouter Commercial=Commercial Company=Société Date=Date -User=Utilisateur +Delete=Supprimer +Bills=Factures +Bill=Facture +Propositions commerciales=Propositions commerciales +Espace compta=Espace comptabilité +Author=Auteur +User=Utilisateur \ No newline at end of file diff --git a/htdocs/main.inc.php3 b/htdocs/main.inc.php3 index e7907574eb7..7c3fa3f47b6 100644 --- a/htdocs/main.inc.php3 +++ b/htdocs/main.inc.php3 @@ -47,7 +47,7 @@ $db->close(); if(!isset($application_lang)) $application_lang = "fr"; -$rtplang = new rtplang("langs", "en", "en", $application_lang); +$rtplang = new rtplang($GLOBALS["DOCUMENT_ROOT"]."/langs", "en", "en", $application_lang); $rtplang->debug=1; /* */