diff --git a/htdocs/comm/bookmark.php3 b/htdocs/comm/bookmark.php3 index 227b3433678..2804772f692 100644 --- a/htdocs/comm/bookmark.php3 +++ b/htdocs/comm/bookmark.php3 @@ -22,7 +22,7 @@ require("./pre.inc.php3"); llxHeader(); -$db = new Db(); + if ($sortorder == "") { $sortorder="DESC"; } @@ -82,8 +82,8 @@ if ( $db->query($sql) ) print "

"; print ""; print ""; - print ""; - print ""; + print ""; + print ""; print ""; print ""; @@ -110,7 +110,7 @@ if ( $db->query($sql) ) print ""; print ""; print ""; - print "\n"; + print "\n"; print "\n"; print "\n"; diff --git a/htdocs/comm/facture.php3 b/htdocs/comm/facture.php3 index 10c57cc71dc..e8e37631bea 100644 --- a/htdocs/comm/facture.php3 +++ b/htdocs/comm/facture.php3 @@ -23,7 +23,7 @@ require("./pre.inc.php3"); llxHeader(); -$db = new Db(); + if ($action == 'add') { $datefacture = $db->idate(mktime(12, 0 , 0, $pmonth, $pday, $pyear)); @@ -171,7 +171,7 @@ if ($action == 'add') { $objp = $db->fetch_object( $i); $var=!$var; print ""; - print "\n"; + print "\n"; print "\n"; if ($objp->df > 0 ) { diff --git a/htdocs/comm/fiche.php3 b/htdocs/comm/fiche.php3 index 54165dd089c..e7bc7e1af75 100644 --- a/htdocs/comm/fiche.php3 +++ b/htdocs/comm/fiche.php3 @@ -149,7 +149,7 @@ if ($socid > 0) { print ""; print ""; - print ""; + print ""; if ($user->rights->projet->creer) print ""; if (defined("MAIN_MODULE_PROPALE") && MAIN_MODULE_PROPALE) @@ -278,7 +278,7 @@ if ($socid > 0) { */ if ($action == 'changevalue') { print "
"; - print "idp\" method=\"post\">"; + print "idp\" method=\"post\">"; print ""; print "Cette société est un cabinet de recrutement : "; print ""; print ''; - print ''; print ''; $i++; diff --git a/htdocs/comm/projet/fiche.php3 b/htdocs/comm/projet/fiche.php3 index 5fc6983ac09..c86aa3f435d 100644 --- a/htdocs/comm/projet/fiche.php3 +++ b/htdocs/comm/projet/fiche.php3 @@ -23,8 +23,6 @@ require("./pre.inc.php3"); require("./project.class.php3"); require("../../propal.class.php3"); -$db = new Db(); - if ($HTTP_POST_VARS["action"] == 'update') { $projet = new Project($db); @@ -70,7 +68,7 @@ if ($action == 'create') { print_titre("Nouveau projet"); - print ''; + print ''; ?>
 IdSocieteIdSocieteStatutAuteur
" . ($i + 1 + ($limit * $page)) . "$obj->idpidp\">$obj->nomidp\">$obj->nom$obj->stcomm$obj->author
idp\">$objp->nomidp\">$objp->nomfacid\">$objp->facnumberidp\">Comptaidp\">Documentsidp&action=add_bookmark\">[Bookmark]idp&action=add_bookmark\">[Bookmark]idp&action=create\">[Projet]
'.$obj->nom.''; + print ''; print '
diff --git a/htdocs/compta/bank/functions.lib.php3 b/htdocs/compta/bank/functions.lib.php3 index 6b6618697ab..d3da77b30f7 100644 --- a/htdocs/compta/bank/functions.lib.php3 +++ b/htdocs/compta/bank/functions.lib.php3 @@ -138,75 +138,7 @@ function gljFooter_Cursor ($file, $page, $limit, $i, $parm="") { // // // -function gljMenu_PrestaLogged() { - print "
"; - print "Liste |\n"; - print "
"; -} - - -function gljMenu_Stat() { - print "
"; - print "" . $GLOBALS["_STAT_HOME"] . " |\n"; - print "" . $GLOBALS["_STAT_CONTRAT"] . " |\n"; - print "" . $GLOBALS["_STAT_EFFECTIF"] . " |\n"; - print "" . $GLOBALS["_STAT_POSTE"] . " |\n"; - print "" . $GLOBALS["_STAT_REGION"] . " |\n"; - print "" . $GLOBALS["_STAT_LANG"] . " |\n"; - print "" . $GLOBALS["_STAT_SECTEUR"] . "\n"; - print "
"; -} -// -// -// -function gljMenu_Soc() { - print "
"; - print "" . $GLOBALS["_AFIND"] . " |\n"; - print "" . $GLOBALS["_BYDATE"] . " |\n"; - print "" . $GLOBALS["_BYPOSTE"] . " |\n"; - print "" . $GLOBALS["_BYREGION"] . " |\n"; - print "" . $GLOBALS["_BYSECTEUR"] . " |\n"; - print "" . $GLOBALS["_BYCOMPANY"] . "\n"; - print "
"; -} -/* - * - */ -function gljMenu_SocLogged() { - print "
"; - print "" . $GLOBALS["_COORDENT"] . " | "; - print "" . $GLOBALS["_DESC"] . " | "; - //print "" . $GLOBALS["_ENT"] . " | "; - print "" . $GLOBALS["_OFFRES"] . " | "; - print "" . $GLOBALS["_ABO"] . " | "; - print "" . $GLOBALS["_STAT"] . " | "; - print "" . $GLOBALS["_PREF"] . ""; - print "

"; -} -/* - * - */ -function gljMenu_SocSSII() { - print "

"; - print "Accueil SSII | "; - print "Ressources | "; - print "Prestations"; - print "

"; -} -/* - * - */ -function gljMenu_Cv() { - print "

"; - print "" . $GLOBALS["_AFIND"] . " |\n"; - print "" . $GLOBALS["_BYDATE"] . " |\n"; - print "" . $GLOBALS["_BYPOSTE"] . " |\n"; - print "" . $GLOBALS["_BYREGION"] . " |\n"; - print "" . $GLOBALS["_BYSECTEUR"] . " |\n"; - print "" . $GLOBALS["_BYEXPERT"] . "\n"; - print "
"; -} /* * * Verif info diff --git a/htdocs/compta/charges/pre.inc.php3 b/htdocs/compta/charges/pre.inc.php3 index d0fb2f90fd7..141b579cff7 100644 --- a/htdocs/compta/charges/pre.inc.php3 +++ b/htdocs/compta/charges/pre.inc.php3 @@ -36,15 +36,15 @@ function llxHeader($head = "") $menu->add(DOL_URL_ROOT."/compta/facture.php3","Factures"); - $menu->add("index.php3","Charges"); + $menu->add("index.php","Charges"); - $menu->add_submenu(DOL_URL_ROOT."/compta/sociales/index.php3","Prest. Sociales"); + $menu->add_submenu(DOL_URL_ROOT."/compta/sociales/index.php","Prest. Sociales"); $menu->add(DOL_URL_ROOT."/compta/ca.php3","Chiffres d'affaires"); $menu->add(DOL_URL_ROOT."/compta/resultat/","Résultats"); - $menu->add(DOL_URL_ROOT."/compta/bank/index.php3","Banque"); + $menu->add(DOL_URL_ROOT."/compta/bank/index.php","Banque"); left_menu($menu->liste); diff --git a/htdocs/compta/dons/pre.inc.php b/htdocs/compta/dons/pre.inc.php index 006686a7cdc..13863a2607c 100644 --- a/htdocs/compta/dons/pre.inc.php +++ b/htdocs/compta/dons/pre.inc.php @@ -44,7 +44,7 @@ function llxHeader($head = "") { $menu->add_submenu("liste.php","Liste complète"); $menu->add_submenu("stats.php","Stats"); - $menu->add("/compta/bank/index.php3","Bank"); + $menu->add("/compta/bank/index.php","Bank"); left_menu($menu->liste); diff --git a/htdocs/compta/fac.php3 b/htdocs/compta/fac.php3 index 07d42056a85..a8d5328b584 100644 --- a/htdocs/compta/fac.php3 +++ b/htdocs/compta/fac.php3 @@ -85,7 +85,7 @@ if ($result) { print ""; print "\n"; - print "\n"; + print "\n"; if ($objp->df > 0 ) { print ""; print "\n"; - print "\n"; + print "\n"; print "\n"; diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index 7f2ecd47565..ffb7cca43e9 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -90,7 +90,7 @@ if ( $db->query($sql) ) $var = !$var; print ""; print ''; - print ''; + print ''; print ''; print ''; @@ -114,7 +114,7 @@ else * * */ -print ''; +print ''; print ''; print ''; diff --git a/htdocs/compta/sociales/pre.inc.php3 b/htdocs/compta/sociales/pre.inc.php3 index 1f1be7a98ea..4315ef93594 100644 --- a/htdocs/compta/sociales/pre.inc.php3 +++ b/htdocs/compta/sociales/pre.inc.php3 @@ -35,7 +35,7 @@ function llxHeader($head = "") $menu = new Menu(); $menu->add("../charges/","Charges"); - $menu->add_submenu("index.php3","Prest. Sociales"); + $menu->add_submenu("index.php","Prest. Sociales"); // $menu->add_submenu("/compta/sociales/conf.php","Conf"); left_menu($menu->liste); diff --git a/htdocs/compta/tva/pre.inc.php3 b/htdocs/compta/tva/pre.inc.php3 index d54a798a335..7584abe5811 100644 --- a/htdocs/compta/tva/pre.inc.php3 +++ b/htdocs/compta/tva/pre.inc.php3 @@ -33,7 +33,7 @@ function llxHeader($head = "") { $menu = new Menu(); - $menu->add("index.php3","TVA"); + $menu->add("index.php","TVA"); $menu->add("reglement.php","Réglements"); $menu->add_submenu("fiche.php?action=create","Nouveau réglement");
facid\">$objp->facnumberidp\">$objp->nomidp\">$objp->nom"; diff --git a/htdocs/compta/genfac.php3 b/htdocs/compta/genfac.php3 index 5d10525a98a..6b37968702f 100644 --- a/htdocs/compta/genfac.php3 +++ b/htdocs/compta/genfac.php3 @@ -167,7 +167,7 @@ toto $var=!$var; print "
[idp\">Filtre]idp\">$objp->nomidp\">$objp->nomfacid\">$objp->facnumber
'.strftime("%d %b %y",$obj->de).'periode).'">'.strftime("%Y",$obj->periode).'periode).'">'.strftime("%Y",$obj->periode).''.$obj->nom.''.$obj->libelle.''.price($obj->amount).'