diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php index 8e7cd8c81bb..18b8f1f6f2c 100644 --- a/htdocs/adherents/cotisations.php +++ b/htdocs/adherents/cotisations.php @@ -69,7 +69,7 @@ if ($HTTP_POST_VARS["action"] == '2bank' && $HTTP_POST_VARS["rowid"] !=''){ $result = $db->query($sql); if ($result) { - //Header("Location: $PHP_SELF"); + //Header("Location: cotisations.php"); } else { @@ -135,7 +135,7 @@ if ($result) $num = $db->num_rows(); $i = 0; - print_barre_liste("Liste des cotisations", $page, $PHP_SELF, "&statut=$statut&sortorder=$sortorder&sortfield=$sortfield"); + print_barre_liste("Liste des cotisations", $page, "cotisations.php", "&statut=$statut&sortorder=$sortorder&sortfield=$sortfield"); print "\n"; print ''; @@ -147,7 +147,7 @@ if ($result) foreach ($Total as $key=>$value){ $var=!$var; - print "\n"; + print "\n"; } print "
$key".price($value)."".$Number[$key]."".price($value/$Number[$key])."
$key".price($value)."".$Number[$key]."".price($value/$Number[$key])."

\n"; @@ -156,24 +156,24 @@ if ($result) print ''; //print "Date"; print ''; - print_liste_field_titre("Date
",$PHP_SELF,"c.dateadh","&page=$page&statut=$statut"); + print_liste_field_titre("Date
","cotisations.php","c.dateadh","&page=$page&statut=$statut"); print "\n"; //print "Montant"; print ''; - print_liste_field_titre("Montant
",$PHP_SELF,"c.cotisation","&page=$page&statut=$statut"); + print_liste_field_titre("Montant
","cotisations.php","c.cotisation","&page=$page&statut=$statut"); print "\n"; //print "Prenom Nom / Société"; print ''; - // print_liste_field_titre("Prenom",$PHP_SELF,"d.prenom","&page=$page&statut=$statut"); - print_liste_field_titre("Prenom Nom
",$PHP_SELF,"d.nom","&page=$page&statut=$statut"); + // print_liste_field_titre("Prenom","cotisations.php","d.prenom","&page=$page&statut=$statut"); + print_liste_field_titre("Prenom Nom
","cotisations.php","d.nom","&page=$page&statut=$statut"); // print " / Société"; print "\n"; if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE !=0){ print ''; - // print_liste_field_titre("Bank",$PHP_SELF,"c.fk_bank","&page=$page&statut=$statut"); + // print_liste_field_titre("Bank","cotisations.php","c.fk_bank","&page=$page&statut=$statut"); print 'Bank
(Type,Numéro,Libelle)'; print "\n"; } @@ -203,7 +203,7 @@ if ($result) print "Deposé"; }else{ print ""; - print "
"; + print ""; print ''; print ''; print '"; diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index e70e2620420..533b48ab6af 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2001-2004 Rodolphe Quiedeville * Copyright (C) 2002-2003 Jean-Louis Bergamo * Copyright (C) 2004 Laurent Destailleur * @@ -80,7 +80,7 @@ if ($_POST["action"] == 'cotisation') $result = $db->query($sql); if ($result) { - //Header("Location: $PHP_SELF"); + //Header("Location: fiche.php"); } else { @@ -202,7 +202,7 @@ if ($_POST["action"] == 'add') $result = $db->query($sql); if ($result) { - //Header("Location: $PHP_SELF"); + //Header("Location: fiche.php"); } else { @@ -342,7 +342,7 @@ $adho->fetch_optionals(); if ($action == 'create') { print_titre("Nouvel adhérent"); - print "\n"; + print "\n"; print ''; print ''; @@ -449,7 +449,7 @@ if ($rowid > 0) */ if ($action == 'delete') { - $html->form_confirm("$PHP_SELF?rowid=$rowid","Supprimer un adhérent","Etes-vous sûr de vouloir supprimer cet adhérent (La suppression d'un adhérent entraine la suppression de toutes ses cotisations !)","confirm_delete"); + $html->form_confirm("fiche.php?rowid=$rowid","Supprimer un adhérent","Etes-vous sûr de vouloir supprimer cet adhérent (La suppression d'un adhérent entraine la suppression de toutes ses cotisations !)","confirm_delete"); } /* @@ -457,7 +457,7 @@ if ($rowid > 0) */ if ($action == 'valid') { - $html->form_confirm("$PHP_SELF?rowid=$rowid","Valider un adhérent","Etes-vous sûr de vouloir valider cet adhérent ?","confirm_valid"); + $html->form_confirm("fiche.php?rowid=$rowid","Valider un adhérent","Etes-vous sûr de vouloir valider cet adhérent ?","confirm_valid"); } /* @@ -465,7 +465,7 @@ if ($rowid > 0) */ if ($action == 'resign') { - $html->form_confirm("$PHP_SELF?rowid=$rowid","Résilier une adhésion","Etes-vous sûr de vouloir résilier cet adhérent ?","confirm_resign"); + $html->form_confirm("fiche.php?rowid=$rowid","Résilier une adhésion","Etes-vous sûr de vouloir résilier cet adhérent ?","confirm_resign"); } /* @@ -473,7 +473,7 @@ if ($rowid > 0) */ if ($action == 'add_glasnost') { - $html->form_confirm("$PHP_SELF?rowid=$rowid","Ajouter dans glasnost","Etes-vous sur de vouloir ajouter cet adhérent dans glasnost ? (serveur : ".ADHERENT_GLASNOST_SERVEUR.")","confirm_add_glasnost"); + $html->form_confirm("fiche.php?rowid=$rowid","Ajouter dans glasnost","Etes-vous sur de vouloir ajouter cet adhérent dans glasnost ? (serveur : ".ADHERENT_GLASNOST_SERVEUR.")","confirm_add_glasnost"); } /* @@ -481,7 +481,7 @@ if ($rowid > 0) */ if ($action == 'del_glasnost') { - $html->form_confirm("$PHP_SELF?rowid=$rowid","Supprimer dans glasnost","Etes-vous sur de vouloir effacer cet adhérent dans glasnost ? (serveur : ".ADHERENT_GLASNOST_SERVEUR.")","confirm_del_glasnost"); + $html->form_confirm("fiche.php?rowid=$rowid","Supprimer dans glasnost","Etes-vous sur de vouloir effacer cet adhérent dans glasnost ? (serveur : ".ADHERENT_GLASNOST_SERVEUR.")","confirm_del_glasnost"); } /* @@ -489,7 +489,7 @@ if ($rowid > 0) */ if ($action == 'add_spip') { - $html->form_confirm("$PHP_SELF?rowid=$rowid","Ajouter dans spip","Etes-vous sur de vouloir ajouter cet adhérent dans spip ? (serveur : ".ADHERENT_SPIP_SERVEUR.")","confirm_add_spip"); + $html->form_confirm("fiche.php?rowid=$rowid","Ajouter dans spip","Etes-vous sur de vouloir ajouter cet adhérent dans spip ? (serveur : ".ADHERENT_SPIP_SERVEUR.")","confirm_add_spip"); } /* @@ -497,12 +497,12 @@ if ($rowid > 0) */ if ($action == 'del_spip') { - $html->form_confirm("$PHP_SELF?rowid=$rowid","Supprimer dans spip","Etes-vous sur de vouloir effacer cet adhérent dans spip ? (serveur : ".ADHERENT_SPIP_SERVEUR.")","confirm_del_spip"); - $html->form_confirm("$PHP_SELF?rowid=$rowid","Ajouter dans glasnost","Etes-vous sur de vouloir ajouter cet adhérent dans glasnost ? (serveur : ".ADHERENT_GLASNOST_SERVEUR.")","confirm_del_spip"); + $html->form_confirm("fiche.php?rowid=$rowid","Supprimer dans spip","Etes-vous sur de vouloir effacer cet adhérent dans spip ? (serveur : ".ADHERENT_SPIP_SERVEUR.")","confirm_del_spip"); + $html->form_confirm("fiche.php?rowid=$rowid","Ajouter dans glasnost","Etes-vous sur de vouloir ajouter cet adhérent dans glasnost ? (serveur : ".ADHERENT_GLASNOST_SERVEUR.")","confirm_del_spip"); } - print "\n"; + print "\n"; print '
'; print ''; @@ -556,36 +556,36 @@ if ($user->admin) if ($adh->statut < 1) { - print "Valider l'adhésion\n"; + print "Valider l'adhésion\n"; } if ($adh->statut == 1) { - print "Résilier l'adhésion\n"; + print "Résilier l'adhésion\n"; } - print "id&action=delete\">Supprimer\n"; + print "id&action=delete\">Supprimer\n"; /* * bouton : "Envoie des informations" */ - print "id&action=sendinfo\">Envoyer sa fiche a l'adhérent\n"; + print "id&action=sendinfo\">Envoyer sa fiche a l'adhérent\n"; if ($adht->vote == 'yes' && defined("ADHERENT_USE_GLASNOST") && ADHERENT_USE_GLASNOST ==1){ define("XMLRPC_DEBUG", 1); if ($adh->is_in_glasnost() == 1){ - print "id&action=del_glasnost\">Suppression dans Glasnost\n"; + print "id&action=del_glasnost\">Suppression dans Glasnost\n"; } - print "id&action=add_glasnost\">Ajout dans Glasnost\n"; - print "id&action=del_glasnost\">Suppression dans Glasnost\n"; + print "id&action=add_glasnost\">Ajout dans Glasnost\n"; + print "id&action=del_glasnost\">Suppression dans Glasnost\n"; } if (defined("ADHERENT_USE_SPIP") && ADHERENT_USE_SPIP ==1){ if ($adh->is_in_spip() == 1){ - print "id&action=del_spip\">Suppression dans Spip\n"; + print "id&action=del_spip\">Suppression dans Spip\n"; }else{ - print "id&action=add_spip\">Ajout dans Spip\n"; + print "id&action=add_spip\">Ajout dans Spip\n"; } } diff --git a/htdocs/adherents/options.php b/htdocs/adherents/options.php index 05826a42142..eeb13af49d3 100644 --- a/htdocs/adherents/options.php +++ b/htdocs/adherents/options.php @@ -98,8 +98,8 @@ llxHeader(); print "\n"; print "\n"; print "\n"; - print "\n"; + print "\n"; print ""; // $i++; } @@ -110,7 +110,7 @@ llxHeader(); * */ print '
'; - print "Nouvel attribut"; + print "Nouvel attribut"; print "
"; } @@ -127,7 +127,7 @@ if ($_GET["action"] == 'create') { print_titre("Nouvel attribut"); print '
'; - print ""; + print ""; print '
Numero'.$adh->id.' ".$adho->attribute_label[$key]." $key$value".img_edit().""; - print "  ".img_delete()."".img_edit().""; + print "  ".img_delete()."
'; print ''; @@ -164,7 +164,7 @@ if ($_GET["attrname"] && $_GET["action"] == 'edit') /* * formulaire d'edition */ - print ''; + print ''; print ''; print ''; print '
'; diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 806dc123d33..92cfe6634e0 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2003-2004 Rodolphe Quiedeville * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify @@ -94,7 +94,7 @@ if ($handle) else { print ''; - print ''; + print ''; } print ''; diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index dbf19bfec80..6bb063d534a 100644 --- a/htdocs/admin/compta.php +++ b/htdocs/admin/compta.php @@ -1,5 +1,6 @@ +/* Copyright (C) 2004 Rodolphe Quiedeville + * 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 @@ -65,7 +66,7 @@ print "
"; print '
 activeractiver
'; -print ''; +print ''; print ''; print ''; print ''; @@ -102,7 +103,7 @@ if ($result) $obj = $db->fetch_object( $i); $var=!$var; - print ''; + print ''; print ''; print ''; print ''; @@ -135,7 +136,7 @@ if ($result) print ''; print '\n"; print ''; diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 64259a34112..b664e395519 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -168,11 +168,11 @@ if ($_GET["id"]) print ''; foreach ($fieldlist as $field => $value) { print ''; } print ''; print ''; @@ -189,9 +189,9 @@ if ($_GET["id"]) } print '"; diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index 201bd098b35..37c99d0d035 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -38,6 +38,10 @@ if ($user->societe_id > 0) llxHeader(); +$begin=$_GET["begin"]; +$sortorder=$_GET["sortorder"]; +$sortfield=$_GET["sortfield"]; + if ($sortfield == "") { $sortfield="c.rowid"; @@ -80,20 +84,20 @@ $sql .= $db->plimit($limit + 1,$offset); if ( $db->query($sql) ) { $num = $db->num_rows(); - print_barre_liste("Commandes", $_GET["page"], $PHP_SELF,"&socidp=$socidp",$sortfield,$sortorder,'',$num); + print_barre_liste("Commandes", $_GET["page"], "liste.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); $i = 0; print '
Option de tenue de comptabilitéDescription'; print '   '; - print ''.img_delete().''; + print ''.img_delete().''; print "
'; - print_liste_field_titre(ucfirst($fieldlist[$field]),$PHP_SELF,$fieldlist[$field],"&id=".$_GET["id"]); + print_liste_field_titre(ucfirst($fieldlist[$field]),"dict.php",$fieldlist[$field],"&id=".$_GET["id"]); print ''; - print_liste_field_titre("Activer/Désactiver",$PHP_SELF,"active","&id=".$_GET["id"]); + print_liste_field_titre("Activer/Désactiver","dict.php","active","&id=".$_GET["id"]); print '
'; if ($obj->code) { - print ''.$actl[$obj->active].''; + print ''.$actl[$obj->active].''; } else { - print ''.$actl[$obj->active].''; + print ''.$actl[$obj->active].''; } print "
'; print ''; - print_liste_field_titre_new ("Réf",$PHP_SELF,"c.ref","","&socidp=$socidp",'width="15%"',$sortfield); + print_liste_field_titre_new ("Réf","liste.php","c.ref","","&socidp=$socidp",'width="15%"',$sortfield); - print_liste_field_titre_new ("Société",$PHP_SELF,"s.nom","","&socidp=$socidp",'width="30%"',$sortfield); + print_liste_field_titre_new ("Société","liste.php","s.nom","","&socidp=$socidp",'width="30%"',$sortfield); - print_liste_field_titre_new ("Date",$PHP_SELF,"c.date_commande","","&socidp=$socidp", 'width="25%" align="right" colspan="2"',$sortfield); + print_liste_field_titre_new ("Date","liste.php","c.date_commande","","&socidp=$socidp", 'width="25%" align="right" colspan="2"',$sortfield); - print_liste_field_titre_new ("Statut",$PHP_SELF,"c.fk_statut","","&socidp=$socidp",'width="10%" align="center"',$sortfield); + print_liste_field_titre_new ("Statut","liste.php","c.fk_statut","","&socidp=$socidp",'width="10%" align="center"',$sortfield); print "\n"; $var=True; diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 71c3d6db124..f49692b72be 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -63,7 +63,7 @@ if ($action == 'add' && $account) } else { - Header("Location: $PHP_SELF?account=" . $account); + Header("Location: account.php?account=" . $account); } } if ($action == 'del' && $account && $user->rights->banque->modifier) @@ -183,7 +183,7 @@ if ($account > 0) print_fiche_titre("Journal de trésorerie du compte : " .$acct->label,$mesg); print '
'; - print ''; + print ''; print ''; print ''; print '
'; @@ -211,7 +211,7 @@ if ($account > 0) */ if ($user->rights->banque->modifier) { - print ''; + print ''; print ''; print ''; print ''; @@ -402,7 +402,7 @@ Function _print_lines($db,$sql,$acct) { if ($user->rights->banque->modifier) { - print ""; } diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php index aadf34322ef..4a7be1b774c 100644 --- a/htdocs/compta/bank/budget.php +++ b/htdocs/compta/bank/budget.php @@ -61,7 +61,7 @@ if ($_GET["bid"] == 0) $objp = $db->fetch_object( $i); $var=!$var; print ""; - print ""; + print ""; print ''; print ""; print ""; diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 18fefbe11e5..77fc7f7295b 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -78,7 +78,7 @@ if (! isset($_GET["num"])) $numrows = $db->num_rows(); $i = 0; - print_barre_liste("Relevés bancaires, compte : id."\">".$acct->label."", $page, $PHP_SELF,"&account=$account",$sortfield,$sortorder,'',$numrows); + print_barre_liste("Relevés bancaires, compte : id."\">".$acct->label."", $page, "releve.php","&account=$account",$sortfield,$sortorder,'',$numrows); print '
'; print '
rowid&account=$acct->id&page=$page\">"; + print "rowid&account=$acct->id&page=$page\">"; print img_delete(); print "
rowid\">$objp->labelrowid\">$objp->label'.$objp->nombre.'".price(abs($objp->somme))."".price(abs($objp->somme / $objp->nombre))."
'; @@ -89,14 +89,17 @@ if (! isset($_GET["num"])) { $objp = $db->fetch_object( $i); $var=!$var; - if (! $objp->numr) { -// print "\n"; - } else { - print "\n"; - } + if (! $objp->numr) + { + // + } + else + { + print "\n"; + } $i++; } - print "
Ecritures rapprochées à aucun relevé
numr&account=".$_GET["account"]."\">$objp->numr
numr&account=".$_GET["account"]."\">$objp->numr
\n"; + print "\n"; } @@ -146,13 +149,13 @@ else $num=$_GET["num"]; } - $mesprevnext ="id\">".img_previous().""; + $mesprevnext ="id\">".img_previous().""; $mesprevnext.=" Relevé $num "; - $mesprevnext.="id\">".img_next().""; + $mesprevnext.="id\">".img_next().""; print_fiche_titre('Relevé numéro '.$num.', compte : '.$acct->label.'',$mesprevnext); - print ""; + print ""; print ""; print ''; print ""; @@ -186,7 +189,7 @@ else $var=True; $numrows = $db->num_rows(); $i = 0; - print ""; + print ""; print "\n"; while ($i < $numrows) diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index b1d0b647877..cb768306947 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -200,10 +200,10 @@ if ($result) $i = 0; if ($action == 'facturer') { - print_barre_liste("Liste des clients facturables", $page, $PHP_SELF,"",$sortfield,$sortorder,'',$num); + print_barre_liste("Liste des clients facturables", $page, "clients.php","",$sortfield,$sortorder,'',$num); } else { - print_barre_liste("Liste des clients", $page, $PHP_SELF,"",$sortfield,$sortorder,'',$num); + print_barre_liste("Liste des clients", $page, "clients.php","",$sortfield,$sortorder,'',$num); } if ($sortorder == "DESC") @@ -216,7 +216,7 @@ if ($result) } print '
id."\">Vue etendue
id."\">Vue etendue ".price($total)." 
'; print '"; print "\n"; diff --git a/htdocs/compta/pmt.php b/htdocs/compta/pmt.php index bbb8a56a703..3a433686b0c 100644 --- a/htdocs/compta/pmt.php +++ b/htdocs/compta/pmt.php @@ -86,10 +86,9 @@ if ($result) { print ""; + print ""; } else { @@ -373,7 +373,7 @@ if ($_GET["propalid"]) $cloturor = new User($db, $obj->fk_user_cloture); $cloturor->fetch(''); - print '

Cacher le suivi des actions '; + print '

Cacher le suivi des actions '; print '

'; - print_liste_field_titre("Société",$PHP_SELF,"s.nom"); + print_liste_field_titre("Société","clients.php","s.nom"); print "VillePréfix 
"; -print ""; +print ''; print ""; - $strmonth[1] = "Janvier"; $strmonth[2] = "Février"; $strmonth[3] = "Mars"; @@ -103,8 +102,6 @@ $strmonth[10] = "Octobre"; $strmonth[11] = "Novembre"; $strmonth[12] = "Décembre"; - - print "Date :"; $cmonth = date("n", time()); print ""; print "[id."&action=setstatut&statut=4\">Facturée][id."&action=setstatut&statut=4\">Facturée]
'; print ''; print ''; @@ -388,7 +388,7 @@ if ($_GET["propalid"]) } else { - print '

Voir le suivi des actions '; + print '

Voir le suivi des actions '; } } else { @@ -459,16 +459,16 @@ if ($_GET["propalid"]) { $num = $db->num_rows(); - print_barre_liste("Propositions commerciales", $page, $PHP_SELF,"&socidp=$socidp",$sortfield,$sortorder,'',$num); + print_barre_liste("Propositions commerciales", $page, "propal.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); $i = 0; print "

 NomDate
Création'.$author->fullname.'
"; print ''; - print_liste_field_titre_new ("Réf",$PHP_SELF,"p.ref","","&year=$year&viewstatut=$viewstatut",'',$sortfield); - print_liste_field_titre_new ("Société",$PHP_SELF,"s.nom","&viewstatut=$viewstatut","",'',$sortfield); - print_liste_field_titre_new ("Date",$PHP_SELF,"p.datep","&viewstatut=$viewstatut","",'align="right" colspan="2"',$sortfield); - print_liste_field_titre_new ("Prix",$PHP_SELF,"p.price","&viewstatut=$viewstatut","",'align="right"',$sortfield); - print_liste_field_titre_new ("Statut",$PHP_SELF,"p.fk_statut","&viewstatut=$viewstatut","",'align="center"',$sortfield); + print_liste_field_titre_new ("Réf","propal.php","p.ref","","&year=$year&viewstatut=$viewstatut",'',$sortfield); + print_liste_field_titre_new ("Société","propal.php","s.nom","&viewstatut=$viewstatut","",'',$sortfield); + print_liste_field_titre_new ("Date","propal.php","p.datep","&viewstatut=$viewstatut","",'align="right" colspan="2"',$sortfield); + print_liste_field_titre_new ("Prix","propal.php","p.price","&viewstatut=$viewstatut","",'align="right"',$sortfield); + print_liste_field_titre_new ("Statut","propal.php","p.fk_statut","&viewstatut=$viewstatut","",'align="center"',$sortfield); print "\n"; while ($i < min($num, $limit)) @@ -477,7 +477,7 @@ if ($_GET["propalid"]) $var=!$var; print ""; - print "\n"; + print "\n"; print "\n"; $now = time(); diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php index 80613a832fe..003cd66bb16 100644 --- a/htdocs/contact/index.php +++ b/htdocs/contact/index.php @@ -107,13 +107,13 @@ if ($result) $num = $db->num_rows(); $i = 0; - print_barre_liste($titre ,$page, $PHP_SELF, '&begin='.$_GET["begin"].'&view='.$_GET["view"].'&userid='.$_GET["userid"], $sortfield, $sortorder,'',$num); + print_barre_liste($titre ,$page, "index.php", '&begin='.$_GET["begin"].'&view='.$_GET["view"].'&userid='.$_GET["userid"], $sortfield, $sortorder,'',$num); print "
"; - print "| *\n| "; + print "| *\n| "; for ($ij = 65 ; $ij < 91; $ij++) { - print ""; + print ""; if ($_GET["begin"] == chr($ij) ) { @@ -137,11 +137,11 @@ if ($result) } print '

propalid\">$objp->refpropalid\">$objp->refidp\">$objp->nom
'; print ''; print ''; diff --git a/htdocs/contrat/enservice.php b/htdocs/contrat/enservice.php index 8101e45e6df..d2f39b0f607 100644 --- a/htdocs/contrat/enservice.php +++ b/htdocs/contrat/enservice.php @@ -65,18 +65,18 @@ if ( $db->query($sql) ) $i = 0; - print_barre_liste("Liste des contrats en service", $page, $PHP_SELF, "&sref=$sref&snom=$snom", $sortfield, $sortorder,'',$num); + print_barre_liste("Liste des contrats en service", $page, "enservice.php", "&sref=$sref&snom=$snom", $sortfield, $sortorder,'',$num); print '
'; - print_liste_field_titre("Nom",$PHP_SELF,"lower(p.name)", $begin); + print_liste_field_titre("Nom","index.php","lower(p.name)", $begin); print ""; - print_liste_field_titre("Prénom",$PHP_SELF,"lower(p.firstname)", $begin); + print_liste_field_titre("Prénom","index.php","lower(p.firstname)", $begin); print ""; - print_liste_field_titre("Société",$PHP_SELF,"lower(s.nom)", $begin); + print_liste_field_titre("Société","index.php","lower(s.nom)", $begin); print 'Téléphone
'; print '"; print ""; print "'; print "\n"; diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 70ddf419106..f4032cf10a7 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -73,22 +73,22 @@ if ( $db->query($sql) ) $i = 0; - print_barre_liste("Liste des contrats", $page, $PHP_SELF, "&sref=$sref&snom=$snom", $sortfield, $sortorder,'',$num); + print_barre_liste("Liste des contrats", $page, "index.php", "&sref=$sref&snom=$snom", $sortfield, $sortorder,'',$num); print '
'; - print_liste_field_titre("Libellé",$PHP_SELF, "p.label"); + print_liste_field_titre("Libellé","enservice.php", "p.label"); print ""; - print_liste_field_titre("Société",$PHP_SELF, "s.nom"); + print_liste_field_titre("Société","enservice.php", "s.nom"); print "Statut"; - print_liste_field_titre("Date fin",$PHP_SELF, "date_fin_validite"); + print_liste_field_titre("Date fin","enservice.php", "date_fin_validite"); print '
'; print ''; print ''; print ''; print "\n"; diff --git a/htdocs/expedition/commande.php b/htdocs/expedition/commande.php index e7662403b87..d61e0c33156 100644 --- a/htdocs/expedition/commande.php +++ b/htdocs/expedition/commande.php @@ -79,7 +79,7 @@ if ($_GET["id"] > 0) */ if ($_GET["action"] == 'cloture') { - $html->form_confirm("$PHP_SELF?id=$id","Cloturer la commande","Etes-vous sûr de cloturer cette commande ?","confirm_cloture"); + $html->form_confirm("commande.php?id=$id","Cloturer la commande","Etes-vous sûr de cloturer cette commande ?","confirm_cloture"); } /* * diff --git a/htdocs/expedition/liste.php b/htdocs/expedition/liste.php index c651f14886c..43cfb61d2df 100644 --- a/htdocs/expedition/liste.php +++ b/htdocs/expedition/liste.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2001-2004 Rodolphe Quiedeville * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify @@ -83,18 +83,18 @@ $sql .= $db->plimit($limit + 1,$offset); if ( $db->query($sql) ) { $num = $db->num_rows(); - print_barre_liste("Expeditions", $_GET["page"], $PHP_SELF,"&socidp=$socidp",$sortfield,$sortorder,'',$num); + print_barre_liste("Expeditions", $_GET["page"], "liste.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); $i = 0; print '
'; - print_liste_field_titre("Numéro",$PHP_SELF, "c.rowid"); + print_liste_field_titre("Numéro","index.php", "c.rowid"); print ""; - print_liste_field_titre("Libellé",$PHP_SELF, "p.label"); + print_liste_field_titre("Libellé","index.php", "p.label"); print ""; - print_liste_field_titre("Société",$PHP_SELF, "s.nom"); + print_liste_field_titre("Société","index.php", "s.nom"); print ''; - print_liste_field_titre("Statut",$PHP_SELF, "c.enservice"); + print_liste_field_titre("Statut","index.php", "c.enservice"); print ''; - print_liste_field_titre("Date Fin",$PHP_SELF, "c.fin_validite"); + print_liste_field_titre("Date Fin","index.php", "c.fin_validite"); print '
'; print ''; - print_liste_field_titre_new ("Réf",$PHP_SELF,"e.ref","","&socidp=$socidp",'width="15%"',$sortfield); + print_liste_field_titre_new ("Réf","liste.php","e.ref","","&socidp=$socidp",'width="15%"',$sortfield); - print_liste_field_titre_new ("Date",$PHP_SELF,"e.date_expedition","","&socidp=$socidp", 'width="25%" align="right" colspan="2"',$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 ("Statut",$PHP_SELF,"e.fk_statut","","&socidp=$socidp",'width="10%" align="center"',$sortfield); + print_liste_field_titre_new ("Statut","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 c1f8bdfce19..a400a50c2f1 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -130,7 +130,7 @@ if ($action == 'create') $fix = new Fichinter($db); $numpr = $fix->get_new_num($objsoc->prefix_comm); - print ""; + print ""; $strmonth[1] = "Janvier"; $strmonth[2] = "Février"; @@ -260,7 +260,7 @@ if ($action == 'edit') print_titre("Mettre à jour Fiche d'intervention"); - print ""; + print ""; print '
'; print "
Date"; diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php index 06c56472549..b390bbb9314 100644 --- a/htdocs/fichinter/index.php +++ b/htdocs/fichinter/index.php @@ -66,14 +66,14 @@ $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit( $limit + 1 ,$offset); if ( $db->query($sql) ) { $num = $db->num_rows(); - print_barre_liste("Liste des fiches d'intervention", $page, $PHP_SELF,"&socid=$socid",$sortfield,$sortorder,'',$num); + print_barre_liste("Liste des fiches d'intervention", $page, "index.php","&socid=$socid",$sortfield,$sortorder,'',$num); $i = 0; print ''; print ""; - print_liste_field_titre_new ("Num",$PHP_SELF,"f.ref","","&socid=$socid",'width="15%"',$sortfield); - print_liste_field_titre_new ("Société",$PHP_SELF,"s.nom","","&socid=$socid",'',$sortfield); - print_liste_field_titre_new ("Date",$PHP_SELF,"f.datei","","&socid=$socid",'',$sortfield); + 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 "\n"; diff --git a/htdocs/fichinter/rapport.php b/htdocs/fichinter/rapport.php index ad42dbd8e7b..a2fc4be2395 100644 --- a/htdocs/fichinter/rapport.php +++ b/htdocs/fichinter/rapport.php @@ -64,7 +64,7 @@ if (empty ($MM)) if (empty($YY)) $YY=strftime("%Y",time());; echo "
"; -echo "\n"; +echo "\n"; echo ""; echo "Mois "; echo " Année "; @@ -91,7 +91,7 @@ if ( $db->query($sql) ) { $num = $db->num_rows(); $title = "Rapport d'activité de " . strftime("%B %Y",strtotime ($start)); - print_barre_liste($title, $page, $PHP_SELF,"&socid=$socid",$sortfield,$sortorder,'',$num); + print_barre_liste($title, $page, "rapport.php","&socid=$socid",$sortfield,$sortorder,'',$num); $i = 0; print '
DuréeStatut 
'; diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php index 7a06295cce3..daebbc36513 100644 --- a/htdocs/fourn/contact.php +++ b/htdocs/fourn/contact.php @@ -81,13 +81,13 @@ $result = $db->query($sql); if ($result) { $num = $db->num_rows(); - print_barre_liste("Liste des contacts fournisseurs",$page, $PHP_SELF, "",$sortfield,$sortorder,"",$num); + print_barre_liste("Liste des contacts fournisseurs",$page, "contact.php", "",$sortfield,$sortorder,"",$num); print "
"; - print "| *\n| "; + print "| *\n| "; for ($i = 65 ; $i < 91; $i++) { - print ""; + print ""; if ($begin == chr($i) ) { print "->" . chr($i) . "<-" ; @@ -106,11 +106,11 @@ if ($result) { print '

'; print ""; print "'; print "\n"; $var=True; @@ -137,7 +137,7 @@ if ($result) { print "
"; - print_liste_field_titre("Nom",$PHP_SELF,"lower(p.name)", $begin); + print_liste_field_titre("Nom","contact.php","lower(p.name)", $begin); print ""; - print_liste_field_titre("Prénom",$PHP_SELF,"lower(p.firstname)", $begin); + print_liste_field_titre("Prénom","contact.php","lower(p.firstname)", $begin); print ""; - print_liste_field_titre("Société",$PHP_SELF,"lower(s.nom)", $begin); + print_liste_field_titre("Société","contact.php","lower(s.nom)", $begin); print 'emailTéléphone
"; $db->free(); } else { - print_barre_liste("Liste des contacts $label",$page, $PHP_SELF); + print_barre_liste("Liste des contacts $label",$page, "contact.php"); print $db->error(); } diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 94751909aa0..b9640d72d8c 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -188,7 +188,7 @@ if ($_GET["action"] == 'create' or $_GET["action"] == 'copy') } print_titre("Saisir une facture fournisseur"); - print ''; + print ''; print ''; print ''; print ''; @@ -288,7 +288,7 @@ else print_titre('Facture : '.$fac->ref); - print "id\" method=\"post\">"; + print ''; print ''; print '
Société
'; @@ -332,7 +332,7 @@ else * Lignes * */ - print "

id&action=add_ligne\" method=\"post\">"; + print "

id&action=add_ligne\" method=\"post\">"; print '

'; print ''; print ''; @@ -379,7 +379,7 @@ else * */ - $head[0][0] = DOL_URL_ROOT."$PHP_SELF?facid=".$fac->id; + $head[0][0] = DOL_URL_ROOT."fiche.php?facid=".$fac->id; $head[0][1] = 'Facture : '.$fac->ref; $h = 1; $a = 0; @@ -562,11 +562,11 @@ else if ($fac->statut == 0) { if ($_GET["action"] <> "edit") - print "id&action=valid\">Valider"; + print "id&action=valid\">Valider"; } else { - print "id&action=copy&socid=$fac->socidp\">Copier"; + print "id&action=copy&socid=$fac->socidp\">Copier"; } } diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index d3e9f98a00f..1d4f147a7f4 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -206,7 +206,7 @@ if ($action == '') { $i = 0; $var=True; - print_barre_liste("Paiements", $page, $PHP_SELF,"&socidp=$socidp",$sortfield,$sortorder,'',$num); + print_barre_liste("Paiements", $page, "paiement.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); print '
LibelléP.U. HTQuantitéTotal HTTaux TVA
'; print ''; diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index c84c9e7bc66..c5450b1f54e 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/index.php @@ -144,7 +144,7 @@ if ($result) $num = $db->num_rows(); $i = 0; - print_barre_liste("Liste des fournisseurs", $page, $PHP_SELF, "", $sortfield, $sortorder, '', $num); + print_barre_liste("Liste des fournisseurs", $page, "index.php", "", $sortfield, $sortorder, '', $num); if ($sortorder == "DESC") { $sortorder="ASC"; @@ -155,7 +155,7 @@ if ($result) } print '
'; print '"; print "\n"; $var=True; diff --git a/htdocs/postnuke/articles/fiche.php b/htdocs/postnuke/articles/fiche.php index 8b2c54455b9..0ae83906c52 100644 --- a/htdocs/postnuke/articles/fiche.php +++ b/htdocs/postnuke/articles/fiche.php @@ -66,7 +66,7 @@ if ($id) { print_titre ("Edition de la fiche article"); - print "\n"; + print "\n"; print ""; print '
'; - print_liste_field_titre("Société",$PHP_SELF,"s.nom"); + print_liste_field_titre("Société","index.php","s.nom"); print "Ville
'; diff --git a/htdocs/postnuke/articles/index.php b/htdocs/postnuke/articles/index.php index e11be645f68..70ab71adc0c 100644 --- a/htdocs/postnuke/articles/index.php +++ b/htdocs/postnuke/articles/index.php @@ -37,7 +37,7 @@ if ($page == -1) { $page = 0 ; } $limit = $conf->liste_limit; $offset = $limit * $page ; -print_barre_liste("Liste des articles", $page, $PHP_SELF, "", $sortfield, $sortorder, $form); +print_barre_liste("Liste des articles", $page, "index.php", "", $sortfield, $sortorder, $form); $sql = "SELECT p.pn_sid, p.pn_title FROM " . PN_DB_NAME . "." . PN_TABLE_STORIES_NAME . " as p"; @@ -50,7 +50,7 @@ if ( $db->query($sql) ) $i = 0; print "

"; print "'; print "\n"; $var=True; diff --git a/htdocs/product/album/fiche.php b/htdocs/product/album/fiche.php index 96bd67557c5..2eac495fb26 100644 --- a/htdocs/product/album/fiche.php +++ b/htdocs/product/album/fiche.php @@ -66,7 +66,7 @@ if ($action == 'updateosc') { if ($action == 'create') { - print "\n"; + print "\n"; print ""; print '
Nouvel album

'; @@ -126,7 +126,7 @@ else { print '
Edition de la fiche Album : '.$album->titre.'

'; - print "\n"; + print "\n"; print ""; print '
"; - print_liste_field_titre("Titre.",$PHP_SELF, "p.pn_title"); + print_liste_field_titre("Titre.","index.php", "p.pn_title"); print ' 
'; @@ -149,7 +149,7 @@ else $htmls = new Form($db); $ga = new Groupart($db); - print "\n"; + print "\n"; print ""; foreach ($gas as $key => $value) diff --git a/htdocs/product/album/index.php b/htdocs/product/album/index.php index f207adc8c23..fc1267a9f67 100644 --- a/htdocs/product/album/index.php +++ b/htdocs/product/album/index.php @@ -39,7 +39,7 @@ $limit = $conf->liste_limit; $offset = $limit * $page ; -print_barre_liste("Liste des albums", $page, $PHP_SELF); +print_barre_liste("Liste des albums", $page, "index.php"); $sql = "SELECT a.rowid, a.title, a.osc_id FROM ".MAIN_DB_PREFIX."album as a"; @@ -51,7 +51,7 @@ if ( $db->query($sql) ) { $i = 0; print "

"; print ""; print ""; print "\n"; diff --git a/htdocs/product/categorie/fiche.php b/htdocs/product/categorie/fiche.php index 8246f9ffe19..a7ed8808718 100644 --- a/htdocs/product/categorie/fiche.php +++ b/htdocs/product/categorie/fiche.php @@ -63,7 +63,7 @@ if ($action == 'updateosc') { if ($action == 'create') { - print "\n"; + print "\n"; print ""; print '
Nouvel album

'; @@ -116,7 +116,7 @@ else { print '
Edition de la fiche Album : '.$album->titre.'

'; - print "\n"; + print "\n"; print ""; print '
"; - print_liste_field_titre("Titre",$PHP_SELF, "a.title"); + print_liste_field_titre("Titre","index.php", "a.title"); print "
'; @@ -135,7 +135,7 @@ else $htmls = new Form($db); $ga = new Groupart($db); - print "\n"; + print "\n"; print ""; foreach ($gas as $key => $value) diff --git a/htdocs/product/categorie/index.php b/htdocs/product/categorie/index.php index c81b11d05d5..0e3bd217c59 100644 --- a/htdocs/product/categorie/index.php +++ b/htdocs/product/categorie/index.php @@ -29,7 +29,7 @@ if ($id) { $title = title_url($id, $db); - print_barre_liste($title, $page, $PHP_SELF); + print_barre_liste($title, $page, "index.php"); $sql = "SELECT products_id FROM ".DB_NAME_OSC.".products_to_categories WHERE categories_id = $id"; @@ -69,7 +69,7 @@ if ($id) $i = 0; print "

"; print ""; print ''; print "\n"; @@ -119,7 +119,7 @@ if ($id) else { - print_barre_liste("Liste des catégories", $page, $PHP_SELF); + print_barre_liste("Liste des catégories", $page, "index.php"); $sql = "SELECT c.categories_id, cd.categories_name "; $sql .= " FROM ".DB_NAME_OSC.".categories as c,".DB_NAME_OSC.".categories_description as cd"; @@ -133,7 +133,7 @@ else $i = 0; print "

Réf."; - print_liste_field_titre("Titre",$PHP_SELF, "l.title"); + print_liste_field_titre("Titre","index.php", "l.title"); print " 
"; print ""; print ""; print "\n"; diff --git a/htdocs/product/concert/fiche.php b/htdocs/product/concert/fiche.php index 1d7e8ab9e10..f9b246f4143 100644 --- a/htdocs/product/concert/fiche.php +++ b/htdocs/product/concert/fiche.php @@ -60,7 +60,7 @@ if ($action == 'updateosc') { if ($action == 'create') { - print "\n"; + print "\n"; print ""; print '
Nouveau concert

'; @@ -127,7 +127,7 @@ else { print '
Edition de la fiche Concert : '.$concert->titre.'

'; - print "\n"; + print "\n"; print ""; print '
"; - print_liste_field_titre("Titre",$PHP_SELF, "a.title"); + print_liste_field_titre("Titre","index.php", "a.title"); print "
'; diff --git a/htdocs/product/concert/fichelieu.php b/htdocs/product/concert/fichelieu.php index cef9f12e115..0e8dd83b4d9 100644 --- a/htdocs/product/concert/fichelieu.php +++ b/htdocs/product/concert/fichelieu.php @@ -58,7 +58,7 @@ if ($action == 'updateosc') { if ($action == 'create') { - print "\n"; + print "\n"; print ""; print '
Nouveau lieu de concert

'; @@ -101,7 +101,7 @@ else { print '
Edition de la fiche lieu de concert : '.$lieuconcert->nom.'

'; - print "\n"; + print "\n"; print ""; print '
'; diff --git a/htdocs/product/concert/index.php b/htdocs/product/concert/index.php index 596e0c7eb0c..52e93223d02 100644 --- a/htdocs/product/concert/index.php +++ b/htdocs/product/concert/index.php @@ -36,7 +36,7 @@ if ($page == -1) { $page = 0 ; } $limit = $conf->liste_limit; $offset = $limit * $page ; -print_barre_liste("Liste des concerts", $page, $PHP_SELF); +print_barre_liste("Liste des concerts", $page, "index.php"); //$sql = "SELECT c.rowid, c.date_concert as dc, ga.nom, lc.nom as lieu, lc.ville"; $sql = "SELECT c.rowid, c.date_concert as dc, c.fk_groupart, c.fk_lieu_concert, ga.nom, lc.nom as lieu, lc.ville"; @@ -50,13 +50,13 @@ if ( $db->query($sql) ) { $i = 0; print "

"; print ""; print "\n"; diff --git a/htdocs/product/concert/salles.php b/htdocs/product/concert/salles.php index 00cd18e2259..7fe667988ad 100644 --- a/htdocs/product/concert/salles.php +++ b/htdocs/product/concert/salles.php @@ -36,7 +36,7 @@ if ($page == -1) { $page = 0 ; } $limit = $conf->liste_limit; $offset = $limit * $page ; -print_barre_liste("Liste des concerts", $page, $PHP_SELF); +print_barre_liste("Liste des concerts", $page, "salles.php"); $sql = "SELECT lc.rowid, lc.nom, lc.ville FROM ".MAIN_DB_PREFIX."lieu_concert as lc"; @@ -48,9 +48,9 @@ if ( $db->query($sql) ) { $i = 0; print "

"; - print_liste_field_titre("Titre",$PHP_SELF, "a.title"); + print_liste_field_titre("Titre","index.php", "a.title"); print ""; - print_liste_field_titre("Artiste/Groupe",$PHP_SELF, "ga.nom"); + print_liste_field_titre("Artiste/Groupe","index.php", "ga.nom"); print ""; - print_liste_field_titre("Salle",$PHP_SELF, "lc.nom"); + print_liste_field_titre("Salle","index.php", "lc.nom"); print ""; - print_liste_field_titre("Ville",$PHP_SELF, "lc.ville"); + print_liste_field_titre("Ville","index.php", "lc.ville"); print "
"; print ""; print "\n"; diff --git a/htdocs/product/groupart/fiche.php b/htdocs/product/groupart/fiche.php index c4fc5d40ae8..ab78bc4b5ef 100644 --- a/htdocs/product/groupart/fiche.php +++ b/htdocs/product/groupart/fiche.php @@ -53,7 +53,7 @@ if ($action == 'updateosc') { if ($action == 'create') { - print "\n"; + print "\n"; print ""; print '
Nouvel Artiste/Groupe

'; @@ -113,7 +113,7 @@ else } print '
Edition de la fiche produit : '.$groupart->ref.'

'; - print "\n"; + print "\n"; print ""; print '
"; - print_liste_field_titre("Nom",$PHP_SELF, "lc.nom"); + print_liste_field_titre("Nom","salles.php", "lc.nom"); print ""; - print_liste_field_titre("Ville",$PHP_SELF, "lc.ville"); + print_liste_field_titre("Ville","salles.php", "lc.ville"); print "
'; diff --git a/htdocs/product/groupart/index.php b/htdocs/product/groupart/index.php index 75af7d124f7..75e1c370dd0 100644 --- a/htdocs/product/groupart/index.php +++ b/htdocs/product/groupart/index.php @@ -38,7 +38,7 @@ $limit = $conf->liste_limit; $offset = $limit * $page ; -print_barre_liste("Liste des Artistes/Groupes", $page, $PHP_SELF); +print_barre_liste("Liste des Artistes/Groupes", $page, "index.php"); $sql = "SELECT g.rowid, g.nom, groupart FROM ".MAIN_DB_PREFIX."groupart as g"; @@ -50,7 +50,7 @@ if ( $db->query($sql) ) { $i = 0; print "

"; print ""; print ""; print "\n"; diff --git a/htdocs/product/osc-liste.php b/htdocs/product/osc-liste.php index 2bc7d4d5e24..9b8a6c543c2 100644 --- a/htdocs/product/osc-liste.php +++ b/htdocs/product/osc-liste.php @@ -37,7 +37,7 @@ $limit = $conf->liste_limit; $offset = $limit * $page ; -print_barre_liste("Liste des produits oscommerce", $page, $PHP_SELF); +print_barre_liste("Liste des produits oscommerce", $page, "osc-liste.php"); $sql = "SELECT p.products_id, p.products_model, p.products_quantity, p.products_status, d.products_name, m.manufacturers_name, m.manufacturers_id"; $sql .= " FROM ".DB_NAME_OSC.".products as p, ".DB_NAME_OSC.".products_description as d, ".DB_NAME_OSC.".manufacturers as m"; diff --git a/htdocs/product/osc-reviews.php b/htdocs/product/osc-reviews.php index 4d50d3c5eed..db85b4d09d1 100644 --- a/htdocs/product/osc-reviews.php +++ b/htdocs/product/osc-reviews.php @@ -37,7 +37,7 @@ $limit = $conf->liste_limit; $offset = $limit * $page ; -print_barre_liste("Liste des produits oscommerce", $page, $PHP_SELF); +print_barre_liste("Liste des produits oscommerce", $page, "osc-reviews.php"); $sql = "SELECT r.reviews_rating FROM ".DB_NAME_OSC.".reviews as r"; diff --git a/htdocs/product/promotion/index.php b/htdocs/product/promotion/index.php index 7f0f1446bd0..83fd2822dd3 100644 --- a/htdocs/product/promotion/index.php +++ b/htdocs/product/promotion/index.php @@ -48,7 +48,7 @@ if ($page == -1) { $page = 0 ; } $limit = $conf->liste_limit; $offset = $limit * $page ; -print_barre_liste("Liste des promotions", $page, $PHP_SELF, "",$sortfield, $sortorder); +print_barre_liste("Liste des promotions", $page, "index.php", "",$sortfield, $sortorder); $urladd = "&sortorder=$sortorder&sortfield=$sortfield"; @@ -65,9 +65,9 @@ if ( $db->query($sql) ) $i = 0; print '

"; - print_liste_field_titre("Réf",$PHP_SELF, "p.ref"); + print_liste_field_titre("Réf","index.php", "p.ref"); print "
'; print ""; print ""; print ''; diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index e60c4d9861c..6b92d10d2f3 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -74,7 +74,7 @@ if ($_GET["id"]) $sortfield="f.datef"; } - print_barre_liste("Factures",$page,$PHP_SELF,"&id=$product->id",$sortfield,$sortorder); + print_barre_liste("Factures",$page,"facture.php","&id=$product->id",$sortfield,$sortorder); $sql = "SELECT distinct(f.rowid), s.nom,s.idp,f.facnumber,f.amount,".$db->pdate("f.datef")." as df,f.paye,f.rowid as facid"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."facturedet as d WHERE f.fk_soc = s.idp"; @@ -95,9 +95,9 @@ if ($_GET["id"]) print ''; print ''; print ''; print ''; print "\n"; diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 6431211eb81..b95681f8ae0 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -65,15 +65,15 @@ if ($result) $texte = "Liste des mouvements"; llxHeader("","",$texte); - print_barre_liste($texte, $page, $PHP_SELF, "&sref=$sref&snom=$snom", $sortfield, $sortorder,'',$num); + print_barre_liste($texte, $page, "mouvement.php", "&sref=$sref&snom=$snom", $sortfield, $sortorder,'',$num); print '
"; - print_liste_field_titre("Réf",$PHP_SELF, "p.products_model"); + print_liste_field_titre("Réf","index.php", "p.products_model"); print ""; - print_liste_field_titre("Titre",$PHP_SELF, "pd.products_name"); + print_liste_field_titre("Titre","index.php", "pd.products_name"); print "FinPrix initial
Numéro'; - print_liste_field_titre("Société",$PHP_SELF,"s.nom","","&socidp=$socidp"); + print_liste_field_titre("Société","facture.php","s.nom","","&socidp=$socidp"); print ''; - print_liste_field_titre("Date",$PHP_SELF,"f.datef","","&socidp=$socidp"); + print_liste_field_titre("Date","facture.php","f.datef","","&socidp=$socidp"); print 'Montant 
'; print "\n"; $var=True; diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index a189bf23d64..c4114bed464 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -166,7 +166,7 @@ if ($_GET["id"]) if ($_GET["action"] == "correction") { print_titre ("Correction du stock"); - print "id\" method=\"post\">\n"; + print "id\" method=\"post\">\n"; print ''; print '
"; - print_liste_field_titre("Réf",$PHP_SELF, "p.ref",""); + print_liste_field_titre("Réf","mouvement.php", "p.ref",""); print "Unités"; - print_liste_field_titre("Date",$PHP_SELF, "m.datem",""); + print_liste_field_titre("Date","mouvement.php", "m.datem",""); print ""; - print_liste_field_titre("Entrepôt",$PHP_SELF, "s.label",""); + print_liste_field_titre("Entrepôt","mouvement.php", "s.label",""); print "
'; print '
Entrepôt'; print ''; print '
Entrepôt'; print '\n"; $sql = "SELECT s.nom, s.idp, p.rowid as projectid, p.ref, p.title, s.client,".$db->pdate("p.dateo")." as do"; diff --git a/htdocs/societe.php b/htdocs/societe.php index 1adebc2c117..6ebfc36ab04 100644 --- a/htdocs/societe.php +++ b/htdocs/societe.php @@ -132,7 +132,7 @@ if ($result) $params = "&socname=$socname"; - print_barre_liste($title, $page, $PHP_SELF,$params,$sortfield,$sortorder,'',$num); + print_barre_liste($title, $page, "societe.php",$params,$sortfield,$sortorder,'',$num); if ($title_filtre) { @@ -144,9 +144,9 @@ if ($result) print '
'; -print_liste_field_titre("Titre",$PHP_SELF,"p.title"); +print_liste_field_titre("Titre","index.php","p.title"); print "Réf"; -print_liste_field_titre("Société",$PHP_SELF,"s.nom"); +print_liste_field_titre("Société","index.php","s.nom"); print "
'; print ''; print ''; print "\n"; $var=True; diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php index 6c87c5d11d4..76b5322ead6 100644 --- a/htdocs/societe/notify/fiche.php +++ b/htdocs/societe/notify/fiche.php @@ -150,8 +150,8 @@ if ( $soc->fetch($soc->id) ) print '
'; - print_liste_field_titre($langs->trans("Company"),$PHP_SELF,"s.nom", $params); + print_liste_field_titre($langs->trans("Company"),"societe.php","s.nom", $params); print ''; - print_liste_field_titre($langs->trans("Town"),$PHP_SELF,"s.ville",$params); + print_liste_field_titre($langs->trans("Town"),"societe.php","s.ville",$params); print ''.$langs->trans("Cards").'
'; print ''; - print_liste_field_titre_new ("Contact",$PHP_SELF,"c.name","","&socid=$socid",'',$sortfield); - print_liste_field_titre_new ("Action",$PHP_SELF,"a.titre","","&socid=$socid",'',$sortfield); + 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 ''; print ''; diff --git a/htdocs/societe/notify/index.php b/htdocs/societe/notify/index.php index ff97bda7034..7f954d36fca 100644 --- a/htdocs/societe/notify/index.php +++ b/htdocs/societe/notify/index.php @@ -53,7 +53,7 @@ $pagenext = $page + 1; * * */ -print_barre_liste("Liste des societes", $page, $PHP_SELF); +print_barre_liste("Liste des societes", $page, "index.php"); $sql = "SELECT s.nom, s.idp, c.name, c.firstname, a.titre,n.rowid FROM ".MAIN_DB_PREFIX."socpeople as c, ".MAIN_DB_PREFIX."action_def as a, ".MAIN_DB_PREFIX."notify_def as n, ".MAIN_DB_PREFIX."societe as s"; $sql .= " WHERE n.fk_contact = c.idp AND a.rowid = n.fk_action"; @@ -75,11 +75,11 @@ if ($result) print "
 
"; print ''; print "\n"; $var=True; while ($i < $num) diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 27e0770a4c0..e31a37e214d 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -40,16 +40,16 @@ if ($result) print "

"; - print_liste_field_titre("Société",$PHP_SELF,"s.nom"); + print_liste_field_titre("Société","index.php","s.nom"); print ""; - print_liste_field_titre("Contact",$PHP_SELF,"c.name"); + print_liste_field_titre("Contact","index.php","c.name"); print ""; - print_liste_field_titre("Action",$PHP_SELF,"a.titre"); + print_liste_field_titre("Action","index.php","a.titre"); print "
"; print ''; print ""; print ""; print ""; print ""; print "\n"; $var=True;
"; - print_liste_field_titre("Nom",$PHP_SELF,"name"); + print_liste_field_titre("Nom","index.php","name"); print ""; - print_liste_field_titre("Prénom",$PHP_SELF,"firstname"); + print_liste_field_titre("Prénom","index.php","firstname"); print ""; - print_liste_field_titre("Login",$PHP_SELF,"login"); + print_liste_field_titre("Login","index.php","login"); print ""; - print_liste_field_titre("Code",$PHP_SELF,"code"); + print_liste_field_titre("Code","index.php","code"); print "