diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index d49116c8f15741ac77cedcf236ed737d9cea7190..e25cfe61ac929e8ab32ef0a74c5ca925808ce734 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -444,7 +444,7 @@ if ($action == 'create')
print '<input name="num_chq" type="text" size="6">';
print "</td></tr>\n";
}
- print '<tr><td>'.$langs->trans("Subscription").'</td><td><input type="text" name="cotisation" size="6"> euros</td></tr>';
+ print '<tr><td>'.$langs->trans("Subscription").'</td><td><input type="text" name="cotisation" size="6">'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE !=0 && defined("ADHERENT_BANK_USE_AUTO") && ADHERENT_BANK_USE_AUTO !=0){
print '<tr><td>'.$langs->trans("Label").'</td><td><input name="label" type="text" size=20 value="'.$langs->trans("Subscription").' " ></td></tr>';
@@ -760,7 +760,7 @@ if ($rowid)
print '<input name="num_chq" type="text" size="6">';
print "</td></tr>\n";
}
- print '<tr><td>Cotisation</td><td><input type="text" name="cotisation" size="6"> euros</td></tr>';
+ print '<tr><td>'.$langs->trans("Subscription").'</td><td><input type="text" name="cotisation" size="6"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE !=0 &&
defined("ADHERENT_BANK_USE_AUTO") && ADHERENT_BANK_USE_AUTO !=0){
print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2"><input name="label" type="text" size=20 value="Cotisation '.stripslashes($adh->prenom).' '.stripslashes($adh->nom).' '.strftime("%Y",$adh->datefin).'" ></td></tr>';
diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php
index 73aeb99762cec7e8a7a69921ac310930f3c3f327..20359a36d354cda9c3760243b42cdb4b029b129d 100644
--- a/htdocs/compta/dons/fiche.php
+++ b/htdocs/compta/dons/fiche.php
@@ -220,7 +220,7 @@ if ($_GET["action"] == 'create') {
print "<tr $bc[1]>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td><input type="text" name="cp" size="8"> <input type="text" name="ville" size="40"></td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Country").'</td><td><input type="text" name="pays" size="40"></td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" size="40"></td></tr>';
- print "<tr $bc[1]>".'<td>'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10"> euros</td></tr>';
+ print "<tr $bc[1]>".'<td>'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print "<tr $bc[1]>".'<td colspan="3" align="center"><input type="submit" value="'.$langs->trans("Save").'"></td></tr>';
print "</table>\n";
print "</form>\n";
@@ -297,7 +297,7 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit')
print "<tr $bc[1]>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td><input type="text" name="cp" size="8" value="'.$don->cp.'"> <input type="text" name="ville" size="40" value="'.$don->ville.'"></td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Country").'</td><td><input type="text" name="pays" size="40" value="'.$don->pays.'"></td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" size="40" value="'.$don->email.'"></td></tr>';
- print "<tr $bc[1]>".'<td>'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.$don->amount.'"> euros</td></tr>';
+ print "<tr $bc[1]>".'<td>'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.$don->amount.'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print "<tr $bc[1]><td>".$langs->trans("PaymentMode")."</td><td>\n";
$paiement = new Paiement($db);
@@ -362,7 +362,7 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit')
print "<tr $bc[1]>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>'.$don->cp.' '.$don->ville.'</td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Country").'</td><td>'.$don->pays.'</td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("EMail").'</td><td>'.$don->email.'</td></tr>';
- print "<tr $bc[1]>".'<td>'.$langs->trans("Amount").'</td><td>'.price($don->amount).' euros</td></tr>';
+ print "<tr $bc[1]>".'<td>'.$langs->trans("Amount").'</td><td>'.price($don->amount).' '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
if ($don->statut == 1)
{
print "<tr $bc[1]><td>".$langs->trans("PaymentMode")."</td><td>";
diff --git a/htdocs/compta/dons/formulaire/fsfe.fr.php b/htdocs/compta/dons/formulaire/fsfe.fr.php
index d2c767f0e1b23fe1d8a46f5a9d911849f7968f02..da3b7c88218c0ba04b83a9372684b518bc569947 100644
--- a/htdocs/compta/dons/formulaire/fsfe.fr.php
+++ b/htdocs/compta/dons/formulaire/fsfe.fr.php
@@ -193,7 +193,7 @@ $don->fetch($_GET["rowid"]);
</td>
</tr>
</table>
- Somme en toutes lettres (<b>en euros</b>): <?php print transcoS2L(number_format($don->amount, 2, ',', ' '), "euros"); ?><br>
+ Somme en toutes lettres (<b><?php print $langs->trans("Currency".$conf->monnaie); ?></b>): <?php print transcoS2L(number_format($don->amount, 2, ',', ' '), "euros"); ?><br>
Date du paiement : <?php print strftime("%d %B %Y", $don->date); ?> <br>
Mode de versement :
<table width="100%">
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 28260cdcbc8303e5ac89ff335a899b04dc4b9b80..e5a0be174c541d71b1cb9c7f661726c4109ff6b3 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -196,8 +196,6 @@ if ($_POST["action"] == 'add')
}
else
{
- print "<p><b>Erreur : la facture n'a pas �t� cr��e, v�rifier le num�ro !</b>";
- print "<p>Retour � la <a href=\"propal.php?propalid=$propalid\">propale</a>";
dolibarr_print_error($db);
}
}
@@ -968,7 +966,7 @@ else
print '<a href="'.DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"),"payment").'</a>';
print " ".strftime("%d %B %Y",$objp->dp)."</td>\n";
print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
- print '<td align="right">'.price($objp->amount)."</td><td>".$conf->monnaie."</td>\n";
+ print '<td align="right">'.price($objp->amount)."</td><td>".$langs->trans("Currency".$conf->monnaie)."</td>\n";
print "</tr>";
$totalpaye += $objp->amount;
$i++;
@@ -976,13 +974,13 @@ else
if ($fac->paye == 0)
{
- print "<tr><td colspan=\"2\" align=\"right\">".$langs->trans("AlreadyPayed")." :</td><td align=\"right\"><b>".price($totalpaye)."</b></td><td>".$conf->monnaie."</td></tr>\n";
- print "<tr><td colspan=\"2\" align=\"right\">Factur� :</td><td align=\"right\" style=\"border: 1px solid;\">".price($fac->total_ttc)."</td><td>".MAIN_MONNAIE."</td></tr>\n";
+ print "<tr><td colspan=\"2\" align=\"right\">".$langs->trans("AlreadyPayed")." :</td><td align=\"right\"><b>".price($totalpaye)."</b></td><td>".$langs->trans("Currency".$conf->monnaie)."</td></tr>\n";
+ print "<tr><td colspan=\"2\" align=\"right\">Factur� :</td><td align=\"right\" style=\"border: 1px solid;\">".price($fac->total_ttc)."</td><td>".$langs->trans("Currency".$conf->monnaie)."</td></tr>\n";
$resteapayer = $fac->total_ttc - $totalpaye;
print "<tr><td colspan=\"2\" align=\"right\">".$langs->trans("RemainderToPay")." :</td>";
- print "<td align=\"right\" style=\"border: 1px solid;\" bgcolor=\"#f0f0f0\"><b>".price($resteapayer)."</b></td><td>".$conf->monnaie."</td></tr>\n";
+ print "<td align=\"right\" style=\"border: 1px solid;\" bgcolor=\"#f0f0f0\"><b>".price($resteapayer)."</b></td><td>".$langs->trans("Currency".$conf->monnaie)."</td></tr>\n";
}
print "</table>";
$db->free($result);
@@ -1010,12 +1008,12 @@ else
print '<tr><td height=\"10\">'.$langs->trans("AmountHT").'</td>';
print '<td align="right" colspan="2"><b>'.price($fac->total_ht).'</b></td>';
- print '<td>'.$conf->monnaie.'</td></tr>';
+ print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print '<tr><td height=\"10\">'.$langs->trans("VAT").'</td><td align="right" colspan="2">'.price($fac->total_tva).'</td>';
- print '<td>'.$conf->monnaie.'</td></tr>';
+ print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print '<tr><td height=\"10\">'.$langs->trans("AmountTTC").'</td><td align="right" colspan="2">'.price($fac->total_ttc).'</td>';
- print '<td>'.$conf->monnaie.'</td></tr>';
+ print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print '<tr><td height=\"10\">'.$langs->trans("Status").'</td><td align="left" colspan="3">'.($fac->getLibStatut()).'</td></tr>';
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 5f6bc3420745021812e3f5da6409cc91ed7851f7..93ba2d39a38353d04faef2cce4faeb5ee8f45473 100755
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -179,7 +179,7 @@ if ($_GET["action"] == 'create')
print '<tr><td>'.$langs->trans("Label").' :</td><td colspan="2">'.$charge->lib."</td></tr>\n";
print "<tr><td>Date �ch�ance :</td><td colspan=\"2\">".dolibarr_print_date($charge->date_ech)."</td></tr>\n";
- print '<tr><td>'.$langs->trans("AmountTTC").":</td><td colspan=\"2\">".price($charge->amount)." euros</td></tr>";
+ print '<tr><td>'.$langs->trans("AmountTTC").":</td><td colspan=\"2\">".price($charge->amount).' '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
$sql = "SELECT sum(p.amount) FROM ".MAIN_DB_PREFIX."paiementcharge as p WHERE p.fk_charge = $chid;";
$result = $db->query($sql);
@@ -187,7 +187,7 @@ if ($_GET["action"] == 'create')
$sumpayed = $db->result(0,0);
$db->free();
}
- print '<tr><td>'.$langs->trans("AlreadyPayed").'</td><td colspan="2"><b>'.price($sumpayed).'</b> euros</td></tr>';
+ print '<tr><td>'.$langs->trans("AlreadyPayed").'</td><td colspan="2"><b>'.price($sumpayed).'</b> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print "<tr class=\"liste_titre\"><td colspan=\"3\">".$langs->trans("Payment").'</td>';
@@ -210,7 +210,7 @@ if ($_GET["action"] == 'create')
$html->select_comptes($charge->accountid, "accountid", 0, "courant=1"); // Affiche liste des comptes courant
print '</td></tr>';
- print "<tr><td valign=\"top\">".$langs->trans("RemainderToPay").":</td><td><b>".price($total - $sumpayed)."</b> euros TTC</td></tr>\n";
+ print "<tr><td valign=\"top\">".$langs->trans("RemainderToPay").":</td><td><b>".price($total - $sumpayed).'</b> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
// print "<tr><td valign=\"top\">Montant :</td><td><input name=\"amount\" type=\"text\"></td></tr>\n";
/*
diff --git a/htdocs/compta/pointmort.php b/htdocs/compta/pointmort.php
index 4878b92835ae554c791366015eb2f6fdcf35cd1f..c6d606bdfb5681b454257ed1f9664e54381f60b6 100644
--- a/htdocs/compta/pointmort.php
+++ b/htdocs/compta/pointmort.php
@@ -151,7 +151,7 @@ function ppt ($db) {
$xdate = mktime(0, 0, 0, date("m", $xdate + (33 * 24 * 3600)), 1 , date("Y", $xdate + (33 * 24 * 3600))) ;
$i++;
}
- print "<tr><td colspan=\"2\" align=\"right\">Totaux en euros :</td><td align=\"right\">$totalca</td>";
+ print "<tr><td colspan=\"2\" align=\"right\">Totaux:</td><td align=\"right\">$totalca</td>";
print "<td align=\"right\">$totalpm</td><td align=\"right\" bgcolor=\"#f0f0f0\">$pmt</td>";
print "<td colspan=\"4\"> </td></tr>";
print "</table>";
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index c32dde55f3faad709a5da64e5af8e950145d55a6..2c6396ad4f07a4e3e9d21137cc0dfebb3212e8fe 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -107,7 +107,7 @@ if ($result)
print '<td align="center">'.strftime("%d/%m/%Y",$obj->datec)."</td>\n";
- print '<td align="right">'.price($obj->amount)." euros</td>\n";
+ print '<td align="right">'.price($obj->amount).' '.$langs->trans("Currency".$conf->monnaie).'</td>\n";
print "</tr>\n";
$i++;
diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php
index ddaf8f6978f1476e0de2ed9734ab072731c9d6e5..966b25af51283d9896ae2a4bcdf18c1f486912ec 100644
--- a/htdocs/compta/prelevement/liste.php
+++ b/htdocs/compta/prelevement/liste.php
@@ -131,7 +131,7 @@ if ($result)
print '<td><a href="fiche.php?id='.$obj->rowid.'">'.stripslashes($obj->nom)."</a></td>\n";
print '<td align="center">'.strftime("%d/%m/%Y",$obj->datec)."</td>\n";
- print '<td align="right">'.price($obj->amount)." euros</td>\n";
+ print '<td align="right">'.price($obj->amount).' '.$langs->trans("Currency".$conf->monnaie).'</td>\n";
print '<td align="center"><a href="fiche.php?id='.$obj->rowid.'">'.$obj->code_client."</a></td>\n";
print "</tr>\n";
$i++;
diff --git a/htdocs/compta/prelevement/rejet-prelevement.class.php b/htdocs/compta/prelevement/rejet-prelevement.class.php
index 2adc9b1f8b19ac8b78096a817b43e75cb61d9b48..5a00f1c4fe72d2c42848843e8228001a6d0a0b20 100644
--- a/htdocs/compta/prelevement/rejet-prelevement.class.php
+++ b/htdocs/compta/prelevement/rejet-prelevement.class.php
@@ -201,7 +201,7 @@ class RejetPrelevement
$from = $this->user->fullname." <".$this->user->email.">";
$message = "Bonjour,\n";
- $message .= "\nLe pr�l�vement de la facture ".$fac->ref." pour le compte de la soci�t� ".$soc->nom." d'un montant de ".price($fac->total_ttc)." euros a �t� rejet� par la banque.";
+ $message .= "\nLe pr�l�vement de la facture ".$fac->ref." pour le compte de la soci�t� ".$soc->nom." d'un montant de ".price($fac->total_ttc).' '.$langs->trans("Currency".$conf->monnaie).' a �t� rejet� par la banque.";
$message .= "\n\n--\n".$this->user->fullname;
diff --git a/htdocs/compta/stats/comp.php b/htdocs/compta/stats/comp.php
index e23dd5a5ef838a1df3cb47df80393343831e0d0e..141f9b8236d1ab96bd6b09c3b35bc0f4af3a81f0 100644
--- a/htdocs/compta/stats/comp.php
+++ b/htdocs/compta/stats/comp.php
@@ -50,8 +50,8 @@ function propals ($db, $year, $month) {
$oldstatut = $objp->statut;
if ($i > 0) {
- print "<tr><td align=\"right\" colspan=\"4\">Total : <b>".price($subtotal)."</b></td>\n";
- print "<td align=\"left\">Euros HT</td></tr>\n";
+ print "<tr><td align=\"right\" colspan=\"4\">".$langs->trans("Total").": <b>".price($subtotal)."</b></td>\n";
+ print "<td align=\"left\">".$langs->trans("Currency".$conf->monnaie)."</td></tr>\n";
}
$subtotal = 0;
@@ -83,11 +83,11 @@ function propals ($db, $year, $month) {
$i++;
}
- print "<tr><td align=\"right\" colspan=\"4\">Total : <b>".price($subtotal)."</b></td>\n";
- print "<td align=\"left\">Euros HT</td></tr>\n";
+ print "<tr><td align=\"right\" colspan=\"4\">".$langs->trans("Total").": <b>".price($subtotal)."</b></td>\n";
+ print "<td align=\"left\">".$langs->trans("Currency".$conf->monnaie)."</td></tr>\n";
print "<tr>";
- print "<td colspan=\"3\" align=\"right\"><b>Total : ".price($total)."</b></td>";
- print "<td align=\"left\"><b>Euros HT</b></td></tr>";
+ print "<td colspan=\"3\" align=\"right\"><b>".$langs->trans("Total").": ".price($total)."</b></td>";
+ print "<td align=\"left\"><b>".$langs->trans("Currency".$conf->monnaie)."</b></td></tr>";
print "</table>";
$db->free();
diff --git a/htdocs/compta/voyage/index.php b/htdocs/compta/voyage/index.php
index fa033f0c33c4bf56acca0be1f835638d97cc2817..01207f5abf74c7a20d86dc5734298b3d9643dd9d 100644
--- a/htdocs/compta/voyage/index.php
+++ b/htdocs/compta/voyage/index.php
@@ -130,7 +130,7 @@ if ($result) {
print "</select></td>";
- print "<td><input name=\"reduc\" type=\"text\" size=6 value=0.00>euros</td><td> </td>";
+ print '<td><input name="reduc" type="text" size="6" value="0.00">'.$langs->trans("Currency".$conf->monnaie).'</td><td> </td>';
print '</tr>';
print "</table></form>";
diff --git a/htdocs/expedition/mods/methode_expedition.modules.php b/htdocs/expedition/mods/methode_expedition.modules.php
index a7458bda8a97bbbdc6bef310f02c369ed1cd97c8..29bfe2e3c78a7d18bf7ca760b2ea4f0aff1e7dca 100644
--- a/htdocs/expedition/mods/methode_expedition.modules.php
+++ b/htdocs/expedition/mods/methode_expedition.modules.php
@@ -200,7 +200,7 @@ Class methode_expedition
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10);
- $titre = "Montants exprim�s en euros";
+ $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
}
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 918817a138af10b24887b9b26b867c571bfdd7e7..4959cdcd7f959b5bd9e0bb60accaa3c71f57285c 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -116,7 +116,7 @@ if ($action == 'create')
print '<a href="fiche.php?facid='.$facid.'">'.$obj->facnumber.'</a></td></tr>';
print "<tr><td>".$langs->trans("Company")." :</td><td colspan=\"2\">$obj->nom</td></tr>";
- print "<tr><td>".$langs->trans("AmountTTC")." :</td><td colspan=\"2\">".price($obj->total_ttc)." euros</td></tr>";
+ print "<tr><td>".$langs->trans("AmountTTC")." :</td><td colspan=\"2\">".price($obj->total_ttc).' '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
$sql = "SELECT sum(p.amount) FROM ".MAIN_DB_PREFIX."paiementfourn as p WHERE p.fk_facture_fourn = $facid;";
$result = $db->query($sql);
@@ -124,7 +124,7 @@ if ($action == 'create')
$sumpayed = $db->result(0,0);
$db->free();
}
- print '<tr><td>'.$langs->trans("AlreadyPayed").' :</td><td colspan="2"><b>'.price($sumpayed).'</b> euros</td></tr>';
+ print '<tr><td>'.$langs->trans("AlreadyPayed").' :</td><td colspan="2"><b>'.price($sumpayed).'</b> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print "<tr class=\"liste_titre\"><td colspan=\"3\">".$langs->trans("Payment")."</td>";
@@ -188,7 +188,7 @@ if ($action == 'create')
print "</select>";
print "</td></tr>\n";
- print "<tr><td valign=\"top\">".$langs->trans("RemainderToPay")." :</td><td><b>".price($total - $sumpayed)."</b> euros</td></tr>\n";
+ print "<tr><td valign=\"top\">".$langs->trans("RemainderToPay")." :</td><td><b>".price($total - $sumpayed).'</b> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print "<tr><td valign=\"top\">".$langs->trans("AmountTTC")." :</td><td><input name=\"amount\" type=\"text\" value=\"".($total - $sumpayed)."\"></td></tr>\n";
print '<tr><td colspan="3" align="center"><input type="submit" value="'.$langs->trans("Save").'"></td></tr>';
print "</form>\n";
diff --git a/htdocs/includes/modules/facture/pdf_adytek.modules.php b/htdocs/includes/modules/facture/pdf_adytek.modules.php
index b09777bb63cb476e034d1c0ed8929f803c84fbc4..3ede5272a22df04258203f7bb639c8e8978a7f2d 100644
--- a/htdocs/includes/modules/facture/pdf_adytek.modules.php
+++ b/htdocs/includes/modules/facture/pdf_adytek.modules.php
@@ -415,8 +415,7 @@ class pdf_adytek extends ModelePDFFactures {
*/
function _pagehead(&$pdf, $fac)
{
- global $conf;
- global $langs;
+ global $langs,$conf;
$langs->load("main");
$langs->load("bills");
$langs->load("companies");
@@ -518,7 +517,7 @@ class pdf_adytek extends ModelePDFFactures {
$pdf->line(200, 94, 205, 94 );
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10);
- $titre = $langs->trans("AmountInCurrency")." ".$conf->monnaie;
+ $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 94, $titre);
/*
*/
diff --git a/htdocs/includes/modules/facture/pdf_bernique.modules.php b/htdocs/includes/modules/facture/pdf_bernique.modules.php
index 55cfefbdcbf390a27d4c4d7350cfa7d3467c7868..b5a97643eb11925c8630650d6d681e656834ad1c 100644
--- a/htdocs/includes/modules/facture/pdf_bernique.modules.php
+++ b/htdocs/includes/modules/facture/pdf_bernique.modules.php
@@ -330,6 +330,9 @@ class pdf_bernique extends ModelePDFFactures {
*/
function _pagehead(&$pdf, $fac)
{
+ global $langs,$conf;
+ $langs->load("main");
+ $langs->load("bills");
$pdf->SetXY(10,5);
if (defined("FAC_PDF_INTITULE"))
@@ -386,7 +389,7 @@ class pdf_bernique extends ModelePDFFactures {
*/
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10);
- $titre = "Montants exprim�s en euros";
+ $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
/*
*/
diff --git a/htdocs/includes/modules/facture/pdf_bigorneau.modules.php b/htdocs/includes/modules/facture/pdf_bigorneau.modules.php
index bca1aa700fa104c009c988ea8e3a6549c0712993..549110cce8ef76138a8c95f8d4eafc052e0bed94 100644
--- a/htdocs/includes/modules/facture/pdf_bigorneau.modules.php
+++ b/htdocs/includes/modules/facture/pdf_bigorneau.modules.php
@@ -267,6 +267,9 @@ class pdf_bigorneau extends ModelePDFFactures {
*/
function _pagehead(&$pdf, $fac)
{
+ global $langs,$conf;
+ $langs->load("main");
+ $langs->load("bills");
$pdf->SetXY(10,5);
if (defined("FAC_PDF_INTITULE"))
@@ -323,7 +326,7 @@ class pdf_bigorneau extends ModelePDFFactures {
*/
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10);
- $titre = "Montants exprim�s en euros";
+ $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
/*
*/
diff --git a/htdocs/includes/modules/facture/pdf_bulot.modules.php b/htdocs/includes/modules/facture/pdf_bulot.modules.php
index 3f6109b50fb192cc345230ac5dec8e223ef08c79..5d8cc924396553d22fd721271f8b0e9c513e6d3d 100644
--- a/htdocs/includes/modules/facture/pdf_bulot.modules.php
+++ b/htdocs/includes/modules/facture/pdf_bulot.modules.php
@@ -347,6 +347,9 @@ class pdf_bulot extends ModelePDFFactures {
*/
function _pagehead(&$pdf, $fac)
{
+ global $langs,$conf;
+ $langs->load("main");
+ $langs->load("bills");
$pdf->SetXY(10,5);
if (defined("FAC_PDF_INTITULE"))
@@ -403,7 +406,7 @@ class pdf_bulot extends ModelePDFFactures {
*/
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10);
- $titre = $langs->trans("AmountInCurrency")." ".$conf->monnaie;
+ $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
/*
*/
diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php
index 7518a9d857217dddd15cb73d30f6451c36124db5..f3c3635ac1b333237a85736230a06de2a0fa55e8 100644
--- a/htdocs/includes/modules/facture/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php
@@ -562,8 +562,7 @@ class pdf_crabe extends ModelePDFFactures
*/
function _pagehead(&$pdf, $fac)
{
- global $conf;
- global $langs;
+ global $langs,$conf;
$langs->load("main");
$langs->load("bills");
$langs->load("propal");
@@ -690,7 +689,7 @@ class pdf_crabe extends ModelePDFFactures
*/
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10);
- $titre = $langs->trans("AmountInCurrency")." ".$conf->monnaie;
+ $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 94, $titre);
/*
*/
diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php
index c6a2675006fb9337716afeff5dfd00019333c061..271d1bad3bb6c3452024807267333ba040c8dc16 100644
--- a/htdocs/includes/modules/facture/pdf_oursin.modules.php
+++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php
@@ -560,8 +560,7 @@ class pdf_oursin extends ModelePDFFactures
*/
function _pagehead(&$pdf, $fac)
{
- global $conf;
- global $langs;
+ global $langs,$conf;
$langs->load("main");
$langs->load("bills");
$langs->load("propal");
@@ -710,7 +709,7 @@ class pdf_oursin extends ModelePDFFactures
*/
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10);
- $titre = $langs->trans("AmountInCurrency")." ".$conf->monnaie;
+ $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 94, $titre);
/*
*/
diff --git a/htdocs/includes/modules/facture/pdf_tourteau.modules.php b/htdocs/includes/modules/facture/pdf_tourteau.modules.php
index 63e076e56b1a31c787494ea5256636e04cc9380b..6bef02d5327a2ee198d5dce1b4d3ed7e0d4483ac 100644
--- a/htdocs/includes/modules/facture/pdf_tourteau.modules.php
+++ b/htdocs/includes/modules/facture/pdf_tourteau.modules.php
@@ -319,6 +319,9 @@ class pdf_tourteau extends ModelePDFFactures {
*/
function _pagehead(&$pdf, $fac)
{
+ global $langs,$conf;
+ $langs->load("main");
+ $langs->load("bills");
$pdf->SetXY(10,5);
if (defined("FAC_PDF_INTITULE"))
@@ -375,7 +378,7 @@ class pdf_tourteau extends ModelePDFFactures {
*/
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10);
- $titre = "Montants exprim�s en euros";
+ $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
/*
*/
diff --git a/htdocs/includes/modules/propale/pdf_propale_adytek.modules.php b/htdocs/includes/modules/propale/pdf_propale_adytek.modules.php
index b036a45b1d7e637e89a9ed6695b07f693883ebc0..1e76538408d8f9b13824a02374d3a9b43de302da 100644
--- a/htdocs/includes/modules/propale/pdf_propale_adytek.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_adytek.modules.php
@@ -281,7 +281,9 @@ class pdf_propale_adytek extends ModelePDFPropales
function _pagehead(&$pdf, $propale)
{
- global $langs;
+ global $langs,$conf;
+ $langs->load("main");
+ $langs->load("bills");
$tab4_top = 60;
$tab4_hl = 6;
@@ -369,15 +371,15 @@ class pdf_propale_adytek extends ModelePDFPropales
$pdf->SetFont('Arial','B',14);
//$pdf->Text(11, 88, "Date : " . strftime("%d %b %Y", $propale->date));
//$pdf->Text(11, 94, "Num�ro : ".$propale->ref);
- $pdf->Text(11, 88, "Date");
+ $pdf->Text(11, 88, $langs->trans("Date"));
$pdf->Text(35, 88, ": " . strftime("%d %b %Y", $propale->date));
- $pdf->Text(11, 94, "Num�ro");
+ $pdf->Text(11, 94, $langs->trans("Ref"));
$pdf->Text(35, 94, ": ".$propale->ref);
/*
*/
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10);
- $titre = "Montants exprim�s en euros";
+ $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
/*
*/
diff --git a/htdocs/includes/modules/propale/pdf_propale_bleu.modules.php b/htdocs/includes/modules/propale/pdf_propale_bleu.modules.php
index e2712c929df8eef445ef6c101258a5e72e8b9fc2..2e143836ca92fdf784d40bdd985a8a693e19a9b0 100644
--- a/htdocs/includes/modules/propale/pdf_propale_bleu.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_bleu.modules.php
@@ -218,7 +218,7 @@ class pdf_propale_bleu extends ModelePDFPropales
function _tableau(&$pdf, $tab_top, $tab_height, $nexY)
{
- global $langs;
+ global $langs,$conf;
$langs->load("main");
$langs->load("bills");
@@ -244,7 +244,7 @@ class pdf_propale_bleu extends ModelePDFPropales
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10);
- $titre = "Montants exprim�s en euros";
+ $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
}
@@ -268,7 +268,7 @@ class pdf_propale_bleu extends ModelePDFPropales
if (defined("FAC_PDF_TEL"))
{
$pdf->SetFont('Times','',10);
- $pdf->MultiCell(76, 5, "T�l : ".FAC_PDF_TEL);
+ $pdf->MultiCell(76, 5, $langs->trans("Phone")." : ".FAC_PDF_TEL);
}
if (defined("MAIN_INFO_SIREN"))
{
diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
index dbf6408837ad2772c75fdec3165a6e745e4ce339..5cfda6d1df0c032bb8f32525d37d7565053093ba 100644
--- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
@@ -215,7 +215,7 @@ class pdf_propale_jaune extends ModelePDFPropales
function _tableau(&$pdf, $tab_top, $tab_height, $nexY)
{
- global $langs;
+ global $langs,$conf;
$langs->load("main");
$langs->load("bills");
@@ -247,7 +247,7 @@ class pdf_propale_jaune extends ModelePDFPropales
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10);
- $titre = "Montants en euros";
+ $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(10,280, $titre);
}
diff --git a/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php b/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php
index 2f93d0921e88fad0726e330fbae6832ab675eeed..b4769d4472a2bc660de2724fb79d95bbf23a881b 100644
--- a/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php
@@ -237,7 +237,7 @@ class pdf_propale_rouge extends ModelePDFPropales
function _tableau(&$pdf, $tab_top, $tab_height, $nexY)
{
- global $langs;
+ global $langs,$conf;
$langs->load("main");
$langs->load("bills");
@@ -263,7 +263,7 @@ class pdf_propale_rouge extends ModelePDFPropales
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10);
- $titre = "Montants exprim�s en euros";
+ $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
}
diff --git a/htdocs/includes/modules/propale/pdf_propale_vert.modules.php b/htdocs/includes/modules/propale/pdf_propale_vert.modules.php
index e48f682ea1ea2bd74237a3ca935f4d1fce1e9539..4b48c84a6ba7888c84237b0e66212c9e6eee2273 100644
--- a/htdocs/includes/modules/propale/pdf_propale_vert.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_vert.modules.php
@@ -272,7 +272,7 @@ class pdf_propale_vert extends ModelePDFPropales
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10);
- $titre = "Montants exprim�s en euros";
+ $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
$pdf->SetXY(10, ($tab_top + $tab_height + 6));
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 592c352aa848d7ecbf1faf25ee2112e20129b48a..726ed7596553867e26fee67c24f9658b2dcd9f93 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -48,7 +48,6 @@ ErrorCreateBankAccount=Creat a bank account then go to Setup panel of Bill modul
ErrorBillNotFound=Bill %s does not exists
BillFrom=From
BillTo=To
-AmountInCurrency=Amount in
ActionsOnBill=Actions on bill
NewBill=New bill
Pr�l�vements=Prelevment
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index b6772cc22b2aa474c833a01d91752047735a194a..84597c7f5ac66d16d0c5a1797d0f6ed0266a9364 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -237,6 +237,7 @@ FillTownFromZip=Fill town from zip
ShowLog=Show log
File=File
ReadPermissionNotAllowed=Read permission not allowed
+AmountInCurrency=Amount in %s currency
# Countries
CountryFR=France
CountryBE=Belgium
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index d0bfc26fa83a173b18cdd8dc766bb420cddd6dd9..961cb61098ca0079805f21f83c812c3f649a291a 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -48,7 +48,6 @@ ErrorCreateBankAccount=Cr
ErrorBillNotFound=Facture %s inexistante
BillFrom=�metteur
BillTo=Adress� �
-AmountInCurrency=Montants exprim�s en
ActionsOnBill=Actions sur la facture
NewBill=Nouvelle facture
Pr�l�vements=Pr�l�vement
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 8488db772546a565a6018d828a1db7819534c6bd..d6898361638675ac80e9880916827d3e8b36e003 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -237,6 +237,7 @@ FillTownFromZip=Renseigner ville
ShowLog=Afficher historique
File=Fichier
ReadPermissionNotAllowed=Permission de lecture non accord�e
+AmountInCurrency=Montant exprim�s en %s
# Countries
CountryFR=France
CountryBE=Belgique
diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php
index e07d9149a81984157cd1b15b1f6ed35034e0f87c..97733c30c3957246f8e3daf08993b222a45c7450 100644
--- a/htdocs/lib/functions.inc.php
+++ b/htdocs/lib/functions.inc.php
@@ -292,21 +292,23 @@ function dolibarr_del_const($db, $name)
*/
function dolibarr_print_ca($ca)
{
+ global $langs,$conf;
+
if ($ca > 1000)
{
$cat = round(($ca / 1000),2);
- $cat = "$cat Keuros";
+ $cat = "$cat K".$langs->trans("Currency".$conf->monnaie);
}
else
{
$cat = round($ca,2);
- $cat = "$cat euros";
+ $cat = "$cat ".$langs->trans("Currency".$conf->monnaie);
}
if ($ca > 1000000)
{
$cat = round(($ca / 1000000),2);
- $cat = "$cat Meuros";
+ $cat = "$cat M".$langs->trans("Currency".$conf->monnaie);
}
return $cat;
diff --git a/htdocs/public/dons/depenses_code.php b/htdocs/public/dons/depenses_code.php
index bf54a20567ad17e61b21a55987be08499cfa7422..6d8223e6aac3804edff2166b2f197038b649b063 100644
--- a/htdocs/public/dons/depenses_code.php
+++ b/htdocs/public/dons/depenses_code.php
@@ -61,7 +61,7 @@ if ( $db->query( $sql) )
print "<td>".stripslashes($objp->nom)."</TD>\n";
print "<TD>".strftime("%d %B %Y",$objp->datef)."</td>\n";
- print '<TD align="right">'.number_format($objp->total,2,'.','').'<br>euros';
+ print '<TD align="right">'.number_format($objp->total,2,'.','').' '.$langs->trans("Currency".$conf->monnaie);
if ($objp->paye == 1)
{
@@ -88,15 +88,15 @@ if ( $db->query( $sql) )
$var=!$var;
print "<TR $bc[$var]>";
- print '<TD colspan="3" align="right">Pay� : '.number_format($total_paye,2,'.',' ').' euros</TD></tr>';
+ print '<TD colspan="3" align="right">Pay� : '.number_format($total_paye,2,'.',' ').' '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
$var=!$var;
print "<TR $bc[$var]>";
- print '<TD colspan="3" align="right">A payer : '.number_format($total_apayer,2,'.',' ').' euros</TD></tr>';
+ print '<TD colspan="3" align="right">A payer : '.number_format($total_apayer,2,'.',' ').' '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
$var=!$var;
print "<TR $bc[$var]>";
- print '<TD colspan="3" align="right">'.$langs->trans("Total").': '.number_format($total,2,'.',' ').' euros</TD></tr>';
+ print '<TD colspan="3" align="right">'.$langs->trans("Total").': '.number_format($total,2,'.',' ').' '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print "</table>";
diff --git a/htdocs/public/dons/donateurs_code.php b/htdocs/public/dons/donateurs_code.php
index 83b4c9401920d619c0f3c202e1f9dd583c2a2fda..157bacc516d90170511c4f2025efca840b276ffc 100644
--- a/htdocs/public/dons/donateurs_code.php
+++ b/htdocs/public/dons/donateurs_code.php
@@ -59,14 +59,14 @@ if ( $db->query( $sql) )
print "<TR $bc[$var]>";
if ($objp->public)
{
- print "<td>".stripslashes($objp->prenom)." ".stripslashes($objp->nom)." ".stripslashes($objp->societe)."</TD>\n";
+ print "<td>".stripslashes($objp->prenom)." ".stripslashes($objp->nom)." ".stripslashes($objp->societe)."</td>\n";
}
else
{
- print "<td>Anonyme Anonyme</TD>\n";
+ print "<td>Anonyme Anonyme</td>\n";
}
- print "<TD>".strftime("%d %B %Y",$objp->datedon)."</td>\n";
- print '<TD align="right">'.number_format($objp->amount,2,'.',' ').' euros</TD>';
+ print "<td>".dolibarr_print_date($objp->datedon)."</td>\n";
+ print '<td align="right">'.number_format($objp->amount,2,'.',' ').' '.$langs->trans("Currency".$conf->monnaie).'</td>';
print "</tr>";
$i++;
}