diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php index fdbb86d1a62..d015d8f07b5 100644 --- a/htdocs/accountancy/admin/card.php +++ b/htdocs/accountancy/admin/card.php @@ -252,7 +252,7 @@ if ($action == 'create') { print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -314,7 +314,7 @@ if ($action == 'create') { print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -364,7 +364,7 @@ if ($action == 'create') { print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); /* * Actions buttons diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php index db17be68e1e..eefe62a47a4 100644 --- a/htdocs/accountancy/admin/categories.php +++ b/htdocs/accountancy/admin/categories.php @@ -146,7 +146,7 @@ if (!empty($cat_id)) print ''; -dol_fiche_end(); +print dol_get_fiche_end(); print ''; diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php index 97b92bdd172..aa10c0101c1 100644 --- a/htdocs/accountancy/admin/fiscalyear_card.php +++ b/htdocs/accountancy/admin/fiscalyear_card.php @@ -187,7 +187,7 @@ if ($action == 'create') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -248,7 +248,7 @@ if ($action == 'create') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); } else { /* * Confirm delete @@ -296,7 +296,7 @@ if ($action == 'create') print ""; - dol_fiche_end(); + print dol_get_fiche_end(); if (!empty($user->rights->accounting->fiscalyear->write)) { diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php index 6a9fdcbffff..ef9ebe3f9b9 100644 --- a/htdocs/accountancy/bookkeeping/card.php +++ b/htdocs/accountancy/bookkeeping/card.php @@ -386,7 +386,7 @@ if ($action == 'create') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -573,7 +573,7 @@ if ($action == 'create') print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; @@ -719,7 +719,7 @@ if ($action == 'create') } } -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php index 9e21a712e7e..8e6387d4608 100644 --- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php +++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php @@ -141,7 +141,7 @@ $linkback = 'socid ? 0 : 1), 'rowid', 'nom', '', '', 0, '', '', 'arearefnobottom'); -dol_fiche_end(); +print dol_get_fiche_end(); $sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, "; $sql .= " bk.subledger_account, bk.numero_compte , bk.label_compte, bk.debit, "; diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php index 4343946a85e..1a37bb1019b 100644 --- a/htdocs/accountancy/customer/card.php +++ b/htdocs/accountancy/customer/card.php @@ -137,7 +137,7 @@ if (!empty($id)) { print ''; print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php index 153717d05e4..67c790a9c36 100644 --- a/htdocs/accountancy/expensereport/card.php +++ b/htdocs/accountancy/expensereport/card.php @@ -146,7 +146,7 @@ if (!empty($id)) { print ''; print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php index bee34f291f5..d6b289a76c8 100644 --- a/htdocs/accountancy/supplier/card.php +++ b/htdocs/accountancy/supplier/card.php @@ -141,7 +141,7 @@ if (!empty($id)) { print ''; print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index 07d4454feae..17d5f51d6eb 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -246,7 +246,7 @@ $helptext .= '__YEAR__, __MONTH__, __DAY__'; form_constantes($constantes, 0, $helptext); -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/adherents/admin/adherent_emails.php b/htdocs/adherents/admin/adherent_emails.php index e5b612e3d86..4374d281895 100644 --- a/htdocs/adherents/admin/adherent_emails.php +++ b/htdocs/adherents/admin/adherent_emails.php @@ -136,7 +136,7 @@ form_constantes($constantes, 0, $helptext); //print '
'; //print ''; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php index 689e7c11be3..ae4f1989114 100644 --- a/htdocs/adherents/admin/adherent_extrafields.php +++ b/htdocs/adherents/admin/adherent_extrafields.php @@ -74,7 +74,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Members"), -1, 'use require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/adherents/admin/adherent_type_extrafields.php b/htdocs/adherents/admin/adherent_type_extrafields.php index 9fef3ad5c21..92b5ed990e3 100644 --- a/htdocs/adherents/admin/adherent_type_extrafields.php +++ b/htdocs/adherents/admin/adherent_type_extrafields.php @@ -77,7 +77,7 @@ print dol_get_fiche_head($head, 'attributes_type', $langs->trans("Members"), -1, require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php index beaf05ce3fa..330568c20bf 100644 --- a/htdocs/adherents/admin/website.php +++ b/htdocs/adherents/admin/website.php @@ -208,7 +208,7 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) { } -dol_fiche_end(); +print dol_get_fiche_end(); print ''; diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php index c0b5998f035..3af330f0066 100644 --- a/htdocs/adherents/agenda.php +++ b/htdocs/adherents/agenda.php @@ -133,7 +133,7 @@ if ($object->id > 0) { print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); //print '
'; diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index 128b915ef0f..4bffb8bc0db 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -969,7 +969,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { print ''; print "\n"; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -1229,7 +1229,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php'; print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -1608,7 +1608,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { print "
\n"; print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); /* diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php index 0f6e6250796..cb6384cfb63 100644 --- a/htdocs/adherents/document.php +++ b/htdocs/adherents/document.php @@ -145,7 +145,7 @@ if ($id > 0) { print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); $modulepart = 'member'; $permission = $user->rights->adherent->creer; diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php index 80fdfc99479..14d886b6cc4 100644 --- a/htdocs/adherents/ldap.php +++ b/htdocs/adherents/ldap.php @@ -128,7 +128,7 @@ print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); /* * Barre d'actions diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index 4026dded2a2..1ce2da4751b 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -112,7 +112,7 @@ if ($id) { include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; - dol_fiche_end(); + print dol_get_fiche_end(); } // End of page diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php index 0a5bee034c2..cd0f90d27c6 100644 --- a/htdocs/adherents/stats/byproperties.php +++ b/htdocs/adherents/stats/byproperties.php @@ -173,7 +173,7 @@ foreach ($data as $val) { print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php index 44da065d888..7d05678263a 100644 --- a/htdocs/adherents/stats/geo.php +++ b/htdocs/adherents/stats/geo.php @@ -299,7 +299,7 @@ if ($mode) { } -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php index a3c77e1c64a..472a93cfce7 100644 --- a/htdocs/adherents/stats/index.php +++ b/htdocs/adherents/stats/index.php @@ -219,7 +219,7 @@ print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php index 9c9589eaec2..915a3e77176 100644 --- a/htdocs/adherents/subscription.php +++ b/htdocs/adherents/subscription.php @@ -555,7 +555,7 @@ if ($rowid > 0) { print "\n"; print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); print ''; @@ -1020,7 +1020,7 @@ if ($rowid > 0) { print ''; print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php index 7dd6f3f0e66..6479b5c479f 100644 --- a/htdocs/adherents/subscription/card.php +++ b/htdocs/adherents/subscription/card.php @@ -232,7 +232,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') { print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -335,7 +335,7 @@ if ($rowid && $action != 'edit') { print ''; - dol_fiche_end(); + print dol_get_fiche_end(); /* * Barre d'actions diff --git a/htdocs/adherents/subscription/info.php b/htdocs/adherents/subscription/info.php index cbc659df766..a7a4a897505 100644 --- a/htdocs/adherents/subscription/info.php +++ b/htdocs/adherents/subscription/info.php @@ -72,7 +72,7 @@ print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 3d9dc7ace60..d1573f316f9 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -358,7 +358,7 @@ if ($action == 'create') { print ''; print "\n"; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -433,7 +433,7 @@ if ($rowid > 0) { print ''; print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); /* * Buttons @@ -759,7 +759,7 @@ if ($rowid > 0) { print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; diff --git a/htdocs/adherents/type_ldap.php b/htdocs/adherents/type_ldap.php index f743de5421a..d8deebba9ba 100644 --- a/htdocs/adherents/type_ldap.php +++ b/htdocs/adherents/type_ldap.php @@ -114,7 +114,7 @@ print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); /* * Action bar diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php index 971d8411640..6cf349270e8 100644 --- a/htdocs/adherents/type_translation.php +++ b/htdocs/adherents/type_translation.php @@ -166,7 +166,7 @@ $linkback = ''.$langs->tra dol_banner_tab($object, 'rowid', $linkback); -dol_fiche_end(); +print dol_get_fiche_end(); @@ -272,7 +272,7 @@ if ($action == 'add' && $user->rights->adherent->configurer) { print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php index fa459ceb926..0cd9dd52648 100644 --- a/htdocs/admin/agenda.php +++ b/htdocs/admin/agenda.php @@ -197,7 +197,7 @@ if (!empty($triggers)) print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; print ''; diff --git a/htdocs/admin/agenda_extrafields.php b/htdocs/admin/agenda_extrafields.php index 476bad8ce75..0c46e84dff6 100644 --- a/htdocs/admin/agenda_extrafields.php +++ b/htdocs/admin/agenda_extrafields.php @@ -78,7 +78,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Agenda"), -1, 'acti require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php index d29ba6c4830..c743ed06e55 100644 --- a/htdocs/admin/agenda_extsites.php +++ b/htdocs/admin/agenda_extsites.php @@ -224,7 +224,7 @@ while ($i <= $MAXAGENDA) print ''; -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; print ''; diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php index e6f0885a6cb..a31c4ed1dbe 100644 --- a/htdocs/admin/agenda_other.php +++ b/htdocs/admin/agenda_other.php @@ -376,7 +376,7 @@ print ''."\n"; print ''; -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php index 0f8b64c48b1..51a9d4f327b 100644 --- a/htdocs/admin/agenda_reminder.php +++ b/htdocs/admin/agenda_reminder.php @@ -229,7 +229,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL == 2) print ''; -dol_fiche_end(); +print dol_get_fiche_end(); //print '
'; diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php index 83fc2155236..fd80a545aa5 100644 --- a/htdocs/admin/agenda_xcal.php +++ b/htdocs/admin/agenda_xcal.php @@ -135,7 +135,7 @@ print ""; print ''; -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; print "trans("Save")."\">"; diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php index 71891c9c08d..c8157a40d81 100644 --- a/htdocs/admin/bank.php +++ b/htdocs/admin/bank.php @@ -495,7 +495,7 @@ if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE) { print "\n"; print ''; -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; print ''; diff --git a/htdocs/admin/bank_extrafields.php b/htdocs/admin/bank_extrafields.php index a554aa4a3cf..7ad9e1d0f23 100644 --- a/htdocs/admin/bank_extrafields.php +++ b/htdocs/admin/bank_extrafields.php @@ -75,7 +75,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("BankSetupModule"), require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/admin/bom_extrafields.php b/htdocs/admin/bom_extrafields.php index a1dd1cde985..8ae26587ebd 100644 --- a/htdocs/admin/bom_extrafields.php +++ b/htdocs/admin/bom_extrafields.php @@ -74,7 +74,7 @@ print dol_get_fiche_head($head, 'bom_extrafields', $langs->trans("ExtraFields"), require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php index c5cf9b2eee9..4fee30d274e 100644 --- a/htdocs/admin/chequereceipts.php +++ b/htdocs/admin/chequereceipts.php @@ -266,7 +266,7 @@ print "
"; print ''."\n"; -dol_fiche_end(); +print dol_get_fiche_end(); print ''; diff --git a/htdocs/admin/commande_fournisseur_dispatch_extrafields.php b/htdocs/admin/commande_fournisseur_dispatch_extrafields.php index 3642205e158..98a98a7ec2c 100644 --- a/htdocs/admin/commande_fournisseur_dispatch_extrafields.php +++ b/htdocs/admin/commande_fournisseur_dispatch_extrafields.php @@ -83,7 +83,7 @@ print dol_get_fiche_head($head, 'attributeslines_reception', $langs->trans("Rece require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index 6ba10068c4c..b7065a230bd 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -488,7 +488,7 @@ print '
'; print ''; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php index 2dd5af492aa..2e8d29500ed 100644 --- a/htdocs/admin/dav.php +++ b/htdocs/admin/dav.php @@ -148,7 +148,7 @@ if ($action == 'edit') } -dol_fiche_end(); +print dol_get_fiche_end(); /*print '
'; print "trans("Save")."\">"; diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php index 3d2bc3121d3..e3006635b39 100644 --- a/htdocs/admin/defaultvalues.php +++ b/htdocs/admin/defaultvalues.php @@ -401,7 +401,7 @@ if ($result) print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); print "\n"; diff --git a/htdocs/admin/delivery_extrafields.php b/htdocs/admin/delivery_extrafields.php index 38628fa171b..c0ed636abac 100644 --- a/htdocs/admin/delivery_extrafields.php +++ b/htdocs/admin/delivery_extrafields.php @@ -80,7 +80,7 @@ print dol_get_fiche_head($head, 'attributes_receivings', $langs->trans("Receivin require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/admin/deliverydet_extrafields.php b/htdocs/admin/deliverydet_extrafields.php index 50dea86c2a5..50032e8f793 100644 --- a/htdocs/admin/deliverydet_extrafields.php +++ b/htdocs/admin/deliverydet_extrafields.php @@ -81,7 +81,7 @@ print dol_get_fiche_head($head, 'attributeslines_receivings', $langs->trans("Rec require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/admin/ecm_directories_extrafields.php b/htdocs/admin/ecm_directories_extrafields.php index da1fcdbfae5..3179c01960c 100644 --- a/htdocs/admin/ecm_directories_extrafields.php +++ b/htdocs/admin/ecm_directories_extrafields.php @@ -84,7 +84,7 @@ print dol_get_fiche_head($head, 'attributes_ecm_directories', $langs->trans("ECM require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/admin/ecm_files_extrafields.php b/htdocs/admin/ecm_files_extrafields.php index 20c379532b8..9fc297fd37a 100644 --- a/htdocs/admin/ecm_files_extrafields.php +++ b/htdocs/admin/ecm_files_extrafields.php @@ -84,7 +84,7 @@ print dol_get_fiche_head($head, 'attributes_ecm_files', $langs->trans("ECM"), -1 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php index 71b25dde669..7a48883fd55 100644 --- a/htdocs/admin/emailcollector_card.php +++ b/htdocs/admin/emailcollector_card.php @@ -261,7 +261,7 @@ if ($action == 'create') { print ''."\n"; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -295,7 +295,7 @@ if (($id || $ref) && $action == 'edit') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print '   '; @@ -655,7 +655,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea print '

'; - dol_fiche_end(); + print dol_get_fiche_end(); // Buttons for actions if ($action != 'presend' && $action != 'editline') { diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php index 37e19acc13b..b75606f739c 100644 --- a/htdocs/admin/events.php +++ b/htdocs/admin/events.php @@ -125,7 +125,7 @@ foreach ($eventstolog as $key => $arr) } print ''; -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; print "trans("Save")."\">"; diff --git a/htdocs/admin/expedition_extrafields.php b/htdocs/admin/expedition_extrafields.php index bd46148175a..901caf58c00 100644 --- a/htdocs/admin/expedition_extrafields.php +++ b/htdocs/admin/expedition_extrafields.php @@ -80,7 +80,7 @@ print dol_get_fiche_head($head, 'attributes_shipment', $langs->trans("Sendings") require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/admin/expeditiondet_extrafields.php b/htdocs/admin/expeditiondet_extrafields.php index 669b4c56a64..a61581ce18a 100644 --- a/htdocs/admin/expeditiondet_extrafields.php +++ b/htdocs/admin/expeditiondet_extrafields.php @@ -81,7 +81,7 @@ print dol_get_fiche_head($head, 'attributeslines_shipment', $langs->trans("Sendi require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php index 2466fbe7cab..fb2782d3aa7 100644 --- a/htdocs/admin/expensereport.php +++ b/htdocs/admin/expensereport.php @@ -480,7 +480,7 @@ print '
'; print ''; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/admin/expensereport_extrafields.php b/htdocs/admin/expensereport_extrafields.php index 51b82e64d4f..ac88ec78912 100644 --- a/htdocs/admin/expensereport_extrafields.php +++ b/htdocs/admin/expensereport_extrafields.php @@ -74,7 +74,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("ExpenseReports"), - require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/admin/expensereport_ik.php b/htdocs/admin/expensereport_ik.php index f798aaf2c60..2e00d0d8ff9 100644 --- a/htdocs/admin/expensereport_ik.php +++ b/htdocs/admin/expensereport_ik.php @@ -180,7 +180,7 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab) echo ''; echo ''; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php index 52f690801cc..9a4bf2804b2 100644 --- a/htdocs/admin/expensereport_rules.php +++ b/htdocs/admin/expensereport_rules.php @@ -338,7 +338,7 @@ echo ''; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/admin/export.php b/htdocs/admin/export.php index bf1a514df90..5dd541b34b5 100644 --- a/htdocs/admin/export.php +++ b/htdocs/admin/export.php @@ -103,7 +103,7 @@ print ''; print ''; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index ff3953822f4..35dd1002b12 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -802,7 +802,7 @@ print ''; print "
\n"; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php index e4f87bbd4be..7ef9e216ad9 100644 --- a/htdocs/admin/facture_situation.php +++ b/htdocs/admin/facture_situation.php @@ -140,7 +140,7 @@ _updateBtn(); print ''; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php index 87319d7b5dd..44b7034064b 100644 --- a/htdocs/admin/holiday.php +++ b/htdocs/admin/holiday.php @@ -282,7 +282,7 @@ print '
'; if ($conf->global->MAIN_FEATURES_LEVEL < 2) { - dol_fiche_end(); + print dol_get_fiche_end(); // End of page llxFooter(); $db->close(); @@ -501,7 +501,7 @@ print ''; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/admin/holiday_extrafields.php b/htdocs/admin/holiday_extrafields.php index 4c7ef209e21..1205b592e5f 100644 --- a/htdocs/admin/holiday_extrafields.php +++ b/htdocs/admin/holiday_extrafields.php @@ -74,7 +74,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Holidays"), -1, 'ho require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/admin/import.php b/htdocs/admin/import.php index 598bab92c10..e70d8eadbba 100644 --- a/htdocs/admin/import.php +++ b/htdocs/admin/import.php @@ -93,7 +93,7 @@ print ''; print ''; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php index 8bab5c4e968..b8c207644c6 100644 --- a/htdocs/admin/ldap.php +++ b/htdocs/admin/ldap.php @@ -251,7 +251,7 @@ print ''.$langs->trans('Password').' (ex: secret)'; print ''; -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php index 8923bb26d20..b29fa00e49e 100644 --- a/htdocs/admin/ldap_contacts.php +++ b/htdocs/admin/ldap_contacts.php @@ -246,7 +246,7 @@ print ''; print info_admin($langs->trans("LDAPDescValues")); -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php index 9a3aa4c706a..9de9c195f8f 100644 --- a/htdocs/admin/ldap_groups.php +++ b/htdocs/admin/ldap_groups.php @@ -180,7 +180,7 @@ print ''; print info_admin($langs->trans("LDAPDescValues")); -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php index 3bcd6c27dbc..214a4f2cb9b 100644 --- a/htdocs/admin/ldap_members.php +++ b/htdocs/admin/ldap_members.php @@ -366,7 +366,7 @@ print ''; print info_admin($langs->trans("LDAPDescValues")); -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; diff --git a/htdocs/admin/ldap_members_types.php b/htdocs/admin/ldap_members_types.php index 3641947d6d1..489e6047f9b 100644 --- a/htdocs/admin/ldap_members_types.php +++ b/htdocs/admin/ldap_members_types.php @@ -162,7 +162,7 @@ print ''; print info_admin($langs->trans("LDAPDescValues")); -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php index a46c98645e1..efb34cca413 100644 --- a/htdocs/admin/ldap_users.php +++ b/htdocs/admin/ldap_users.php @@ -336,7 +336,7 @@ print ''; print info_admin($langs->trans("LDAPDescValues")); -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index 89d0c58e4df..82e28f3cf73 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -201,7 +201,7 @@ if (!empty($conf->multicurrency->enabled) && !empty($conf->global->MULTICURRENCY { if (!empty($aCurrencies) && count($aCurrencies) > 1) { - dol_fiche_end(); + print dol_get_fiche_end(); } } diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php index 977d27c0866..58e904f02ce 100644 --- a/htdocs/admin/mailman.php +++ b/htdocs/admin/mailman.php @@ -198,7 +198,7 @@ if (!empty($conf->global->ADHERENT_USE_MAILMAN)) print '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'
'; print '%LISTE%, %MAILMAN_ADMINPW%, %EMAIL%
'; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; @@ -212,7 +212,7 @@ if (!empty($conf->global->ADHERENT_USE_MAILMAN)) $link .= ''; print load_fiche_titre($langs->trans('MailmanTitle'), $link, ''); - dol_fiche_end(); + print dol_get_fiche_end(); } diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index c3792812210..cc81c78255d 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -506,7 +506,7 @@ if ($action == 'edit') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -737,7 +737,7 @@ if ($action == 'edit') print ''; } - dol_fiche_end(); + print dol_get_fiche_end(); // Actions button @@ -892,7 +892,7 @@ if ($action == 'edit') print $formmail->get_form('addfile', 'removefile'); - dol_fiche_end(); + print dol_get_fiche_end(); // References print ''.$langs->trans("EMailsWillHaveMessageID").': '; diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php index ebc3201dcdf..a464c0fca8e 100644 --- a/htdocs/admin/mails_emailing.php +++ b/htdocs/admin/mails_emailing.php @@ -384,7 +384,7 @@ if ($action == 'edit') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -475,7 +475,7 @@ if ($action == 'edit') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); if ($conf->global->MAIN_MAIL_SENDMODE_EMAILING == 'mail' && empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)) @@ -599,7 +599,7 @@ if ($action == 'edit') print $formmail->get_form('addfile', 'removefile'); - dol_fiche_end(); + print dol_get_fiche_end(); } } diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php index 6f80706276e..4556ec80bff 100644 --- a/htdocs/admin/mails_senderprofile_list.php +++ b/htdocs/admin/mails_senderprofile_list.php @@ -645,7 +645,7 @@ if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $n print $formfile->showdocuments('massfilesarea_emailsenderprofile', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty); } -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php index 4dfdc413af5..8cbd9675160 100644 --- a/htdocs/admin/mails_templates.php +++ b/htdocs/admin/mails_templates.php @@ -953,7 +953,7 @@ print '
'; print ''; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php index 0be41dce273..e0a42ee3a2d 100644 --- a/htdocs/admin/mails_ticket.php +++ b/htdocs/admin/mails_ticket.php @@ -361,7 +361,7 @@ if ($action == 'edit') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -441,7 +441,7 @@ if ($action == 'edit') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); if ($conf->global->MAIN_MAIL_SENDMODE_TICKET == 'mail' && empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)) @@ -565,7 +565,7 @@ if ($action == 'edit') print $formmail->get_form('addfile', 'removefile'); - dol_fiche_end(); + print dol_get_fiche_end(); } } diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php index a62385bf2ca..9bdc497c776 100644 --- a/htdocs/admin/menus.php +++ b/htdocs/admin/menus.php @@ -206,7 +206,7 @@ print ''; print ''; -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; print ''; diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index f56bf284fc9..70d2f4bcda6 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -398,7 +398,7 @@ if ($action == 'create') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -507,7 +507,7 @@ if ($action == 'create') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); // Bouton print '
'; diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php index 065146489a7..9aec5ef0c29 100644 --- a/htdocs/admin/modulehelp.php +++ b/htdocs/admin/modulehelp.php @@ -554,7 +554,7 @@ if ($mode == 'changelog') print $text; -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index db4a2d85d8e..e281cb21155 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -883,7 +883,7 @@ if ($mode == 'common' || $mode == 'commonkanban') } } - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; @@ -916,7 +916,7 @@ if ($mode == 'marketplace') print "\n"; print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; @@ -1136,7 +1136,7 @@ if ($mode == 'deploy') } } - dol_fiche_end(); + print dol_get_fiche_end(); } if ($mode == 'develop') @@ -1170,7 +1170,7 @@ if ($mode == 'develop') print "\n"; - dol_fiche_end(); + print dol_get_fiche_end(); } // End of page diff --git a/htdocs/admin/mrp_extrafields.php b/htdocs/admin/mrp_extrafields.php index 4078043c001..e81c7f1cf75 100644 --- a/htdocs/admin/mrp_extrafields.php +++ b/htdocs/admin/mrp_extrafields.php @@ -74,7 +74,7 @@ print dol_get_fiche_head($head, 'mrp_extrafields', $langs->trans("ExtraFields"), require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php index cfd93b195b3..af352558a71 100644 --- a/htdocs/admin/oauth.php +++ b/htdocs/admin/oauth.php @@ -141,7 +141,7 @@ foreach ($list as $key) print ''."\n"; -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php index f0fdeb28760..99510f4b7c8 100644 --- a/htdocs/admin/oauthlogintokens.php +++ b/htdocs/admin/oauthlogintokens.php @@ -402,7 +402,7 @@ if ($mode == 'userconf' && $user->admin) print ''; } -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/admin/order_extrafields.php b/htdocs/admin/order_extrafields.php index 8435e801902..81d0312ab69 100644 --- a/htdocs/admin/order_extrafields.php +++ b/htdocs/admin/order_extrafields.php @@ -77,7 +77,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Orders"), -1, 'orde require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/admin/orderdet_extrafields.php b/htdocs/admin/orderdet_extrafields.php index 3d228baeb57..734d617f564 100644 --- a/htdocs/admin/orderdet_extrafields.php +++ b/htdocs/admin/orderdet_extrafields.php @@ -78,7 +78,7 @@ print dol_get_fiche_head($head, 'attributeslines', $langs->trans("Orders"), -1, require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php index 35e738754bf..8edf851f49e 100644 --- a/htdocs/admin/payment.php +++ b/htdocs/admin/payment.php @@ -262,7 +262,7 @@ print "\n"; print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; print '
'; diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php index 718e64e6446..6a419d39e53 100644 --- a/htdocs/admin/paymentbybanktransfer.php +++ b/htdocs/admin/paymentbybanktransfer.php @@ -361,7 +361,7 @@ foreach ($dirmodels as $reldir) */ -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index 41b0cc75ab1..3677daa38a5 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -260,7 +260,7 @@ if ($result) print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index 50d01924364..c16b5c30c47 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -368,7 +368,7 @@ foreach ($dirmodels as $reldir) */ -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index a9205cb9e5f..71bd50ef5ce 100644 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -197,7 +197,7 @@ print ''; print ''; -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; print ''; diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php index 0e3008c57cd..3f66d04ca01 100644 --- a/htdocs/admin/receiptprinter.php +++ b/htdocs/admin/receiptprinter.php @@ -354,7 +354,7 @@ if ($mode == 'config' && $user->admin) { print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print ''; @@ -460,7 +460,7 @@ if ($mode == 'template' && $user->admin) { } print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; diff --git a/htdocs/admin/reception_extrafields.php b/htdocs/admin/reception_extrafields.php index 27f33be8157..605b8cf465e 100644 --- a/htdocs/admin/reception_extrafields.php +++ b/htdocs/admin/reception_extrafields.php @@ -83,7 +83,7 @@ print dol_get_fiche_head($head, 'attributes_reception', $langs->trans("Reception require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php index 286e6d15565..ecf72df9b37 100644 --- a/htdocs/admin/resource.php +++ b/htdocs/admin/resource.php @@ -142,7 +142,7 @@ print ''; //RESOURCE_HIDE_ADD_CONTACT_USER //RESOURCE_HIDE_ADD_CONTACT_THIPARTY -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/admin/resource_extrafields.php b/htdocs/admin/resource_extrafields.php index d0e2a3e5b0a..d7287b53019 100644 --- a/htdocs/admin/resource_extrafields.php +++ b/htdocs/admin/resource_extrafields.php @@ -77,7 +77,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("ResourceSingular"), require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php index fba88d768c4..fc2c4e141d5 100644 --- a/htdocs/admin/security_file.php +++ b/htdocs/admin/security_file.php @@ -177,7 +177,7 @@ print ''; print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index ff0ca0006af..2e4f1f05229 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -184,7 +184,7 @@ print ''; print ''; -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; diff --git a/htdocs/admin/socialnetworks.php b/htdocs/admin/socialnetworks.php index 3d959b04b83..faf8897126f 100644 --- a/htdocs/admin/socialnetworks.php +++ b/htdocs/admin/socialnetworks.php @@ -108,7 +108,7 @@ foreach ($arrayofsocialnetworks as $snkey => $snlabel) { } -dol_fiche_end(); +print dol_get_fiche_end(); print ''; diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php index 772d4e32707..fe98d4bfe9e 100644 --- a/htdocs/admin/spip.php +++ b/htdocs/admin/spip.php @@ -146,7 +146,7 @@ if (!empty($conf->global->ADHERENT_USE_SPIP)) form_constantes($constantes, 2); - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; @@ -160,7 +160,7 @@ if (!empty($conf->global->ADHERENT_USE_SPIP)) $link .= ''; print load_fiche_titre($langs->trans('SPIPTitle'), $link, ''); - dol_fiche_end(); + print dol_get_fiche_end(); } // End of page diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php index bda90d0ac74..c0c04eb9430 100644 --- a/htdocs/admin/supplier_payment.php +++ b/htdocs/admin/supplier_payment.php @@ -454,7 +454,7 @@ print "\n"; print ''; -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; print '
'; diff --git a/htdocs/admin/supplierinvoice_extrafields.php b/htdocs/admin/supplierinvoice_extrafields.php index 10de9a09735..d84779c7477 100644 --- a/htdocs/admin/supplierinvoice_extrafields.php +++ b/htdocs/admin/supplierinvoice_extrafields.php @@ -78,7 +78,7 @@ print dol_get_fiche_head($head, 'supplierinvoice', $langs->trans("Suppliers"), - require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/admin/supplierinvoicedet_extrafields.php b/htdocs/admin/supplierinvoicedet_extrafields.php index 576e3f7b3b3..ac40ef66e09 100644 --- a/htdocs/admin/supplierinvoicedet_extrafields.php +++ b/htdocs/admin/supplierinvoicedet_extrafields.php @@ -80,7 +80,7 @@ print dol_get_fiche_head($head, 'supplierinvoicedet', $langs->trans("Suppliers") require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/admin/supplierorder_extrafields.php b/htdocs/admin/supplierorder_extrafields.php index a35820806fb..c46eebfb037 100644 --- a/htdocs/admin/supplierorder_extrafields.php +++ b/htdocs/admin/supplierorder_extrafields.php @@ -78,7 +78,7 @@ print dol_get_fiche_head($head, 'supplierorder', $langs->trans("Suppliers"), -1, require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/admin/supplierorderdet_extrafields.php b/htdocs/admin/supplierorderdet_extrafields.php index 8043c56bcd2..7017bebf61f 100644 --- a/htdocs/admin/supplierorderdet_extrafields.php +++ b/htdocs/admin/supplierorderdet_extrafields.php @@ -79,7 +79,7 @@ print dol_get_fiche_head($head, 'supplierorderdet', $langs->trans("Suppliers"), require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php index 03b590a318c..e8da4a8d736 100644 --- a/htdocs/admin/ticket.php +++ b/htdocs/admin/ticket.php @@ -186,7 +186,7 @@ print dol_get_fiche_head($head, 'settings', $langs->trans("Module56000Name"), -1 print ''.$langs->trans("TicketSetupDictionaries").' : '.$langs->trans("ClickHereToGoTo", $langs->transnoentitiesnoconv("DictionarySetup")).'
'; -dol_fiche_end(); +print dol_get_fiche_end(); /* diff --git a/htdocs/admin/ticket_extrafields.php b/htdocs/admin/ticket_extrafields.php index ad88e5adbf8..4a50beaa32e 100644 --- a/htdocs/admin/ticket_extrafields.php +++ b/htdocs/admin/ticket_extrafields.php @@ -75,7 +75,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Module56000Name"), require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons if ($action != 'create' && $action != 'edit') { diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php index 8de245ab8db..50ff514c6a7 100644 --- a/htdocs/admin/ticket_public.php +++ b/htdocs/admin/ticket_public.php @@ -175,7 +175,7 @@ print dol_get_fiche_head($head, 'public', $langs->trans("Module56000Name"), -1, print ''.$langs->trans("TicketPublicAccess").' : '.dol_buildpath('/public/ticket/index.php', 2).''; -dol_fiche_end(); +print dol_get_fiche_end(); $enabledisablehtml = $langs->trans("TicketsActivatePublicInterface").' '; diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index e6f667a169b..edd5ca95026 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -547,7 +547,7 @@ if ($mode == 'searchkey') print '
'; } -dol_fiche_end(); +print dol_get_fiche_end(); print "\n"; diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php index b6fc6f43ae9..a22e585f972 100644 --- a/htdocs/admin/user.php +++ b/htdocs/admin/user.php @@ -328,7 +328,7 @@ foreach ($dirmodels as $reldir) print ''; print "
"; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php index e9cdcaf09b6..e73e01ccbdf 100644 --- a/htdocs/admin/usergroup.php +++ b/htdocs/admin/usergroup.php @@ -260,7 +260,7 @@ foreach ($dirmodels as $reldir) print ''; print "
"; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php index 01ef915d137..208caf85666 100644 --- a/htdocs/admin/website.php +++ b/htdocs/admin/website.php @@ -621,7 +621,7 @@ if ($id) } } -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php index 479bbdbe7b9..738fd5bc998 100644 --- a/htdocs/admin/website_options.php +++ b/htdocs/admin/website_options.php @@ -140,7 +140,7 @@ if ($action == 'edit') } -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/asset/admin/assets_extrafields.php b/htdocs/asset/admin/assets_extrafields.php index 393f028f950..3334610b927 100644 --- a/htdocs/asset/admin/assets_extrafields.php +++ b/htdocs/asset/admin/assets_extrafields.php @@ -70,7 +70,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Assets"), -1, 'gene require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/asset/admin/assets_type_extrafields.php b/htdocs/asset/admin/assets_type_extrafields.php index 2b67be78e2b..25d7df8e1a7 100644 --- a/htdocs/asset/admin/assets_type_extrafields.php +++ b/htdocs/asset/admin/assets_type_extrafields.php @@ -69,7 +69,7 @@ print dol_get_fiche_head($head, 'attributes_type', $langs->trans("Assets"), -1, require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons if ($action != 'create' && $action != 'edit') diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php index 6cda5f6eaa7..6fec16ef0a0 100644 --- a/htdocs/asset/admin/setup.php +++ b/htdocs/asset/admin/setup.php @@ -105,7 +105,7 @@ if ($action == 'edit') print '
'; } -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php index 8b087297b79..0fa78edf9ce 100644 --- a/htdocs/asset/card.php +++ b/htdocs/asset/card.php @@ -180,7 +180,7 @@ if ($action == 'create') print ''."\n"; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -218,7 +218,7 @@ if (($id || $ref) && $action == 'edit') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print '   '; @@ -297,7 +297,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); // Buttons for actions diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php index 021f54a1ad2..4c2e36aed9a 100644 --- a/htdocs/asset/document.php +++ b/htdocs/asset/document.php @@ -135,7 +135,7 @@ if ($object->id) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); $modulepart = 'asset'; //$permission = $user->rights->asset->create; diff --git a/htdocs/asset/info.php b/htdocs/asset/info.php index 0cca7015573..d211cf0dbad 100644 --- a/htdocs/asset/info.php +++ b/htdocs/asset/info.php @@ -82,7 +82,7 @@ print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/asset/note.php b/htdocs/asset/note.php index b1665d7fcc4..514e05bff72 100644 --- a/htdocs/asset/note.php +++ b/htdocs/asset/note.php @@ -146,7 +146,7 @@ if ($id > 0 || !empty($ref)) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); } // End of page diff --git a/htdocs/asset/type.php b/htdocs/asset/type.php index 3c6773f5992..28f2ce59df0 100644 --- a/htdocs/asset/type.php +++ b/htdocs/asset/type.php @@ -382,7 +382,7 @@ if ($action == 'create') print ''; print "\n"; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -490,7 +490,7 @@ if ($rowid > 0) print ''; print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); /* * Buttons @@ -595,7 +595,7 @@ if ($rowid > 0) print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print '   '; diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php index 674c5b771d0..b6ce9cda1bc 100644 --- a/htdocs/blockedlog/admin/blockedlog.php +++ b/htdocs/blockedlog/admin/blockedlog.php @@ -170,7 +170,7 @@ print ''; if (GETPOST('withtab', 'alpha')) { - dol_fiche_end(); + print dol_get_fiche_end(); } print '

'; diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php index b4e26337c50..0a77c6ddf3b 100644 --- a/htdocs/blockedlog/admin/blockedlog_list.php +++ b/htdocs/blockedlog/admin/blockedlog_list.php @@ -582,7 +582,7 @@ if (!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->glob if (GETPOST('withtab', 'alpha')) { - dol_fiche_end(); + print dol_get_fiche_end(); } print '

'; diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php index d5e929796e5..317fd6f9032 100644 --- a/htdocs/bom/bom_agenda.php +++ b/htdocs/bom/bom_agenda.php @@ -185,7 +185,7 @@ if ($object->id > 0) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php index 37db34f283c..7970911d84d 100644 --- a/htdocs/bom/bom_card.php +++ b/htdocs/bom/bom_card.php @@ -275,7 +275,7 @@ if ($action == 'create') print ''."\n"; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -311,7 +311,7 @@ if (($id || $ref) && $action == 'edit') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print '   '; @@ -535,7 +535,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php index 0f2a88366aa..f6a34a9c25d 100644 --- a/htdocs/bom/bom_document.php +++ b/htdocs/bom/bom_document.php @@ -130,7 +130,7 @@ if ($object->id) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); $modulepart = 'bom'; $permission = $user->rights->bom->write; diff --git a/htdocs/bom/bom_note.php b/htdocs/bom/bom_note.php index e69be248a1d..78b38732f7f 100644 --- a/htdocs/bom/bom_note.php +++ b/htdocs/bom/bom_note.php @@ -144,7 +144,7 @@ if ($id > 0 || !empty($ref)) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); } // End of page diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php index 1506dd70269..30ccc6cdd75 100644 --- a/htdocs/bookmarks/card.php +++ b/htdocs/bookmarks/card.php @@ -177,7 +177,7 @@ if ($action == 'create') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print '   '; @@ -295,7 +295,7 @@ if ($id > 0 && !preg_match('/^add/i', $action)) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); if ($action == 'edit') { diff --git a/htdocs/categories/admin/categorie_extrafields.php b/htdocs/categories/admin/categorie_extrafields.php index 404d35d6065..9bc1dd685ff 100644 --- a/htdocs/categories/admin/categorie_extrafields.php +++ b/htdocs/categories/admin/categorie_extrafields.php @@ -72,7 +72,7 @@ print dol_get_fiche_head($head, 'attributes_categories', $langs->trans("Categori require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php index 8949ba25ef4..4c17c56c9d0 100644 --- a/htdocs/categories/card.php +++ b/htdocs/categories/card.php @@ -270,7 +270,7 @@ if ($user->rights->categorie->creer) print ''; - dol_fiche_end(''); + print dol_get_fiche_end(''); print '
'; print ''; diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php index 9f7aebf7fec..a06517c8cda 100644 --- a/htdocs/categories/edit.php +++ b/htdocs/categories/edit.php @@ -170,7 +170,7 @@ if (empty($reshook)) { print ''; -dol_fiche_end(); +print dol_get_fiche_end(); print '
 
'; diff --git a/htdocs/categories/info.php b/htdocs/categories/info.php index 0011b4c1f5f..5bd8f6c9d24 100644 --- a/htdocs/categories/info.php +++ b/htdocs/categories/info.php @@ -95,7 +95,7 @@ print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php index 0c7c35da1fe..73c7664f6c2 100644 --- a/htdocs/categories/photos.php +++ b/htdocs/categories/photos.php @@ -161,7 +161,7 @@ if ($object->id) print "\n"; print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php index c690cfcab84..660dbf9317d 100644 --- a/htdocs/categories/traduction.php +++ b/htdocs/categories/traduction.php @@ -223,7 +223,7 @@ print ''; print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index 1985e756d45..280b278657c 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -267,7 +267,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php'; print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); /* diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 7e9e63895aa..a46e302bd4b 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -1291,7 +1291,7 @@ if ($action == 'create') print ''."\n"; } - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -1782,7 +1782,7 @@ if ($id > 0) print ''."\n"; } - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -2095,7 +2095,7 @@ if ($id > 0) print '
'; print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); } diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index 0c3ff22801a..613ac76380e 100644 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -254,7 +254,7 @@ if ($object->id > 0) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); $modulepart = 'actions'; diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 65123586e89..e62f411d786 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -417,7 +417,7 @@ print ''; //print dol_get_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action'); //print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, $listofextcals, $actioncode, $usergroup, '', $resourceid); -//dol_fiche_end(); +//print dol_get_fiche_end(); $viewmode = ''; $viewmode .= ''; diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php index 813e3240b7a..292c0ea94ce 100644 --- a/htdocs/comm/action/info.php +++ b/htdocs/comm/action/info.php @@ -112,7 +112,7 @@ print '
'; dol_print_object_info($object); print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php index ed96a3a2d4f..582f1c538f0 100644 --- a/htdocs/comm/action/list.php +++ b/htdocs/comm/action/list.php @@ -454,7 +454,7 @@ if ($resql) //print dol_get_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action'); //print_actions_filter($form, $canedit, $search_status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid); - //dol_fiche_end(); + //print dol_get_fiche_end(); // Add link to show birthdays $link = ''; diff --git a/htdocs/comm/admin/propal_extrafields.php b/htdocs/comm/admin/propal_extrafields.php index f926afb56a9..79836087775 100644 --- a/htdocs/comm/admin/propal_extrafields.php +++ b/htdocs/comm/admin/propal_extrafields.php @@ -72,7 +72,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Proposals"), -1, 'p require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/comm/admin/propaldet_extrafields.php b/htdocs/comm/admin/propaldet_extrafields.php index aa6dac82910..fa12fe9b555 100644 --- a/htdocs/comm/admin/propaldet_extrafields.php +++ b/htdocs/comm/admin/propaldet_extrafields.php @@ -79,7 +79,7 @@ print dol_get_fiche_head($head, 'attributeslines', $langs->trans("Proposals"), - require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 63a6a24aeaa..df7e96fc742 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -1256,7 +1256,7 @@ if ($object->id > 0) print '
'; print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); /* diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index 812dea03f43..bb74fb686aa 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -741,7 +741,7 @@ if ($action == 'create') $doleditor->Create(); print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; @@ -923,7 +923,7 @@ if ($action == 'create') print ""; - dol_fiche_end(); + print dol_get_fiche_end(); // Clone confirmation @@ -1064,7 +1064,7 @@ if ($action == 'create') print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); print dol_set_focus('#sendto'); } @@ -1122,7 +1122,7 @@ if ($action == 'create') } else print dol_htmlentitiesbr($object->body); print ''; - dol_fiche_end(); + print dol_get_fiche_end(); } else { /* * Edition mode mailing (CKeditor or HTML source) @@ -1195,7 +1195,7 @@ if ($action == 'create') print ''; print ''; - dol_fiche_end(); + print dol_get_fiche_end(); @@ -1289,7 +1289,7 @@ if ($action == 'create') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 2b59550cf2b..7c219cc448a 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -305,7 +305,7 @@ if ($object->fetch($id) >= 0) print "
"; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php index 05ae0885ba8..199a5caad8b 100644 --- a/htdocs/comm/mailing/info.php +++ b/htdocs/comm/mailing/info.php @@ -81,7 +81,7 @@ if ($object->fetch($id) >= 0) //print ''; - dol_fiche_end(); + print dol_get_fiche_end(); } // End of page diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index 6bd1fe715e3..bd4c16f89ca 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -105,7 +105,7 @@ if ($_socid > 0) print ""; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 1f813b6c6ad..7190168b513 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -1771,7 +1771,7 @@ if ($action == 'create') print ''; } - dol_fiche_end(); + print dol_get_fiche_end(); $langs->load("bills"); print '
'; @@ -2382,7 +2382,7 @@ if ($action == 'create') print "\n"; - dol_fiche_end(); + print dol_get_fiche_end(); /* diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php index 7d1cd05c706..9c491c7227c 100644 --- a/htdocs/comm/propal/contact.php +++ b/htdocs/comm/propal/contact.php @@ -188,7 +188,7 @@ if ($object->id > 0) dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1); - dol_fiche_end(); + print dol_get_fiche_end(); // Contacts lines (modules that overwrite templates must declare this into descriptor) diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index f1eef2164a0..309c2a44ad4 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -172,7 +172,7 @@ if ($object->id > 0) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); $modulepart = 'propal'; $permission = $user->rights->propal->creer; diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php index fd9595f3579..e56a5129c5c 100644 --- a/htdocs/comm/propal/info.php +++ b/htdocs/comm/propal/info.php @@ -126,7 +126,7 @@ dol_print_object_info($object); print ''; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php index 1435d7f7f30..80b991a2526 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.php @@ -140,7 +140,7 @@ if ($id > 0 || !empty($ref)) print ''; - dol_fiche_end(); + print dol_get_fiche_end(); } } } diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index fe847f6ff64..e439056de5f 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -355,7 +355,7 @@ print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index 753e22a5ce8..21f06e7bc1d 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -121,7 +121,7 @@ if ($socid > 0) if (!$isCustomer && !$isSupplier) { print '

'.$langs->trans('ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts').'

'; - dol_fiche_end(); + print dol_get_fiche_end(); print ''; @@ -189,7 +189,7 @@ if ($socid > 0) print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index 1ee05562bf7..922e384af4d 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -261,7 +261,7 @@ if ($socid > 0) if (!$isCustomer && !$isSupplier) { print '

'.$langs->trans('ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts').'

'; - dol_fiche_end(); + print dol_get_fiche_end(); print ''; @@ -336,7 +336,7 @@ if ($socid > 0) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); if ($user->rights->societe->creer) @@ -375,7 +375,7 @@ if ($socid > 0) print ""; - dol_fiche_end(); + print dol_get_fiche_end(); } if ($user->rights->societe->creer) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 795a120cee6..eb93a125fb5 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1828,7 +1828,7 @@ if ($action == 'create' && $usercancreate) print ''; - dol_fiche_end(); + print dol_get_fiche_end(); // Button "Create Draft" print '
'; @@ -2474,7 +2474,7 @@ if ($action == 'create' && $usercancreate) print "\n"; - dol_fiche_end(); + print dol_get_fiche_end(); /* * Buttons for actions diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php index 51b94d82d23..84c4eb5626a 100644 --- a/htdocs/commande/contact.php +++ b/htdocs/commande/contact.php @@ -188,7 +188,7 @@ if ($id > 0 || !empty($ref)) dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1); - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php index 20f49195e10..c3afff9e00d 100644 --- a/htdocs/commande/document.php +++ b/htdocs/commande/document.php @@ -175,7 +175,7 @@ if ($id > 0 || !empty($ref)) print "
\n"; - dol_fiche_end(); + print dol_get_fiche_end(); $modulepart = 'commande'; $permission = $user->rights->commande->creer; diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php index 9001a3ffb51..dd31e547569 100644 --- a/htdocs/commande/info.php +++ b/htdocs/commande/info.php @@ -127,7 +127,7 @@ print ''; print ''; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php index 9542e432d7e..c996aea7601 100644 --- a/htdocs/commande/note.php +++ b/htdocs/commande/note.php @@ -139,7 +139,7 @@ if ($id > 0 || !empty($ref)) print ''; - dol_fiche_end(); + print dol_get_fiche_end(); } diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index 13657c61553..1da32f13e80 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -388,7 +388,7 @@ print ''; print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php index 221299fe8b7..ac31d091833 100644 --- a/htdocs/compta/accounting-files.php +++ b/htdocs/compta/accounting-files.php @@ -567,7 +567,7 @@ print ' 0 || !empty($ref)) { print ''; - dol_fiche_end(); + print dol_get_fiche_end(); $modulepart = 'bank'; diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index 6db4714db3d..f190ddb1471 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -166,7 +166,7 @@ if (!empty($id)) print $langs->trans("AllAccounts"); } -dol_fiche_end(); +print dol_get_fiche_end(); // Affiche tableau diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index e4bed6376f1..5d0df32cd3e 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -436,7 +436,7 @@ if ($id > 0 || !empty($ref)) dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1); - dol_fiche_end(); + print dol_get_fiche_end(); /* diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php index 7bddd7915cb..8b086516351 100644 --- a/htdocs/compta/bank/card.php +++ b/htdocs/compta/bank/card.php @@ -544,7 +544,7 @@ if ($action == 'create') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -752,7 +752,7 @@ if ($action == 'create') print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); /* * Barre d'actions @@ -1028,7 +1028,7 @@ if ($action == 'create') print ''; } - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php index 1369a629d2f..896b91545db 100644 --- a/htdocs/compta/bank/document.php +++ b/htdocs/compta/bank/document.php @@ -123,7 +123,7 @@ if ($id > 0 || !empty($ref)) { print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); $modulepart = 'bank'; diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index 496988ba74a..9350e211284 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -762,7 +762,7 @@ if ($account) print $langs->trans("AllAccounts"); } -dol_fiche_end(); +print dol_get_fiche_end(); print ''; diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php index eab2c1ad182..7ae7c995935 100644 --- a/htdocs/compta/bank/line.php +++ b/htdocs/compta/bank/line.php @@ -566,7 +566,7 @@ if ($result) print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '

'; diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 137712d5cec..166d69fdd30 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -251,7 +251,7 @@ if (empty($numref)) dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1); - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index f59723436d2..03844897a15 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -96,7 +96,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1); - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php index 7218a191d1c..8a7f5415339 100644 --- a/htdocs/compta/bank/various_payment/card.php +++ b/htdocs/compta/bank/various_payment/card.php @@ -454,7 +454,7 @@ if ($action == 'create') print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -603,7 +603,7 @@ if ($id) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); /* diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php index 32351e5fe3b..14187bf51e3 100644 --- a/htdocs/compta/bank/various_payment/document.php +++ b/htdocs/compta/bank/various_payment/document.php @@ -143,7 +143,7 @@ if ($object->id) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); $modulepart = 'banque'; $permission = $user->rights->banque->modifier; diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php index 4b61b446045..96299886070 100644 --- a/htdocs/compta/cashcontrol/cashcontrol_card.php +++ b/htdocs/compta/cashcontrol/cashcontrol_card.php @@ -660,7 +660,7 @@ if (empty($action) || $action == "view" || $action == "close") print '
'; print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); if ($action != 'close') { print '
'; diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php index b17c3f4f9a4..e9a2a3a93a7 100644 --- a/htdocs/compta/deplacement/stats/index.php +++ b/htdocs/compta/deplacement/stats/index.php @@ -306,7 +306,7 @@ print '
'; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/compta/facture/admin/facture_cust_extrafields.php b/htdocs/compta/facture/admin/facture_cust_extrafields.php index 16327c8b348..54234b4a10c 100644 --- a/htdocs/compta/facture/admin/facture_cust_extrafields.php +++ b/htdocs/compta/facture/admin/facture_cust_extrafields.php @@ -73,7 +73,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Invoices"), -1, 'in require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php b/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php index 50a7fd18586..3f85d7ba074 100644 --- a/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php +++ b/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php @@ -74,7 +74,7 @@ print dol_get_fiche_head($head, 'attributesrec', $langs->trans("Invoices"), -1, require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php index 2b9e37e43c6..5b1daff5913 100644 --- a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php +++ b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php @@ -74,7 +74,7 @@ print dol_get_fiche_head($head, 'attributeslines', $langs->trans("Invoices"), -1 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php index 58fd39e33fe..539fb89e675 100644 --- a/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php +++ b/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php @@ -74,7 +74,7 @@ print dol_get_fiche_head($head, 'attributeslinesrec', $langs->trans("Invoices"), require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php index 4a9a0a197b3..0d483665e40 100644 --- a/htdocs/compta/facture/card-rec.php +++ b/htdocs/compta/facture/card-rec.php @@ -1056,7 +1056,7 @@ if ($action == 'create') print ""; - dol_fiche_end(); + print dol_get_fiche_end(); // Autogeneration @@ -1102,7 +1102,7 @@ if ($action == 'create') print ""; - dol_fiche_end(); + print dol_get_fiche_end(); $title = $langs->trans("ProductsAndServices"); @@ -1641,7 +1641,7 @@ if ($action == 'create') print "\n"; - dol_fiche_end(); + print dol_get_fiche_end(); /** diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 401a2fdd37a..74947b7c591 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -3618,7 +3618,7 @@ if ($action == 'create') print "\n"; - dol_fiche_end(); + print dol_get_fiche_end(); // Button "Create Draft" print '
'; @@ -5030,7 +5030,7 @@ if ($action == 'create') print "\n"; - dol_fiche_end(); + print dol_get_fiche_end(); // Actions buttons diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php index f50f6b85a55..fc66715dd3d 100644 --- a/htdocs/compta/facture/contact.php +++ b/htdocs/compta/facture/contact.php @@ -185,7 +185,7 @@ if ($id > 0 || !empty($ref)) dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1); - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php index 548fefab0fa..e001b203296 100644 --- a/htdocs/compta/facture/document.php +++ b/htdocs/compta/facture/document.php @@ -174,7 +174,7 @@ if ($id > 0 || !empty($ref)) print "
\n"; - dol_fiche_end(); + print dol_get_fiche_end(); $modulepart = 'facture'; $permission = $user->rights->facture->creer; diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php index a7af3893883..f26f4ea0255 100644 --- a/htdocs/compta/facture/info.php +++ b/htdocs/compta/facture/info.php @@ -120,7 +120,7 @@ print ''; print ''; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php index 76c6833c07b..a2343171d66 100644 --- a/htdocs/compta/facture/note.php +++ b/htdocs/compta/facture/note.php @@ -139,7 +139,7 @@ if ($id > 0 || !empty($ref)) $cssclass = "titlefield"; include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; - dol_fiche_end(); + print dol_get_fiche_end(); } // End of page diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index 2f44b0b2437..eea3b29aa36 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -573,7 +573,7 @@ if ($object->id > 0) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); $numopen = 0; $pending = 0; $numclosed = 0; diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php index afbe4528b14..fb1002d45a5 100644 --- a/htdocs/compta/facture/stats/index.php +++ b/htdocs/compta/facture/stats/index.php @@ -381,7 +381,7 @@ print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php index b787878f31d..b99e4c35d1c 100644 --- a/htdocs/compta/localtax/card.php +++ b/htdocs/compta/localtax/card.php @@ -198,7 +198,7 @@ if ($action == 'create') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -271,7 +271,7 @@ if ($id) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); /* diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 21e9fba85bc..d1da6de0c3e 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -528,7 +528,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print ''; - dol_fiche_end(); + print dol_get_fiche_end(); /* diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php index 9d0758b48bf..db942328d13 100644 --- a/htdocs/compta/paiement/card.php +++ b/htdocs/compta/paiement/card.php @@ -299,7 +299,7 @@ print ''; print ''; -dol_fiche_end(); +print dol_get_fiche_end(); /* diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php index 21b7ac83f58..49a8cf5d61b 100644 --- a/htdocs/compta/paiement/cheque/card.php +++ b/htdocs/compta/paiement/cheque/card.php @@ -370,7 +370,7 @@ if ($action == 'new') print ''; print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -719,7 +719,7 @@ if ($action == 'new') dol_print_error($db); } - dol_fiche_end(); + print dol_get_fiche_end(); } diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php index a1640f08496..208d74a316f 100644 --- a/htdocs/compta/paiement/info.php +++ b/htdocs/compta/paiement/info.php @@ -74,7 +74,7 @@ print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index 17970037b4a..e5941624910 100644 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -252,7 +252,7 @@ if ($action == 'create') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); /* * Other unpaid charges diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php index 6dfa4e3be7a..5ee71863dd2 100644 --- a/htdocs/compta/payment_sc/card.php +++ b/htdocs/compta/payment_sc/card.php @@ -158,7 +158,7 @@ print ''; print ''; -dol_fiche_end(); +print dol_get_fiche_end(); /* diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php index 69968503a5d..5d87303236a 100644 --- a/htdocs/compta/prelevement/card.php +++ b/htdocs/compta/prelevement/card.php @@ -250,7 +250,7 @@ if ($id > 0 || $ref) print ''; - dol_fiche_end(); + print dol_get_fiche_end(); $formconfirm = ''; diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index b1a15a766f6..1f8ecdaeced 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -150,7 +150,7 @@ if ($id > 0 || $ref) print ''; - dol_fiche_end(); + print dol_get_fiche_end(); } else { dol_print_error($db); } diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index 9135616d915..fb1a9451aed 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -144,7 +144,7 @@ if ($prev_id > 0 || $ref) print ''; - dol_fiche_end(); + print dol_get_fiche_end(); } else { dol_print_error($db); } diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index 151e53e4a59..81e854ef5a0 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -143,7 +143,7 @@ if ($prev_id > 0 || $ref) print ''; - dol_fiche_end(); + print dol_get_fiche_end(); } else { dol_print_error($db); } diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php index 71f39f6c98d..ccb60486c76 100644 --- a/htdocs/compta/prelevement/line.php +++ b/htdocs/compta/prelevement/line.php @@ -179,7 +179,7 @@ if ($id) } print ''; - dol_fiche_end(); + print dol_get_fiche_end(); } else { dol_print_error($db); } diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index 8e8521e4026..3930d711a1c 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -97,7 +97,7 @@ if ($id > 0) print dol_get_fiche_head($head, 'customer', $langs->trans("ThirdParty"), 0, 'company'); dol_banner_tab($object, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom', '', '', 0, '', '', 1); - dol_fiche_end(); + print dol_get_fiche_end(); if (!empty($conf->facture->enabled) && $user->rights->facture->lire) { diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php index 98131687cb1..8af8c54752b 100644 --- a/htdocs/compta/sociales/card.php +++ b/htdocs/compta/sociales/card.php @@ -376,7 +376,7 @@ if ($action == 'create') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -681,7 +681,7 @@ if ($id > 0) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); if ($action == 'edit') { diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php index dd07afd416f..eea97c13a1d 100644 --- a/htdocs/compta/sociales/document.php +++ b/htdocs/compta/sociales/document.php @@ -156,7 +156,7 @@ if ($object->id) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); $modulepart = 'tax'; $permission = $user->rights->tax->charges->creer; diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php index 1f20bcd28e3..7e7f236b3ab 100644 --- a/htdocs/compta/tva/card.php +++ b/htdocs/compta/tva/card.php @@ -293,7 +293,7 @@ if ($action == 'create') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -369,7 +369,7 @@ if ($id) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); /* * Action buttons diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php index 8d097e6aad5..10efd84288c 100644 --- a/htdocs/compta/tva/document.php +++ b/htdocs/compta/tva/document.php @@ -142,7 +142,7 @@ if ($object->id) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); $permission = $user->rights->tax->charges->creer; $permtoedit = $user->rights->fournisseur->facture->creer; diff --git a/htdocs/compta/tva/info.php b/htdocs/compta/tva/info.php index 71ff7b14844..ddabf6e2b49 100644 --- a/htdocs/compta/tva/info.php +++ b/htdocs/compta/tva/info.php @@ -89,7 +89,7 @@ print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); llxFooter(); diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php index 1d42d638bc8..95ec50be24f 100644 --- a/htdocs/contact/agenda.php +++ b/htdocs/contact/agenda.php @@ -227,7 +227,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) print ''; - dol_fiche_end(); + print dol_get_fiche_end(); // Actions buttons diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index 746d2222c39..b4406207977 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -873,7 +873,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) print ""; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -1237,7 +1237,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -1482,7 +1482,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) print '
'; print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); // Barre d'actions print '
'; diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php index f2eb1e4cfaf..d3992296aec 100644 --- a/htdocs/contact/consumption.php +++ b/htdocs/contact/consumption.php @@ -158,7 +158,7 @@ print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php index d2979081189..8a70ec6e2df 100644 --- a/htdocs/contact/document.php +++ b/htdocs/contact/document.php @@ -162,7 +162,7 @@ if ($object->id) print ''; - dol_fiche_end(); + print dol_get_fiche_end(); $modulepart = 'contact'; $permission = $user->rights->societe->contact->creer; diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php index fbe56cb9587..c39c20d3d25 100644 --- a/htdocs/contact/info.php +++ b/htdocs/contact/info.php @@ -77,7 +77,7 @@ if ($id > 0) print ''; - dol_fiche_end(); + print dol_get_fiche_end(); } llxFooter(); diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php index 2a24d7ab518..68d810967ad 100644 --- a/htdocs/contact/ldap.php +++ b/htdocs/contact/ldap.php @@ -130,7 +130,7 @@ print ''; print ''; -dol_fiche_end(); +print dol_get_fiche_end(); /* diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php index 2e2eefb2995..478288046e1 100644 --- a/htdocs/contact/note.php +++ b/htdocs/contact/note.php @@ -114,7 +114,7 @@ if ($id > 0) print ''; - dol_fiche_end(); + print dol_get_fiche_end(); } llxFooter(); diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 8df4dca28d4..bbaf013efa1 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -204,7 +204,7 @@ if ($action == 'edit') print ""; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -296,7 +296,7 @@ if ($action == 'edit') print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); } diff --git a/htdocs/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php index b221aa55398..8571856362a 100644 --- a/htdocs/contrat/admin/contract_extrafields.php +++ b/htdocs/contrat/admin/contract_extrafields.php @@ -74,7 +74,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Contracts"), -1, 'c require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/contrat/admin/contractdet_extrafields.php b/htdocs/contrat/admin/contractdet_extrafields.php index fba9843eea0..4b3f03ffedf 100644 --- a/htdocs/contrat/admin/contractdet_extrafields.php +++ b/htdocs/contrat/admin/contractdet_extrafields.php @@ -74,7 +74,7 @@ print dol_get_fiche_head($head, 'attributeslines', $langs->trans("Contracts"), - require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php index 48238496721..f88b470215c 100644 --- a/htdocs/contrat/agenda.php +++ b/htdocs/contrat/agenda.php @@ -204,7 +204,7 @@ if ($id > 0) print ''; - dol_fiche_end(); + print dol_get_fiche_end(); diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 64b3275379a..1187571d2d0 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -1197,7 +1197,7 @@ if ($action == 'create') print "\n"; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -2015,7 +2015,7 @@ if ($action == 'create') print ''; } - dol_fiche_end(); + print dol_get_fiche_end(); /* diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index 32c3dd67ada..4f69d5a2c56 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/contact.php @@ -230,7 +230,7 @@ if ($id > 0 || !empty($ref)) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php index fb7291c5d6b..759c2080930 100644 --- a/htdocs/contrat/document.php +++ b/htdocs/contrat/document.php @@ -186,7 +186,7 @@ if ($object->id) print ''; - dol_fiche_end(); + print dol_get_fiche_end(); $modulepart = 'contract'; $permission = $user->rights->contrat->creer; diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php index d2f7a7e71fa..0368340bffd 100644 --- a/htdocs/contrat/note.php +++ b/htdocs/contrat/note.php @@ -176,7 +176,7 @@ if ($id > 0 || !empty($ref)) include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; - dol_fiche_end(); + print dol_get_fiche_end(); } diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php index d83aa3cc19a..8b1618c8da9 100644 --- a/htdocs/core/class/html.formticket.class.php +++ b/htdocs/core/class/html.formticket.class.php @@ -422,7 +422,7 @@ class FormTicket print ''; - if ($withdolfichehead) dol_fiche_end(); + if ($withdolfichehead) print dol_get_fiche_end(); print '
'; print ''; diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php index 859f6e5cac1..433ec4969ca 100644 --- a/htdocs/core/customreports.php +++ b/htdocs/core/customreports.php @@ -758,7 +758,7 @@ if ($sql) { print '
'; if (!defined('USE_CUSTOME_REPORT_AS_INCLUDE')) { - dol_fiche_end(); + print dol_get_fiche_end(); } // End of page diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php index f380152abdb..20ffa3f52b6 100644 --- a/htdocs/core/lib/accounting.lib.php +++ b/htdocs/core/lib/accounting.lib.php @@ -235,7 +235,7 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index a3eb00a38ec..7cdf83f9961 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1258,7 +1258,7 @@ function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $di * @param array $links Array of tabs. Currently initialized by calling a function xxx_admin_prepare_head * @param string $active Active tab name (document', 'info', 'ldap', ....) * @param string $title Title - * @param int $notab -1 or 0=Add tab header, 1=no tab header (if you set this to 1, using dol_fiche_end() to close tab is not required), -2=Add tab header with no seaparation under tab (to start a tab just after) + * @param int $notab -1 or 0=Add tab header, 1=no tab header (if you set this to 1, using print dol_get_fiche_end() to close tab is not required), -2=Add tab header with no seaparation under tab (to start a tab just after) * @param string $picto Add a picto on tab title * @param int $pictoisfullpath If 1, image path is a full path. If you set this to 1, you can use url returned by dol_buildpath('/mymodyle/img/myimg.png',1) for $picto. * @param string $morehtmlright Add more html content on right of tabs title @@ -1279,7 +1279,7 @@ function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0 * @param array $links Array of tabs * @param string $active Active tab name * @param string $title Title - * @param int $notab -1 or 0=Add tab header, 1=no tab header (if you set this to 1, using dol_fiche_end() to close tab is not required), -2=Add tab header with no seaparation under tab (to start a tab just after) + * @param int $notab -1 or 0=Add tab header, 1=no tab header (if you set this to 1, using print dol_get_fiche_end() to close tab is not required), -2=Add tab header with no seaparation under tab (to start a tab just after) * @param string $picto Add a picto on tab title * @param int $pictoisfullpath If 1, image path is a full path. If you set this to 1, you can use url returned by dol_buildpath('/mymodyle/img/myimg.png',1) for $picto. * @param string $morehtmlright Add more html content on right of tabs title diff --git a/htdocs/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php index 385c22146b9..b23acd76a5b 100644 --- a/htdocs/core/lib/report.lib.php +++ b/htdocs/core/lib/report.lib.php @@ -115,7 +115,7 @@ function report_header($reportname, $notused, $period, $periodlink, $description print ''."\n"; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php index 69bf77262c8..4bc2bbe8d7a 100644 --- a/htdocs/core/tpl/admin_extrafields_add.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php @@ -211,7 +211,7 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php
Contact:con - +
">      ">
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php index 396406932e7..19b5322ace5 100644 --- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php @@ -298,7 +298,7 @@ if (in_array($type, array_keys($typewecanchangeinto))) - +
">      ">
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php index ea72f29607b..ef288f97589 100644 --- a/htdocs/core/tpl/card_presend.tpl.php +++ b/htdocs/core/tpl/card_presend.tpl.php @@ -292,5 +292,5 @@ if ($action == 'presend') // Show form print $formmail->get_form(); - dol_fiche_end(); + print dol_get_fiche_end(); } diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php index d81a79d7b80..68f45284582 100644 --- a/htdocs/core/tpl/massactions_pre.tpl.php +++ b/htdocs/core/tpl/massactions_pre.tpl.php @@ -160,7 +160,7 @@ if ($massaction == 'presend') print $formmail->get_form(); } - dol_fiche_end(); + print dol_get_fiche_end(); } // Allow Pre-Mass-Action hook (eg for confirmation dialog) $parameters = array( diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php index 5f87e640bce..8c2d42adfaa 100644 --- a/htdocs/cron/admin/cron.php +++ b/htdocs/cron/admin/cron.php @@ -105,7 +105,7 @@ print ''; print ''; -dol_fiche_end(); +print dol_get_fiche_end(); print '
'; print ''; diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php index bdb776a7100..dbe159f32d3 100644 --- a/htdocs/cron/card.php +++ b/htdocs/cron/card.php @@ -510,7 +510,7 @@ if (($action == "create") || ($action == "edit")) print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -693,7 +693,7 @@ if (($action == "create") || ($action == "edit")) print ''; print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); print "\n\n
\n"; diff --git a/htdocs/datapolicy/admin/setup.php b/htdocs/datapolicy/admin/setup.php index f8c38bf5b6b..2d89bb09e3a 100644 --- a/htdocs/datapolicy/admin/setup.php +++ b/htdocs/datapolicy/admin/setup.php @@ -164,7 +164,7 @@ if ($action == 'edit') // Page end -dol_fiche_end(); +print dol_get_fiche_end(); llxFooter(); $db->close(); diff --git a/htdocs/datapolicy/admin/setupmail.php b/htdocs/datapolicy/admin/setupmail.php index 241dd9dace5..7076608898e 100644 --- a/htdocs/datapolicy/admin/setupmail.php +++ b/htdocs/datapolicy/admin/setupmail.php @@ -153,7 +153,7 @@ print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); print '

'; diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php index 440de00499e..e3c28a86dac 100644 --- a/htdocs/delivery/card.php +++ b/htdocs/delivery/card.php @@ -629,7 +629,7 @@ if ($action == 'create') // Create. Seems to no be used print "\n"; - dol_fiche_end(); + print dol_get_fiche_end(); //if ($object->statut == 0) // only if draft // print '
'; diff --git a/htdocs/don/admin/donation_extrafields.php b/htdocs/don/admin/donation_extrafields.php index d210f4399bc..6062d4fca26 100644 --- a/htdocs/don/admin/donation_extrafields.php +++ b/htdocs/don/admin/donation_extrafields.php @@ -70,7 +70,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Donations"), -1, 'p require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/don/card.php b/htdocs/don/card.php index 48af083a5fb..51252e480da 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -452,7 +452,7 @@ if ($action == 'create') print ''; print "\n"; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -583,7 +583,7 @@ if (!empty($id) && $action == 'edit') print "\n"; - dol_fiche_end(); + print dol_get_fiche_end(); print '
   
'; @@ -775,7 +775,7 @@ if (!empty($id) && $action != 'edit') print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); $remaintopay = $object->amount - $totalpaid; diff --git a/htdocs/don/document.php b/htdocs/don/document.php index 4b7a7f052dc..4067c9a0500 100644 --- a/htdocs/don/document.php +++ b/htdocs/don/document.php @@ -179,7 +179,7 @@ if ($object->id) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); $modulepart = 'don'; $permission = $user->rights->don->lire; diff --git a/htdocs/don/info.php b/htdocs/don/info.php index ead0f354646..f60b8380939 100644 --- a/htdocs/don/info.php +++ b/htdocs/don/info.php @@ -120,7 +120,7 @@ print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); llxFooter(); $db->close(); diff --git a/htdocs/don/note.php b/htdocs/don/note.php index ff25b704dd3..1e5e2667b31 100644 --- a/htdocs/don/note.php +++ b/htdocs/don/note.php @@ -131,7 +131,7 @@ if ($id > 0 || !empty($ref)) $cssclass = "titlefield"; include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; - dol_fiche_end(); + print dol_get_fiche_end(); } llxFooter(); diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php index 15146932055..fa97965ca4d 100644 --- a/htdocs/don/payment/card.php +++ b/htdocs/don/payment/card.php @@ -203,7 +203,7 @@ if ($resql) print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); /* diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php index d8f373cbd37..e7985ded1ff 100644 --- a/htdocs/don/payment/payment.php +++ b/htdocs/don/payment/payment.php @@ -231,7 +231,7 @@ if ($action == 'create') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); /* * List of payments on donation diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php index 998de2b7793..eed3108c3db 100644 --- a/htdocs/don/stats/index.php +++ b/htdocs/don/stats/index.php @@ -296,7 +296,7 @@ print ''; print '
'; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php index d63ef0397fe..53f02cede7a 100644 --- a/htdocs/ecm/dir_add_card.php +++ b/htdocs/ecm/dir_add_card.php @@ -251,7 +251,7 @@ if ($action == 'create') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php index 9a084da6cc9..8c1c0162692 100644 --- a/htdocs/ecm/dir_card.php +++ b/htdocs/ecm/dir_card.php @@ -448,7 +448,7 @@ if ($action == 'edit') print ''; } -dol_fiche_end(); +print dol_get_fiche_end(); diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php index 69cac4d1449..145e28c5e59 100644 --- a/htdocs/ecm/file_card.php +++ b/htdocs/ecm/file_card.php @@ -388,7 +388,7 @@ print '
'; print ajax_autoselect('downloadinternallink'); print ajax_autoselect('downloadlink'); -dol_fiche_end(); +print dol_get_fiche_end(); if ($action == 'edit') { diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index eb65d9a997b..f1716c5020e 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -335,7 +335,7 @@ $module = 'ecm'; include DOL_DOCUMENT_ROOT.'/core/tpl/filemanager.tpl.php'; // End of page -dol_fiche_end(); +print dol_get_fiche_end(); llxFooter(); diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php index f3708fbe6df..4ee3c1fcc82 100644 --- a/htdocs/ecm/index_auto.php +++ b/htdocs/ecm/index_auto.php @@ -466,7 +466,7 @@ if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_ } -dol_fiche_end(); +print dol_get_fiche_end(); llxFooter(); diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index d89d08bc1b2..77e25704a6b 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -1030,7 +1030,7 @@ if ($action == 'create') print ""; - dol_fiche_end(); + print dol_get_fiche_end(); // Shipment lines @@ -2403,7 +2403,7 @@ if ($action == 'create') } - dol_fiche_end(); + print dol_get_fiche_end(); $object->fetchObjectLinked($object->id, $object->element); diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php index d2adaadf484..536f0a239ef 100644 --- a/htdocs/expedition/contact.php +++ b/htdocs/expedition/contact.php @@ -250,7 +250,7 @@ if ($id > 0 || !empty($ref)) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); // Lines of contacts echo '
'; diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php index ede667279e6..fffad537b6e 100644 --- a/htdocs/expedition/document.php +++ b/htdocs/expedition/document.php @@ -169,7 +169,7 @@ if ($id > 0 || !empty($ref)) { print "\n"; - dol_fiche_end(); + print dol_get_fiche_end(); $modulepart = 'expedition'; $permission = $user->rights->expedition->creer; diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php index 64aa415c4ce..71de26fa3cf 100644 --- a/htdocs/expedition/note.php +++ b/htdocs/expedition/note.php @@ -148,7 +148,7 @@ if ($id > 0 || !empty($ref)) $cssclass = 'titlefield'; include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; - dol_fiche_end(); + print dol_get_fiche_end(); } // End of page diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php index d500a97ab71..8fa04c27c25 100644 --- a/htdocs/expedition/stats/index.php +++ b/htdocs/expedition/stats/index.php @@ -305,7 +305,7 @@ print ''; print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index c0896151284..63b2977336c 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -1483,7 +1483,7 @@ if ($action == 'create') print ''; print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -1616,7 +1616,7 @@ if ($action == 'create') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -2543,7 +2543,7 @@ if ($action == 'create') print ''; - dol_fiche_end(); + print dol_get_fiche_end(); } // end edit or not edit } // end of if result else { diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php index 531140e1b2a..c61c55a04fd 100644 --- a/htdocs/expensereport/document.php +++ b/htdocs/expensereport/document.php @@ -142,7 +142,7 @@ if ($object->id) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); $modulepart = 'expensereport'; diff --git a/htdocs/expensereport/info.php b/htdocs/expensereport/info.php index 00510e4e5fd..53d1531f4b9 100644 --- a/htdocs/expensereport/info.php +++ b/htdocs/expensereport/info.php @@ -98,7 +98,7 @@ if ($id > 0 || !empty($ref)) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); } // End of page diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index 0186bd08103..574a0382fcb 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -345,7 +345,7 @@ if ($resql) dol_banner_tab($fuser, 'id', $linkback, $user->rights->user->user->lire || $user->admin); - dol_fiche_end(); + print dol_get_fiche_end(); if ($action != 'edit') { diff --git a/htdocs/expensereport/note.php b/htdocs/expensereport/note.php index 31667d74a4e..ebb66ce42fd 100644 --- a/htdocs/expensereport/note.php +++ b/htdocs/expensereport/note.php @@ -108,7 +108,7 @@ if ($id > 0 || !empty($ref)) print ''; - dol_fiche_end(); + print dol_get_fiche_end(); } // End of page diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php index 4a5099cc03a..6662b1054f4 100644 --- a/htdocs/expensereport/payment/card.php +++ b/htdocs/expensereport/payment/card.php @@ -152,7 +152,7 @@ print ''; print ''; -dol_fiche_end(); +print dol_get_fiche_end(); /* diff --git a/htdocs/expensereport/payment/info.php b/htdocs/expensereport/payment/info.php index 281e760684d..a654c77b6cd 100644 --- a/htdocs/expensereport/payment/info.php +++ b/htdocs/expensereport/payment/info.php @@ -75,7 +75,7 @@ print ''; print ''; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php index 68c43a99ad1..a01eb50981d 100644 --- a/htdocs/expensereport/payment/payment.php +++ b/htdocs/expensereport/payment/payment.php @@ -239,7 +239,7 @@ if ($action == 'create' || empty($action)) print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print dol_get_fiche_head(); @@ -279,7 +279,7 @@ if ($action == 'create' || empty($action)) print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php index b789fc57345..de6c0b961d6 100644 --- a/htdocs/expensereport/stats/index.php +++ b/htdocs/expensereport/stats/index.php @@ -301,7 +301,7 @@ print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index 412167c55f2..64d94eda3b9 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -516,7 +516,7 @@ if ($step == 2 && $datatoexport) print ''; print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php index 84dfeb7cfd3..0fa5a930f05 100644 --- a/htdocs/fichinter/admin/fichinter_extrafields.php +++ b/htdocs/fichinter/admin/fichinter_extrafields.php @@ -73,7 +73,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Interventions"), -1 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/fichinter/admin/fichinterdet_extrafields.php b/htdocs/fichinter/admin/fichinterdet_extrafields.php index 5a13bdb4b32..4593de914e3 100644 --- a/htdocs/fichinter/admin/fichinterdet_extrafields.php +++ b/htdocs/fichinter/admin/fichinterdet_extrafields.php @@ -74,7 +74,7 @@ print dol_get_fiche_head($head, 'attributesdet', $langs->trans("Interventions"), require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; -dol_fiche_end(); +print dol_get_fiche_end(); // Buttons diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php index 0a4bbfe922f..31f65be4263 100644 --- a/htdocs/fichinter/card-rec.php +++ b/htdocs/fichinter/card-rec.php @@ -417,7 +417,7 @@ if ($action == 'create') { print "\n"; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print '     '; @@ -438,7 +438,7 @@ if ($action == 'create') { print ''; print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 720e6fe71f3..da1de06cc16 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1012,7 +1012,7 @@ if ($action == 'create') print ''; } - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -1053,7 +1053,7 @@ if ($action == 'create') print ''; print ''; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -1588,7 +1588,7 @@ if ($action == 'create') print ''."\n"; } - dol_fiche_end(); + print dol_get_fiche_end(); print "\n"; diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php index 8dd498d5242..3f0b965b094 100644 --- a/htdocs/fichinter/contact.php +++ b/htdocs/fichinter/contact.php @@ -169,7 +169,7 @@ if ($id > 0 || !empty($ref)) dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1); - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php index e28345534d7..8da827132a2 100644 --- a/htdocs/fichinter/document.php +++ b/htdocs/fichinter/document.php @@ -163,7 +163,7 @@ if ($object->id) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); $modulepart = 'ficheinter'; $permission = $user->rights->ficheinter->creer; diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php index 320a29f4171..a53c69b77bd 100644 --- a/htdocs/fichinter/info.php +++ b/htdocs/fichinter/info.php @@ -124,7 +124,7 @@ print ''; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); llxFooter(); $db->close(); diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php index fd18040d037..b634d7092bf 100644 --- a/htdocs/fichinter/note.php +++ b/htdocs/fichinter/note.php @@ -125,7 +125,7 @@ if ($id > 0 || !empty($ref)) print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); } llxFooter(); diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php index 45d4c2c2c7d..0e4872637b8 100644 --- a/htdocs/fichinter/stats/index.php +++ b/htdocs/fichinter/stats/index.php @@ -320,7 +320,7 @@ print ''; print '
'; print '
'; -dol_fiche_end(); +print dol_get_fiche_end(); llxFooter(); diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index e6a1a6a5a8c..563f46329f5 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -767,7 +767,7 @@ if ($object->id > 0) print ''; print '
'; - dol_fiche_end(); + print dol_get_fiche_end(); /* diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 524d67e55b9..46b3d372dfd 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1765,7 +1765,7 @@ if ($action == 'create') // Bouton "Create Draft" print "\n"; - dol_fiche_end(); + print dol_get_fiche_end(); print '
'; print ''; @@ -2339,7 +2339,7 @@ if ($action == 'create') print '
'; print ''; - dol_fiche_end(); + print dol_get_fiche_end(); /** * Boutons actions diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php index 45178a656ba..3dc9a68d814 100644 --- a/htdocs/fourn/commande/contact.php +++ b/htdocs/fourn/commande/contact.php @@ -182,7 +182,7 @@ if ($id > 0 || !empty($ref)) dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1); - dol_fiche_end(); + print dol_get_fiche_end(); // Contacts lines include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php'; diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index 6f6678b57de..8b735f6b6d8 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -1080,7 +1080,7 @@ if ($id > 0 || !empty($ref)) { print ''; } - dol_fiche_end(); + print dol_get_fiche_end(); // traitement entrepot par défaut print '