diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index af2ac1ca202..6edeac41e8d 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -21,7 +21,7 @@ * $Source$ */ -/*! \file htdocs/admin/dict.php +/*! \file htdocs/admin/dict.php \ingroup setup \brief Page d'administration des dictionnaires de données \version $Revision$ @@ -48,6 +48,9 @@ $active = 1; // Cette page est une page d'édition générique des dictionnaires de données // Mettre ici tous les caractéristiques des dictionnaires +// Ordres d'affichage des dictionnaires (0 pour espace) +$taborder=array(4,3,2,0,1,0,5,0,6,0,7); + // Nom des tables des dictionnaires $tabname[1] = MAIN_DB_PREFIX."c_forme_juridique"; $tabname[2] = MAIN_DB_PREFIX."c_departements"; @@ -114,6 +117,9 @@ $tabrowid[7] = "id"; $msg=''; + +$sortfield=$_GET["sortfield"]; + /* * Actions ajout d'une entrée dans un dictionnaire de donnée */ @@ -244,6 +250,9 @@ if ($_GET["action"] == $acts[1]) // disable llxHeader(); +/* + * Affichage d'un dictionnaire particulier + */ if ($_GET["id"]) { print_titre($langs->trans("DictionnarySetup")); @@ -356,13 +365,9 @@ if ($_GET["id"]) if ($fieldlist[$field]=='libelle') $valuetoshow=$langs->trans("Label")."*"; if ($fieldlist[$field]=='pays') $valuetoshow=$langs->trans("Country"); // Affiche nom du champ - print ''; - print_liste_field_titre($valuetoshow,"dict.php",$fieldlist[$field],"&id=".$_GET["id"]); - print ''; + print_liste_field_titre($valuetoshow,"dict.php",$fieldlist[$field],"&id=".$_GET["id"],"","",$sortfield); } - print ''; - print_liste_field_titre($langs->trans("Activate")."/".$langs->trans("Disable"),"dict.php","active","&id=".$_GET["id"]); - print ''; + print_liste_field_titre($langs->trans("Activate")."/".$langs->trans("Disable"),"dict.php","active","&id=".$_GET["id"],"","",$sortfield); print ' '; print ''; @@ -413,11 +418,22 @@ if ($_GET["id"]) } else { + /* + * Affichage de la liste des dictionnaires + */ + print_titre($langs->trans("DictionnarySetup")); print '
'; - foreach ($tabname as $i => $value) { - print ''.$tablib[$i].' (Table '.$tabname[$i].')
'; + foreach ($taborder as $i) { + if ($i) { + $value=$tabname[$i]; + print ''.$tablib[$i].' (Table '.$tabname[$i].')
'; + } + else + { + print '
'; + } } } diff --git a/htdocs/boutique/auteur/index.php b/htdocs/boutique/auteur/index.php index d1fb5624be5..fd5ceafe973 100644 --- a/htdocs/boutique/auteur/index.php +++ b/htdocs/boutique/auteur/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 @@ -47,9 +48,8 @@ if ( $db->query($sql) ) { $num = $db->num_rows(); $i = 0; print ""; - print ""; print_liste_field_titre("Nom","index.php", "e.nom"); - print ""; print "\n"; $var=True; while ($i < $num) { diff --git a/htdocs/boutique/client/index.php b/htdocs/boutique/client/index.php index 1d514447a53..a462421a7ce 100644 --- a/htdocs/boutique/client/index.php +++ b/htdocs/boutique/client/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 @@ -50,11 +51,10 @@ if ( $db->query($sql) ) $num = $db->num_rows(); $i = 0; print "
"; + print "
"; - print ""; print_liste_field_titre($langs->trans("Firstname"),"index.php", "c.customers_firstname"); - print "'; + print ''; print "\n"; $var=True; while ($i < $num) @@ -62,10 +62,10 @@ if ( $db->query($sql) ) $objp = $db->fetch_object(); $var=!$var; print ""; - print '\n"; - print '\n"; - print "\n"; - print "\n"; + print '\n"; + print '\n"; + print "\n"; + print "\n"; print "\n"; $i++; } diff --git a/htdocs/boutique/commande/index.php b/htdocs/boutique/commande/index.php index 9d9abca8946..285b99bfc63 100644 --- a/htdocs/boutique/commande/index.php +++ b/htdocs/boutique/commande/index.php @@ -51,10 +51,12 @@ if ( $db->query($sql) ) { $num = $db->num_rows(); $i = 0; - print "
"; + print "
"; print_liste_field_titre($langs->trans("Lastname"),"index.php", "c.customers_lastname"); - print ''.$langs->trans("EMail").'Newsletter'.$langs->trans("EMail").''.$langs->trans("Newsletter").'
'.$objp->customers_firstname."'.$objp->customers_lastname."$objp->customers_email_address$objp->customers_newsletter'.$objp->customers_firstname."'.$objp->customers_lastname."$objp->customers_email_address$objp->customers_newsletter
"; - print "
Numéro".$langs->trans("Date").""; + print ""; + print ""; + print ""; + print ""; print_liste_field_titre("Client","commande.php", "customers_name"); - print ''; + print ''; print "\n"; $var=True; while ($i < $num) diff --git a/htdocs/boutique/editeur/index.php b/htdocs/boutique/editeur/index.php index e7515030050..4b88f04a6c9 100644 --- a/htdocs/boutique/editeur/index.php +++ b/htdocs/boutique/editeur/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 @@ -47,9 +48,8 @@ if ( $db->query($sql) ) { $num = $db->num_rows(); $i = 0; print "
".$langs->trans("Ref")."".$langs->trans("Date")."'.$langs->trans("Total").''.$langs->trans("Total").'
"; - print ""; + print ""; + print_liste_field_titre($langs->trans("Name"),"index.php", "e.nom"); print "\n"; $var=True; while ($i < $num) { diff --git a/htdocs/boutique/livre/index.php b/htdocs/boutique/livre/index.php index 9bde3d09fae..94ef024eda6 100644 --- a/htdocs/boutique/livre/index.php +++ b/htdocs/boutique/livre/index.php @@ -62,11 +62,9 @@ if ( $db->query($sql) ) $num = $db->num_rows(); $i = 0; print "
"; - print_liste_field_titre("Nom","index.php", "e.nom"); - print "
"; - print ""; print_liste_field_titre($langs->trans("Ref"),"index.php", "l.ref"); - print ""; + print_liste_field_titre($langs->trans("Title"),"index.php", "l.title"); print ''; print "\n"; $var=True; diff --git a/htdocs/boutique/livre/vignettes.php b/htdocs/boutique/livre/vignettes.php index 60ef7d03fca..bdcb630d176 100644 --- a/htdocs/boutique/livre/vignettes.php +++ b/htdocs/boutique/livre/vignettes.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 @@ -61,11 +62,9 @@ if ( $db->query($sql) ) $num = $db->num_rows(); $i = 0; print "
"; + print "
"; - print_liste_field_titre("Titre","index.php", "l.title"); - print " 
"; - print ""; print_liste_field_titre($langs->trans("Ref"),"vignettes.php", "l.ref"); - print ""; + print_liste_field_titre($langs->trans("Title"),"vignettes.php", "l.title"); print ''; print "\n"; $var=True; diff --git a/htdocs/boutique/newsletter/index.php b/htdocs/boutique/newsletter/index.php index 7a89763c0e0..4953267e280 100644 --- a/htdocs/boutique/newsletter/index.php +++ b/htdocs/boutique/newsletter/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,9 +49,8 @@ if ( $db->query($sql) ) $num = $db->num_rows(); $i = 0; print "
"; + print "
"; - print_liste_field_titre("Titre","vignettes.php", "l.title"); - print " 
"; - print ""; + print ""; + print_liste_field_titre($langs->trans("Subject"),"index.php", "email_subject"); print ''; print ''; print "\n"; diff --git a/htdocs/boutique/notification/index.php b/htdocs/boutique/notification/index.php index 6692f282c88..a7f8b4899ff 100644 --- a/htdocs/boutique/notification/index.php +++ b/htdocs/boutique/notification/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 @@ -23,6 +24,8 @@ require("./pre.inc.php"); +$langs->load("products"); + llxHeader(); if ($sortfield == "") { @@ -52,10 +55,9 @@ if ( $db->query($sql) ) $num = $db->num_rows(); $i = 0; print "
"; - print_liste_field_titre("Sujet","index.php", "email_subject"); - print "
'.$langs->trans("Status").'Nb envois
"; - print ""; print_liste_field_titre("Client","index.php", "c.customers_lastname"); - print ""; - print ""; + print ''; print "\n"; $var=True; while ($i < $num) diff --git a/htdocs/comm/clients.php b/htdocs/comm/clients.php index 0027a6311bf..6d12fb5be85 100644 --- a/htdocs/comm/clients.php +++ b/htdocs/comm/clients.php @@ -116,16 +116,11 @@ if ($result) $i = 0; + $addu = "&page=$page&begin=$begin&search_nom=".$_GET["search_nom"]; print '
"; + print "
Produit'.$langs->trans("Product").'
'; print ''; - print ""; + print_liste_field_titre($langs->trans("Companies"),"clients.php","s.nom",$addu,"",'valign="right"'); + print_liste_field_titre($langs->trans("Town"),"clients.php","s.ville",$addu); print "\n"; print ''; diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index 7c93656ef4b..1f764033aa0 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -160,13 +160,11 @@ if ($result) } print '
"; - - $addu = "&page=$page&begin=$begin&search_nom=".$_GET["search_nom"]; - - print_liste_field_titre("Société","clients.php","s.nom",$addu); - print ""; - print_liste_field_titre("Ville","clients.php","s.ville",$addu); - print "
'; - print ''; print_liste_field_titre($langs->trans("Lastname"),"contact.php","lower(p.name)", $begin,"&type=$type"); - print "'; + print ''; print ''; print "\n"; $var=True; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 80945b52b21..30d80aa942f 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -879,18 +879,14 @@ else $i = 0; - print '
'; + print '
"; print_liste_field_titre($langs->trans("Firstname"),"contact.php","lower(p.firstname)", $begin,"&type=$type"); - print ""; print_liste_field_titre($langs->trans("Company"),"contact.php","lower(s.nom)", $begin,"&type=$type"); - print ''.$langs->trans("Lastname").''.$langs->trans("Lastname").''.$langs->trans("Phone").'
'; + print '
'; print ''; - - 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 ($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 ($langs->trans("Status"),"propal.php","p.fk_statut","","&socidp=$socidp&viewstatut=$viewstatut",'width="10%" align="center"',$sortfield); + print_liste_field_titre($langs->trans("Ref"),"propal.php","p.ref","","&socidp=$socidp&viewstatut=$viewstatut",'width="15%"',$sortfield); + print_liste_field_titre($langs->trans("Company"),"propal.php","s.nom","","&socidp=$socidp&viewstatut=$viewstatut",'width="30%"',$sortfield); + print_liste_field_titre($langs->trans("Date"),"propal.php","p.datep","","&socidp=$socidp&viewstatut=$viewstatut", 'width="25%" align="right" colspan="2"',$sortfield); + print_liste_field_titre($langs->trans("Price"),"propal.php","p.price","","&socidp=$socidp&viewstatut=$viewstatut", ' width="20%" align="right"',$sortfield); + print_liste_field_titre($langs->trans("Status"),"propal.php","p.fk_statut","","&socidp=$socidp&viewstatut=$viewstatut",'width="10%" align="center"',$sortfield); print "\n"; $var=true; diff --git a/htdocs/comm/prospect/prospects.php b/htdocs/comm/prospect/prospects.php index 9b275e46361..330a4799dff 100644 --- a/htdocs/comm/prospect/prospects.php +++ b/htdocs/comm/prospect/prospects.php @@ -145,18 +145,12 @@ if ($result) print '
'; print ''; - print ""; - print "'; + print ''; print "\n"; $var=true; diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index b1281df8c9a..231e9475314 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -89,18 +89,12 @@ if ( $db->query($sql) ) print_barre_liste($langs->trans("Orders"), $_GET["page"], "liste.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); $i = 0; - print '
"; - print_liste_field_titre($langs->trans("Company"),"prospects.php","s.nom"); - print ""; + print_liste_field_titre($langs->trans("Company"),"prospects.php","s.nom","","","valign=\"center\">"); print_liste_field_titre($langs->trans("Town"),"prospects.php","s.ville"); - print ""; - print_liste_field_titre("Département","prospects.php","s.fk_departement"); - print ""; + print_liste_field_titre("Département","prospects.php","s.fk_departement","","","align=\"center\""); print_liste_field_titre($langs->trans("Status"),"prospects.php","s.fk_stcomm"); - print ""; print_liste_field_titre("Insertion","prospects.php","s.datec"); - print '  
'; - + print '
'; print ''; - - print_liste_field_titre_new ($langs->trans("Ref"),"liste.php","c.ref","","&socidp=$socidp",'width="15%"',$sortfield); - - print_liste_field_titre_new ($langs->trans("Company"),"liste.php","s.nom","","&socidp=$socidp",'width="30%"',$sortfield); - - print_liste_field_titre_new ($langs->trans("Date"),"liste.php","c.date_commande","","&socidp=$socidp", 'width="25%" align="right" colspan="2"',$sortfield); - - print_liste_field_titre_new ($langs->trans("Status"),"liste.php","c.fk_statut","","&socidp=$socidp",'width="10%" align="center"',$sortfield); - + print_liste_field_titre($langs->trans("Ref"),"liste.php","c.ref","","&socidp=$socidp",'width="15%"',$sortfield); + print_liste_field_titre($langs->trans("Company"),"liste.php","s.nom","","&socidp=$socidp",'width="30%"',$sortfield); + print_liste_field_titre($langs->trans("Date"),"liste.php","c.date_commande","","&socidp=$socidp", 'width="25%" align="right" colspan="2"',$sortfield); + print_liste_field_titre($langs->trans("Status"),"liste.php","c.fk_statut","","&socidp=$socidp",'width="10%" align="center"',$sortfield); print "\n"; $var=True; diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index 6d1703ef5f8..15d3800cc24 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -36,6 +36,8 @@ if ($conf->webcal->enabled) { require("../lib/webcal.class.php"); } +$langs->laod("companies"); + llxHeader(); /* @@ -226,9 +228,9 @@ if ($result) $sortorder="DESC"; } print '
'; - print '"; + print ''; + print_liste_field_titre($langs->trans("Company"),"clients.php","s.nom","","",'valign="center"'); + print ''; print "\n"; $var=True; diff --git a/htdocs/compta/config.php b/htdocs/compta/config.php index 986baf93da1..2191dd244d0 100644 --- a/htdocs/compta/config.php +++ b/htdocs/compta/config.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * $Id$ * $Source$ @@ -57,11 +58,11 @@ if ($action == 'create') { $num = $db->num_rows(); $i = 0; - print "
'; - print_liste_field_titre("Société","clients.php","s.nom"); - print "Ville
'.$langs->trans("Company").'Préfix 
"; + print "
"; print ''; - print ""; print_liste_field_titre($langs->trans("Label"),"config.php","label"); - print "\n"; + print "\n"; if ($num > 0) { $var=True; diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index 12e7d1c9440..dc272dc731d 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -66,11 +66,11 @@ if ( $db->query($sql) ) print_barre_liste("Liste des déplacements", $page, "index.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); $i = 0; - print '
Numéro"; + print "Numéro
'; + print '
'; print ""; - print_liste_field_titre_new ("Date","index.php","d.dated","","&socidp=$socidp",'',$sortfield); - print_liste_field_titre_new ("Société","index.php","s.nom","","&socidp=$socidp",'',$sortfield); - print ''; + print_liste_field_titre($langs->trans("Date"),"index.php","d.dated","","&socidp=$socidp",'',$sortfield); + print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","&socidp=$socidp",'',$sortfield); + print_liste_field_titre($langs->trans("User"),"index.php","u.name","","&socidp=$socidp",'',$sortfield); print "\n"; $var=True; diff --git a/htdocs/compta/dons/liste.php b/htdocs/compta/dons/liste.php index 87dabfc69ef..fa147678f5e 100644 --- a/htdocs/compta/dons/liste.php +++ b/htdocs/compta/dons/liste.php @@ -74,18 +74,13 @@ if ($result) print "
Utilisateur
"; print ''; - print ""; - print "'; + print_liste_field_titre($langs->trans("Firstname"),"liste.php","d.prenom","&page=$page&statut=$statut"); + print_liste_field_titre($langs->trans("Name"),"liste.php","d.nom","&page=$page&statut=$statut"); + print_liste_field_titre($langs->trans("Company"),"liste.php","d.societe","&page=$page&statut=$statut"); + print_liste_field_titre($langs->trans("Date"),"liste.php","d.datedon","&page=$page&statut=$statut"); + print_liste_field_titre($langs->trans("Project"),"liste.php","","&page=$page&statut=$statut"); + print_liste_field_titre($langs->trans("Amount"),"liste.php","d.amount","&page=$page&statut=$statut","",'align="right"'); + print ''; print "\n"; $var=True; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 3c45f8ce162..8253c6b1473 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1497,21 +1497,13 @@ else $i = 0; print '
"; - print_liste_field_titre("Prénom","liste.php","d.prenom","&page=$page&statut=$statut"); - print ""; - print_liste_field_titre("Nom","liste.php","d.nom","&page=$page&statut=$statut"); - print ""; - print_liste_field_titre("Société","liste.php","d.societe","&page=$page&statut=$statut"); - print ""; - print_liste_field_titre("Date","liste.php","d.datedon","&page=$page&statut=$statut"); - print "Projet"; - print_liste_field_titre("Montant","liste.php","d.amount","&page=$page&statut=$statut"); - print '  
'; print ''; - print ''; + print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total","","&socidp=$socidp",'align="right"'); + print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"f.total_ttc","","&socidp=$socidp",'align="right"'); + print_liste_field_titre($langs->trans("Received"),$_SERVER["PHP_SELF"],"am","","&socidp=$socidp",'align="right"'); + print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye","","&socidp=$socidp",'align="right"'); print "\n"; if ($num > 0) diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index df6336fc0c9..348e574148a 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -420,15 +420,13 @@ else print_barre_liste("Factures",$page,"fiche-rec.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); $i = 0; - print "
'; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"f.facnumber","","&socidp=$socidp"); - print ''; - print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"f.datef","","&socidp=$socidp"); - print ''; + print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"f.datef","","&socidp=$socidp",'align="center"'); print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&socidp=$socidp"); - print ''; - print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total","","&socidp=$socidp"); - print ''; - print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"f.total_ttc","","&socidp=$socidp"); - print ''; - print_liste_field_titre("Reçu",$_SERVER["PHP_SELF"],"am","","&socidp=$socidp"); - print ''; - print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye","","&socidp=$socidp"); - print '
"; - print ''; - print ''; - print ''; + print "
Titre'; - print_liste_field_titre("Société","fiche-rec.php","s.nom","","&socidp=$socidp"); - - print 'Montant
"; + print ''; + print ''; + print_liste_field_titre($langs->trans("Company"),"fiche-rec.php","s.nom","","&socidp=$socidp"); + print ''; print ''; - print "\n"; + print "\n"; if ($num > 0) { @@ -443,10 +441,10 @@ else $class = "normal"; print '\n"; - print ''; + print "\n"; + print ''; - print "\n"; + print "\n"; if (! $objp->paye) { @@ -464,7 +462,7 @@ else print ''; } - print "\n"; + print "\n"; $i++; } } @@ -474,7 +472,7 @@ else } else { - print $db->error() . "
" . $sql; + dolibarr_print_error($db); } } diff --git a/htdocs/compta/ligne.php b/htdocs/compta/ligne.php index b00e6c29208..4429886632c 100644 --- a/htdocs/compta/ligne.php +++ b/htdocs/compta/ligne.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * $Id$ * $Source$ @@ -69,15 +70,13 @@ if ($action == 'create') { */ print_barre_liste("Comptes comptable",$page,"ligne.php"); - - print "
'.$langs->trans("Ref").''.$langs->trans("Amount").' 
' . $objp->titre; - print "'.$objp->nom.''.$objp->nom.'".price($objp->total)."".price($objp->total)." 
"; + print "
"; print ''; - print ""; + print ''; print "\n"; - print ''; print ''; print ''; @@ -87,7 +86,6 @@ if ($action == 'create') { print ''; print ''; - $sql = "SELECT ca.number, c.label, c.amount"; $sql .= " FROM ".MAIN_DB_PREFIX."compta_account as ca, ".MAIN_DB_PREFIX."compta as c WHERE c.fk_compta_account = ca.rowid"; $sql .= " ORDER BY ca.number"; diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 0a2c08f92c7..8b5313bdaaf 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -363,25 +363,24 @@ if ($action == '') print_barre_liste("Paiements", $page, "paiement.php","",$sortfield,$sortorder,'',$num); - print '
Numéro"; + print_liste_field_titre($langs->trans("Ref"),"ligne.php","id"); print_liste_field_titre($langs->trans("Label"),"ligne.php","label"); - print "Montant'.$langs->trans("Amount").'
'; - print ''; + print '
'; + print ''; print ""; print ""; - print "'; + print_liste_field_titre($langs->trans("Type"),"paiement.php","c.libelle","",""); + print_liste_field_titre($langs->trans("Amount"),"paiement.php","c.libelle","","",'align="right"'); print ""; - print "\n"; + print "\n"; while ($i < min($num,$limit)) { $objp = $db->fetch_object(); $var=!$var; - print ""; - print "\n"; - print "\n"; - print "\n"; - print ''; + print ""; + print "\n"; + print "\n"; + print "\n"; + print ''; print ""; $i++; } diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php index 943b01918f7..346be2d16b4 100644 --- a/htdocs/compta/paiement/liste.php +++ b/htdocs/compta/paiement/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 @@ -67,9 +68,9 @@ if ($result) print '
FactureDate"; - print_liste_field_titre("Type","paiement.php","c.libelle","",""); - print 'Montant 
facid\">$objp->facnumber".strftime("%d %B %Y",$objp->dp)."$objp->paiement_type $objp->num_paiement'.price($objp->amount).' 
facid\">$objp->facnumber".strftime("%d %B %Y",$objp->dp)."$objp->paiement_type $objp->num_paiement'.price($objp->amount).' 
'; print ''; - print ''; print_liste_field_titre($langs->trans("Type"),"liste.php","c.libelle","",""); - print ''; + print ''; print ""; print "\n"; diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index 2405491e20c..f4550c4552c 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -463,13 +463,13 @@ if ($_GET["propalid"]) print_barre_liste("Propositions commerciales", $page, "propal.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); $i = 0; - print "
Date'; + print ''.$langs->trans("Date").''.$langs->trans("Amount").''.$langs->trans("Amount").' 
"; + print "
"; print ''; - 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 ($langs->trans("Price"),"propal.php","p.price","&viewstatut=$viewstatut","",'align="right"',$sortfield); - print_liste_field_titre_new ($langs->trans("Status"),"propal.php","p.fk_statut","&viewstatut=$viewstatut","",'align="center"',$sortfield); + print_liste_field_titre($langs->trans("Ref"),"propal.php","p.ref","","&year=$year&viewstatut=$viewstatut",'',$sortfield); + print_liste_field_titre($langs->trans("Company"),"propal.php","s.nom","&viewstatut=$viewstatut","",'',$sortfield); + print_liste_field_titre($langs->trans("Date"),"propal.php","p.datep","&viewstatut=$viewstatut","",'align="right" colspan="2"',$sortfield); + print_liste_field_titre($langs->trans("Price"),"propal.php","p.price","&viewstatut=$viewstatut","",'align="right"',$sortfield); + print_liste_field_titre($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/index.php b/htdocs/compta/sociales/index.php index f3a23f803ea..c49feb65ce0 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -161,21 +161,13 @@ if ($user->rights->compta->charges->creer) { } print ""; -print ''; +print_liste_field_titre($langs->trans("Type"),"index.php","type","","",'align="left"'); +print_liste_field_titre($langs->trans("Label"),"index.php","s.libelle","","",'align="left"'); +print_liste_field_titre($langs->trans("Amount"),"index.php","s.amount","","",'align="right"'); +print_liste_field_titre($langs->trans("Status"),"index.php","s.paye","","",'align="center"'); print "\n"; diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php index eed3589bd5b..67cb05a6226 100644 --- a/htdocs/contact/index.php +++ b/htdocs/contact/index.php @@ -128,15 +128,12 @@ if ($result) print_barre_liste($titre ,$page, "index.php", '&begin='.$_GET["begin"].'&view='.$_GET["view"].'&userid='.$_GET["userid"], $sortfield, $sortorder,'',$num); - print '

'; print_liste_field_titre($langs->trans("Ref"),"index.php","id"); -print ''; print_liste_field_titre($langs->trans("DateDue"),"index.php","de"); -print ''; print_liste_field_titre($langs->trans("Period"),"index.php","periode"); -print ''; -print_liste_field_titre($langs->trans("Type"),"index.php","type"); -print ''; -print_liste_field_titre($langs->trans("Label"),"index.php","s.libelle"); -print ''; -print_liste_field_titre($langs->trans("Amount"),"index.php","s.amount"); -print ''; -print_liste_field_titre($langs->trans("Status"),"index.php","s.paye"); -print '
'; + print '
'; - print ''; print_liste_field_titre($langs->trans("Lastname"),"index.php","lower(p.name)", $begin); - print "'; print ''; @@ -152,8 +149,6 @@ if ($result) print "\n"; - - print ''; print ''; print '
'; + print '
"; print_liste_field_titre($langs->trans("Firstname"),"index.php","lower(p.firstname)", $begin); - print ""; print_liste_field_titre($langs->trans("Company"),"index.php","lower(s.nom)", $begin); - print ''.$langs->trans("Phone").'
';