From 48acd8d39ca356f73e2105bb82bb437bb5059ec6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2005 17:46:02 +0000 Subject: [PATCH] Trad: Traduction de la monnaie par la monnaie principale. --- htdocs/comm/propal.php | 6 ++--- htdocs/commande/fiche.php | 6 ++--- htdocs/compta/bank/budget.php | 2 +- htdocs/compta/bank/virement.php | 2 +- htdocs/compta/commande/fiche.php | 8 +++--- htdocs/compta/facture.php | 13 +++++----- htdocs/compta/facture/fiche-rec.php | 8 +++--- htdocs/compta/paiement/fiche.php | 2 +- htdocs/compta/prelevement/index.php | 2 +- htdocs/compta/propal.php | 6 ++--- htdocs/compta/sociales/charges.php | 2 +- htdocs/compta/stats/cumul.php | 6 +++-- htdocs/compta/stats/exercices.php | 8 +++--- htdocs/compta/stats/prev.php | 2 +- htdocs/compta/tva.php | 2 +- htdocs/fourn/commande/fiche.php | 6 ++--- htdocs/fourn/commande/note.php | 6 ++--- htdocs/fourn/facture/fiche.php | 6 ++--- .../modules/facture/pdf_adytek.modules.php | 19 +++++++++++--- .../modules/facture/pdf_crabe.modules.php | 2 +- .../modules/facture/pdf_oursin.modules.php | 26 ++++++++++++------- .../propale/pdf_propale_azur.modules.php | 2 +- htdocs/lolix/societe/fiche.php | 2 +- htdocs/projet/commandes.php | 4 +-- htdocs/projet/facture.php | 4 +-- htdocs/projet/propal.php | 6 ++--- htdocs/soc.php | 6 ++--- htdocs/societe/lien.php | 2 +- 28 files changed, 94 insertions(+), 72 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index b04d1d2b730..ed4510a1bef 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -565,12 +565,12 @@ if ($_GET['propalid']) print ''.$langs->trans('AmountHT').''; print ''.price($obj->price).''; - print ''.$conf->monnaie.''; + print ''.$langs->trans("Currency".$conf->monnaie).''; print ''.$langs->trans('VAT').''.price($propal->total_tva).''; - print ''.$conf->monnaie.''; + print ''.$langs->trans("Currency".$conf->monnaie).''; print ''.$langs->trans('AmountTTC').''.price($propal->total_ttc).''; - print ''.$conf->monnaie.''; + print ''.$langs->trans("Currency".$conf->monnaie).''; print ''.$langs->trans('Status').''.$propal->getLibStatut().''; print '
'; if ($propal->brouillon == 1 && $user->rights->propale->creer) diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index a801f83db37..55bb5545e4b 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -538,7 +538,7 @@ else // Ligne de 3 colonnes print ''.$langs->trans("AmountHT").''; print ''.price($commande->total_ht).''; - print ''.$conf->monnaie.''; + print ''.$langs->trans("Currency".$conf->monnaie).''; print ''.$langs->trans("Note").' :
'; if ($commande->brouillon == 1 && $user->rights->commande->creer) { @@ -570,9 +570,9 @@ else print ''; print ''.$langs->trans("VAT").''.price($commande->total_tva).''; - print ''.$conf->monnaie.''; + print ''.$langs->trans("Currency".$conf->monnaie).''; print ''.$langs->trans("TotalTTC").''.price($commande->total_ttc).''; - print ''.$conf->monnaie.''; + print ''.$langs->trans("Currency".$conf->monnaie).''; print ""; diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php index 9c7af91bde4..b5b151ed222 100644 --- a/htdocs/compta/bank/budget.php +++ b/htdocs/compta/bank/budget.php @@ -142,7 +142,7 @@ else $total = $total + (0 - $objp->amount); } $db->free(); - print ''.$langs->trans("Total")."".price(abs($total))."".$conf->monnaie.""; + print ''.$langs->trans("Total")."".price(abs($total))."".$langs->trans("Currency".$conf->monnaie).""; } else { diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php index 60bfea9e7be..b6e0dbb9daa 100644 --- a/htdocs/compta/bank/virement.php +++ b/htdocs/compta/bank/virement.php @@ -73,7 +73,7 @@ if ($_POST["action"] == 'add') $accountto=new Account($db); $accountto->fetch($_POST["account_to"]); - $mesg.="
Votre virement entre id."\">".$accountfrom->label." et id."\">".$accountto->label." de ".$amount." ".$conf->monnaie." a été crée.
"; + $mesg.="
Votre virement entre id."\">".$accountfrom->label." et id."\">".$accountto->label." de ".$amount." ".$langs->trans("Currency".$conf->monnaie)." a été crée.
"; } else { dolibarr_print_error($db); diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php index 8e4d9efe3a9..8610ed980ed 100644 --- a/htdocs/compta/commande/fiche.php +++ b/htdocs/compta/commande/fiche.php @@ -157,7 +157,7 @@ if ($_GET["id"] > 0) // Ligne de 3 colonnes print ''.$langs->trans("AmountHT").''; print ''.price($commande->total_ht).''; - print ''.$conf->monnaie.''; + print ''.$langs->trans("Currency".$conf->monnaie).''; print ''.$langs->trans("Note").' :
'.nl2br($commande->note).''; print ''.$langs->trans("GlobalDiscount").''; @@ -165,9 +165,9 @@ if ($_GET["id"] > 0) print ''; print ''.$langs->trans("VAT").''.price($commande->total_tva).''; - print ''.$conf->monnaie.''; + print ''.$langs->trans("Currency".$conf->monnaie).''; print ''.$langs->trans("TotalTTC").''.price($commande->total_ttc).''; - print ''.$conf->monnaie.''; + print ''.$langs->trans("Currency".$conf->monnaie).''; print "\n"; /* @@ -346,7 +346,7 @@ if ($_GET["id"] > 0) $total = $total + $objp->total; $i++; } - print "".$langs->trans("TotalHT").": $total ".$conf->monnaie."\n"; + print "".$langs->trans("TotalHT").": $total ".$langs->trans("Currency".$conf->monnaie)."\n"; print ""; } $db->free(); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index e5a0be174c5..ed48e8386c6 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -907,11 +907,11 @@ else print ''; print ''.$soc->nom.''; - print "Conditions de réglement : " . $fac->cond_reglement .""; + print "Conditions de réglement" . $fac->cond_reglement .""; print ''.$langs->trans("Date").''; print "".dolibarr_print_date($fac->date,"%A %d %B %Y")."\n"; - print "Date limite de réglement : " . dolibarr_print_date($fac->date_lim_reglement,"%A %d %B %Y"); + print ''.$langs->trans("DateClosing").'' . 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 ""; @@ -928,18 +928,18 @@ else } else { - print 'Classer la facture'; + print ''.$langs->trans("ClassifyBill").''; } print " "; } else { print ' '; print " "; } - print ''; + print ''; /* - * Paiements - */ + * Paiements + */ print $langs->trans("Payments").' :
'; $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 "
\n"; print_titre("Documents"); print ''; diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index c0dd2900ff5..95e6f414b11 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -295,14 +295,14 @@ else print ""; - print ''; + print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; if ($fac->note) { print '"; diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php index a0a9b7d78d6..87c364d95d2 100644 --- a/htdocs/compta/paiement/fiche.php +++ b/htdocs/compta/paiement/fiche.php @@ -119,7 +119,7 @@ if ($paiement->bank_account) { print ''; print ''; if ($paiement->numero) { print ''; } -print ''; +print ''; print "
'.$langs->trans("Amount").'
'.$langs->trans("AmountHT").''.price($fac->total_ht).''.$conf->monnaie.' HT
'.$langs->trans("Currency".$conf->monnaie).'
'.$langs->trans("VAT").''.price($fac->total_tva).''.$conf->monnaie.'
'.$langs->trans("Currency".$conf->monnaie).'
'.$langs->trans("TotalTTC").''.price($fac->total_ttc).''.$conf->monnaie.'
'.$langs->trans("Currency".$conf->monnaie).'
Note : '.nl2br($fac->note)."
'.$langs->trans("Date").''.dolibarr_print_date($paiement->date).'
'.$langs->trans("Type").''.$paiement->type_libelle.'
'.$langs->trans("Numero").''.$paiement->numero.'
'.$langs->trans("Amount").''.$paiement->montant." ".$conf->monnaie.'
'.$langs->trans("Amount").''.$paiement->montant." ".$langs->trans("Currency".$conf->monnaie).'
"; print nl2br($paiement->note); diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index f013c84a351..4398248ee88 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -81,7 +81,7 @@ if ($result) print ''.strftime("%d/%m/%Y %H:%M",$obj->datec)."\n"; - print ''.price($obj->amount)." ".$conf->monnaie."\n"; + print ''.price($obj->amount)." ".$langs->trans("Currency".$conf->monnaie)."\n"; print "\n"; $i++; diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index 73a9e6e8148..4befe13e457 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -276,12 +276,12 @@ if ($_GET["propalid"]) print ''.$langs->trans('AmountHT').''; print ''.price($obj->price).''; - print ''.$conf->monnaie.''; + print ''.$langs->trans("Currency".$conf->monnaie).''; print ''.$langs->trans('VAT').''.price($propal->total_tva).''; - print ''.$conf->monnaie.''; + print ''.$langs->trans("Currency".$conf->monnaie).''; print ''.$langs->trans('AmountTTC').''.price($propal->total_ttc).''; - print ''.$conf->monnaie.''; + print ''.$langs->trans("Currency".$conf->monnaie).''; print ''.$langs->trans('Status').''.$propal->getLibStatut().''; print '
'; if ($propal->brouillon == 1 && $user->rights->propale->creer) diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php index 503cf4cb6ff..590c3e1f658 100644 --- a/htdocs/compta/sociales/charges.php +++ b/htdocs/compta/sociales/charges.php @@ -129,7 +129,7 @@ if ($chid > 0) print img_object($langs->trans("Payment"),"payment").' '; print dolibarr_print_date($objp->dp)."\n"; print "$objp->paiement_type $objp->num_paiement\n"; - print ''.price($objp->amount)."".$conf->monnaie."\n"; + print ''.price($objp->amount)."".$langs->trans("Currency".$conf->monnaie)."\n"; print ""; $totalpaye += $objp->amount; $i++; diff --git a/htdocs/compta/stats/cumul.php b/htdocs/compta/stats/cumul.php index 1c5de8faf53..218593ceba9 100644 --- a/htdocs/compta/stats/cumul.php +++ b/htdocs/compta/stats/cumul.php @@ -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 '
'; @@ -83,7 +83,9 @@ print "
"; $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); + + /* * Fonctions diff --git a/htdocs/compta/stats/exercices.php b/htdocs/compta/stats/exercices.php index df70e64c411..f3567e66e37 100644 --- a/htdocs/compta/stats/exercices.php +++ b/htdocs/compta/stats/exercices.php @@ -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 "
\n"; @@ -77,7 +77,7 @@ function factures ($db, $year, $month, $paye) print "idp\">$objp->nom\n"; print "facid\">$objp->facnumber\n"; if ($objp->df > 0 ) { - print "".strftime("%d %B %Y",$objp->df)."\n"; + print "".dolibarr_print_date($objp->df)."\n"; } else { print "!!!\n"; } @@ -95,7 +95,7 @@ function factures ($db, $year, $month, $paye) $i++; } - print "Total : ".price($total).""; + print "".$langs->trans("Total")." : ".price($total).""; print ""; $db->free(); } @@ -110,7 +110,7 @@ function pt ($db, $sql, $year) { if ($result) { $num = $db->num_rows(); $i = 0; $total = 0 ; - print ''; + print '
'; print ""; print ''; print ''; diff --git a/htdocs/compta/stats/prev.php b/htdocs/compta/stats/prev.php index 31bc7a66189..1e0c06381f5 100644 --- a/htdocs/compta/stats/prev.php +++ b/htdocs/compta/stats/prev.php @@ -60,7 +60,7 @@ function pt ($db, $sql, $title) { $total = $total + $obj->amount; $i++; } - print ""; + print ""; $db->free(); } diff --git a/htdocs/compta/tva.php b/htdocs/compta/tva.php index 195974b2af1..3b43246a747 100644 --- a/htdocs/compta/tva.php +++ b/htdocs/compta/tva.php @@ -55,7 +55,7 @@ function pt ($db, $sql, $date) { $i++; } - print ""; + print ""; print "
'.$langs->trans("Month").''.$langs->trans("Amount").'
".$langs->trans("TotalHT").": ".price($total)." ".$conf->monnaie."
".$langs->trans("TotalHT").": ".price($total)." ".$langs->trans("Currency".$conf->monnaie)."
".$langs->trans("TotalHT").":".price($total)."".$conf->monnaie."
".$langs->trans("TotalHT").":".price($total)."".$langs->trans("Currency".$conf->monnaie)."
"; $db->free(); diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 9f80d104bab..2f88a04b500 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -336,12 +336,12 @@ if ($_GET["id"] > 0) // Ligne de 3 colonnes print ''.$langs->trans("AmountHT").''; print ''.price($commande->total_ht).''; - print ''.$conf->monnaie.''; + print ''.$langs->trans("Currency".$conf->monnaie).''; print ''.$langs->trans("VAT").''.price($commande->total_tva).''; - print ''.$conf->monnaie.''; + print ''.$langs->trans("Currency".$conf->monnaie).''; print ''.$langs->trans("TotalTTC").''.price($commande->total_ttc).''; - print ''.$conf->monnaie.' '; + print ''.$langs->trans("Currency".$conf->monnaie).' '; if ($commande->note) { diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php index 5c5072a17c1..fd4cc019a68 100644 --- a/htdocs/fourn/commande/note.php +++ b/htdocs/fourn/commande/note.php @@ -132,13 +132,13 @@ if ($_GET["id"] > 0) // Ligne de 3 colonnes print ''.$langs->trans("AmountHT").''; print ''.price($commande->total_ht).''; - print ''.$conf->monnaie.''; + print ''.$langs->trans("Currency".$conf->monnaie).''; print ' '; print ''.$langs->trans("VAT").''.price($commande->total_tva).''; - print ''.$conf->monnaie.''; + print ''.$langs->trans("Currency".$conf->monnaie).''; print ''.$langs->trans("TotalTTC").''.price($commande->total_ttc).''; - print ''.$conf->monnaie.''; + print ''.$langs->trans("Currency".$conf->monnaie).''; if ($user->rights->fournisseur->commande->creer) diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index e8aa8f5a5b6..03fa1bca37b 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -555,7 +555,7 @@ else print ""; print "".img_object($langs->trans("Payment"),"payment").' '.dolibarr_print_date($objp->dp)."\n"; print "$objp->paiement_type $objp->num_paiement\n"; - print "".price($objp->amount)."".$conf->monnaie."\n"; + print "".price($objp->amount)."".$langs->trans("Currency".$conf->monnaie)."\n"; if ($fac->statut == 1 && $fac->paye == 0 && $user->societe_id == 0) { @@ -569,13 +569,13 @@ else $total = $total + $objp->amount; $i++; } - print "".$langs->trans("Total")." :".price($total)."".$conf->monnaie."\n"; + print "".$langs->trans("Total")." :".price($total)."".$langs->trans("Currency".$conf->monnaie)."\n"; if ($fac->statut > 0) { $resteapayer = abs($fac->total_ttc - $total); - print "".$langs->trans("RemainderToPay")." :"; + print "".$langs->trans("RemainderToPay")." :"; print ''.price($resteapayer)."".$conf->monnaie.""; print "\n"; } diff --git a/htdocs/includes/modules/facture/pdf_adytek.modules.php b/htdocs/includes/modules/facture/pdf_adytek.modules.php index 3ede5272a22..8d1c1ea9b1e 100644 --- a/htdocs/includes/modules/facture/pdf_adytek.modules.php +++ b/htdocs/includes/modules/facture/pdf_adytek.modules.php @@ -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; } diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index f3c3635ac1b..20235134588 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -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; diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php index 271d1bad3bb..a6d9ffcfebb 100644 --- a/htdocs/includes/modules/facture/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php @@ -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') { diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index da554e64b69..c879b8bf4f3 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -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); /* */ diff --git a/htdocs/lolix/societe/fiche.php b/htdocs/lolix/societe/fiche.php index ff1f3d29072..afc07ef2143 100644 --- a/htdocs/lolix/societe/fiche.php +++ b/htdocs/lolix/societe/fiche.php @@ -81,7 +81,7 @@ if ($_GET["action"] == 'edit') print ''.$langs->transcountry("ProfId2",$soc->pays_code).''; print ''.$langs->transcountry("ProfId3",$soc->pays_code).''; - print ''.$langs->trans("Capital").' '.$conf->monnaie.''; + print ''.$langs->trans("Capital").' '.$langs->trans("Currency".$conf->monnaie).''; print 'Forme juridique'; diff --git a/htdocs/projet/commandes.php b/htdocs/projet/commandes.php index 577ec3de847..6ef8e6ab489 100644 --- a/htdocs/projet/commandes.php +++ b/htdocs/projet/commandes.php @@ -110,11 +110,11 @@ if (sizeof($commandes)>0 && is_array($commandes)) print ''.$i.' '.$langs->trans("Orders").''; print ''.$langs->trans("TotalHT").': '.price($total).''; - print ''.$conf->monnaie.''; + print ''.$langs->trans("Currency".$conf->monnaie).''; print ""; } $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/projet/facture.php b/htdocs/projet/facture.php index 2d5ed4894dc..595f3abdb35 100644 --- a/htdocs/projet/facture.php +++ b/htdocs/projet/facture.php @@ -116,11 +116,11 @@ print '
'; print ''.$i.' '.$langs->trans("Bills").''; print ''.$langs->trans("TotalHT").' : '.price($total).''; - print ''.$conf->monnaie.''; + print ''.$langs->trans("Currency".$conf->monnaie).''; print ""; } $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/projet/propal.php b/htdocs/projet/propal.php index b548e4c24a5..9e4a0d9ce2c 100644 --- a/htdocs/projet/propal.php +++ b/htdocs/projet/propal.php @@ -101,7 +101,7 @@ if (sizeof($propales)>0 && is_array($propales)) print ""; print "id\">$propale->ref\n"; - print ''.strftime("%d %B %Y",$propale->datep).''; + print ''.dolibarr_print_date($propale->datep).''; print ''.price($propale->price).' '; $total = $total + $propale->price; @@ -109,10 +109,10 @@ if (sizeof($propales)>0 && is_array($propales)) print ''.$i.' '.$langs->trans("Proposal").''; print ''.$langs->trans("TotalHT").': '.price($total).''; - print ''.$conf->monnaie.''; + print ''.$langs->trans("Currency".$conf->monnaie).''; } $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/soc.php b/htdocs/soc.php index 69f04bc67d9..0bac9ca358b 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -256,7 +256,7 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create') print ''.$langs->transcountry('ProfId2',$soc->pays_code).''; print ''.$langs->transcountry('ProfId3',$soc->pays_code).' '; - print ''.$langs->trans('Capital').' '.$conf->monnaie.''; + print ''.$langs->trans('Capital').' '.$langs->trans("Currency".$conf->monnaie).''; print ''.$langs->trans('JuridicalStatus').''; $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 ''; - print ''.$langs->trans("Capital").' '.$conf->monnaie.''; + print ''.$langs->trans("Capital").' '.$langs->trans("Currency".$conf->monnaie).''; print ''.$langs->trans('JuridicalStatus').''; $form->select_forme_juridique($soc->forme_juridique_code,0); @@ -530,7 +530,7 @@ else print $soc->tva_intra; print ''; - print ''.$langs->trans('Capital').''.$soc->capital.' '.$conf->monnaie.''; + print ''.$langs->trans('Capital').''.$soc->capital.' '.$langs->trans("Currency".$conf->monnaie).''; print ''.$langs->trans('JuridicalStatus').''.$soc->forme_juridique.''; diff --git a/htdocs/societe/lien.php b/htdocs/societe/lien.php index 319822f7593..f3457bde055 100644 --- a/htdocs/societe/lien.php +++ b/htdocs/societe/lien.php @@ -154,7 +154,7 @@ if($_GET["socid"]) print ''.$langs->transcountry('ProfId2',$soc->pays_code).''.$soc->siret.''; print ''.$langs->transcountry('ProfId3',$soc->pays_code).''.$soc->ape.' '; - print ''.$langs->trans("Capital").''.$soc->capital.' '.$conf->monnaie.''; + print ''.$langs->trans("Capital").''.$soc->capital.' '.$langs->trans("Currency".$conf->monnaie).''; // Société mère print ''.$langs->trans("ParentCompany").'';