diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index 7e743d807d7..1d38199147c 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -189,7 +189,7 @@ $head = member_prepare_head($adh); dol_fiche_head($head, 'subscription', $langs->trans("Member")); print '
'; -print ''; +print ''; print ''; // Ref @@ -378,7 +378,7 @@ if ($action == 'addsubscription' && $user->rights->adherent->cotisation->creer) print "\n\n\n"; print ''; - print ''; + print ''; print ''; print ''; print "
\n"; diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php index 87e3fd88ef6..db622b2cb5d 100644 --- a/htdocs/adherents/cotisations.php +++ b/htdocs/adherents/cotisations.php @@ -212,7 +212,7 @@ if ($result) if ($allowinsertbankafter && ! $objp->fk_account && $conf->banque->enabled && $conf->global->ADHERENT_BANK_USE && $objp->cotisation) { print ""; - print ''; + print ''; } print ""; diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 5e6a78826f7..39593d8226d 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -596,7 +596,7 @@ if ($action == 'edit') if ($conf->societe->enabled) $rowspan++; print ''; - print ''; + print ''; print ""; print ""; print "statut."\">"; @@ -741,7 +741,7 @@ if ($action == 'create') print_fiche_titre($langs->trans("NewMember")); print ''; - print ''; + print ''; print ''; print '
'; @@ -982,7 +982,7 @@ if ($rowid && $action != 'edit') if ($conf->societe->enabled) $rowspan++; print ''; - print ''; + print ''; print '
'; // Ref diff --git a/htdocs/adherents/fiche_subscription.php b/htdocs/adherents/fiche_subscription.php index 0a4524141cf..884240845e9 100644 --- a/htdocs/adherents/fiche_subscription.php +++ b/htdocs/adherents/fiche_subscription.php @@ -191,7 +191,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') print "\n"; print ''; - print ''; + print ''; print ""; print ""; print "fk_bank."\">"; @@ -303,7 +303,7 @@ if ($rowid && $action != 'edit') } print ''; - print ''; + print ''; print '
'; // Ref diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 56152b6b3f7..5a8834b6743 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -119,7 +119,7 @@ print '
'; // Formulaire recherche adherent print ''; -print ''; +print ''; print ''; print ''; print ''; diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index 0f62498bb64..727dc3ed899 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -82,7 +82,7 @@ if ($id) if ($msg) print '
'.$msg.'
'; print ""; - print ''; + print ''; print '
'; diff --git a/htdocs/adherents/options.php b/htdocs/adherents/options.php index 0ae2b94b391..41fb51dc38a 100644 --- a/htdocs/adherents/options.php +++ b/htdocs/adherents/options.php @@ -165,7 +165,7 @@ if ($_GET["action"] == 'create') print_titre($langs->trans('NewAttribute')); print ''; - print ''; + print ''; print '
'; print ''; @@ -201,7 +201,7 @@ if ($_GET["attrname"] && $_GET["action"] == 'edit') * formulaire d'edition */ print ''; - print ''; + print ''; print ''; print ''; print '
'; diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index f3a230014ad..68cbc325257 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -197,7 +197,7 @@ if ($_GET["action"] == 'create') if ($mesg) print '
'.$mesg.'
'; print ""; - print ''; + print ''; print '
'; print ''; @@ -333,7 +333,7 @@ if ($rowid > 0) print ''; - print ''; + print ''; print ''; print ''; print '
'; diff --git a/htdocs/admin/adherent.php b/htdocs/admin/adherent.php index ecc1e3157ac..fc45ea664f2 100644 --- a/htdocs/admin/adherent.php +++ b/htdocs/admin/adherent.php @@ -98,7 +98,7 @@ $form = new Form($db); // Mail required for members $var=!$var; print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -112,7 +112,7 @@ print ''; // Send mail information is on by default $var=!$var; print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -129,7 +129,7 @@ print ''; // Insertion cotisations dans compte financier $var=!$var; print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -272,7 +272,7 @@ $constantes=array( $obj = $db->fetch_object($result); $var=!$var; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php index 4a4ba6e182a..ed714f58ba8 100644 --- a/htdocs/admin/agenda.php +++ b/htdocs/admin/agenda.php @@ -102,7 +102,7 @@ dol_fiche_head($head, 'autoactions', $langs->trans("Agenda")); print ''; -print ''; +print ''; print ''; $var=true; diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php index b4c09a568f0..7414793a9ea 100644 --- a/htdocs/admin/agenda_xcal.php +++ b/htdocs/admin/agenda_xcal.php @@ -81,7 +81,7 @@ dol_fiche_head($head, 'xcal', $langs->trans("Agenda")); print ''; -print ''; +print ''; print "
"; print ""; diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index 28c1384280f..cad405e9ade 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -230,7 +230,7 @@ if (!isset($_ENV['windir']) && !file_exists($_ENV['windir'])) { $var=!$var; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -252,7 +252,7 @@ if ($conf->societe->enabled) { $var=!$var; print ""; - print ''; + print ''; print ""; print ""; print ''; @@ -270,7 +270,7 @@ if ($conf->produit->enabled) { $var=!$var; print ""; - print ''; + print ''; print ""; print ""; print ''; diff --git a/htdocs/admin/bookmark.php b/htdocs/admin/bookmark.php index c5198220a12..e58d0941cc3 100644 --- a/htdocs/admin/bookmark.php +++ b/htdocs/admin/bookmark.php @@ -63,7 +63,7 @@ if ($mesg) print '
'.$mesg; print '
'; print ''; -print ''; +print ''; print ''; $var=true; diff --git a/htdocs/admin/boutique.php b/htdocs/admin/boutique.php index 7e67d444dfc..17fe1e14ff5 100644 --- a/htdocs/admin/boutique.php +++ b/htdocs/admin/boutique.php @@ -139,7 +139,7 @@ print '
'; $var=true; print ''; -print ''; +print ''; print "
'.$langs->trans("GenbarcodeLocation").'
'.$langs->trans("SetDefaultBarcodeTypeProducts").'
'.$langs->trans("SetDefaultBarcodeTypeThirdParties").'
"; print ""; print ""; diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index a16ce4d8138..1c02dbeb75a 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -276,7 +276,7 @@ if ($resql) $var = ! $var; print ''; - print ''; + print ''; $logo=eregi_replace("^object_","",$box->boximg); print ''; print ''; @@ -389,7 +389,7 @@ print '
".$langs->trans("Parameter")."
'.img_object("",$logo).' '.$box->boxlabel.'
'; $var=false; print ''; -print ''; +print ''; print ''; print "\n"; diff --git a/htdocs/admin/cashdesk.php b/htdocs/admin/cashdesk.php index 40021595071..d0073539081 100644 --- a/htdocs/admin/cashdesk.php +++ b/htdocs/admin/cashdesk.php @@ -69,7 +69,7 @@ print '
'; // Mode $var=true; print ''; -print ''; +print ''; print ''; print '
"; print $langs->trans("MaxNbOfLinesForBoxes")."
'; diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php index a9d82aa30e4..4f07bc3df1f 100644 --- a/htdocs/admin/clicktodial.php +++ b/htdocs/admin/clicktodial.php @@ -63,7 +63,7 @@ if ($mesg) print '
'.$mesg; print '
'; print ''; -print ''; +print ''; print ''; $var=true; diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 73b03016f65..d151fd62934 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -422,7 +422,7 @@ $var=true; /* $var=! $var; print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -436,7 +436,7 @@ print ''; /* $var=! $var; print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -449,7 +449,7 @@ print ''; // Utiliser le contact de la commande dans le document $var=! $var; print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -460,7 +460,7 @@ print ''; $var=! $var; print ''; -print ''; +print ''; print ''; print '
'.$langs->trans("ValidOrderAfterPropalClosed").'
'.$langs->trans("AddDeliveryCostLine").'
'.$langs->trans("UseCustomerContactAsOrderRecipientIfExist").'
'; print $langs->trans("FreeLegalTextOnOrders").'
'; @@ -473,7 +473,7 @@ print ''; //Use draft Watermark $var=!$var; print "
"; -print ''; +print ''; print ""; print '
'; print $langs->trans("WatermarkOnDraftOrders").'
'; diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index da1c5795333..fe133d0205a 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -211,7 +211,7 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit') */ print ''; - print ''; + print ''; print ''; $var=true; @@ -577,7 +577,7 @@ else // Identifiants de la société (propre au pays) print ''; - print ''; + print ''; print ''; print ''; $var=true; diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index 4a1f56cf298..ba3be3ed10b 100644 --- a/htdocs/admin/compta.php +++ b/htdocs/admin/compta.php @@ -86,7 +86,7 @@ print '
'.$langs->trans("CompanyIds").''.$langs->trans("Value").'
'; // Cas du parametre COMPTA_MODE print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -142,7 +142,7 @@ if ($result) $var=!$var; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/admin/comptaexpert.php b/htdocs/admin/comptaexpert.php index 08d37978563..d8d86a526b8 100644 --- a/htdocs/admin/comptaexpert.php +++ b/htdocs/admin/comptaexpert.php @@ -87,7 +87,7 @@ print '
'.$langs->trans('OptionMode').''.$langs->trans('Description').'
'; // Cas du param�tre COMPTA_MODE print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -129,7 +129,7 @@ if ($result) $var=!$var; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php index e412f64061f..6d853247078 100644 --- a/htdocs/admin/confexped.php +++ b/htdocs/admin/confexped.php @@ -107,7 +107,7 @@ $var=true; // expedition activation/desactivation $var=!$var; print ""; -print ''; +print ''; print '
'.$langs->trans('OptionMode').''.$langs->trans('Description').'
'; print ''; print ''; @@ -144,7 +144,7 @@ print ''; // Bon de livraison activation/desactivation $var=!$var; print ""; -print ''; +print ''; print '
'.$langs->trans("Feature").'
'; print ""; print ""; diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index 83f9bf5e16b..8486d8b6949 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -77,7 +77,7 @@ $form = new Form($db); # Affiche ligne d'ajout $var=false; print ''; -print ''; +print ''; print ''; print "\n"; @@ -135,7 +135,7 @@ if ($result) print "\n"; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php index c9e1f2d9a34..7e7c948affa 100644 --- a/htdocs/admin/delais.php +++ b/htdocs/admin/delais.php @@ -74,7 +74,7 @@ $countrynotdefined=''.$langs->trans("ErrorSetACountryFirst") if ((isset($_GET["action"]) && $_GET["action"] == 'edit')) { print ''; - print ''; + print ''; print ''; $var=true; diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 5438d565bad..7b08258bf3b 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -485,7 +485,7 @@ if ($_GET["id"]) $fieldlist=split(',',$tabfield[$_GET["id"]]); print ''; - print ''; + print ''; print '
'; // Ligne d'ajout @@ -607,7 +607,7 @@ if ($_GET["id"]) if ($_GET["action"] == 'modify' && ($_GET["rowid"] == ($obj->rowid?$obj->rowid:$obj->code))) { print ''; - print ''; + print ''; print ''; print ''; fieldList($fieldlist,$obj); diff --git a/htdocs/admin/droitpret.php b/htdocs/admin/droitpret.php index 9a0b6a50e7f..bba3e290367 100644 --- a/htdocs/admin/droitpret.php +++ b/htdocs/admin/droitpret.php @@ -83,7 +83,7 @@ $form = new Form($db); // Categorie $var=!$var; print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -100,7 +100,7 @@ print ''; // Adresse destination $var=!$var; print '
'; -print ''; +print ''; print ''; print ''; print ''; diff --git a/htdocs/admin/editeur.php b/htdocs/admin/editeur.php index 0d70bcb620a..d5385e3b139 100644 --- a/htdocs/admin/editeur.php +++ b/htdocs/admin/editeur.php @@ -68,7 +68,7 @@ print_fiche_titre($langs->trans("Configuration du module Editeur"),$linkback,'se print '
'; print ''; -print ''; +print ''; print '
'; print ''; diff --git a/htdocs/admin/energie.php b/htdocs/admin/energie.php index b0757c9a20a..f8b67b6021c 100644 --- a/htdocs/admin/energie.php +++ b/htdocs/admin/energie.php @@ -50,7 +50,7 @@ print_fiche_titre($langs->trans("Energy"),$linkback,'setup'); print '
'; print ''; -print ''; +print ''; print ''; print '
'; print ''; diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php index f643c0e061f..98428f9abcc 100644 --- a/htdocs/admin/events.php +++ b/htdocs/admin/events.php @@ -116,7 +116,7 @@ dol_fiche_head($head, 'audit', $langs->trans("Security")); print ''; -print ''; +print ''; print ''; $var=true; diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php index b6a63afea69..5f1cf86130b 100644 --- a/htdocs/admin/external_rss.php +++ b/htdocs/admin/external_rss.php @@ -189,7 +189,7 @@ print '
'; // Formulaire ajout print ''; -print ''; +print ''; print '
'; print ''; @@ -252,7 +252,7 @@ if ($resql) // print_r($rss->items); print ""; - print ''; + print ''; print ""; print ""; diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 180d8a71a9d..5aa969bc833 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -470,7 +470,7 @@ print '
'; print_titre($langs->trans("SuggestedPaymentModesIfNotDefinedInInvoice")); print ''; -print ''; +print ''; print '
".$langs->trans("RSS")." ".($i+1)."
'; $var=True; @@ -572,7 +572,7 @@ $var=true; // Force date validation $var=! $var; print ''; -print ''; +print ''; print ''; print '
'; print $langs->trans("ForceInvoiceDate"); @@ -586,7 +586,7 @@ print ''; // Active la possibilite d'editer/supprimer une facture validee sans paiement $var=! $var; print '
'; -print ''; +print ''; print ''; print '
'; print $langs->trans("EnableEditDeleteValidInvoice"); @@ -599,7 +599,7 @@ print ''; $var=! $var; print '
'; -print ''; +print ''; print ''; print '
'; print $langs->trans("UsBillingContactAsIncoiveRecipientIfExist"); @@ -612,7 +612,7 @@ print ''; $var=! $var; print '
'; -print ''; +print ''; print ''; print '
'; print $langs->trans("FreeLegalTextOnInvoices").'
'; @@ -624,7 +624,7 @@ print ''; $var=!$var; print "
"; -print ''; +print ''; print ""; print '
'; print $langs->trans("WatermarkOnDraftBill").'
'; diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index 9332fc29ba9..42de414d426 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -390,7 +390,7 @@ $var=true; //Use draft Watermark $var=!$var; print ""; -print ''; +print ''; print ""; print '
'; print $langs->trans("WatermarkOnDraftInterventionCards").'
'; diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index b4d0418227a..ec6f8daff11 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -103,7 +103,7 @@ print "
\n"; if (isset($_GET["action"]) && $_GET["action"] == 'edit') { print ''; - print ''; + print ''; print ''; clearstatcache(); diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php index 93a8b361fc3..c9a7c4ce077 100644 --- a/htdocs/admin/ldap.php +++ b/htdocs/admin/ldap.php @@ -96,7 +96,7 @@ $html=new Form($db); print ''; -print ''; +print ''; print ''; diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php index 86a48c095b4..93ba92dd706 100644 --- a/htdocs/admin/ldap_contacts.php +++ b/htdocs/admin/ldap_contacts.php @@ -97,7 +97,7 @@ print $langs->trans("LDAPDescContact").'
'; print '
'; print ''; -print ''; +print ''; $html=new Form($db); diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php index b1dde21cf08..29fbd83f528 100644 --- a/htdocs/admin/ldap_groups.php +++ b/htdocs/admin/ldap_groups.php @@ -89,7 +89,7 @@ print '
'; print ''; -print ''; +print ''; $html=new Form($db); diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php index 162cf5a3873..503d1f041e2 100644 --- a/htdocs/admin/ldap_members.php +++ b/htdocs/admin/ldap_members.php @@ -112,7 +112,7 @@ print '
'; print ''; -print ''; +print ''; $html=new Form($db); diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php index 584f3ddb73f..f181543f4c1 100644 --- a/htdocs/admin/ldap_users.php +++ b/htdocs/admin/ldap_users.php @@ -100,7 +100,7 @@ print '
'; print ''; -print ''; +print ''; $html=new Form($db); diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index a7cefb6faab..b4ae08a56ae 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -71,7 +71,7 @@ if ($mesg) print $mesg.'
'; if (isset($_GET["action"]) && $_GET["action"] == 'edit') { print ''; - print ''; + print ''; print ''; clearstatcache(); diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index 8f71d13d8f6..7e4b3f8c8f5 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -420,7 +420,7 @@ $var=true; $var=! $var; print ''; -print ''; +print ''; print ''; print '
'; print $langs->trans("FreeLegalTextOnDeliveryReceipts").'
'; diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php index bc1c1d0f728..3365533188d 100644 --- a/htdocs/admin/mailing.php +++ b/htdocs/admin/mailing.php @@ -63,7 +63,7 @@ if ($mesg) print '
'.$mesg; print '
'; print ''; -print ''; +print ''; print ''; $var=true; diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 7d77bf486e1..f084b3c487e 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -205,7 +205,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') $html=new Form($db); print ''; - print ''; + print ''; print ''; clearstatcache(); diff --git a/htdocs/admin/mantis.php b/htdocs/admin/mantis.php index ab587561133..442360d6bf6 100644 --- a/htdocs/admin/mantis.php +++ b/htdocs/admin/mantis.php @@ -137,7 +137,7 @@ print '
'; print ''; -print ''; +print ''; print ""; print ""; diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php index 08d47aa3b32..a56a2adcb4f 100644 --- a/htdocs/admin/menus.php +++ b/htdocs/admin/menus.php @@ -113,7 +113,7 @@ dol_fiche_head($head, 'handler', $langs->trans("Menus")); if (isset($_GET["action"]) && $_GET["action"] == 'edit') { print ''; - print ''; + print ''; print ''; clearstatcache(); diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index fb7d0e672b0..67102c60808 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -294,7 +294,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'create') else print '
'; print ''; - print ''; + print ''; print '
'; @@ -399,7 +399,7 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit') print '
'; print ''; - print ''; + print ''; print ''; print '
'; @@ -517,7 +517,7 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit') // Ajout de contraintes personalisees print ''; - print ''; + print ''; print ''; print ''; @@ -531,7 +531,7 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit') // Ajout de contraintes predefinis print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php index 01942db469e..21e49683a5f 100644 --- a/htdocs/admin/notification.php +++ b/htdocs/admin/notification.php @@ -65,7 +65,7 @@ if ($mesg) print '
'.$mesg; print '
'; print ''; -print ''; +print ''; print ''; $var=true; diff --git a/htdocs/admin/paybox.php b/htdocs/admin/paybox.php index 7848b5f9786..c232f2cc787 100644 --- a/htdocs/admin/paybox.php +++ b/htdocs/admin/paybox.php @@ -80,7 +80,7 @@ if ($mesg) print '
'.$mesg; print '
'; print ''; -print ''; +print ''; print ''; $var=true; diff --git a/htdocs/admin/phenix.php b/htdocs/admin/phenix.php index 45a4db865da..c16164e4757 100644 --- a/htdocs/admin/phenix.php +++ b/htdocs/admin/phenix.php @@ -159,7 +159,7 @@ print '
'; print ''; -print ''; +print ''; print "
"; print ""; diff --git a/htdocs/admin/produit.php b/htdocs/admin/produit.php index 7b280a15dba..df924f13a9b 100644 --- a/htdocs/admin/produit.php +++ b/htdocs/admin/produit.php @@ -164,7 +164,7 @@ print " \n"; // multiprix activation/desactivation $var=!$var; print ""; -print ''; +print ''; print ""; print ""; print ''; @@ -182,7 +182,7 @@ if($conf->global->PRODUIT_MULTIPRICES) { $var=!$var; print ""; - print ''; + print ''; print ""; print ""; print ''; @@ -195,7 +195,7 @@ if($conf->global->PRODUIT_MULTIPRICES) // sousproduits activation/desactivation $var=!$var; print ""; -print ''; +print ''; print ""; print ""; print ''; @@ -210,7 +210,7 @@ print ''; // utilisation formulaire Ajax sur choix produit $var=!$var; print ""; -print ''; +print ''; print ""; print ""; print ''; @@ -235,7 +235,7 @@ if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) { $var=!$var; print ""; - print ''; + print ''; print ""; print ""; print ''; @@ -248,7 +248,7 @@ if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) // Visualiser description produit dans les formulaires activation/desactivation $var=!$var; print ""; -print ''; +print ''; print ""; print ""; print ''; @@ -264,7 +264,7 @@ print ''; /* $var=!$var; print ""; -print ''; +print ''; print ""; print ""; print ''; @@ -280,7 +280,7 @@ print ''; // Utilisation de l'ecotaxe $var=!$var; print ""; -print ''; +print ''; print ""; print ""; print ''; diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php index bbd61bdae55..8a0bb3fd9d5 100644 --- a/htdocs/admin/propale.php +++ b/htdocs/admin/propale.php @@ -426,7 +426,7 @@ print ""; $var=!$var; print ""; -print ''; +print ''; print ""; print ""; print ''; @@ -437,7 +437,7 @@ print ''; $var=! $var; print ''; -print ''; +print ''; print ''; print '"; print ''; @@ -466,7 +466,7 @@ if ($conf->commande->enabled) $var=! $var; print ''; -print ''; +print ''; print ''; print '
 
'.$langs->trans("MultiPricesAbility").'
'.$langs->trans("MultiPricesNumPrices").'
'.$langs->trans("AssociatedProductsAbility").'
'.$langs->trans("UseSearchToSelectProduct").'
'.$langs->trans("NumberOfProductShowInSelect").'
'.$langs->trans("ViewProductDescInFormAbility").'
'.$langs->trans("ConfirmDeleteProductLineAbility").'
'.$langs->trans("UseEcoTaxeAbility").'
'.$langs->trans("DefaultProposalDurationValidity").'
'; print $langs->trans("UseCustomerContactAsPropalRecipientIfExist"); @@ -452,7 +452,7 @@ if ($conf->commande->enabled) { $var=!$var; print ""; - print ''; + print ''; print ""; print "
'.$langs->trans("ClassifiedInvoicedWithOrder").'
'; print $langs->trans("FreeLegalTextOnProposal").'
'; @@ -478,7 +478,7 @@ print ''; $var=!$var; print "
"; -print ''; +print ''; print ""; print '
'; print $langs->trans("WatermarkOnDraftProposal").'
'; diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php index 1c2660233dc..7b47e653c1c 100644 --- a/htdocs/admin/security.php +++ b/htdocs/admin/security.php @@ -178,7 +178,7 @@ $html = new Form($db); // Choix du gestionnaire du générateur de mot de passe print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -249,7 +249,7 @@ print '
'; $var=true; print ""; -print ''; +print ''; print ""; print ''; diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index 5dcf5b056c4..84e9cdef80e 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -120,7 +120,7 @@ print "\n"; print ''; -print ''; +print ''; print ''; print ''; $var=!$var; print ''; -print ''; +print ''; print ''; print ''; $var=!$var; if (empty($conf->global->MAIN_SESSION_TIMEOUT)) $conf->global->MAIN_SESSION_TIMEOUT=ini_get("session.gc_maxlifetime"); print ''; -print ''; +print ''; print ''; print '\n"; // Utilisation formulaire Ajax sur choix societe $var=!$var; print ""; -print ''; +print ''; print ""; print ""; print ''; diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index 3b4801aad55..994f44a643f 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -134,7 +134,7 @@ print ""; print ''; print ''; print ''; print ''; print ''; print ''; print '
'.$langs->trans("MaxSizeForUploadedFiles").'.'; $max=@ini_get('upload_max_filesize'); @@ -137,7 +137,7 @@ print '
'.$langs->trans("UMask").''; print $form->textwithpicto('',$langs->trans("UMaskExplanation")); @@ -153,7 +153,7 @@ print '
'.$langs->trans("SessionTimeOut").''; print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor"))); diff --git a/htdocs/admin/societe.php b/htdocs/admin/societe.php index d97114c3468..317a8ee7bf6 100644 --- a/htdocs/admin/societe.php +++ b/htdocs/admin/societe.php @@ -240,7 +240,7 @@ print "  
'.$langs->trans("UseSearchToSelectCompany").'
'.$langs->trans("UserWarehouse").''; print ""; -print ''; +print ''; print ""; print $html->selectyesno("STOCK_USERSTOCK",$conf->global->STOCK_USERSTOCK,1); print ''; @@ -149,7 +149,7 @@ if ($conf->global->STOCK_USERSTOCK == 1) print ''; print ""; - print ''; + print ''; print ""; print $html->selectyesno("STOCK_USERSTOCK_AUTOCREATE",$conf->global->STOCK_USERSTOCK_AUTOCREATE,1); @@ -174,7 +174,7 @@ if ($conf->facture->enabled) print ''.$langs->trans("DeStockOnBill").''; print ""; - print ''; + print ''; print ""; print $html->selectyesno("STOCK_CALCULATE_ON_BILL",$conf->global->STOCK_CALCULATE_ON_BILL,1); print ''; @@ -188,7 +188,7 @@ if ($conf->commande->enabled) print ''.$langs->trans("DeStockOnValidateOrder").''; print ""; - print ''; + print ''; print ""; print $html->selectyesno("STOCK_CALCULATE_ON_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER,1); print ''; @@ -202,7 +202,7 @@ if ($conf->expedition->enabled) print ''.$langs->trans("DeStockOnShipment").''; print ""; - print ''; + print ''; print ""; print $html->selectyesno("STOCK_CALCULATE_ON_SHIPMENT",$conf->global->STOCK_CALCULATE_ON_SHIPMENT,1); print ''; @@ -224,7 +224,7 @@ if ($conf->fournisseur->enabled) print ''.$langs->trans("ReStockOnBill").''; print ""; - print ''; + print ''; print ""; print $html->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_BILL",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL,1); print ''; @@ -238,7 +238,7 @@ if ($conf->commande->enabled) print ''.$langs->trans("ReStockOnValidateOrder").''; print ""; - print ''; + print ''; print ""; print $html->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER,1); print ''; diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index 38fff5d961f..f33e5e6ac96 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -115,7 +115,7 @@ print_titre($langs->trans("SyslogOutput")); // Mode print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -141,7 +141,7 @@ print "\n"; // Level print ''; -print ''; +print ''; print ''; print '
'; print ''; diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php index 14b4d799cc9..f5f743174f1 100644 --- a/htdocs/admin/taxes.php +++ b/htdocs/admin/taxes.php @@ -84,7 +84,7 @@ print '
'; // Cas du parametre TAX_MODE print ''; -print ''; +print ''; print ''; print ''; print ''; diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index 0a64b249e77..86d3d4db387 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -66,7 +66,7 @@ if ($_GET["msg"]) - + diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php index aa7fc0fc954..2ff2ad2b523 100644 --- a/htdocs/admin/tools/eaccelerator.php +++ b/htdocs/admin/tools/eaccelerator.php @@ -254,7 +254,7 @@ if (is_array($resCached) || is_array($resRemoved)) { print "
"; print ''; - print ''; + print ''; print '
'.$langs->trans('OptionVatMode').''.$langs->trans('Description').'
'; print ''; diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php index 691b7e495da..8529f855cc1 100644 --- a/htdocs/admin/tools/purge.php +++ b/htdocs/admin/tools/purge.php @@ -105,7 +105,7 @@ if ($message) } print ''; -print ''; +print ''; print ''; diff --git a/htdocs/admin/webcalendar.php b/htdocs/admin/webcalendar.php index 11a1d96458b..77c88f79fcd 100644 --- a/htdocs/admin/webcalendar.php +++ b/htdocs/admin/webcalendar.php @@ -157,7 +157,7 @@ print '
'; print ''; -print ''; +print ''; print "
Actions
"; print ""; diff --git a/htdocs/admin/webservices.php b/htdocs/admin/webservices.php index 1beffb9dd64..aee7f810bb3 100644 --- a/htdocs/admin/webservices.php +++ b/htdocs/admin/webservices.php @@ -64,7 +64,7 @@ if ($mesg) print '
'.$mesg; /* print '
'; print ''; -print ''; +print ''; print ''; $var=true; diff --git a/htdocs/bookmarks/fiche.php b/htdocs/bookmarks/fiche.php index 02a84ef9f4b..9e0cf9a2a67 100644 --- a/htdocs/bookmarks/fiche.php +++ b/htdocs/bookmarks/fiche.php @@ -134,7 +134,7 @@ if ($action == 'create') */ print ''."\n"; - print ''; + print ''; print ''; print_fiche_titre($langs->trans("NewBookmark")); @@ -181,7 +181,7 @@ if ($_GET["id"] > 0 && ! eregi('^add',$_GET["action"])) if ($_GET["action"] == 'edit') { print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/boutique/notification/fiche.php b/htdocs/boutique/notification/fiche.php index 7bb56a73b73..8fc6edf5038 100644 --- a/htdocs/boutique/notification/fiche.php +++ b/htdocs/boutique/notification/fiche.php @@ -62,7 +62,7 @@ if ($action == 'create') { print "\n"; - print ''; + print ''; print ''; print '
Nouvel Editeur

'; @@ -91,7 +91,7 @@ else print '
Edition de la fiche Editeur : '.$editeur->titre.'

'; print "\n"; - print ''; + print ''; print ''; print '
'; diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php index e1120251347..0bde50e0785 100644 --- a/htdocs/cashdesk/index.php +++ b/htdocs/cashdesk/index.php @@ -63,25 +63,22 @@ if ( $_SESSION['uid'] > 0 ) {
- + - +
Nom d'utilisateur
Mot de passe
- + diff --git a/htdocs/cashdesk/templates/facturation1.tpl.php b/htdocs/cashdesk/templates/facturation1.tpl.php index 9e9d2d11433..0173030cda5 100644 --- a/htdocs/cashdesk/templates/facturation1.tpl.php +++ b/htdocs/cashdesk/templates/facturation1.tpl.php @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Article
- + @@ -104,7 +104,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- + @@ -147,7 +147,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - +
Différence
QuantitéStockPrix unitaireTaux TVARemise (%)Prix total
diff --git a/htdocs/cashdesk/templates/validation1.tpl.php b/htdocs/cashdesk/templates/validation1.tpl.php index 199f40774fb..bb190a26911 100644 --- a/htdocs/cashdesk/templates/validation1.tpl.php +++ b/htdocs/cashdesk/templates/validation1.tpl.php @@ -62,7 +62,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Montant dûEncaisséRendu
- +

Notes

diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 11f75c4f3e5..d7454eb9ab3 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -284,7 +284,7 @@ function formCategory($db,$object,$type,$typeid) print '
'; print_fiche_titre($title,'',''); print ''; - print ''; + print ''; print ''; print ''; print '
'; diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php index 42a5aace8f9..495cff0d9bd 100644 --- a/htdocs/categories/edit.php +++ b/htdocs/categories/edit.php @@ -114,7 +114,7 @@ print '
'; print "\n"; print ''; -print ''; +print ''; print ''; print ''; print ''; diff --git a/htdocs/categories/fiche.php b/htdocs/categories/fiche.php index 6ef76012192..c5baf00209f 100644 --- a/htdocs/categories/fiche.php +++ b/htdocs/categories/fiche.php @@ -179,7 +179,7 @@ if ($user->rights->categorie->creer) print ''; } print ''; - print ''; + print ''; print ''; print ''; //print ''; Mis dans origin diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index 2671c53c10e..5d0e02714f2 100644 --- a/htdocs/categories/index.php +++ b/htdocs/categories/index.php @@ -62,7 +62,7 @@ print '
'; * Zone recherche produit/service */ print ''; -print ''; +print ''; print ''; print ''; print ''; diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 0e3e8b6c61e..d6286b62cee 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -438,7 +438,7 @@ if ($_GET["action"] == 'create') } print ''; - print ''; + print ''; print ''; if (! empty($_REQUEST["backtopage"])) print ''; @@ -652,7 +652,7 @@ if ($_GET["id"]) { // Fiche action en mode edition print ''; - print ''; + print ''; print ''; print ''; if (! empty($_REQUEST["backtopage"])) print ''; diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index d736175b52e..38a2328a9ab 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -161,7 +161,7 @@ print_fiche_titre($title,$nav); if ($canedit) { print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 0fb1127828b..836382aae5a 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -177,7 +177,7 @@ if ($resql) if ($canedit) { print ''; - print ''; + print ''; print ''; print ''; print '
'; diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index 07165e4ed09..d5c19d4b500 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -99,7 +99,7 @@ if ($_GET["action"] == 'create') } print "id."\" method=\"post\">"; - print ''; + print ''; print ""; print '
'; diff --git a/htdocs/comm/adresse_livraison.php b/htdocs/comm/adresse_livraison.php index 3c59386289a..5cabc37518a 100644 --- a/htdocs/comm/adresse_livraison.php +++ b/htdocs/comm/adresse_livraison.php @@ -214,7 +214,7 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create') } print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -319,7 +319,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit') } print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 0930ae5e132..745bae14549 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -104,7 +104,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire) { $var=false; print ''; - print ''; + print ''; print '
'; print ''; print ''; @@ -123,7 +123,7 @@ if ($conf->contrat->enabled && $user->rights->contrat->lire) { $var=false; print ''; - print ''; + print ''; print '
'.$langs->trans("SearchAProposal").'
'; print ''; print ''; diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 7b723da0320..da8a871a1dd 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -254,7 +254,7 @@ if ($mil->fetch($_REQUEST["id"]) >= 0) if ($mil->statut == 0) { print ''; - print ''; + print ''; } print '
'.$langs->trans("SearchAContract").'
'; @@ -313,7 +313,7 @@ if ($mil->fetch($_REQUEST["id"]) >= 0) print '
'; print ''; - print ''; + print ''; print_titre($langs->trans("ToClearAllRecipientsClickHere")); print ''; print ''; @@ -329,7 +329,7 @@ if ($mil->fetch($_REQUEST["id"]) >= 0) // List of selected targets print "\n\n"; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 2215cda898a..9006807829a 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -466,7 +466,7 @@ if ($_GET["action"] == 'create') { // EMailing in creation mode print ''."\n"; - print ''; + print ''; print ''; print_fiche_titre($langs->trans("NewMailing")); @@ -738,7 +738,7 @@ else * Mailing en mode edition */ print ''."\n"; - print ''; + print ''; print ''; print ''; print '
'; diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index 4005f169b40..2cd521cf70e 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -50,7 +50,7 @@ print '
'; // Recherche emails $var=false; print ''; -print ''; +print ''; print ''; print ''; print '
'.$langs->trans("SearchAMailing").'
'; diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index 510a26ee481..51e11299bfe 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -86,7 +86,7 @@ if ($_socid > 0) print ''; - print ''; + print ''; print ''; print ''; print '
'; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 2718169d1b1..cdd65dad6cc 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -974,7 +974,7 @@ if ($id > 0 || ! empty($ref)) if ($user->rights->propale->creer && $_GET['action'] == 'refclient') { print ''; - print ''; + print ''; print ''; print ''; print ' '; @@ -1035,7 +1035,7 @@ if ($id > 0 || ! empty($ref)) if ($propal->brouillon && $_GET['action'] == 'editdate') { print ''; - print ''; + print ''; print ''; $html->select_date($propal->date,'re','','',0,"editdate"); print ''; @@ -1073,7 +1073,7 @@ if ($id > 0 || ! empty($ref)) if ($propal->brouillon && $_GET['action'] == 'editecheance') { print ''; - print ''; + print ''; print ''; $html->select_date($propal->fin_validite,'ech','','','',"editecheance"); print ''; @@ -1106,7 +1106,7 @@ if ($id > 0 || ! empty($ref)) if ($_GET['action'] == 'editdate_livraison') { print ''; - print ''; + print ''; print ''; $html->select_date($propal->date_livraison,'liv_','','','',"editdate_livraison"); print ''; @@ -1363,7 +1363,7 @@ if ($id > 0 || ! empty($ref)) if ($conf->global->PRODUIT_USE_MARKUP && $conf->use_javascript_ajax) { $formMarkup = ''."\n"; - $formMarkup.= ''."\n"; + $formMarkup.= ''."\n"; $formMarkup.= ''."\n"; if ($objp->fk_product > 0) { @@ -1499,7 +1499,7 @@ if ($id > 0 || ! empty($ref)) if ($propal->statut == 0 && $_GET["action"] == 'editline' && $user->rights->propale->creer && $_GET["lineid"] == $objp->rowid) { print 'rowid.'" method="post">'; - print ''; + print ''; print ''; print ''; print ''; @@ -1600,7 +1600,7 @@ if ($id > 0 || ! empty($ref)) // Add free products/services form print ''; - print ''; + print ''; print ''; print ''; @@ -1665,7 +1665,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; @@ -1718,7 +1718,7 @@ if ($id > 0 || ! empty($ref)) * Formulaire cloture (signe ou non) */ $form_close = ''; - $form_close.= ''; + $form_close.= ''; $form_close.= '
 
'; $form_close.= '
'.$langs->trans('Note').'
"; print ''; @@ -174,7 +174,7 @@ if ($_GET['propalid']) if ($_GET["action"] == 'edit') { print ''; - print ''; + print ''; print ''; print '
"; print ''; diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index cb1934d7607..1f58cd3444f 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -55,7 +55,7 @@ if ($conf->propal->enabled) $var=false; print ''; print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index f61fdebd14b..e39c77c764e 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -96,7 +96,7 @@ if ($_socid > 0) * */ print ''; - print ''; + print ''; print ''; print '
'.$langs->trans("SearchAProposal").'
'; print $langs->trans("Ref").':
'; print '
'; diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index d801e111263..19b25b2734d 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -127,7 +127,7 @@ if ($_socid > 0) print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php index ab8acab7dba..bb0df3561f3 100644 --- a/htdocs/commande/contact.php +++ b/htdocs/commande/contact.php @@ -228,7 +228,7 @@ if ($id > 0 || ! empty($ref)) $var = false; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -257,7 +257,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 2a23f0d3c36..7d439828eb5 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -921,7 +921,7 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer) $nbrow=10; print ''; - print ''; + print ''; print ''; print '' ."\n"; print ''; @@ -1294,7 +1294,7 @@ else if ($user->rights->commande->creer && $_GET['action'] == 'RefCustomerOrder') { print ''; - print ''; + print ''; print ''; print ''; print ' '; @@ -1369,7 +1369,7 @@ else if ($_GET['action'] == 'editdate_livraison') { print ''; - print ''; + print ''; print ''; $html->select_date($commande->date_livraison,'liv_','','','',"setdate_livraison"); print ''; @@ -1672,7 +1672,7 @@ else if ($_GET['action'] == 'editline' && $user->rights->commande->creer && $_GET['rowid'] == $objp->rowid) { print 'rowid.'" method="post">'; - print ''; + print ''; print ''; print ''; print ''; @@ -1783,7 +1783,7 @@ else // Add free products/services form print ''; - print ''; + print ''; print ''; print ''; @@ -1853,7 +1853,7 @@ else print ''; print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index 737056e5852..3cfc82486c5 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -66,7 +66,7 @@ print '
'; $var=false; print ''; print ''; -print ''; +print ''; print ''; print ''; diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php index 6f50a6a5738..8abd0c62363 100644 --- a/htdocs/commande/note.php +++ b/htdocs/commande/note.php @@ -121,7 +121,7 @@ if ($id > 0 || ! empty($ref)) if ($_GET["action"] == 'edit') { print ''; - print ''; + print ''; print ''; print '
"; } diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 93827dc894c..3f2cba761b7 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -331,7 +331,7 @@ if ($account || $_GET["ref"]) if ($user->rights->banque->modifier && $_GET["action"]=='addline') { print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -396,7 +396,7 @@ if ($account || $_GET["ref"]) print ''; print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index fe99f64b8ce..dbbd76a1111 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -238,7 +238,7 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure if ($message) { print "$message
\n"; } print ''; - print ''; + print ''; print ''; print ''."\n\n"; diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php index a9f6ace57e3..b124799e8dc 100644 --- a/htdocs/compta/bank/categ.php +++ b/htdocs/compta/bank/categ.php @@ -89,7 +89,7 @@ print_fiche_titre($langs->trans("Rubriques")); print ''; -print ''; +print ''; print ""; print '
'.$langs->trans("SearchOrder").'
'; print $langs->trans("Ref").':
'; print ''; diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index aff4369bc6c..a852e23ccfc 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -166,7 +166,7 @@ if ($_GET["action"] == 'create') if ($message) { print "$message
\n"; } print ''; - print ''; + print ''; print ''; print ''; @@ -394,7 +394,7 @@ else if ($message) { print "$message
\n"; } print ''; - print ''; + print ''; print ''; print ''."\n\n"; diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 039cb5f4477..81771038dc8 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -257,7 +257,7 @@ if ($result) $i++; print ''; - print ''; + print ''; print ""; print ""; @@ -427,7 +427,7 @@ if ($result) if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { print "rowid\">"; - print ''; + print ''; print ''; print ""; print $html->select_types_paiements($objp->fk_type,"value",'',2); @@ -446,7 +446,7 @@ if ($result) if ($user->rights->banque->modifier) { print "rowid\">"; - print ''; + print ''; print ''; print ""; print ''; @@ -464,7 +464,7 @@ if ($result) if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { print "rowid\">"; - print ''; + print ''; print ''; print ""; print ''; @@ -485,7 +485,7 @@ if ($result) if ($user->rights->banque->consolidate) { print "rowid\">"; - print ''; + print ''; print ''; print ""; print '
'; @@ -516,7 +516,7 @@ print '
'; print ''; print ""; -print ''; +print ''; print ""; print ""; print ""; print ''; - print ''; + print ''; print ""; print ""; print "rowid."\">"; diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 9d0046eb8d7..0daae34761e 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -224,7 +224,7 @@ else print '
'; print ""; - print ''; + print ''; print ""; print '
".$langs->trans("Rubriques").""; diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index 341e21dab5e..f8df76437b2 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -197,7 +197,7 @@ if ($resql) $var=!$var; print "
'; diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index 68c8ec64b40..e6c524fdd21 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -146,7 +146,7 @@ if ($resql) print "\n"; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php index b9916f1f3c1..1300736c0d8 100644 --- a/htdocs/compta/bank/virement.php +++ b/htdocs/compta/bank/virement.php @@ -146,7 +146,7 @@ print $langs->trans("TransferDesc"); print "

"; print ""; -print ''; +print ''; print ''; diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php index 5c4cb94b59c..22d4e2523de 100644 --- a/htdocs/compta/commande/fiche.php +++ b/htdocs/compta/commande/fiche.php @@ -161,7 +161,7 @@ if ($id > 0 || ! empty($ref)) if ($user->rights->commande->creer && $_GET['action'] == 'RefCustomerOrder') { print ''; - print ''; + print ''; print ''; print ''; print ' '; @@ -236,7 +236,7 @@ if ($id > 0 || ! empty($ref)) if ($_GET['action'] == 'editdate_livraison') { print ''; - print ''; + print ''; print ''; $html->select_date($commande->date_livraison,'liv_','','','',"setdate_livraison"); print ''; diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index a6b4718d9b3..c38c4e68e89 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -132,7 +132,7 @@ if ($_GET["action"] == 'create') if ($mesg) print $mesg."
"; print "\n"; - print ''; + print ''; print ''; print '
  
'; @@ -187,7 +187,7 @@ else dol_fiche_head($head, $hselected, $langs->trans("TripCard")); print "\n"; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index 7158662418f..5819353e7e3 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -212,7 +212,7 @@ if ($_GET["action"] == 'create') if ($mesg) print '
'.$mesg.'
'; print ''; - print ''; + print ''; print '
'; print ''; @@ -279,7 +279,7 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit') dol_fiche_head($head, $hselected, $langs->trans("Ref")); print ''; - print ''; + print ''; print '
'; print ''; @@ -364,7 +364,7 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit') dol_fiche_head($head, $hselected, $langs->trans("Ref").": ".$_GET["rowid"]); print ""; - print ''; + print ''; print '
'; // Ref diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 6a3d6239e47..ebd9e46e0e6 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1424,7 +1424,7 @@ if ($_GET['action'] == 'create') if (empty($cond_reglement_id)) $cond_reglement_id=1; print ''; - print ''; + print ''; print ''; print '' ."\n"; print ''; @@ -2194,7 +2194,7 @@ else if ($user->rights->facture->creer && $_GET['action'] == 'RefCustomerOrder') { print ''; - print ''; + print ''; print ''; print ''; print ' '; @@ -2892,7 +2892,7 @@ else if ($_GET['action'] == 'editline' && $user->rights->facture->creer && $_GET['rowid'] == $objp->rowid) { print 'rowid.'" method="post">'; - print ''; + print ''; print ''; print ''; print ''; @@ -3006,7 +3006,7 @@ else // Add free products/services form print ''; - print ''; + print ''; print ''; print ''; @@ -3075,7 +3075,7 @@ else print ''; print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index 74dd9f8a7b3..b463123e45e 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -117,7 +117,7 @@ if ($_GET["facid"] > 0) if ($fac->brouillon == 1 && $user->rights->facture->creer) { print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php index 6ca4fcd6418..efdcabd888f 100644 --- a/htdocs/compta/facture/contact.php +++ b/htdocs/compta/facture/contact.php @@ -207,7 +207,7 @@ if ($id > 0) $var = false; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -237,7 +237,7 @@ if ($id > 0) print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 491c7c9632f..05420b06f41 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -110,7 +110,7 @@ if ($_GET["action"] == 'create') if ($facture->fetch($_GET["facid"]) > 0) { print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index b1d1be6c8f1..ae6fe6ce062 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -308,7 +308,7 @@ if ($result) $total_payed=0; print ''; - print ''; + print ''; while ($i < $num) { diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php index 461c3c54ecc..ac0ceaa88bb 100644 --- a/htdocs/compta/facture/note.php +++ b/htdocs/compta/facture/note.php @@ -117,7 +117,7 @@ if ($_GET["facid"]) if ($_GET["action"] == 'edit') { print ''; - print ''; + print ''; print ''; print '
"; print ''; @@ -137,7 +137,7 @@ if ($_GET["facid"]) if ($_GET["action"] == 'edit') { print ''; - print ''; + print ''; print ''; print '
"; print ''; diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 20e494aab17..0e7fd366baa 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -115,7 +115,7 @@ $max=3; if ($conf->facture->enabled && $user->rights->facture->lire) { print ''; - print ''; + print ''; print '
% '; print '
'; print ""; print ''; @@ -129,7 +129,7 @@ if ($conf->facture->enabled && $user->rights->facture->lire) if ($conf->fournisseur->enabled && $user->rights->fournisseur->lire) { print ''; - print ''; + print ''; print '
'.$langs->trans("SearchACustomerInvoice").'
'; print ''; print ""; diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index b1ebc23e0c5..2c508760464 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -266,7 +266,7 @@ if ($_GET['action'] == 'create' || $_POST['action'] == 'confirm_paiement' || $_P } print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php index f37424c153a..46ff42829a5 100644 --- a/htdocs/compta/paiement/rapport.php +++ b/htdocs/compta/paiement/rapport.php @@ -89,7 +89,7 @@ print_fiche_titre($titre); // Formulaire de génération print ''; -print ''; +print ''; print ''; $cmonth = date("n", time()); $syear = date("Y", time()); diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index 0171f6bb8b7..f2ffa730f72 100755 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -172,7 +172,7 @@ if ($_GET["action"] == 'create') } print ''; - print ''; + print ''; print "id\">"; print ''; diff --git a/htdocs/compta/param/comptes/fiche.php b/htdocs/compta/param/comptes/fiche.php index b07a6a83b7f..77871e894db 100644 --- a/htdocs/compta/param/comptes/fiche.php +++ b/htdocs/compta/param/comptes/fiche.php @@ -78,7 +78,7 @@ if ($_GET["action"] == 'create' && $user->rights->compta->ventilation->parametre print_fiche_titre($langs->trans("NewAccount")); print ''; - print ''; + print ''; print ''; print ''."\n"; diff --git a/htdocs/compta/param/comptes/index.php b/htdocs/compta/param/comptes/index.php index 8ba4c14bbaa..e0243ba760f 100644 --- a/htdocs/compta/param/comptes/index.php +++ b/htdocs/compta/param/comptes/index.php @@ -57,7 +57,7 @@ print '
'.$langs->trans("SearchASupplierInvoice").'
'; * Zone recherche facture */ print ''; -print ''; +print ''; print ''; print ""; diff --git a/htdocs/compta/prelevement/config.php b/htdocs/compta/prelevement/config.php index 819fa46e8ca..86c37b9dcbd 100644 --- a/htdocs/compta/prelevement/config.php +++ b/htdocs/compta/prelevement/config.php @@ -74,7 +74,7 @@ print "
"; if ($user->rights->prelevement->bons->configurer) print ''; -print ''; +print ''; print '
'; print ''; @@ -194,7 +194,7 @@ if ($conf->global->MAIN_MODULE_NOTIFICATION) if ($user->rights->prelevement->bons->configurer) print ''; - print ''; + print ''; print '
'; print ''; diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php index 51a3d2abe7d..8cec7050426 100644 --- a/htdocs/compta/prelevement/fiche.php +++ b/htdocs/compta/prelevement/fiche.php @@ -195,7 +195,7 @@ if ($_GET["id"]) if($bon->date_trans == 0) { print ''; - print ''; + print ''; print ''; print '
'; print '
Date Transmission'; @@ -217,7 +217,7 @@ if ($_GET["id"]) if($bon->date_trans <> 0 && $bon->date_credit == 0) { print ''; - print ''; + print ''; print ''; print ''; print '
Crédité le'; diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index e61d4753aa6..b3bf9bb2948 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -148,7 +148,7 @@ if ($_GET["id"]) $rej = new RejetPrelevement($db, $user); print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php index 8bdae6d72f9..ade25b4f7e3 100644 --- a/htdocs/compta/sociales/charges.php +++ b/htdocs/compta/sociales/charges.php @@ -181,7 +181,7 @@ if ($_GET["action"] == 'create') $var=false; print ''; - print ''; + print ''; print ''; print "
Rejet de prélèvement
"; @@ -279,7 +279,7 @@ if ($chid > 0) if ($_GET['action'] == 'edit') { print "id&action=update\" method=\"post\">"; - print ''; + print ''; } print '
'; diff --git a/htdocs/compta/tva/fiche.php b/htdocs/compta/tva/fiche.php index d5498409c9b..90428272695 100644 --- a/htdocs/compta/tva/fiche.php +++ b/htdocs/compta/tva/fiche.php @@ -144,7 +144,7 @@ if ($id) if ($_GET["action"] == 'create') { print "\n"; - print ''; + print ''; print ''; print_fiche_titre($langs->trans("NewVATPayment")); diff --git a/htdocs/compta/ventilation/fiche.php b/htdocs/compta/ventilation/fiche.php index 317748f211a..bc860f7b544 100644 --- a/htdocs/compta/ventilation/fiche.php +++ b/htdocs/compta/ventilation/fiche.php @@ -112,7 +112,7 @@ if($_GET["id"]) if($objp->fk_code_ventilation == 0) { print ''."\n"; - print ''; + print ''; print ''; } diff --git a/htdocs/compta/ventilation/fournisseur/fiche.php b/htdocs/compta/ventilation/fournisseur/fiche.php index 9bc05e2b84b..2d827678e4b 100644 --- a/htdocs/compta/ventilation/fournisseur/fiche.php +++ b/htdocs/compta/ventilation/fournisseur/fiche.php @@ -101,7 +101,7 @@ if($_GET["id"]) if($objp->fk_code_ventilation == 0) { print ''."\n"; - print ''; + print ''; print ''; } diff --git a/htdocs/compta/voyage/index.php b/htdocs/compta/voyage/index.php index 8f4529386a6..2961563a5d7 100644 --- a/htdocs/compta/voyage/index.php +++ b/htdocs/compta/voyage/index.php @@ -77,7 +77,7 @@ $result = $db->query($sql); if ($result) { print ""; - print ''; + print ''; print ""; print "
"; print ""; diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 7ff810d91c8..848b026d001 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -254,7 +254,7 @@ if ($user->rights->societe->contact->creer) print '
'; print ''; - print ''; + print ''; print ''; print '
'; @@ -345,7 +345,7 @@ if ($user->rights->societe->contact->creer) } print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php index 98dcbf40f51..c72b0ac5c63 100644 --- a/htdocs/contact/index.php +++ b/htdocs/contact/index.php @@ -207,7 +207,7 @@ if ($result) print_barre_liste($titre ,$page, "index.php", '&begin='.$begin.'&view='.$_GET["view"].'&userid='.$_GET["userid"], $sortfield, $sortorder,'',$num,$nbtotalofrecords); print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index bb439c6e6b3..0125ad34127 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -95,7 +95,7 @@ if ($_GET["action"] == 'edit') print '
'; print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index ffaefb2fad4..4a2a11d887c 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/contact.php @@ -230,7 +230,7 @@ if ($id > 0) $var = false; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -259,7 +259,7 @@ if ($id > 0) print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 4a585610710..af05af633b9 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -462,7 +462,7 @@ if ($_GET["action"] == 'create') $soc->fetch($obj->rowid); print ''; - print ''; + print ''; print ''; print ''."\n"; @@ -683,7 +683,7 @@ else if ($contrat->brouillon && $user->rights->contrat->creer) { print ''; - print ''; + print ''; print ''; } @@ -896,7 +896,7 @@ else else { print ""; - print ''; + print ''; print ''; print ''; // Ligne carac @@ -1069,7 +1069,7 @@ else * Activer la ligne de contrat */ print ''; - print ''; + print ''; print '
'; //print ''; @@ -1119,7 +1119,7 @@ else * Desactiver la ligne de contrat */ print ''; - print ''; + print ''; print '
'.$langs->trans("Status").'
'; @@ -1194,7 +1194,7 @@ else // Service sur produit predefini print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -1230,7 +1230,7 @@ else // Service libre print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 1a90c8532f8..6a72a03044a 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -81,7 +81,7 @@ if ($conf->contrat->enabled) { $var=false; print ''; - print ''; + print ''; print '
'; print ''; print ''; diff --git a/htdocs/contrat/liste.php b/htdocs/contrat/liste.php index 8da71fa6591..5e7847d6e7d 100644 --- a/htdocs/contrat/liste.php +++ b/htdocs/contrat/liste.php @@ -113,7 +113,7 @@ if ($resql) print "\n"; print ''; - print ''; + print ''; print ''; print '\n"; print ''; - print ''; + print ''; print ''; print '
'.$langs->trans("SearchAContract").'
'; print ''; diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php index 9ff5046f423..6d57a75778c 100644 --- a/htdocs/contrat/note.php +++ b/htdocs/contrat/note.php @@ -132,7 +132,7 @@ if ($_GET["id"]) if ($_GET["action"] == 'edit') { print ''; - print ''; + print ''; print ''; print '
"; print ''; @@ -152,7 +152,7 @@ if ($_GET["id"]) if ($_GET["action"] == 'edit') { print ''; - print ''; + print ''; print ''; print '
"; print ''; diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php index 33681479fa6..de508023c24 100644 --- a/htdocs/contrat/services.php +++ b/htdocs/contrat/services.php @@ -140,7 +140,7 @@ if ($resql) print "
'; print ''; diff --git a/htdocs/domain/index.php b/htdocs/domain/index.php index 008509fb95a..f452a12cdf3 100644 --- a/htdocs/domain/index.php +++ b/htdocs/domain/index.php @@ -41,7 +41,7 @@ if ($result) print_barre_liste($langs->trans("DomainNames"), $page, "liste.php","",$sortfield,$sortorder,"",$num); print ""; - print ''; + print ''; print ""; print ""; print ""; diff --git a/htdocs/ecm/docdir.php b/htdocs/ecm/docdir.php index 306de9d2260..aa462b4867e 100644 --- a/htdocs/ecm/docdir.php +++ b/htdocs/ecm/docdir.php @@ -147,7 +147,7 @@ if ($_GET["action"] == 'create') // Create //*********************** print ''; - print ''; + print ''; print ''; $title=$langs->trans("ECMNewSection"); diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php index a0a6f7902c3..4069e8b907b 100644 --- a/htdocs/ecm/docfile.php +++ b/htdocs/ecm/docfile.php @@ -119,7 +119,7 @@ dol_fiche_head($head, 'card', $langs->trans("ECMSectionManual")); if ($_GET["action"] == 'edit') { print ''; - print ''; + print ''; print ''; print ''; } diff --git a/htdocs/ecm/docmine.php b/htdocs/ecm/docmine.php index d764c27692d..ac6efff7db8 100644 --- a/htdocs/ecm/docmine.php +++ b/htdocs/ecm/docmine.php @@ -228,7 +228,7 @@ dol_fiche_head($head, 'card', $langs->trans("ECMSectionManual")); if ($_GET["action"] == 'edit') { print ''; - print ''; + print ''; print ''; print ''; } diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php index c1203a1c841..a88769f0299 100644 --- a/htdocs/ecm/search.php +++ b/htdocs/ecm/search.php @@ -140,7 +140,7 @@ print '
'; //print_fiche_titre($langs->trans("ECMSectionsManual")); print ''; -print ''; +print ''; print ''; print ""; print ''; @@ -154,7 +154,7 @@ print "
'.$langs->trans("ECMSearchByKeywords").'
"; //print_fiche_titre($langs->trans("ECMSectionAuto")); print '
'; -print ''; +print ''; print ''; print ""; print ''; diff --git a/htdocs/energie/compteur.php b/htdocs/energie/compteur.php index 8bb55f5db9f..7ef5142e45d 100644 --- a/htdocs/energie/compteur.php +++ b/htdocs/energie/compteur.php @@ -92,7 +92,7 @@ if ($_GET["action"] == 'create') $compteur = new EnergieCompteur($db, $user); print ''; - print ''; + print ''; print ''; print '
'.$langs->trans("ECMSearchByEntity").'
'; @@ -157,7 +157,7 @@ else $html = new Form($db); print ''; - print ''; + print ''; print ''; print '
'; diff --git a/htdocs/energie/compteur_groupe.php b/htdocs/energie/compteur_groupe.php index b0a328d86f3..5bc91d3d7fd 100644 --- a/htdocs/energie/compteur_groupe.php +++ b/htdocs/energie/compteur_groupe.php @@ -82,7 +82,7 @@ if ($_GET["id"] > 0) $html = new Form($db); print ''; - print ''; + print ''; print ''; print '
'; diff --git a/htdocs/energie/groupe.php b/htdocs/energie/groupe.php index d4920b19bf8..7b839b06fe0 100644 --- a/htdocs/energie/groupe.php +++ b/htdocs/energie/groupe.php @@ -71,7 +71,7 @@ if ($_GET["action"] == 'create') $html = new Form($db); print ''; - print ''; + print ''; print ''; print '
'; diff --git a/htdocs/expedition/commande.php b/htdocs/expedition/commande.php index 03b7e07174a..9a76ebf36e4 100644 --- a/htdocs/expedition/commande.php +++ b/htdocs/expedition/commande.php @@ -178,7 +178,7 @@ if ($id > 0 || ! empty($ref)) if ($user->rights->commande->creer && $_GET['action'] == 'RefCustomerOrder') { print ''; - print ''; + print ''; print ''; print ''; print ' '; @@ -252,7 +252,7 @@ if ($id > 0 || ! empty($ref)) if ($_GET['action'] == 'editdate_livraison') { print ''; - print ''; + print ''; print ''; $html->select_date($commande->date_livraison,'liv_','','','',"setdate_livraison"); print ''; diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 35c744c34bf..694f981a3ac 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -242,7 +242,7 @@ if ($_GET["action"] == 'create') * Document source */ print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index edb212820dd..df0adc45803 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -44,7 +44,7 @@ print '
'; $var=false; print ''; print ''; -print ''; +print ''; print ''; print ''; diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index 890f5820791..15a9510e242 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -363,7 +363,7 @@ if ($step == 2 && $datatoexport) // Liste deroulante des modeles d'export print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -582,7 +582,7 @@ if ($step == 3 && $datatoexport) print $langs->trans("SaveExportModel"); print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php index f5d2cf4177c..d2485039f2a 100644 --- a/htdocs/fichinter/contact.php +++ b/htdocs/fichinter/contact.php @@ -217,7 +217,7 @@ if ($id > 0) $var = false; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -246,7 +246,7 @@ if ($id > 0) print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 07a2b63c611..4ae9a96149a 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -405,7 +405,7 @@ if ($_GET["action"] == 'create') if ($_GET["socid"] > 0) { print ""; - print ''; + print ''; print '
'.$langs->trans("SearchASending").'
'; print $langs->trans("Ref").':
'; @@ -572,7 +572,7 @@ elseif ($_GET["id"] > 0) if ($_GET['action'] == 'editdescription') { print ''; - print ''; + print ''; print ''; print '
'; print ''; @@ -681,7 +681,7 @@ elseif ($_GET["id"] > 0) if ($fichinter->statut == 0 && $_GET["action"] == 'editline' && $user->rights->ficheinter->creer && $_GET["ligne"] == $objp->rowid) { print 'rowid.'" method="post">'; - print ''; + print ''; print ''; print ''; print ''; @@ -743,7 +743,7 @@ elseif ($_GET["id"] > 0) // Ajout ligne d'intervention print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php index 5ae80d49ca6..18df7eea8aa 100644 --- a/htdocs/fichinter/note.php +++ b/htdocs/fichinter/note.php @@ -114,7 +114,7 @@ if ($_GET['id']) if ($_GET["action"] == 'edit') { print ''; - print ''; + print ''; print ''; print '
"; print ''; @@ -134,7 +134,7 @@ if ($_GET['id']) if ($_GET["action"] == 'edit') { print ''; - print ''; + print ''; print ''; print '
"; print ''; diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php index 791d0e1d310..f6b8700ed4b 100644 --- a/htdocs/fourn/commande/contact.php +++ b/htdocs/fourn/commande/contact.php @@ -224,7 +224,7 @@ if ($id > 0 || ! empty($ref)) $var = false; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -253,7 +253,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index f0f1990942c..2180d2000bf 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -166,7 +166,7 @@ if ($id > 0 || ! empty($ref)) if ($commande->statut == 3 || $commande->statut == 4 || $commande->statut == 5) { print ''; - print ''; + print ''; print ''; print '
'; diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 4334e61078a..5d78300fd46 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -777,7 +777,7 @@ if ($id > 0 || ! empty($ref)) if ($_GET["action"] == 'editline' && $user->rights->fournisseur->commande->creer && ($_GET["rowid"] == $commandline->id)) { print 'id.'" method="post">'; - print ''; + print ''; print ''; print ''; print ''; @@ -843,7 +843,7 @@ if ($id > 0 || ! empty($ref)) // Add free products/services form print ''; - print ''; + print ''; print ''; print ''; @@ -901,7 +901,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; - print ''; + print ''; print ''; print ''; @@ -1013,7 +1013,7 @@ if ($id > 0 || ! empty($ref)) */ print '
'; print ''; - print ''; + print ''; print ''; print '
'; print ''; @@ -1039,7 +1039,7 @@ if ($id > 0 || ! empty($ref)) */ print '
'; print ''; - print ''; + print ''; print ''; print '
'.$langs->trans("ToOrder").'
'; print ''; diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php index fd2b74925de..f40d06139c9 100644 --- a/htdocs/fourn/commande/note.php +++ b/htdocs/fourn/commande/note.php @@ -98,7 +98,7 @@ if ($id > 0 || ! empty($ref)) * Commande */ print ''; - print ''; + print ''; print ''; print '
'.$langs->trans("Receive").'
'; diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php index 81e6bce37ff..6c7804305af 100644 --- a/htdocs/fourn/facture/contact.php +++ b/htdocs/fourn/facture/contact.php @@ -214,7 +214,7 @@ if ($id > 0) $var = false; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -243,7 +243,7 @@ if ($id > 0) print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 1481772714c..457f9c2ea83 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -386,7 +386,7 @@ if ($_GET['action'] == 'create') $dateinvoice=($datefacture==''?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0):$datefacture); print ''; - print ''; + print ''; print ''; print '
'; @@ -479,7 +479,7 @@ else print_fiche_titre($langs->trans('SupplierInvoice')); print ''; - print ''; + print ''; print ''; print '
'; @@ -814,7 +814,7 @@ else if ($fac->statut == 0 && $_GET['action'] == 'mod_ligne' && $_GET['etat'] == '0' && $_GET['ligne_id'] == $fac->lignes[$i]->rowid) { print ''; - print ''; + print ''; print ''; print ''; @@ -957,7 +957,7 @@ else // Add free products/services form print ''; - print ''; + print ''; print ''; print ''; @@ -1022,7 +1022,7 @@ else print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php index 01e52d9d15e..79f85e04f4b 100644 --- a/htdocs/fourn/facture/note.php +++ b/htdocs/fourn/facture/note.php @@ -118,7 +118,7 @@ if ($_GET["facid"]) if ($_GET["action"] == 'edit') { print ''; - print ''; + print ''; print ''; print '
"; print ''; @@ -138,7 +138,7 @@ if ($_GET["facid"]) if ($_GET["action"] == 'edit') { print ''; - print ''; + print ''; print ''; print '
"; print ''; diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index ef26fde6b30..6d9f2394e7e 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -221,7 +221,7 @@ if ($action == 'create' || $action == 'add_paiement') print_fiche_titre($langs->trans('DoPayment')); print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/fourn/paiement/fiche.php b/htdocs/fourn/paiement/fiche.php index 82a768acf32..a7c226f37a2 100644 --- a/htdocs/fourn/paiement/fiche.php +++ b/htdocs/fourn/paiement/fiche.php @@ -193,7 +193,7 @@ else print ''; print ''; print '
'.$langs->trans('Date').''; print ''; - print ''; + print ''; if (!empty($_POST['remonth']) && !empty($_POST['reday']) && !empty($_POST['reyear'])) $sel_date=dol_mktime(12, 0 , 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); else @@ -225,7 +225,7 @@ else print ''.$langs->trans('Numero').''; print ''; - print ''; + print ''; if (!empty($_POST['new_num'])) $num = $this->db->escape($_POST['new_num']); else diff --git a/htdocs/fourn/product/categorie.php b/htdocs/fourn/product/categorie.php index 9898005e0d2..bbac3b0a4fe 100644 --- a/htdocs/fourn/product/categorie.php +++ b/htdocs/fourn/product/categorie.php @@ -153,7 +153,7 @@ if ($_GET["id"]) print $langs->trans("AddProductToCat")."

"; print ''; print ''; - print ''; + print ''; print "
'; + print ''; print ''; print '
'; print ''; diff --git a/htdocs/fourn/product/index.php b/htdocs/fourn/product/index.php index 31f4148213f..6d513cc82a0 100644 --- a/htdocs/fourn/product/index.php +++ b/htdocs/fourn/product/index.php @@ -49,7 +49,7 @@ print '
'.$langs->trans("Price").'
'; * Zone recherche produit/service */ print ''; -print ''; +print ''; print ''; print "\n"; print ''; diff --git a/htdocs/fourn/product/liste.php b/htdocs/fourn/product/liste.php index c1abf85fcb9..b00a96324f4 100644 --- a/htdocs/fourn/product/liste.php +++ b/htdocs/fourn/product/liste.php @@ -189,7 +189,7 @@ if ($resql) // Lignes des champs de filtre print ''; - print ''; + print ''; if ($fourn_id > 0) print ''; print ''; print ''; diff --git a/htdocs/fourn/product/photos.php b/htdocs/fourn/product/photos.php index e6528dc915b..3e66788d7cf 100644 --- a/htdocs/fourn/product/photos.php +++ b/htdocs/fourn/product/photos.php @@ -116,7 +116,7 @@ if ($_GET["id"]) print_titre($langs->trans("AddPhoto")); print ''; - print ''; + print ''; print ''; print '
'.$langs->trans("Search").'
'; diff --git a/htdocs/html.formcompany.class.php b/htdocs/html.formcompany.class.php index 6a5035b126a..65abd1ac5a0 100644 --- a/htdocs/html.formcompany.class.php +++ b/htdocs/html.formcompany.class.php @@ -135,7 +135,7 @@ class FormCompany print ''; print ''; - print ''; + print ''; print '
'; print '
'; diff --git a/htdocs/html.formfile.class.php b/htdocs/html.formfile.class.php index d1f89a7ddde..a737cd6c52f 100644 --- a/htdocs/html.formfile.class.php +++ b/htdocs/html.formfile.class.php @@ -65,7 +65,7 @@ class FormFile print ''; print ''; - print ''; + print ''; print ''; print '
'; @@ -295,7 +295,7 @@ class FormFile if (empty($noform)) print ''; print ''; - print ''; + print ''; print_titre($langs->trans("BuildDocuments")); print ''; diff --git a/htdocs/html.formmail.class.php b/htdocs/html.formmail.class.php index c6f6248fa77..52845873ca7 100644 --- a/htdocs/html.formmail.class.php +++ b/htdocs/html.formmail.class.php @@ -177,7 +177,7 @@ class FormMail print "\n\n"; print "param["returnurl"]."\">\n"; - print ''; + print ''; foreach ($this->param as $key=>$value) { print "\n"; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 590a7ad6fc3..877a81193da 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -343,7 +343,7 @@ if ($step == 2 && $datatoimport) print ''; - print ''; + print ''; print ''; print '
'; @@ -399,7 +399,7 @@ if ($step == 2 && $datatoimport) // Liste deroulante des modeles d'import print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -618,7 +618,7 @@ if ($step == 3 && $datatoimport) print $langs->trans("SaveImportModel"); print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/includes/barcode/html.formbarcode.class.php b/htdocs/includes/barcode/html.formbarcode.class.php index dfd0c6673db..7e90fcf4bff 100644 --- a/htdocs/includes/barcode/html.formbarcode.class.php +++ b/htdocs/includes/barcode/html.formbarcode.class.php @@ -69,7 +69,7 @@ class FormBarCode } $select_encoder = ''; - $select_encoder.= ''; + $select_encoder.= ''; $select_encoder.= ''; $select_encoder.= ''; $select_encoder.= ''; + print ''; print ''; print '
'; print '
'; diff --git a/htdocs/includes/modules/commande/mod_commande_saphir.php b/htdocs/includes/modules/commande/mod_commande_saphir.php index fd42edd4366..3babe8c62ad 100644 --- a/htdocs/includes/modules/commande/mod_commande_saphir.php +++ b/htdocs/includes/modules/commande/mod_commande_saphir.php @@ -54,7 +54,7 @@ class mod_commande_saphir extends ModeleNumRefCommandes $texte = $langs->trans('GenericNumRefModelDesc')."
\n"; $texte.= ''; - $texte.= ''; + $texte.= ''; $texte.= ''; $texte.= ''; $texte.= ''; diff --git a/htdocs/includes/modules/facture/mercure/mercure.modules.php b/htdocs/includes/modules/facture/mercure/mercure.modules.php index 8bb37566889..2668c4201df 100644 --- a/htdocs/includes/modules/facture/mercure/mercure.modules.php +++ b/htdocs/includes/modules/facture/mercure/mercure.modules.php @@ -53,7 +53,7 @@ class mod_facture_mercure extends ModeleNumRefFactures $texte = $langs->trans('GenericNumRefModelDesc')."
\n"; $texte.= ''; - $texte.= ''; + $texte.= ''; $texte.= ''; $texte.= ''; $texte.= ''; diff --git a/htdocs/includes/modules/fichinter/mod_arctic.php b/htdocs/includes/modules/fichinter/mod_arctic.php index c0504a5fe34..8e35820382b 100644 --- a/htdocs/includes/modules/fichinter/mod_arctic.php +++ b/htdocs/includes/modules/fichinter/mod_arctic.php @@ -59,7 +59,7 @@ class mod_arctic extends ModeleNumRefFicheinter $texte = $langs->trans('GenericNumRefModelDesc')."
\n"; $texte.= ''; - $texte.= ''; + $texte.= ''; $texte.= ''; $texte.= ''; $texte.= '
'; diff --git a/htdocs/includes/modules/livraison/mod_livraison_saphir.php b/htdocs/includes/modules/livraison/mod_livraison_saphir.php index b18c95bd624..5f683b26ca5 100644 --- a/htdocs/includes/modules/livraison/mod_livraison_saphir.php +++ b/htdocs/includes/modules/livraison/mod_livraison_saphir.php @@ -52,7 +52,7 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder $texte = $langs->trans('GenericNumRefModelDesc')."
\n"; $texte.= ''; - $texte.= ''; + $texte.= ''; $texte.= ''; $texte.= ''; $texte.= '
'; diff --git a/htdocs/includes/modules/propale/mod_propale_saphir.php b/htdocs/includes/modules/propale/mod_propale_saphir.php index b70c4215754..b49768a480e 100644 --- a/htdocs/includes/modules/propale/mod_propale_saphir.php +++ b/htdocs/includes/modules/propale/mod_propale_saphir.php @@ -54,7 +54,7 @@ class mod_propale_saphir extends ModeleNumRefPropales $texte = $langs->trans('GenericNumRefModelDesc')."
\n"; $texte.= ''; - $texte.= ''; + $texte.= ''; $texte.= ''; $texte.= ''; $texte.= '
'; diff --git a/htdocs/includes/modules/societe/mod_codeclient_elephant.php b/htdocs/includes/modules/societe/mod_codeclient_elephant.php index e178ad3edf3..1f547be902e 100644 --- a/htdocs/includes/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/includes/modules/societe/mod_codeclient_elephant.php @@ -76,7 +76,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode $texte = $langs->trans('GenericNumRefModelDesc')."
\n"; $texte.= ''; - $texte.= ''; + $texte.= ''; $texte.= ''; $texte.= ''; $texte.= ''; diff --git a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php index a4551267284..691483d9b8e 100644 --- a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php +++ b/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php @@ -54,7 +54,7 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders $texte = $langs->trans('GenericNumRefModelDesc')."
\n"; $texte.= ''; - $texte.= ''; + $texte.= ''; $texte.= ''; $texte.= ''; $texte.= '
'; diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 5677357b479..4f231152cf6 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -88,7 +88,7 @@ class CMailFile $addr_cc="",$addr_bcc="",$deliveryreceipt=0,$msgishtml=0,$errors_to='') { global $conf; - +var_dump($to); exit; // On definit fin de ligne $this->eol="\n"; if (eregi('^win',PHP_OS)) $this->eol="\r\n"; @@ -211,6 +211,15 @@ class CMailFile // comme des injections mail par les serveurs de messagerie. $this->headers = eregi_replace("[\r\n]+$","",$this->headers); } + else if ($conf->global->MAIN_MAIL_SENDMODE == 'simplemail') + { + // Use Simplemail library + // ------------------------------------------ + + require_once(DOL_DOCUMENT_ROOT."/includes/simplemail/class.mail.php"); + $mail = new simplemail(); + + } else if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps') { // Use SMTPS library diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php index c01997d3b79..f408cdf98ee 100644 --- a/htdocs/lib/security.lib.php +++ b/htdocs/lib/security.lib.php @@ -99,7 +99,7 @@ function dol_loginfunction($langs,$conf,$mysoc) print '">'."\n"; // Token field - print ''; + print ''; // Table 1 $title='Dolibarr '.DOL_VERSION; diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php index 2f9c8e56a27..d5d5ad5a852 100644 --- a/htdocs/livraison/fiche.php +++ b/htdocs/livraison/fiche.php @@ -198,7 +198,7 @@ if ($_GET["action"] == 'create') * Commande */ print ''; - print ''; + print ''; print ''; print ''; if (!$conf->expedition_bon->enabled && $conf->stock->enabled) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index f448e343abc..d8a89d2c45d 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -171,14 +171,21 @@ dol_syslog("Start session name=".$sessionname." Session id()=".session_id().", _ // Creation d'un jeton contre les failles CSRF $token = md5(uniqid(rand(),TRUE)); // Genere un hash d'un nombre aleatoire -$_SESSION['oldtoken'] = $_SESSION['newtoken']; // roulement des jetons car cree a chaque appel +// roulement des jetons car cree a chaque appel +$_SESSION['token_level_2'] = $_SESSION['token_level_1']; +$_SESSION['token_level_1'] = $_SESSION['newtoken']; $_SESSION['newtoken'] = $token; // Verification de la presence et de la validite du jeton -if (isset($_POST['token']) && isset($_SESSION['oldtoken'])) +if (isset($_POST['token_level_1']) && isset($_SESSION['token_level_1'])) { - if ($_POST['token'] != $_SESSION['oldtoken']) unset($_POST); + if ($_POST['token_level_1'] != $_SESSION['token_level_1']) unset($_POST); } +else if (isset($_POST['token_level_2']) && isset($_SESSION['token_level_2'])) +{ + if ($_POST['token_level_2'] != $_SESSION['token_level_2']) unset($_POST); +} + // Disable modules (this must be after session_start and after conf has been reloaded) if (! empty($_REQUEST["disablemodules"])) $_SESSION["disablemodules"]=$_REQUEST["disablemodules"]; @@ -1081,7 +1088,7 @@ function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch='search',$ $ret.=''; $ret.=$title.'
'; $ret.=''; - $ret.=''; + $ret.=''; $ret.=''; $ret.=''; $ret.=' '; diff --git a/htdocs/oscommerce_ws/produits/OSCvente.php b/htdocs/oscommerce_ws/produits/OSCvente.php index 6f568573b43..1c07f124fd7 100644 --- a/htdocs/oscommerce_ws/produits/OSCvente.php +++ b/htdocs/oscommerce_ws/produits/OSCvente.php @@ -139,7 +139,7 @@ if ($_GET["action"] == 'vendre' ) print ''; print ''; print ''; - print ''; + print ''; print ''; print ''."\n"; print ''; print ''; - print ''; + print ''; print ''; print "\n"; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -265,7 +265,7 @@ else print "\t\t\n"; print "\t\t\n"; print ''."\n"; print ''; print ''; @@ -333,7 +333,7 @@ elseif ( !($err = $client->getError()) ) //print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/postnuke/articles/fiche.php b/htdocs/postnuke/articles/fiche.php index 2bb6fd7ce72..ad344e2385b 100644 --- a/htdocs/postnuke/articles/fiche.php +++ b/htdocs/postnuke/articles/fiche.php @@ -68,7 +68,7 @@ if ($id) print_titre ("Edition de la fiche article"); print "\n"; - print ''; + print ''; print ""; print '
'.$langs->trans('Qty').'
'; print $html->select_produits('','idprod'.$i,'',$conf->produit->limit_size,$soc->price_level); diff --git a/htdocs/oscommerce_ws/produits/categories.php b/htdocs/oscommerce_ws/produits/categories.php index cf847847258..f0543835c5f 100644 --- a/htdocs/oscommerce_ws/produits/categories.php +++ b/htdocs/oscommerce_ws/produits/categories.php @@ -201,7 +201,7 @@ if ($_REQUEST["action"] == 'import') print '
'; print ''; // print ''; @@ -209,7 +209,7 @@ if ($_REQUEST["action"] == 'import') print $html->select_all_categories(0,$categorie->id_mere).'
".$obj->dolicatid."".$obj->label."'; - print ''; + print ''; print 'Importer
'; diff --git a/htdocs/product/barcode.php b/htdocs/product/barcode.php index 4fb485cb85c..7b6b227400e 100644 --- a/htdocs/product/barcode.php +++ b/htdocs/product/barcode.php @@ -154,7 +154,7 @@ print '
'; if ($_GET['action'] == 'editbarcode') { print ''; - print ''; + print ''; print ''; print ''; print ' '; diff --git a/htdocs/product/droitpret/index.php b/htdocs/product/droitpret/index.php index 7b1e944a5db..4ce4042549f 100644 --- a/htdocs/product/droitpret/index.php +++ b/htdocs/product/droitpret/index.php @@ -79,7 +79,7 @@ $lastRapport = $obj->lastRapport; print ''; -print ''; +print ''; print ''; diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 85e3721f0ba..a5375b0d53d 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -590,7 +590,7 @@ if ($_GET["action"] == 'create' && $user->rights->produit->creer) if (! $conf->global->PRODUCT_CANVAS_ABILITY || !$_GET["canvas"]) { print ''; - print ''; + print ''; print ''; print ''."\n"; @@ -1008,7 +1008,7 @@ if ($_GET["id"] || $_GET["ref"]) { print "\n"; print "\n"; - print ''; + print ''; print ''; print ''; print ''; @@ -1246,7 +1246,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status) $objp = $db->fetch_object($result); $var=!$var; print ''; - print ''; + print ''; print ""; print ""; print ""; print ""; print "\n"; print "\n"; diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 73185af8273..99606a58230 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -247,7 +247,7 @@ if ($_GET["id"] || $_GET["ref"]) } print '
"; print ''; @@ -1289,7 +1289,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status) { $var=!$var; print ''; - print ''; + print ''; print '
'; print ''; print $langs->trans("OtherPropals").''; @@ -1365,7 +1365,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status) $objc = $db->fetch_object($result); $var=!$var; print ''; - print ''; + print ''; print "
"; print ''; @@ -1408,7 +1408,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status) { $var=!$var; print ''; - print ''; + print ''; print '
'; print ''; print $langs->trans("OtherOrders").''; @@ -1480,7 +1480,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status) $objp = $db->fetch_object($result); $var=!$var; print ''; - print ''; + print ''; print "
"; print ''; @@ -1542,7 +1542,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status) $var=!$var; print ''; - print ''; + print ''; print "
factureid."\">$objp->facnumbersocid."\">".dol_trunc($objp->nom,24)."
'; print ''; - print ''; + print ''; print ''; print '
'.$langs->trans("Supplier").''; diff --git a/htdocs/product/index.php b/htdocs/product/index.php index 89101d736e3..44f2644b124 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -57,7 +57,7 @@ print '
'; $rowspan=2; if ($conf->barcode->enabled) $rowspan++; print ''; -print ''; +print ''; print ''; print ""; print ''; diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index c7d492b85b0..129c89a0847 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -207,7 +207,7 @@ if ($resql) else { print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 18c8703b5c9..6d55c2863f4 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -246,7 +246,7 @@ if ($_GET["action"] == 'edit_price' && $user->rights->produit->creer) if (empty($conf->global->PRODUIT_MULTIPRICES)) { print ''; - print ''; + print ''; print ''; print ''; print '
'.$langs->trans("Search").'
'; @@ -303,7 +303,7 @@ if ($_GET["action"] == 'edit_price' && $user->rights->produit->creer) for($i=1; $i<=$conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) { print ''; - print ''; + print ''; print ''; print ''; print '
'; diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index c9e7a2828ef..5fc82f93654 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -180,7 +180,7 @@ if ($resql) } print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/product/sousproduits/fiche.php b/htdocs/product/sousproduits/fiche.php index e5c6245d949..57c7434c9ac 100644 --- a/htdocs/product/sousproduits/fiche.php +++ b/htdocs/product/sousproduits/fiche.php @@ -247,7 +247,7 @@ if ($id || $ref) print '
'.$langs->trans("ProductToAddSearch").''; print ''; print ''; print ''; print ''; - print ''; + print ''; print 'trans("NewWarehouse")); print "\n"; - print ''; + print ''; print ''; print ''."\n"; @@ -422,7 +422,7 @@ else print_fiche_titre($langs->trans("WarehouseEdit"), $mesg); print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php index d4faf5e3e27..549fc716b33 100644 --- a/htdocs/product/stock/index.php +++ b/htdocs/product/stock/index.php @@ -46,7 +46,7 @@ print '
'; - print ''; + print ''; print $langs->trans("KeywordFilter"); print ''; print ''; @@ -270,7 +270,7 @@ if ($id || $ref) print '
'.$langs->trans("Ref").''.$langs->trans("Label").''.$langs->trans("AddDel").''.$langs->trans("Quantity").'
'; * Zone recherche entrepot */ print ''; -print ''; +print ''; print ''; print ""; print ''; diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index e81f11ad60d..44f0639b9cb 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -245,7 +245,7 @@ if ($_GET["id"] || $_GET["ref"]) { print_titre($langs->trans("StockCorrection")); print "id\" method=\"post\">\n"; - print ''; + print ''; print ''; print '
'.$langs->trans("Search").'
'; print ''; @@ -276,7 +276,7 @@ if ($_GET["id"] || $_GET["ref"]) { print_titre($langs->trans("Transfer")); print "id\" method=\"post\">\n"; - print ''; + print ''; print ''; print '
'.$langs->trans("Warehouse").'
'; print '
'.$langs->trans("WarehouseSource").''; @@ -302,7 +302,7 @@ if ($_GET["id"] || $_GET["ref"]) { print_titre($langs->trans("SetStock")); print "id\" method=\"post\">\n"; - print ''; + print ''; print ''; print ''; print '
'.$langs->trans("Warehouse").''; diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php index 1408757118b..955ff190b7e 100644 --- a/htdocs/product/traduction.php +++ b/htdocs/product/traduction.php @@ -158,7 +158,7 @@ print '
'; if ($_GET["action"] == 'edit') { print ''; - print ''; + print ''; print ''; print ''; @@ -254,7 +254,7 @@ if ($_GET["action"] == 'add' || $user->rights->produit->modifier) $select.=''; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/projet/activity/list.php b/htdocs/projet/activity/list.php index 0cdd2e51b5a..17af0c1a081 100644 --- a/htdocs/projet/activity/list.php +++ b/htdocs/projet/activity/list.php @@ -122,7 +122,7 @@ $tasksarray=$projet->getTasksArray(0,0); //var_dump($tasksarray); print ''; -print ''; +print ''; print ''; print '
'; diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php index d091207316d..8f49ba99cba 100644 --- a/htdocs/projet/fiche.php +++ b/htdocs/projet/fiche.php @@ -147,7 +147,7 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer) if ($mesg) print $mesg.'
'; print ''; - print ''; + print ''; //if ($_REQUEST["socid"]) print ''; print '
'; print ''; @@ -208,7 +208,7 @@ else if ($_GET["action"] == 'edit') { print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/projet/tasks/fiche.php b/htdocs/projet/tasks/fiche.php index b5735a56708..9121b8552ea 100644 --- a/htdocs/projet/tasks/fiche.php +++ b/htdocs/projet/tasks/fiche.php @@ -142,7 +142,7 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer) if ($mesg) print '
'.$mesg.'
'; print ''; - print ''; + print ''; print ''; if ($_GET['id']) print ''; if ($_GET['mode']) print ''; @@ -191,7 +191,7 @@ else $param=($_REQUEST["mode"]=='mine'?'&mode=mine':''); print ''; - print ''; + print ''; print '
'; diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 1ec34eac84f..2ec254236fc 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -97,7 +97,7 @@ if ($_GET["id"] > 0) } print ''; - print ''; + print ''; print ''; print '
'; diff --git a/htdocs/projet/tasks/who.php b/htdocs/projet/tasks/who.php index 5ab94eeee5f..dc50877b583 100644 --- a/htdocs/projet/tasks/who.php +++ b/htdocs/projet/tasks/who.php @@ -68,7 +68,7 @@ if ($_GET["id"] > 0) if ($mesg) print $mesg.'
'; print ''; - print ''; + print ''; print ''; print '
'; diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php index abf5134577b..6a67533208b 100644 --- a/htdocs/public/demo/index.php +++ b/htdocs/public/demo/index.php @@ -192,7 +192,7 @@ asort($orders); //var_dump($orders); print ''; -print ''; +print ''; print ''; print "\n"; diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index 788d512fa8c..67a56c2509a 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -238,7 +238,7 @@ print '
  • Les champs Commencant par un * seront affi print "
    \n"; print "\n"; -print ''; +print ''; print ''; print '
    • '."\n"; diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index b47a53f4111..4344f1a4b7b 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -112,7 +112,7 @@ else if (! empty($conf->global->PAYBOX_CREDITOR)) $creditor=$conf->global->PAYBO print '
    '; print ''; -print ''; +print ''; print ''; print ''; print ''; diff --git a/htdocs/searchpostalcode.php b/htdocs/searchpostalcode.php index 070b6277e29..d16fe7df866 100644 --- a/htdocs/searchpostalcode.php +++ b/htdocs/searchpostalcode.php @@ -112,7 +112,7 @@ function change_categorie(urlbase,leselect) print "

    "; // Ouvre 3 div a la place de top_menu car le llxFooter en ferme 3 print ""; -print ''; +print ''; print "
    "; print ""; print "
    "; diff --git a/htdocs/soc.php b/htdocs/soc.php index 8b9ef64168c..49a2e82c747 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -379,7 +379,7 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create') print ''; print ''; - print ''; + print ''; print ''; print ''; if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print ''; @@ -712,7 +712,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit') print ''; print ''; - print ''; + print ''; print ''; if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print ''; @@ -976,7 +976,7 @@ else } print ''; - print ''; + print ''; print ''; // Name diff --git a/htdocs/societe.php b/htdocs/societe.php index 0a176306278..4faa89fd191 100644 --- a/htdocs/societe.php +++ b/htdocs/societe.php @@ -238,7 +238,7 @@ if ($resql) } print ''; - print ''; + print ''; // Lignes des titres print '
    '; diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php index bf7f1c98755..f6efb3eb9b6 100644 --- a/htdocs/societe/notify/fiche.php +++ b/htdocs/societe/notify/fiche.php @@ -140,7 +140,7 @@ if ( $soc->fetch($soc->id) ) print_fiche_titre($langs->trans("AddNewNotification")); print ''; - print ''; + print ''; // Ligne de titres print '
    '; diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index f56143b3fd1..86ffc6c0bff 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -192,7 +192,7 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer if ($message) { print "$message

    \n"; } print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/societe/socnote.php b/htdocs/societe/socnote.php index 4b7261c2ba8..6250363e49e 100644 --- a/htdocs/societe/socnote.php +++ b/htdocs/societe/socnote.php @@ -68,7 +68,7 @@ if ($socid > 0) print ""; - print ''; + print ''; print '
    '; diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index e29204deed6..4914b80bf9b 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -211,7 +211,7 @@ function pHeader($soutitre,$next,$action='none') print '
    '; print ''."\n"; - print ''; + print ''; print ''."\n"; // print '
    '."\n"; diff --git a/htdocs/telephonie/adsl/fiche.php b/htdocs/telephonie/adsl/fiche.php index 090870bb29f..d99f5c4193a 100644 --- a/htdocs/telephonie/adsl/fiche.php +++ b/htdocs/telephonie/adsl/fiche.php @@ -412,7 +412,7 @@ elseif ($_GET["action"] == 'create_line' && $_GET["client"] > 0) else { print "\n"; - print ''; + print ''; print ''; print ''."\n"; if ($_GET['contratid'] > 0) @@ -744,7 +744,7 @@ if ( $user->rights->telephonie->adsl->commander && $ligne->statut == 1) print '
    '; print ''; - print ''; + print ''; print ''; print '
    Commande chez le fournisseur'; print '
    Date de la commande'; @@ -768,7 +768,7 @@ if ( $user->rights->telephonie->adsl->gerer && $ligne->statut == 2) print '
    '; print ''; - print ''; + print ''; print ''; print '
    Activ�e chez le fournisseur'; print "
    Date de l'activation"; @@ -795,7 +795,7 @@ if ( $user->rights->telephonie->adsl->gerer && $ligne->statut == 3) print '
    '; print ''; - print ''; + print ''; print ''; print '
    Programm� sur le backbone'; print "
    Date de la programmation"; @@ -813,7 +813,7 @@ if ( $user->rights->telephonie->adsl->gerer && $ligne->statut == 9) print '
    '; print ''; - print ''; + print ''; print ''; print '
    Livr�e au client'; print "
    Date de la livraison client"; @@ -830,7 +830,7 @@ if ( $user->rights->telephonie->adsl->gerer && $ligne->statut == 4) { print '
    '; print ''; - print ''; + print ''; print ''; print '
    A r�silier'; print '
    Date de r�siliation demand�e'; @@ -846,7 +846,7 @@ if ( $user->rights->telephonie->adsl->gerer && $ligne->statut == 5) { print '
    '; print ''; - print ''; + print ''; print ''; print '
    Demande de r�siliatin fournisseur'; print '
    Date de la demande de r�siliation'; @@ -862,7 +862,7 @@ if ( $user->rights->telephonie->adsl->gerer && $ligne->statut == 6) { print '
    '; print ''; - print ''; + print ''; print ''; print '
    Confirmation de r�siliatin fournisseur'; print '
    Date de la confirmation de r�siliation'; diff --git a/htdocs/telephonie/client/commentaires.php b/htdocs/telephonie/client/commentaires.php index 152bc4c76a2..dcf14eab8f7 100644 --- a/htdocs/telephonie/client/commentaires.php +++ b/htdocs/telephonie/client/commentaires.php @@ -125,7 +125,7 @@ if ($_GET["id"]) print '

    '; print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/telephonie/client/facture.php b/htdocs/telephonie/client/facture.php index cdfa1c4f2d4..e45f20a52c3 100644 --- a/htdocs/telephonie/client/facture.php +++ b/htdocs/telephonie/client/facture.php @@ -305,7 +305,7 @@ if ($_GET["facid"] > 0) if ($fac->brouillon == 1 && $user->rights->facture->creer) { print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/telephonie/client/new.php b/htdocs/telephonie/client/new.php index d11d08ad12a..a7750d89d5d 100644 --- a/htdocs/telephonie/client/new.php +++ b/htdocs/telephonie/client/new.php @@ -635,7 +635,7 @@ if ($user->rights->telephonie->ligne->creer) print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/telephonie/client/permissions.php b/htdocs/telephonie/client/permissions.php index 45ee050e3c5..c13080b5f8f 100644 --- a/htdocs/telephonie/client/permissions.php +++ b/htdocs/telephonie/client/permissions.php @@ -114,7 +114,7 @@ if ($soc->id) print '
    Nouveau
    commentaire'; print '    		% '; print '

    '; print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/telephonie/client/tarifs.php b/htdocs/telephonie/client/tarifs.php index c3d302a97b2..531cd57f7f0 100644 --- a/htdocs/telephonie/client/tarifs.php +++ b/htdocs/telephonie/client/tarifs.php @@ -215,7 +215,7 @@ if ($_GET["id"]) print "
    \n
    \n"; print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/telephonie/config/compta.php b/htdocs/telephonie/config/compta.php index 9faa111dae6..3b5bb05c8ce 100644 --- a/htdocs/telephonie/config/compta.php +++ b/htdocs/telephonie/config/compta.php @@ -58,7 +58,7 @@ print "
    "; */ print_titre("Emails"); print ''; -print ''; +print ''; print '
    '; print ''; print ''; diff --git a/htdocs/telephonie/config/index.php b/htdocs/telephonie/config/index.php index cca6164e0d8..ff549e1d340 100644 --- a/htdocs/telephonie/config/index.php +++ b/htdocs/telephonie/config/index.php @@ -66,7 +66,7 @@ print "
    "; */ print_titre("Emails"); print ''; -print ''; +print ''; print '
    Nom
    '; print ''; print ''; diff --git a/htdocs/telephonie/config/mail.php b/htdocs/telephonie/config/mail.php index 7dd1dc3e63b..cb1ab7916a2 100644 --- a/htdocs/telephonie/config/mail.php +++ b/htdocs/telephonie/config/mail.php @@ -59,7 +59,7 @@ print "
    "; */ print_titre("Emails"); print ''; -print ''; +print ''; print '
    Nom
    '; print ''; print ''; diff --git a/htdocs/telephonie/config/xdsl.php b/htdocs/telephonie/config/xdsl.php index baacc781d74..1398374e540 100644 --- a/htdocs/telephonie/config/xdsl.php +++ b/htdocs/telephonie/config/xdsl.php @@ -80,7 +80,7 @@ dol_fiche_head($head, $hselected, "Configuration des liens xDSL"); print_titre("Fournisseurs"); print ''; -print ''; +print ''; print '
    Nom
    '; $form = new Form($db); diff --git a/htdocs/telephonie/config/xdsl_product.php b/htdocs/telephonie/config/xdsl_product.php index ecd81fb4534..81562c4f655 100644 --- a/htdocs/telephonie/config/xdsl_product.php +++ b/htdocs/telephonie/config/xdsl_product.php @@ -80,7 +80,7 @@ dol_fiche_head($head, $hselected, "Configuration des liens xDSL"); $form = new Form($db); print_titre($langs->trans("Products")); print ''; -print ''; +print ''; print '
    '; $prods = array(); diff --git a/htdocs/telephonie/config/xdsl_wkf.php b/htdocs/telephonie/config/xdsl_wkf.php index ab8d361ba50..1b7762aa4ae 100644 --- a/htdocs/telephonie/config/xdsl_wkf.php +++ b/htdocs/telephonie/config/xdsl_wkf.php @@ -82,7 +82,7 @@ dol_fiche_head($head, $hselected, "Configuration des liens xDSL"); print_titre("Workflow"); print ''; -print ''; +print ''; print '
    '; $form = new Form($db); diff --git a/htdocs/telephonie/contrat/fiche.php b/htdocs/telephonie/contrat/fiche.php index d002d03339d..fdd5e8c858d 100644 --- a/htdocs/telephonie/contrat/fiche.php +++ b/htdocs/telephonie/contrat/fiche.php @@ -230,7 +230,7 @@ elseif ($_GET["action"] == 'create_line' && $_GET["client_comm"] > 0 && $user->r else { print "\n"; - print ''; + print ''; print ''; print ''."\n"; @@ -755,7 +755,7 @@ else print_fiche_titre('Edition du contrat', $mesg); print ''; - print ''; + print ''; print ''; print '
    '; @@ -963,7 +963,7 @@ else print_fiche_titre('Ajouter un contact', $mesg); print ''; - print ''; + print ''; print ''; print '
    '; @@ -1055,7 +1055,7 @@ else print_fiche_titre('Ajouter une prise d\'ordre mensuelle'); print ''; - print ''; + print ''; print ''; print '
    '; print '
    Montant mensuel'; diff --git a/htdocs/telephonie/contrat/services.php b/htdocs/telephonie/contrat/services.php index 9a5e14d982a..36d410100db 100644 --- a/htdocs/telephonie/contrat/services.php +++ b/htdocs/telephonie/contrat/services.php @@ -252,7 +252,7 @@ if ($_GET["id"]) print_fiche_titre('Ajouter un service', $mesg); print ''; - print ''; + print ''; print ''; print ''; print ''; print '
    Service'; diff --git a/htdocs/telephonie/distributeurs/fiche.php b/htdocs/telephonie/distributeurs/fiche.php index aa9a86412c0..a89ae63750e 100644 --- a/htdocs/telephonie/distributeurs/fiche.php +++ b/htdocs/telephonie/distributeurs/fiche.php @@ -86,7 +86,7 @@ if ($_GET["action"] == 'create_commercial') dol_fiche_head($head, $hselected, $distri->nom); print ''; - print ''; + print ''; print '
    '; @@ -121,7 +121,7 @@ $h++; dol_fiche_head($head, $hselected, "Distributeurs"); print ''; - print ''; + print ''; print ''; print '
    '; diff --git a/htdocs/telephonie/facturation/index.php b/htdocs/telephonie/facturation/index.php index 35b5c4ef56e..dbdb65c8c4a 100644 --- a/htdocs/telephonie/facturation/index.php +++ b/htdocs/telephonie/facturation/index.php @@ -131,7 +131,7 @@ print '
    '; print '    		'; print ''; -print ''; +print ''; print ''; print ''; diff --git a/htdocs/telephonie/fournisseur/fiche.php b/htdocs/telephonie/fournisseur/fiche.php index 6dafd4423a7..21b01c9f7fc 100644 --- a/htdocs/telephonie/fournisseur/fiche.php +++ b/htdocs/telephonie/fournisseur/fiche.php @@ -106,7 +106,7 @@ if ($_GET["action"] == 'create') { $fourn = new FournisseurTelephonie($db); print "\n"; - print ''; + print ''; print ''; print_titre("Nouveau fournisseur"); @@ -168,7 +168,7 @@ if ($_GET["id"] > 0) print_titre("Modification fournisseur"); print ''; - print ''; + print ''; print ''; print '
    '; diff --git a/htdocs/telephonie/ligne/commande/retour/index.php b/htdocs/telephonie/ligne/commande/retour/index.php index 0e5a3295e07..e6fcbe8105a 100644 --- a/htdocs/telephonie/ligne/commande/retour/index.php +++ b/htdocs/telephonie/ligne/commande/retour/index.php @@ -103,7 +103,7 @@ else print '
    '; print ''; -print ''; +print ''; print ''; print '
    '; diff --git a/htdocs/telephonie/ligne/commentaires.php b/htdocs/telephonie/ligne/commentaires.php index e63fa65c3d5..047b127bbb1 100644 --- a/htdocs/telephonie/ligne/commentaires.php +++ b/htdocs/telephonie/ligne/commentaires.php @@ -163,7 +163,7 @@ if ($_GET["id"]) print '
    '; print ''; - print ''; + print ''; print '
    '; print ''; diff --git a/htdocs/telephonie/ligne/conso.php b/htdocs/telephonie/ligne/conso.php index 8872994a6be..4e52695101c 100644 --- a/htdocs/telephonie/ligne/conso.php +++ b/htdocs/telephonie/ligne/conso.php @@ -217,7 +217,7 @@ if ($_GET["id"] or $_GET["numero"]) print_barre_liste("CDR", $page, "conso.php", $urladd, $sortfield, $sortorder, '', $num); print ''."\n"; - print ''; + print ''; print '
    Nouveau
    commentaire'; print '
    '."\n"; print ''; print ''; diff --git a/htdocs/telephonie/ligne/fiche.php b/htdocs/telephonie/ligne/fiche.php index c7a088c59b9..327c2fc1bfa 100644 --- a/htdocs/telephonie/ligne/fiche.php +++ b/htdocs/telephonie/ligne/fiche.php @@ -374,7 +374,7 @@ elseif ($_GET["action"] == 'create' && $_GET["contratid"] > 0) else { print ''; - print ''; + print ''; print ''; print ''."\n"; print ''."\n"; @@ -835,7 +835,7 @@ else */ print ''; - print ''; + print ''; print ''; print '
    NumeroDateDuree
    '; print ''; @@ -859,7 +859,7 @@ else */ print ''; - print ''; + print ''; print ''; print '
    Modification de la remise Local/Mobile/National
    '; print ''; @@ -948,7 +948,7 @@ else print_fiche_titre('Edition de la ligne', $mesg); print "id\" method=\"post\">\n"; - print ''; + print ''; print ''; print '
    Migrer vers un autre contrat
    '; @@ -1102,7 +1102,7 @@ else print_fiche_titre('Ajouter un contact', $mesg); print "id\" method=\"post\">\n"; - print ''; + print ''; print ''; print '
    '; @@ -1227,7 +1227,7 @@ if ( $user->rights->telephonie->ligne_commander && $ligne->statut == 3 ) $form = new Form($db); print '
    '; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -1251,7 +1251,7 @@ if ( $user->rights->telephonie->ligne_activer && $ligne->statut == 2 && $ligne-> print '
    Commander la ligne chez un autre fournisseur
    '; print ''; - print ''; + print ''; print ''; print '
    Activer'; print '
    Date'; @@ -1264,7 +1264,7 @@ if ( $user->rights->telephonie->ligne_activer && $ligne->statut == 2 && $ligne-> print ''; - print ''; + print ''; print ''; print '
    Refuser'; print '
    Date'; @@ -1287,7 +1287,7 @@ if ( $user->rights->telephonie->ligne_activer && ( $ligne->statut == 5 || $ligne print '
    '; print ''; - print ''; + print ''; print ''; print '
    Confirmation de la r�siliation'; print '
    Date'; @@ -1313,7 +1313,7 @@ if ( $user->rights->telephonie->ligne->creer && $ligne->statut == 6 && $ligne->t print '
    '; print ''; - print ''; + print ''; print ''; print '
    Recommander la ligne'; print '
    Date'; diff --git a/htdocs/telephonie/ligne/infoc.php b/htdocs/telephonie/ligne/infoc.php index 90f82b88a76..5d92caae554 100644 --- a/htdocs/telephonie/ligne/infoc.php +++ b/htdocs/telephonie/ligne/infoc.php @@ -168,7 +168,7 @@ if ($_GET["id"] or $_GET["numero"]) print_fiche_titre('Edition des informations complementaires de la ligne', $mesg); print "id\" method=\"post\">\n"; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/telephonie/ligne/numdata.php b/htdocs/telephonie/ligne/numdata.php index 0f27d073acc..1cb96235b35 100644 --- a/htdocs/telephonie/ligne/numdata.php +++ b/htdocs/telephonie/ligne/numdata.php @@ -127,7 +127,7 @@ print ''; print ''; print ''; -print ''; +print ''; print ''; print ''; diff --git a/htdocs/telephonie/service/fiche.php b/htdocs/telephonie/service/fiche.php index 7f452f56d38..e5215876cf8 100644 --- a/htdocs/telephonie/service/fiche.php +++ b/htdocs/telephonie/service/fiche.php @@ -102,7 +102,7 @@ if ($_GET["action"] == 'create') print_titre("Nouveau service"); print ''; - print ''; + print ''; print ''; print '
    '; @@ -185,7 +185,7 @@ else print_fiche_titre('Edition du service', $mesg); print "id\" method=\"post\">\n"; - print ''; + print ''; print ''; print '
    '; diff --git a/htdocs/telephonie/tarifs/config/grilles.php b/htdocs/telephonie/tarifs/config/grilles.php index 2b953321954..ef9bc57ba84 100644 --- a/htdocs/telephonie/tarifs/config/grilles.php +++ b/htdocs/telephonie/tarifs/config/grilles.php @@ -118,7 +118,7 @@ print "
    "; if ($_GET["action"] == 'delete') { print '

    '; - print ''; + print ''; print ''; print ''; print ''; @@ -139,7 +139,7 @@ if ($_GET["action"] == 'delete') else { print '

    '; - print ''; + print ''; print ''; print '
    '; diff --git a/htdocs/telephonie/tarifs/config/permissions.php b/htdocs/telephonie/tarifs/config/permissions.php index 02d21940f98..bc5b9ff81c4 100644 --- a/htdocs/telephonie/tarifs/config/permissions.php +++ b/htdocs/telephonie/tarifs/config/permissions.php @@ -129,7 +129,7 @@ if ($resql) $form = new Form($db); print ''; -print ''; +print ''; print ''; print '
    '; print ''; diff --git a/htdocs/telephonie/tarifs/config/tarif.php b/htdocs/telephonie/tarifs/config/tarif.php index 74c0afa15f8..0c27091d4b2 100644 --- a/htdocs/telephonie/tarifs/config/tarif.php +++ b/htdocs/telephonie/tarifs/config/tarif.php @@ -205,7 +205,7 @@ else print '
    '; -print ''; +print ''; print ''; print '
    Grille
    '; diff --git a/htdocs/telephonie/tarifs/config/tarifs.php b/htdocs/telephonie/tarifs/config/tarifs.php index 5fe741a602b..2a4aa9373a2 100644 --- a/htdocs/telephonie/tarifs/config/tarifs.php +++ b/htdocs/telephonie/tarifs/config/tarifs.php @@ -55,7 +55,7 @@ if ($user->societe_id > 0) print ''; -print ''; +print ''; print ''; print '
    '; diff --git a/htdocs/telephonie/tarifs/grille.php b/htdocs/telephonie/tarifs/grille.php index 1b3092f9a46..062ee3d1211 100644 --- a/htdocs/telephonie/tarifs/grille.php +++ b/htdocs/telephonie/tarifs/grille.php @@ -121,7 +121,7 @@ if ($auth_write) { print ''; - print ''; + print ''; print ''; print '
    '; print ''; diff --git a/htdocs/telephonie/tarifs/permissions.php b/htdocs/telephonie/tarifs/permissions.php index f63beb8227d..7923bd61d8c 100644 --- a/htdocs/telephonie/tarifs/permissions.php +++ b/htdocs/telephonie/tarifs/permissions.php @@ -129,7 +129,7 @@ if ($resql) $form = new Form($db); print ''; -print ''; +print ''; print ''; print '
    Modification
    '; print ''; diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php index 5960825054d..6bd440c36f0 100644 --- a/htdocs/user/clicktodial.php +++ b/htdocs/user/clicktodial.php @@ -97,7 +97,7 @@ if ($_GET["id"]) if ($_GET["action"] == 'edit') { print ''; - print ''; + print ''; print ''; print '
    Grille
    '; diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index a6aa2113462..ead6fdd6d30 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -473,7 +473,7 @@ if (($action == 'create') || ($action == 'adduserldap')) print "\n\n\n"; print ''; - print ''; + print ''; print '
    '; print '
    '; print $langs->trans("LDAPUsers"); @@ -492,7 +492,7 @@ if (($action == 'create') || ($action == 'adduserldap')) } print ''; - print ''; + print ''; print ''; if ($ldap_sid) print ''; print ''; @@ -1186,7 +1186,7 @@ else { $form = new Form($db); print ''."\n"; - print ''; + print ''; print ''; print ''."\n"; print ''."\n"; @@ -1265,7 +1265,7 @@ else { print ''; - print ''; + print ''; print ''; print ''; print '
    '.$langs->trans("GroupsToAdd").'
    '; diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php index 6c0e4e2f62a..c205c76b9b0 100644 --- a/htdocs/user/group/fiche.php +++ b/htdocs/user/group/fiche.php @@ -181,7 +181,7 @@ if ($action == 'create') if ($message) { print $message."
    "; } print ''; - print ''; + print ''; print ''; print '
    '; @@ -385,7 +385,7 @@ else { $form = new Form($db); print ''."\n"; - print ''; + print ''; print ''; print '
    '."\n"; print ''."\n"; @@ -478,7 +478,7 @@ else if ($_GET["action"] == 'edit' && $caneditperms) { print ''; - print ''; + print ''; print ''; print '
    '.$langs->trans("NonAffectedUsers").'
    '; diff --git a/htdocs/user/home.php b/htdocs/user/home.php index ddbed2bace4..6e5ecac3025 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -48,7 +48,7 @@ print '
    '; // Recherche User $var=false; print ''; -print ''; +print ''; print ''; print ''; print '
    '.$langs->trans("SearchAUser").'
    '; @@ -60,7 +60,7 @@ print ''; // Recherche Group $var=false; print '
    '; -print ''; +print ''; print ''; print ''; print '
    '.$langs->trans("SearchAGroup").'
    '; diff --git a/htdocs/user/note.php b/htdocs/user/note.php index eac624e9d8b..c94281412d1 100644 --- a/htdocs/user/note.php +++ b/htdocs/user/note.php @@ -88,7 +88,7 @@ if ($id) if ($msg) print '
    '.$msg.'
    '; print ""; - print ''; + print ''; print ''; diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 0837403e529..967f47918a4 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -142,7 +142,7 @@ print '

    '; if ($_GET["action"] == 'edit') { print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php index b3d6424b887..4e6817fa633 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -195,7 +195,7 @@ print ''."\n"; // Form print ''."\n"; -print ''; +print ''; print ''."\n"; // Table 1