Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Trad: Traduction de la monnaie par la monnaie principale.

Browse Source
This commit is contained in:
Laurent Destailleur
2005-07-10 15:46:19 +00:00
parent eaff6c1bea
commit d8f9242c46
32 changed files with 82 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/adherents/fiche.php
View File

@@ -444,7 +444,7 @@ if ($action == 'create')
print '<input name="num_chq" type="text" size="6">'; print '<input name="num_chq" type="text" size="6">';
print "</td></tr>\n"; 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){ 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>'; 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 '<input name="num_chq" type="text" size="6">';
print "</td></tr>\n"; 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 && if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE !=0 &&
defined("ADHERENT_BANK_USE_AUTO") && ADHERENT_BANK_USE_AUTO !=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>'; 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>';

6
htdocs/compta/dons/fiche.php
View File

@@ -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("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("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("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 "<tr $bc[1]>".'<td colspan="3" align="center"><input type="submit" value="'.$langs->trans("Save").'"></td></tr>';
print "</table>\n"; print "</table>\n";
print "</form>\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("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("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("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"; print "<tr $bc[1]><td>".$langs->trans("PaymentMode")."</td><td>\n";
$paiement = new Paiement($db); $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("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("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("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) if ($don->statut == 1)
{ {
print "<tr $bc[1]><td>".$langs->trans("PaymentMode")."</td><td>"; print "<tr $bc[1]><td>".$langs->trans("PaymentMode")."</td><td>";

2
htdocs/compta/dons/formulaire/fsfe.fr.php
View File

@@ -193,7 +193,7 @@ $don->fetch($_GET["rowid"]);
</td> </td>
</tr> </tr>
</table> </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> Date du paiement : <?php print strftime("%d %B %Y", $don->date); ?> <br>
Mode de versement : Mode de versement :
<table width="100%"> <table width="100%">

16
htdocs/compta/facture.php
View File

@@ -196,8 +196,6 @@ if ($_POST["action"] == 'add')
} }
else else
{ {
print "<p><b>Erreur : la facture n'a pas <20>t<EFBFBD> cr<63><72>e, v<>rifier le num<75>ro !</b>";
print "<p>Retour <20> la <a href=\"propal.php?propalid=$propalid\">propale</a>";
dolibarr_print_error($db); 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 '<a href="'.DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"),"payment").'</a>';
print "&nbsp;".strftime("%d %B %Y",$objp->dp)."</td>\n"; print "&nbsp;".strftime("%d %B %Y",$objp->dp)."</td>\n";
print "<td>$objp->paiement_type $objp->num_paiement</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>"; print "</tr>";
$totalpaye += $objp->amount; $totalpaye += $objp->amount;
$i++; $i++;
@@ -976,13 +974,13 @@ else
if ($fac->paye == 0) 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\">".$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<75> :</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\">Factur<75> :</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; $resteapayer = $fac->total_ttc - $totalpaye;
print "<tr><td colspan=\"2\" align=\"right\">".$langs->trans("RemainderToPay")." :</td>"; 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>"; print "</table>";
$db->free($result); $db->free($result);
@@ -1010,12 +1008,12 @@ else
print '<tr><td height=\"10\">'.$langs->trans("AmountHT").'</td>'; print '<tr><td height=\"10\">'.$langs->trans("AmountHT").'</td>';
print '<td align="right" colspan="2"><b>'.price($fac->total_ht).'</b></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 '<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 '<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>'; print '<tr><td height=\"10\">'.$langs->trans("Status").'</td><td align="left" colspan="3">'.($fac->getLibStatut()).'</td></tr>';

6
htdocs/compta/paiement_charge.php
View File

@@ -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>'.$langs->trans("Label").' :</td><td colspan="2">'.$charge->lib."</td></tr>\n";
print "<tr><td>Date <20>ch<63>ance :</td><td colspan=\"2\">".dolibarr_print_date($charge->date_ech)."</td></tr>\n"; print "<tr><td>Date <20>ch<63>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;"; $sql = "SELECT sum(p.amount) FROM ".MAIN_DB_PREFIX."paiementcharge as p WHERE p.fk_charge = $chid;";
$result = $db->query($sql); $result = $db->query($sql);
@@ -187,7 +187,7 @@ if ($_GET["action"] == 'create')
$sumpayed = $db->result(0,0); $sumpayed = $db->result(0,0);
$db->free(); $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>'; 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 $html->select_comptes($charge->accountid, "accountid", 0, "courant=1"); // Affiche liste des comptes courant
print '</td></tr>'; 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"; // print "<tr><td valign=\"top\">Montant :</td><td><input name=\"amount\" type=\"text\"></td></tr>\n";
/* /*

2
htdocs/compta/pointmort.php
View File

@@ -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))) ; $xdate = mktime(0, 0, 0, date("m", $xdate + (33 * 24 * 3600)), 1 , date("Y", $xdate + (33 * 24 * 3600))) ;
$i++; $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 align=\"right\">$totalpm</td><td align=\"right\" bgcolor=\"#f0f0f0\">$pmt</td>";
print "<td colspan=\"4\">&nbsp;</td></tr>"; print "<td colspan=\"4\">&nbsp;</td></tr>";
print "</table>"; print "</table>";

2
htdocs/compta/prelevement/bons.php
View File

@@ -107,7 +107,7 @@ if ($result)
print '<td align="center">'.strftime("%d/%m/%Y",$obj->datec)."</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 "</tr>\n"; print "</tr>\n";
$i++; $i++;

2
htdocs/compta/prelevement/liste.php
View File

@@ -131,7 +131,7 @@ if ($result)
print '<td><a href="fiche.php?id='.$obj->rowid.'">'.stripslashes($obj->nom)."</a></td>\n"; 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="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 '<td align="center"><a href="fiche.php?id='.$obj->rowid.'">'.$obj->code_client."</a></td>\n";
print "</tr>\n"; print "</tr>\n";
$i++; $i++;

2
htdocs/compta/prelevement/rejet-prelevement.class.php
View File

@@ -201,7 +201,7 @@ class RejetPrelevement
$from = $this->user->fullname." <".$this->user->email.">"; $from = $this->user->fullname." <".$this->user->email.">";
$message = "Bonjour,\n"; $message = "Bonjour,\n";
$message .= "\nLe pr<70>l<EFBFBD>vement de la facture ".$fac->ref." pour le compte de la soci<63>t<EFBFBD> ".$soc->nom." d'un montant de ".price($fac->total_ttc)." euros a <20>t<EFBFBD> rejet<65> par la banque."; $message .= "\nLe pr<70>l<EFBFBD>vement de la facture ".$fac->ref." pour le compte de la soci<63>t<EFBFBD> ".$soc->nom." d'un montant de ".price($fac->total_ttc).' '.$langs->trans("Currency".$conf->monnaie).' a <20>t<EFBFBD> rejet<65> par la banque.";
$message .= "\n\n--\n".$this->user->fullname; $message .= "\n\n--\n".$this->user->fullname;

12
htdocs/compta/stats/comp.php
View File

@@ -50,8 +50,8 @@ function propals ($db, $year, $month) {
$oldstatut = $objp->statut; $oldstatut = $objp->statut;
if ($i > 0) { if ($i > 0) {
print "<tr><td align=\"right\" colspan=\"4\">Total : <b>".price($subtotal)."</b></td>\n"; print "<tr><td align=\"right\" colspan=\"4\">".$langs->trans("Total").": <b>".price($subtotal)."</b></td>\n";
print "<td align=\"left\">Euros HT</td></tr>\n"; print "<td align=\"left\">".$langs->trans("Currency".$conf->monnaie)."</td></tr>\n";
} }
$subtotal = 0; $subtotal = 0;
@@ -83,11 +83,11 @@ function propals ($db, $year, $month) {
$i++; $i++;
} }
print "<tr><td align=\"right\" colspan=\"4\">Total : <b>".price($subtotal)."</b></td>\n"; print "<tr><td align=\"right\" colspan=\"4\">".$langs->trans("Total").": <b>".price($subtotal)."</b></td>\n";
print "<td align=\"left\">Euros HT</td></tr>\n"; print "<td align=\"left\">".$langs->trans("Currency".$conf->monnaie)."</td></tr>\n";
print "<tr>"; print "<tr>";
print "<td colspan=\"3\" align=\"right\"><b>Total : ".price($total)."</b></td>"; print "<td colspan=\"3\" align=\"right\"><b>".$langs->trans("Total").": ".price($total)."</b></td>";
print "<td align=\"left\"><b>Euros HT</b></td></tr>"; print "<td align=\"left\"><b>".$langs->trans("Currency".$conf->monnaie)."</b></td></tr>";
print "</table>"; print "</table>";
$db->free(); $db->free();

2
htdocs/compta/voyage/index.php
View File

@@ -130,7 +130,7 @@ if ($result) {
print "</select></td>"; print "</select></td>";
print "<td><input name=\"reduc\" type=\"text\" size=6 value=0.00>euros</td><td>&nbsp;</td>"; print '<td><input name="reduc" type="text" size="6" value="0.00">'.$langs->trans("Currency".$conf->monnaie).'</td><td>&nbsp;</td>';
print '</tr>'; print '</tr>';
print "</table></form>"; print "</table></form>";

2
htdocs/expedition/mods/methode_expedition.modules.php
View File

@@ -200,7 +200,7 @@ Class methode_expedition
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10); $pdf->SetFont('Arial','',10);
$titre = "Montants exprim<69>s en euros"; $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre); $pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
} }

6
htdocs/fourn/facture/paiement.php
View File

@@ -116,7 +116,7 @@ if ($action == 'create')
print '<a href="fiche.php?facid='.$facid.'">'.$obj->facnumber.'</a></td></tr>'; 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("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;"; $sql = "SELECT sum(p.amount) FROM ".MAIN_DB_PREFIX."paiementfourn as p WHERE p.fk_facture_fourn = $facid;";
$result = $db->query($sql); $result = $db->query($sql);
@@ -124,7 +124,7 @@ if ($action == 'create')
$sumpayed = $db->result(0,0); $sumpayed = $db->result(0,0);
$db->free(); $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>"; print "<tr class=\"liste_titre\"><td colspan=\"3\">".$langs->trans("Payment")."</td>";
@@ -188,7 +188,7 @@ if ($action == 'create')
print "</select>"; print "</select>";
print "</td></tr>\n"; 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 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 '<tr><td colspan="3" align="center"><input type="submit" value="'.$langs->trans("Save").'"></td></tr>';
print "</form>\n"; print "</form>\n";

5
htdocs/includes/modules/facture/pdf_adytek.modules.php
View File

@@ -415,8 +415,7 @@ class pdf_adytek extends ModelePDFFactures {
*/ */
function _pagehead(&$pdf, $fac) function _pagehead(&$pdf, $fac)
{ {
global $conf; global $langs,$conf;
global $langs;
$langs->load("main"); $langs->load("main");
$langs->load("bills"); $langs->load("bills");
$langs->load("companies"); $langs->load("companies");
@@ -518,7 +517,7 @@ class pdf_adytek extends ModelePDFFactures {
$pdf->line(200, 94, 205, 94 ); $pdf->line(200, 94, 205, 94 );
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10); $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); $pdf->Text(200 - $pdf->GetStringWidth($titre), 94, $titre);
/* /*
*/ */

5
htdocs/includes/modules/facture/pdf_bernique.modules.php
View File

@@ -330,6 +330,9 @@ class pdf_bernique extends ModelePDFFactures {
*/ */
function _pagehead(&$pdf, $fac) function _pagehead(&$pdf, $fac)
{ {
global $langs,$conf;
$langs->load("main");
$langs->load("bills");
$pdf->SetXY(10,5); $pdf->SetXY(10,5);
if (defined("FAC_PDF_INTITULE")) if (defined("FAC_PDF_INTITULE"))
@@ -386,7 +389,7 @@ class pdf_bernique extends ModelePDFFactures {
*/ */
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10); $pdf->SetFont('Arial','',10);
$titre = "Montants exprim<69>s en euros"; $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre); $pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
/* /*
*/ */

5
htdocs/includes/modules/facture/pdf_bigorneau.modules.php
View File

@@ -267,6 +267,9 @@ class pdf_bigorneau extends ModelePDFFactures {
*/ */
function _pagehead(&$pdf, $fac) function _pagehead(&$pdf, $fac)
{ {
global $langs,$conf;
$langs->load("main");
$langs->load("bills");
$pdf->SetXY(10,5); $pdf->SetXY(10,5);
if (defined("FAC_PDF_INTITULE")) if (defined("FAC_PDF_INTITULE"))
@@ -323,7 +326,7 @@ class pdf_bigorneau extends ModelePDFFactures {
*/ */
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10); $pdf->SetFont('Arial','',10);
$titre = "Montants exprim<69>s en euros"; $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre); $pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
/* /*
*/ */

5
htdocs/includes/modules/facture/pdf_bulot.modules.php
View File

@@ -347,6 +347,9 @@ class pdf_bulot extends ModelePDFFactures {
*/ */
function _pagehead(&$pdf, $fac) function _pagehead(&$pdf, $fac)
{ {
global $langs,$conf;
$langs->load("main");
$langs->load("bills");
$pdf->SetXY(10,5); $pdf->SetXY(10,5);
if (defined("FAC_PDF_INTITULE")) if (defined("FAC_PDF_INTITULE"))
@@ -403,7 +406,7 @@ class pdf_bulot extends ModelePDFFactures {
*/ */
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10); $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); $pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
/* /*
*/ */

5
htdocs/includes/modules/facture/pdf_crabe.modules.php
View File

@@ -562,8 +562,7 @@ class pdf_crabe extends ModelePDFFactures
*/ */
function _pagehead(&$pdf, $fac) function _pagehead(&$pdf, $fac)
{ {
global $conf; global $langs,$conf;
global $langs;
$langs->load("main"); $langs->load("main");
$langs->load("bills"); $langs->load("bills");
$langs->load("propal"); $langs->load("propal");
@@ -690,7 +689,7 @@ class pdf_crabe extends ModelePDFFactures
*/ */
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10); $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); $pdf->Text(200 - $pdf->GetStringWidth($titre), 94, $titre);
/* /*
*/ */

5
htdocs/includes/modules/facture/pdf_oursin.modules.php
View File

@@ -560,8 +560,7 @@ class pdf_oursin extends ModelePDFFactures
*/ */
function _pagehead(&$pdf, $fac) function _pagehead(&$pdf, $fac)
{ {
global $conf; global $langs,$conf;
global $langs;
$langs->load("main"); $langs->load("main");
$langs->load("bills"); $langs->load("bills");
$langs->load("propal"); $langs->load("propal");
@@ -710,7 +709,7 @@ class pdf_oursin extends ModelePDFFactures
*/ */
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10); $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); $pdf->Text(200 - $pdf->GetStringWidth($titre), 94, $titre);
/* /*
*/ */

5
htdocs/includes/modules/facture/pdf_tourteau.modules.php
View File

@@ -319,6 +319,9 @@ class pdf_tourteau extends ModelePDFFactures {
*/ */
function _pagehead(&$pdf, $fac) function _pagehead(&$pdf, $fac)
{ {
global $langs,$conf;
$langs->load("main");
$langs->load("bills");
$pdf->SetXY(10,5); $pdf->SetXY(10,5);
if (defined("FAC_PDF_INTITULE")) if (defined("FAC_PDF_INTITULE"))
@@ -375,7 +378,7 @@ class pdf_tourteau extends ModelePDFFactures {
*/ */
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10); $pdf->SetFont('Arial','',10);
$titre = "Montants exprim<69>s en euros"; $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre); $pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
/* /*
*/ */

10
htdocs/includes/modules/propale/pdf_propale_adytek.modules.php
View File

@@ -281,7 +281,9 @@ class pdf_propale_adytek extends ModelePDFPropales
function _pagehead(&$pdf, $propale) function _pagehead(&$pdf, $propale)
{ {
global $langs; global $langs,$conf;
$langs->load("main");
$langs->load("bills");
$tab4_top = 60; $tab4_top = 60;
$tab4_hl = 6; $tab4_hl = 6;
@@ -369,15 +371,15 @@ class pdf_propale_adytek extends ModelePDFPropales
$pdf->SetFont('Arial','B',14); $pdf->SetFont('Arial','B',14);
//$pdf->Text(11, 88, "Date : " . strftime("%d %b %Y", $propale->date)); //$pdf->Text(11, 88, "Date : " . strftime("%d %b %Y", $propale->date));
//$pdf->Text(11, 94, "Num<75>ro : ".$propale->ref); //$pdf->Text(11, 94, "Num<75>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(35, 88, ": " . strftime("%d %b %Y", $propale->date));
$pdf->Text(11, 94, "Num<EFBFBD>ro"); $pdf->Text(11, 94, $langs->trans("Ref"));
$pdf->Text(35, 94, ": ".$propale->ref); $pdf->Text(35, 94, ": ".$propale->ref);
/* /*
*/ */
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10); $pdf->SetFont('Arial','',10);
$titre = "Montants exprim<69>s en euros"; $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre); $pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
/* /*
*/ */

6
htdocs/includes/modules/propale/pdf_propale_bleu.modules.php
View File

@@ -218,7 +218,7 @@ class pdf_propale_bleu extends ModelePDFPropales
function _tableau(&$pdf, $tab_top, $tab_height, $nexY) function _tableau(&$pdf, $tab_top, $tab_height, $nexY)
{ {
global $langs; global $langs,$conf;
$langs->load("main"); $langs->load("main");
$langs->load("bills"); $langs->load("bills");
@@ -244,7 +244,7 @@ class pdf_propale_bleu extends ModelePDFPropales
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10); $pdf->SetFont('Arial','',10);
$titre = "Montants exprim<69>s en euros"; $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre); $pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
} }
@@ -268,7 +268,7 @@ class pdf_propale_bleu extends ModelePDFPropales
if (defined("FAC_PDF_TEL")) if (defined("FAC_PDF_TEL"))
{ {
$pdf->SetFont('Times','',10); $pdf->SetFont('Times','',10);
$pdf->MultiCell(76, 5, "T<EFBFBD>l : ".FAC_PDF_TEL); $pdf->MultiCell(76, 5, $langs->trans("Phone")." : ".FAC_PDF_TEL);
} }
if (defined("MAIN_INFO_SIREN")) if (defined("MAIN_INFO_SIREN"))
{ {

4
htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
View File

@@ -215,7 +215,7 @@ class pdf_propale_jaune extends ModelePDFPropales
function _tableau(&$pdf, $tab_top, $tab_height, $nexY) function _tableau(&$pdf, $tab_top, $tab_height, $nexY)
{ {
global $langs; global $langs,$conf;
$langs->load("main"); $langs->load("main");
$langs->load("bills"); $langs->load("bills");
@@ -247,7 +247,7 @@ class pdf_propale_jaune extends ModelePDFPropales
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10); $pdf->SetFont('Arial','',10);
$titre = "Montants en euros"; $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(10,280, $titre); $pdf->Text(10,280, $titre);
} }

4
htdocs/includes/modules/propale/pdf_propale_rouge.modules.php
View File

@@ -237,7 +237,7 @@ class pdf_propale_rouge extends ModelePDFPropales
function _tableau(&$pdf, $tab_top, $tab_height, $nexY) function _tableau(&$pdf, $tab_top, $tab_height, $nexY)
{ {
global $langs; global $langs,$conf;
$langs->load("main"); $langs->load("main");
$langs->load("bills"); $langs->load("bills");
@@ -263,7 +263,7 @@ class pdf_propale_rouge extends ModelePDFPropales
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10); $pdf->SetFont('Arial','',10);
$titre = "Montants exprim<69>s en euros"; $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre); $pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
} }

2
htdocs/includes/modules/propale/pdf_propale_vert.modules.php
View File

@@ -272,7 +272,7 @@ class pdf_propale_vert extends ModelePDFPropales
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',10); $pdf->SetFont('Arial','',10);
$titre = "Montants exprim<69>s en euros"; $titre = $langs->trans("AmountInCurrency",$langs->trans("Currency".$conf->monnaie));
$pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre); $pdf->Text(200 - $pdf->GetStringWidth($titre), 98, $titre);
$pdf->SetXY(10, ($tab_top + $tab_height + 6)); $pdf->SetXY(10, ($tab_top + $tab_height + 6));

1
htdocs/langs/en_US/bills.lang
View File

@@ -48,7 +48,6 @@ ErrorCreateBankAccount=Creat a bank account then go to Setup panel of Bill modul
ErrorBillNotFound=Bill %s does not exists ErrorBillNotFound=Bill %s does not exists
BillFrom=From BillFrom=From
BillTo=To BillTo=To
AmountInCurrency=Amount in
ActionsOnBill=Actions on bill ActionsOnBill=Actions on bill
NewBill=New bill NewBill=New bill
Pr<EFBFBD>l<EFBFBD>vements=Prelevment Pr<EFBFBD>l<EFBFBD>vements=Prelevment

1
htdocs/langs/en_US/main.lang
View File

@@ -237,6 +237,7 @@ FillTownFromZip=Fill town from zip
ShowLog=Show log ShowLog=Show log
File=File File=File
ReadPermissionNotAllowed=Read permission not allowed ReadPermissionNotAllowed=Read permission not allowed
AmountInCurrency=Amount in %s currency
# Countries # Countries
CountryFR=France CountryFR=France
CountryBE=Belgium CountryBE=Belgium

1
htdocs/langs/fr_FR/bills.lang
View File

@@ -48,7 +48,6 @@ ErrorCreateBankAccount=Cr
ErrorBillNotFound=Facture %s inexistante ErrorBillNotFound=Facture %s inexistante
BillFrom=<3D>metteur BillFrom=<3D>metteur
BillTo=Adress<73> <20> BillTo=Adress<73> <20>
AmountInCurrency=Montants exprim<69>s en
ActionsOnBill=Actions sur la facture ActionsOnBill=Actions sur la facture
NewBill=Nouvelle facture NewBill=Nouvelle facture
Pr<EFBFBD>l<EFBFBD>vements=Pr<50>l<EFBFBD>vement Pr<EFBFBD>l<EFBFBD>vements=Pr<50>l<EFBFBD>vement

1
htdocs/langs/fr_FR/main.lang
View File

@@ -237,6 +237,7 @@ FillTownFromZip=Renseigner ville
ShowLog=Afficher historique ShowLog=Afficher historique
File=Fichier File=Fichier
ReadPermissionNotAllowed=Permission de lecture non accord<72>e ReadPermissionNotAllowed=Permission de lecture non accord<72>e
AmountInCurrency=Montant exprim<69>s en %s
# Countries # Countries
CountryFR=France CountryFR=France
CountryBE=Belgique CountryBE=Belgique

8
htdocs/lib/functions.inc.php
View File

@@ -292,21 +292,23 @@ function dolibarr_del_const($db, $name)
*/ */
function dolibarr_print_ca($ca) function dolibarr_print_ca($ca)
{ {
global $langs,$conf;
if ($ca > 1000) if ($ca > 1000)
{ {
$cat = round(($ca / 1000),2); $cat = round(($ca / 1000),2);
$cat = "$cat Keuros"; $cat = "$cat K".$langs->trans("Currency".$conf->monnaie);
} }
else else
{ {
$cat = round($ca,2); $cat = round($ca,2);
$cat = "$cat euros"; $cat = "$cat ".$langs->trans("Currency".$conf->monnaie);
} }
if ($ca > 1000000) if ($ca > 1000000)
{ {
$cat = round(($ca / 1000000),2); $cat = round(($ca / 1000000),2);
$cat = "$cat Meuros"; $cat = "$cat M".$langs->trans("Currency".$conf->monnaie);
} }
return $cat; return $cat;

8
htdocs/public/dons/depenses_code.php
View File

@@ -61,7 +61,7 @@ if ( $db->query( $sql) )
print "<td>".stripslashes($objp->nom)."</TD>\n"; print "<td>".stripslashes($objp->nom)."</TD>\n";
print "<TD>".strftime("%d %B %Y",$objp->datef)."</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) if ($objp->paye == 1)
{ {
@@ -88,15 +88,15 @@ if ( $db->query( $sql) )
$var=!$var; $var=!$var;
print "<TR $bc[$var]>"; print "<TR $bc[$var]>";
print '<TD colspan="3" align="right">Pay<61> : '.number_format($total_paye,2,'.',' ').' euros</TD></tr>'; print '<TD colspan="3" align="right">Pay<61> : '.number_format($total_paye,2,'.',' ').' '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
$var=!$var; $var=!$var;
print "<TR $bc[$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; $var=!$var;
print "<TR $bc[$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>"; print "</table>";

8
htdocs/public/dons/donateurs_code.php
View File

@@ -59,14 +59,14 @@ if ( $db->query( $sql) )
print "<TR $bc[$var]>"; print "<TR $bc[$var]>";
if ($objp->public) 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 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>".dolibarr_print_date($objp->datedon)."</td>\n";
print '<TD align="right">'.number_format($objp->amount,2,'.',' ').' euros</TD>'; print '<td align="right">'.number_format($objp->amount,2,'.',' ').' '.$langs->trans("Currency".$conf->monnaie).'</td>';
print "</tr>"; print "</tr>";
$i++; $i++;
} }