Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Trad: Traduction de la monnaie par la monnaie principale.

Browse Source
This commit is contained in:
Laurent Destailleur 2005-07-10 17:46:02 +00:00
parent 3087f70ecb
commit 48acd8d39c
28 changed files with 94 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/comm/propal.php
View File

@ -565,12 +565,12 @@ if ($_GET['propalid'])
print '<tr><td height="10">'.$langs->trans('AmountHT').'</td>';
print '<td align="right" colspan="2"><b>'.price($obj->price).'</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($propal->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($propal->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">'.$propal->getLibStatut().'</td></tr>';
print '</table><br>';
if ($propal->brouillon == 1 && $user->rights->propale->creer)

6
htdocs/commande/fiche.php
View File

@ -538,7 +538,7 @@ else
// Ligne de 3 colonnes
print '<tr><td>'.$langs->trans("AmountHT").'</td>';
print '<td align="right"><b>'.price($commande->total_ht).'</b></td>';
print '<td>'.$conf->monnaie.'</td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td>';
print '<td rowspan="4" valign="top">'.$langs->trans("Note").' :<br>';
if ($commande->brouillon == 1 && $user->rights->commande->creer)
{
@ -570,9 +570,9 @@ else
print '</td></tr>';
print '<tr><td>'.$langs->trans("VAT").'</td><td align="right">'.price($commande->total_tva).'</td>';
print '<td>'.$conf->monnaie.'</td></tr>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>';
print '<td>'.$conf->monnaie.'</td></tr>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print "</table>";

2
htdocs/compta/bank/budget.php
View File

@ -142,7 +142,7 @@ else
$total = $total + (0 - $objp->amount);
}
$db->free();
print '<tr class="liste_total"><td colspan="3" align="right">'.$langs->trans("Total")."</td><td align=\"right\"><b>".price(abs($total))."</b></td><td>".$conf->monnaie."</td></tr>";
print '<tr class="liste_total"><td colspan="3" align="right">'.$langs->trans("Total")."</td><td align=\"right\"><b>".price(abs($total))."</b></td><td>".$langs->trans("Currency".$conf->monnaie)."</td></tr>";
}
else
{

2
htdocs/compta/bank/virement.php
View File

@ -73,7 +73,7 @@ if ($_POST["action"] == 'add')
$accountto=new Account($db);
$accountto->fetch($_POST["account_to"]);
$mesg.="<div class=\"ok\"><b>Votre virement entre <a href=\"account.php?account=".$accountfrom->id."\">".$accountfrom->label."</a> et <a href=\"account.php?account=".$accountto->id."\">".$accountto->label."</a> de ".$amount." ".$conf->monnaie." a été crée.</b></div>";
$mesg.="<div class=\"ok\"><b>Votre virement entre <a href=\"account.php?account=".$accountfrom->id."\">".$accountfrom->label."</a> et <a href=\"account.php?account=".$accountto->id."\">".$accountto->label."</a> de ".$amount." ".$langs->trans("Currency".$conf->monnaie)." a été crée.</b></div>";
}
else {
dolibarr_print_error($db);

8
htdocs/compta/commande/fiche.php
View File

@ -157,7 +157,7 @@ if ($_GET["id"] > 0)
// Ligne de 3 colonnes
print '<tr><td>'.$langs->trans("AmountHT").'</td>';
print '<td align="right"><b>'.price($commande->total_ht).'</b></td>';
print '<td>'.$conf->monnaie.'</td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td>';
print '<td rowspan="4" valign="top">'.$langs->trans("Note").' :<br>'.nl2br($commande->note).'</td></tr>';
print '<tr><td>'.$langs->trans("GlobalDiscount").'</td><td align="right">';
@ -165,9 +165,9 @@ if ($_GET["id"] > 0)
print '</td></tr>';
print '<tr><td>'.$langs->trans("VAT").'</td><td align="right">'.price($commande->total_tva).'</td>';
print '<td>'.$conf->monnaie.'</td></tr>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>';
print '<td>'.$conf->monnaie.'</td></tr>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print "</table>\n";
/*
@ -346,7 +346,7 @@ if ($_GET["id"] > 0)
$total = $total + $objp->total;
$i++;
}
print "<tr $bc[$var]><td align=\"right\" colspan=\"4\">".$langs->trans("TotalHT").": <b>$total</b> ".$conf->monnaie."</td></tr>\n";
print "<tr $bc[$var]><td align=\"right\" colspan=\"4\">".$langs->trans("TotalHT").": <b>$total</b> ".$langs->trans("Currency".$conf->monnaie)."</td></tr>\n";
print "</table>";
}
$db->free();

13
htdocs/compta/facture.php
View File

@ -907,11 +907,11 @@ else
print '<td colspan="3">';
print '<b><a href="fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></b></td>';
print "<td>Conditions de réglement : " . $fac->cond_reglement ."</td></tr>";
print "<td>Conditions de réglement</td><td>" . $fac->cond_reglement ."</td></tr>";
print '<tr><td>'.$langs->trans("Date").'</td>';
print "<td colspan=\"3\">".dolibarr_print_date($fac->date,"%A %d %B %Y")."</td>\n";
print "<td>Date limite de réglement : " . dolibarr_print_date($fac->date_lim_reglement,"%A %d %B %Y");
print '<td>'.$langs->trans("DateClosing").'</td><td>' . dolibarr_print_date($fac->date_lim_reglement,"%A %d %B %Y");
if ($fac->paye == 0 && $fac->date_lim_reglement < (time() - $warning_delay)) print img_warning($langs->trans("Late"));
print "</td></tr>";
@ -928,18 +928,18 @@ else
}
else
{
print '<a href="facture.php?facid='.$fac->id.'&amp;action=classer">Classer la facture</a>';
print '<a href="facture.php?facid='.$fac->id.'&amp;action=classer">'.$langs->trans("ClassifyBill").'</a>';
}
print "&nbsp;</td>";
} else {
print '<td height=\"10\">&nbsp;</td><td colspan="3">';
print "&nbsp;</td>";
}
print '<td rowspan="8" valign="top">';
print '<td rowspan="8" colspan="2" valign="top">';
/*
* Paiements
*/
* Paiements
*/
print $langs->trans("Payments").' :<br>';
$sql = "SELECT ".$db->pdate("datep")." as dp, pf.amount,";
$sql.= " c.libelle as paiement_type, p.num_paiement, p.rowid";
@ -1332,6 +1332,7 @@ else
if (file_exists($file))
{
print "<br>\n";
print_titre("Documents");
print '<table class="border" width="100%">';

8
htdocs/compta/facture/fiche-rec.php
View File

@ -295,14 +295,14 @@ else
print "</td></tr>";
print '<tr><td>'.$langs->trans("Amount").'</td>';
print '<tr><td>'.$langs->trans("AmountHT").'</td>';
print '<td align="right" colspan="2"><b>'.price($fac->total_ht).'</b></td>';
print '<td>'.$conf->monnaie.' HT</td></tr>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print '<tr><td>'.$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>'.$langs->trans("TotalTTC").'</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>';
if ($fac->note)
{
print '<tr><td colspan="5">Note : '.nl2br($fac->note)."</td></tr>";

2
htdocs/compta/paiement/fiche.php
View File

@ -119,7 +119,7 @@ if ($paiement->bank_account) {
print '<tr><td valign="top" width="140">'.$langs->trans("Date").'</td><td>'.dolibarr_print_date($paiement->date).'</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Type").'</td><td>'.$paiement->type_libelle.'</td></tr>';
if ($paiement->numero) { print '<tr><td valign="top">'.$langs->trans("Numero").'</td><td>'.$paiement->numero.'</td></tr>'; }
print '<tr><td valign="top">'.$langs->trans("Amount").'</td><td>'.$paiement->montant."&nbsp;".$conf->monnaie.'</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Amount").'</td><td>'.$paiement->montant."&nbsp;".$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print "</table>";
print nl2br($paiement->note);

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

@ -81,7 +81,7 @@ if ($result)
print '<td>'.strftime("%d/%m/%Y %H:%M",$obj->datec)."</td>\n";
print '<td align="right">'.price($obj->amount)." ".$conf->monnaie."</td>\n";
print '<td align="right">'.price($obj->amount)." ".$langs->trans("Currency".$conf->monnaie)."</td>\n";
print "</tr>\n";
$i++;

6
htdocs/compta/propal.php
View File

@ -276,12 +276,12 @@ if ($_GET["propalid"])
print '<tr><td height="10">'.$langs->trans('AmountHT').'</td>';
print '<td align="right" colspan="2"><b>'.price($obj->price).'</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($propal->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($propal->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">'.$propal->getLibStatut().'</td></tr>';
print '</table><br>';
if ($propal->brouillon == 1 && $user->rights->propale->creer)

2
htdocs/compta/sociales/charges.php
View File

@ -129,7 +129,7 @@ if ($chid > 0)
print img_object($langs->trans("Payment"),"payment").' ';
print dolibarr_print_date($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++;

6
htdocs/compta/stats/cumul.php
View File

@ -43,7 +43,7 @@ if ($user->societe_id > 0)
$mode='recettes';
if ($conf->compta->mode == 'CREANCES-DETTES') { $mode='creances'; }
print_titre("Chiffre d'affaire cumulé (".$conf->monnaie." HT)");
print_titre("Chiffre d'affaire cumulé (".$langs->trans("Currency".$conf->monnaie)." HT)");
print '<table width="100%"><tr><td valign="top">';
@ -83,7 +83,9 @@ print "</td></tr></table>";
$db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
llxFooter('$Date$ - $Revision$');
/*
* Fonctions

8
htdocs/compta/stats/exercices.php
View File

@ -41,7 +41,7 @@ $mode='recettes';
if ($conf->compta->mode == 'CREANCES-DETTES') { $mode='creances'; }
print_titre("Comparatif CA année en cours avec année précédente (".$conf->monnaie." HT, ".$mode.")");
print_titre("Comparatif CA année en cours avec année précédente (".$langs->trans("Currency".$conf->monnaie)." HT, ".$mode.")");
print "<br>\n";
@ -77,7 +77,7 @@ function factures ($db, $year, $month, $paye)
print "<TD><a href=\"comp.php?socidp=$objp->idp\">$objp->nom</a></TD>\n";
print "<TD><a href=\"facture.php?facid=$objp->facid\">$objp->facnumber</a></TD>\n";
if ($objp->df > 0 ) {
print "<TD align=\"right\">".strftime("%d %B %Y",$objp->df)."</TD>\n";
print "<TD align=\"right\">".dolibarr_print_date($objp->df)."</TD>\n";
} else {
print "<TD align=\"right\"><b>!!!</b></TD>\n";
}
@ -95,7 +95,7 @@ function factures ($db, $year, $month, $paye)
$i++;
}
print "<tr><td align=\"right\"><b>Total : ".price($total)."</b></td><td></td></tr>";
print "<tr><td align=\"right\"><b>".$langs->trans("Total")." : ".price($total)."</b></td><td></td></tr>";
print "</TABLE>";
$db->free();
}
@ -110,7 +110,7 @@ function pt ($db, $sql, $year) {
if ($result) {
$num = $db->num_rows();
$i = 0; $total = 0 ;
print '<table class="border" width="100%" cellspacing="0" cellpadding="3">';
print '<table class="border" width="100%">';
print "<tr class=\"liste_titre\">";
print '<td>'.$langs->trans("Month").'</td>';
print '<td align="right">'.$langs->trans("Amount").'</td></tr>';

2
htdocs/compta/stats/prev.php
View File

@ -60,7 +60,7 @@ function pt ($db, $sql, $title) {
$total = $total + $obj->amount;
$i++;
}
print "<tr class=\"total\"><td colspan=\"2\" align=\"right\"><b>".$langs->trans("TotalHT").": ".price($total)."</b> ".$conf->monnaie."</td></tr>";
print "<tr class=\"total\"><td colspan=\"2\" align=\"right\"><b>".$langs->trans("TotalHT").": ".price($total)."</b> ".$langs->trans("Currency".$conf->monnaie)."</td></tr>";
$db->free();
}

2
htdocs/compta/tva.php
View File

@ -55,7 +55,7 @@ function pt ($db, $sql, $date) {
$i++;
}
print "<tr><td align=\"right\">".$langs->trans("TotalHT").":</td><td align=\"right\"><b>".price($total)."</b></td><td>".$conf->monnaie."</td></tr>";
print "<tr><td align=\"right\">".$langs->trans("TotalHT").":</td><td align=\"right\"><b>".price($total)."</b></td><td>".$langs->trans("Currency".$conf->monnaie)."</td></tr>";
print "</table>";
$db->free();

6
htdocs/fourn/commande/fiche.php
View File

@ -336,12 +336,12 @@ if ($_GET["id"] > 0)
// Ligne de 3 colonnes
print '<tr><td>'.$langs->trans("AmountHT").'</td>';
print '<td align="right"><b>'.price($commande->total_ht).'</b></td>';
print '<td>'.$conf->monnaie.'</td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td>';
print '<td>'.$langs->trans("VAT").'</td><td align="right">'.price($commande->total_tva).'</td>';
print '<td>'.$conf->monnaie.'</td></tr>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>';
print '<td>'.$conf->monnaie.'</td><td colspan="3">&nbsp;</td></tr>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td colspan="3">&nbsp;</td></tr>';
if ($commande->note)
{

6
htdocs/fourn/commande/note.php
View File

@ -132,13 +132,13 @@ if ($_GET["id"] > 0)
// Ligne de 3 colonnes
print '<tr><td>'.$langs->trans("AmountHT").'</td>';
print '<td align="right"><b>'.price($commande->total_ht).'</b></td>';
print '<td>'.$conf->monnaie.'</td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td>';
print '<td rowspan="3" valign="top">&nbsp;</td></tr>';
print '<tr><td>'.$langs->trans("VAT").'</td><td align="right">'.price($commande->total_tva).'</td>';
print '<td>'.$conf->monnaie.'</td></tr>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>';
print '<td>'.$conf->monnaie.'</td></tr>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
if ($user->rights->fournisseur->commande->creer)

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

@ -555,7 +555,7 @@ else
print "<tr $bc[$var]>";
print "<td>".img_object($langs->trans("Payment"),"payment").' '.dolibarr_print_date($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";
if ($fac->statut == 1 && $fac->paye == 0 && $user->societe_id == 0)
{
@ -569,13 +569,13 @@ else
$total = $total + $objp->amount;
$i++;
}
print "<tr $bc[1]><td colspan=\"2\" align=\"right\">".$langs->trans("Total")." :</td><td align=\"right\"><b>".price($total)."</b></td><td$tdsup>".$conf->monnaie."</td></tr>\n";
print "<tr class=\"liste_total\"><td colspan=\"2\" align=\"right\">".$langs->trans("Total")." :</td><td align=\"right\"><b>".price($total)."</b></td><td$tdsup>".$langs->trans("Currency".$conf->monnaie)."</td></tr>\n";
if ($fac->statut > 0)
{
$resteapayer = abs($fac->total_ttc - $total);
print "<tr $bc[1]><td colspan=\"2\" align=\"right\">".$langs->trans("RemainderToPay")." :</td>";
print "<tr class=\liste_total\"><td colspan=\"2\" align=\"right\">".$langs->trans("RemainderToPay")." :</td>";
print '<td align="right"><b>'.price($resteapayer)."</b></td><td$tdsup>".$conf->monnaie."</td>";
print "</tr>\n";
}

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

@ -537,11 +537,24 @@ class pdf_adytek extends ModelePDFFactures {
$langs->load("companies");
$footy=13;
$pdf->SetFont('Arial','',8);
$pdf->SetFont('Arial','',8);
if (MAIN_INFO_CAPITAL) {
$ligne="";
if (defined('MAIN_INFO_CAPITAL') && MAIN_INFO_CAPITAL) {
$ligne="SARL au Capital de " . MAIN_INFO_CAPITAL." ".$langs->trans("Currency".$conf->monnaie);
}
if (defined('MAIN_INFO_SIREN') && MAIN_INFO_SIREN) {
$ligne.=($ligne?" - ":"").$langs->transcountry("ProfId1",$this->code_pays).": ".MAIN_INFO_SIREN;
}
if (defined('MAIN_INFO_SIRET') && MAIN_INFO_SIRET) {
$ligne.=($ligne?" - ":"").$langs->transcountry("ProfId2",$this->code_pays).": ".MAIN_INFO_SIRET;
}
if (defined('MAIN_INFO_RCS') && MAIN_INFO_RCS) {
$ligne.=($ligne?" - ":"").$langs->transcountry("ProfId4",$this->code_pays).": ".MAIN_INFO_RCS;
}
if ($ligne) {
$pdf->SetY(-$footy);
$pdf->MultiCell(190, 3,"SARL au Capital de " . MAIN_INFO_CAPITAL." ".$conf->monnaie." - " . MAIN_INFO_RCS." - Identifiant professionnel: " . MAIN_INFO_SIREN , 0, 'C');
$pdf->MultiCell(190, 3, $ligne, 0, 'C');
$footy-=3;
}

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

@ -713,7 +713,7 @@ class pdf_crabe extends ModelePDFFactures
$ligne="";
if (defined('MAIN_INFO_CAPITAL') && MAIN_INFO_CAPITAL) {
$ligne="SARL au Capital de " . MAIN_INFO_CAPITAL." ".$conf->monnaie;
$ligne="SARL au Capital de " . MAIN_INFO_CAPITAL." ".$langs->trans("Currency".$conf->monnaie);
}
if (defined('MAIN_INFO_SIREN') && MAIN_INFO_SIREN) {
$ligne.=($ligne?" - ":"").$langs->transcountry("ProfId1",$this->code_pays).": ".MAIN_INFO_SIREN;

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

@ -731,18 +731,24 @@ class pdf_oursin extends ModelePDFFactures
$footy=13;
$pdf->SetFont('Arial','',8);
if (defined(MAIN_INFO_CAPITAL)) {
$pdf->SetY(-$footy);
$ligne="SARL au Capital de " . MAIN_INFO_CAPITAL." ".$conf->monnaie;
if (defined(MAIN_INFO_SIREN) && MAIN_INFO_SIREN) {
$ligne.=" - ".$langs->transcountry("ProfId2",$this->code_pays).": ".MAIN_INFO_SIREN;
$ligne="";
if (defined('MAIN_INFO_CAPITAL') && MAIN_INFO_CAPITAL) {
$ligne="SARL au Capital de " . MAIN_INFO_CAPITAL." ".$langs->trans("Currency".$conf->monnaie);
}
if (defined(MAIN_INFO_RCS) && MAIN_INFO_RCS) {
$ligne.=" - ".$langs->transcountry("ProfId3",$this->code_pays).": ".MAIN_INFO_RCS;
if (defined('MAIN_INFO_SIREN') && MAIN_INFO_SIREN) {
$ligne.=($ligne?" - ":"").$langs->transcountry("ProfId1",$this->code_pays).": ".MAIN_INFO_SIREN;
}
if (defined('MAIN_INFO_SIRET') && MAIN_INFO_SIRET) {
$ligne.=($ligne?" - ":"").$langs->transcountry("ProfId2",$this->code_pays).": ".MAIN_INFO_SIRET;
}
if (defined('MAIN_INFO_RCS') && MAIN_INFO_RCS) {
$ligne.=($ligne?" - ":"").$langs->transcountry("ProfId4",$this->code_pays).": ".MAIN_INFO_RCS;
}
if ($ligne) {
$pdf->SetY(-$footy);
$pdf->MultiCell(190, 3, $ligne, 0, 'C');
$footy-=3;
}
$pdf->MultiCell(190, 3, $ligne, 0, 'C');
$footy-=3;
}
// Affiche le numéro de TVA intracommunautaire
if (MAIN_INFO_TVAINTRA == 'MAIN_INFO_TVAINTRA') {

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

@ -608,7 +608,7 @@ class pdf_propale_azur extends ModelePDFPropales
*/
$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);
/*
*/

2
htdocs/lolix/societe/fiche.php
View File

@ -81,7 +81,7 @@ if ($_GET["action"] == 'edit')
print '<td>'.$langs->transcountry("ProfId2",$soc->pays_code).'</td><td><input type="text" name="siret" size="15" maxlength="14" value="'.$soc->siret.'"></td></tr>';
print '<tr><td>'.$langs->transcountry("ProfId3",$soc->pays_code).'</td><td><input type="text" name="ape" size="5" maxlength="4" value="'.$soc->ape.'"></td>';
print '<td>'.$langs->trans("Capital").'</td><td><input type="text" name="capital" size="10" value="'.$soc->capital.'"> '.$conf->monnaie.'</td></tr>';
print '<td>'.$langs->trans("Capital").'</td><td><input type="text" name="capital" size="10" value="'.$soc->capital.'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print '<tr><td>Forme juridique</td><td colspan="3">';

4
htdocs/projet/commandes.php
View File

@ -110,11 +110,11 @@ if (sizeof($commandes)>0 && is_array($commandes))
print '<tr><td colspan="2">'.$i.' '.$langs->trans("Orders").'</td>';
print '<td align="right">'.$langs->trans("TotalHT").': '.price($total).'</td>';
print '<td align="left">'.$conf->monnaie.'</td></tr>';
print '<td align="left">'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print "</table>";
}
$db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
llxFooter('$Date$ - $Revision$');
?>

4
htdocs/projet/facture.php
View File

@ -116,11 +116,11 @@ print '</table><br>';
print '<tr><td colspan="2">'.$i.' '.$langs->trans("Bills").'</td>';
print '<td align="right">'.$langs->trans("TotalHT").' : '.price($total).'</td>';
print '<td align="left">'.$conf->monnaie.'</td></tr>';
print '<td align="left">'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print "</table>";
}
$db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
llxFooter('$Date$ - $Revision$');
?>

6
htdocs/projet/propal.php
View File

@ -101,7 +101,7 @@ if (sizeof($propales)>0 && is_array($propales))
print "<tr $bc[$var]>";
print "<td><a href=\"../comm/propal.php?propalid=$propale->id\">$propale->ref</a></td>\n";
print '<td>'.strftime("%d %B %Y",$propale->datep).'</td>';
print '<td>'.dolibarr_print_date($propale->datep).'</td>';
print '<td align="right">'.price($propale->price).'</td><td>&nbsp;</td></tr>';
$total = $total + $propale->price;
@ -109,10 +109,10 @@ if (sizeof($propales)>0 && is_array($propales))
print '<tr><td colspan="2">'.$i.' '.$langs->trans("Proposal").'</td>';
print '<td align="right">'.$langs->trans("TotalHT").': '.price($total).'</td>';
print '<td align="left">'.$conf->monnaie.'</td></tr></table>';
print '<td align="left">'.$langs->trans("Currency".$conf->monnaie).'</td></tr></table>';
}
$db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
llxFooter('$Date$ - $Revision$');
?>

6
htdocs/soc.php
View File

@ -256,7 +256,7 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create')
print '<td>'.$langs->transcountry('ProfId2',$soc->pays_code).'</td><td><input type="text" name="siret" size="15" maxlength="14" value="'.$soc->siret.'"></td></tr>';
print '<tr><td>'.$langs->transcountry('ProfId3',$soc->pays_code).'</td><td><input type="text" name="ape" size="5" maxlength="4" value="'.$soc->ape.'"></td><td colspan="2">&nbsp;</td></tr>';
print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$soc->capital.'"> '.$conf->monnaie.'</td></tr>';
print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$soc->capital.'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print '<tr><td>'.$langs->trans('JuridicalStatus').'</td><td colspan="3">';
$form->select_forme_juridique($soc->forme_juridique_code,(defined("COMPANY_CREATE_TWO_STEPS")?$soc->pays_code:0));
@ -374,7 +374,7 @@ elseif ($_GET["action"] == 'edit')
print ' '.$langs->trans("VATIntraCheckableOnEUSite");
print '</td></tr>';
print '<tr><td>'.$langs->trans("Capital").'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$soc->capital.'"> '.$conf->monnaie.'</td></tr>';
print '<tr><td>'.$langs->trans("Capital").'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$soc->capital.'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print '<tr><td>'.$langs->trans('JuridicalStatus').'</td><td colspan="3">';
$form->select_forme_juridique($soc->forme_juridique_code,0);
@ -530,7 +530,7 @@ else
print $soc->tva_intra;
print '</td></tr>';
print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3">'.$soc->capital.' '.$conf->monnaie.'</td></tr>';
print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3">'.$soc->capital.' '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print '<tr><td>'.$langs->trans('JuridicalStatus').'</td><td colspan="3">'.$soc->forme_juridique.'</td></tr>';

2
htdocs/societe/lien.php
View File

@ -154,7 +154,7 @@ if($_GET["socid"])
print '<td>'.$langs->transcountry('ProfId2',$soc->pays_code).'</td><td>'.$soc->siret.'</td></tr>';
print '<tr><td>'.$langs->transcountry('ProfId3',$soc->pays_code).'</td><td>'.$soc->ape.'</td><td colspan="2">&nbsp;</td></tr>';
print '<tr><td>'.$langs->trans("Capital").'</td><td colspan="3">'.$soc->capital.' '.$conf->monnaie.'</td></tr>';
print '<tr><td>'.$langs->trans("Capital").'</td><td colspan="3">'.$soc->capital.' '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
// Société mère
print '<tr><td>'.$langs->trans("ParentCompany").'</td><td colspan="3">';