diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 2b934e46766..5335f7b057a 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -535,7 +535,6 @@ if ($_GET["id"]) print ''; } - print '
'; print "\n"; diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index b78cd6e5f85..43b85924d25 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -255,10 +255,9 @@ if ($_socid > 0) print ""; - print "
"; - print "\n"; + print ''; // Nbre max d'éléments des petites listes diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 5b9dd9c0566..c3c8fd242ae 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -743,7 +743,7 @@ if ($_GET['propalid']) print ''; } - print '
'; + print ''; } } diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index b60ccd087dc..80eade5d01f 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -176,8 +176,9 @@ if ($propalid > 0) { print '
'.$langs->trans('ErrorCantOpenDir').' '.$upload_dir.'
'; } - print ' '; print ''; + + print ''; } else { diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php index d38c07a299a..51f0c066538 100644 --- a/htdocs/comm/propal/info.php +++ b/htdocs/comm/propal/info.php @@ -84,7 +84,7 @@ if ($_GET['propalid']) dolibarr_print_object_info($propal); print ''; - print '
'; + print ''; $db->close(); } diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php index 310280c0a3e..bc3a00a7916 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.php @@ -135,7 +135,7 @@ if ($_GET['propalid']) } print ''; - print '
'; + print ''; /* diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 1eb6d9520b6..5a2ea9a5cae 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -264,7 +264,7 @@ else print ''.$account->bic.''; print ''.$langs->trans("BankAccountDomiciliation").''; - print $account->domiciliation; + print nl2br($account->domiciliation); print "\n"; print ''.$langs->trans("BankAccountOwner").''; @@ -272,12 +272,11 @@ else print "\n"; print ''.$langs->trans("BankAccountOwnerAddress").''; - print $account->adresse_proprio; + print nl2br($account->adresse_proprio); print "\n"; } print ''; - print '
'; print ''; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index ed48e8386c6..b08cf82ae0a 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -447,7 +447,7 @@ if ($_POST["action"] == 'send' || $_POST["action"] == 'relance') } else { - $msg='
'.$langs->trans("ErrorMailRecipientIsEmpty").' !
'; + $msg='
'.$langs->trans("ErrorMailRecipientIsEmpty").'
'; dolibarr_syslog("Le mail du destinataire est vide"); } @@ -1381,6 +1381,7 @@ else $num = $db->num_rows($resql); if ($num) { + print "
\n"; print_titre($langs->trans("ActionsOnBill")); $i = 0; $total = 0; diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index 47a08ba2094..c92ceab49e8 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -232,7 +232,7 @@ if ($_GET["facid"] > 0) print ''.price($fac->total_ht).''; print ''.$langs->trans("Currency".$conf->monnaie).''; - print "
"; + print ''; } else diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php index 6fa20b20182..2e1005e3f7f 100644 --- a/htdocs/compta/facture/info.php +++ b/htdocs/compta/facture/info.php @@ -21,7 +21,8 @@ * */ -/*! \file htdocs/compta/facture/info.php +/** + \file htdocs/compta/facture/info.php \ingroup facture \brief Page des informations d'une facture \version $Revision$ @@ -68,9 +69,9 @@ print '
'; dolibarr_print_object_info($facture); print '
'; -print "
"; +print ''; $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php index ede3bd87082..04f63265b61 100644 --- a/htdocs/compta/facture/note.php +++ b/htdocs/compta/facture/note.php @@ -129,8 +129,6 @@ if ($_GET["facid"]) print ""; - print "
"; - /* * Actions @@ -150,5 +148,5 @@ if ($_GET["facid"]) $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php index 62cc09596c3..7b3ea144c85 100644 --- a/htdocs/compta/fiche.php +++ b/htdocs/compta/fiche.php @@ -226,12 +226,10 @@ if ($socid > 0) print ""; print ""; - print "
"; - /* - * - */ print "\n"; + + print ''; // Nbre max d'éléments des petites listes diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php index 87c364d95d2..f3614b5bf94 100644 --- a/htdocs/compta/paiement/fiche.php +++ b/htdocs/compta/paiement/fiche.php @@ -181,12 +181,13 @@ else { dolibarr_print_error($db); } +print ""; + /* - * - * + * Boutons Actions */ -print "
"; + print '
'; if ($user->societe_id == 0 && $paiement->statut == 0 && $_GET["action"] == '') @@ -194,14 +195,14 @@ if ($user->societe_id == 0 && $paiement->statut == 0 && $_GET["action"] == '') print ''.$langs->trans("Valid").''; } - if ($user->societe_id == 0 && $allow_delete && $paiement->statut == 0 && $_GET["action"] == '') { print ''.$langs->trans("Delete").''; } print "
"; + $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php index 38e76b8e6a9..98e91ecce9a 100644 --- a/htdocs/compta/paiement/info.php +++ b/htdocs/compta/paiement/info.php @@ -40,7 +40,6 @@ print '
'; print ''.$langs->trans("Payment").''; print ''.$langs->trans("Info").''; print '
'; -print '
'; /* * Visualisation de la fiche @@ -51,12 +50,16 @@ $paiement = new Paiement($db); $paiement->fetch($_GET["id"], $user); $paiement->info($_GET["id"]); +print '
'; + print '
'; print '
'; dolibarr_print_object_info($paiement); -print '
'; print '
'; +print '
'; + + $db->close(); llxFooter('$Date$ - $Revision$'); diff --git a/htdocs/compta/paiement/pre.inc.php b/htdocs/compta/paiement/pre.inc.php index d0fea024421..15930ca5e55 100644 --- a/htdocs/compta/paiement/pre.inc.php +++ b/htdocs/compta/paiement/pre.inc.php @@ -20,9 +20,12 @@ * $Source$ * */ + require("../../main.inc.php"); + $langs->load("bills"); $langs->load("compta"); +$langs->load("propal"); function llxHeader($head = "", $title="") { global $user, $langs; diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index 0ff195d83ec..32828a9ba3a 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -408,7 +408,7 @@ if ($_GET["propalid"]) dolibarr_print_error($db); } - print '
'; + print ''; } } diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 4e6e7953a60..fadf9564367 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -404,7 +404,7 @@ else print $langs->trans($yesno[$contact->facturation]); print ''; - print "
"; + print ""; print "
"; diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php index f2388afe773..ecb0378d29b 100644 --- a/htdocs/contact/info.php +++ b/htdocs/contact/info.php @@ -79,7 +79,7 @@ if ($contact->socid > 0) dolibarr_print_object_info($contact); -print "
"; +print ""; $db->close(); diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index b544df9b247..dc97d201ff1 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -167,7 +167,7 @@ else } print ""; - print "
"; + print ""; print ""; diff --git a/htdocs/contact/pre.inc.php b/htdocs/contact/pre.inc.php index e0f5f0a32d7..d904f4ca6c4 100644 --- a/htdocs/contact/pre.inc.php +++ b/htdocs/contact/pre.inc.php @@ -19,15 +19,14 @@ * $Source$ * */ + require("../main.inc.php"); function llxHeader($head = "", $urlp = "") { - global $user, $conf; + global $langs, $user, $conf; + + $langs->load("propal"); - /* - * - * - */ top_menu($head); $menu = new Menu(); diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index d01036a6616..3a189b2cb02 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -815,7 +815,7 @@ else print ""; } - print "
"; + print ""; /* * Fin Ajout ligne */ diff --git a/htdocs/contrat/info.php b/htdocs/contrat/info.php index b5f61d4f33b..8cfa3e6fd18 100644 --- a/htdocs/contrat/info.php +++ b/htdocs/contrat/info.php @@ -65,7 +65,7 @@ print '
'; dolibarr_print_object_info($contrat); print '
'; -print "
"; +print ''; $db->close(); diff --git a/htdocs/contrat/ligne.php b/htdocs/contrat/ligne.php index d8ec4ecdbf9..ba393363da2 100644 --- a/htdocs/contrat/ligne.php +++ b/htdocs/contrat/ligne.php @@ -341,7 +341,7 @@ if ($id > 0) dolibarr_print_error($db); } - print '
'; + print ''; print ''; if ($user->rights->contrat->activer && $contrat->statut == 1 && $objp->statut <> 4) diff --git a/htdocs/docsoc.php b/htdocs/docsoc.php index 41b8004cf6b..d91692e6600 100644 --- a/htdocs/docsoc.php +++ b/htdocs/docsoc.php @@ -176,7 +176,7 @@ if ($socid > 0) print ''.$langs->trans("TotalSizeOfAttachedFiles").''.$totalsize.' '.$langs->trans("bytes").''; print ''; - print '
'; + print ''; if ($mesg) { print "$mesg
"; } diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 03fa1bca37b..86e0423764f 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -622,7 +622,7 @@ else print ''; } - print "
"; + print ""; print "\n"; } diff --git a/htdocs/fourn/facture/pre.inc.php b/htdocs/fourn/facture/pre.inc.php index 534597bc0b9..bfeb101ce0c 100644 --- a/htdocs/fourn/facture/pre.inc.php +++ b/htdocs/fourn/facture/pre.inc.php @@ -36,6 +36,7 @@ function llxHeader($head = "", $title = "", $addons='') { global $user, $conf, $langs; $langs->load("suppliers"); + $langs->load("propal"); top_menu($head, $title); diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index 8dcb30dfca7..94f14f2961a 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -117,11 +117,10 @@ if ( $societe->fetch($socid) ) * * */ + print ''; print '
'; - /* - * - */ + print ''; print ''; print ''; @@ -132,18 +131,20 @@ if ( $societe->fetch($socid) ) print ''; print '"; - print '
'.$langs->trans("Name").''.$societe->nom.'
'.$langs->trans("Address").''.nl2br($societe->adresse).'
'.$langs->trans("Phone").''.dolibarr_print_phone($societe->tel).' '.$langs->trans("Fax").''.dolibarr_print_phone($societe->fax).' 
'.$langs->trans("Web")."url\">$societe->url 

'; + print '
'; + + /* * */ + print ''; + $var=true; /* - * * Liste des produits - * */ if ($conf->produit->enabled || $conf->service->enabled) { diff --git a/htdocs/fourn/pre.inc.php b/htdocs/fourn/pre.inc.php index a14768f3229..bdf88ec1699 100644 --- a/htdocs/fourn/pre.inc.php +++ b/htdocs/fourn/pre.inc.php @@ -37,6 +37,7 @@ function llxHeader($head = "", $title="", $addons='') { global $user, $conf, $langs; $langs->load("suppliers"); + $langs->load("propal"); top_menu($head, $title); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index e3a5fdaab3b..09885cd3e2b 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -430,7 +430,7 @@ if ($_GET["id"]) print ''; } - print "
\n"; + print "\n"; print "\n"; } diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 12a94a50fbe..5c9b5a44637 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -231,7 +231,7 @@ if ($_GET["id"]) else print $langs->trans("NotOnSell"); print ''; - print '
'; + print ''; print "\n"; diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php index c3781f5da0a..d96307b6bb2 100644 --- a/htdocs/product/photos.php +++ b/htdocs/product/photos.php @@ -162,7 +162,7 @@ if ($_GET["id"]) else print $langs->trans("NotOnSell"); print ''; - print "
\n"; + print "\n"; print "\n"; diff --git a/htdocs/product/price.php b/htdocs/product/price.php index d784ad4685a..2aff2f99f95 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -153,7 +153,7 @@ if ($product->envente) print $langs->trans("OnSell"); else print $langs->trans("NotOnSell"); print ''; -print "
\n"; +print "\n"; print "\n"; diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 172ede44ea1..a9fa28e9726 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -148,7 +148,6 @@ if ($_GET["id"]) print ""; - print "
"; print ''; print_barre_liste($langs->trans("Bills"),$page,"facture.php","&id=$product->id",$sortfield,$sortorder); diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php index 807f8b8c5fb..2dd34266564 100644 --- a/htdocs/product/stats/fiche.php +++ b/htdocs/product/stats/fiche.php @@ -262,8 +262,9 @@ if ($_GET["id"]) } print '['.$langs->trans("ReCalculate").']'; - print '
'; - + print ''; + + print ''; } } else diff --git a/htdocs/soc.php b/htdocs/soc.php index 0bac9ca358b..e052b489295 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -599,7 +599,7 @@ else print ''; - print "
\n"; + print "\n"; /* * */ diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php index e993a434158..08a1e259274 100644 --- a/htdocs/societe/notify/fiche.php +++ b/htdocs/societe/notify/fiche.php @@ -163,7 +163,7 @@ if ( $soc->fetch($soc->id) ) print ''; print ''; print ''; - print '
'.$langs->trans("Name").''.$soc->nom.'
'.$langs->trans("NbOfActiveNotifications").'0 (TODO Nombre non mis a jour)

'; + print ''; print ''; diff --git a/htdocs/socnote.php b/htdocs/socnote.php index c3a6a1d8271..744b8659197 100644 --- a/htdocs/socnote.php +++ b/htdocs/socnote.php @@ -117,7 +117,7 @@ if ($_GET["socid"] > 0) { print '
'; } -print '
'; +print '
'; $db->close(); diff --git a/htdocs/user/addon.php b/htdocs/user/addon.php index 94f2d72c201..0294b221104 100644 --- a/htdocs/user/addon.php +++ b/htdocs/user/addon.php @@ -136,7 +136,6 @@ if ($_GET["id"]) print "\n"; - print "
\n"; print "\n"; diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 4bc96d01c9c..67e3e85ae33 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -469,7 +469,7 @@ else } print "\n"; - print "
\n"; +// print "
\n"; print "\n"; diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php index 6c338b706ef..7927f61c169 100644 --- a/htdocs/user/group/fiche.php +++ b/htdocs/user/group/fiche.php @@ -21,9 +21,9 @@ */ /** - \file htdocs/user/group/fiche.php - \brief Onglet groupes utilisateurs - \version $Revision$ + \file htdocs/user/group/fiche.php + \brief Onglet groupes utilisateurs + \version $Revision$ */ @@ -217,7 +217,6 @@ else print ''.nl2br($group->note).' '; print "\n"; print "\n"; - print "
\n"; print '';