diff --git a/htdocs/adherents/info.php b/htdocs/adherents/info.php index 9fca3b34818..e288e2146e7 100644 --- a/htdocs/adherents/info.php +++ b/htdocs/adherents/info.php @@ -64,10 +64,6 @@ print ''; print ''; -// Juste pour �viter bug IE qui r�organise mal div pr�c�dents si celui-ci absent -print '
'; -print '
'; - $db->close(); diff --git a/htdocs/adherents/info_subscription.php b/htdocs/adherents/info_subscription.php index 2f42188812d..fffe097f11f 100644 --- a/htdocs/adherents/info_subscription.php +++ b/htdocs/adherents/info_subscription.php @@ -78,10 +78,6 @@ print ''; print ''; -// Juste pour �viter bug IE qui r�organise mal div pr�c�dents si celui-ci absent -print '
'; -print '
'; - $db->close(); diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php index 8710ffc95a1..aca84ebff93 100644 --- a/htdocs/comm/action/info.php +++ b/htdocs/comm/action/info.php @@ -76,10 +76,6 @@ print ''; print ''; -// Juste pour �viter bug IE qui r�organise mal div pr�c�dents si celui-ci absent -print '
'; -print '
'; - $db->close(); llxFooter('$Date$ - $Revision$'); diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php index eb1ccd56b08..202eb30f329 100644 --- a/htdocs/comm/propal/apercu.php +++ b/htdocs/comm/propal/apercu.php @@ -172,7 +172,7 @@ if ($_GET["propalid"] > 0) print ''; } print "\n"; - + // Conversion du PDF en image png si fichier png non existant if (! file_exists($fileimage) && ! file_exists($fileimagebis)) { @@ -200,7 +200,7 @@ if ($_GET["propalid"] > 0) } } } - + print ""; print ''; @@ -231,7 +231,7 @@ elseif (file_exists($fileimagebis)) for ($i = 0; $i < 20; $i++) { $preview = $multiple.$i; - + if (file_exists($dir_output.$preview)) { print '

'; @@ -243,10 +243,6 @@ elseif (file_exists($fileimagebis)) print ''; -// Juste pour éviter bug IE qui réorganise mal div précédents si celui-ci absent -print '

'; -print '
'; - $db->close(); diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php index ad4fb299a34..2aae696fd2d 100644 --- a/htdocs/comm/propal/info.php +++ b/htdocs/comm/propal/info.php @@ -64,9 +64,6 @@ print ''; print ''; -// Juste pour �viter bug IE qui r�organise mal div pr�c�dents si celui-ci absent -print '
'; -print '
'; $db->close(); diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php index c1046f09923..278a20b2c78 100644 --- a/htdocs/commande/apercu.php +++ b/htdocs/commande/apercu.php @@ -45,7 +45,7 @@ $langs->load('sendings'); require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php'); require_once(DOL_DOCUMENT_ROOT.'/propal.class.php'); -if ($conf->projet->enabled) +if ($conf->projet->enabled) { require_once(DOL_DOCUMENT_ROOT."/project.class.php"); } @@ -118,7 +118,7 @@ if ($_GET["id"] > 0) { print ' -> '.$propal->ref.''; } print ""; - + // Ref cde client print ''; print ''; } print "
'; @@ -174,7 +174,7 @@ if ($_GET["id"] > 0) { print '
\n"; - + // Conversion du PDF en image png si fichier png non existant if (! file_exists($fileimage) && ! file_exists($fileimagebis)) { @@ -204,7 +204,7 @@ if ($_GET["id"] > 0) { } print ""; - + // Client print "".$langs->trans("Customer").""; @@ -258,7 +258,7 @@ elseif (file_exists($fileimagebis)) for ($i = 0; $i < 20; $i++) { $preview = $multiple.$i; - + if (file_exists($dir_output.$preview)) { print '

'; @@ -270,10 +270,6 @@ elseif (file_exists($fileimagebis)) print ''; -// Juste pour éviter bug IE qui réorganise mal div précédents si celui-ci absent -print '

'; -print '
'; - $db->close(); diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php index cce814102cb..bb038c8c87c 100644 --- a/htdocs/commande/info.php +++ b/htdocs/commande/info.php @@ -59,10 +59,6 @@ print ''; print ''; -// Juste pour eviter bug IE qui reorganise mal div precedents si celui-ci absent -print '
'; -print '
'; - $db->close(); diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php index 87de14ce12f..dcfe4aba58f 100644 --- a/htdocs/compta/bank/info.php +++ b/htdocs/compta/bank/info.php @@ -63,9 +63,6 @@ print ''; print ''; -// Juste pour �viter bug IE qui r�organise mal div pr�c�dents si celui-ci absent -print '
'; -print '
'; $db->close(); diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index 3b91b86a2f3..b53c5dcea65 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -40,7 +40,7 @@ $langs->load("bills"); // S�curit� acc�s client -if ($user->societe_id > 0) +if ($user->societe_id > 0) { $action = ''; $socid = $user->societe_id; @@ -77,7 +77,7 @@ if ($_GET["facid"] > 0) $author->id = $fac->user_author; $author->fetch(); } - + $head = facture_prepare_head($fac); dol_fiche_head($head, 'preview', $langs->trans("InvoiceCustomer")); @@ -87,7 +87,7 @@ if ($_GET["facid"] > 0) */ print ''; $rowspan=3; - + // Reference print ''; @@ -254,11 +254,11 @@ if ($_GET["facid"] > 0) // Facture non trouv�e print $langs->trans("ErrorBillNotFound",$_GET["facid"]); } -} +} // Si fichier png PDF d'1 page trouv� if (file_exists($fileimage)) -{ +{ print ''; } // Si fichier png PDF de plus d'1 page trouv� @@ -269,7 +269,7 @@ elseif (file_exists($fileimagebis)) for ($i = 0; $i < 20; $i++) { $preview = $multiple.$i; - + if (file_exists($dir_output.$preview)) { print '

'; @@ -281,11 +281,6 @@ elseif (file_exists($fileimagebis)) print ''; -// Juste pour �viter bug IE qui r�organise mal div pr�c�dents si celui-ci absent -print '

'; -print '
'; - - $db->close(); llxFooter('$Date$ - $Revision$'); diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php index b8d648bbe02..18db296696b 100644 --- a/htdocs/compta/facture/info.php +++ b/htdocs/compta/facture/info.php @@ -55,10 +55,6 @@ print '
'.$langs->trans('Ref').''.$fac->ref.'
'; print ''; -// Juste pour �viter bug IE qui r�organise mal div pr�c�dents si celui-ci absent -print '
'; -print '
'; - $db->close(); llxFooter('$Date$ - $Revision$'); diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php index 1719160c863..d28bcb26d58 100644 --- a/htdocs/compta/paiement/info.php +++ b/htdocs/compta/paiement/info.php @@ -72,10 +72,6 @@ print ''; print ''; -// Juste pour �viter bug IE qui r�organise mal div pr�c�dents si celui-ci absent -print '
'; -print '
'; - $db->close(); llxFooter('$Date$ - $Revision$'); diff --git a/htdocs/contrat/info.php b/htdocs/contrat/info.php index aed0afba7b9..0c6804b1804 100644 --- a/htdocs/contrat/info.php +++ b/htdocs/contrat/info.php @@ -57,10 +57,6 @@ print ''; print ''; -// Juste pour �viter bug IE qui r�organise mal div pr�c�dents si celui-ci absent -print '
'; -print '
'; - $db->close(); llxFooter('$Date$ - $Revision$'); diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php index d6743452a29..57cd8ae0567 100644 --- a/htdocs/fichinter/apercu.php +++ b/htdocs/fichinter/apercu.php @@ -38,7 +38,7 @@ $langs->load('interventions'); require_once(DOL_DOCUMENT_ROOT.'/fichinter/fichinter.class.php'); -if ($conf->projet->enabled) +if ($conf->projet->enabled) { require_once(DOL_DOCUMENT_ROOT."/project.class.php"); } @@ -148,7 +148,7 @@ if ($_GET["id"] > 0) { print ''; } print "\n"; - + // Conversion du PDF en image png si fichier png non existant if (! file_exists($fileimage) && ! file_exists($fileimagebis)) { @@ -178,7 +178,7 @@ if ($_GET["id"] > 0) { } print ""; - + // Client print "".$langs->trans("Customer").""; @@ -221,7 +221,7 @@ elseif (file_exists($fileimagebis)) for ($i = 0; $i < 20; $i++) { $preview = $multiple.$i; - + if (file_exists($dir_output.$preview)) { print '

'; @@ -233,11 +233,6 @@ elseif (file_exists($fileimagebis)) print ''; -// Juste pour éviter bug IE qui réorganise mal div précédents si celui-ci absent -print '

'; -print '
'; - - $db->close(); llxFooter('$Date$ - $Revision$'); diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php index 4cf3c6d214e..840ce9590ee 100644 --- a/htdocs/fichinter/info.php +++ b/htdocs/fichinter/info.php @@ -61,10 +61,6 @@ print ''; print ''; -// Juste pour �viter bug IE qui r�organise mal div pr�c�dents si celui-ci absent -print '
'; -print '
'; - $db->close(); llxFooter('$Date$ - $Revision$'); diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php index 1c696e80c37..abc1526efe1 100644 --- a/htdocs/fourn/facture/info.php +++ b/htdocs/fourn/facture/info.php @@ -54,10 +54,6 @@ print ''; print ''; -// Juste pour �viter bug IE qui r�organise mal div pr�c�dents si celui-ci absent -print '
'; -print '
'; - $db->close(); llxFooter('$Date$ - $Revision$'); diff --git a/htdocs/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php index 1bd2d98f2db..56ca6178754 100644 --- a/htdocs/fourn/paiement/info.php +++ b/htdocs/fourn/paiement/info.php @@ -62,10 +62,6 @@ print ''; print ''; -// Juste pour �viter bug IE qui r�organise mal div pr�c�dents si celui-ci absent -print '
'; -print '
'; - $db->close(); llxFooter('$Date$ - $Revision$'); diff --git a/htdocs/index.php b/htdocs/index.php index adc07878910..7dd99159ea4 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -701,10 +701,10 @@ if (sizeof($boxarray)) } // Juste pour éviter bug IE qui réorganise mal div précédents si celui-ci absent -if (empty($conf->browser->firefox)) +/*if (empty($conf->browser->firefox)) { print '
 
'; -} +}*/ $db->close(); diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 5f3d8f4f9eb..6e9def767b9 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1022,9 +1022,8 @@ function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch='search',$ * \brief Show HTML footer DIV + BODY + HTML * \remarks Close 2 div * \param foot A text to add in HTML generated page - * \param limitIEbug Not used */ -function llxFooter($foot='',$limitIEbug=1) +function llxFooter($foot='') { global $conf, $dolibarr_auto_user, $micro_start_time; @@ -1062,9 +1061,6 @@ function llxFooter($foot='',$limitIEbug=1) print ''."\n"; } - // Juste pour eviter bug IE qui reorganise mal div precedents si celui-ci absent - //if ($limitIEbug && empty($conf->browser->firefox)) print "\n".'
 
'."\n"; - // If there is some logs in buffer to show if (sizeof($conf->logbuffer)) { diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php index 29c7e1667ce..6172ec79532 100644 --- a/htdocs/product/stats/fiche.php +++ b/htdocs/product/stats/fiche.php @@ -101,14 +101,14 @@ if ($_GET["id"] || $_GET["ref"]) print $product->getLibStatut(2); print ''; - + // Graphs additionels generes pas le script product-graph.php $year = strftime('%Y',time()); - $file = get_exdir($product->id, 3) . "ventes-".$year."-".$product->id.".png"; + $file = get_exdir($product->id, 3) . "ventes-".$year."-".$product->id.".png"; if (file_exists (DOL_DATA_ROOT.'/product/temp/'.$file) ) { print 'Ventes'; - + $url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_product&file='.$file; print 'Ventes'; $file = get_exdir($product->id, 3) . "ventes-".$product->id.".png"; @@ -117,11 +117,11 @@ if ($_GET["id"] || $_GET["ref"]) print ''; } - + print ''; print ''; - - + + // Choice of stats if ($mode == 'bynumber') print ''; else print img_picto('','tick').' '; @@ -132,9 +132,9 @@ if ($_GET["id"] || $_GET["ref"]) else print img_picto('','tick').' '; print $langs->trans("StatsByNumberOfEntities"); if ($mode == 'byunit') print ''; - + print '

'; - + print ''; // Generation des graphs @@ -148,26 +148,26 @@ if ($_GET["id"] || $_GET["ref"]) $mesg = $langs->trans("ErrorCanNotCreateDir",$dir); } } - + $graphfiles=array( - 'propal' =>array('modulepart'=>'productstats_proposals', - 'file' => $product->id.'/propal12m.png', + 'propal' =>array('modulepart'=>'productstats_proposals', + 'file' => $product->id.'/propal12m.png', 'label' => ($mode=='byunit'?$langs->trans("NumberOfUnitsProposals"):$langs->trans("NumberOfProposals"))), - 'orders' =>array('modulepart'=>'productstats_orders', - 'file' => $product->id.'/orders12m.png', + 'orders' =>array('modulepart'=>'productstats_orders', + 'file' => $product->id.'/orders12m.png', 'label' => ($mode=='byunit'?$langs->trans("NumberOfUnitsCustomerOrders"):$langs->trans("NumberOfCustomerOrders"))), - 'invoices' =>array('modulepart'=>'productstats_invoices', - 'file' => $product->id.'/invoices12m.png', + 'invoices' =>array('modulepart'=>'productstats_invoices', + 'file' => $product->id.'/invoices12m.png', 'label' => ($mode=='byunit'?$langs->trans("NumberOfUnitsCustomerInvoices"):$langs->trans("NumberOfCustomerInvoices"))), - 'invoicessuppliers'=>array('modulepart'=>'productstats_invoicessuppliers', - 'file' => $product->id.'/invoicessuppliers12m.png', + 'invoicessuppliers'=>array('modulepart'=>'productstats_invoicessuppliers', + 'file' => $product->id.'/invoicessuppliers12m.png', 'label' => ($mode=='byunit'?$langs->trans("NumberOfUnitsSupplierInvoices"):$langs->trans("NumberOfSupplierInvoices"))), // 'orderssuppliers' =>array('modulepart'=>'productstats_orderssuppliers', 'file' => $product->id.'/orderssuppliers12m.png', 'label' => $langs->trans("Nombre commande fournisseurs sur les 12 derniers mois")), // 'contracts' =>array('modulepart'=>'productstats_contracts', 'file' => $product->id.'/contracts12m.png', 'label' => $langs->trans("Nombre contrats sur les 12 derniers mois")), ); - + $px = new DolGraph(); $mesg = $px->isGraphKo(); if (! $mesg) @@ -175,9 +175,9 @@ if ($_GET["id"] || $_GET["ref"]) foreach($graphfiles as $key => $val) { if (! $graphfiles[$key]['file']) continue; - + $graph_data = array(); - + // \todo Test si deja existant et recent, on ne genere pas if ($key == 'propal') $graph_data = $product->get_nb_propal($socid,$mode); if ($key == 'orders') $graph_data = $product->get_nb_order($socid,$mode); @@ -203,26 +203,26 @@ if ($_GET["id"] || $_GET["ref"]) } } } - + $mesg = $langs->trans("ChartGenerated"); - + // Affichage graphs $i=0; foreach($graphfiles as $key => $val) { if (! $graphfiles[$key]['file']) continue; - + if ($graphfiles == 'propal' && ! $user->right->propale->lire) continue; if ($graphfiles == 'order' && ! $user->right->commande->lire) continue; if ($graphfiles == 'invoices' && ! $user->right->facture->lire) continue; if ($graphfiles == 'invoices_suppliers' && ! $user->right->fournisseur->facture->lire) continue; - - + + if ($i % 2 == 0) print ''; - + // Show graph print ''; - + if ($i % 2 == 1) print ''; - - + + $i++; } - + if ($i % 2 == 1) print ''; - + print '
'; - + print ''; // Label print ''; print ''; print '
'; @@ -248,23 +248,22 @@ if ($_GET["id"] || $_GET["ref"]) print ''.img_picto($langs->trans("ReCalculate"),'refresh').'
'; - + print '
 
'; - - // Juste pour éviter bug IE qui réorganise mal div précédents si celui-ci absent en fin de page + print '
'; print '
'; - + } } else @@ -276,5 +275,4 @@ else $db->close(); llxFooter('$Date$ - $Revision$'); - ?> diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 6387297f88b..479e4171d46 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -219,10 +219,6 @@ foreach ($listofreferent as $key => $value) } } -// Juste pour eviter bug IE qui reorganise mal div pr�c�dents si celui-ci absent -print '
'; -print '
'; - $db->close(); llxFooter('$Date$ - $Revision$'); diff --git a/htdocs/societe/info.php b/htdocs/societe/info.php index 84f409e8116..7f3265b5d50 100644 --- a/htdocs/societe/info.php +++ b/htdocs/societe/info.php @@ -63,9 +63,6 @@ print ''; print ''; -// Juste pour �viter bug IE qui r�organise mal div pr�c�dents si celui-ci absent -print '
'; -print '
'; $db->close();