diff --git a/htdocs/boutique/commande/fiche.php b/htdocs/boutique/commande/fiche.php index cf418032d2c..d12c6e54f60 100644 --- a/htdocs/boutique/commande/fiche.php +++ b/htdocs/boutique/commande/fiche.php @@ -71,8 +71,8 @@ if ($id) $num = $db->num_rows(); $i = 0; print ''; - print ''; - print ''; + print ''; + print ''; print "\n"; $var=True; while ($i < $num) diff --git a/htdocs/boutique/livre/fiche.php b/htdocs/boutique/livre/fiche.php index dce38d5c6b5..72b680d0aad 100644 --- a/htdocs/boutique/livre/fiche.php +++ b/htdocs/boutique/livre/fiche.php @@ -171,7 +171,7 @@ if ($action == 'create') print ""; print ''; print ''; - print ''; + print ''; print ''; print ''; - print ''; + print ''; print '"; - print ''; + print ''; print '
ProduitsNombrePrixPrix final
Produits'.$langs->trans("Number").''.$langs->trans("Price").'Prix final
Référence
Titre
Prix
'.$langs->trans("Price").'
Frais de port
Titre
Année
Prix
'.$langs->trans("Price").'
Frais de port
Prix'.price($livre->price).'
'.$langs->trans("Price").''.price($livre->price).'
Frais de port'; if ($livre->frais_de_port) { diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 249def8b87e..fdae20c0350 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -887,14 +887,14 @@ if ($_GET["propalid"]) $i = 0; print ''; - print ''; + print ''; - print_liste_field_titre_new ("Réf","propal.php","p.ref","","&socidp=$socidp&viewstatut=$viewstatut",'width="15%"',$sortfield); + print_liste_field_titre_new ($langs->trans("Ref"),"propal.php","p.ref","","&socidp=$socidp&viewstatut=$viewstatut",'width="15%"',$sortfield); print_liste_field_titre_new ("Société","propal.php","s.nom","","&socidp=$socidp&viewstatut=$viewstatut",'width="30%"',$sortfield); - print_liste_field_titre_new ("Date","propal.php","p.datep","","&socidp=$socidp&viewstatut=$viewstatut", 'width="25%" align="right" colspan="2"',$sortfield); - print_liste_field_titre_new ("Prix","propal.php","p.price","","&socidp=$socidp&viewstatut=$viewstatut", ' width="20%" align="right"',$sortfield); + print_liste_field_titre_new ($langs->trans("Date"),"propal.php","p.datep","","&socidp=$socidp&viewstatut=$viewstatut", 'width="25%" align="right" colspan="2"',$sortfield); + print_liste_field_titre_new ($langs->trans("Price"),"propal.php","p.price","","&socidp=$socidp&viewstatut=$viewstatut", ' width="20%" align="right"',$sortfield); print_liste_field_titre_new ("Statut","propal.php","p.fk_statut","","&socidp=$socidp&viewstatut=$viewstatut",'width="10%" align="center"',$sortfield); print "\n"; diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index a31eeed658a..b6731e37c00 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -331,7 +331,7 @@ if ($_GET["action"] == 'create') 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 = $propalid"; diff --git a/htdocs/compta/commande.php b/htdocs/compta/commande.php index 1feb92dc8f8..4fe841df678 100644 --- a/htdocs/compta/commande.php +++ b/htdocs/compta/commande.php @@ -256,8 +256,8 @@ if ($_GET["id"] > 0) print_titre("Facture associée"); } print '
RéfProduitPrixRemiseQté.
'.$langs->trans("Price").'RemiseQté.
'; - print ''; - print ''; + print ''; + print ''; print "\n"; $var=True; diff --git a/htdocs/compta/dons/stats.php b/htdocs/compta/dons/stats.php index ba1d7e19ffa..7a69995a380 100644 --- a/htdocs/compta/dons/stats.php +++ b/htdocs/compta/dons/stats.php @@ -24,7 +24,8 @@ require("./pre.inc.php"); llxHeader(); -print_titre("Statistiques"); + +print_titre($langs->trans("Statistics")); $sql = "SELECT d.amount"; $sql .= " FROM ".MAIN_DB_PREFIX."don as d, ".MAIN_DB_PREFIX."don_projet as p"; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 9076cb16471..f40a7823f25 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -620,7 +620,7 @@ if ($_GET["action"] == 'create') print '
NuméroDateAuteurPrix
'.$langs->trans("Ref").''.$langs->trans("Date").''.$langs->trans("Author").''.$langs->trans("Price").'
'; 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"; @@ -680,7 +680,7 @@ if ($_GET["action"] == 'create') print '
RéfProduitPrixRemiseQté.
'.$langs->trans("Price").'RemiseQté.
'; print ''; - print ''; + print ''; $sql = "SELECT pt.rowid, p.label as product, p.ref, pt.subprice, pt.qty, p.rowid as prodid, pt.remise_percent"; $sql .= " FROM ".MAIN_DB_PREFIX."commandedet as pt, ".MAIN_DB_PREFIX."product as p"; @@ -1329,8 +1329,8 @@ else print ''; print ""; print ""; - print ''; - print "\n"; + print ''; + print "\n"; $var=True; while ($i < $num) @@ -1345,7 +1345,7 @@ else $total = $total + $objp->price; $i++; } - print "\n"; + print "\n"; print "
RéfProduitPrixRemiseQté.
'.$langs->trans("Price").'RemiseQté.
NuméroDatePrix
'.$langs->trans("Price").'
Total : ".price($total)." $_MONNAIE HT
".$langs->trans("TotalHT").": ".price($total)." ".MAIN_MONNAIE."
"; } } else { diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index faaafc1e6fe..8d9686ab55b 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -304,9 +304,9 @@ else */ print_titre("Produits"); - print ''; + print '
'; print ''; - print ''; + print ''; $num = sizeof($fac->lignes); $i = 0; diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index c8027e33a8f..bf4cf09c365 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -224,10 +224,10 @@ if ($_GET["propalid"]) } print '
RéfProduitPrixRemiseQté.
'.$langs->trans("Price").'RemiseQté.
'; print ""; - print ""; + print ''; print ''; print ''; - print ''; + print ''; print "\n"; $var=True; @@ -308,10 +308,10 @@ if ($_GET["propalid"]) */ print_titre("Produits"); - print '
Numéro'.$langs->trans("Ref").''.$langs->trans("Date").''.$langs->trans("Author").'Prix'.$langs->trans("Price").'
'; - print ""; - print ""; - print ''; + print '
RéfProduitPrixRemiseQté.
'; + 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; @@ -465,10 +465,10 @@ if ($_GET["propalid"]) $i = 0; print "
".$langs->trans("Ref")."Produit'.$langs->trans("Price").'RemiseQté.
"; print ''; - print_liste_field_titre_new ("Réf","propal.php","p.ref","","&year=$year&viewstatut=$viewstatut",'',$sortfield); + print_liste_field_titre_new ($langs->trans("Ref"),"propal.php","p.ref","","&year=$year&viewstatut=$viewstatut",'',$sortfield); print_liste_field_titre_new ("Société","propal.php","s.nom","&viewstatut=$viewstatut","",'',$sortfield); print_liste_field_titre_new ("Date","propal.php","p.datep","&viewstatut=$viewstatut","",'align="right" colspan="2"',$sortfield); - print_liste_field_titre_new ("Prix","propal.php","p.price","&viewstatut=$viewstatut","",'align="right"',$sortfield); + print_liste_field_titre_new ($langs->trans("Price"),"propal.php","p.price","&viewstatut=$viewstatut","",'align="right"',$sortfield); print_liste_field_titre_new ("Statut","propal.php","p.fk_statut","&viewstatut=$viewstatut","",'align="center"',$sortfield); print "\n"; diff --git a/htdocs/compta/stats/comp.php b/htdocs/compta/stats/comp.php index d864470c0c1..611c5dcf774 100644 --- a/htdocs/compta/stats/comp.php +++ b/htdocs/compta/stats/comp.php @@ -57,9 +57,9 @@ function propals ($db, $year, $month) { print ""; print ""; - print ""; + print ""; print ""; - print ""; + print ""; print ""; print "\n"; $var=True; diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 1682faf53c8..ed5649387da 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -58,6 +58,7 @@ Cut=Cut Copy=Copy Paste=Paste Default=Default +Price=Price Amount=Amount AmountHT=Amount HT AmountTTC=Amount TTC diff --git a/htdocs/langs/fr_BE/main.lang b/htdocs/langs/fr_BE/main.lang index be60c432ce1..97f3c0e9a54 100644 --- a/htdocs/langs/fr_BE/main.lang +++ b/htdocs/langs/fr_BE/main.lang @@ -58,6 +58,7 @@ Cut=Couper Copy=Copier Paste=Coller Default=Defaut +Price=Prix Amount=Amount AmountHT=Montant HT AmountTTC=Montant TTC diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 264b9443035..536d4f9682f 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -58,6 +58,7 @@ Cut=Couper Copy=Copier Paste=Coller Default=Defaut +Price=Prix Amount=Amount AmountHT=Montant HT AmountTTC=Montant TTC diff --git a/htdocs/product/album/fiche.php b/htdocs/product/album/fiche.php index b9a52fb7647..ec0887453b2 100644 --- a/htdocs/product/album/fiche.php +++ b/htdocs/product/album/fiche.php @@ -76,7 +76,7 @@ if ($action == 'create') print ""; print ''; print ''; - print ''; + print ''; print ""; @@ -111,7 +111,7 @@ else print '"; print "\n"; print "\n"; - print ''; + print ''; print '"; print ''; - print ''; + print ''; print ''; diff --git a/htdocs/product/categorie/fiche.php b/htdocs/product/categorie/fiche.php index ffdd3add0b3..c2f2f3e5c7a 100644 --- a/htdocs/product/categorie/fiche.php +++ b/htdocs/product/categorie/fiche.php @@ -71,9 +71,9 @@ if ($action == 'create') print '
SocieteRéf".$langs->trans("Ref")."DatePrix".$langs->trans("Price")."Statut
Référence
Titre
Prix
'.$langs->trans("Price").'
Description"; print '
'.nl2br($album->description)."
Titre$album->titre
Annee$album->annee
Prix'.price($album->price).'
'.$langs->trans("Price").''.price($album->price).'
Artiste/Groupe'; foreach ($gas as $key => $value) @@ -141,7 +141,7 @@ else print "
Année
Prix
'.$langs->trans("Price").'
 
'; print ""; - print ''; + print ''; print ''; - print ''; + print ''; print ""; @@ -97,10 +97,10 @@ else print '
Référence
'.$langs->trans("Ref").'
Titre
Prix
'.$langs->trans("Price").'
Description"; print '
'; print ""; - print "\n"; + print "\n"; print "\n"; print "\n"; - print ''; + print ''; print '"; $gas = $album->liste_groupart(); @@ -120,11 +120,11 @@ else print "\n"; print ""; - print '
Référence$album->ref".$langs->trans("Ref")."$album->refStatut$album->status
Titre$album->titrePrix'.price($album->price).'
'.$langs->trans("Price").''.price($album->price).'
Description'.nl2br($album->description)."
'; + print '
'; print ""; - print ''; + print ''; print ''; - print ''; + print ''; print "
Référence
'.$langs->trans("Ref").'
Libellé
Prix
'.$langs->trans("Price").'
Description"; print '