diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php index 18b8f1f6f2c..f826c0e483a 100644 --- a/htdocs/adherents/cotisations.php +++ b/htdocs/adherents/cotisations.php @@ -1,6 +1,7 @@ - * Copyright (C) 2003 Jean-Louis Bergamo + * Copyright (C) 2003 Jean-Louis Bergamo + * Copyright (C) 2004 Laurent Destailleur * * 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 @@ -227,17 +228,16 @@ if ($result) $i++; } $var=!$var; - print ""; - print "Total\n"; - print "".price($total)."\n"; - // print " \n"; - print ""; + print ""; + print "".$langs->trans("Total")."\n"; + print "".price($total)."\n"; + print ""; print_fleche_navigation($page,"cotisations.php","&statut=$statut&sortorder=$sortorder&sortfield=$sortfield",1); - print "\n"; + print "\n"; - print "\n"; + print "\n"; print ""; - print "
\n"; + print "
\n"; } diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 0ff2f4acd8c..4e9e4ceeade 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -23,6 +23,8 @@ */ require("./pre.inc.php"); +$langs->load("companies"); + require(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); require(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); require(DOL_DOCUMENT_ROOT."/adherents/adherent_options.class.php"); @@ -365,16 +367,16 @@ if ($action == 'create') { print ''; - print 'Prénom'; - print 'Nom'; + print ''.$langs->trans("FirstName").''; + print ''.$langs->trans("LastName").''; print 'Societe'; print 'Adresse'; print ''; print 'CP Ville '; print 'Pays'; - print 'Email'; - print 'Login'; - print 'Password'; + print ''.$langs->trans("EMail").''; + print ''.$langs->trans("Login").''; + print ''.$langs->trans("Password").''; print 'Date de Naissance
Format AAAA-MM-JJ'; print 'Url photo'; foreach($adho->attribute_label as $key=>$value){ @@ -409,7 +411,7 @@ if ($action == 'create') { if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE !=0 && defined("ADHERENT_BANK_USE_AUTO") && ADHERENT_BANK_USE_AUTO !=0){ print 'Libelle'; } - print ''; + print ''; print "\n"; print "\n"; diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 2890c2459bf..014433b4e9e 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -23,6 +23,9 @@ */ require("./pre.inc.php"); +$langs->load("companies"); + + llxHeader(); @@ -110,7 +113,7 @@ foreach ($AdherentsAll as $key=>$value){ } $var=!$var; print ""; -print ' Total '; +print ' '.$langs->trans("Total").' '; print ''.$SommeA.''; print ''.$SommeB.''; print ''.$SommeC.''; @@ -132,7 +135,7 @@ print "\n"; print ""; print ''; -print 'Nom/Prénom '; +print $langs->trans("LastName").'/'.$langs->trans("FirstName").' '; print '  '; print ''; diff --git a/htdocs/boutique/commande/ca.php b/htdocs/boutique/commande/ca.php index 2c1a5461cdd..7a4f45d90a8 100644 --- a/htdocs/boutique/commande/ca.php +++ b/htdocs/boutique/commande/ca.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * 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 @@ -39,9 +40,9 @@ $offset = $limit * $page ; print_barre_liste("Liste des commandes", $page, "ca.php"); -print '

'; +print '

'; print ''; -print ''; +print ''; $sql = "SELECT sum(t.value) as value"; $sql .= " FROM ".DB_NAME_OSC.".orders_total as t"; diff --git a/htdocs/boutique/commande/fiche.php b/htdocs/boutique/commande/fiche.php index e501bdd484a..cf418032d2c 100644 --- a/htdocs/boutique/commande/fiche.php +++ b/htdocs/boutique/commande/fiche.php @@ -1,6 +1,7 @@ * Copyright (C) 2003 Éric Seigne + * Copyright (C) 2004 Laurent Destailleur * * 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 @@ -109,7 +110,7 @@ if ($id) print '
DescriptionTotal
'.$langs->trans("LastName").'
'; print ""; print ''; - print ''; + print ''; print "
Frais d\'expéditions'.price($commande->total_ot_shipping).' EUR
Total'.price($commande->total_ot_total).' EUR
'.$langs->trans("LastName").''.price($commande->total_ot_total).' EUR
"; diff --git a/htdocs/boutique/commande/index.php b/htdocs/boutique/commande/index.php index 56382e0ebe9..a046ba9af62 100644 --- a/htdocs/boutique/commande/index.php +++ b/htdocs/boutique/commande/index.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * 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 @@ -50,10 +51,10 @@ if ( $db->query($sql) ) { $num = $db->num_rows(); $i = 0; - print "

"; - print ""; print ''; - print "".''; + print "".''; print "".''; print ""; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 085ffcc8102..2475c1d8243 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -504,7 +504,7 @@ if ($_GET["action"] == 'create') print ''; print ''; print '"; - print '"; + print '"; } elseif ($_GET["commandeid"] > 0) { @@ -512,7 +512,7 @@ if ($_GET["action"] == 'create') print ''; print ''; print '"; - print '"; + print '"; } else { @@ -1531,12 +1531,12 @@ else } if ($num <= $limit) { - // Print total + // Print total print ""; - print ""; - print ""; - print ""; - print ""; + print ""; + print ""; + print ""; + print ""; print ''; print "\n"; } diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index b7e87a0e489..d367bb1820c 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * 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 @@ -289,8 +290,8 @@ else print ''; print ''; - print ''; - print ''; + print ''; + print ''; if ($fac->note) { print '"; @@ -303,7 +304,7 @@ else */ print_titre("Produits"); - print '
NuméroDate"; + print ""; + print "'; + print ''; // print ''; // print ''; print "\n"; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 393cfad66de..0df5d022b39 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -354,8 +354,8 @@ if ($_GET["propalid"]) /* * */ - print ''; - print ''; + print ''; + print ''; /* * */ diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 1d4412e63c1..8ac5866f080 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -264,11 +264,11 @@ if ($_GET["action"] == 'create') print ''; print ''; print '"; - print '"; + print '"; } else { - print ''; + print ''; print ''; print ''; - print ''; - print ''; + print ''; + print ''; if ($commande->note) { print '"; diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php index 4a7be1b774c..f18020c9c5d 100644 --- a/htdocs/compta/bank/budget.php +++ b/htdocs/compta/bank/budget.php @@ -42,7 +42,7 @@ if ($_GET["bid"] == 0) print '
Numéro".$langs->trans("Date").""; print_liste_field_titre("Client","commande.php", "customers_name"); - print 'Total'.$langs->trans("Total").'Statut
Total HT'.price($obj->price).' eurosTotal TTC'.price($propal->total_ttc).' euros
'.$langs->trans("TotalHT").''.price($obj->price).' euros'.$langs->trans("TotalTTC").''.price($propal->total_ttc).' euros
Proposition'.$obj->ref.'
Montant HT'.price($amount).'
TVA'.price($obj->tva)."
Total TTC'.price($obj->total)."
'.$langs->trans("TotalTTC").''.price($obj->total)."
Services/Produits
'.$langs->trans("Services").'/'.$langs->trans("Products").'
'; /* * @@ -504,8 +504,8 @@ else print '
TVA'.price($commande->total_tva).''.MAIN_MONNAIE.'
Total'.price($commande->total_ttc).''.MAIN_MONNAIE.' TTC
'.$langs->trans("TotalTTC").''.price($commande->total_ttc).''.MAIN_MONNAIE.'
Note : '.nl2br($commande->note)."
'; print ""; - echo ''; + echo ''; print "\n"; $sql = "SELECT sum(d.amount) as somme, count(*) as nombre, c.label, c.rowid "; @@ -71,7 +71,7 @@ if ($_GET["bid"] == 0) } $db->free(); - print "".''; + print "".''; print ''; } else @@ -128,7 +128,7 @@ else $total = $total + (0 - $objp->amount); } $db->free(); - print ""; + print ""; } else { diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index 469d2e22fb8..93ef2e61f1d 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -84,7 +84,7 @@ for ($i = 0 ; $i < sizeof($accounts) ; $i++) } $var = !$var; -print "".''; +print "".''; print ''; @@ -120,7 +120,7 @@ print "".'".''; +print "".''; /* diff --git a/htdocs/compta/commande.php b/htdocs/compta/commande.php index 4b04dccd238..7a9cb37e382 100644 --- a/htdocs/compta/commande.php +++ b/htdocs/compta/commande.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * 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 @@ -129,8 +130,8 @@ if ($_GET["id"] > 0) print ''; print ''; - print ''; - print ''; + print ''; + print ''; if ($commande->note) { print '"; @@ -287,7 +288,7 @@ if ($_GET["id"] > 0) $total = $total + $objp->total; $i++; } - print "\n"; + print "\n"; print "
DescriptionNbTotalMoyenneDescriptionNb'.$langs->trans("Total").'Moyenne
Total
'.$langs->trans("Total").''.price($total).' 
Total".price(abs($total))."".MAIN_MONNAIE."
".$langs->trans("Total")."".price(abs($total))."".MAIN_MONNAIE."
Total'.price($total).' 
'.$langs->trans("Total").''.price($total).' 
Dettes
URSSAF'.price /* * Total */ -print "
Total'.price($total).' 
'.$langs->trans("Total").''.price($total).' 
TVA'.price($commande->total_tva).''.MAIN_MONNAIE.'
Total'.price($commande->total_ttc).''.MAIN_MONNAIE.' TTC
'.$langs->trans("TotalTTC").''.price($commande->total_ttc).''.MAIN_MONNAIE.'
Note : '.nl2br($commande->note)."
Total : $total Euros HT
".$langs->trans("TotalHT").": $total ".MAIN_MONNAIE."
"; } $db->free(); diff --git a/htdocs/compta/dons/index.php b/htdocs/compta/dons/index.php index f9aa4e3f50d..c65b4b6e2bb 100644 --- a/htdocs/compta/dons/index.php +++ b/htdocs/compta/dons/index.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * 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 @@ -43,24 +44,24 @@ if ($result) print_titre("Dons"); -print ''; -print ''; +print '
'; +print ''; print ""; print ""; -print "\n"; +print "\n"; $var=True; for ($i = 0 ; $i < 4 ; $i++) { $var=!$var; - print ""; - print ''; - print ''; + print ""; + print ''; + print ''; $total += $somme[$i]; print ""; } -print "".''; +print "".''; print "
 Somme
'.$libelle[$i].''.price($somme[$i]).'
'.$libelle[$i].''.price($somme[$i]).'
Total'.price($total).'
'.$langs->trans("Total").''.price($total).'
"; diff --git a/htdocs/compta/dons/stats.php b/htdocs/compta/dons/stats.php index f4bc1e35c0f..ba1d7e19ffa 100644 --- a/htdocs/compta/dons/stats.php +++ b/htdocs/compta/dons/stats.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * 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 @@ -45,7 +46,7 @@ if ($result) print "
Nombre de dons'.$i.'
Total'.price($total).'
'.$langs->trans("Total").''.price($total).'
Moyenne'.price($total / $i).'
Proposition'.$obj->ref.'
Montant HT'.price($amount).'
TVA'.price($obj->tva)."
Total TTC'.price($obj->total)."
'.$langs->trans("TotalTTC").''.price($obj->total)."
Commande'.$commande->ref.'
Montant HT'.price($commande->total_ht).'
TVA'.price($commande->total_tva)."
Total TTC'.price($commande->total_ttc)."
'.$langs->trans("TotalTTC").''.price($commande->total_ttc)."
Total : ".price($total)."".price($total_ttc)."".price($totalrecu)."".$langs->trans("Total").": ".price($total)."".price($total_ttc)."".price($totalrecu)." 
TVA'.price($fac->total_tva).''.MAIN_MONNAIE.'
Total'.price($fac->total_ttc).''.MAIN_MONNAIE.' TTC
'.$langs->trans("TotalTTC").''.price($fac->total_ttc).''.MAIN_MONNAIE.'
Note : '.nl2br($fac->note)."
'; + print '
'; print ''; print ''; diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 45ed2d585e1..82545a894c2 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -295,7 +295,7 @@ if ($_GET["action"] == 'create') { // Print total print ""; - print ''; + print ''; print ""; print ""; print ""; diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index 516f15fbafb..b7d162ce971 100755 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2004 Laurent Destailleur * * 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 @@ -315,7 +315,7 @@ if ($_GET["action"] == 'create') { // Print total print ""; - print ''; + print ''; print ""; print ""; print ""; diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index 68f670f34c9..69051303381 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -258,7 +258,7 @@ if ($_GET["propalid"]) $total = $total + $objp->total; $i++; } - print "\n"; + print "\n"; print "
RéfProduitPrixRemiseQté.
Total :'.$langs->trans("TotalTTC").':".price($total_ttc)."".price($totalrecu)."".price($total_ttc - $totalrecu)."
Total :'.$langs->trans("TotalTTC").':".price($total_ttc)."".price($totalrecu)."".price($total_ttc - $totalrecu)."
Total : $total Euros HT
".$langs->trans("TotalHT").": $total ".MAIN_MONNAIE."
"; $db->free(); } diff --git a/htdocs/compta/stats/prev.php b/htdocs/compta/stats/prev.php index b5dd6ded9be..e2105d700bd 100644 --- a/htdocs/compta/stats/prev.php +++ b/htdocs/compta/stats/prev.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * 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 @@ -58,7 +59,7 @@ function pt ($db, $sql, $title) { $total = $total + $obj->amount; $i++; } - print "Total : ".price($total)." ".MAIN_MONNAIE." HT"; + print "".$langs->trans("TotalHT").": ".price($total)." ".MAIN_MONNAIE.""; $db->free(); } diff --git a/htdocs/compta/tva.php b/htdocs/compta/tva.php index d88905ac455..2d5c82585ea 100644 --- a/htdocs/compta/tva.php +++ b/htdocs/compta/tva.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * $Id$ * $Source$ @@ -53,7 +54,7 @@ function pt ($db, $sql, $date) { $i++; } - print "Total :".price($total)."euros HT"; + print "".$langs->trans("TotalHT").":".price($total)."".MAIN_MONNAIE.""; print ""; $db->free(); diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index 2f15d4ea5aa..e99d03e7864 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -171,7 +171,7 @@ for ($y = $year_current ; $y >= $year_start ; $y=$y-1 ) { $subtotal = 0; } } - print 'Total :'.price($total).''; + print ''.$langs->trans("Total").':'.price($total).''; print " \n"; print ""; diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php index a80dafa8bbe..b3f4d93062f 100644 --- a/htdocs/compta/tva/reglement.php +++ b/htdocs/compta/tva/reglement.php @@ -46,8 +46,8 @@ if ($result) print '
'; print ''; print ''; - print ""; - print ""; + print ""; + print ""; print "\n"; print "\n"; $var=1; @@ -64,8 +64,8 @@ if ($result) $i++; } - print ""; - print ""; + print ""; + print ""; print "
DateMontant".$langs->trans("Date")."".$langs->trans("Amount")." 
Total :".price($total)."euros HT
".$langs->trans("TotalHT").":".price($total)."".MAIN_MONNAIE."
"; $db->free(); diff --git a/htdocs/compta/voyage/reduc.php b/htdocs/compta/voyage/reduc.php index 39e6c657330..e8ae93e9e6d 100644 --- a/htdocs/compta/voyage/reduc.php +++ b/htdocs/compta/voyage/reduc.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * 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 @@ -62,7 +63,7 @@ if ($result) { $db->free(); } -print "Total :"; +print "".$langs->trans("TotalHT").":"; print "".price($total)."\n"; diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 1f081248479..016f97f27ac 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -337,7 +337,7 @@ else print 'LibelléP.U. HTQuantitéTotal HT'; print 'Taux TVA'; print 'TVA'; - print 'Total TTC '; + print ''.$langs->trans("TotalTTC").' '; for ($i = 0 ; $i < sizeof($fac->lignes) ; $i++) { print "".''.$fac->lignes[$i][0].""; @@ -410,9 +410,9 @@ else print "Auteur$authorfullname"; print "Statut".$fac->LibStatut($fac->paye,$fac->statut).""; - print "".' Total HT'.price($fac->total_ht).""; + print "".' '.$langs->trans("TotalHT").''.price($fac->total_ht).""; print 'TVA'.price($fac->total_tva).""; - print "".' Total TTC'.price($fac->total_ttc).""; + print "".' '.$langs->trans("TotalTTC").''.price($fac->total_ttc).""; if (strlen($fac->note)) { print "".'Commentaires'; @@ -500,7 +500,7 @@ else print 'LibelléP.U. HTQantitéTotal HT'; print 'Taux TVA'; print 'TVA'; - print 'Total TTC'; + print ''.$langs->trans("TotalTTC").''; $var=1; for ($i = 0 ; $i < sizeof($fac->lignes) ; $i++) { diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index c334acfe639..cb2e3f7745c 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -4,7 +4,7 @@ Company=Company Companies=Companies Name=Name LastName=Lastname -Firstname=Firstname +FirstName=Firstname Surname=Surname/Pseudo Address=Addrese State=State diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index dd4adb6622a..4afce836ad7 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -54,3 +54,8 @@ Cut=Cut Copy=Copy Paste=Paste Default=Default +Amount=Montant +Total=Total +TotalHT=Total HT +TotalTTC=Total TTC +Delta=Delta diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index eb0fcb29371..313be4466ea 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -53,4 +53,9 @@ Second=Seconde Cut=Couper Copy=Copier Paste=Coller -Default=Defaut \ No newline at end of file +Default=Defaut +Amount=Amount +Total=Total +TotalHT=Total HT +TotalTTC=Total TTC +Delta=Ecart \ No newline at end of file diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 2d801743182..26b116afaac 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -153,7 +153,7 @@ if ($_GET["id"]) $i++; } } - print 'Total : '.$total.""; + print ''.$langs->trans("Total").':'.$total.""; diff --git a/htdocs/projet/commandes.php b/htdocs/projet/commandes.php index 852a5978302..fd7f46f2b74 100644 --- a/htdocs/projet/commandes.php +++ b/htdocs/projet/commandes.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * 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 @@ -85,8 +86,8 @@ if (sizeof($commandes)>0 && is_array($commandes)) } print ''.$i.' commandes '; - print 'Total : '.price($total).''; - print ''.MAIN_MONNAIE.' HT'; + print ''.$langs->trans("TotalHT").': '.price($total).''; + print ''.MAIN_MONNAIE.''; print ""; } diff --git a/htdocs/public/dons/depenses_code.php b/htdocs/public/dons/depenses_code.php index fc6dc43e3c8..11d0f214acc 100644 --- a/htdocs/public/dons/depenses_code.php +++ b/htdocs/public/dons/depenses_code.php @@ -1,6 +1,7 @@ +/* Copyright (C) 2003 Rodolphe Quiedeville * Copyright (C) 2003 Association FSF France + * Copyright (C) 2004 Laurent Destailleur * * 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 @@ -90,7 +91,7 @@ if ( $db->query( $sql) ) $var=!$var; print ""; - print 'Total : '.number_format($total,2,'.',' ').' euros'; + print ''.$langs->trans("Total").': '.number_format($total,2,'.',' ').' euros'; print "";