From e35da2f84d89a509e8b7251641249a256f0d8184 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 14 Aug 2018 09:55:58 +0200 Subject: [PATCH 1/2] Standardize code --- htdocs/modulebuilder/admin/setup.php | 1 + htdocs/modulebuilder/index.php | 4 +--- htdocs/modulebuilder/template/mymoduleindex.php | 2 +- htdocs/modulebuilder/template/myobject_agenda.php | 3 +-- htdocs/modulebuilder/template/myobject_card.php | 1 - htdocs/modulebuilder/template/myobject_document.php | 2 +- htdocs/modulebuilder/template/myobject_note.php | 2 +- htdocs/opensurvey/card.php | 2 +- htdocs/opensurvey/index.php | 4 +--- htdocs/opensurvey/list.php | 2 +- htdocs/opensurvey/wizard/choix_autre.php | 2 +- htdocs/opensurvey/wizard/choix_date.php | 2 +- htdocs/opensurvey/wizard/create_survey.php | 2 +- htdocs/opensurvey/wizard/index.php | 2 +- htdocs/paybox/admin/paybox.php | 1 + htdocs/paypal/admin/paypal.php | 1 + htdocs/printing/admin/printing.php | 2 +- htdocs/printing/index.php | 2 +- htdocs/product/admin/dynamic_prices.php | 1 + htdocs/product/admin/price_rules.php | 2 +- htdocs/product/admin/product.php | 2 +- htdocs/product/admin/product_extrafields.php | 2 +- htdocs/product/admin/product_lot_extrafields.php | 2 +- htdocs/product/admin/product_tools.php | 2 +- htdocs/product/composition/card.php | 3 +-- htdocs/product/dynamic_price/editor.php | 1 + htdocs/product/inventory/card.php | 1 - htdocs/product/stats/card.php | 2 +- htdocs/product/stats/commande.php | 1 + htdocs/product/stats/commande_fournisseur.php | 1 + htdocs/product/stats/contrat.php | 2 +- htdocs/product/stats/facture.php | 1 + htdocs/product/stats/facture_fournisseur.php | 1 + htdocs/product/stats/propal.php | 1 + htdocs/product/stats/supplier_proposal.php | 1 + 35 files changed, 33 insertions(+), 30 deletions(-) diff --git a/htdocs/modulebuilder/admin/setup.php b/htdocs/modulebuilder/admin/setup.php index 5bc1fb7c206..26e64785524 100644 --- a/htdocs/modulebuilder/admin/setup.php +++ b/htdocs/modulebuilder/admin/setup.php @@ -155,5 +155,6 @@ if (GETPOST('withtab', 'alpha')) { print '

'; +// End of page llxFooter(); $db->close(); diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php index 2eb20f48fea..ea3824fc5fb 100644 --- a/htdocs/modulebuilder/index.php +++ b/htdocs/modulebuilder/index.php @@ -2487,8 +2487,6 @@ elseif (! empty($module)) dol_fiche_end(); // End modules - - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/modulebuilder/template/mymoduleindex.php b/htdocs/modulebuilder/template/mymoduleindex.php index f439d4fd9d8..b2b9356217e 100644 --- a/htdocs/modulebuilder/template/mymoduleindex.php +++ b/htdocs/modulebuilder/template/mymoduleindex.php @@ -233,6 +233,6 @@ if (! empty($conf->mymodule->enabled) && $user->rights->mymodule->read) print ''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php index dfd69037baf..7559c874e68 100644 --- a/htdocs/modulebuilder/template/myobject_agenda.php +++ b/htdocs/modulebuilder/template/myobject_agenda.php @@ -256,7 +256,6 @@ if ($object->id > 0) } } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php index 16a83ee7d0d..3f2d9b14dac 100644 --- a/htdocs/modulebuilder/template/myobject_card.php +++ b/htdocs/modulebuilder/template/myobject_card.php @@ -467,7 +467,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea */ } - // End of page llxFooter(); $db->close(); diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php index 9dd021326b0..a2db0266012 100644 --- a/htdocs/modulebuilder/template/myobject_document.php +++ b/htdocs/modulebuilder/template/myobject_document.php @@ -161,6 +161,6 @@ else accessforbidden('',0,0); } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php index d240f07ef53..6063d337679 100644 --- a/htdocs/modulebuilder/template/myobject_note.php +++ b/htdocs/modulebuilder/template/myobject_note.php @@ -159,6 +159,6 @@ if ($id > 0 || ! empty($ref)) dol_fiche_end(); } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php index af75bf4783b..0df6400bcc9 100644 --- a/htdocs/opensurvey/card.php +++ b/htdocs/opensurvey/card.php @@ -430,6 +430,6 @@ if ($object->allow_comments) { print ''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/opensurvey/index.php b/htdocs/opensurvey/index.php index 3b800b748ff..4c60a807445 100644 --- a/htdocs/opensurvey/index.php +++ b/htdocs/opensurvey/index.php @@ -78,8 +78,6 @@ print ''; print ''; - - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php index de8feaad8da..ecb26047e52 100644 --- a/htdocs/opensurvey/list.php +++ b/htdocs/opensurvey/list.php @@ -296,6 +296,6 @@ print ''."\n"; print ''; print ''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/opensurvey/wizard/choix_autre.php b/htdocs/opensurvey/wizard/choix_autre.php index 9acf9d441e2..366842513c8 100644 --- a/htdocs/opensurvey/wizard/choix_autre.php +++ b/htdocs/opensurvey/wizard/choix_autre.php @@ -161,6 +161,6 @@ print ''."\n"; print '


'."\n"; print ''."\n"; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/opensurvey/wizard/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php index fb7312b891c..5aa478d9450 100644 --- a/htdocs/opensurvey/wizard/choix_date.php +++ b/htdocs/opensurvey/wizard/choix_date.php @@ -564,6 +564,6 @@ print ''."\n"; print '



'."\n"; print ''."\n"; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php index 2e33d377ca2..d7c35fdd082 100644 --- a/htdocs/opensurvey/wizard/create_survey.php +++ b/htdocs/opensurvey/wizard/create_survey.php @@ -204,6 +204,6 @@ else print '


'."\n"; print ''."\n"; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/opensurvey/wizard/index.php b/htdocs/opensurvey/wizard/index.php index 4d03b7d2d8f..f15284e2e83 100644 --- a/htdocs/opensurvey/wizard/index.php +++ b/htdocs/opensurvey/wizard/index.php @@ -57,6 +57,6 @@ print '
'; print ''; print ''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php index 4c68abab520..df1a5758478 100644 --- a/htdocs/paybox/admin/paybox.php +++ b/htdocs/paybox/admin/paybox.php @@ -250,5 +250,6 @@ print '

'; include DOL_DOCUMENT_ROOT.'/core/tpl/onlinepaymentlinks.tpl.php'; +// End of page llxFooter(); $db->close(); diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php index 381151cac93..57acfe7390e 100644 --- a/htdocs/paypal/admin/paypal.php +++ b/htdocs/paypal/admin/paypal.php @@ -326,5 +326,6 @@ $token=''; include DOL_DOCUMENT_ROOT.'/core/tpl/onlinepaymentlinks.tpl.php'; +// End of page llxFooter(); $db->close(); diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php index 96dd916290e..b2300c7125a 100644 --- a/htdocs/printing/admin/printing.php +++ b/htdocs/printing/admin/printing.php @@ -361,6 +361,6 @@ if ($mode == 'userconf' && $user->admin) } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/printing/index.php b/htdocs/printing/index.php index 384d0834cc0..47dd65b9f0c 100644 --- a/htdocs/printing/index.php +++ b/htdocs/printing/index.php @@ -68,6 +68,6 @@ foreach ($result as $driver) } } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php index 348380e9b37..4f40c85e2a9 100644 --- a/htdocs/product/admin/dynamic_prices.php +++ b/htdocs/product/admin/dynamic_prices.php @@ -357,5 +357,6 @@ if ($action == 'create_updater' || $action == 'edit_updater') { print ''; } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/product/admin/price_rules.php b/htdocs/product/admin/price_rules.php index 0049daeaa7d..3c6bf5abe8a 100644 --- a/htdocs/product/admin/price_rules.php +++ b/htdocs/product/admin/price_rules.php @@ -200,6 +200,6 @@ print '
print ''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index ea3539d193e..2cdb5c1ca52 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -744,7 +744,7 @@ print ''; print ''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/product/admin/product_extrafields.php b/htdocs/product/admin/product_extrafields.php index 7da3e800468..82eafd230d7 100644 --- a/htdocs/product/admin/product_extrafields.php +++ b/htdocs/product/admin/product_extrafields.php @@ -126,6 +126,6 @@ if ($action == 'edit' && ! empty($attrname)) require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/product/admin/product_lot_extrafields.php b/htdocs/product/admin/product_lot_extrafields.php index 23e87d23476..8e57daf7491 100644 --- a/htdocs/product/admin/product_lot_extrafields.php +++ b/htdocs/product/admin/product_lot_extrafields.php @@ -116,6 +116,6 @@ if ($action == 'edit' && ! empty($attrname)) require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php index ed4480aeaa2..a153e9f1ab6 100644 --- a/htdocs/product/admin/product_tools.php +++ b/htdocs/product/admin/product_tools.php @@ -342,6 +342,6 @@ else print ''; } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php index c3f568a958c..5f91a0e369e 100644 --- a/htdocs/product/composition/card.php +++ b/htdocs/product/composition/card.php @@ -657,7 +657,6 @@ if ($id > 0 || ! empty($ref)) } } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php index 9187775f8e9..baa738c20c5 100644 --- a/htdocs/product/dynamic_price/editor.php +++ b/htdocs/product/dynamic_price/editor.php @@ -244,5 +244,6 @@ print ''; +// End of page llxFooter(); $db->close(); diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php index 80b17a5e31d..d143aa4e3c8 100644 --- a/htdocs/product/inventory/card.php +++ b/htdocs/product/inventory/card.php @@ -409,7 +409,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea */ } - // End of page llxFooter(); $db->close(); diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php index 3982ea7b87e..52ffa0a58c8 100644 --- a/htdocs/product/stats/card.php +++ b/htdocs/product/stats/card.php @@ -433,6 +433,6 @@ if (! $id) dol_fiche_end(); } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index 77941d940df..f85fb375b5a 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -257,5 +257,6 @@ if ($id > 0 || ! empty($ref)) dol_print_error(); } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php index da5c8f24911..ed49d34fbc3 100644 --- a/htdocs/product/stats/commande_fournisseur.php +++ b/htdocs/product/stats/commande_fournisseur.php @@ -265,5 +265,6 @@ if ($id > 0 || ! empty($ref)) { dol_print_error(); } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index c01cbd40530..55ae3a29939 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -236,6 +236,6 @@ else dol_print_error(); } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index d0c75ac90b4..fa4e468a5f9 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -278,5 +278,6 @@ if ($id > 0 || ! empty($ref)) dol_print_error(); } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php index 6bd722220ba..b3f8d1e41c0 100644 --- a/htdocs/product/stats/facture_fournisseur.php +++ b/htdocs/product/stats/facture_fournisseur.php @@ -263,5 +263,6 @@ if ($id > 0 || ! empty($ref)) dol_print_error(); } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index 80256037dfe..a58bb01961e 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -261,5 +261,6 @@ if ($id > 0 || ! empty($ref)) dol_print_error(); } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php index cac015171cf..ca165a7cfd1 100644 --- a/htdocs/product/stats/supplier_proposal.php +++ b/htdocs/product/stats/supplier_proposal.php @@ -260,5 +260,6 @@ if ($id > 0 || ! empty($ref)) dol_print_error(); } +// End of page llxFooter(); $db->close(); From 57f51fda3e55c3bc8aed27211ea4b10c3c08291c Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 15 Aug 2018 12:48:13 +0200 Subject: [PATCH 2/2] Standardize --- htdocs/product/agenda.php | 3 +-- htdocs/product/card.php | 2 +- htdocs/product/document.php | 2 +- htdocs/product/fournisseurs.php | 1 - htdocs/product/index.php | 2 +- htdocs/product/list.php | 2 +- htdocs/product/note.php | 1 + htdocs/product/popuprop.php | 2 +- htdocs/product/price.php | 2 +- htdocs/product/reassort.php | 2 +- htdocs/product/reassortlot.php | 2 +- htdocs/product/stock/card.php | 3 +-- htdocs/product/stock/fiche-valo.php | 1 + htdocs/product/stock/index.php | 2 +- htdocs/product/stock/info.php | 2 +- htdocs/product/stock/list.php | 3 +-- htdocs/product/stock/massstockmove.php | 3 +-- htdocs/product/stock/mouvement.php | 2 +- htdocs/product/stock/product.php | 2 +- htdocs/product/stock/productlot_card.php | 1 - htdocs/product/stock/productlot_list.php | 1 - htdocs/product/stock/replenishorders.php | 1 + htdocs/product/stock/valo.php | 3 +-- htdocs/product/traduction.php | 1 + htdocs/projet/activity/index.php | 3 +-- htdocs/projet/activity/perday.php | 2 +- htdocs/projet/activity/perweek.php | 3 +-- htdocs/projet/admin/project.php | 1 + htdocs/projet/admin/project_extrafields.php | 2 +- htdocs/projet/admin/project_task_extrafields.php | 2 +- htdocs/projet/card.php | 2 +- htdocs/projet/comment.php | 2 +- htdocs/projet/contact.php | 2 +- htdocs/projet/document.php | 2 +- htdocs/projet/element.php | 4 +--- htdocs/projet/ganttview.php | 3 +-- htdocs/projet/index.php | 3 +-- htdocs/projet/info.php | 2 +- htdocs/projet/list.php | 3 +-- htdocs/projet/note.php | 2 +- htdocs/projet/stats/index.php | 2 +- htdocs/projet/tasks.php | 2 +- htdocs/projet/tasks/contact.php | 3 +-- htdocs/projet/tasks/document.php | 3 +-- htdocs/projet/tasks/list.php | 1 + htdocs/projet/tasks/note.php | 2 +- htdocs/projet/tasks/stats/index.php | 2 +- htdocs/projet/tasks/task.php | 2 +- htdocs/projet/tasks/time.php | 2 +- 49 files changed, 46 insertions(+), 57 deletions(-) diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php index 9eee66664d9..2dfe8aa425f 100644 --- a/htdocs/product/agenda.php +++ b/htdocs/product/agenda.php @@ -203,7 +203,6 @@ if ($id > 0 || $ref) } } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/product/card.php b/htdocs/product/card.php index adb127d67f8..2c11b8efd86 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -2187,6 +2187,6 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete') print '
'; } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/product/document.php b/htdocs/product/document.php index 4f6ec9cf403..0b5b7fa6f16 100644 --- a/htdocs/product/document.php +++ b/htdocs/product/document.php @@ -345,6 +345,6 @@ else print $langs->trans("ErrorUnknown"); } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 807b2e5a826..62fb0b8c29f 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -889,7 +889,6 @@ else print $langs->trans("ErrorUnknown"); } - // End of page llxFooter(); $db->close(); diff --git a/htdocs/product/index.php b/htdocs/product/index.php index 89330618879..71cf2636661 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -397,8 +397,8 @@ if (! empty($conf->global->MAIN_SHOW_PRODUCT_ACTIVITY_TRIM)) print ''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/product/list.php b/htdocs/product/list.php index 385187b316e..593711290d3 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -960,6 +960,6 @@ else dol_print_error($db); } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/product/note.php b/htdocs/product/note.php index c0e9d77ea83..8bf30c3d6e0 100644 --- a/htdocs/product/note.php +++ b/htdocs/product/note.php @@ -115,6 +115,7 @@ if ($id > 0 || ! empty($ref)) dol_fiche_end(); } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index d6aa23fe2c0..0d54808ecef 100644 --- a/htdocs/product/popuprop.php +++ b/htdocs/product/popuprop.php @@ -207,6 +207,6 @@ print ""; dol_fiche_end(); - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/product/price.php b/htdocs/product/price.php index e68730acf64..6aa5386de50 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -2197,6 +2197,6 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) } } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index 2e8dfcb36fa..5e72fafbc40 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -391,6 +391,6 @@ else dol_print_error($db); } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php index b4d14ef1231..e4ec3854fb5 100644 --- a/htdocs/product/reassortlot.php +++ b/htdocs/product/reassortlot.php @@ -421,6 +421,6 @@ else dol_print_error($db); } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index 41e70a6fbf9..7e13364d7ca 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -707,7 +707,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) } } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/product/stock/fiche-valo.php b/htdocs/product/stock/fiche-valo.php index 400c6183ca4..d815e56a00b 100644 --- a/htdocs/product/stock/fiche-valo.php +++ b/htdocs/product/stock/fiche-valo.php @@ -140,5 +140,6 @@ if ($_GET["id"]) print ""; } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php index fd2c1d48168..e658b794d4b 100644 --- a/htdocs/product/stock/index.php +++ b/htdocs/product/stock/index.php @@ -185,6 +185,6 @@ if ($resql) //print ''; print ''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php index 4653a56495d..065dd448a8d 100644 --- a/htdocs/product/stock/info.php +++ b/htdocs/product/stock/info.php @@ -73,6 +73,6 @@ dol_print_object_info($object); print ''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php index aba8655fae1..ca6cad1d664 100644 --- a/htdocs/product/stock/list.php +++ b/htdocs/product/stock/list.php @@ -271,7 +271,6 @@ else dol_print_error($db); } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php index 51692a3e9a1..c585b7a7e89 100644 --- a/htdocs/product/stock/massstockmove.php +++ b/htdocs/product/stock/massstockmove.php @@ -462,7 +462,6 @@ print '
'; - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 7e15a4f86ac..c1631b3ff18 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -1173,7 +1173,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete' && $id>0) } */ +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index d2da5abd3e0..9d4ac0fb122 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -994,6 +994,6 @@ if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE)) } } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php index 4c614155042..334ab91ebc4 100644 --- a/htdocs/product/stock/productlot_card.php +++ b/htdocs/product/stock/productlot_card.php @@ -416,7 +416,6 @@ if (empty($action)) } - // End of page llxFooter(); $db->close(); diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php index b0eaccc08fa..8f5c13ceec7 100644 --- a/htdocs/product/stock/productlot_list.php +++ b/htdocs/product/stock/productlot_list.php @@ -551,7 +551,6 @@ else dol_print_error($db); } - // End of page llxFooter(); $db->close(); diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php index ab8176ab186..ce1dd5126a9 100644 --- a/htdocs/product/stock/replenishorders.php +++ b/htdocs/product/stock/replenishorders.php @@ -336,5 +336,6 @@ else dol_print_error($db); } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php index be8ee2d500e..4e3a245060c 100644 --- a/htdocs/product/stock/valo.php +++ b/htdocs/product/stock/valo.php @@ -157,7 +157,6 @@ else dol_print_error($db); } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php index c96e1c0f025..4c344786553 100644 --- a/htdocs/product/traduction.php +++ b/htdocs/product/traduction.php @@ -354,5 +354,6 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service print '
'; } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index 53818220081..2ed1bb1498f 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -576,7 +576,6 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_S print '
'; - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index 0943d8dd428..f4caef2b5ad 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -710,6 +710,6 @@ if ($conf->use_javascript_ajax) print ''; } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php index b22ed6ee71a..200851b6307 100644 --- a/htdocs/projet/activity/perweek.php +++ b/htdocs/projet/activity/perweek.php @@ -749,7 +749,6 @@ if ($conf->use_javascript_ajax) print ''; } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php index 80a13582d4d..f82a71514c4 100644 --- a/htdocs/projet/admin/project.php +++ b/htdocs/projet/admin/project.php @@ -910,5 +910,6 @@ print ''; print ''; +// End of page llxFooter(); $db->close(); diff --git a/htdocs/projet/admin/project_extrafields.php b/htdocs/projet/admin/project_extrafields.php index d247408079c..8f39a20f762 100644 --- a/htdocs/projet/admin/project_extrafields.php +++ b/htdocs/projet/admin/project_extrafields.php @@ -113,6 +113,6 @@ if ($action == 'edit' && ! empty($attrname)) require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/projet/admin/project_task_extrafields.php b/htdocs/projet/admin/project_task_extrafields.php index 32e4af98f89..90729840035 100644 --- a/htdocs/projet/admin/project_task_extrafields.php +++ b/htdocs/projet/admin/project_task_extrafields.php @@ -112,6 +112,6 @@ if ($action == 'edit' && ! empty($attrname)) require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 56c04614a55..2a5793a3c0e 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -1288,6 +1288,6 @@ else print $langs->trans("RecordNotFound"); } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php index f152d6b4608..7f547feffb3 100644 --- a/htdocs/projet/comment.php +++ b/htdocs/projet/comment.php @@ -183,6 +183,6 @@ print '
'; // Include comment tpl view include DOL_DOCUMENT_ROOT . '/core/tpl/bloc_comment.tpl.php'; - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index 2f4c265f577..f7edf686eb2 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -266,6 +266,6 @@ if ($id > 0 || ! empty($ref)) } } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php index 8854f928b43..3af813ba698 100644 --- a/htdocs/projet/document.php +++ b/htdocs/projet/document.php @@ -158,6 +158,6 @@ else dol_print_error('','NoRecordFound'); } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 79b2be5b009..28cc833eeb2 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -1181,10 +1181,8 @@ if ($conf->use_javascript_ajax) print $comboenhancement; } - - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index da418680376..a1ac7c32aaa 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -364,7 +364,6 @@ else print '
'.$langs->trans("NoTasks").'
'; } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 906cb3783f1..50143057205 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -318,7 +318,6 @@ if (! empty($conf->global->PROJECT_SHOW_PROJECT_LIST_ON_PROJECT_AREA)) print ''; - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php index 64bc17aa749..31d633e70d1 100644 --- a/htdocs/projet/info.php +++ b/htdocs/projet/info.php @@ -191,6 +191,6 @@ if (!empty($object->id)) show_actions_done($conf,$langs,$db,$object,null,0,$actioncode, '', $filters, $sortfield, $sortorder); } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index 779091d069f..9ea8e133102 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -919,7 +919,6 @@ print "\n"; print ''; print "\n"; - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php index 8a16d3d5e42..96dce3da63f 100644 --- a/htdocs/projet/note.php +++ b/htdocs/projet/note.php @@ -118,6 +118,6 @@ if ($id > 0 || ! empty($ref)) dol_fiche_end(); } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php index 38e9bc327bc..46c6248ebd3 100644 --- a/htdocs/projet/stats/index.php +++ b/htdocs/projet/stats/index.php @@ -373,6 +373,6 @@ print $stringtoshow; print ''; print '
'; - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index bf2ddf33890..17d245f94bf 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -724,6 +724,6 @@ else if ($id > 0 || ! empty($ref)) } } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index 6ed9af89385..f27ff3393f5 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -531,7 +531,6 @@ if (is_object($hookmanager)) $reshook=$hookmanager->executeHooks('formContactTpl',$parameters,$object,$action); } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php index 74cbba539b3..4e8e1319aa3 100644 --- a/htdocs/projet/tasks/document.php +++ b/htdocs/projet/tasks/document.php @@ -292,7 +292,6 @@ else exit; } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index 7a97de16f52..2366ccc738b 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -841,5 +841,6 @@ print ''; print ''; +// End of page llxFooter(); $db->close(); diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php index 2fd47827d6a..ebd4210ff6e 100644 --- a/htdocs/projet/tasks/note.php +++ b/htdocs/projet/tasks/note.php @@ -247,6 +247,6 @@ if ($object->id > 0) dol_fiche_end(); } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php index fa9ebcf3b52..68b52339ebb 100644 --- a/htdocs/projet/tasks/stats/index.php +++ b/htdocs/projet/tasks/stats/index.php @@ -212,6 +212,6 @@ print $stringtoshow; print ''; print '
'; - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index ace9ab21a29..7b4a9d25537 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -626,6 +626,6 @@ if ($id > 0 || ! empty($ref)) } } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index f3271535bcd..4c2e60f05b2 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -1153,6 +1153,6 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) } } - +// End of page llxFooter(); $db->close();