From 8aaf21c6dde39f5b7198b9fa357e3cd19d817fbb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Feb 2005 20:38:33 +0000 Subject: [PATCH] Trad: Traduction de la chaine "Remise" --- htdocs/comm/addpropal.php | 2 +- htdocs/comm/propal.php | 2 +- htdocs/commande/fiche.php | 8 ++++---- htdocs/compta/commande.php | 12 ++++++------ htdocs/compta/facture.php | 4 ++-- htdocs/compta/facture/fiche-rec.php | 12 ++++++------ htdocs/compta/propal.php | 6 +++--- htdocs/contrat/ligne.php | 6 +++--- htdocs/fourn/commande/fiche.php | 6 +++--- .../modules/facture/pdf_bernique.modules.php | 8 ++++---- .../modules/facture/pdf_crabe.modules.php | 2 +- .../modules/facture/pdf_oursin.modules.php | 2 +- .../propale/pdf_propale_rouge.modules.php | 8 ++++---- .../modules/propale/pdf_propale_vert.modules.php | 16 ++++++++-------- htdocs/telephonie/ligne/communications.php | 2 +- htdocs/telephonie/ligne/remises.php | 12 ++++++------ 16 files changed, 54 insertions(+), 54 deletions(-) diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index d0218b50620..aac4cd7a1c5 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -233,7 +233,7 @@ if ($_GET["action"] == 'create') print_titre($titre); print ''; - print ''; + print ''; for ($i = 1 ; $i <= PROPALE_NEW_FORM_NB_PRODUCT ; $i++) { print ''; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 594e7894c8a..7140a4f29dd 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -347,7 +347,7 @@ if ($_GET["propalid"]) */ if ($propal->brouillon == 1 && $user->rights->propale->creer) { - print ''; + print ''; print ''; print ''; diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 4fb9139faf7..b3ee6b21129 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -307,8 +307,8 @@ if ($_GET["action"] == 'create') dolibarr_print_error($db); } - print '
'.$lib.''.$langs->trans("Qty").'Remise
'.$lib.''.$langs->trans("Qty").''.$langs->trans("Discount").'
Remise ?
'.$langs->trans("Discount").' ?%
'; - print ''; + print '
20 Produits les plus vendusQuan.Remise
'; + print ''; for ($i = 1 ; $i < 5 ; $i++) { print ''; @@ -336,7 +336,7 @@ if ($_GET["action"] == 'create') print '
20 Produits les plus vendus'.$langs->trans("Qty").''.$langs->trans("Discount").'
'; print ''; - print ''; + print ''; $sql = "SELECT pt.rowid, p.label as product, p.ref, pt.price, pt.qty, p.rowid as prodid, pt.remise_percent"; $sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pt, ".MAIN_DB_PREFIX."product as p WHERE pt.fk_product = p.rowid AND pt.fk_propal = $propalid"; @@ -502,7 +502,7 @@ else print ''; print ''; - print ''; print ''; - print ''; + print ''; - print '
'.$langs->trans("Ref").''.$langs->trans("Product").''.$langs->trans("Price").'Remise'.$langs->trans("Qty").'
'.$langs->trans("Price").''.$langs->trans("Discount").''.$langs->trans("Qty").'
'.$conf->monnaie.''.$langs->trans("Note").' :
Remise globale'; + print '
'.$langs->trans("GlobalDiscount").''; if ($commande->brouillon == 1 && $user->rights->commande->creer) { diff --git a/htdocs/compta/commande.php b/htdocs/compta/commande.php index 147adcf31db..c436953e68d 100644 --- a/htdocs/compta/commande.php +++ b/htdocs/compta/commande.php @@ -120,9 +120,9 @@ if ($_GET["id"] > 0) print ''.price($commande->total_ht).''.$conf->monnaie.' HTNote
'.$langs->trans("Note").'
Remise globale'; + print '
'.$langs->trans("GlobalDiscount").''; print $commande->remise_percent.' % '; @@ -143,7 +143,7 @@ if ($_GET["id"] > 0) * Lignes de commandes * */ - echo '
'; + echo '
'; $sql = "SELECT l.fk_product, l.description, l.price, l.qty, l.rowid, l.tva_tx, l.remise_percent, l.subprice"; $sql .= " FROM ".MAIN_DB_PREFIX."commandedet as l WHERE l.fk_commande =".$commande->id." ORDER BY l.rowid"; @@ -158,9 +158,9 @@ if ($_GET["id"] > 0) { print ''; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; print ''; print "\n"; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index b196f8bb63b..2aeccd8c4f3 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1144,9 +1144,9 @@ else print ""; print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 2d959266ad8..c166deb0985 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -154,9 +154,9 @@ if ($_GET["action"] == 'create') { print ""; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; print ''; print "\n"; @@ -310,11 +310,11 @@ else * Lignes * */ - print_titre("Produits"); + print_titre($langs->trans("Products")); print '
'.$langs->trans("Description").'TvaQuantitéRemise'.$langs->trans("VAT").''.$langs->trans("Qty").''.$langs->trans("Discount").'P.U.  
'.$langs->trans("Description").''.$langs->trans("VAT").'P.U. HTP.U. HT'.$langs->trans("Quantity").'Remise'.$langs->trans("Dscount").'   
'.$langs->trans("Description").'TvaQuantitéRemise'.$langs->trans("VAT").''.$langs->trans("Qty").''.$langs->trans("Discount").'P.U.N.P.
'; - print ''; - print ''; + print ''; + print ''; $num = sizeof($fac->lignes); $i = 0; diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index e7fb02be6d7..93917c9695e 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -155,7 +155,7 @@ if ($_GET["propalid"]) * */ - print ""; + print ""; /* * @@ -356,8 +356,8 @@ if ($_GET["propalid"]) print '
'.$langs->trans("Ref").'Produit'.$langs->trans("Price").'RemiseQté.
'.$langs->trans("Ref").''.$langs->trans("Product").''.$langs->trans("Price").''.$langs->trans("Discount").''.$langs->trans("Qty").'
Remise".price($obj->remise)." euros
".$langs->trans("Discount")."".price($obj->remise)." euros
'; print ""; - print ""; - print ''; + print '"; + print ''; $sql = "SELECT pt.rowid, p.label as product, p.ref, pt.price, pt.qty, p.rowid as prodid, pt.remise_percent"; $sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pt, ".MAIN_DB_PREFIX."product as p WHERE pt.fk_product = p.rowid AND pt.fk_propal =".$propal->id; diff --git a/htdocs/contrat/ligne.php b/htdocs/contrat/ligne.php index 32ff3c75e30..f0e3c9aaaa5 100644 --- a/htdocs/contrat/ligne.php +++ b/htdocs/contrat/ligne.php @@ -214,9 +214,9 @@ $html = new Form($db); { print ''; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; print ''; print "\n"; diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index b1ff00b1861..85d262e3d01 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -466,9 +466,9 @@ if ($id > 0) print ""; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; print ''."\n"; diff --git a/htdocs/includes/modules/facture/pdf_bernique.modules.php b/htdocs/includes/modules/facture/pdf_bernique.modules.php index 6c9bca1dfb9..5ad7f79b069 100644 --- a/htdocs/includes/modules/facture/pdf_bernique.modules.php +++ b/htdocs/includes/modules/facture/pdf_bernique.modules.php @@ -259,19 +259,19 @@ class pdf_bernique extends ModelePDFFactures { $pdf->SetXY (132, $tab2_top + 0); - $pdf->MultiCell(42, $tab2_hl, "Total HT", 0, 'R', 0); + $pdf->MultiCell(42, $tab2_hl, $langs->trans("TotalHT"), 0, 'R', 0); $pdf->SetXY (11, $tab2_top + $tab2_hl); - $pdf->MultiCell(42, $tab2_hl, "Remise ". $fac->remise_percent . " %", 0, 'L', 0); + $pdf->MultiCell(42, $tab2_hl, $langs->trans("Discount")." ". $fac->remise_percent . " %", 0, 'L', 0); $pdf->SetXY (132, $tab2_top + $tab2_hl * 2); $pdf->MultiCell(42, $tab2_hl, "Total HT aprés remise", 0, 'R', 0); $pdf->SetXY (132, $tab2_top + $tab2_hl * 3); - $pdf->MultiCell(42, $tab2_hl, "Total TVA", 0, 'R', 0); + $pdf->MultiCell(42, $tab2_hl, $langs->trans("TotalVAT"), 0, 'R', 0); $pdf->SetXY (132, $tab2_top + $tab2_hl * 4); - $pdf->MultiCell(42, $tab2_hl, "Total TTC", 0, 'R', 1); + $pdf->MultiCell(42, $tab2_hl, $langs->trans("TotalTTC"), 0, 'R', 1); $pdf->SetXY (174, $tab2_top + 0); $pdf->MultiCell(26, $tab2_hl, price($fac->total_ht + $fac->remise), 0, 'R', 0); diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index 0d0d37ebd51..74efd652a50 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -526,7 +526,7 @@ class pdf_crabe extends ModelePDFFactures $pdf->Text(153, $tab_top + 5, $langs->trans("Qty")); $pdf->line(162, $tab_top, 162, $tab_top + $tab_height); - $pdf->Text(163, $tab_top + 5,'Remise'); + $pdf->Text(163, $tab_top + 5,$langs->trans("Discount")); $pdf->line(177, $tab_top, 177, $tab_top + $tab_height); $pdf->Text(185, $tab_top + 5, $langs->trans("TotalHT")); diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php index 3713d286195..7609f5cbd39 100644 --- a/htdocs/includes/modules/facture/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php @@ -452,7 +452,7 @@ class pdf_oursin extends ModelePDFFactures if ($fac->remise > 0) { $pdf->SetXY ($col1x, $tab2_top + $tab2_hl); - $pdf->MultiCell($col2x-$col1x, $tab2_hl, "Remise globale", 0, 'L', 0); + $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->trans("GlobalDiscount"), 0, 'L', 0); $pdf->SetXY ($col2x, $tab2_top + $tab2_hl); $pdf->MultiCell(26, $tab2_hl, "-".$fac->remise_percent."%", 0, 'R', 0); diff --git a/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php b/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php index 9f04f95d097..dffe47679f7 100644 --- a/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php @@ -187,19 +187,19 @@ class pdf_propale_rouge extends ModelePDFPropales $pdf->line(174, $tab2_top, 174, $tab2_top + $tab2_height); $pdf->SetXY (132, $tab2_top + 0); - $pdf->MultiCell(42, $tab2_lh, "Total HT", 0, 'R', 0); + $pdf->MultiCell(42, $tab2_lh, $langs->trans("TotalHT"), 0, 'R', 0); $pdf->SetXY (132, $tab2_top + $tab2_lh); - $pdf->MultiCell(42, $tab2_lh, "Remise HT", 0, 'R', 0); + $pdf->MultiCell(42, $tab2_lh, $langs->trans("Discount"), 0, 'R', 0); $pdf->SetXY (132, $tab2_top + $tab2_lh*2); $pdf->MultiCell(42, $tab2_lh, "Total HT après remise", 0, 'R', 0); $pdf->SetXY (132, $tab2_top + $tab2_lh*3); - $pdf->MultiCell(42, $tab2_lh, "Total TVA", 0, 'R', 0); + $pdf->MultiCell(42, $tab2_lh, $langs->trans("TotalVAT"), 0, 'R', 0); $pdf->SetXY (132, $tab2_top + ($tab2_lh*4)); - $pdf->MultiCell(42, $tab2_lh, "Total TTC", 1, 'R', 1); + $pdf->MultiCell(42, $tab2_lh, $langs->trans("TotalTTC"), 1, 'R', 1); $pdf->SetXY (174, $tab2_top + 0); $pdf->MultiCell(26, $tab2_lh, price($propale->total_ht + $propale->remise), 0, 'R', 0); diff --git a/htdocs/includes/modules/propale/pdf_propale_vert.modules.php b/htdocs/includes/modules/propale/pdf_propale_vert.modules.php index 7f1d9340640..77109736ddd 100644 --- a/htdocs/includes/modules/propale/pdf_propale_vert.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_vert.modules.php @@ -189,19 +189,19 @@ class pdf_propale_vert extends ModelePDFPropales $pdf->line(174, $tab2_top, 174, $tab2_top + $tab2_height); $pdf->SetXY (132, $tab2_top + 0); - $pdf->MultiCell(42, $tab2_lh, "Total HT", 0, 'R', 0); + $pdf->MultiCell(42, $tab2_lh, $langs->trans("TotalHT"), 0, 'R', 0); $pdf->SetXY (132, $tab2_top + $tab2_lh); - $pdf->MultiCell(42, $tab2_lh, "Remise globale HT", 0, 'R', 0); + $pdf->MultiCell(42, $tab2_lh, $langs->trans("GlobalDiscount"), 0, 'R', 0); $pdf->SetXY (132, $tab2_top + $tab2_lh*2); $pdf->MultiCell(42, $tab2_lh, "Total HT après remise", 0, 'R', 0); $pdf->SetXY (132, $tab2_top + $tab2_lh*3); - $pdf->MultiCell(42, $tab2_lh, "Total TVA", 0, 'R', 0); + $pdf->MultiCell(42, $tab2_lh, $langs->trans("TotalVAT"), 0, 'R', 0); $pdf->SetXY (132, $tab2_top + ($tab2_lh*4)); - $pdf->MultiCell(42, $tab2_lh, "Total TTC", 1, 'R', 1); + $pdf->MultiCell(42, $tab2_lh, $langs->trans("TotalTTC"), 1, 'R', 1); $pdf->SetXY (174, $tab2_top + 0); $pdf->MultiCell(26, $tab2_lh, price($propale->total_ht + $propale->remise), 0, 'R', 0); @@ -241,11 +241,11 @@ class pdf_propale_vert extends ModelePDFPropales $pdf->SetXY(132, $yt); $pdf->line(132, $tab_top, 132, $tab_top + $tab_height); - $pdf->MultiCell(10,5,'TVA',0,'C'); + $pdf->MultiCell(10,5,$langs->trans("VAT"),0,'C'); $pdf->line(142, $tab_top, 142, $tab_top + $tab_height); $pdf->SetXY(142, $yt); - $pdf->MultiCell(8,5,'Qté',0,'C'); + $pdf->MultiCell(8,5,$langs->trans("Qty"),0,'C'); $pdf->line(150, $tab_top, 150, $tab_top + $tab_height); $pdf->SetXY(150, $yt); @@ -253,11 +253,11 @@ class pdf_propale_vert extends ModelePDFPropales $pdf->line(166, $tab_top, 166, $tab_top + $tab_height); $pdf->SetXY(166, $yt); - $pdf->MultiCell(14,5,'Remise',0,'C'); + $pdf->MultiCell(14,5,$langs->trans("Discount"),0,'C'); $pdf->line(180, $tab_top, 180, $tab_top + $tab_height); $pdf->SetXY(180, $yt); - $pdf->MultiCell(20,5,'Total',0,'R'); + $pdf->MultiCell(20,5,$langs->trans("Total"),0,'R'); // $pdf->Rect(10, $tab_top, 190, $nexY - $tab_top); $pdf->Rect(10, $tab_top, 190, $tab_height); diff --git a/htdocs/telephonie/ligne/communications.php b/htdocs/telephonie/ligne/communications.php index ad00f90ed09..a0004e4ce7b 100644 --- a/htdocs/telephonie/ligne/communications.php +++ b/htdocs/telephonie/ligne/communications.php @@ -93,7 +93,7 @@ if ($result) print ''; print ''; - print ''; + print ''; print "\n"; print ''; diff --git a/htdocs/telephonie/ligne/remises.php b/htdocs/telephonie/ligne/remises.php index a1809734100..e2281e2ff3c 100644 --- a/htdocs/telephonie/ligne/remises.php +++ b/htdocs/telephonie/ligne/remises.php @@ -54,7 +54,7 @@ if ( $result ) $h++; $head[$h][0] = DOL_URL_ROOT."/telephonie/ligne/remises.php?id=".$ligne->id; - $head[$h][1] = $langs->trans('Remises'); + $head[$h][1] = $langs->trans('Discounts'); $hselected=$h; $h++; @@ -63,7 +63,7 @@ if ( $result ) print_fiche_titre('Fiche Ligne', $mesg); - print '
".$langs->trans("Ref")."Produit'.$langs->trans("Price").'RemiseQté.
'.$langs->trans("Ref").''.$langs->trans("Product").''.$langs->trans("Price").''.$langs->trans("Discount").''.$langs->trans("Qty").'
'.$langs->trans("Description").'TvaQuantitéRemise'.$langs->trans("VAT").''.$langs->trans("Qty").''.$langs->trans("Discount").'P.U.  
'.$langs->trans("Description").'TvaQuantitéRemise'.$langs->trans("VAT").''.$langs->trans("Qty").''.$langs->trans("Discount").'P.U.  
Vente /secVente FixeAchat /secAchat FixeRemise'.$langs->trans("Discount").'
'; + print '
'; print ''; @@ -104,13 +104,13 @@ if ( $result ) } print '
Numéro'.dolibarr_print_phone($ligne->numero).'

'; - print ''; + print '
'; print ''; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; /* historique */
DateRemiseCommentaireUtilisateur'.$langs->trans("Discount").''.$langs->trans("Comment").''.$langs->trans("User").'