diff --git a/htdocs/about.php b/htdocs/about.php index 3122d0dec70..68ff7872d39 100644 --- a/htdocs/about.php +++ b/htdocs/about.php @@ -20,7 +20,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); diff --git a/htdocs/actioncomm.class.php b/htdocs/actioncomm.class.php index 2ea5bb8e3d8..9980326b783 100644 --- a/htdocs/actioncomm.class.php +++ b/htdocs/actioncomm.class.php @@ -109,7 +109,7 @@ class ActionComm if ($this->fk_facture) { - $this->objet_url = 'Facture'; + $this->objet_url = 'Facture'; } $this->db->free(); diff --git a/htdocs/adherents/cartes/pre.inc.php b/htdocs/adherents/cartes/pre.inc.php index 6caad304f15..2f252b22abf 100644 --- a/htdocs/adherents/cartes/pre.inc.php +++ b/htdocs/adherents/cartes/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); function llxHeader($head = "") { global $user, $conf; diff --git a/htdocs/adherents/pre.inc.php b/htdocs/adherents/pre.inc.php index bf21f8ace89..f501b95cd98 100644 --- a/htdocs/adherents/pre.inc.php +++ b/htdocs/adherents/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../main.inc.php3"); +require("../main.inc.php"); function llxHeader($head = "") { global $user, $conf; diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php index 558b7a5ee48..3e3e17e4774 100644 --- a/htdocs/admin/external_rss.php +++ b/htdocs/admin/external_rss.php @@ -71,9 +71,9 @@ print "\n

Attention, pour la r

  • WikiApril / http://wiki.april.org / http://wiki.april.org/RecentChanges?format=rss (et tous les sites phpwiki)
  • LinuxFR / http://linuxfr.org / http://www.linuxfr.org/backend.rss
  • WikiInterneRycks / ../wiki / ../wiki/RecentChanges?format=rss (ne marche pas, je suis en https et en plus y a un apache_auth)
    • -
  • LoLix / http://back.fr.lolix.org/ / http://back.fr.lolix.org/jobs.rss.php3
    • +
  • LoLix / http://back.fr.lolix.org/ / http://back.fr.lolix.org/jobs.rss.php
  • Parinux / http://parinux.org/ / http://parinux.org/backend.rss
    • -
  • Docs d'AbulÉdu / http://docs.abuledu.org / http://docs.abuledu.org/backend.php3 (et tous les sites spip)
    • +
  • Docs d'AbulÉdu / http://docs.abuledu.org / http://docs.abuledu.org/backend.php (et tous les sites spip)

    • @@ -81,7 +81,7 @@ print "\n

    Attention, pour la r // Pour l'instant on fait un seul RSS externe, mais c'est sans soucis qu'on passe à plus ! // ptet définir une variable pour NBMAX_RSS_EXTERNE ... modifier en fonction le fichier -// ../pre.inc.php3 +// ../pre.inc.php for($i = 0; $i < $nbexternalrss; $i++) { print " Syndication du site numéro " . ($i+1) . " diff --git a/htdocs/admin/pre.inc.php b/htdocs/admin/pre.inc.php index a5d97f12b98..cfb15422260 100644 --- a/htdocs/admin/pre.inc.php +++ b/htdocs/admin/pre.inc.php @@ -18,7 +18,7 @@ * $Id$ * $Source$ */ -require("../main.inc.php3"); +require("../main.inc.php"); function llxHeader($head = "", $urlp = "") { global $user, $conf; diff --git a/htdocs/admin/system/pre.inc.php b/htdocs/admin/system/pre.inc.php index b602dba0bd6..acf13b38f47 100644 --- a/htdocs/admin/system/pre.inc.php +++ b/htdocs/admin/system/pre.inc.php @@ -18,7 +18,7 @@ * $Id$ * $Source$ */ -require("../../main.inc.php3"); +require("../../main.inc.php"); function llxHeader($head = "", $urlp = "") { /* diff --git a/htdocs/admin/system/update.php b/htdocs/admin/system/update.php index 18ab850d1f3..a759b02ed29 100644 --- a/htdocs/admin/system/update.php +++ b/htdocs/admin/system/update.php @@ -25,8 +25,8 @@ $user->getrights('facture'); if (!$user->rights->facture->lire) accessforbidden(); -require("../../facture.class.php3"); -require("../../propal.class.php3"); +require("../../facture.class.php"); +require("../../propal.class.php"); llxHeader(); diff --git a/htdocs/boutique/auteur/pre.inc.php b/htdocs/boutique/auteur/pre.inc.php index 8322d8f6ebe..ff5d1dbbd15 100644 --- a/htdocs/boutique/auteur/pre.inc.php +++ b/htdocs/boutique/auteur/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); require("../livre/livre.class.php"); require("./auteur.class.php"); diff --git a/htdocs/boutique/client/pre.inc.php b/htdocs/boutique/client/pre.inc.php index 425634bef4d..2067e741c6f 100644 --- a/htdocs/boutique/client/pre.inc.php +++ b/htdocs/boutique/client/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); require("./client.class.php"); function llxHeader($head = "", $urlp = "") { diff --git a/htdocs/boutique/commande/pre.inc.php b/htdocs/boutique/commande/pre.inc.php index 0aacdf1ffbf..f4ceaccb67f 100644 --- a/htdocs/boutique/commande/pre.inc.php +++ b/htdocs/boutique/commande/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); require("./commande.class.php"); function llxHeader($head = "", $urlp = "") { diff --git a/htdocs/boutique/editeur/pre.inc.php b/htdocs/boutique/editeur/pre.inc.php index fc8cc01a2db..c0a92299bb9 100644 --- a/htdocs/boutique/editeur/pre.inc.php +++ b/htdocs/boutique/editeur/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); require("../livre/livre.class.php"); require("./editeur.class.php"); diff --git a/htdocs/boutique/livre/pre.inc.php b/htdocs/boutique/livre/pre.inc.php index 901b5b6501a..cb86ec6a92f 100644 --- a/htdocs/boutique/livre/pre.inc.php +++ b/htdocs/boutique/livre/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); require("./livre.class.php"); require("../editeur/editeur.class.php"); require("../auteur/auteur.class.php"); diff --git a/htdocs/boutique/newsletter/pre.inc.php b/htdocs/boutique/newsletter/pre.inc.php index 3ecc838cb13..b208831d11e 100644 --- a/htdocs/boutique/newsletter/pre.inc.php +++ b/htdocs/boutique/newsletter/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); require("./newsletter.class.php"); function llxHeader($head = "", $urlp = "") { diff --git a/htdocs/boutique/notification/pre.inc.php b/htdocs/boutique/notification/pre.inc.php index 372b99e29c7..820665f6fdd 100644 --- a/htdocs/boutique/notification/pre.inc.php +++ b/htdocs/boutique/notification/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); require("../livre/livre.class.php"); require("./notification.class.php"); diff --git a/htdocs/boutique/pre.inc.php b/htdocs/boutique/pre.inc.php index 8e5f34c8b51..0783aafb829 100644 --- a/htdocs/boutique/pre.inc.php +++ b/htdocs/boutique/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../main.inc.php3"); +require("../main.inc.php"); require("./livre/livre.class.php"); require("./editeur/editeur.class.php"); require("./auteur/auteur.class.php"); diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 7107e8778e2..62e68127f12 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -18,12 +18,12 @@ * $Id$ * $Source$ */ -require("./pre.inc.php3"); +require("./pre.inc.php"); -require("../../contact.class.php3"); -require("../../lib/webcal.class.php3"); -require("../../cactioncomm.class.php3"); -require("../../actioncomm.class.php3"); +require("../../contact.class.php"); +require("../../lib/webcal.class.php"); +require("../../cactioncomm.class.php"); +require("../../actioncomm.class.php"); /* * Sécurité accés client @@ -118,7 +118,7 @@ if ($HTTP_POST_VARS["action"] == 'add_action') $webcal->add($user, $todo->date, $societe->nom, $libelle); } } - Header("Location: ".DOL_URL_ROOT."/comm/fiche.php3?socid=$socid"); + Header("Location: ".DOL_URL_ROOT."/comm/fiche.php?socid=$socid"); } if ($HTTP_POST_VARS["action"] == 'confirm_delete' && $HTTP_POST_VARS["confirm"] == yes) @@ -186,7 +186,7 @@ if ($action=='create') print '

    Rendez-vous
    '; print 'Société'; - print ''.$societe->nom.''; + print ''.$societe->nom.''; print 'Contact'.$contact->fullname.''; print 'Date'; print_date_select(); @@ -224,7 +224,7 @@ if ($action=='create') print 'Action'.$caction->libelle.''; print 'Société'; - print ''.$societe->nom.''; + print ''.$societe->nom.''; print 'Contact'.$contact->fullname.''; print 'Date'; print $html->select_date('','ac',1,1); @@ -246,7 +246,7 @@ if ($action=='create') print ''; print ''; print 'Société'; - print ''.$societe->nom.''; + print ''.$societe->nom.''; } print 'Date'; @@ -306,12 +306,12 @@ if ($id) if ($action == 'edit') { print_titre ("Edition de la fiche action"); - print ''; + print ''; print ''; print ''; print ''; print ''; - print ''; + print ''; print ''; + print ' '.$obj->societe.''; - print ''; + print ''; /* * Contact */ @@ -215,7 +215,7 @@ if ( $db->query($sql) ) { $cont = new Contact($db); $cont->fetch($obj->fk_contact); - print ''.$cont->fullname.''; + print ''.$cont->fullname.''; } else { diff --git a/htdocs/comm/action/pre.inc.php b/htdocs/comm/action/pre.inc.php index d52e629fdbd..583732228b7 100644 --- a/htdocs/comm/action/pre.inc.php +++ b/htdocs/comm/action/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); function llxHeader($head = "", $urlp = "") { /* @@ -34,11 +34,11 @@ function llxHeader($head = "", $urlp = "") { $menu->add_submenu(DOL_URL_ROOT."/comm/action/?time=today", "Aujourd'hui"); - $menu->add(DOL_URL_ROOT."/comm/clients.php3", "Clients"); + $menu->add(DOL_URL_ROOT."/comm/clients.php", "Clients"); - $menu->add_submenu(DOL_URL_ROOT."/comm/contact.php3", "Contacts"); + $menu->add_submenu(DOL_URL_ROOT."/comm/contact.php", "Contacts"); - $menu->add(DOL_URL_ROOT."/comm/propal.php3", "Propales"); + $menu->add(DOL_URL_ROOT."/comm/propal.php", "Propales"); $menu->add(DOL_URL_ROOT."/comm/projet/", "Projets"); diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 59c99d4c7d8..2c8716873d3 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); $user->getrights('propale'); @@ -72,7 +72,7 @@ print '"; + print ""; $i++; } print "
    Type'.$act->type.'
    Société'.$act->societe->nom.''.$act->societe->nom.'Contact'; $html->select_array("scontactid", $act->societe->contact_array(), $act->contact->id, 1); @@ -340,7 +340,7 @@ if ($id) print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; @@ -366,17 +366,17 @@ if ($id) print ''; + print 'Annuler'; } else { - print 'Editer'; + print 'Editer'; } print ''; print ''; print ''; print ''; + print 'Supprimer'; print '
    Type'.$act->type.'
    Société'.$act->societe->nom.''.$act->societe->nom.'Contact'.$act->contact->fullname.'
    Date'.strftime('%d %B %Y %H:%M',$act->date).''; if ($action=='edit') { - print 'Annuler---'; - print 'Supprimer
    '; } diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 1e4a08b31c3..19cbe032b95 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -20,12 +20,12 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); -require("../../contact.class.php3"); -require("../../lib/webcal.class.php3"); -require("../../cactioncomm.class.php3"); -require("../../actioncomm.class.php3"); +require("../../contact.class.php"); +require("../../lib/webcal.class.php"); +require("../../cactioncomm.class.php"); +require("../../actioncomm.class.php"); /* * Sécurité accés client @@ -204,9 +204,9 @@ if ( $db->query($sql) ) print '    		'; - print ' '.$obj->societe.''.$obj->libelle.''.$obj->libelle.'
    '; print ''; print ''; -print ''; +print ''; print "'; print "
    Rechercher une proposition
    "; print 'Num. :

    \n"; @@ -95,7 +95,7 @@ if ( $db->query($sql) ) { $obj = $db->fetch_object( $i); $var=!$var; - print "
    rowid."\">".$obj->ref."
    rowid."\">".$obj->ref."

    "; @@ -120,7 +120,7 @@ if ( $db->query($sql) ) { $obj = $db->fetch_object( $i); $var=!$var; - print "rowid."\">".$obj->ref.""; + print "rowid."\">".$obj->ref.""; $i++; } print "
    "; @@ -153,7 +153,7 @@ if ( $db->query($sql) ) $obj = $db->fetch_object( $i); $var = !$var; print ""; - print ''.$obj->nom.''; + print ''.$obj->nom.''; print ''; print ''; print ''; @@ -187,8 +187,8 @@ if ( $db->query($sql) ) $var=!$var; print "".strftime("%d %b %Y",$obj->da).""; - print "id\">$obj->libelle $obj->label"; - print ''.$obj->sname.''; + print "id\">$obj->libelle $obj->label"; + print ''.$obj->sname.''; $i++; } $db->free(); diff --git a/htdocs/comm/people.php b/htdocs/comm/people.php index 74f6fa2d3a9..d86db1a0585 100644 --- a/htdocs/comm/people.php +++ b/htdocs/comm/people.php @@ -19,8 +19,8 @@ * $Source$ * */ -require("./pre.inc.php3"); -require("../contact.class.php3"); +require("./pre.inc.php"); +require("../contact.class.php"); if ($sortorder == "") { @@ -39,7 +39,7 @@ if ($action == 'add') $result = $db->query($sql); if ($result) { - Header("Location: fiche.php3?socid=$socid"); + Header("Location: fiche.php?socid=$socid"); } } } @@ -59,7 +59,7 @@ if ($action == 'update') $result = $contact->update($contactid); if ($result) { - Header("Location: fiche.php3?socid=$socid"); + Header("Location: fiche.php?socid=$socid"); } } } @@ -99,7 +99,7 @@ if ($socid > 0) * * */ - print_fiche_titre ("Contact société : idp\">$objsoc->nom"); + print_fiche_titre ("Contact société : idp\">$objsoc->nom"); /* * */ @@ -152,12 +152,12 @@ if ($socid > 0) { if ($obj->fk_user) { - print 'LoginFiche'; + print 'LoginFiche'; } else { print 'LoginPas de compte'; - print 'Créer un compte'; + print 'Créer un compte'; } } @@ -166,7 +166,7 @@ if ($socid > 0) if ($action == 'addcontact') { - print "
    "; + print ""; print ""; print ""; print ""; @@ -196,7 +196,7 @@ if ($socid > 0) $obj = $db->fetch_object( 0); } - print ""; + print ""; print ''; print ""; print '
    Nom
    '; @@ -256,7 +256,7 @@ if ($socid > 0) print ""; if ($obj->propalrowid) { - print ""; + print ""; } else { diff --git a/htdocs/comm/pre.inc.php b/htdocs/comm/pre.inc.php index 2b4048e3812..31cf2d350d3 100644 --- a/htdocs/comm/pre.inc.php +++ b/htdocs/comm/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../main.inc.php3"); +require("../main.inc.php"); function llxHeader($head = "", $urlp = "") { global $user, $conf; @@ -32,17 +32,17 @@ function llxHeader($head = "", $urlp = "") { $menu = new Menu(); - $menu->add(DOL_URL_ROOT."/comm/clients.php3", "Clients"); + $menu->add(DOL_URL_ROOT."/comm/clients.php", "Clients"); - $menu->add_submenu(DOL_URL_ROOT."/comm/contact.php3", "Contacts"); + $menu->add_submenu(DOL_URL_ROOT."/comm/contact.php", "Contacts"); $menu->add(DOL_URL_ROOT."/comm/action/", "Actions"); if ($user->rights->propale->lire) { - $menu->add(DOL_URL_ROOT."/comm/propal.php3", "Propales"); - $menu->add_submenu("propal.php3?viewstatut=0", "Brouillons"); - $menu->add_submenu("propal.php3?viewstatut=1", "Ouvertes"); + $menu->add(DOL_URL_ROOT."/comm/propal.php", "Propales"); + $menu->add_submenu("propal.php?viewstatut=0", "Brouillons"); + $menu->add_submenu("propal.php?viewstatut=1", "Ouvertes"); } if ($conf->fichinter->enabled ) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index f9a29ddcc56..85a446b966b 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -25,7 +25,7 @@ * @package propale */ -require("./pre.inc.php3"); +require("./pre.inc.php"); $user->getrights('propale'); if (!$user->rights->propale->lire) @@ -34,11 +34,11 @@ if (!$user->rights->propale->lire) /* * Modules optionnels */ -require("../project.class.php3"); -require("./propal_model_pdf.class.php3"); -require("../propal.class.php3"); -require("../actioncomm.class.php3"); -require("../lib/CMailFile.class.php3"); +require("../project.class.php"); +require("./propal_model_pdf.class.php"); +require("../propal.class.php"); +require("../actioncomm.class.php"); +require("../lib/CMailFile.class.php"); /* * @@ -263,7 +263,7 @@ if ($propalid) print "
    ". strftime("%d %b %Y %H:%M", $obj->da) ."propalrowid\">$obj->libellepropalrowid\">$obj->libelle
    "; - print ''; + print ''; print ''; print ''; @@ -328,7 +328,7 @@ if ($propalid) */ if ($propal->brouillon == 1) { - print ''; + print ''; print ''; print '
    Société'.$obj->nom.'
    Société'.$obj->nom.'Statut'.$obj->lst.'
    Date'.strftime("%A %d %B %Y",$obj->dp).'
    "; print "\n"; - print ''; + print ''; print ""; print ''; print "\n"; if ($obj->statut == 0 && $user->rights->propale->creer) { - print ''; + print ''; } else { @@ -405,7 +405,7 @@ if ($propalid) print "\n"; if ($obj->statut == 0 && $user->rights->propale->creer) { - print ''; + print ''; } else { @@ -446,7 +446,7 @@ if ($propalid) */ $html = new Form($db); $var=!$var; - print ''; + print ''; print ''; print ''; print ''; @@ -458,7 +458,7 @@ if ($propalid) print ''; $var=!$var; - print ''; + print ''; print ''; print ""; print ''; @@ -632,7 +632,7 @@ if ($propalid) if ($propal->brouillon == 1) { - print ''; + print ''; print ''; print '"; print "\n"; - print "\n"; + print "\n"; $now = time(); $lim = 3600 * 24 * 15 ; @@ -867,9 +867,9 @@ if ($propalid) $m = strftime("%m",$objp->dp); print strftime("%d",$objp->dp)."\n"; - print " "; + print " "; print strftime("%B",$objp->dp)."\n"; - print " "; + print " "; print strftime("%Y",$objp->dp)."\n"; print "\n"; diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index d703bf165fe..11b5763629e 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -25,7 +25,7 @@ if (!$user->rights->propale->lire) accessforbidden(); -require_once("../../propal.class.php3"); +require_once("../../propal.class.php"); llxHeader(); function do_upload ($upload_dir) diff --git a/htdocs/comm/propal/pre.inc.php b/htdocs/comm/propal/pre.inc.php index 711b91cd560..6646c276136 100644 --- a/htdocs/comm/propal/pre.inc.php +++ b/htdocs/comm/propal/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); function llxHeader($head = "", $urlp = "") { global $user, $conf; @@ -32,17 +32,17 @@ function llxHeader($head = "", $urlp = "") { $menu = new Menu(); - $menu->add(DOL_URL_ROOT."/comm/clients.php3", "Clients"); + $menu->add(DOL_URL_ROOT."/comm/clients.php", "Clients"); - $menu->add_submenu(DOL_URL_ROOT."/comm/contact.php3", "Contacts"); + $menu->add_submenu(DOL_URL_ROOT."/comm/contact.php", "Contacts"); $menu->add(DOL_URL_ROOT."/comm/action/", "Actions"); if ($user->rights->propale->lire) { - $menu->add(DOL_URL_ROOT."/comm/propal.php3", "Propales"); - $menu->add_submenu("propal.php3?viewstatut=0", "Brouillons"); - $menu->add_submenu("propal.php3?viewstatut=1", "Ouvertes"); + $menu->add(DOL_URL_ROOT."/comm/propal.php", "Propales"); + $menu->add_submenu("propal.php?viewstatut=0", "Brouillons"); + $menu->add_submenu("propal.php?viewstatut=1", "Ouvertes"); } if ($conf->fichinter->enabled ) diff --git a/htdocs/comm/socnote.php b/htdocs/comm/socnote.php index 0de2825ffce..8acdacbdcd5 100644 --- a/htdocs/comm/socnote.php +++ b/htdocs/comm/socnote.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); /* @@ -59,7 +59,7 @@ if ($socid > 0) { print '
    Remise'; print '%'; @@ -368,13 +368,13 @@ if ($propalid) $var=!$var; print "
    [$objp->ref]'.$objp->product.''.$objp->product.'".price($objp->price)."'.$objp->tva_tx.' %".$objp->qty."SupprimerSupprimer".$objp->qty."SupprimerSupprimer
     
     
    Modèle'; @@ -848,7 +848,7 @@ if ($propalid) $var=!$var; print "
    propalid\">$objp->refidp\">$objp->nomidp\">$objp->nom".price($objp->price)."
    '; print ""; + print ""; } else { diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php index 55b3ec05c6b..cf7e724ee84 100644 --- a/htdocs/compta/bank/bilan.php +++ b/htdocs/compta/bank/bilan.php @@ -20,7 +20,7 @@ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); diff --git a/htdocs/compta/bank/bplc.php b/htdocs/compta/bank/bplc.php index 8ce26e88181..f219183d1c1 100644 --- a/htdocs/compta/bank/bplc.php +++ b/htdocs/compta/bank/bplc.php @@ -19,8 +19,8 @@ * $Source$ */ -require("./pre.inc.php3"); -require("./bank.lib.php3"); +require("./pre.inc.php"); +require("./bank.lib.php"); llxHeader(); diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php index 9395a4069fb..87836611e89 100644 --- a/htdocs/compta/bank/budget.php +++ b/htdocs/compta/bank/budget.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); @@ -122,7 +122,7 @@ else print ""; print "\n"; - print ""; + print ""; print ""; print ""; $i++; @@ -139,7 +139,7 @@ else } -print 'Editer'; +print 'Editer'; diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php index fdb7359885c..93e94c4cbf2 100644 --- a/htdocs/compta/bank/categ.php +++ b/htdocs/compta/bank/categ.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); diff --git a/htdocs/compta/bank/config.php b/htdocs/compta/bank/config.php index 56f0198c3d2..3a55ec843ab 100644 --- a/htdocs/compta/bank/config.php +++ b/htdocs/compta/bank/config.php @@ -18,8 +18,8 @@ * $Id$ * $Source$ */ -require("./pre.inc.php3"); -require("./bank.lib.php3"); +require("./pre.inc.php"); +require("./bank.lib.php"); llxHeader(); diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 0a4932e860e..c615286da84 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -19,7 +19,7 @@ * $Id$ * $Source$ */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index 5e27481847d..aa83e715025 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -19,10 +19,10 @@ * $Source$ * */ -require("./pre.inc.php3"); -require("./bank.lib.php3"); -require("../../tva.class.php3"); -require("../../chargesociales.class.php3"); +require("./pre.inc.php"); +require("./bank.lib.php"); +require("../../tva.class.php"); +require("../../chargesociales.class.php"); llxHeader(); @@ -61,7 +61,7 @@ for ($i = 0 ; $i < sizeof($accounts) ; $i++) $solde = $acc->solde(); print ""; @@ -119,7 +119,7 @@ for ($i = 0 ; $i < sizeof($accounts) ; $i++) { $solde = $acc->solde(); print ""; diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 220ac83c989..9157bcf74e5 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); @@ -105,7 +105,7 @@ if ($result) print "\n"; } - print ""; + print ""; print ""; print ""; @@ -181,7 +181,7 @@ if ($result) print ""; print ""; - print ""; + print ""; print ""; $i++; diff --git a/htdocs/compta/bank/pre.inc.php b/htdocs/compta/bank/pre.inc.php index ab6a35614ca..e7e190456d4 100644 --- a/htdocs/compta/bank/pre.inc.php +++ b/htdocs/compta/bank/pre.inc.php @@ -20,7 +20,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); require("./account.class.php"); function llxHeader($head = "") @@ -36,7 +36,7 @@ function llxHeader($head = "") $menu = new Menu(); $menu->add("index.php","Comptes"); - $menu->add_submenu("search.php3","Recherche"); + $menu->add_submenu("search.php","Recherche"); $sql = "SELECT rowid, label FROM llx_bank_account where clos = 0 AND courant = 1"; @@ -50,9 +50,9 @@ function llxHeader($head = "") while ($i < $numr) { $objp = $db->fetch_object($i); - $menu->add("account.php3?account=" . $objp->rowid, $objp->label); - $menu->add_submenu("releve.php3?account=" . $objp->rowid ,"Relevés"); - $menu->add_submenu("rappro.php3?account=".$objp->rowid,"Rappro"); + $menu->add("account.php?account=" . $objp->rowid, $objp->label); + $menu->add_submenu("releve.php?account=" . $objp->rowid ,"Relevés"); + $menu->add_submenu("rappro.php?account=".$objp->rowid,"Rappro"); $i++; } } @@ -60,11 +60,11 @@ function llxHeader($head = "") $menu->add("index.php","Banque"); - $menu->add_submenu("budget.php3","Budgets"); - $menu->add_submenu("bilan.php3","Bilan"); - $menu->add_submenu("virement.php3","Virement"); + $menu->add_submenu("budget.php","Budgets"); + $menu->add_submenu("bilan.php","Bilan"); + $menu->add_submenu("virement.php","Virement"); - $menu->add_submenu("config.php3","Config"); + $menu->add_submenu("config.php","Config"); if (defined("COMPTA_ONLINE_PAYMENT_BPLC") && COMPTA_ONLINE_PAYMENT_BPLC) { diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index fe7e41ac7c7..71d52b29311 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -18,7 +18,7 @@ * $Id$ * $Source$ */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); @@ -121,7 +121,7 @@ if ($result) if ($objp->rappro) { - print ""; + print ""; } else { @@ -140,7 +140,7 @@ if ($result) } print "
    "; - print "id\">"; + print "id\">"; print ""; print "
    "; print ""; diff --git a/htdocs/commande/pre.inc.php b/htdocs/commande/pre.inc.php index 60c4e678325..778b289af2d 100644 --- a/htdocs/commande/pre.inc.php +++ b/htdocs/commande/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../main.inc.php3"); +require("../main.inc.php"); require("./commande.class.php"); function llxHeader($head = "", $urlp = "") diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index d86b075e707..95c3e53a2b4 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -21,7 +21,7 @@ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); if ($HTTP_POST_VARS["action"] == 'add' && $account) { @@ -283,7 +283,7 @@ if ($account) if ($objp->rappro) { - print "    		num_releve&account=$account\">$objp->num_relevenum_releve&account=$account\">$objp->num_releve
    ".strftime("%d %B %Y",$objp->do)."rowid\">$objp->labelrowid\">$objp->label".price(abs($objp->amount))." 
    "; - print ''.$acc->label.''; + print ''.$acc->label.''; print "$acc->bank$acc->number
    "; - print ''.$acc->label.''; + print ''.$acc->label.''; print "$acc->bank$acc->number ".price($objp->amount)."num_releve&ve=1\">$objp->num_relevenum_releve&ve=1\">$objp->num_releve$objp->author
    $objp->labelrowid\">voirrowid\">voir
    num_releve\">$objp->num_relevenum_releve\">$objp->num_releve
    "; -print '
    Dernier relevé : '.$last_releve.''; +print '
    Dernier relevé : '.$last_releve.''; $db->close(); diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 74778950929..ed4197ca137 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -23,7 +23,7 @@ * $rel * $ve */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); @@ -200,7 +200,7 @@ else print "".price($total)."\n"; - print "[rowid&account=$account\">edit]"; + print "[rowid&account=$account\">edit]"; print ""; $i++; diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index 22d95f2548e..da08207a657 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -21,8 +21,8 @@ * *******************************************************************************/ -require("./pre.inc.php3"); -require("./bank.lib.php3"); +require("./pre.inc.php"); +require("./bank.lib.php"); llxHeader(); if ($vline) { @@ -44,7 +44,7 @@ print "Compte"; print "\n"; ?> - + diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php index 10d0a2bc61a..1eec2b43af2 100644 --- a/htdocs/compta/bank/virement.php +++ b/htdocs/compta/bank/virement.php @@ -19,8 +19,8 @@ * $Source$ * */ -require("./pre.inc.php3"); -require("./bank.lib.php3"); +require("./pre.inc.php"); +require("./bank.lib.php"); llxHeader(); diff --git a/htdocs/compta/caisse/pre.inc.php b/htdocs/compta/caisse/pre.inc.php index 41bed71bcfa..dfb908a3d74 100644 --- a/htdocs/compta/caisse/pre.inc.php +++ b/htdocs/compta/caisse/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); function llxHeader($head = "") { global $user, $conf; diff --git a/htdocs/compta/charges.php b/htdocs/compta/charges.php index 90842f3bdf2..6708222e9fd 100644 --- a/htdocs/compta/charges.php +++ b/htdocs/compta/charges.php @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); diff --git a/htdocs/compta/charges/fiche.php b/htdocs/compta/charges/fiche.php index 1f735cb7254..60fb4bab1a9 100644 --- a/htdocs/compta/charges/fiche.php +++ b/htdocs/compta/charges/fiche.php @@ -20,8 +20,8 @@ * */ -require("./pre.inc.php3"); -require("../service.class.php3"); +require("./pre.inc.php"); +require("../service.class.php"); llxHeader(); @@ -133,10 +133,10 @@ if ($action == 'create') { print '-'; - print '[Editer]'; + print '[Editer]'; - print '[Date de debut]'; - print '[Date de fin]'; + print '[Date de debut]'; + print '[Date de fin]'; print '-'; print '
    '; diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index f6ca10024e3..b006b85838d 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); diff --git a/htdocs/compta/charges/pre.inc.php b/htdocs/compta/charges/pre.inc.php index c972b0ffa37..3a385c15ae5 100644 --- a/htdocs/compta/charges/pre.inc.php +++ b/htdocs/compta/charges/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); function llxHeader($head = "") { diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index 92d4d40eaeb..90fa97b2e0c 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -19,11 +19,11 @@ * $Source$ * */ -require("./pre.inc.php3"); -require("../contact.class.php3"); -require("../lib/webcal.class.php3"); -require("../cactioncomm.class.php3"); -require("../actioncomm.class.php3"); +require("./pre.inc.php"); +require("../contact.class.php"); +require("../lib/webcal.class.php"); +require("../cactioncomm.class.php"); +require("../actioncomm.class.php"); llxHeader(); @@ -45,7 +45,7 @@ if ($sortfield == "") { if ($action=='add_action') { /* - * Vient de actioncomm.php3 + * Vient de actioncomm.php * */ $actioncomm = new ActionComm($db); @@ -223,13 +223,13 @@ if ($result) $var=!$var; print ""; - print "idp\">$obj->nom\n"; + print "idp\">$obj->nom\n"; print "".$obj->ville." \n"; print "$obj->prefix_comm \n"; if ($user->societe_id == 0) { - print "idp&action=create\">[Facture]\n"; + print "idp&action=create\">[Facture]\n"; } else { diff --git a/htdocs/compta/config.php b/htdocs/compta/config.php index abcd3d92b75..fcfecd9048b 100644 --- a/htdocs/compta/config.php +++ b/htdocs/compta/config.php @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index 26fac7c6fb6..ec328347725 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -20,7 +20,7 @@ * */ require("./pre.inc.php"); -require("../../tva.class.php3"); +require("../../tva.class.php"); /* * @@ -84,7 +84,7 @@ if ( $db->query($sql) ) $var=!$var; print ""; print ''.strftime("%d %B %Y",$objp->dd).''; - print "idp\">$objp->nom\n"; + print "idp\">$objp->nom\n"; print ''.$objp->firstname.' '.$objp->name.''; diff --git a/htdocs/compta/deplacement/pre.inc.php b/htdocs/compta/deplacement/pre.inc.php index 32c708cb029..effe11bacbe 100644 --- a/htdocs/compta/deplacement/pre.inc.php +++ b/htdocs/compta/deplacement/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); require("./deplacement.class.php"); $deplacement_type[0] = "voiture"; diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index ce4f14f609b..63e15c38854 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -259,7 +259,7 @@ if ($rowid > 0 && $action == 'edit') if ($don->statut == 1 && $resteapayer > 0) { - print "[Emettre un paiement]"; + print "[Emettre un paiement]"; } elseif ($don->statut == 0) { diff --git a/htdocs/compta/dons/formulaire/fsfe.fr.php b/htdocs/compta/dons/formulaire/fsfe.fr.php index 516ceadba27..5aead70dc13 100644 --- a/htdocs/compta/dons/formulaire/fsfe.fr.php +++ b/htdocs/compta/dons/formulaire/fsfe.fr.php @@ -28,7 +28,7 @@ * $Source$ * */ -require("../../../main.inc.php3"); +require("../../../main.inc.php"); require("../../../projetdon.class.php"); require("../../../don.class.php"); diff --git a/htdocs/compta/dons/pre.inc.php b/htdocs/compta/dons/pre.inc.php index 97b67c49534..f2b179f0c62 100644 --- a/htdocs/compta/dons/pre.inc.php +++ b/htdocs/compta/dons/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); require("../../projetdon.class.php"); $libelle[0] = "Promesses non validées"; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 5315ba1dd0f..84f42f5f46d 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -19,17 +19,17 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); $user->getrights('facture'); if (!$user->rights->facture->lire) accessforbidden(); -require("../facture.class.php3"); -require("../lib/CMailFile.class.php3"); +require("../facture.class.php"); +require("../lib/CMailFile.class.php"); require("../paiement.class.php"); -require("../project.class.php3"); -require("../propal.class.php3"); +require("../project.class.php"); +require("../propal.class.php"); require("./bank/account.class.php"); require("../contrat/contrat.class.php"); @@ -99,7 +99,7 @@ if ($HTTP_POST_VARS["action"] == 'add') else { print "

    Erreur : la facture n'a pas été créée, vérifier le numéro !"; - print "

    Retour à la propal"; + print "

    Retour à la propal"; print $db->error(); } } @@ -508,7 +508,7 @@ else print ""; print ""; print "'; + print ''.$soc->nom.''; print ""; @@ -562,7 +562,7 @@ else print '\n"; if (! $fac->paye && $user->rights->facture->paiement) { - print '"; $total = $total + $objp->amount; @@ -611,7 +611,7 @@ else if ($fac->brouillon == 1) { - print ''; + print ''; print ''; print '
    Client"; - print ''.$soc->nom.'Conditions de réglement : " . $fac->cond_reglement ."
    '.price($objp->amount)."$_MONNAIEDel'; + print 'Del'; } print "
    "; if ($objp->fk_product) { - print ''; + print ''; } else { @@ -750,7 +750,7 @@ else if ($fac->statut == 1 && $resteapayer > 0 && $user->rights->facture->paiement) { - print ""; + print ""; } else { @@ -792,7 +792,7 @@ else { if ($user->rights->facture->creer) { - print ""; + print ""; } else { @@ -984,7 +984,7 @@ else $objp = $db->fetch_object( $i); $var=!$var; print ""; - print "\n"; + print "\n"; print "\n"; print ''; print ""; @@ -1101,9 +1101,9 @@ else } } - print '\n"; - print ''; + print ''; if ($objp->df > 0 ) { @@ -1112,9 +1112,9 @@ else $m = strftime("%m",$objp->df); print strftime("%d",$objp->df)."\n"; - print ' '; + print ' '; print strftime("%B",$objp->df)."\n"; - print ' '; + print ' '; print strftime("%Y",$objp->df)."\n"; } else @@ -1132,7 +1132,7 @@ else } else { - print ''; + print ''; } } else diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php index ea4a5161d96..d810413b732 100644 --- a/htdocs/compta/fiche.php +++ b/htdocs/compta/fiche.php @@ -19,11 +19,11 @@ * $Source$ * */ -require("./pre.inc.php3"); -require("../contact.class.php3"); -require("../lib/webcal.class.php3"); -require("../cactioncomm.class.php3"); -require("../actioncomm.class.php3"); +require("./pre.inc.php"); +require("../contact.class.php"); +require("../lib/webcal.class.php"); +require("../cactioncomm.class.php"); +require("../actioncomm.class.php"); /* * Sécurité accés client @@ -43,7 +43,7 @@ llxHeader(); if ($action=='add_action') { /* - * Vient de actioncomm.php3 + * Vient de actioncomm.php * */ $actioncomm = new ActionComm($db); @@ -187,12 +187,12 @@ if ($socid > 0) if ($user->societe_id == 0) { - print ''; + print ''; print ""; print ""; if ($user->rights->facture->creer) - print ""; - print ""; + print ""; + print ""; print ""; } print "
    Remise'; print '%'; @@ -652,7 +652,7 @@ else print "
    '.stripslashes(nl2br($objp->description)).''.stripslashes(nl2br($objp->description)).'[Emettre un paiement][Emettre un paiement]Générer la factureGénérer la facture
    propalid\">$objp->refpropalid\">$objp->ref".strftime("%d %B %Y",$objp->dp)."'.price($objp->price).'
    ' . $objp->facnumber; + print '' . $objp->facnumber; print "'.$objp->nom.''.$objp->nom.'impayéeimpayéeCommercialCommercialidp\">Documentsidp&action=add\">[Bookmark][idp\">".translate("Facture")."]idp\">Notes[idp\">".translate("Facture")."]idp\">Notes[idp&action=create\">Déplacement]
    "; @@ -245,7 +245,7 @@ if ($socid > 0) if ($num > 0) { print ""; - print "idp\">liste des factures ($num)"; + print "idp\">liste des factures ($num)"; } while ($i < $num && $i < 5) @@ -253,7 +253,7 @@ if ($socid > 0) $objp = $db->fetch_object( $i); $var=!$var; print ""; - print "facid\">$objp->facnumber\n"; + print "facid\">$objp->facnumber\n"; if ($objp->df > 0 ) { print "".strftime("%d %B %Y",$objp->df)."\n"; @@ -344,7 +344,7 @@ if ($socid > 0) print 'Prénom Nom'; print 'PosteTél'; print "FaxEmail"; - print "idp&action=addcontact\">Ajouter"; + print "idp&action=addcontact\">Ajouter"; $sql = "SELECT p.idp, p.name, p.firstname, p.poste, p.phone, p.fax, p.email, p.note FROM llx_socpeople as p WHERE p.fk_soc = $objsoc->idp ORDER by p.datec"; $result = $db->query($sql); @@ -358,9 +358,9 @@ if ($socid > 0) print ""; print ''; - //print ''; + //print ''; //print ' '; - print ''.$obj->firstname.' '. $obj->name.' '; + print ''.$obj->firstname.' '. $obj->name.' '; if ($obj->note) { @@ -368,10 +368,10 @@ if ($socid > 0) } print ""; print "$obj->poste "; - print ''.$obj->phone.' '; - print ''.$obj->fax.' '; - print ''.$obj->email.' '; - print "idp&action=editcontact&contactid=$obj->idp\">Modifier"; + print ''.$obj->phone.' '; + print ''.$obj->fax.' '; + print ''.$obj->email.' '; + print "idp&action=editcontact&contactid=$obj->idp\">Modifier"; print "\n"; $i++; $tag = !$tag; @@ -427,7 +427,7 @@ if ($socid > 0) print ' '; if ($obj->propalrowid) { - print ''.$obj->libelle.''; + print ''.$obj->libelle.''; } else { print ''.$obj->libelle.''; } @@ -438,13 +438,13 @@ if ($socid > 0) if ($obj->fk_contact) { $contact = new Contact($db); $contact->fetch($obj->fk_contact); - print ''.$contact->fullname.''; + print ''.$contact->fullname.''; } else { print ' '; } /* */ - print ''.$obj->code.''; + print ''.$obj->code.''; print "\n"; $i++; } diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index c330e371240..c22e09da436 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); /* * Sécurité accés client @@ -71,7 +71,7 @@ print ''; print ''; print ""; print ''; -print ''; +print ''; print "'; print "
    Rechercher une facture
    "; print 'Num. :

    "; @@ -103,8 +103,8 @@ if ($user->comm > 0 && $conf->commercial ) { $var=!$var; $obj = $db->fetch_object($i); - print "rowid\">$obj->ref"; - print ''.$obj->nom.''; + print "rowid\">$obj->ref"; + print ''.$obj->nom.''; $i++; } print "
    "; @@ -132,8 +132,8 @@ if ( $db->query($sql) ) { $obj = $db->fetch_object( $i); $var=!$var; - print ''.$obj->facnumber.''; - print ''.$obj->nom.''; + print ''.$obj->facnumber.''; + print ''.$obj->nom.''; $i++; } @@ -210,7 +210,7 @@ if ( $db->query($sql) ) $obj = $db->fetch_object( $i); $var = !$var; print ""; - print ''.$obj->nom.''; + print ''.$obj->nom.''; print ''; print ''; print ''; @@ -262,8 +262,8 @@ if ( $db->query($sql) ) { $obj = $db->fetch_object( $i); $var=!$var; - print ''.$obj->facnumber.''; - print ''.$obj->nom.''; + print ''.$obj->facnumber.''; + print ''.$obj->nom.''; $i++; } print "
    "; @@ -289,7 +289,7 @@ if ( $result ) { $obj = $db->fetch_object($i); $var=!$var; - print "".strftime("%d %b %Y",$obj->da)."$obj->libelle $obj->label"; + print "".strftime("%d %b %Y",$obj->da)."$obj->libelle $obj->label"; $i++; } $db->free(); @@ -329,7 +329,7 @@ if ($user->societe_id == 0) $obj = $db->fetch_object( $i); $var = !$var; print ""; - print ''.$obj->libelle.''; + print ''.$obj->libelle.''; print ''.price($obj->amount).''; print ''; $i++; diff --git a/htdocs/compta/ligne.php b/htdocs/compta/ligne.php index ad2407f36c7..7f4eef7bf90 100644 --- a/htdocs/compta/ligne.php +++ b/htdocs/compta/ligne.php @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index b7e6ae3b9c5..87b1e6656e9 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); require("../paiement.class.php"); require("./bank/account.class.php"); @@ -58,7 +58,7 @@ if ($action == 'create') $total = $obj->total; print_titre("Emettre un paiement"); - print '

    '; + print ''; print ''; print ''; @@ -191,7 +191,7 @@ if ($action == '') { $objp = $db->fetch_object( $i); $var=!$var; print ""; - print "\n"; + print "\n"; print "\n"; print "\n"; print ''; diff --git a/htdocs/compta/paiement/pre.inc.php b/htdocs/compta/paiement/pre.inc.php index d38f34a78ac..a7371680c80 100644 --- a/htdocs/compta/paiement/pre.inc.php +++ b/htdocs/compta/paiement/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); function llxHeader($head = "") { global $user, $conf; @@ -33,9 +33,9 @@ function llxHeader($head = "") { $menu = new Menu(); - $menu->add("../facture.php3","Factures"); + $menu->add("../facture.php","Factures"); - $menu->add_submenu("../paiement.php3","Paiements"); + $menu->add_submenu("../paiement.php","Paiements"); $menu->add(DOL_URL_ROOT."/compta/stats/","Chiffre d'affaire"); diff --git a/htdocs/compta/pmt.php b/htdocs/compta/pmt.php index 5187ff66858..f59e95340fb 100644 --- a/htdocs/compta/pmt.php +++ b/htdocs/compta/pmt.php @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); /* diff --git a/htdocs/compta/pointmort.php b/htdocs/compta/pointmort.php index feeb7997f68..99877930b9d 100644 --- a/htdocs/compta/pointmort.php +++ b/htdocs/compta/pointmort.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); function pt ($db, $sql) { $result = $db->query($sql); @@ -169,7 +169,7 @@ ppt($db, 0); print "


    facid\">$objp->facnumberfacid\">$objp->facnumber".strftime("%d %B %Y",$objp->dp)."$objp->paiement_type $objp->num_paiement'.price($objp->amount).' 
    "; -print ""; +print ""; print "
    Paramétrer le point mort
    Paramétrer le point mort
    "; diff --git a/htdocs/compta/pre.inc.php b/htdocs/compta/pre.inc.php index c18d44d034f..68c1cfbd4b7 100644 --- a/htdocs/compta/pre.inc.php +++ b/htdocs/compta/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../main.inc.php3"); +require("../main.inc.php"); function llxHeader($head = "", $title="") { global $user, $conf; @@ -32,19 +32,19 @@ function llxHeader($head = "", $title="") { $menu = new Menu(); - $menu->add(DOL_URL_ROOT."/compta/clients.php3", "Clients"); + $menu->add(DOL_URL_ROOT."/compta/clients.php", "Clients"); if ($conf->don->enabled) { $menu->add(DOL_URL_ROOT."/compta/dons/","Dons"); } - $menu->add(DOL_URL_ROOT."/compta/facture.php3","Factures"); - $menu->add_submenu("paiement.php3","Paiements"); + $menu->add(DOL_URL_ROOT."/compta/facture.php","Factures"); + $menu->add_submenu("paiement.php","Paiements"); if ($user->comm > 0 && $conf->commercial && MAIN_MODULE_PROPALE) { - $menu->add(DOL_URL_ROOT."/compta/propal.php3","Propales"); + $menu->add(DOL_URL_ROOT."/compta/propal.php","Propales"); } $menu->add(DOL_URL_ROOT."/contrat/","Contrats"); @@ -62,9 +62,9 @@ function llxHeader($head = "", $title="") { $menu->add(DOL_URL_ROOT."/fourn/index.php", "Fournisseurs"); /* - * $menu->add("ligne.php3","Compta"); - * $menu->add_submenu("ligne.php3","Lignes"); - * $menu->add_submenu("config.php3","Configuration"); + * $menu->add("ligne.php","Compta"); + * $menu->add_submenu("ligne.php","Lignes"); + * $menu->add_submenu("config.php","Configuration"); */ if ($user->compta > 0) diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index c26aaa33c43..4f68a296625 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -19,15 +19,15 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); -require("../lib/CMailFile.class.php3"); +require("../lib/CMailFile.class.php"); /* * Modules optionnels */ -require("../project.class.php3"); -require("../propal.class.php3"); -require("../actioncomm.class.php3"); +require("../project.class.php"); +require("../propal.class.php"); +require("../actioncomm.class.php"); /* * */ @@ -110,7 +110,7 @@ if ($propalid) print ''; - print ''; + print ''; print ""; // @@ -121,7 +121,7 @@ if ($propalid) $projet = new Project($db); $projet->fetch($obj->fk_projet); print ''; } print ""; @@ -223,7 +223,7 @@ if ($propalid) $objp = $db->fetch_object( $i); $var=!$var; print ""; - print ""; + print "Emettre une facture"; } else { @@ -312,7 +312,7 @@ if ($propalid) $objp = $db->fetch_object($i); $var=!$var; print "\n"; - print ''; + print ''; print ""; print ''; print "\n"; @@ -440,7 +440,7 @@ if ($propalid) $var=!$var; print ""; print "\n"; - print "\n"; + print "\n"; $now = time(); $lim = 3600 * 24 * 15 ; @@ -459,9 +459,9 @@ if ($propalid) $m = strftime("%m",$objp->dp); print strftime("%d",$objp->dp)."\n"; - print " "; + print " "; print strftime("%B",$objp->dp)."\n"; - print " "; + print " "; print strftime("%Y",$objp->dp)."\n"; print "\n"; diff --git a/htdocs/compta/resultat/caisse.php b/htdocs/compta/resultat/caisse.php index 0d775fd5084..c9ca80171d6 100644 --- a/htdocs/compta/resultat/caisse.php +++ b/htdocs/compta/resultat/caisse.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); /* * diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php index c527b0f98ed..83339906394 100644 --- a/htdocs/compta/resultat/index.php +++ b/htdocs/compta/resultat/index.php @@ -19,9 +19,9 @@ * $Source$ * */ -require("./pre.inc.php3"); -require("../../tva.class.php3"); -require("../../chargesociales.class.php3"); +require("./pre.inc.php"); +require("../../tva.class.php"); +require("../../chargesociales.class.php"); /* * */ @@ -64,7 +64,7 @@ if ($result) { $var=!$var; print ""; - print "\n"; + print "\n"; print "\n"; diff --git a/htdocs/compta/resultat/pre.inc.php b/htdocs/compta/resultat/pre.inc.php index 2cf08dd4a65..0bc07400dd3 100644 --- a/htdocs/compta/resultat/pre.inc.php +++ b/htdocs/compta/resultat/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); function llxHeader($head = "") { global $conf; @@ -33,8 +33,8 @@ function llxHeader($head = "") { $menu = new Menu(); - $menu->add("/compta/facture.php3","Factures"); - $menu->add("../charges.php3","Charges"); + $menu->add("/compta/facture.php","Factures"); + $menu->add("../charges.php","Charges"); $menu->add(DOL_URL_ROOT."/compta/stats/","Chiffre d'affaire"); diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index 69f8d35b7e3..35c8e72e54f 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); diff --git a/htdocs/compta/sociales/pre.inc.php b/htdocs/compta/sociales/pre.inc.php index 4315ef93594..ee2695e4ff6 100644 --- a/htdocs/compta/sociales/pre.inc.php +++ b/htdocs/compta/sociales/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); function llxHeader($head = "") { diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php index 304c4140943..d76e4dad6d8 100644 --- a/htdocs/compta/stats/casoc.php +++ b/htdocs/compta/stats/casoc.php @@ -88,10 +88,10 @@ if ($result) $var=!$var; print ""; - print "\n"; + print "\n"; print ''; print ''; - print "\n"; + print "\n"; print "\n"; $i++; diff --git a/htdocs/compta/stats/comp.php b/htdocs/compta/stats/comp.php index fd06d6272d8..af0aa022611 100644 --- a/htdocs/compta/stats/comp.php +++ b/htdocs/compta/stats/comp.php @@ -69,7 +69,7 @@ function propals ($db, $year, $month) { print "\n"; - print "\n"; + print "\n"; print "\n"; @@ -125,7 +125,7 @@ function factures ($db, $year, $month, $paye) { $var=!$var; print ""; print "\n"; - print "\n"; + print "\n"; if ($objp->df > 0 ) { print "\n"; diff --git a/htdocs/compta/stats/exercices.php b/htdocs/compta/stats/exercices.php index 97e151022f4..ceba5916942 100644 --- a/htdocs/compta/stats/exercices.php +++ b/htdocs/compta/stats/exercices.php @@ -69,7 +69,7 @@ function propals ($db, $year, $month) { print "\n"; - print "\n"; + print "\n"; print "\n"; @@ -122,7 +122,7 @@ function factures ($db, $year, $month, $paye) { $var=!$var; print ""; print "\n"; - print "\n"; + print "\n"; if ($objp->df > 0 ) { print "\n"; } else { diff --git a/htdocs/compta/stats/pre.inc.php b/htdocs/compta/stats/pre.inc.php index 3f9967b6985..8d24c382e4a 100644 --- a/htdocs/compta/stats/pre.inc.php +++ b/htdocs/compta/stats/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); function llxHeader($head = "") { global $user, $conf; diff --git a/htdocs/compta/tva.php b/htdocs/compta/tva.php index 7ea2732b383..1d1ec3c8546 100644 --- a/htdocs/compta/tva.php +++ b/htdocs/compta/tva.php @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); /* diff --git a/htdocs/compta/tva/fiche.php b/htdocs/compta/tva/fiche.php index 5685fc2e47d..ad37c60e7ca 100644 --- a/htdocs/compta/tva/fiche.php +++ b/htdocs/compta/tva/fiche.php @@ -19,8 +19,8 @@ * $Source$ * */ -require("./pre.inc.php3"); -require("../../tva.class.php3"); +require("./pre.inc.php"); +require("../../tva.class.php"); $mesg = ''; @@ -180,7 +180,7 @@ if ($action == 'create') } else { - print ''; + print ''; } print ''; print '
    Société'.$obj->nom.'
    Société'.$obj->nom.'Note :
    ". nl2br($obj->note)."
    Projet'; - print ''; + print ''; print $projet->title.'
    Destinataire$obj->firstname $obj->name <$obj->email>
    facid\">$objp->facnumber"; + print "facid\">$objp->facnumber"; if ($objp->paye) { print " (payée)"; @@ -260,7 +260,7 @@ if ($propalid) if ($obj->statut == 2) { print ''; - print "Emettre une facture
    [$objp->ref]'.$objp->product.''.$objp->product.'".price($objp->price)." ".$objp->qty."
    propalid\">$objp->refidp\">$objp->nomidp\">$objp->nom".price($objp->price)."
     Factures facid\">$objp->facnumber $objp->nomFactures facid\">$objp->facnumber $objp->nom".price($objp->amount)."
    idp\">$objp->nomidp\">$objp->nom'.price($objp->ca).''.price(100 / $catotal * $objp->ca).'%idp\">Voir les facturesidp\">Voir les factures
    idp\">$objp->nompropalid\">$objp->refpropalid\">$objp->ref".strftime("%d %B %Y",$objp->dp)."
    idp\">$objp->nomfacid\">$objp->facnumberfacid\">$objp->facnumber".strftime("%d %B %Y",$objp->df)."idp\">$objp->nompropalid\">$objp->refpropalid\">$objp->ref".strftime("%d %B %Y",$objp->dp)."
    idp\">$objp->nomfacid\">$objp->facnumberfacid\">$objp->facnumber".strftime("%d %B %Y",$objp->df)."[Editer][Editer]-

    '; diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index 415ed0c87ce..b38a5e2829d 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -19,8 +19,8 @@ * $Source$ * */ -require("./pre.inc.php3"); -require("../../tva.class.php3"); +require("./pre.inc.php"); +require("../../tva.class.php"); /* * diff --git a/htdocs/compta/tva/pre.inc.php b/htdocs/compta/tva/pre.inc.php index 7584abe5811..d2318d4b5dc 100644 --- a/htdocs/compta/tva/pre.inc.php +++ b/htdocs/compta/tva/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); function llxHeader($head = "") { global $user, $conf; diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php index 2a06f54832f..8712603131d 100644 --- a/htdocs/compta/tva/reglement.php +++ b/htdocs/compta/tva/reglement.php @@ -19,8 +19,8 @@ * $Source$ * */ -require("./pre.inc.php3"); -require("../../tva.class.php3"); +require("./pre.inc.php"); +require("../../tva.class.php"); /* * diff --git a/htdocs/compta/voyage/bilan.php b/htdocs/compta/voyage/bilan.php index 7c6b54d49ee..eab1363e8a8 100644 --- a/htdocs/compta/voyage/bilan.php +++ b/htdocs/compta/voyage/bilan.php @@ -20,8 +20,8 @@ * */ -require("./pre.inc.php3"); -require("./reduc.class.php3"); +require("./pre.inc.php"); +require("./reduc.class.php"); llxHeader(); diff --git a/htdocs/compta/voyage/index.php b/htdocs/compta/voyage/index.php index 002d6caafdf..3ea28e4f40e 100644 --- a/htdocs/compta/voyage/index.php +++ b/htdocs/compta/voyage/index.php @@ -20,7 +20,7 @@ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); diff --git a/htdocs/compta/voyage/pre.inc.php b/htdocs/compta/voyage/pre.inc.php index 8172ff30b1f..2fd9fd53e4e 100644 --- a/htdocs/compta/voyage/pre.inc.php +++ b/htdocs/compta/voyage/pre.inc.php @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); function llxHeader($head = "") { global $user, $conf; @@ -36,11 +36,11 @@ function llxHeader($head = "") { $menu->add("index.php","Voyages"); $menu->add_submenu("index.php","Voyages"); - $menu->add_submenu("bilan.php3","Bilan"); - $menu->add_submenu("reduc.php3","Reduc"); - $menu->add_submenu("voyage.php3","Voyage"); + $menu->add_submenu("bilan.php","Bilan"); + $menu->add_submenu("reduc.php","Reduc"); + $menu->add_submenu("voyage.php","Voyage"); - $menu->add("/compta/facture.php3","Factures"); + $menu->add("/compta/facture.php","Factures"); $menu->add("/compta/bank/index.php","Bank"); diff --git a/htdocs/compta/voyage/reduc.php b/htdocs/compta/voyage/reduc.php index 7023708aae6..8f279ebeb04 100644 --- a/htdocs/compta/voyage/reduc.php +++ b/htdocs/compta/voyage/reduc.php @@ -20,7 +20,7 @@ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); diff --git a/htdocs/compta/voyage/voyage.php b/htdocs/compta/voyage/voyage.php index b6856c40233..e08a5e26e38 100644 --- a/htdocs/compta/voyage/voyage.php +++ b/htdocs/compta/voyage/voyage.php @@ -20,7 +20,7 @@ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); ?> diff --git a/htdocs/contact.php b/htdocs/contact.php index 0a050201a4a..fdea41325c2 100644 --- a/htdocs/contact.php +++ b/htdocs/contact.php @@ -20,7 +20,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); /* * Sécurité accés client @@ -120,15 +120,15 @@ if ($result) print ""; - print ''.$obj->name.''; + print ''.$obj->name.''; print "$obj->firstname"; print ' '; - print "idp\">$obj->nom\n"; + print "idp\">$obj->nom\n"; - print ''.$obj->email.' '; + print ''.$obj->email.' '; - print ''.$obj->phone.' '; + print ''.$obj->phone.' '; print "\n"; $i++; diff --git a/htdocs/contrat/contrat.class.php b/htdocs/contrat/contrat.class.php index 76610a385a4..87933354bd8 100644 --- a/htdocs/contrat/contrat.class.php +++ b/htdocs/contrat/contrat.class.php @@ -32,7 +32,7 @@ class Contrat Function Contrat($DB) { - include_once("../societe.class.php3"); + include_once("../societe.class.php"); $this->db = $DB ; $this->product = new Product($DB); $this->societe = new Societe($DB); diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index e06ec1fb047..0e94ed8a011 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -22,7 +22,7 @@ require("./pre.inc.php"); require("./contrat.class.php"); -require("../facture.class.php3"); +require("../facture.class.php"); llxHeader(); @@ -149,7 +149,7 @@ else if ($contrat->factureid) { print 'Société'.$contrat->societe->nom_url.''; - print 'FactureFacture'; + print 'FactureFacture'; } else { diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index fa8bbd5411d..f4b9f9f76cf 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -71,7 +71,7 @@ if ( $db->query($sql) ) $var=!$var; print ""; print "cid\">$obj->label\n"; - print "sidp\">$obj->nom\n"; + print "sidp\">$obj->nom\n"; print ''; if ($obj->enservice == 1) { diff --git a/htdocs/contrat/pre.inc.php b/htdocs/contrat/pre.inc.php index eb1d1eee79b..cb92eeea752 100644 --- a/htdocs/contrat/pre.inc.php +++ b/htdocs/contrat/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../main.inc.php3"); +require("../main.inc.php"); $types[0] = "produit"; $types[1] = "service"; diff --git a/htdocs/domain/index.php b/htdocs/domain/index.php index d850bd3566b..a019bdb0508 100644 --- a/htdocs/domain/index.php +++ b/htdocs/domain/index.php @@ -20,7 +20,7 @@ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); diff --git a/htdocs/domain/pre.inc.php b/htdocs/domain/pre.inc.php index d118c535d19..7d9947773d8 100644 --- a/htdocs/domain/pre.inc.php +++ b/htdocs/domain/pre.inc.php @@ -20,7 +20,7 @@ * */ -require ("../main.inc.php3"); +require ("../main.inc.php"); function llxHeader($head = "") { @@ -36,7 +36,7 @@ function llxHeader($head = "") { $menu->add("/comm/index.php", "Commercial"); - $menu->add_submenu("/comm/clients.php3", "Clients"); + $menu->add_submenu("/comm/clients.php", "Clients"); $menu->add_submenu("/compta/", "Factures"); diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php index b01deccaa5f..b66bb2e6777 100644 --- a/htdocs/fichinter/index.php +++ b/htdocs/fichinter/index.php @@ -20,7 +20,7 @@ * */ require("./pre.inc.php"); -require("../contact.class.php3"); +require("../contact.class.php"); if ($user->societe_id > 0) { @@ -85,7 +85,7 @@ if ( $db->query($sql) ) print "fichid\">$objp->ref\n"; print ' '; - print "idp\">$objp->nom\n"; + print "idp\">$objp->nom\n"; print "".strftime("%d %B %Y",$objp->dp)."\n"; print ''.sprintf("%.1f",$objp->duree).''; print ''.$objp->fk_statut.''; diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php index 0bc7a80b7d9..b9374a8e342 100644 --- a/htdocs/fourn/contact.php +++ b/htdocs/fourn/contact.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); @@ -125,8 +125,8 @@ if ($result) { print "$obj->name"; print "$obj->firstname"; - print ' '; - print "idp\">$obj->nom\n"; + print ' '; + print "idp\">$obj->nom\n"; print "$obj->email \n"; print ''.$obj->phone.''; diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index e7f263c93b4..29c17d30be1 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); /* * Sécurité accés client @@ -312,7 +312,7 @@ else print ''.price($fac->lignes[$i][5]).""; print ''.price($fac->lignes[$i][6]).""; print '['; - print 'Supprimer]'; + print 'Supprimer]'; print ''; } @@ -351,7 +351,7 @@ else * Facture */ print ''; - print ""; + print ""; print "\n"; print ""; print "\n"; @@ -472,7 +472,7 @@ else if ($obj->statut == 0 && $user->societe_id == 0) { - print ''; + print ''; } else { diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php index c304745a0ab..fd0fa281092 100644 --- a/htdocs/fourn/facture/index.php +++ b/htdocs/fourn/facture/index.php @@ -19,8 +19,8 @@ * $Source$ * */ -require("./pre.inc.php3"); -require("../../contact.class.php3"); +require("./pre.inc.php"); +require("../../contact.class.php"); llxHeader(); @@ -139,10 +139,10 @@ if ($result) $var=!$var; print ""; - print "\n"; - print "\n"; - print ''; - print "\n"; + print "\n"; + print "\n"; + print ''; + print "\n"; print ''; print ''; diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index e4d88fa72cd..e3cd78a6668 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); require("./paiementfourn.class.php"); /* @@ -49,7 +49,7 @@ if ($action == 'add') { if ( $paiementfourn->create($user) ) { - Header("Location: fiche.php3?facid=$facid"); + Header("Location: fiche.php?facid=$facid"); } $action = ''; @@ -88,7 +88,7 @@ if ($action == 'create') print ""; print ''; + print ''.$obj->facnumber.''; print ""; print ""; @@ -195,7 +195,7 @@ if ($action == '') { $objp = $db->fetch_object( $i); $var=!$var; print ""; - print "\n"; + print "\n"; print "\n"; print "\n"; print ''; diff --git a/htdocs/fourn/facture/pre.inc.php b/htdocs/fourn/facture/pre.inc.php index c8245dd5c33..50c3edadb2a 100644 --- a/htdocs/fourn/facture/pre.inc.php +++ b/htdocs/fourn/facture/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); require("../../facturefourn.class.php"); function llxHeader($head = "", $urlp = "") { @@ -38,7 +38,7 @@ function llxHeader($head = "", $urlp = "") { if ($user->societe_id == 0) { - $menu->add_submenu(DOL_URL_ROOT."/soc.php3?&action=create","Nouvelle société"); + $menu->add_submenu(DOL_URL_ROOT."/soc.php?&action=create","Nouvelle société"); } @@ -46,7 +46,7 @@ function llxHeader($head = "", $urlp = "") { if ($user->societe_id == 0) { - $menu->add_submenu("fiche.php3?action=create","Nouvelle"); + $menu->add_submenu("fiche.php?action=create","Nouvelle"); } $menu->add_submenu(DOL_URL_ROOT."/fourn/facture/paiement.php", "Paiements"); diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index bf3f8cbb3a6..5da244658fa 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -20,8 +20,8 @@ * $Source$ * */ -require("./pre.inc.php3"); -require("../contact.class.php3"); +require("./pre.inc.php"); +require("../contact.class.php"); llxHeader(); @@ -150,9 +150,9 @@ if ($socid > 0) { print ""; - print ''; + print ''; - print ""; + print ""; @@ -223,7 +223,7 @@ if ($socid > 0) { $obj = $db->fetch_object( $i); $tag = !$tag; print ""; - print ''; + print ''; print ""; $i++; @@ -269,7 +269,7 @@ if ($socid > 0) { print ""; print ''; print ""; - print ""; + print ""; $sql = "SELECT p.idp, p.name, p.firstname, p.poste, p.phone, p.fax, p.email, p.note"; $sql .= " FROM llx_socpeople as p WHERE p.fk_soc = $objsoc->idp ORDER by p.datec"; @@ -288,10 +288,10 @@ if ($socid > 0) { } print ""; print ""; - print ''; - print ''; - print ''; - print ""; + print ''; + print ''; + print ''; + print ""; print "\n"; $i++; $tag = !$tag; @@ -356,7 +356,7 @@ if ($socid > 0) { print "\n"; if ($obj->propalrowid) { - print ''; + print ''; } else { print ''; } @@ -367,13 +367,13 @@ if ($socid > 0) { if ($obj->fk_contact) { $contact = new Contact($db); $contact->fetch($obj->fk_contact); - print ''; + print ''; } else { print ''; } /* */ - print ''; + print ''; print "\n"; $i++; $tag = !$tag; diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index 9ca726c61a6..92168ee4573 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/index.php @@ -19,8 +19,8 @@ * $Source$ * */ -require("./pre.inc.php3"); -require("../contact.class.php3"); +require("./pre.inc.php"); +require("../contact.class.php"); /* * Sécurité accés client @@ -156,12 +156,12 @@ if ($result) $var=!$var; print ""; - print "\n"; + print "\n"; print "\n"; print "\n"; - print ''; + print ''; print "\n"; $i++; diff --git a/htdocs/fourn/people.php b/htdocs/fourn/people.php index 99985eab31f..84216a57222 100644 --- a/htdocs/fourn/people.php +++ b/htdocs/fourn/people.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); if ($sortorder == "") { @@ -47,7 +47,7 @@ if ($action == 'add') { $sql .= " VALUES (now(),$socid,'$name','$firstname','$poste','$phone','$fax','$email')"; $result = $db->query($sql); if ($result) { - Header("Location: fiche.php3?socid=$socid"); + Header("Location: fiche.php?socid=$socid"); } } } @@ -60,7 +60,7 @@ if ($action == 'update') { $sql .= " WHERE idp=$contactid"; $result = $db->query($sql); if ($result) { - Header("Location: fiche.php3?socid=$socid"); + Header("Location: fiche.php?socid=$socid"); } } } @@ -94,8 +94,8 @@ if ($socid > 0) { * */ print "
    Sociétésocidp\">$obj->socnom
    Sociétésocidp\">$obj->socnomsocidp\">Autres factures
    Date".strftime("%A %d %B %Y",$obj->df)."
    [Editer][Editer]
    facid\">$obj->facnumberfacid\">".strftime("%d %b %Y",$obj->datef)."'.stripslashes("$obj->libelle").'socid\">$obj->nomfacid\">$obj->facnumberfacid\">".strftime("%d %b %Y",$obj->datef)."'.stripslashes("$obj->libelle").'socid\">$obj->nom'.price($obj->total_ht).''.$yn[$obj->paye].'
    Facture
    Numéro :'; - print ''.$obj->facnumber.'
    Société :$obj->nom
    Montant :".price($obj->total_ttc)." euros TTC
    facid\">$objp->facnumberfacid\">$objp->facnumber".strftime("%d %B %Y",$objp->dp)."$objp->paiement_type $objp->num_paiement'.price($objp->amount).' 
    Fiche fournisseur : $objsoc->nom
    		Nouvelle Facture Nouvelle factureNouvelle Facture Nouvelle facture[idp&action=edit\">Editer][idp&action=edit\">Editer]
    '.$obj->title.''.$obj->title.'".strftime("%d %b %Y", $obj->do) ."
    Prénom NomPosteTélFaxEmailidp&action=addcontact\">Ajouter
    idp&action=addcontact\">Ajouter
    $obj->poste '.$obj->phone.' '.$obj->fax.' '.$obj->email.' idp&action=editcontact&contactid=$obj->idp\">Modifier'.$obj->phone.' '.$obj->fax.' '.$obj->email.' idp&action=editcontact&contactid=$obj->idp\">Modifier
    " .strftime("%H:%M",$obj->da)."'.$obj->libelle.''.$obj->libelle.''.$obj->libelle.''.$contact->fullname.''.$contact->fullname.' '.$obj->code.''.$obj->code.'
    idp\">$obj->nomidp\">$obj->nom".$obj->ville."$obj->prefix_comm Nouvelle factureNouvelle facture
    \n"; - print ""; - print ""; + print ""; + print ""; print '
    Contacts pour la société : idp\">$objsoc->nom
    		[Ajouter un contact]
    Contacts pour la société : idp\">$objsoc->nom
    		[Ajouter un contact]
    '; print "
    "; @@ -162,7 +162,7 @@ if ($socid > 0) { if ($action == 'addcontact') { - print "
    "; + print "
    "; print ""; print ""; print ""; @@ -190,7 +190,7 @@ if ($socid > 0) { $obj = $db->fetch_object( 0); } - print ""; + print ""; print ""; print ""; print "
    Ajouter le contact
    "; @@ -239,7 +239,7 @@ if ($socid > 0) { } print ""; if ($obj->propalrowid) { - print ""; + print ""; } else { print ""; } diff --git a/htdocs/fourn/pre.inc.php b/htdocs/fourn/pre.inc.php index bf32c1ea87a..3ddc7cbb780 100644 --- a/htdocs/fourn/pre.inc.php +++ b/htdocs/fourn/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../main.inc.php3"); +require("../main.inc.php"); function llxHeader($head = "", $urlp = "") { @@ -40,16 +40,16 @@ function llxHeader($head = "", $urlp = "") */ if ($user->societe_id == 0) { - $menu->add_submenu(DOL_URL_ROOT."/soc.php3?&action=create","Nouvelle société"); + $menu->add_submenu(DOL_URL_ROOT."/soc.php?&action=create","Nouvelle société"); } - $menu->add_submenu("contact.php3","Contacts"); + $menu->add_submenu("contact.php","Contacts"); $menu->add(DOL_URL_ROOT."/fourn/facture/index.php", "Factures"); if ($user->societe_id == 0) { - $menu->add_submenu(DOL_URL_ROOT."/fourn/facture/fiche.php3?action=create","Nouvelle"); + $menu->add_submenu(DOL_URL_ROOT."/fourn/facture/fiche.php?action=create","Nouvelle"); } left_menu($menu->liste); diff --git a/htdocs/includes/boxes/box_clients.php b/htdocs/includes/boxes/box_clients.php index 18972b20543..b8550631e38 100644 --- a/htdocs/includes/boxes/box_clients.php +++ b/htdocs/includes/boxes/box_clients.php @@ -44,7 +44,7 @@ if ($result) $info_box_contents[$i][0] = array('align' => 'left', 'text' => $objp->nom, - 'url' => DOL_URL_ROOT."/comm/fiche.php3?socid=".$objp->idp); + 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->idp); $i++; } diff --git a/htdocs/includes/boxes/box_factures.php b/htdocs/includes/boxes/box_factures.php index 1ad95e4cdf3..5fffbe4a225 100644 --- a/htdocs/includes/boxes/box_factures.php +++ b/htdocs/includes/boxes/box_factures.php @@ -47,11 +47,11 @@ if ($user->rights->facture->lire) $info_box_contents[$i][0] = array('align' => 'left', 'text' => $objp->facnumber, - 'url' => DOL_URL_ROOT."/compta/facture.php3?facid=".$objp->facid); + 'url' => DOL_URL_ROOT."/compta/facture.php?facid=".$objp->facid); $info_box_contents[$i][1] = array('align' => 'left', 'text' => $objp->nom, - 'url' => DOL_URL_ROOT."/comm/fiche.php3?socid=".$objp->idp); + 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->idp); $i++; } } diff --git a/htdocs/includes/boxes/box_factures_imp.php b/htdocs/includes/boxes/box_factures_imp.php index df79e4536e6..1cf6f63e1eb 100644 --- a/htdocs/includes/boxes/box_factures_imp.php +++ b/htdocs/includes/boxes/box_factures_imp.php @@ -45,11 +45,11 @@ if ($user->rights->facture->lire) $info_box_contents[$i][0] = array('align' => 'left', 'text' => $objp->facnumber, - 'url' => DOL_URL_ROOT."/compta/facture.php3?facid=".$objp->facid); + 'url' => DOL_URL_ROOT."/compta/facture.php?facid=".$objp->facid); $info_box_contents[$i][1] = array('align' => 'left', 'text' => $objp->nom, - 'url' => DOL_URL_ROOT."/comm/fiche.php3?socid=".$objp->idp); + 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->idp); $i++; } diff --git a/htdocs/includes/boxes/box_produits.php b/htdocs/includes/boxes/box_produits.php index 735a5c6b257..e61af17afc7 100644 --- a/htdocs/includes/boxes/box_produits.php +++ b/htdocs/includes/boxes/box_produits.php @@ -43,11 +43,11 @@ if ($user->rights->produit->lire) $info_box_contents[$i][0] = array('align' => 'left', 'text' => $objp->label, - 'url' => DOL_URL_ROOT."/product/fiche.php3?id=".$objp->rowid); + 'url' => DOL_URL_ROOT."/product/fiche.php?id=".$objp->rowid); $info_box_contents[$i][1] = array('align' => 'right', 'text' => price($objp->price), - 'url' => DOL_URL_ROOT."/product/fiche.php3?id=".$objp->rowid); + 'url' => DOL_URL_ROOT."/product/fiche.php?id=".$objp->rowid); $i++; } } diff --git a/htdocs/includes/boxes/box_propales.php b/htdocs/includes/boxes/box_propales.php index d10e7756faa..da118142be4 100644 --- a/htdocs/includes/boxes/box_propales.php +++ b/htdocs/includes/boxes/box_propales.php @@ -46,11 +46,11 @@ if ($user->rights->propale->lire) $info_box_contents[$i][0] = array('align' => 'left', 'text' => $objp->ref, - 'url' => DOL_URL_ROOT."/comm/propal.php3?propalid=".$objp->rowid); + 'url' => DOL_URL_ROOT."/comm/propal.php?propalid=".$objp->rowid); $info_box_contents[$i][1] = array('align' => 'center', 'text' => $objp->nom, - 'url' => DOL_URL_ROOT."/comm/fiche.php3?socid=".$objp->idp); + 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->idp); $i++; } } diff --git a/htdocs/includes/boxes/box_services_vendus.php b/htdocs/includes/boxes/box_services_vendus.php index 9b1fb3f9722..6bbc272e764 100644 --- a/htdocs/includes/boxes/box_services_vendus.php +++ b/htdocs/includes/boxes/box_services_vendus.php @@ -48,7 +48,7 @@ if ($result) $info_box_contents[$i][0] = array('align' => 'left', 'text' => $objp->nom, - 'url' => DOL_URL_ROOT."/comm/fiche.php3?socid=".$objp->idp); + 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->idp); $info_box_contents[$i][1] = array('align' => 'left', 'text' => $objp->label, diff --git a/htdocs/index.php b/htdocs/index.php index d96a8e7353e..2494013c10a 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); diff --git a/htdocs/install.php b/htdocs/install.php index 5a7fa760b9d..d2581a8bdf7 100644 --- a/htdocs/install.php +++ b/htdocs/install.php @@ -103,7 +103,7 @@ if ($HTTP_POST_VARS["action"] == "set") } print ''; - require ($dolibarr_main_document_root . "/lib/mysql.lib.php3"); + require ($dolibarr_main_document_root . "/lib/mysql.lib.php"); require ($dolibarr_main_document_root . "/conf/conf.class.php"); $conf = new Conf(); $conf->db->host = $dolibarr_main_db_host; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 520e075d52c..a0432922d43 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -48,7 +48,7 @@ define('DOL_URL_ROOT', $pos); require (DOL_DOCUMENT_ROOT."/conf/conf.class.php"); /* - * Doit figurer aprés l'inclusion de conf.class.php3 pour overider certaines variables, à terme conf.class.php3 devra etre un fichier qui ne sera pas modifié par l'utilisateur + * Doit figurer aprés l'inclusion de conf.class.php pour overider certaines variables, à terme conf.class.php3 devra etre un fichier qui ne sera pas modifié par l'utilisateur */ $conf = new Conf(); $conf->db->host = $dolibarr_main_db_host; @@ -56,12 +56,12 @@ $conf->db->name = $dolibarr_main_db_name; $conf->db->user = $dolibarr_main_db_user; $conf->db->pass = $dolibarr_main_db_pass; -require (DOL_DOCUMENT_ROOT ."/lib/mysql.lib.php3"); -require (DOL_DOCUMENT_ROOT ."/lib/functions.inc.php3"); -require (DOL_DOCUMENT_ROOT ."/product.class.php3"); -require (DOL_DOCUMENT_ROOT ."/user.class.php3"); -require (DOL_DOCUMENT_ROOT ."/menu.class.php3"); -require (DOL_DOCUMENT_ROOT ."/societe.class.php3"); +require (DOL_DOCUMENT_ROOT ."/lib/mysql.lib.php"); +require (DOL_DOCUMENT_ROOT ."/lib/functions.inc.php"); +require (DOL_DOCUMENT_ROOT ."/product.class.php"); +require (DOL_DOCUMENT_ROOT ."/user.class.php"); +require (DOL_DOCUMENT_ROOT ."/menu.class.php"); +require (DOL_DOCUMENT_ROOT ."/societe.class.php"); require (DOL_DOCUMENT_ROOT ."/html.form.class.php"); require (DOL_DOCUMENT_ROOT ."/translate.class.php"); require (DOL_DOCUMENT_ROOT ."/boxes.php"); @@ -424,8 +424,8 @@ Function left_menu($menu) if (defined("MAIN_SEARCHFORM_SOCIETE") && MAIN_SEARCHFORM_SOCIETE > 0) { - print 'Societes'; - print ''; + print 'Societes'; + print ''; print ''; print ''; print ' '; @@ -435,8 +435,8 @@ Function left_menu($menu) if (defined("MAIN_SEARCHFORM_CONTACT") && MAIN_SEARCHFORM_CONTACT > 0) { - print 'Contacts'; - print ''; + print 'Contacts'; + print ''; print ''; print ''; print ' '; diff --git a/htdocs/notify.class.php b/htdocs/notify.class.php index f2f6a6a780c..40dc1bbb827 100644 --- a/htdocs/notify.class.php +++ b/htdocs/notify.class.php @@ -35,7 +35,7 @@ class Notify Function Notify($DB) { $this->db = $DB ; - include_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php3"); + include_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); } /* diff --git a/htdocs/postnuke/articles/pre.inc.php b/htdocs/postnuke/articles/pre.inc.php index 99767c3b586..509a65c8931 100644 --- a/htdocs/postnuke/articles/pre.inc.php +++ b/htdocs/postnuke/articles/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); function llxHeader($head = "", $urlp = "") { global $user, $conf; diff --git a/htdocs/pre.inc.php b/htdocs/pre.inc.php index 81b0d984570..bc75b1fc4f5 100644 --- a/htdocs/pre.inc.php +++ b/htdocs/pre.inc.php @@ -21,7 +21,7 @@ * */ -require ("./main.inc.php3"); +require ("./main.inc.php"); function llxHeader($head = "") { global $user, $conf; @@ -40,7 +40,7 @@ function llxHeader($head = "") { if ($user->admin) { - $menu->add_submenu(DOL_URL_ROOT."/soc.php3?&action=create", "Nouvelle société"); + $menu->add_submenu(DOL_URL_ROOT."/soc.php?&action=create", "Nouvelle société"); } $menu->add_submenu(DOL_URL_ROOT."/contact.php", "Contacts"); } @@ -49,10 +49,10 @@ function llxHeader($head = "") { { $menu->add(DOL_URL_ROOT."/comm/index.php", "Commercial"); - $menu->add_submenu(DOL_URL_ROOT."/comm/clients.php3", "Clients"); + $menu->add_submenu(DOL_URL_ROOT."/comm/clients.php", "Clients"); if ($user->rights->propale->lire) - $menu->add_submenu(DOL_URL_ROOT."/comm/propal.php3", "Propales"); + $menu->add_submenu(DOL_URL_ROOT."/comm/propal.php", "Propales"); } if ($conf->compta->enabled ) @@ -60,7 +60,7 @@ function llxHeader($head = "") { $menu->add(DOL_URL_ROOT."/compta/", "Comptabilité"); if ($user->rights->facture->lire) - $menu->add_submenu(DOL_URL_ROOT."/compta/facture.php3", "Factures"); + $menu->add_submenu(DOL_URL_ROOT."/compta/facture.php", "Factures"); } if ($conf->fichinter->enabled ) @@ -117,7 +117,7 @@ function llxHeader($head = "") { $menu->add(DOL_URL_ROOT."/compta/voyage/index.php","Voyages"); $menu->add_submenu(DOL_URL_ROOT."/compta/voyage/index.php","Voyages"); - $menu->add_submenu(DOL_URL_ROOT."/compta/voyage/reduc.php3","Reduc"); + $menu->add_submenu(DOL_URL_ROOT."/compta/voyage/reduc.php","Reduc"); } if ($conf->domaine->enabled ) diff --git a/htdocs/product.class.php b/htdocs/product.class.php index df4ebed2546..f64160367f8 100644 --- a/htdocs/product.class.php +++ b/htdocs/product.class.php @@ -190,7 +190,7 @@ class Product $this->duration_value = substr($result["duration"],0,strlen($result["duration"])-1); $this->duration_unit = substr($result["duration"],-1); - $this->label_url = ''.$this->label.''; + $this->label_url = ''.$this->label.''; $this->db->free(); return 1; diff --git a/htdocs/product/album/pre.inc.php b/htdocs/product/album/pre.inc.php index b69c93fb9ae..f5ad42f761f 100644 --- a/htdocs/product/album/pre.inc.php +++ b/htdocs/product/album/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); require("./album.class.php"); require("../groupart/groupart.class.php"); diff --git a/htdocs/product/categorie/pre.inc.php b/htdocs/product/categorie/pre.inc.php index a7b3467e60c..b553f3c0934 100644 --- a/htdocs/product/categorie/pre.inc.php +++ b/htdocs/product/categorie/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); require("../groupart/groupart.class.php"); require("../categorie/categorie.class.php"); diff --git a/htdocs/product/concert/pre.inc.php b/htdocs/product/concert/pre.inc.php index 69b6320844e..f4070c0924b 100644 --- a/htdocs/product/concert/pre.inc.php +++ b/htdocs/product/concert/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); require("./concert.class.php"); require("./lieuconcert.class.php"); require("../groupart/groupart.class.php"); diff --git a/htdocs/product/critiques/pre.inc.php b/htdocs/product/critiques/pre.inc.php index 87c32284064..4bc3e75b378 100644 --- a/htdocs/product/critiques/pre.inc.php +++ b/htdocs/product/critiques/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); require("./critique.class.php"); function llxHeader($head = "", $urlp = "") { diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 37f3512da60..d99989de7b4 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -20,9 +20,9 @@ * */ -require("./pre.inc.php3"); -require("../propal.class.php3"); -require("../facture.class.php3"); +require("./pre.inc.php"); +require("../propal.class.php"); +require("../facture.class.php"); $user->getrights('produit'); $user->getrights('propale'); @@ -66,7 +66,7 @@ if ($action == 'addinpropal') else { $mesg = ucfirst($types[$type]) . ' ajouté à la proposition '; - $mesg .= ''.$propal->ref.''; + $mesg .= ''.$propal->ref.''; } $action = ''; } @@ -83,7 +83,7 @@ if ($action == 'addinfacture') $action = ''; $mesg = 'Produit ajouté à la facture '; - $mesg .= ''.$facture->ref.''; + $mesg .= ''.$facture->ref.''; } if ($HTTP_POST_VARS["action"] == 'update' && @@ -363,7 +363,7 @@ if ($action == '') { if ($user->rights->produit->modifier || $user->rights->produit->creer) { - print ''; + print ''; } else { @@ -381,7 +381,7 @@ if ($action == '') { if ($user->rights->produit->modifier || $user->rights->produit->creer) { - print ''; + print ''; } else { @@ -429,10 +429,10 @@ if ($id && $action == '' && $product->envente) $objp = $db->fetch_object( $i); $var=!$var; print ""; - print "\n"; - print "\n"; + print "\n"; + print "\n"; print "\n"; - print ''; + print ''; print ''; print '"; - print "\n"; + print "\n"; print "\n"; print ''; print "\n"; diff --git a/htdocs/service/pre.inc.php b/htdocs/service/pre.inc.php index 92b29d9e704..b6b46dba8f3 100644 --- a/htdocs/service/pre.inc.php +++ b/htdocs/service/pre.inc.php @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * */ -require("../main.inc.php3"); +require("../main.inc.php"); function llxHeader($head = "", $urlp = "") { @@ -37,7 +37,7 @@ function llxHeader($head = "", $urlp = "") $menu->add(DOL_URL_ROOT."/service/index.php", "Services"); - $menu->add_submenu(DOL_URL_ROOT."/service/fiche.php3?action=create", "Nouveau"); + $menu->add_submenu(DOL_URL_ROOT."/service/fiche.php?action=create", "Nouveau"); left_menu($menu->liste); } diff --git a/htdocs/soc.php b/htdocs/soc.php index 0e1818c17d5..2e8097bbb72 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -20,7 +20,7 @@ * */ -require("pre.inc.php3"); +require("pre.inc.php"); /* @@ -83,7 +83,7 @@ if ($action == 'update') if ($action == 'create') { print '
    Nouvelle société

    '; - print ''; + print ''; print ''; print ''; @@ -122,7 +122,7 @@ elseif ($action == 'edit') $soc->id = $socid; $soc->fetch($socid); - print ''; + print ''; print ''; print '
    ". strftime("%d %b %Y %H:%M", $obj->da) ."propalrowid\">$obj->libellepropalrowid\">$obj->libelle$obj->libelle
    test de connexion à la base de données
    [Changer le prix][Changer le prix][Editer][Editer]
    propalid\">$objp->refidp\">$objp->nompropalid\">$objp->refidp\">$objp->nom". strftime("%d %B %Y",$objp->dp)."'; print ''; @@ -455,7 +455,7 @@ if ($id && $action == '' && $product->envente) $otherprop = $propal->liste_array(1, '<>'.$user->id); if (sizeof($otherprop)) { - print ''; + print ''; print ''; print ''; print ""; - print "\n"; - print "\n"; + print "\n"; + print "\n"; print "\n"; - print ''; + print ''; print ''; print '"; - print "\n"; + print "\n"; print "\n"; $i++; } diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index e95471b9e3e..b4fb8069fac 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); $user->getrights('produit'); if (!$user->rights->produit->lire) @@ -96,7 +96,7 @@ if ($result) if ($num == 1 && (isset($sall) or isset($snom) or isset($sref))) { $objp = $db->fetch_object($i); - Header("Location: fiche.php3?id=$objp->rowid"); + Header("Location: fiche.php?id=$objp->rowid"); } if ($ref || $snom || $sall) @@ -139,7 +139,7 @@ if ($result) $objp = $db->fetch_object( $i); $var=!$var; print ""; - print "\n"; + print "\n"; print "\n"; print ''; print "\n"; diff --git a/htdocs/product/osc-liste.php b/htdocs/product/osc-liste.php index 46d66941644..2bc7d4d5e24 100644 --- a/htdocs/product/osc-liste.php +++ b/htdocs/product/osc-liste.php @@ -20,7 +20,7 @@ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); diff --git a/htdocs/product/osc-productsbyreviews.php b/htdocs/product/osc-productsbyreviews.php index 797b8cc352f..b829f597e97 100644 --- a/htdocs/product/osc-productsbyreviews.php +++ b/htdocs/product/osc-productsbyreviews.php @@ -20,7 +20,7 @@ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); diff --git a/htdocs/product/osc-reviews.php b/htdocs/product/osc-reviews.php index 27ae0003ed8..4d50d3c5eed 100644 --- a/htdocs/product/osc-reviews.php +++ b/htdocs/product/osc-reviews.php @@ -20,7 +20,7 @@ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index 1961dab411f..eede0449d5f 100644 --- a/htdocs/product/popuprop.php +++ b/htdocs/product/popuprop.php @@ -20,7 +20,7 @@ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); if ($sortfield == "") { @@ -66,7 +66,7 @@ if ( $db->query($sql) ) $objp = $db->fetch_object( $i); $var=!$var; print ""; - print "\n"; + print "\n"; print "\n"; print ''; print "\n"; diff --git a/htdocs/product/pre.inc.php b/htdocs/product/pre.inc.php index 3634309c29b..71413a7a0f4 100644 --- a/htdocs/product/pre.inc.php +++ b/htdocs/product/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../main.inc.php3"); +require("../main.inc.php"); $types[0] = "produit"; $types[1] = "service"; @@ -38,11 +38,11 @@ function llxHeader($head = "", $urlp = "", $title="") $menu->add(DOL_URL_ROOT."/product/index.php?type=0", "Produits"); $menu->add_submenu("liste.php?type=0","Liste"); - $menu->add_submenu("fiche.php3?&action=create&type=0","Nouveau produit"); + $menu->add_submenu("fiche.php?&action=create&type=0","Nouveau produit"); $menu->add(DOL_URL_ROOT."/product/index.php?type=1", "Services"); $menu->add_submenu("liste.php?type=1","Liste"); - $menu->add_submenu("fiche.php3?&action=create&type=1","Nouveau service"); + $menu->add_submenu("fiche.php?&action=create&type=1","Nouveau service"); if (defined("MAIN_MODULE_BOUTIQUE") && MAIN_MODULE_BOUTIQUE) { diff --git a/htdocs/product/promotion/pre.inc.php b/htdocs/product/promotion/pre.inc.php index 12e4233f8c7..6e43a173f39 100644 --- a/htdocs/product/promotion/pre.inc.php +++ b/htdocs/product/promotion/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); require("./promotion.class.php"); function llxHeader($head = "", $urlp = "") { diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 90b2d3eb998..57220481876 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -42,7 +42,7 @@ if ($id) print '
    Autres Propositions"; @@ -497,10 +497,10 @@ if ($id && $action == '' && $product->envente) $var=!$var; print "
    factureid\">$objp->facnumberidp\">$objp->nomfactureid\">$objp->facnumberidp\">$objp->nom". strftime("%d %B %Y",$objp->df)."'; print ''; diff --git a/htdocs/product/groupart/pre.inc.php b/htdocs/product/groupart/pre.inc.php index d2cba065442..ec99127c0c3 100644 --- a/htdocs/product/groupart/pre.inc.php +++ b/htdocs/product/groupart/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); require("./groupart.class.php"); require("../album/album.class.php"); diff --git a/htdocs/product/index.php b/htdocs/product/index.php index db7b57488fa..8a5172cd527 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); $user->getrights('produit'); if (!$user->rights->produit->lire) @@ -68,7 +68,7 @@ if ($result) $objp = $db->fetch_object( $i); $var=!$var; print "
    rowid\">$objp->refrowid\">$objp->ref$objp->label
    rowid\">$objp->refrowid\">$objp->ref$objp->label'.price($objp->price).'
    rowid\">$objp->refrowid\">$objp->ref$objp->label'.$objp->c.'
    '; print ""; - print ''; + print ''; print ''; print ""; print '"; - print '\n"; - print ''; + print ''; if ($objp->df > 0 ) { diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php index 024ddb3d291..e6256c57daf 100644 --- a/htdocs/product/stats/fiche.php +++ b/htdocs/product/stats/fiche.php @@ -20,7 +20,7 @@ * */ require("./pre.inc.php"); -require("../../propal.class.php3"); +require("../../propal.class.php"); require("../../graph.class.php"); llxHeader(); @@ -67,7 +67,7 @@ if ($id) print '
    Référence'.$product->ref.'Référence'.$product->ref.'Statistiques
    Libellé$product->label'; @@ -102,7 +102,7 @@ if ($id) $var=!$var; print "
    '; + print ''; if ($objp->paye) { print $objp->facnumber; @@ -112,7 +112,7 @@ if ($id) print ''.$objp->facnumber.''; } print "'.$objp->nom.''.$objp->nom.'
    '; print ""; - print ''; + print ''; print ''; print ""; print ' @@ -118,7 +118,7 @@ if ($action == 'create') else { print '
    Référence'.$product->ref.'Référence'.$product->ref.'Statistiques
    Libellé$product->label'; diff --git a/htdocs/product/stats/index.php b/htdocs/product/stats/index.php index a7c445327b2..4424737876a 100644 --- a/htdocs/product/stats/index.php +++ b/htdocs/product/stats/index.php @@ -21,7 +21,7 @@ */ require("./pre.inc.php"); -require("../../propal.class.php3"); +require("../../propal.class.php"); require("../../graph.class.php"); llxHeader(); diff --git a/htdocs/product/stats/pre.inc.php b/htdocs/product/stats/pre.inc.php index 9848cdfdfc7..90f6cdffe88 100644 --- a/htdocs/product/stats/pre.inc.php +++ b/htdocs/product/stats/pre.inc.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); $types[0] = "produit"; $types[1] = "service"; @@ -38,11 +38,11 @@ function llxHeader($head = "", $urlp = "") $menu->add(DOL_URL_ROOT."/product/index.php?type=0", "Produits"); $menu->add_submenu("../liste.php?type=0","Liste"); - $menu->add_submenu("../fiche.php3?&action=create&type=0","Nouveau produit"); + $menu->add_submenu("../fiche.php?&action=create&type=0","Nouveau produit"); $menu->add(DOL_URL_ROOT."/product/index.php?type=1", "Services"); $menu->add_submenu("../liste.php?type=1","Liste"); - $menu->add_submenu("../fiche.php3?&action=create&type=1","Nouveau service"); + $menu->add_submenu("../fiche.php?&action=create&type=1","Nouveau service"); $menu->add("./", "Statistiques"); diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php index 8250f478298..b7c2d5c5db1 100644 --- a/htdocs/projet/fiche.php +++ b/htdocs/projet/fiche.php @@ -21,7 +21,7 @@ */ require("./pre.inc.php"); require("./project.class.php"); -require("../propal.class.php3"); +require("../propal.class.php"); if ($HTTP_POST_VARS["action"] == 'update') { @@ -76,7 +76,7 @@ if ($action == 'create') get_nom($socidp); - print ''.$societe->nom.''; + print ''.$societe->nom.''; ?>
    '; - print ''; + print ''; print ''; print ''; @@ -145,7 +145,7 @@ if ($action == 'create') $var=!$var; print ""; - print "\n"; + print "\n"; print ''; diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 46978fc7ed1..ccf05244881 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -104,7 +104,7 @@ if ( $db->query($sql) ) print ""; print "\n"; print "\n"; - print "\n"; + print "\n"; print "\n"; $i++; diff --git a/htdocs/projet/pre.inc.php b/htdocs/projet/pre.inc.php index 6d6fa73246c..f9dd4dc3042 100644 --- a/htdocs/projet/pre.inc.php +++ b/htdocs/projet/pre.inc.php @@ -20,7 +20,7 @@ * */ -require ("../main.inc.php3"); +require ("../main.inc.php"); function llxHeader($head = "", $urlp = "") { /* diff --git a/htdocs/propal.class.php b/htdocs/propal.class.php index 760057ddd3d..93eda043ec8 100644 --- a/htdocs/propal.class.php +++ b/htdocs/propal.class.php @@ -342,7 +342,7 @@ class Propal $this->lignes = array(); $this->db->free(); - $this->ref_url = ''.$this->ref.''; + $this->ref_url = ''.$this->ref.''; /* * Lignes diff --git a/htdocs/public/adherents/pre.inc.php b/htdocs/public/adherents/pre.inc.php index b28ce56879d..cb5159f3845 100644 --- a/htdocs/public/adherents/pre.inc.php +++ b/htdocs/public/adherents/pre.inc.php @@ -20,7 +20,7 @@ * */ -require("../../main.inc.php3"); +require("../../main.inc.php"); function llxHeader($head = "") { global $user, $conf; diff --git a/htdocs/public/dons/bplc.php b/htdocs/public/dons/bplc.php index 278260284f3..ee13afa0bd3 100644 --- a/htdocs/public/dons/bplc.php +++ b/htdocs/public/dons/bplc.php @@ -27,8 +27,8 @@ * */ -require("../../lib/mysql.lib.php3"); -require("../../conf/conf.class.php3"); +require("../../lib/mysql.lib.php"); +require("../../conf/conf.class.php"); require("../../retourbplc.class.php"); require("../../don.class.php"); diff --git a/htdocs/public/dons/index.php b/htdocs/public/dons/index.php index 426e2c2f47c..d3c48979345 100644 --- a/htdocs/public/dons/index.php +++ b/htdocs/public/dons/index.php @@ -21,8 +21,8 @@ */ require("../../don.class.php"); -require("../../lib/mysql.lib.php3"); -require("../../conf/conf.class.php3"); +require("../../lib/mysql.lib.php"); +require("../../conf/conf.class.php"); $conf = new Conf(); diff --git a/htdocs/service/fiche.php b/htdocs/service/fiche.php index 1f735cb7254..60fb4bab1a9 100644 --- a/htdocs/service/fiche.php +++ b/htdocs/service/fiche.php @@ -20,8 +20,8 @@ * */ -require("./pre.inc.php3"); -require("../service.class.php3"); +require("./pre.inc.php"); +require("../service.class.php"); llxHeader(); @@ -133,10 +133,10 @@ if ($action == 'create') { print ''; - print ''; + print ''; - print ''; - print ''; + print ''; + print ''; print ''; print '
    Société'.$projet->societe->nom.'
    Société'.$projet->societe->nom.'
    Réf'.$projet->ref.'
    Titre'.$projet->title.'
    id\">$propale->refid\">$propale->ref'.strftime("%d %B %Y",$propale->datep).'
    projectid\">$objp->titleprojectid\">$objp->refidp\">$objp->nomidp\">$objp->nom
    -[Editer][Editer][Date de debut][Date de fin][Date de debut][Date de fin]-

    '; diff --git a/htdocs/service/index.php b/htdocs/service/index.php index 19cabfdbc57..71c2fbc4ca8 100644 --- a/htdocs/service/index.php +++ b/htdocs/service/index.php @@ -20,7 +20,7 @@ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); @@ -63,7 +63,7 @@ if ( $db->query($sql) ) { $objp = $db->fetch_object( $i); $var=!$var; print "
    rowid\">$objp->refrowid\">$objp->ref$objp->label'.price($objp->price).'
    '; @@ -175,7 +175,7 @@ elseif ($action == 'edit') if ($soc->client) { - print ''; + print ''; } else { @@ -184,7 +184,7 @@ elseif ($action == 'edit') if ($soc->fournisseur) { - print ''; + print ''; } else { @@ -202,7 +202,7 @@ elseif ($action == 'edit') print '
    Clientoui Fiche
    Clientoui Fiche
    Fournisseuroui Fiche
    Fournisseuroui Fiche
    '; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/societe.class.php b/htdocs/societe.class.php index 275d4eb99cc..cf076846cee 100644 --- a/htdocs/societe.class.php +++ b/htdocs/societe.class.php @@ -152,7 +152,7 @@ class Societe { $this->ville = stripslashes($obj->ville); $this->url = $obj->url; - $this->nom_url = ''.$obj->nom.''; + $this->nom_url = ''.$obj->nom.''; $this->tel = $obj->tel; $this->fax = $obj->fax; diff --git a/htdocs/societe.php b/htdocs/societe.php index 7f2fd22e868..d14fed98980 100644 --- a/htdocs/societe.php +++ b/htdocs/societe.php @@ -18,11 +18,11 @@ * $Id$ * $Source$ */ -require("./pre.inc.php3"); -require("./contact.class.php3"); -require("./lib/webcal.class.php3"); -require("./cactioncomm.class.php3"); -require("./actioncomm.class.php3"); +require("./pre.inc.php"); +require("./contact.class.php"); +require("./lib/webcal.class.php"); +require("./cactioncomm.class.php"); +require("./actioncomm.class.php"); /* * Sécurité accés client @@ -131,12 +131,12 @@ if ($result) { $var=!$var; print ""; - print "\n"; + print "\n"; print "\n"; print '\n"; + print "idp\">client\n"; } else { @@ -145,7 +145,7 @@ if ($result) { print "'; + print 'fournisseur'; } else { diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php index f6f01080d6b..b3cc5f9b64b 100644 --- a/htdocs/societe/notify/fiche.php +++ b/htdocs/societe/notify/fiche.php @@ -81,7 +81,7 @@ if ( $soc->fetch($socid) ) print '
    [Editer][Editer]---
    idp\">$obj->nomidp\">$obj->nom".$obj->ville." '; if ($obj->client) { - print "idp\">client"; if ($obj->fournisseur) { - print 'fournisseur'; if ($soc->client) { - print 'Fiche commercial'; + print 'Fiche commercial'; } else { @@ -90,7 +90,7 @@ if ( $soc->fetch($socid) ) print ''; if ($soc->client) { - print 'Fiche compta'; + print 'Fiche compta'; } else { diff --git a/htdocs/societe/notify/pre.inc.php b/htdocs/societe/notify/pre.inc.php index 38ed28485f6..633d3f5e5d5 100644 --- a/htdocs/societe/notify/pre.inc.php +++ b/htdocs/societe/notify/pre.inc.php @@ -20,7 +20,7 @@ * */ -require ("../../main.inc.php3"); +require ("../../main.inc.php"); function llxHeader($head = "") { @@ -38,7 +38,7 @@ function llxHeader($head = "") { $menu->add(DOL_URL_ROOT."/societe.php", "Sociétés","company"); - $menu->add_submenu(DOL_URL_ROOT."/soc.php3?&action=create", "Nouvelle société"); + $menu->add_submenu(DOL_URL_ROOT."/soc.php?&action=create", "Nouvelle société"); $menu->add_submenu(DOL_URL_ROOT."/contact.php", "Contacts"); diff --git a/htdocs/societe/pre.inc.php b/htdocs/societe/pre.inc.php index cf0803ceb74..0054a065e3b 100644 --- a/htdocs/societe/pre.inc.php +++ b/htdocs/societe/pre.inc.php @@ -20,7 +20,7 @@ * */ -require ("../main.inc.php3"); +require ("../main.inc.php"); function llxHeader($head = "") { @@ -38,7 +38,7 @@ function llxHeader($head = "") { $menu->add(DOL_URL_ROOT."/societe.php", "Sociétés","company"); - $menu->add_submenu(DOL_URL_ROOT."/soc.php3?&action=create", "Nouvelle société"); + $menu->add_submenu(DOL_URL_ROOT."/soc.php?&action=create", "Nouvelle société"); $menu->add_submenu(DOL_URL_ROOT."/contact.php", "Contacts"); diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index f7f0ae194c7..1ee2fb83433 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -307,7 +307,7 @@ else print '
    '; if ($fuser->contact_id) { - print 'Fiche contact'; + print 'Fiche contact'; } else { diff --git a/htdocs/user/pre.inc.php b/htdocs/user/pre.inc.php index a423a3c1c43..bde2e565256 100644 --- a/htdocs/user/pre.inc.php +++ b/htdocs/user/pre.inc.php @@ -18,7 +18,7 @@ * $Id$ * $Source$ */ -require("../main.inc.php3"); +require("../main.inc.php"); function llxHeader($head = "", $urlp = "") {