diff --git a/htdocs/contrat/enservice.php b/htdocs/contrat/enservice.php index 4980b144de0..471167fee0d 100644 --- a/htdocs/contrat/enservice.php +++ b/htdocs/contrat/enservice.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -64,20 +65,15 @@ if ( $db->query($sql) ) $num = $db->num_rows(); $i = 0; - print_barre_liste("Liste des contrats en service", $page, "enservice.php", "&sref=$sref&snom=$snom", $sortfield, $sortorder,'',$num); - print ''; + print '
'; - print ''; print_liste_field_titre($langs->trans("Label"),"enservice.php", "p.label"); - print ""; + print_liste_field_titre($langs->trans("Company"),"enservice.php", "s.nom"); print ""; - print "'; + print_liste_field_titre("Date fin","enservice.php", "date_fin_validite","","",'align=\"center\"'); print "\n"; $now=mktime(); diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index d4843e809d9..6f768e54852 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -90,20 +90,12 @@ if ( $db->query($sql) ) print '
'; + print '
"; - print_liste_field_titre("Société","enservice.php", "s.nom"); - print "".$langs->trans("Status").""; - print_liste_field_titre("Date fin","enservice.php", "date_fin_validite"); - print '
'; print ''; - print ''; - print ''; + print_liste_field_titre($langs->trans("Status"),"index.php", "c.enservice","","",'align="center"'); + print_liste_field_titre("Date Fin","index.php", "c.fin_validite","","",'align="center"'); + print_liste_field_titre($langs->trans("Action"),"index.php", "c.next","","",'align="center"'); print "\n"; $now=mktime(); diff --git a/htdocs/expedition/liste.php b/htdocs/expedition/liste.php index 6d1680a7222..0c239538f0d 100644 --- a/htdocs/expedition/liste.php +++ b/htdocs/expedition/liste.php @@ -86,15 +86,12 @@ if ( $db->query($sql) ) print_barre_liste("Expeditions", $_GET["page"], "liste.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); $i = 0; - print '
'; print_liste_field_titre($langs->trans("Ref"),"index.php", "c.rowid"); - print ""; print_liste_field_titre($langs->trans("Label"),"index.php", "p.label"); - print ""; print_liste_field_titre($langs->trans("Company"),"index.php", "s.nom"); - print ''; - print_liste_field_titre($langs->trans("Status"),"index.php", "c.enservice"); - print ''; - print_liste_field_titre("Date Fin","index.php", "c.fin_validite"); - print ''; - print_liste_field_titre($langs->trans("Action"),"index.php", "c.next"); - print '
'; + print '
'; print ''; - - print_liste_field_titre_new ($langs->trans("Ref"),"liste.php","e.ref","","&socidp=$socidp",'width="15%"',$sortfield); - - 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 ($langs->trans("Status"),"liste.php","e.fk_statut","","&socidp=$socidp",'width="10%" align="center"',$sortfield); + print_liste_field_titre($langs->trans("Ref"),"liste.php","e.ref","","&socidp=$socidp",'width="15%"',$sortfield); + print_liste_field_titre($langs->trans("Date"),"liste.php","e.date_expedition","","&socidp=$socidp", 'width="25%" align="right" colspan="2"',$sortfield); + print_liste_field_titre($langs->trans("Status"),"liste.php","e.fk_statut","","&socidp=$socidp",'width="10%" align="center"',$sortfield); print "\n"; $var=True; diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php index 10a8e06507b..67e7049fc5b 100644 --- a/htdocs/fichinter/index.php +++ b/htdocs/fichinter/index.php @@ -71,11 +71,11 @@ if ( $db->query($sql) ) print_barre_liste("Liste des fiches d'intervention", $page, "index.php","&socid=$socid",$sortfield,$sortorder,'',$num); $i = 0; - print '
'; + print '
'; print ""; - 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_liste_field_titre($langs->trans("Ref"),"index.php","f.ref","","&socid=$socid",'width="15%"',$sortfield); + print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","&socid=$socid",'',$sortfield); + print_liste_field_titre($langs->trans("Date"),"index.php","f.datei","","&socid=$socid",'',$sortfield); print ''; print ''; print "\n"; diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php index a6669d41bb4..25c59c78221 100644 --- a/htdocs/fourn/contact.php +++ b/htdocs/fourn/contact.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -107,13 +108,10 @@ if ($result) { } print '
'.$langs->trans("Duration").''.$langs->trans("Status").' 
'; print ""; - print "'; + print ''; print "\n"; $var=True; $i = 0; diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php index 27d9d6adba5..0aaf1533d4a 100644 --- a/htdocs/fourn/facture/index.php +++ b/htdocs/fourn/facture/index.php @@ -122,28 +122,15 @@ if ($result) print_barre_liste("Liste des factures fournisseurs", $page, "index.php",'', $sortfield, $sortorder,'',$num); - - print '
"; print_liste_field_titre($langs->trans("Lastname"),"contact.php","lower(p.name)", $begin); - print ""; print_liste_field_titre($langs->trans("Firstname"),"contact.php","lower(p.firstname)", $begin); - print ""; print_liste_field_titre($langs->trans("Company"),"contact.php","lower(s.nom)", $begin); - print ''.$langs->trans("Email").''.$langs->trans("Phone").''.$langs->trans("Email").''.$langs->trans("Phone").'
'; + print '
'; print ''; - print ''; - print ''; + print_liste_field_titre($langs->trans("Ref"),"index.php","facnumber"); + print_liste_field_titre($langs->trans("Date"),"index.php","fac.datef"); print ''; - print ''; - print ''; - print ''; - print ''; + print_liste_field_titre($langs->trans("Company"),"index.php","s.nom"); + print_liste_field_titre($langs->trans("AmountHT"),"index.php","fac.total_ht","","",'align="right"'); + print_liste_field_titre($langs->trans("AmountTTC"),"index.php","fac.total_ttc","","",'align="right"'); + print_liste_field_titre($langs->trans("Status"),"index.php","fk_statut,paye","","",'align="center"'); print "\n"; $var=True; while ($i < min($num,$limit)) diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index 8fe33d04326..d250049befc 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/index.php @@ -158,9 +158,9 @@ if ($result) $sortorder="DESC"; } print '
'; - print_liste_field_titre("Numéro","index.php","facnumber"); - print ''; - print_liste_field_titre("Date","index.php","fac.datef"); - print ''.$langs->trans("Label").''; - print_liste_field_titre("Société","index.php","s.nom"); - print ''; - print_liste_field_titre("Montant HT","index.php","fac.total_ht"); - print ''; - print_liste_field_titre("Montant TTC","index.php","fac.total_ttc"); - print ''; - print_liste_field_titre($langs->trans("Status"),"index.php","fk_statut,paye"); - print '
'; - print ''; + print ''; + print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","",'valign="center"'); + print ''; print "\n"; $var=True; diff --git a/htdocs/postnuke/articles/index.php b/htdocs/postnuke/articles/index.php index fce5ff68164..3f83a377ccb 100644 --- a/htdocs/postnuke/articles/index.php +++ b/htdocs/postnuke/articles/index.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -48,32 +49,32 @@ if ( $db->query($sql) ) { $num = $db->num_rows(); $i = 0; - print "

'; - print_liste_field_titre($langs->trans("Company"),"index.php","s.nom"); - print ''.$langs->trans("Town").'
'.$langs->trans("Town").'
"; - print "
"; - print_liste_field_titre("Titre.","index.php", "p.pn_title"); + print ""; + print ""; + print_liste_field_titre($langs->trans("Ref"),"index.php", "p.pn_title"); print ''; - print "\n"; + print "\n"; $var=True; while ($i < $num) { $objp = $db->fetch_object(); $var=!$var; - print ""; + print ""; print '\n"; - print "\n"; + print "pn_sid\">$objp->pn_title\n"; + print "\n"; - print "\n"; + print "\n"; $i++; } - print "
 
Fiche livre '; - print "pn_sid\">$objp->pn_titlepn_sid\">$objp->titlepn_sid\">$objp->title
"; + print "
"; $db->free(); } else { - print $db->error(); + dolibarr_print_error($db); } $db->close(); diff --git a/htdocs/product/album/index.php b/htdocs/product/album/index.php index 9ccae1f67c5..d213641e8d2 100644 --- a/htdocs/product/album/index.php +++ b/htdocs/product/album/index.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -49,23 +50,23 @@ $sql .= $db->plimit( $limit ,$offset); if ( $db->query($sql) ) { $num = $db->num_rows(); $i = 0; - print "

"; - print "
"; + print ""; + print ""; print_liste_field_titre("Titre","index.php", "a.title"); print ""; - print ""; - print "\n"; + print ""; + print "\n"; $var=True; while ($i < $num) { $objp = $db->fetch_object( $i); $var=!$var; - print ""; - print "\n"; - print ''; - print "\n"; + print ""; + print "\n"; + print ''; + print "\n"; $i++; } - print "
 
rowid\">$objp->titleurl
rowid\">$objp->titleurl
"; + print "
"; $db->free(); } diff --git a/htdocs/product/categorie/index.php b/htdocs/product/categorie/index.php index 626064f9fba..88d31f55816 100644 --- a/htdocs/product/categorie/index.php +++ b/htdocs/product/categorie/index.php @@ -1,6 +1,7 @@ - * Copyright (C) 2003 Éric Seigne + * Copyright (C) 2003 Éric Seigne + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -67,10 +68,9 @@ if ($id) { $num = $db->num_rows(); $i = 0; - print "

"; - print "
".$langs->trans("Ref").""; + print ""; + print ""; print_liste_field_titre("Titre","index.php", "l.title"); - print ""; print ''; print "\n"; $var=True; @@ -78,10 +78,9 @@ if ($id) { $objp = $db->fetch_object( $i); $var=!$var; - print ""; - print ''; - print ''; - + print ""; + print ''; + print ''; if ($objp->status == 1) { @@ -98,9 +97,9 @@ if ($id) print ''; } - print ''; - print "\n"; + print "\n"; $i++; } print "
".$langs->trans("Ref")." 
'.$objp->ref.''.$objp->title.'
'.$objp->ref.''.$objp->title.''; + print ''; print 'Fiche en ligne
"; @@ -131,12 +130,12 @@ else { $num = $db->num_rows(); $i = 0; - print "

"; - print "
"; + print ""; + print ""; print_liste_field_titre("Titre","index.php", "a.title"); - print ""; - print ""; - print "\n"; + print ""; + print "\n"; + $var=True; while ($i < $num) { diff --git a/htdocs/product/concert/index.php b/htdocs/product/concert/index.php index 56354676f1f..e70ed7b836c 100644 --- a/htdocs/product/concert/index.php +++ b/htdocs/product/concert/index.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -48,18 +49,14 @@ $sql .= $db->plimit( $limit ,$offset); if ( $db->query($sql) ) { $num = $db->num_rows(); $i = 0; - print "

 
"; - print "
"; + print ""; + print ""; print_liste_field_titre("Titre","index.php", "a.title"); - print ""; + print "\n"; - print "\n"; $var=True; while ($i < $num) { $objp = $db->fetch_object( $i); diff --git a/htdocs/product/concert/salles.php b/htdocs/product/concert/salles.php index 1ca9640b4c1..c721fe4c233 100644 --- a/htdocs/product/concert/salles.php +++ b/htdocs/product/concert/salles.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -46,14 +47,13 @@ $sql .= $db->plimit( $limit ,$offset); if ( $db->query($sql) ) { $num = $db->num_rows(); $i = 0; - print "

"; print_liste_field_titre("Artiste/Groupe","index.php", "ga.nom"); - print ""; print_liste_field_titre("Salle","index.php", "lc.nom"); - print ""; print_liste_field_titre("Ville","index.php", "lc.ville"); - print "
"; - print ""; + print "
"; - print_liste_field_titre("Nom","salles.php", "lc.nom"); - print ""; - print_liste_field_titre("Ville","salles.php", "lc.ville"); - print "
"; + + print ""; + print_liste_field_titre("Nom","salles.php", "lc.nom"); + print_liste_field_titre("Ville","salles.php", "lc.ville"); + print "\n"; - print "\n"; $var=True; while ($i < $num) { $objp = $db->fetch_object( $i); diff --git a/htdocs/product/groupart/index.php b/htdocs/product/groupart/index.php index f1e94461c57..dd21a5731d1 100644 --- a/htdocs/product/groupart/index.php +++ b/htdocs/product/groupart/index.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -48,23 +49,23 @@ $sql .= $db->plimit( $limit ,$offset); if ( $db->query($sql) ) { $num = $db->num_rows(); $i = 0; - print "

"; - print "
"; + print ""; + print ""; print_liste_field_titre($langs->trans("Ref"),"index.php", "p.ref"); - print ""; - print ""; - print "\n"; + print ""; + print "\n"; + $var=True; while ($i < $num) { $objp = $db->fetch_object( $i); $var=!$var; - print ""; - print "\n"; - print "\n"; - print "\n"; + print ""; + print "\n"; + print "\n"; + print "\n"; $i++; } - print "
 
rowid\">$objp->nom".ucfirst(strtolower(strtoupper($objp->groupart)))."
rowid\">$objp->nom".ucfirst(strtolower(strtoupper($objp->groupart)))."
"; + print "
"; $db->free(); } diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index 488a24d921d..d55ed0cedaa 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -163,13 +163,11 @@ if ($result) print ''; - print ""; print_liste_field_titre($langs->trans("Ref"),"liste.php", "p.ref","&envente=$envente&type=$type&fourn_id=$fourn_id"); - print "\n"; + print_liste_field_titre($langs->trans("SellingPrice"),"liste.php", "p.price","&envente=$envente&type=$type&fourn_id=$fourn_id","",'align=\"right\"'); + print "\n"; print ''; print ''; diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index 0fa9ba8b15d..3f58c85311e 100644 --- a/htdocs/product/popuprop.php +++ b/htdocs/product/popuprop.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -39,15 +40,13 @@ llxHeader(); print_barre_liste("Liste des produits par popularité dans les propositions commerciales", $page, "popurop.php"); -print '
"; + print "
"; print_liste_field_titre($langs->trans("Label"),"liste.php", "p.label","&envente=$envente&type=$type&fourn_id=$fourn_id"); - print ""; - print_liste_field_titre($langs->trans("SellingPrice"),"liste.php", "p.price","&envente=$envente&type=$type&fourn_id=$fourn_id"); - print "
'; +print '
'; -print ""; print_liste_field_titre($langs->trans("Ref"),"popurop.php", "p.ref"); -print "\n"; +print_liste_field_titre("Nb. de proposition","popurop.php", "c","","",'align=\"center\"'); +print "\n"; $sql = "select p.rowid, p.label, p.ref, count(*) as c from ".MAIN_DB_PREFIX."propaldet as pd, ".MAIN_DB_PREFIX."product as p where p.rowid = pd.fk_product group by (p.rowid)"; diff --git a/htdocs/product/promotion/index.php b/htdocs/product/promotion/index.php index 79f51cf3c50..52376a946f6 100644 --- a/htdocs/product/promotion/index.php +++ b/htdocs/product/promotion/index.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -63,23 +64,21 @@ if ( $db->query($sql) ) { $num = $db->num_rows(); $i = 0; - print '

"; +print "
"; 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_liste_field_titre($langs->trans("Ref"),"index.php", "p.products_model"); - print ""; - print ""; + print ""; print ''; print ''; - print "\n"; + print "\n"; $var=True; while ($i < $num) { $objp = $db->fetch_object( $i); $var=!$var; - print ""; + print ""; print '"; print '"; diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index d4199e679b7..a69b0128ffc 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -91,16 +92,15 @@ if ($_GET["id"]) $num = $db->num_rows(); $i = 0; - print "
"; print_liste_field_titre("Titre","index.php", "pd.products_name"); - print "Fin  FinPrix initialPrix remisé
'.$objp->products_model."'.$objp->products_name."
"; - print ''; - print ''; - print ''; + print "
Numéro'; - print_liste_field_titre("Société","facture.php","s.nom","","&socidp=$socidp"); - print ''; - print_liste_field_titre("Date","facture.php","f.datef","","&socidp=$socidp"); - print 'Montant
"; + + print ''; + print_liste_field_titre($langs->trans("Ref"),"facture.php","s.nom","","&socidp=$socidp"); + print_liste_field_titre($langs->trans("Company"),"facture.php","s.nom","","&socidp=$socidp"); + print_liste_field_titre($langs->trans("Date"),"facture.php","f.datef","","&socidp=$socidp",'align="right"'); + print_liste_field_titre($langs->trans("Amount"),"facture.php","f.amount","","&socidp=$socidp",'align="right"'); print ''; - print "\n"; + print "\n"; if ($num > 0) { @@ -110,7 +110,7 @@ if ($_GET["id"]) $objp = $db->fetch_object( $i); $var=!$var; - print ""; + print ""; print '
 
'; if ($objp->paye) { diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index 1044a873889..51a84966d0a 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -94,15 +95,12 @@ if ($_GET["id"]) $num = $db->num_rows(); $i = 0; - print ""; - print ''; - print ''; - print ''; - print "\n"; + print "
Numéro'; - print_liste_field_titre("Société","propal.php","s.nom","","&id=$product->id&socidp=$socidp"); - print ''; - print_liste_field_titre("Date","propal.php","f.datef","","&id=$product->id&socidp=$socidp"); - print '
"; + print ''; + print_liste_field_titre($langs->trans("Ref"),"propal.php","p.rowid","","&id=$product->id&socidp=$socidp"); + print_liste_field_titre($langs->trans("Company"),"propal.php","s.nom","","&id=$product->id&socidp=$socidp"); + print_liste_field_titre($langs->trans("Date")"Date","propal.php","f.datef","","&id=$product->id&socidp=$socidp",'align="right"'); + print "\n"; if ($num > 0) { diff --git a/htdocs/product/stock/liste.php b/htdocs/product/stock/liste.php index b31b9e0978e..29827e1a0b1 100644 --- a/htdocs/product/stock/liste.php +++ b/htdocs/product/stock/liste.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -116,13 +117,12 @@ if ($result) print_barre_liste($texte, $page, "liste.php", "&sref=$sref&snom=$snom", $sortfield, $sortorder,'',$num); } - print '
'; + print '
'; - print ""; print_liste_field_titre($langs->trans("Ref"),"liste.php", "p.ref","&envente=$envente&type=$type"); - print ""; + print ""; print "\n"; print ''; diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index ca20db8be8b..249d9cd2d26 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -67,14 +68,13 @@ if ($result) print_barre_liste($texte, $page, "mouvement.php", "&sref=$sref&snom=$snom", $sortfield, $sortorder,'',$num); - print '
"; + print "
"; print_liste_field_titre($langs->trans("Label"),"liste.php", "p.label","&envente=$envente&type=$type"); - print "Prix de ventePrix de vente
'; - print "
"; + print ''; + print ""; print_liste_field_titre($langs->trans("Ref"),"mouvement.php", "p.ref",""); - print ""; print_liste_field_titre("Date","mouvement.php", "m.datem",""); - print "\n"; + print "\n"; $var=True; while ($i < min($num,$limit)) diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 349b6ce38d2..93dcfd3d489 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -72,12 +72,12 @@ $pagenext = $page + 1; * */ print '
'; -print '
Unités"; + print "Unités"; print_liste_field_titre("Entrepôt","mouvement.php", "s.label",""); - print "
'; -print '
'; -print_liste_field_titre("Titre","index.php","p.title"); -print ''.$langs->trans("Ref").''; +print ''; +print ''; +print_liste_field_titre($langs->trans("Title"),"index.php","p.title"); +print ''; print_liste_field_titre("Société","index.php","s.nom"); -print "\n"; +print "\n"; $sql = "SELECT s.nom, s.idp, p.rowid as projectid, p.ref, p.title, s.client,".$db->pdate("p.dateo")." as do"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."projet as p"; diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php index b31da0a4937..1f977c5d756 100644 --- a/htdocs/societe/notify/fiche.php +++ b/htdocs/societe/notify/fiche.php @@ -20,7 +20,11 @@ * $Source$ * */ + require("pre.inc.php"); + +$langs->load("companies"); + /* * Sécurité accés client */ @@ -132,11 +136,10 @@ if ( $soc->fetch($soc->id) ) * */ - print '
'.$langs->trans("Ref").'
'; - print ''; - - print ''; - print ''; + print '
Nom'.$soc->nom.'
Adresse'.nl2br($soc->adresse).' 
CP'.$soc->cp.' '.$soc->ville.'
'; + print ''; + print ''; + print ''; print '
'.$langs->trans("Name").''.$soc->nom.'
'.$langs->trans("Address").''.nl2br($soc->adresse).' 
'.$langs->trans("Zip").' / '.$langs->trans("Town").''.$soc->cp.' / '.$soc->ville.'

'; @@ -153,10 +156,10 @@ if ( $soc->fetch($soc->id) ) { $sortfield="c.name"; } - print ''; + print '
'; print ''; - print_liste_field_titre_new ("Contact","fiche.php","c.name","","&socid=$socid",'',$sortfield); - print_liste_field_titre_new ("Action","fiche.php","a.titre","","&socid=$socid",'',$sortfield); + print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.name","","&socid=$socid",'',$sortfield); + print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre","","&socid=$socid",'',$sortfield); print ''; print ''; diff --git a/htdocs/societe/notify/index.php b/htdocs/societe/notify/index.php index 728c5ebb3c7..c552f586c07 100644 --- a/htdocs/societe/notify/index.php +++ b/htdocs/societe/notify/index.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -72,15 +73,12 @@ if ($result) $i = 0; - print "
 
"; - print ''; - print "\n"; + print "
"; - print_liste_field_titre("Société","index.php","s.nom"); - print ""; - print_liste_field_titre("Contact","index.php","c.name"); - print ""; - print_liste_field_titre("Action","index.php","a.titre"); - print "
"; + print ''; + print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","",'valign=\"center\"'); + print_liste_field_titre($langs->trans("Contact"),"index.php","c.name"); + print_liste_field_titre($langs->trans("Action"),"index.php","a.titre"); + print "\n"; $var=True; while ($i < $num) { @@ -88,14 +86,14 @@ if ($result) $var=!$var; - print ""; - print "\n"; + print ""; + print "\n"; print "\n"; print "\n"; print "\n"; $i++; } - print "
idp\">$obj->nom
idp\">$obj->nom".$obj->firstname." ".$obj->name."".$obj->titre."
"; + print "
"; $db->free(); } else diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 1cab3269841..fd84464c4cb 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -48,20 +48,12 @@ if ($result) print "
"; - print ""; + print "
"; print ''; - print ""; - print ""; - print ""; - print ""; print "\n"; $var=True; while ($i < $num)
"; print_liste_field_titre($langs->trans("LastName"),"index.php","name"); - print ""; print_liste_field_titre($langs->trans("FirstName"),"index.php","firstname"); - print ""; print_liste_field_titre($langs->trans("Login"),"index.php","login"); - print ""; print_liste_field_titre($langs->trans("Code"),"index.php","code"); - print "