diff --git a/htdocs/adherents/edit.php b/htdocs/adherents/edit.php index 10b1d52c0ba..0095b0441df 100644 --- a/htdocs/adherents/edit.php +++ b/htdocs/adherents/edit.php @@ -137,11 +137,11 @@ if ($rowid) $htmls = new Form($db); - print "Type"; + print ''.$langs->trans("Type").''; $htmls->select_array("type", $adht->liste_array(), $adh->typeid); print ""; - print 'Commentaires'; + print ''.$langs->trans("Comments").''; $morphys["phy"] = "Physique"; $morphys["mor"] = "Morale"; diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index b37db3ece0d..4c431e7a8f4 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -359,11 +359,11 @@ if ($action == 'create') { $htmls = new Form($db); $adht = new AdherentType($db); - print 'Type'; + print ''.$langs->trans("Type").''; $htmls->select_array("type", $adht->liste_array()); print "\n"; - print 'Commentaires :'; + print ''.$langs->trans("Comments").' :'; $morphys["phy"] = "Physique"; $morphys["mor"] = "Morale"; @@ -512,12 +512,12 @@ if ($rowid > 0) print "
\n"; - print ''; + print '
'; print ''; - print ''; + print ''; - print "\n"; + print '\n"; print ''; diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 02ef535cae0..49836f22402 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -42,7 +42,7 @@ print '
'; print '
Numero'.$adh->id.' Commentaires
'.$langs->trans("Comments").'
Type$adh->type
'.$langs->trans("Type").''.$adh->type."'; print nl2br($adh->commentaire).' 
'; print ''; -print ""; +print ''; print ""; print ""; print ""; diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php index bc762071090..1ffb22a46a9 100644 --- a/htdocs/adherents/liste.php +++ b/htdocs/adherents/liste.php @@ -108,7 +108,7 @@ if ($result) print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; diff --git a/htdocs/adherents/options.php b/htdocs/adherents/options.php index 1631a90af07..4dec847ef22 100644 --- a/htdocs/adherents/options.php +++ b/htdocs/adherents/options.php @@ -92,9 +92,9 @@ llxHeader(); print "
Type'.$langs->trans("Type").'A validerValidesCotisants à jour"; - print_liste_field_titre("Type","liste.php","t.libelle","&page=$page&statut=$statut"); + print_liste_field_titre($langs->trans("Type"),"liste.php","t.libelle","&page=$page&statut=$statut"); print ""; @@ -116,7 +116,7 @@ if ($result) print ""; - print_liste_field_titre("Statut","liste.php","d.statut","&page=$page&statut=$statut"); + print_liste_field_titre($langs->trans("Status"),"liste.php","d.statut","&page=$page&statut=$statut"); print "Action
"; print ''; - print ""; + print ''; print ""; - print ""; + print ''; print "\n"; $var=True; @@ -104,7 +104,7 @@ llxHeader(); print ""; print "\n"; print "\n"; - print "\n"; + print "\n"; print "\n"; print ""; @@ -139,9 +139,9 @@ if ($_GET["action"] == 'create') { print ''; - print ''; + print ''; print ''; - print '"; - print ""; print ''; @@ -251,9 +251,9 @@ else print '
Libelle'.$langs->trans("Label").'Nom de l'attributType '.$langs->trans("Type").' 
".$adho->attribute_label[$key]." $key$value$value".img_edit().""; print "  ".img_delete()."
Libellé
'.$langs->trans("Label").'
Nom de l\'attribut (pas d\'espace et uniquement des carateres alphanumeriques)
Type'; + print '
'.$langs->trans("Type").''; $form->select_array('type',array('varchar'=>'chaine', 'text'=>'texte', 'int'=>'entier', @@ -176,10 +176,10 @@ if ($_GET["attrname"] && $_GET["action"] == 'edit') print ''; print ''; - print ''; + print ''; print ''; list($type,$size)=preg_split('/\(|\)/',$adho->attribute_name[$_GET["attrname"]]); - print ''; print ""; - print ""; + print ''; print "\n"; $var=True; @@ -157,7 +157,7 @@ if ($_GET["action"] == 'create') { print ''; - print ''; + print ''; print '"; print '
Libellé
'.$langs->trans("Label").'
Nom de l\'attribut'.$_GET["attrname"].' 
Type'; + print '
'.$langs->trans("Type").''; $form->select_array('type',array('varchar'=>'chaine', 'text'=>'texte', 'int'=>'entier', diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 08d15cfe494..81ac371fa6a 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -103,7 +103,7 @@ if ($result) print '
IdLibelléCotisation ?Vote ? '.$langs->trans("Label").'Cotisation ?Vote ? 
Libellé
'.$langs->trans("Label").'
Soumis à cotisation'; @@ -169,7 +169,7 @@ if ($_GET["action"] == 'create') { print ''; - print '
Commentaires :'; + print '
'.$langs->trans("Comments").' :'; print "
Mail d\'accueil :'; @@ -207,7 +207,7 @@ if ($_GET["rowid"] > 0 && $_GET["action"] == 'edit') print ''; print ''; - print ''; + print ''; print ''; - print '"; print '\n"; -print "\n"; +print "\n"; print "\n"; print "\n"; print "\n"; diff --git a/htdocs/admin/system/mysql-tables-contraintes.php b/htdocs/admin/system/mysql-tables-contraintes.php index 7bb7339f132..037b3ca8f95 100644 --- a/htdocs/admin/system/mysql-tables-contraintes.php +++ b/htdocs/admin/system/mysql-tables-contraintes.php @@ -33,7 +33,7 @@ print '
'; print '
Libellé
'.$langs->trans("Label").'
Soumis à cotisation'; @@ -220,7 +220,7 @@ if ($_GET["rowid"] > 0 && $_GET["action"] == 'edit') $htmls->selectyesno("vote",$adht->vote); print '
Commentaires :'; + print '
'.$langs->trans("Comments").' :'; print "
Mail d\'accueil :'; diff --git a/htdocs/admin/adherent.php b/htdocs/admin/adherent.php index 34b36bb33ce..e72eb956a5c 100644 --- a/htdocs/admin/adherent.php +++ b/htdocs/admin/adherent.php @@ -232,13 +232,13 @@ function form_constantes($tableau){ global $db,$bc; $form = new Form($db); print ''; - print ''; - print ''; - print ''; - print ''; - //print ''; - print ""; - print "\n"; + print ''; + print ''; + print ''; + print ''; + //print ''; + print ""; + print "\n"; $var=True; foreach($tableau as $const){ diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index fbf98f2c7f6..a798f0a342a 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -350,7 +350,7 @@ print '
DescriptionValeurTypeNoteAction
'.$langs->trans("Description").'Valeur'.$langs->trans("Type").'NoteAction
'; print ''; print ''; print ''; -print ''; +print ''; print ''; print "\n"; $var=True; diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php index 9a363de4af5..440293402ec 100644 --- a/htdocs/admin/ldap.php +++ b/htdocs/admin/ldap.php @@ -87,7 +87,7 @@ print ''; print ''; print ''; -print ''; +print ''; print '
OptionDescription'.$langs->trans("Option").''.$langs->trans("Description").'
Serveur LDAP'.LDAP_SERVER_HOST.'
DN'.LDAP_SERVER_DN.'
Pass'.LDAP_SERVER_PASS.'
Type'.LDAP_SERVER_TYPE.'
'.$langs->trans("Type").''.LDAP_SERVER_TYPE.'
'; diff --git a/htdocs/admin/system/gendata.php b/htdocs/admin/system/gendata.php index 350cc6e7742..ddcb42cff17 100644 --- a/htdocs/admin/system/gendata.php +++ b/htdocs/admin/system/gendata.php @@ -77,8 +77,8 @@ if ($action == 'product') $produit->type = 1; $produit->envente = 1; $produit->ref = time() . "$f"; - $produit->libelle = "Libelle"; - $produit->description = "Description"; + $produit->libelle = $langs->trans("Label"); + $produit->description = $langs->trans("Description"); $produit->price = rand(1,10000); $produit->tva_tx = "19.6"; $produit->create($user); diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php index 45a91130955..d89f2efd311 100644 --- a/htdocs/admin/system/index.php +++ b/htdocs/admin/system/index.php @@ -89,7 +89,7 @@ if ($result) $row = $db->fetch_row(); } print "
Version" . $row[1] . "
Type" . $conf->db->type . "
".$langs->trans("Type")."" . $conf->db->type . "
Host" . $conf->db->host . "
User" . $conf->db->user . " 
Pass" . $conf->db->pass . " 
'; print ''; print ''; -print ''; +print ''; print ''; print "\n"; diff --git a/htdocs/admin/system/mysql-tables.php b/htdocs/admin/system/mysql-tables.php index 8125f047db4..a8fed76dd11 100644 --- a/htdocs/admin/system/mysql-tables.php +++ b/htdocs/admin/system/mysql-tables.php @@ -38,7 +38,7 @@ print '
'; print '
TablesType'.$langs->trans("Type").'Contraintes
'; print ''; print ''; -print ''; +print ''; print ''; print ''; print ''; diff --git a/htdocs/boutique/commande/ca.php b/htdocs/boutique/commande/ca.php index 7a4f45d90a8..1e45435253b 100644 --- a/htdocs/boutique/commande/ca.php +++ b/htdocs/boutique/commande/ca.php @@ -40,8 +40,8 @@ $offset = $limit * $page ; print_barre_liste("Liste des commandes", $page, "ca.php"); -print '

Nom de la tableType'.$langs->trans("Type").'Format lignesNb enr.Avg_row_length
'; -print ''; +print '
Description
'; +print ''; print ''; $sql = "SELECT sum(t.value) as value"; @@ -57,11 +57,11 @@ if ( $db->query($sql) ) { $objp = $db->fetch_object(0); $var=!$var; - print ""; + print ""; print ''; print ''; - print "\n"; + print "\n"; $i++; } @@ -85,7 +85,7 @@ if ( $db->query($sql) ) { $objp = $db->fetch_object(0); $var=!$var; - print ""; + print ""; print ''; print ''; $i++; diff --git a/htdocs/boutique/commande/index.php b/htdocs/boutique/commande/index.php index a046ba9af62..625fd445e0a 100644 --- a/htdocs/boutique/commande/index.php +++ b/htdocs/boutique/commande/index.php @@ -55,27 +55,23 @@ if ( $db->query($sql) ) print "'; - // print ''; - // print ''; - print "\n"; + print "\n"; $var=True; while ($i < $num) { $objp = $db->fetch_object( $i); $var=!$var; - print ""; + print ""; print ''; - print '\n"; + print '\n"; print ''; - // print ''; - // print ''; - print "\n"; + print "\n"; $i++; } - print "
'.$langs->trans("Description").''.$langs->trans("LastName").'
Somme des commandes'.price($objp->value).'
Somme des frais de port'.price($objp->value).'
Numéro".$langs->trans("Date").""; print_liste_field_titre("Client","commande.php", "customers_name"); print ''.$langs->trans("Total").'Statut
Fiche '; print $objp->orders_id .""; print strftime("%d %B %Y",$objp->date_purchased).''.$objp->customers_name."'.$objp->customers_name."'.price($objp->value).''.$objp->orders_status.''.$objp->orders_date_finished.'
"; + print "
"; $db->free(); } else diff --git a/htdocs/boutique/livre/fiche.php b/htdocs/boutique/livre/fiche.php index c6aa77729f8..b79119a4109 100644 --- a/htdocs/boutique/livre/fiche.php +++ b/htdocs/boutique/livre/fiche.php @@ -184,7 +184,7 @@ if ($action == 'create') $htmls->select_array("editeurid", $edits->liste_array(), $livre->editeurid); print "
Description"; + print '
'.$langs->trans("Description").''; print '
 
'; print ""; print ''; - print ""; + print ''; - print "
'.$langs->trans("Ref").'Description
'.$langs->trans("Description").'
Statut$livre->status_text"; + print '
'.$langs->trans("Status").''.$livre->status_text; if ($livre->status == 0) { print '
Changer'; @@ -350,9 +350,9 @@ else print ''; print ""; print ''; - print ''; + print ''; print ''; - print "\n"; $var=True; diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php index 0241c86cc76..7e0726742dc 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.php @@ -96,7 +96,7 @@ if ($_GET["propalid"]) $url = DOL_URL_ROOT.'/comm/prospect/fiche.php?socid='.$societe->id; } print ''.$societe->nom.''; - print ''; + print ''; print ''; print ''; - print ""; + print ""; if ($societe->url) { @@ -138,7 +138,7 @@ if ($socid > 0) } print ""; - print ""; + print ''; print ''; diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 86cc6a7d596..c32aeb31d6d 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -547,7 +547,7 @@ else if ($num) { print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -650,7 +650,7 @@ else print ""; print ""; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index b4b8b8e71b3..328d7b2da2c 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -217,7 +217,7 @@ if ($account > 0) print ''; } print ''; - print ''; + print ''; print ''; print ''; @@ -292,7 +292,7 @@ if ($account > 0) print ""; print ''; print ''; - print ''; + print ''; print ''; print ''; } diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php index f18020c9c5d..4f892a42e5e 100644 --- a/htdocs/compta/bank/budget.php +++ b/htdocs/compta/bank/budget.php @@ -42,7 +42,7 @@ if ($_GET["bid"] == 0) print '
'.$langs->trans("Ref").''.$livre->ref.'Description'.$langs->trans("Description").'Catégories
Statut$livre->status_text"; + print '
'.$langs->trans("Status").''.$livre->status_text; if ($livre->status == 0) { print '
Changer'; diff --git a/htdocs/boutique/newsletter/index.php b/htdocs/boutique/newsletter/index.php index bab5a69cec9..480677aab31 100644 --- a/htdocs/boutique/newsletter/index.php +++ b/htdocs/boutique/newsletter/index.php @@ -47,34 +47,34 @@ if ( $db->query($sql) ) { $num = $db->num_rows(); $i = 0; - print "

"; - print "
"; + print ""; + print ""; - print ''; + print ''; print ''; - print "\n"; + print "\n"; $var=True; while ($i < $num) { $objp = $db->fetch_object( $i); $var=!$var; - print ""; + print ""; print '\n"; - print ''; - print ''; - print "\n"; + print "rowid\">$objp->email_subject\n"; + print ''; + print ''; + print "\n"; $i++; } - print "
"; print_liste_field_titre("Sujet","index.php", "email_subject"); print "Statut'.$langs->trans("Status").'Nb envois
Fiche '; - print "rowid\">$objp->email_subject'.$objp->status.''.$objp->nbsent.'
'.$objp->status.''.$objp->nbsent.'
"; + print "
"; $db->free(); } else { - print $db->error(); + dolibarr_print_error($db); } $db->close(); diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 08dd7e467a4..78f65036ff8 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -332,7 +332,7 @@ if ($_GET["id"]) print ''; print ''; - print ''; + print ''; print ''; print ''; @@ -362,7 +362,7 @@ if ($_GET["id"]) print_titre ("Action commerciale"); print '
Type'.$act->type.'
'.$langs->trans("Type").''.$act->type.'
Société'.$act->societe->nom.'
'; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index be458b400e0..03f62d05d2a 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -73,7 +73,7 @@ if ($_GET["action"] == 'create') print ''; print '"; + print $langs->trans("Comments").''; print ""; print ""; - print ""; + print ''; print ""; print ""; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index be1031003ce..6fb6de87453 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -302,7 +302,7 @@ if ($_GET["propalid"]) $url = DOL_URL_ROOT.'/comm/prospect/fiche.php?socid='.$societe->id; } print ''.$societe->nom.''; - print ''; + print ''; print ''; print "
Type'.$act->type.'
'.$langs->trans("Type").''.$act->type.'
Société'.$act->societe->nom.'
Société'.$soc->nom.''; - print "Commentaires
Date"; print_date_select(); diff --git a/htdocs/comm/bookmark.php b/htdocs/comm/bookmark.php index fee5c71d10a..65618514519 100644 --- a/htdocs/comm/bookmark.php +++ b/htdocs/comm/bookmark.php @@ -85,7 +85,7 @@ if ( $db->query($sql) ) print "IdSocieteStatut'.$langs->trans("Status").'".$langs->trans("Author")."".$langs->trans("Date")."Statut'.$obj->lst.'
'.$langs->trans("Status").''.$obj->lst.'
Date'.strftime("%A %d %B %Y",$propal->date); if ($propal->fin_validite) @@ -378,7 +378,7 @@ if ($_GET["propalid"]) print "
Commentaires :
"; @@ -897,7 +897,7 @@ if ($_GET["propalid"]) 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_liste_field_titre_new ($langs->trans("Status"),"propal.php","p.fk_statut","","&socidp=$socidp&viewstatut=$viewstatut",'width="10%" align="center"',$sortfield); print "

Statut'.$propal->statut_libelle.'
'.$langs->trans("Status").''.$propal->statut_libelle.'
Date'.strftime("%A %d %B %Y",$propal->date); if ($propal->fin_validite) diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php index b4ec8afd73c..991861cd9dc 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -125,7 +125,7 @@ if ($socid > 0) print '
Siret'.$societe->siret.'Capital'.$societe->capital.'
Type $societe->typentEffectif$societe->effectif
".$langs->trans("Type")." $societe->typentEffectif$societe->effectif
Forme juridique$societe->forme_juridique
Statut$societe->statut_commercial
'.$langs->trans("Status").''.$societe->statut_commercial.' '; print ''; print 'Ne pas contacter'; diff --git a/htdocs/comm/prospect/prospects.php b/htdocs/comm/prospect/prospects.php index 76c16bce848..099afaa66a2 100644 --- a/htdocs/comm/prospect/prospects.php +++ b/htdocs/comm/prospect/prospects.php @@ -154,7 +154,7 @@ if ($result) print ""; print_liste_field_titre("Département","prospects.php","s.fk_departement"); print ""; - print_liste_field_titre("Statut","prospects.php","s.fk_stcomm"); + print_liste_field_titre($langs->trans("Status"),"prospects.php","s.fk_stcomm"); print ""; print_liste_field_titre("Insertion","prospects.php","s.datec"); print ' 
Description'.$langs->trans("Description").'TvaQuantitéRemise
Description'.$langs->trans("Description").'TvaQuantitéRemise
Date OpeValeurTypeDescriptionDate OpeValeur'.$langs->trans("Type").''.$langs->trans("Description").'DébitCréditSoldeRelevé
YYYY MMDD Description0000.000000.00YYYY MMDD '.$langs->trans("Description").'0000.000000.00
'; print ""; - echo ''; + print ''; print "\n"; $sql = "SELECT sum(d.amount) as somme, count(*) as nombre, c.label, c.rowid "; @@ -100,7 +100,7 @@ else print '
DescriptionNb'.$langs->trans("Total").'Moyenne'.$langs->trans("Description").'Nb'.$langs->trans("Total").'Moyenne
'; print ""; - echo ''; + print ''; print "\n"; $sql = "SELECT d.amount, d.label, ".$db->pdate("d.dateo")." as do, d.rowid"; diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php index 302beb7f8a4..2c6a77d68a9 100644 --- a/htdocs/compta/bank/categ.php +++ b/htdocs/compta/bank/categ.php @@ -55,7 +55,7 @@ print ''; print ""; print '
DateDescriptionMontant Date'.$langs->trans("Description").'Montant 
'; print ''; -print ""; +print ''; print "\n"; $sql = "SELECT rowid, label FROM ".MAIN_DB_PREFIX."bank_categ ORDER BY label"; diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index e9145cedf1d..0ec69b7982a 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -120,7 +120,7 @@ if ($_GET["action"] == 'create') print ''; print ''; - print ''; + print ''; print ''; print ''; @@ -194,7 +194,7 @@ else print ''; print ''; - print ''; + print ''; print ''; print ''; @@ -275,7 +275,7 @@ else print ''; print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index ccf8cca76f3..0447d853c95 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -127,7 +127,7 @@ if ($action == 'delete_categ') print_titre("Edition de la ligne"); print '
NumDescriptionNum'.$langs->trans("Description").'
Banque
Libellé
'.$langs->trans("Label").'
Code BanqueCode GuichetNuméroClé RIB
Banque'.$account->bank.'
Libellé
'.$langs->trans("Label").''.$account->label.'
Code BanqueCode GuichetNuméroClé RIB
Banque
Libellé
'.$langs->trans("Label").'
Code BanqueCode GuichetNuméroClé RIB
'; print ""; -print ""; +print ''; print ""; print ""; print ""; @@ -250,9 +250,9 @@ print "
DateDescriptionDate'.$langs->trans("Description").'DebitCreditReleve
"; print "

Classé dans

"; print ''; -print ""; -print ''; -print "\n"; +print ""; +print ''; +print "\n"; $sql = "SELECT c.label, c.rowid"; $sql .= " FROM ".MAIN_DB_PREFIX."bank_class as a, ".MAIN_DB_PREFIX."bank_categ as c WHERE a.lineid=$rowid AND a.fk_categ = c.rowid "; diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index 28250e20359..2d5e7f288f0 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -128,7 +128,7 @@ if ($result) print '
Description
'.$langs->trans("Description").'
'; print ""; - print ""; + print ''; print ""; print ""; print ""; diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 77fc7f7295b..c3c6a0c4d00 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -159,7 +159,7 @@ else print ""; print '
DateDescriptionDate'.$langs->trans("Description").'DebitCreditReleve
'; print ""; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index a6edb2beb63..fa7ce683820 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -42,10 +42,10 @@ print '
'; print '
Date OpeValeurTypeDescriptionDate OpeValeur'.$langs->trans("Type").''.$langs->trans("Description").'DebitCreditSolde
'; print ""; -print ""; -print ""; -print ""; -print ""; +print ''; +print ""; +print ""; +print ""; print ""; print "\n"; ?> diff --git a/htdocs/compta/caisse/index.php b/htdocs/compta/caisse/index.php index bac479a04c5..e5fa9d4e577 100644 --- a/htdocs/compta/caisse/index.php +++ b/htdocs/compta/caisse/index.php @@ -86,7 +86,7 @@ else { print_fiche_titre("Recettes"); print '
DateDescriptionDebitCreditTypeDate'.$langs->trans("Description").'DebitCredit".$langs->trans("Type")."Compte
'; -print ''; +print ''; print ''; @@ -122,7 +122,7 @@ print '
'; print_fiche_titre("Dépenses"); print '
JourDescriptionMontantType
Jour'.$langs->trans("Description").'Montant'.$langs->trans("Type").'
Fonction pas encore disponible
'; -print ''; +print ''; print ''; diff --git a/htdocs/compta/commande.php b/htdocs/compta/commande.php index 4fe841df678..347e7015a72 100644 --- a/htdocs/compta/commande.php +++ b/htdocs/compta/commande.php @@ -157,7 +157,7 @@ if ($_GET["id"] > 0) if ($num) { print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/compta/config.php b/htdocs/compta/config.php index 5c98c23e0ca..c636d304958 100644 --- a/htdocs/compta/config.php +++ b/htdocs/compta/config.php @@ -57,11 +57,11 @@ if ($action == 'create') { $num = $db->num_rows(); $i = 0; - print "
JourDescriptionMontantType
Jour'.$langs->trans("Description").'Montant'.$langs->trans("Type").'
Fonction pas encore disponible
Description'.$langs->trans("Description").'TvaQuantitéRemise
"; - print ''; - print "\n"; + print "
Numéro"; - print_liste_field_titre("Libellé","config.php","label"); - print "
"; + print ''; + print "\n"; if ($num > 0) { $var=True; @@ -69,16 +69,16 @@ if ($action == 'create') { $objp = $db->fetch_object( $i); $var=!$var; - print ""; + print ""; print ''; print ''; - print "\n"; + print "\n"; $i++; } } - print "
Numéro"; + print_liste_field_titre($langs->trans("Label"),"config.php","label"); + print "
'.$objp->number.''.$objp->label.'
"; + print "
"; $db->free(); } else { print $db->error(); diff --git a/htdocs/compta/dons/edit.php b/htdocs/compta/dons/edit.php index dae9e525f7a..3487df45732 100644 --- a/htdocs/compta/dons/edit.php +++ b/htdocs/compta/dons/edit.php @@ -96,10 +96,10 @@ if ($rowid) print_date_select($don->date); print ""; - print 'Commentaires :
'; + print ''.$langs->trans("Comments").' :
'; print ''; - print "Statut du don"; + print ''.$langs->trans("Status").''; $listst[0] = "Promesse à valider"; $listst[1] = "Promesse validée"; diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index a1f71a3249e..6dd608896ad 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -133,7 +133,7 @@ if ($action == 'create') { print_date_select(); print ''; - print 'Commentaires :
'; + print ''.$langs->trans("Comments").' :
'; print ""; print "Mode de paiement\n"; @@ -208,7 +208,7 @@ if ($rowid > 0 && $action == 'edit') print strftime("%d %B %Y",$don->date); print ""; - print 'Commentaires :
'; + print ''.$langs->trans("Comments").' :
'; print nl2br($don->commentaire).''; if ($don->statut == 1) @@ -319,7 +319,7 @@ if ($rowid > 0 && $action == 'edit') print ''; print ''; print ''; - print "".''; + print "".''; print "".''; print "".''; print '
Commentaires
'.$langs->trans("Comments").'
'; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index ec3aba63aae..59f2ce242e5 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -831,7 +831,7 @@ else $num = $db->num_rows(); $i = 0; $total = 0; echo ''; - print ''; + print ''; print ""; $var=True; @@ -881,7 +881,7 @@ else print ''; print ''; print ''; - print ''; + print ''; if ($fac->note) { print '"; @@ -919,7 +919,7 @@ else if ($num_lignes) { print ""; - print ''; + print ''; print ''; print ''; print ''; @@ -1031,7 +1031,7 @@ else print ""; print ""; - print ''; + print ''; print ''; print ''; print ''; @@ -1454,7 +1454,7 @@ else print ''; print "\n"; diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index a138b61c46d..498225a3f2a 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -152,8 +152,8 @@ if ($_GET["action"] == 'create') echo '
DateType
Date'.$langs->trans("Type").'Montant 
'.MAIN_MONNAIE.'
Montant TTC'.price($fac->total_ttc).''.MAIN_MONNAIE.' TTC
Statut'.($fac->get_libstatut()).'
'.$langs->trans("Status").''.($fac->get_libstatut()).'
Note : '.nl2br($fac->note)."
Description'.$langs->trans("Description").'TvaP.U. HTQuantité
Description'.$langs->trans("Description").'TvaP.U. HTQuantité'; print_liste_field_titre("Reçu",$_SERVER["PHP_SELF"],"am","","&socidp=$socidp"); print ''; - print_liste_field_titre("Statut",$_SERVER["PHP_SELF"],"fk_statut,paye","","&socidp=$socidp"); + print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye","","&socidp=$socidp"); print '
'; if ($num) { - print ""; - print ''; + print ""; + print ''; print ''; print ''; print ''; diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php index 39d9e4c1939..edcd2d967fd 100644 --- a/htdocs/compta/facture/note.php +++ b/htdocs/compta/facture/note.php @@ -100,7 +100,7 @@ if ($_GET["facid"]) $url = DOL_URL_ROOT.'/comm/prospect/fiche.php?socid='.$societe->id; } print ''.$societe->nom.''; - print ''; + print ''; print '"; print ''; - print ''; + print ''; print "".''; @@ -305,7 +305,7 @@ else print stripslashes($fac->note); print ''; - print "".''; print "".''; print ''; @@ -323,8 +323,8 @@ else $authorfullname=$author->fullname; } print ""; - print ""; - print ""; + print '"; + print ""; print "
Description
'.$langs->trans("Description").'TvaQuantitéRemiseStatut'.$facture->statut_libelle.'
'.$langs->trans("Status").''.$facture->statut_libelle.'
Date'.strftime("%A %d %B %Y",$facture->date); if ($facture->fin_validite) diff --git a/htdocs/compta/ligne.php b/htdocs/compta/ligne.php index baa6d7b7c00..8ecc4882031 100644 --- a/htdocs/compta/ligne.php +++ b/htdocs/compta/ligne.php @@ -70,12 +70,12 @@ if ($action == 'create') { print_barre_liste("Comptes comptable",$page,"ligne.php"); - print ""; - print ''; - print "'; - print ""; + print ''; print ''; print ''; if ($_GET["action"] == 'copy') { - print ''; + print ''; } else { - print ''; + print ''; } print "".'
Numéro"; - print_liste_field_titre("Libellé","ligne.php","label"); + print ""; + print ''; + print ""; - print "\n"; + print "\n"; print ''; diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index f7da80d55b4..3c0e17b6626 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -165,10 +165,10 @@ if ($_GET["action"] == 'create') print ""; - print ""; + print ''; + print ''; - print "'; print "\n"; diff --git a/htdocs/compta/stats/comp.php b/htdocs/compta/stats/comp.php index 611c5dcf774..d7307a863e5 100644 --- a/htdocs/compta/stats/comp.php +++ b/htdocs/compta/stats/comp.php @@ -60,7 +60,7 @@ function propals ($db, $year, $month) { print ""; print ""; print ""; - print ""; + print ""; print "\n"; $var=True; } diff --git a/htdocs/compta/voyage/bilan.php b/htdocs/compta/voyage/bilan.php index d944cbfcda1..05eaf6a6422 100644 --- a/htdocs/compta/voyage/bilan.php +++ b/htdocs/compta/voyage/bilan.php @@ -95,12 +95,12 @@ for ($j = 0 ; $j < sizeof($cartes) ; $j++) { $reduc = new Reduc($db); $reduc->fetch($cartes[$j]); - print "
Numéro"; + print_liste_field_titre($langs->trans("Label"),"ligne.php","label"); print "Montant
Date :"; print_date_select(); - print "Commentaires
'.$langs->trans("Comments").'
Type :
'.$langs->trans("Type").' :
Num print 'Date : '.strftime("%d %B %Y",$paiement->date)." 
"; -print 'Type : '.$paiement->type_libelle." 
"; +print $langs->trans("Type").' : '.$paiement->type_libelle." 
"; print 'Montant : '.$paiement->montant." ".MAIN_MONNAIE."
"; diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php index 0496c781e01..39b8b4db4f4 100644 --- a/htdocs/compta/paiement/liste.php +++ b/htdocs/compta/paiement/liste.php @@ -68,21 +68,21 @@ if ($result) print ''; print ''; print ''; print ""; - print "\n"; + print "\n"; while ($i < min($num,$limit)) { $objp = $db->fetch_object( $i); $var=!$var; - print ""; + print ""; print '\n"; - print "\n"; - print ''; + print " ".strftime("%d %B %Y",$objp->dp)."\n"; + print "\n"; + print ''; print ""; $i++; } diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index f8a5e080262..d4af6e0f2f2 100755 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -160,7 +160,7 @@ if ($_GET["action"] == 'create') print ''.$chid.''; print "\n"; print "\n"; - print "\n"; + print '\n"; print "\n"; print ""; @@ -180,7 +180,7 @@ if ($_GET["action"] == 'create') print ""; - print ""; + print ''; print ""; + print ''; print ''; @@ -469,7 +469,7 @@ if ($_GET["propalid"]) 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 ($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_liste_field_titre_new ($langs->trans("Status"),"propal.php","p.fk_statut","&viewstatut=$viewstatut","",'align="center"',$sortfield); print "\n"; while ($i < min($num, $limit)) diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php index 3d37d45b029..5fc806135d2 100644 --- a/htdocs/compta/sociales/charges.php +++ b/htdocs/compta/sociales/charges.php @@ -85,7 +85,7 @@ if ($chid > 0) print '
Date'; - print_liste_field_titre("Type","liste.php","c.libelle","",""); + print_liste_field_titre($langs->trans("Type"),"liste.php","c.libelle","",""); print 'Montant 
'; print img_file(); - print " ".strftime("%d %B %Y",$objp->dp)."$objp->paiement_type $objp->num_paiement'.price($objp->amount).' $objp->paiement_type $objp->num_paiement'.price($objp->amount).' 
Type charge :$charge->type_libelle
Période :$charge->periode
Libellé :$charge->lib
'.$langs->trans("Label").' :'.$charge->lib."
Date échéance :".dolibarr_print_date($charge->date_ech)."
Montant TTC:".price($charge->amount)." euros
Date :"; print_date_select(); print "Commentaires
'.$langs->trans("Comments").'
Type du paiement :
Statut :$obj->lst
'.$langs->trans("Status").' :'.$obj->lst.'
'; - print ""; + print ""; print ""; print ''; + print '
Type$cha->type_libellePaiements
".$langs->trans("Type")."$cha->type_libellePaiements
Période".dolibarr_print_date($cha->periode,"%Y")."'; @@ -105,7 +105,7 @@ if ($chid > 0) $num = $db->num_rows(); $i = 0; $total = 0; echo ''; - print ''; + print ''; print ""; $var=True; @@ -143,19 +143,19 @@ if ($chid > 0) print ""; if ($cha->paye==0) { - print ''; + print ''; print ""; print ""; } else { - print ''; + print ''; print ""; print ""; } - print ""; - print "
DateType
Date'.$langs->trans("Type").'Montant 
Libellé
'.$langs->trans("Label").'
Date d'échéancedate_ech)."\">
Montant TTCamount\">
Libellé'.$cha->lib.'
'.$langs->trans("Label").''.$cha->lib.'
Date d'échéance".dolibarr_print_date($cha->date_ech)."
Montant TTC".price($cha->amount)."
Statut".$cha->getLibStatut()."
"; + print '
'.$langs->trans("Status").''.$cha->getLibStatut().'
'; print "\n"; diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index 3a242a0dd64..32277e71177 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -97,13 +97,13 @@ print_liste_field_titre("Ech print '		'; print_liste_field_titre("Période","index.php","periode"); print ''; -print_liste_field_titre("Type","index.php","type"); +print_liste_field_titre($langs->trans("Type"),"index.php","type"); print ''; -print_liste_field_titre("Libellé","index.php","s.libelle"); +print_liste_field_titre($langs->trans("Label"),"index.php","s.libelle"); print ''; print_liste_field_titre("Montant","index.php","s.amount"); print ''; -print_liste_field_titre("Statut","index.php","s.paye"); +print_liste_field_titre($langs->trans("Status"),"index.php","s.paye"); print ' 
".$langs->trans("Ref")."Date".$langs->trans("Price")."Statut".$langs->trans("Status")."
"; - print ""; - print ''; - print ''; - print ''; - print "\n"; + print "
DescriptionMontant 
"; + print ""; + print ''; + print ''; + print ''; + print "\n"; print ''; print ''; @@ -114,11 +114,11 @@ for ($j = 0 ; $j < sizeof($cartes) ; $j++) { $result = $db->query($sql); if ($result) { - print ""; - print ""; - print ""; + print ""; + print ''; + print ""; print ""; - print "\n"; + print "\n"; $var=True; diff --git a/htdocs/compta/voyage/index.php b/htdocs/compta/voyage/index.php index dfc77e2e879..226344dd573 100644 --- a/htdocs/compta/voyage/index.php +++ b/htdocs/compta/voyage/index.php @@ -78,12 +78,12 @@ if ($result) { print ""; print ""; - print "
'.$langs->trans("Description").'Montant 
'.$reduc->label.''.$reduc->price.' 
DateDescriptionMontant
Date'.$langs->trans("Description").'MontantRéduction
"; - print ""; - print ""; - print ""; + print "
DateDescriptionMontant
"; + print ""; + print ''; + print ""; print ""; - print "\n"; + print "\n"; $var=True; diff --git a/htdocs/compta/voyage/reduc.php b/htdocs/compta/voyage/reduc.php index e8ae93e9e6d..c0742bba545 100644 --- a/htdocs/compta/voyage/reduc.php +++ b/htdocs/compta/voyage/reduc.php @@ -27,11 +27,11 @@ llxHeader(); print_titre ("Abonnement de réduction"); -print "
Date'.$langs->trans("Description").'MontantRéduction
"; -print ""; -print ""; -print ""; -print "\n"; +print "
DateDescriptionMontant
"; +print ""; +print ''; +print ""; +print "\n"; $sql = "SELECT b.rowid,".$db->pdate("b.date_debut")." as debut,".$db->pdate("b.date_fin")." as fin, b.amount, b.label "; diff --git a/htdocs/contrat/enservice.php b/htdocs/contrat/enservice.php index d2f39b0f607..aa9d36c9892 100644 --- a/htdocs/contrat/enservice.php +++ b/htdocs/contrat/enservice.php @@ -70,11 +70,11 @@ if ( $db->query($sql) ) print '
Date'.$langs->trans("Description").'Montant
'; print '"; - print ""; + print ""; print "'; diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 9bd25f58ba2..9c97217c990 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -146,7 +146,7 @@ if ($id) $class = "warning"; $statut= "Ce contrat n'est pas en service"; } - print "\n"; + print "\n"; if ($_GET["request"] == 'miseenservice') { diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index f4032cf10a7..96c038c2140 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -81,11 +81,11 @@ if ( $db->query($sql) ) print ''; print '
'; - print_liste_field_titre("Libellé","enservice.php", "p.label"); + print_liste_field_titre($langs->trans("Label"),"enservice.php", "p.label"); print ""; print_liste_field_titre("Société","enservice.php", "s.nom"); print "Statut".$langs->trans("Status").""; print_liste_field_titre("Date fin","enservice.php", "date_fin_validite"); print '
Statut$statut
".$langs->trans("Status")."$statut
'; print_liste_field_titre("Numéro","index.php", "c.rowid"); print ""; - print_liste_field_titre("Libellé","index.php", "p.label"); + print_liste_field_titre($langs->trans("Label"),"index.php", "p.label"); print ""; print_liste_field_titre("Société","index.php", "s.nom"); print ''; - print_liste_field_titre("Statut","index.php", "c.enservice"); + print_liste_field_titre($langs->trans("Status"),"index.php", "c.enservice"); print ''; print_liste_field_titre("Date Fin","index.php", "c.fin_validite"); diff --git a/htdocs/domain/index.php b/htdocs/domain/index.php index 72e075c617f..91635939233 100644 --- a/htdocs/domain/index.php +++ b/htdocs/domain/index.php @@ -63,12 +63,12 @@ if ($result) { print ""; print ""; - print ""; - print ""; - print ""; + print "
DateDescription
"; + print ""; + print ''; print ""; print ""; - print "\n"; + print "\n"; $var=True; diff --git a/htdocs/expedition/commande.php b/htdocs/expedition/commande.php index d75a8136d20..4a8b4ba976a 100644 --- a/htdocs/expedition/commande.php +++ b/htdocs/expedition/commande.php @@ -142,7 +142,7 @@ if ($_GET["id"] > 0) if ($num) { print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -304,7 +304,7 @@ if ($_GET["id"] > 0) { print '
Date'.$langs->trans("Description").'MontantRéduction
Description'.$langs->trans("Description").'Quan. CommandéeQuan. livréeReste à livrer
'; print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index b23e811dfd1..d18e54fb165 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -179,7 +179,7 @@ if ($_POST["action"] == 'create') if ($num) { print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -369,7 +369,7 @@ else if ($num) { print ''; - print ''; + print ''; print ''; print ''; print "\n"; @@ -450,7 +450,7 @@ else { print '
Description'.$langs->trans("Description").'Quan. livréeExpédition
Description'.$langs->trans("Description").'Quan. commandéeQuan. livréeQuan. à livrer
Description'.$langs->trans("Description").'Quan. commandéeQuan. livrée
'; print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/expedition/liste.php b/htdocs/expedition/liste.php index 6d94aac552f..30b4a2640c1 100644 --- a/htdocs/expedition/liste.php +++ b/htdocs/expedition/liste.php @@ -94,7 +94,7 @@ if ( $db->query($sql) ) print_liste_field_titre_new ("Date","liste.php","e.date_expedition","","&socidp=$socidp", 'width="25%" align="right" colspan="2"',$sortfield); - print_liste_field_titre_new ("Statut","liste.php","e.fk_statut","","&socidp=$socidp",'width="10%" align="center"',$sortfield); + print_liste_field_titre_new ($langs->trans("Status"),"liste.php","e.fk_statut","","&socidp=$socidp",'width="10%" align="center"',$sortfield); print "\n"; $var=True; diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index ac770ddf0ff..84e4884fb1f 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -233,7 +233,7 @@ if ($_GET["action"] == 'create') } print ''; - print ''; + print ''; print "'; @@ -308,7 +308,7 @@ if ($_GET["action"] == 'edit') print ''; - print ''; + print ''; print ''; print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php index b6527ee4dd3..33a5cbeb124 100644 --- a/htdocs/fichinter/index.php +++ b/htdocs/fichinter/index.php @@ -76,8 +76,8 @@ if ( $db->query($sql) ) print_liste_field_titre_new ("Num","index.php","f.ref","","&socid=$socid",'width="15%"',$sortfield); print_liste_field_titre_new ("Société","index.php","s.nom","","&socid=$socid",'',$sortfield); print_liste_field_titre_new ("Date","index.php","f.datei","","&socid=$socid",'',$sortfield); - print ''; - print ''; + print ''; + print ''; print "\n"; $var=True; while ($i < $num) diff --git a/htdocs/fichinter/rapport.php b/htdocs/fichinter/rapport.php index 19cbff5b9c9..bf062ab79a0 100644 --- a/htdocs/fichinter/rapport.php +++ b/htdocs/fichinter/rapport.php @@ -95,25 +95,24 @@ if ( $db->query($sql) ) print_barre_liste($title, $page, "rapport.php","&socid=$socid",$sortfield,$sortorder,'',$num); $i = 0; - print '
Description'.$langs->trans("Description").'Quan. livréeExpédition
Description
'.$langs->trans("Description").'"; print '
Description
'.$langs->trans("Description").''; @@ -345,9 +345,9 @@ if ($_GET["id"]) print '
Société'.$fichinter->client->nom.'
Date'.strftime("%A %d %B %Y",$fichinter->date).'
Numéro'.$fichinter->ref.'
Durée'.$fichinter->duree.'
'.$langs->trans("Duration").''.$fichinter->duree.'
Projet 
Description
'.$langs->trans("Description").''; print nl2br($fichinter->note); print '
DuréeStatut '.$langs->trans("Duration").''.$langs->trans("Status").' 
'; - print ""; + print '
'; + print ""; print ''; if (empty($socid)) print ''; - print ''; + print ''; - print ''; - print ''; -// print ''; - print "\n"; + print ''; + print ''; + print "\n"; $var=True; $DureeTotal = 0; while ($i < $num) { $objp = $db->fetch_object( $i); $var=!$var; - print ""; - print "\n"; + print ""; + print "\n"; if (empty($socid)) { @@ -122,32 +121,21 @@ if ( $db->query($sql) ) print '\n"; } - print ''; - print "\n"; - print ''; + print ''; + print "\n"; + print ''; $DureeTotal += $objp->duree; -/* print ''; - - if ($user->societe_id == 0) - { - print ''; - } - else - { - print ""; - } - */ print "\n"; + print "\n"; $i++; } - print "
NumSociétéDescription'.$langs->trans("Description").'DateDuréeStatut 
Date'.$langs->trans("Duration").'
fichid\">$objp->ref
fichid\">$objp->ref '; print "idp$filter\">$objp->nom'.nl2br($objp->note).'".strftime("%d %B %Y",$objp->dp)."'.sprintf("%.1f",$objp->duree).''.nl2br($objp->note).'".strftime("%d %B %Y",$objp->dp)."'.sprintf("%.1f",$objp->duree).''.$objp->fk_statut.'[Fiche Inter] 
"; + print "
"; $db->free(); - print "
Total $DureeTotal jour[s]"; + print "
".$langs->trans("Total")." $DureeTotal jour[s]"; } else { - print $db->error(); - print "

$sql"; + dolibarr_print_error($db); } $db->close(); diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index e91641ceb5f..c7a37b5a826 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -219,18 +219,18 @@ if ($_GET["action"] == 'create' or $_GET["action"] == 'copy') } } print '

Commentaires
'.$langs->trans("Comments").'
Numéro
Libellé
'.$langs->trans("Label").'
Libellé
'.$langs->trans("Label").'
Date'; $html->select_date(); @@ -240,7 +240,7 @@ if ($_GET["action"] == 'create' or $_GET["action"] == 'copy') print "

"; print ''; - print "".''; + print ''; for ($i = 1 ; $i < 9 ; $i++) { @@ -263,7 +263,7 @@ if ($_GET["action"] == 'create' or $_GET["action"] == 'copy') } print "
 LibelléP.U. HTQuantitéTx TVA
 '.$langs->trans("Label").'P.U. HTQuantitéTx TVA
"; - print '

'; + print '

'; print ""; } @@ -295,7 +295,7 @@ else print "
Société'.stripslashes($fac->socnom).'Commentaires
'.$langs->trans("Comments").'
Numéro'; print '
Libellé'; + print '
'.$langs->trans("Label").''; print '
Montant HT'.price($fac->total_ht).'
".$langs->trans("Author")."$authorfullname
Statut".$fac->LibStatut($fac->paye,$fac->statut)."
'.$langs->trans("Status").''.$fac->LibStatut($fac->paye,$fac->statut)."
trans("Save")."\">
"; print ""; @@ -334,7 +334,7 @@ else */ print "

id&action=add_ligne\" method=\"post\">"; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -396,7 +396,7 @@ else print "\n"; print ""; print "\n"; - print ""; @@ -408,14 +408,14 @@ else $authorfullname=$author->fullname; } print ""; - print ""; + print '"; print "".'"; print '"; print "".'"; if (strlen($fac->note)) { - print "".''; } @@ -440,13 +440,13 @@ else echo '
LibelléP.U. HTQuantitéTotal HT
'.$langs->trans("Label").'P.U. HTQuantitéTotal HTTaux TVATVA'.$langs->trans("TotalTTC").' 
socidp\">Autres factures
Date".dolibarr_print_date($fac->datep,"%A %d %B %Y")."
Libellé"; + print '
'.$langs->trans("Label").''; print $fac->libelle; print "
".$langs->trans("Author")."$authorfullname
Statut".$fac->LibStatut($fac->paye,$fac->statut)."
'.$langs->trans("Status").''.$fac->LibStatut($fac->paye,$fac->statut)."
 '.$langs->trans("TotalHT").''.price($fac->total_ht)."TVA'.price($fac->total_tva)."
 '.$langs->trans("TotalTTC").''.price($fac->total_ttc)."
Commentaires'; + print '
'.$langs->trans("Comments").''; print nl2br(stripslashes($fac->note)); print '
'; print ""; print ""; - print ""; + print ''; if ($fac->statut == 1 && $fac->paye == 0 && $user->societe_id == 0) { $tdsup=' colspan="2"'; } - print " "; + print " "; print "\n"; $var=True; @@ -497,7 +497,7 @@ else * */ print '

DateType'.$langs->trans("Type").'MontantMontant
'; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php index efd600ae764..e3aff2ceea7 100644 --- a/htdocs/fourn/facture/index.php +++ b/htdocs/fourn/facture/index.php @@ -119,7 +119,7 @@ if ($result) print_barre_liste("Liste des factures fournisseurs", $page, "index.php",'', $sortfield, $sortorder,'',$num); - print '
LibelléP.U. HTQantitéTotal HT
'.$langs->trans("Label").'P.U. HTQantitéTotal HTTaux TVATVA'.$langs->trans("TotalTTC").'
'; + print '
'; print ''; print ''; - print ''; + print ''; print ''; @@ -138,7 +138,7 @@ if ($result) print_liste_field_titre("Montant TTC","index.php","fac.total_ttc"); print ''; print ''; print "\n"; $var=True; diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index 1d4f147a7f4..309e4854417 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -118,7 +118,7 @@ if ($action == 'create') $html->select_date(); print ""; - print ""; + print ''; print "\n"; @@ -169,7 +169,7 @@ if ($action == 'create') print "\n"; print "\n"; - print ''; + print ''; print "\n"; print "
'; print_liste_field_titre("Numéro","index.php","facnumber"); @@ -127,7 +127,7 @@ if ($result) print ''; print_liste_field_titre("Date","index.php","fac.datef"); print 'Libellé'.$langs->trans("Label").''; print_liste_field_titre("Société","index.php","s.nom"); print ''; - print_liste_field_titre("Statut","index.php","fk_statut,paye"); + print_liste_field_titre($langs->trans("Status"),"index.php","fk_statut,paye"); print '
Commentaires :
'.$langs->trans("Comments").' :
Reste à payer :".price($total - $sumpayed)." euros TTC
Montant :
\n"; @@ -208,25 +208,25 @@ if ($action == '') { print_barre_liste("Paiements", $page, "paiement.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); - print ''; - print ''; + print '
'; + print ''; print ""; print ""; print ""; - print ""; - print ''; + print ''; + print ''; print ""; while ($i < min($num,$limit)) { $objp = $db->fetch_object( $i); $var=!$var; - print ""; - print "\n"; + print ""; + print "\n"; print ''; - print "\n"; - print "\n"; - print ''; + print "\n"; + print "\n"; + print ''; print ""; $i++; } diff --git a/htdocs/postnuke/articles/fiche.php b/htdocs/postnuke/articles/fiche.php index 0e9ca1add0c..7950897ecbb 100644 --- a/htdocs/postnuke/articles/fiche.php +++ b/htdocs/postnuke/articles/fiche.php @@ -73,7 +73,7 @@ if ($id) print '
FactureSociétéDateTypeMontant'.$langs->trans("Type").'Montant 
facid\">$objp->facnumber
facid\">$objp->facnumber'.$objp->nom.'".strftime("%d %B %Y",$objp->dp)."$objp->paiement_type $objp->num_paiement'.price($objp->amount).' ".strftime("%d %B %Y",$objp->dp)."$objp->paiement_type $objp->num_paiement'.price($objp->amount).' 
'; print "\n"; print ""; - print ""; + print ''; print '"; print ''; @@ -105,9 +105,9 @@ else print '
Titre$article->titre
Description'.$langs->trans("Description").'
 
'; print ""; print ''; - print ''; + print ''; - print "\n"; + print '\n"; print '"; print "\n"; print "\n"; @@ -133,7 +133,7 @@ else print '
'.$langs->trans("Ref").''.$album->ref.'Description
'.$langs->trans("Description").'
Statut$album->status
'.$langs->trans("Status")."$album->status'.nl2br($album->description)."
Titre$album->titre
Annee$album->annee
'; print ""; print ''; - print ""; + print ''; print ''; print '"; print ''; @@ -95,13 +95,13 @@ else { print '
Fiche Album : '.$album->titre.'

'; - print '
'.$langs->trans("Ref").'Description
'.$langs->trans("Description").'
Titre
 
'; - print ""; - print "\n"; - print "\n"; + print '
".$langs->trans("Ref")."$album->refStatut$album->status
'; + print ''; + print '\n"; + print '\n"; print "\n"; print ''; - print '"; + print '"; $gas = $album->liste_groupart(); print ''; - print ''; + print ''; print ''; if ($product->type == 0) { @@ -423,11 +423,11 @@ else } print ''; } - print ""; + print ''; if ($product->type == 1) { - print "".'
'.$langs->trans("Ref")."$album->ref'.$langs->trans("Status").'$album->status
Titre$album->titre'.$langs->trans("Price").''.price($album->price).'
Description'.nl2br($album->description)."
'.$langs->trans("Description").''.nl2br($album->description)."Artiste/Groupe
    '; @@ -123,9 +123,9 @@ else print ''; print ""; print ''; - print ''; - print ''; - print "'; + print ''; + print '"; diff --git a/htdocs/product/concert/fiche.php b/htdocs/product/concert/fiche.php index b5262f44bfd..e6b5f399204 100644 --- a/htdocs/product/concert/fiche.php +++ b/htdocs/product/concert/fiche.php @@ -118,7 +118,7 @@ else print '"; - print '"; + print '"; print "
    '.$langs->trans("Ref").'
    Libellé
    '.$langs->trans("Price").'
    Description"; + print ''.$langs->trans("Label").'
    '.$langs->trans("Price").'
    '.$langs->trans("Description").''; print '
    Lieu'.$lieuconcert->nom_url."
    Description'.nl2br($concert->description)."
    '.$langs->trans("Description").''.nl2br($concert->description)."
    "; @@ -134,9 +134,9 @@ else print ''; print ""; print ''; - print ''; + print ''; print ''; - print ""; diff --git a/htdocs/product/concert/fichelieu.php b/htdocs/product/concert/fichelieu.php index 3003a9a5514..27083ff2cb0 100644 --- a/htdocs/product/concert/fichelieu.php +++ b/htdocs/product/concert/fichelieu.php @@ -68,7 +68,7 @@ if ($action == 'create') print ""; print ''; print ''; - print ""; print ''; @@ -92,7 +92,7 @@ else print '
    '.$langs->trans("Ref").'
    Libellé
    '.$langs->trans("Label").'
    '.$langs->trans("Price").'
    Description"; + print '
    '.$langs->trans("Description").''; print '
    Nom
    Ville
    Description"; + print '
    '.$langs->trans("Description").''; print '
     
    '; print "\n"; print "\n"; - print '"; print "
    Nom$lieuconcert->nom
    Ville$lieuconcert->ville
    Description'; + print '
    '.$langs->trans("Description").''; print nl2br($lieuconcert->description)."
    "; @@ -108,7 +108,7 @@ else print ''; print ''; print ''; - print ""; diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 7d4fefb0603..57781884637 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -253,17 +253,17 @@ if ($_GET["action"] == 'create') print "Cette référence existe déjà"; } print ''; - print ''; + print ''; print ''; print ''; - print ''; if ($_GET["type"] == 0 && defined("MAIN_MODULE_STOCK")) @@ -276,12 +276,12 @@ if ($_GET["action"] == 'create') { print ''; } - print '"; if ($_GET["type"] == 1) { - print "".''; } - print "".''; + print ''; print '
    Nom
    Ville
    Description"; + print '
    '.$langs->trans("Description").''; print '
    Libellé
    '.$langs->trans("Label").'
    Prix de vente
    Taux TVA'; print $html->select_tva("tva_tx"); print '
    Statut'; + print '
    '.$langs->trans("Status").''; print '
    Description'; + print '
    '.$langs->trans("Description").''; print '
    Durée  '; + print '
    '.$langs->trans("Duration").'  '; print 'jour '; print 'semaine '; print 'mois '; @@ -289,7 +289,7 @@ if ($_GET["action"] == 'create') print '
     
     
    '; print ''; } @@ -360,7 +360,7 @@ else print "Cet article n'est pas en vente"; } print '
Libellé'.$product->libelle.'
'.$langs->trans("Label").''.$product->libelle.'
Prix de vente'.price($product->price).'
Description".nl2br($product->description)."
'.$langs->trans("Description").''.nl2br($product->description).'
Durée'.$product->duration_value.' '; + print '
'.$langs->trans("Duration").''.$product->duration_value.' '; if ($product->duration_value > 1) { $plu = "s"; @@ -525,13 +525,13 @@ else print ''; print ''; print "".''; - print ''; + print ''; print "".''; - print "".'".'"; if ($product->type == 1) { - print "".''; print ''; - print ""; print ''; @@ -90,7 +90,7 @@ else print "\n"; print ""; print "\n"; - print ""; + print ''; $gas = $groupart->liste_albums(); print '
'.$langs->trans("Ref").'
Libellé
'.$langs->trans("Label").'
Taux TVA'; $html = new Form($db); print $html->select_tva("tva_tx", $product->tva_tx); print '
Statut'; + print '
'.$langs->trans("Status").''; print ''; } - print "
Description'; + print '
'.$langs->trans("Description").''; print '
Durée'; + print '
'.$langs->trans("Duration").''; switch ($product->duration_unit) { case "d": diff --git a/htdocs/product/groupart/fiche.php b/htdocs/product/groupart/fiche.php index 89d45252d5f..4008dd9f425 100644 --- a/htdocs/product/groupart/fiche.php +++ b/htdocs/product/groupart/fiche.php @@ -64,7 +64,7 @@ if ($action == 'create') print 'Nom
Artiste/Groupe
Description"; + print '
'.$langs->trans("Description").''; print '
 
Nom".$groupart->nom."
Groupe/Artiste".ucfirst(strtolower(strtoupper($groupart->grar)))."
Description".nl2br($groupart->desc)."
'.$langs->trans("Description").''.nl2br($groupart->desc).'
Album(s)
    '; @@ -119,9 +119,9 @@ else print ''; print ''; - print ''; - print "'; + print '"; diff --git a/htdocs/product/index.php b/htdocs/product/index.php index bed1ef9049c..6c26ce0827a 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -48,7 +48,7 @@ print '
    '; print ''; print $langs->trans("Ref").':  '; -print 'Libellé :  '; +print $langs->trans("Label").':  '; print '
    '; print_titre($langs->trans("ProductsAndServices")); diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index ad764a8767d..ea43db01ebc 100644 --- a/htdocs/product/popuprop.php +++ b/htdocs/product/popuprop.php @@ -44,7 +44,7 @@ print '
    Nom
    Artiste/Groupe
    Description"; + print '
    Artiste/Groupe
    '.$langs->trans("Description").''; print '
    '; print "\n"; diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index bcbe7e1199c..a3d8c7b0d82 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -49,7 +49,7 @@ if ($_GET["id"]) print '
    "; print_liste_field_titre($langs->trans("Ref"),"popurop.php", "p.ref"); print ""; -print_liste_field_titre("Libellé","popurop.php", "p.label"); +print_liste_field_titre($langs->trans("Label"),"popurop.php", "p.label"); print ""; print_liste_field_titre("Nb. de proposition","popurop.php", "c"); print "
    '; print ''; print ''; - print ""; + print ''; print '
    '.$langs->trans("Ref").''.$product->ref.''.$langs->trans("Statistics").'
    Libellé$product->libelle
    '.$langs->trans("Label").''.$product->libelle.''; print "Propositions commerciales : ".$product->count_propale($socid); print "
    Proposé à ".$product->count_propale_client($socid)." clients"; diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index 662ce5c6e84..36678782076 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -49,7 +49,7 @@ if ($_GET["id"]) print ''; print ''; print ''; - print ""; + print ''; print '
    '.$langs->trans("Ref").''.$product->ref.''.$langs->trans("Statistics").'
    Libellé$product->libelle
    '.$langs->trans("Label").''.$product->libelle.''; print "Propositions commerciales : ".$product->count_propale($socid); print "
    Proposé à ".$product->count_propale_client($socid)." clients"; diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php index 4feb5079071..5af16b50493 100644 --- a/htdocs/product/stock/fiche.php +++ b/htdocs/product/stock/fiche.php @@ -92,13 +92,13 @@ if ($_GET["action"] == 'create') print_titre("Nouvel entrepôt"); print ''; - print ''; - print ''; + print '"; - print ''; print ''; print '
    Libellé
    Description'; + print '
    '.$langs->trans("Label").'
    '.$langs->trans("Description").''; print '
    Statut'; + print '
    '.$langs->trans("Status").''; print '
     
    '; @@ -121,8 +121,8 @@ else print_fiche_titre('Fiche entrepot', $mesg); print ''; - print ''; - print ""; + print ''; + print ''; print ''; print '\n"; -print ''; +print ''; $morphys["phy"] = "Physique"; $morphys["mor"] = "Morale"; diff --git a/htdocs/public/adherents/priv_edit.php b/htdocs/public/adherents/priv_edit.php index 72c763fcd4c..fda538f43cc 100644 --- a/htdocs/public/adherents/priv_edit.php +++ b/htdocs/public/adherents/priv_edit.php @@ -166,10 +166,10 @@ if (isset($user->login)){ print '
    Libellé'.$entrepot->libelle.'
    Description".nl2br($entrepot->description)."
    '.$langs->trans("Label").''.$entrepot->libelle.'
    '.$langs->trans("Description").''.nl2br($entrepot->description).'
    statut'.$entrepot->statuts[$entrepot->statut].'
    Nb de produits'; print $entrepot->nb_products(); @@ -140,16 +140,16 @@ else print ''; print ''; - print ''; - print ''; + print '"; - print '
    Libellé
    Description'; + print '
    '.$langs->trans("Label").'
    '.$langs->trans("Description").''; print '
    Statut'; + print '
    '.$langs->trans("Status").''; print ''; + print '
    '; - print ""; - print "\n"; + print_liste_field_titre($langs->trans("Label"),"liste.php", "p.label","&envente=$envente&type=$type"); + print ""; + print "\n"; print ''; print ''; diff --git a/htdocs/public/adherents/index.php b/htdocs/public/adherents/index.php index c03cf44ca60..6c4b2f0f7d2 100644 --- a/htdocs/public/adherents/index.php +++ b/htdocs/public/adherents/index.php @@ -25,62 +25,12 @@ llxHeader(); print_titre("Gestion des adhesions a l'association"); -print '

    "; + print "
    "; print_liste_field_titre($langs->trans("Ref"),"liste.php", "p.ref","&envente=$envente&type=$type"); print ""; - print_liste_field_titre("Libellé","liste.php", "p.label","&envente=$envente&type=$type"); - print "Prix de vente
    Prix de vente
    '; +print '
    '; print ''; print ''; print ''; print ''; -/* -print ''; -print ""; -print ""; -print "\n"; -$var=True; - - -$sql = "SELECT count(*) as somme , t.libelle FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."adherent_type as t"; -$sql .= " WHERE d.fk_adherent_type = t.rowid AND d.statut = 1 GROUP BY t.libelle"; - -$result = $db->query($sql); - -if ($result) -{ - $num = $db->num_rows(); - $i = 0; - while ($i < $num) - { - $objp = $db->fetch_object( $i); - - $var=!$var; - print ""; - print ''; - print ''; - - print ""; - - $i++; - } - $db->free(); - -} -print "
    Les menus ci-contre correspondent a:
    -Inscription : Formulaires d\'inscription pour les non-adherents
    -Edition de sa fiche : Permet d\'editer sa fiche d\'adherent
    -Liste des adherents : Permet de voir la liste des adherents (reserve aux adherents)
    TypeNb
    '.$objp->libelle.''.$objp->somme.'
    "; - -print ''; -print '

    '; -print ''; -print ""; -print "\n"; - -print ""; -print ''; -print "
    Rechercher un adhérent
    '; - -print 'Nom/Prénom '; - -print '  '; -print '
    "; -*/ print '

    '; diff --git a/htdocs/public/adherents/new.php b/htdocs/public/adherents/new.php index dad58a4c33a..de6cf6eb945 100644 --- a/htdocs/public/adherents/new.php +++ b/htdocs/public/adherents/new.php @@ -155,11 +155,11 @@ print ''; $htmls = new Form($db); $adht = new AdherentType($db); -print '
    Type'; +print '
    '.$langs->trans("Type").''; $htmls->select_array("type", $adht->liste_array()); print "Commentaires :
    '.$langs->trans("Comments").' :
    '; } - print ''; + print '
    '; - print ""; - print ''; + print ''; + print ''; print ''; print '"; - print ''; + print ''; $morphys["phy"] = "Physique"; $morphys["mor"] = "Morale"; diff --git a/htdocs/public/adherents/priv_fiche.php b/htdocs/public/adherents/priv_fiche.php index c1197abb400..06876680481 100644 --- a/htdocs/public/adherents/priv_fiche.php +++ b/htdocs/public/adherents/priv_fiche.php @@ -48,10 +48,10 @@ if ($rowid > 0) print_titre("Fiche adhérent de $adh->prenom $adh->nom"); - print '
    Type$adh->typeCommentaires
    '.$langs->trans("Type").''.$adh->type.''.$langs->trans("Comments").'
    Personne'.$adh->morphy.' '; @@ -213,11 +213,11 @@ if (isset($user->login)){ $htmls = new Form($db); - print "
    Type"; + print '
    '.$langs->trans("Type").''; $htmls->select_array("type", $adht->liste_array(), $adh->typeid); print "Commentaires
    '.$langs->trans("Comments").'
    '; + print '
    '; - print "\n"; - print ''; + print '\n"; + print ''; print '';
    Type$adh->typeCommentaires
    '.$langs->trans("Type").''.$adh->type."'.$langs->trans("Comments").'
    Personne'.$adh->morphy.'