diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index f6c3da0754e..d4667f6c438 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -19,8 +19,8 @@ * $Source$ * */ -require("./pre.inc.php3"); -require("./propal_model_pdf.class.php3"); +require("./pre.inc.php"); +require("./propal_model_pdf.class.php"); if (defined("PROPALE_ADDON") && is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".PROPALE_ADDON.".php")) { @@ -66,12 +66,12 @@ if ($action == 'create') } } - print "
"; + print ""; print ""; print ''; - print ''; + print ''; print '"; @@ -119,7 +119,7 @@ if ($action == 'create') if ($numdest==0) { print 'Cette societe n\'a pas de contact, veuillez en creer un avant de faire de propale
'; - print 'Ajouter un contact'; + print 'Ajouter un contact'; } print ''; /* @@ -152,7 +152,7 @@ if ($action == 'create') if ($numprojet==0) { print 'Cette societe n\'a pas de projet.
'; - print 'Créer un projet'; + print 'Créer un projet'; } print ''; print ''; diff --git a/htdocs/comm/bookmark.php b/htdocs/comm/bookmark.php index 2804772f692..51c455eab15 100644 --- a/htdocs/comm/bookmark.php +++ b/htdocs/comm/bookmark.php @@ -19,7 +19,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); diff --git a/htdocs/comm/clients.php b/htdocs/comm/clients.php index dcf94cc2f03..67cfcfc028e 100644 --- a/htdocs/comm/clients.php +++ b/htdocs/comm/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"); /* * Sécurité accés client @@ -91,7 +91,7 @@ if ($result) if ($num == 1) { $obj = $db->fetch_object(0); - Header("Location: fiche.php3?socid=$obj->idp"); + Header("Location: fiche.php?socid=$obj->idp"); } else { @@ -127,7 +127,7 @@ if ($result) $var=!$var; print ""; - print "\n"; + print "\n"; print "\n"; print "\n"; @@ -135,7 +135,7 @@ if ($result) { if ($user->rights->propale->creer) { - print "\n"; + print "\n"; } else { @@ -143,7 +143,7 @@ if ($result) } if ($conf->fichinter->enabled) { - print "\n"; + print "\n"; } else { diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index 4755df495be..44c4dde4ced 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -20,7 +20,7 @@ * $Source$ * */ -require("./pre.inc.php3"); +require("./pre.inc.php"); /* * Sécurité accés client @@ -115,19 +115,19 @@ if ($result) print ""; - print ''; + print ''; print ""; - print '\n"; + print '\n"; - print ''; + print ''; - print ''; + print ''; if ($user->societe_id == 0) { - print "\n"; + print "\n"; } else { diff --git a/htdocs/comm/docsoc.php b/htdocs/comm/docsoc.php index 0afab49b8bc..256f1eeaf06 100644 --- a/htdocs/comm/docsoc.php +++ b/htdocs/comm/docsoc.php @@ -18,7 +18,7 @@ * $Id$ * $Source$ */ -require("./pre.inc.php3"); +require("./pre.inc.php"); llxHeader(); @@ -83,8 +83,8 @@ if ($socid > 0) print "
Société'.$objsoc->nom.'
Société'.$objsoc->nom.''; print "Commentaires
Modèle
idp\">$obj->nomidp\">$obj->nom".$obj->ville." $obj->prefix_comm idp&action=create\">[Propal]idp&action=create\">[Propal]idp&action=create\">[Fiche Inter]idp&action=create\">[Fiche Inter]
'.$obj->name.''.$obj->name.'$obj->firstnamefiltrer '; - print "idp\">$obj->nomfiltrer '; + print "idp\">$obj->nom'.$obj->email.' '.$obj->email.' '.$obj->phone.' '.$obj->phone.' idp&setcontact=$obj->cidp&action=create\">[Propal]idp&setcontact=$obj->cidp&action=create\">[Propal]
\n"; print ""; - print ""; - print ""; + print ""; + print ""; print "
Documents associés à l'entreprise : $societe->nom
id\">Commercialid\">Comptaid\">Commercialid\">Compta
"; /* * diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 20dc7238071..2cc9d43b533 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/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"); llxHeader(); $user->getrights('propale'); @@ -146,7 +146,7 @@ if ($socid > 0) { if ($user->societe_id == 0) { - print "idp\">Compta"; + print "idp\">Compta"; print "idp\">Documents"; print "idp&action=add_bookmark\">[Bookmark]"; if ($user->rights->projet->creer) @@ -154,10 +154,10 @@ if ($socid > 0) { if (defined("MAIN_MODULE_FICHEINTER") && MAIN_MODULE_FICHEINTER) { - print "idp&action=create\">[Intervention]"; + print "idp&action=create\">[Intervention]"; } - print "idp\">Notes"; - print "[idp&action=edit\">Editer]"; + print "idp\">Notes"; + print "[idp&action=edit\">Editer]"; } print ""; /* @@ -211,14 +211,14 @@ if ($socid > 0) { if ( $db->query($sql) ) { $num = $db->num_rows(); if ($num >0 ) { - print "idp\">Liste des propales ($num)"; + print "idp\">Liste des propales ($num)"; } $i = 0; $now = time(); $lim = 3600 * 24 * 15 ; while ($i < $num && $i < 4) { $objp = $db->fetch_object( $i); $var=!$var; print ""; - print "propalid\">$objp->ref\n"; + print "propalid\">$objp->ref\n"; if ( ($now - $objp->dp) > $lim && $objp->statutid == 1 ) { print " > 15 jours"; } @@ -274,7 +274,7 @@ if ($socid > 0) { print '-'; if (defined("MAIN_MODULE_PROPALE") && MAIN_MODULE_PROPALE && $user->rights->propale->creer) { - print "idp&action=create\">Créer une proposition"; + print "idp&action=create\">Créer une proposition"; } else { @@ -314,7 +314,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); @@ -327,7 +327,7 @@ if ($socid > 0) { print ''; - print ''.$obj->firstname.' '. $obj->name.' '; + print ''.$obj->firstname.' '. $obj->name.' '; if ($obj->note) { @@ -335,10 +335,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; @@ -353,7 +353,7 @@ if ($socid > 0) { * */ print ''; - print ''; + print ''; print ''; print ''; + print ''; } else { - print ''; + print ''; } /* * Contact pour cette action @@ -408,13 +408,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++; } @@ -485,11 +485,11 @@ if ($socid > 0) { if ($obj->propalrowid) { - print ''; + print ''; } else { - print ''; + print ''; } /* * Contact pour cette action @@ -499,7 +499,7 @@ if ($socid > 0) { { $contact = new Contact($db); $contact->fetch($obj->fk_contact); - print ''; + print ''; } else { @@ -507,7 +507,7 @@ if ($socid > 0) { } /* */ - print ''; + print ''; print "\n"; $i++; } diff --git a/htdocs/lib/functions.inc.php3 b/htdocs/lib/functions.inc.php similarity index 100% rename from htdocs/lib/functions.inc.php3 rename to htdocs/lib/functions.inc.php diff --git a/htdocs/lib/webcal.class.php3 b/htdocs/lib/webcal.class.php similarity index 100% rename from htdocs/lib/webcal.class.php3 rename to htdocs/lib/webcal.class.php diff --git a/htdocs/public/error-404.php3 b/htdocs/public/error-404.php similarity index 100% rename from htdocs/public/error-404.php3 rename to htdocs/public/error-404.php
Actions à faire [Nouvelle action]
Actions à faire [Nouvelle action]
'; @@ -395,11 +395,11 @@ if ($socid > 0) { if ($obj->propalrowid) { - print ''.$obj->libelle.''.$obj->libelle.''.$obj->libelle.''.$obj->libelle.''.$contact->fullname.''.$contact->fullname.' '.$obj->code.''.$obj->code.'
'.$obj->libelle.''.$obj->libelle.''.$obj->libelle.''.$obj->libelle.''.$contact->fullname.''.$contact->fullname.''.$obj->code.''.$obj->code.'