From 9a470fa42dd775d610b2f2367b59490c13c9b5f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 22 Oct 2020 22:50:03 +0200 Subject: [PATCH] replace deprecated --- htdocs/adherents/admin/adherent.php | 2 +- htdocs/adherents/admin/adherent_emails.php | 2 +- htdocs/adherents/admin/adherent_extrafields.php | 2 +- htdocs/adherents/admin/adherent_type_extrafields.php | 2 +- htdocs/adherents/admin/website.php | 2 +- htdocs/adherents/ldap.php | 2 +- htdocs/adherents/note.php | 2 +- htdocs/adherents/stats/byproperties.php | 2 +- htdocs/adherents/stats/geo.php | 2 +- htdocs/adherents/stats/index.php | 2 +- htdocs/adherents/subscription.php | 4 ++-- htdocs/adherents/subscription/card.php | 4 ++-- htdocs/adherents/subscription/info.php | 2 +- htdocs/adherents/type.php | 8 ++++---- htdocs/adherents/type_ldap.php | 2 +- htdocs/adherents/type_translation.php | 4 ++-- htdocs/admin/accountant.php | 2 +- htdocs/admin/agenda.php | 2 +- htdocs/admin/agenda_extrafields.php | 2 +- htdocs/admin/agenda_extsites.php | 2 +- htdocs/admin/agenda_other.php | 2 +- htdocs/admin/agenda_reminder.php | 2 +- htdocs/admin/agenda_xcal.php | 2 +- htdocs/admin/bank.php | 2 +- htdocs/admin/bank_extrafields.php | 2 +- htdocs/admin/bom.php | 2 +- htdocs/admin/bom_extrafields.php | 2 +- htdocs/admin/chequereceipts.php | 2 +- htdocs/admin/commande.php | 2 +- .../commande_fournisseur_dispatch_extrafields.php | 2 +- htdocs/admin/company.php | 2 +- htdocs/admin/confexped.php | 2 +- htdocs/admin/contract.php | 2 +- htdocs/admin/dav.php | 2 +- htdocs/admin/defaultvalues.php | 2 +- htdocs/admin/ecm.php | 2 +- htdocs/admin/ecm_directories_extrafields.php | 2 +- htdocs/admin/ecm_files_extrafields.php | 2 +- htdocs/admin/emailcollector_card.php | 6 +++--- htdocs/admin/events.php | 2 +- htdocs/admin/expedition.php | 2 +- htdocs/admin/expedition_extrafields.php | 2 +- htdocs/admin/expeditiondet_extrafields.php | 2 +- htdocs/admin/expensereport.php | 2 +- htdocs/admin/expensereport_extrafields.php | 2 +- htdocs/admin/expensereport_ik.php | 2 +- htdocs/admin/expensereport_rules.php | 2 +- htdocs/admin/export.php | 2 +- htdocs/admin/facture.php | 2 +- htdocs/admin/facture_situation.php | 2 +- htdocs/admin/fichinter.php | 2 +- htdocs/admin/holiday.php | 2 +- htdocs/admin/holiday_extrafields.php | 2 +- htdocs/admin/import.php | 2 +- htdocs/admin/ldap.php | 2 +- htdocs/admin/ldap_contacts.php | 2 +- htdocs/admin/ldap_groups.php | 2 +- htdocs/admin/ldap_members.php | 2 +- htdocs/admin/ldap_members_types.php | 2 +- htdocs/admin/ldap_users.php | 2 +- htdocs/admin/limits.php | 2 +- htdocs/admin/livraison.php | 2 +- htdocs/admin/livraison_extrafields.php | 2 +- htdocs/admin/livraisondet_extrafields.php | 2 +- htdocs/admin/mailman.php | 4 ++-- htdocs/admin/mails.php | 6 +++--- htdocs/admin/mails_emailing.php | 6 +++--- htdocs/admin/mails_senderprofile_list.php | 2 +- htdocs/admin/mails_templates.php | 2 +- htdocs/admin/mails_ticket.php | 6 +++--- htdocs/admin/menus.php | 2 +- htdocs/admin/menus/edit.php | 4 ++-- htdocs/admin/menus/index.php | 2 +- htdocs/admin/menus/other.php | 2 +- htdocs/admin/modulehelp.php | 2 +- htdocs/admin/modules.php | 8 ++++---- htdocs/admin/mrp.php | 2 +- htdocs/admin/mrp_extrafields.php | 2 +- htdocs/admin/multicurrency.php | 2 +- htdocs/admin/oauth.php | 2 +- htdocs/admin/oauthlogintokens.php | 2 +- htdocs/admin/openinghours.php | 2 +- htdocs/admin/order_extrafields.php | 2 +- htdocs/admin/orderdet_extrafields.php | 2 +- htdocs/admin/payment.php | 2 +- htdocs/admin/perms.php | 2 +- htdocs/admin/propal.php | 2 +- htdocs/admin/proxy.php | 2 +- htdocs/admin/receiptprinter.php | 4 ++-- htdocs/admin/reception_extrafields.php | 2 +- htdocs/admin/reception_setup.php | 2 +- htdocs/admin/resource.php | 2 +- htdocs/admin/resource_extrafields.php | 2 +- htdocs/admin/security.php | 2 +- htdocs/admin/security_file.php | 2 +- htdocs/admin/security_other.php | 2 +- htdocs/admin/socialnetworks.php | 2 +- htdocs/admin/spip.php | 4 ++-- htdocs/admin/stock.php | 2 +- htdocs/admin/supplier_invoice.php | 2 +- htdocs/admin/supplier_order.php | 2 +- htdocs/admin/supplier_payment.php | 2 +- htdocs/admin/supplier_proposal.php | 2 +- htdocs/admin/supplierinvoice_extrafields.php | 2 +- htdocs/admin/supplierinvoicedet_extrafields.php | 2 +- htdocs/admin/supplierorder_extrafields.php | 2 +- htdocs/admin/supplierorderdet_extrafields.php | 2 +- htdocs/admin/taxes.php | 2 +- htdocs/admin/ticket.php | 2 +- htdocs/admin/ticket_extrafields.php | 2 +- htdocs/admin/ticket_public.php | 2 +- htdocs/admin/translation.php | 2 +- htdocs/admin/user.php | 2 +- htdocs/admin/usergroup.php | 2 +- htdocs/admin/website.php | 2 +- htdocs/admin/website_options.php | 2 +- htdocs/asset/admin/assets_extrafields.php | 2 +- htdocs/asset/admin/assets_type_extrafields.php | 2 +- htdocs/asset/admin/setup.php | 2 +- htdocs/asset/card.php | 6 +++--- htdocs/asset/document.php | 2 +- htdocs/asset/info.php | 2 +- htdocs/asset/note.php | 2 +- htdocs/asset/type.php | 8 ++++---- htdocs/blockedlog/admin/blockedlog.php | 2 +- htdocs/blockedlog/admin/blockedlog_list.php | 2 +- htdocs/bom/bom_agenda.php | 2 +- htdocs/bom/bom_card.php | 6 +++--- htdocs/bom/bom_document.php | 2 +- htdocs/bom/bom_note.php | 2 +- htdocs/bookmarks/card.php | 4 ++-- htdocs/categories/admin/categorie.php | 2 +- htdocs/categories/admin/categorie_extrafields.php | 2 +- htdocs/categories/card.php | 2 +- htdocs/categories/edit.php | 2 +- htdocs/categories/info.php | 2 +- htdocs/categories/photos.php | 2 +- htdocs/categories/traduction.php | 2 +- htdocs/categories/viewcat.php | 2 +- htdocs/comm/action/card.php | 6 +++--- htdocs/comm/action/document.php | 2 +- htdocs/comm/action/index.php | 2 +- htdocs/comm/action/info.php | 2 +- htdocs/comm/action/list.php | 2 +- htdocs/comm/admin/propal_extrafields.php | 2 +- htdocs/comm/admin/propaldet_extrafields.php | 2 +- htdocs/comm/card.php | 2 +- htdocs/comm/mailing/advtargetemailing.php | 2 +- htdocs/comm/mailing/card.php | 12 ++++++------ htdocs/comm/mailing/cibles.php | 2 +- htdocs/comm/mailing/info.php | 2 +- htdocs/comm/multiprix.php | 2 +- htdocs/comm/propal/card.php | 4 ++-- htdocs/comm/propal/contact.php | 2 +- htdocs/comm/propal/document.php | 2 +- htdocs/comm/propal/info.php | 2 +- htdocs/comm/propal/note.php | 2 +- htdocs/comm/propal/stats/index.php | 2 +- htdocs/comm/prospect/recap-prospect.php | 2 +- htdocs/comm/recap-client.php | 2 +- htdocs/comm/remise.php | 2 +- htdocs/comm/remx.php | 4 ++-- htdocs/commande/card.php | 4 ++-- htdocs/commande/contact.php | 2 +- htdocs/commande/document.php | 2 +- htdocs/commande/info.php | 2 +- htdocs/commande/note.php | 2 +- htdocs/commande/stats/index.php | 2 +- htdocs/compta/accounting-files.php | 2 +- htdocs/compta/bank/account_statement_document.php | 2 +- htdocs/compta/bank/annuel.php | 2 +- htdocs/compta/bank/bankentries_list.php | 2 +- htdocs/compta/bank/card.php | 6 +++--- htdocs/compta/bank/document.php | 2 +- htdocs/compta/bank/graph.php | 2 +- htdocs/compta/bank/info.php | 2 +- htdocs/compta/bank/line.php | 2 +- htdocs/compta/bank/releve.php | 4 ++-- htdocs/compta/bank/treso.php | 2 +- htdocs/compta/bank/various_payment/card.php | 4 ++-- htdocs/compta/bank/various_payment/document.php | 2 +- htdocs/compta/bank/various_payment/info.php | 2 +- htdocs/compta/cashcontrol/cashcontrol_card.php | 2 +- htdocs/compta/deplacement/card.php | 2 +- htdocs/compta/deplacement/document.php | 2 +- htdocs/compta/deplacement/info.php | 2 +- htdocs/compta/deplacement/stats/index.php | 2 +- .../facture/admin/facture_cust_extrafields.php | 2 +- .../facture/admin/facture_rec_cust_extrafields.php | 2 +- .../facture/admin/facturedet_cust_extrafields.php | 2 +- .../admin/facturedet_rec_cust_extrafields.php | 2 +- htdocs/compta/facture/card-rec.php | 6 +++--- htdocs/compta/facture/card.php | 4 ++-- htdocs/compta/facture/contact.php | 2 +- htdocs/compta/facture/document.php | 2 +- htdocs/compta/facture/info.php | 2 +- htdocs/compta/facture/prelevement.php | 2 +- htdocs/compta/facture/stats/index.php | 2 +- htdocs/compta/localtax/card.php | 4 ++-- htdocs/compta/paiement.php | 2 +- htdocs/compta/paiement/card.php | 2 +- htdocs/compta/paiement/cheque/card.php | 4 ++-- htdocs/compta/paiement/info.php | 2 +- htdocs/compta/paiement_charge.php | 2 +- htdocs/compta/payment_sc/card.php | 2 +- htdocs/compta/prelevement/card.php | 2 +- htdocs/compta/prelevement/create.php | 4 ++-- htdocs/compta/prelevement/factures.php | 2 +- htdocs/compta/prelevement/fiche-rejet.php | 2 +- htdocs/compta/prelevement/fiche-stat.php | 2 +- htdocs/compta/prelevement/line.php | 2 +- htdocs/compta/recap-compta.php | 2 +- htdocs/compta/sociales/card.php | 4 ++-- htdocs/compta/sociales/document.php | 2 +- htdocs/compta/sociales/info.php | 2 +- htdocs/compta/tva/card.php | 4 ++-- htdocs/compta/tva/document.php | 2 +- htdocs/compta/tva/info.php | 2 +- htdocs/contact/agenda.php | 2 +- htdocs/contact/card.php | 6 +++--- htdocs/contact/consumption.php | 2 +- htdocs/contact/document.php | 2 +- htdocs/contact/info.php | 2 +- htdocs/contact/ldap.php | 2 +- htdocs/contact/note.php | 2 +- htdocs/contact/perso.php | 4 ++-- htdocs/contrat/admin/contract_extrafields.php | 2 +- htdocs/contrat/admin/contractdet_extrafields.php | 2 +- htdocs/contrat/agenda.php | 2 +- htdocs/contrat/card.php | 4 ++-- htdocs/contrat/contact.php | 2 +- htdocs/contrat/document.php | 2 +- htdocs/contrat/note.php | 2 +- htdocs/core/class/html.formticket.class.php | 2 +- htdocs/core/customreports.php | 2 +- htdocs/core/lib/accounting.lib.php | 2 +- htdocs/core/lib/functions.lib.php | 2 +- htdocs/core/lib/report.lib.php | 2 +- htdocs/core/modules/oauth/github_oauthcallback.php | 2 +- htdocs/core/modules/oauth/google_oauthcallback.php | 2 +- .../core/modules/oauth/stripelive_oauthcallback.php | 2 +- .../core/modules/oauth/stripetest_oauthcallback.php | 2 +- htdocs/core/tpl/admin_extrafields_add.tpl.php | 2 +- htdocs/core/tpl/admin_extrafields_edit.tpl.php | 2 +- htdocs/core/tpl/card_presend.tpl.php | 2 +- htdocs/core/tpl/massactions_pre.tpl.php | 2 +- htdocs/cron/admin/cron.php | 2 +- htdocs/cron/card.php | 6 +++--- htdocs/cron/info.php | 2 +- htdocs/datapolicy/admin/setup.php | 2 +- htdocs/datapolicy/admin/setupmail.php | 2 +- htdocs/don/admin/donation.php | 2 +- htdocs/don/admin/donation_extrafields.php | 2 +- htdocs/don/card.php | 6 +++--- htdocs/don/document.php | 2 +- htdocs/don/info.php | 2 +- htdocs/don/note.php | 2 +- htdocs/don/payment/card.php | 2 +- htdocs/don/payment/payment.php | 2 +- htdocs/don/stats/index.php | 2 +- htdocs/ecm/dir_add_card.php | 2 +- htdocs/ecm/dir_card.php | 2 +- htdocs/ecm/file_card.php | 2 +- htdocs/ecm/index.php | 2 +- htdocs/ecm/index_auto.php | 2 +- htdocs/ecm/search.php | 2 +- htdocs/expedition/card.php | 4 ++-- htdocs/expedition/contact.php | 2 +- htdocs/expedition/document.php | 2 +- htdocs/expedition/note.php | 2 +- htdocs/expedition/shipment.php | 2 +- htdocs/expedition/stats/index.php | 2 +- htdocs/expensereport/card.php | 6 +++--- htdocs/expensereport/document.php | 2 +- htdocs/expensereport/info.php | 2 +- htdocs/expensereport/list.php | 2 +- htdocs/expensereport/note.php | 2 +- htdocs/expensereport/payment/card.php | 2 +- htdocs/expensereport/payment/info.php | 2 +- htdocs/expensereport/payment/payment.php | 4 ++-- htdocs/expensereport/stats/index.php | 2 +- htdocs/exports/export.php | 10 +++++----- htdocs/fichinter/admin/fichinter_extrafields.php | 2 +- htdocs/fichinter/admin/fichinterdet_extrafields.php | 2 +- htdocs/fichinter/card-rec.php | 6 +++--- htdocs/fichinter/card.php | 6 +++--- htdocs/fichinter/contact.php | 2 +- htdocs/fichinter/document.php | 2 +- htdocs/fichinter/info.php | 2 +- htdocs/fichinter/note.php | 2 +- htdocs/fichinter/stats/index.php | 2 +- htdocs/fourn/card.php | 2 +- htdocs/fourn/commande/card.php | 4 ++-- htdocs/fourn/commande/contact.php | 2 +- htdocs/fourn/commande/dispatch.php | 2 +- htdocs/fourn/commande/document.php | 2 +- htdocs/fourn/commande/info.php | 2 +- htdocs/fourn/commande/note.php | 2 +- htdocs/fourn/facture/card.php | 4 ++-- htdocs/fourn/facture/contact.php | 2 +- htdocs/fourn/facture/document.php | 2 +- htdocs/fourn/facture/info.php | 2 +- htdocs/fourn/facture/note.php | 2 +- htdocs/fourn/facture/paiement.php | 2 +- htdocs/fourn/paiement/card.php | 2 +- htdocs/fourn/paiement/info.php | 2 +- htdocs/fourn/recap-fourn.php | 2 +- htdocs/holiday/card.php | 6 +++--- htdocs/holiday/document.php | 2 +- htdocs/holiday/list.php | 2 +- htdocs/hrm/admin/admin_establishment.php | 2 +- htdocs/hrm/admin/admin_hrm.php | 2 +- htdocs/hrm/establishment/card.php | 6 +++--- htdocs/hrm/establishment/info.php | 2 +- htdocs/imports/import.php | 12 ++++++------ htdocs/intracommreport/admin/intracommreport.php | 2 +- htdocs/intracommreport/card.php | 6 +++--- htdocs/livraison/card.php | 2 +- htdocs/loan/card.php | 4 ++-- htdocs/loan/document.php | 2 +- htdocs/loan/info.php | 2 +- htdocs/loan/note.php | 2 +- htdocs/loan/payment/card.php | 2 +- htdocs/loan/payment/payment.php | 2 +- htdocs/loan/schedule.php | 2 +- htdocs/margin/admin/margin.php | 2 +- htdocs/margin/agentMargins.php | 2 +- htdocs/margin/checkMargins.php | 2 +- htdocs/margin/customerMargins.php | 2 +- htdocs/margin/productMargins.php | 2 +- htdocs/margin/tabs/productMargins.php | 2 +- htdocs/margin/tabs/thirdpartyMargins.php | 2 +- htdocs/modulebuilder/admin/setup.php | 2 +- htdocs/modulebuilder/index.php | 10 +++++----- htdocs/modulebuilder/template/admin/about.php | 2 +- .../template/admin/myobject_extrafields.php | 2 +- htdocs/modulebuilder/template/admin/setup.php | 2 +- htdocs/modulebuilder/template/myobject_agenda.php | 2 +- htdocs/modulebuilder/template/myobject_card.php | 6 +++--- htdocs/modulebuilder/template/myobject_document.php | 2 +- htdocs/modulebuilder/template/myobject_note.php | 2 +- htdocs/mrp/mo_agenda.php | 2 +- htdocs/mrp/mo_card.php | 6 +++--- htdocs/mrp/mo_document.php | 2 +- htdocs/mrp/mo_movements.php | 2 +- htdocs/mrp/mo_note.php | 2 +- htdocs/mrp/mo_production.php | 2 +- htdocs/opensurvey/card.php | 2 +- htdocs/opensurvey/results.php | 2 +- htdocs/opensurvey/wizard/create_survey.php | 2 +- htdocs/paybox/admin/paybox.php | 2 +- htdocs/paypal/admin/paypal.php | 2 +- htdocs/printing/admin/printing.php | 8 ++++---- htdocs/product/admin/price_rules.php | 2 +- htdocs/product/admin/product.php | 2 +- htdocs/product/admin/product_extrafields.php | 2 +- htdocs/product/admin/product_lot_extrafields.php | 2 +- .../product/admin/product_supplier_extrafields.php | 2 +- htdocs/product/admin/stock_extrafields.php | 2 +- htdocs/product/agenda.php | 2 +- .../product/canvas/product/tpl/card_create.tpl.php | 2 +- htdocs/product/canvas/product/tpl/card_edit.tpl.php | 2 +- htdocs/product/canvas/product/tpl/card_view.tpl.php | 2 +- .../product/canvas/service/tpl/card_create.tpl.php | 2 +- htdocs/product/canvas/service/tpl/card_edit.tpl.php | 2 +- htdocs/product/canvas/service/tpl/card_view.tpl.php | 2 +- htdocs/product/card.php | 8 ++++---- htdocs/product/composition/card.php | 2 +- htdocs/product/document.php | 2 +- htdocs/product/dynamic_price/editor.php | 2 +- htdocs/product/fournisseurs.php | 4 ++-- htdocs/product/inventory/card.php | 6 +++--- htdocs/product/inventory/inventory.php | 2 +- htdocs/product/note.php | 2 +- htdocs/product/popuprop.php | 2 +- htdocs/product/price.php | 12 ++++++------ htdocs/product/stats/card.php | 4 ++-- htdocs/product/stats/commande.php | 2 +- htdocs/product/stats/commande_fournisseur.php | 2 +- htdocs/product/stats/contrat.php | 2 +- htdocs/product/stats/facture.php | 2 +- htdocs/product/stats/facture_fournisseur.php | 2 +- htdocs/product/stats/propal.php | 2 +- htdocs/product/stats/supplier_proposal.php | 2 +- htdocs/product/stock/card.php | 6 +++--- htdocs/product/stock/fiche-valo.php | 2 +- htdocs/product/stock/info.php | 2 +- htdocs/product/stock/movement_card.php | 2 +- htdocs/product/stock/movement_list.php | 2 +- htdocs/product/stock/product.php | 2 +- htdocs/product/stock/productlot_card.php | 4 ++-- htdocs/product/stock/productlot_document.php | 2 +- htdocs/product/stock/replenish.php | 2 +- htdocs/product/stock/replenishorders.php | 2 +- htdocs/product/stock/stockatdate.php | 2 +- htdocs/product/stock/tpl/stockcorrection.tpl.php | 2 +- htdocs/product/stock/tpl/stocktransfer.tpl.php | 2 +- htdocs/product/traduction.php | 4 ++-- htdocs/projet/activity/perday.php | 2 +- htdocs/projet/activity/permonth.php | 2 +- htdocs/projet/activity/perweek.php | 2 +- htdocs/projet/admin/project.php | 2 +- htdocs/projet/admin/project_extrafields.php | 2 +- htdocs/projet/admin/project_task_extrafields.php | 2 +- htdocs/projet/card.php | 6 +++--- htdocs/projet/comment.php | 2 +- htdocs/projet/contact.php | 2 +- htdocs/projet/document.php | 2 +- htdocs/projet/element.php | 2 +- htdocs/projet/ganttview.php | 2 +- htdocs/projet/info.php | 2 +- htdocs/projet/note.php | 2 +- htdocs/projet/stats/index.php | 2 +- htdocs/projet/tasks.php | 4 ++-- htdocs/projet/tasks/comment.php | 4 ++-- htdocs/projet/tasks/contact.php | 4 ++-- htdocs/projet/tasks/document.php | 4 ++-- htdocs/projet/tasks/note.php | 4 ++-- htdocs/projet/tasks/stats/index.php | 2 +- htdocs/projet/tasks/task.php | 6 +++--- htdocs/projet/tasks/time.php | 4 ++-- htdocs/public/members/new.php | 2 +- htdocs/reception/card.php | 6 +++--- htdocs/reception/contact.php | 2 +- htdocs/reception/note.php | 2 +- htdocs/reception/stats/index.php | 2 +- htdocs/recruitment/admin/candidature_extrafields.php | 2 +- htdocs/recruitment/admin/jobposition_extrafields.php | 2 +- htdocs/recruitment/admin/public_interface.php | 2 +- htdocs/recruitment/admin/setup.php | 2 +- htdocs/recruitment/admin/setup_candidatures.php | 2 +- htdocs/recruitment/recruitmentcandidature_agenda.php | 2 +- htdocs/recruitment/recruitmentcandidature_card.php | 6 +++--- .../recruitment/recruitmentcandidature_document.php | 2 +- htdocs/recruitment/recruitmentcandidature_note.php | 2 +- htdocs/recruitment/recruitmentjobposition_agenda.php | 2 +- .../recruitmentjobposition_candidature.php | 6 +++--- htdocs/recruitment/recruitmentjobposition_card.php | 6 +++--- .../recruitment/recruitmentjobposition_document.php | 2 +- htdocs/recruitment/recruitmentjobposition_note.php | 2 +- htdocs/resource/agenda.php | 2 +- htdocs/resource/card.php | 4 ++-- htdocs/resource/contact.php | 2 +- htdocs/resource/document.php | 2 +- htdocs/resource/element_resource.php | 8 ++++---- htdocs/resource/note.php | 2 +- htdocs/salaries/admin/salaries.php | 2 +- htdocs/salaries/admin/salaries_extrafields.php | 2 +- htdocs/salaries/card.php | 4 ++-- htdocs/salaries/document.php | 2 +- htdocs/salaries/info.php | 2 +- htdocs/salaries/stats/index.php | 2 +- htdocs/societe/admin/contact_extrafields.php | 2 +- htdocs/societe/admin/societe.php | 2 +- htdocs/societe/admin/societe_extrafields.php | 2 +- htdocs/societe/agenda.php | 2 +- htdocs/societe/canvas/company/tpl/card_view.tpl.php | 2 +- .../societe/canvas/individual/tpl/card_view.tpl.php | 2 +- htdocs/societe/card.php | 6 +++--- htdocs/societe/consumption.php | 2 +- htdocs/societe/contact.php | 2 +- htdocs/societe/document.php | 2 +- htdocs/societe/note.php | 2 +- htdocs/societe/notify/card.php | 2 +- htdocs/societe/paymentmodes.php | 10 +++++----- htdocs/societe/price.php | 2 +- htdocs/societe/project.php | 2 +- htdocs/societe/societecontact.php | 2 +- htdocs/societe/website.php | 2 +- htdocs/stripe/admin/stripe.php | 2 +- .../admin/supplier_proposal_extrafields.php | 2 +- .../admin/supplier_proposaldet_extrafields.php | 2 +- htdocs/supplier_proposal/card.php | 4 ++-- htdocs/supplier_proposal/contact.php | 2 +- htdocs/supplier_proposal/document.php | 2 +- htdocs/supplier_proposal/info.php | 2 +- htdocs/supplier_proposal/note.php | 2 +- htdocs/takepos/admin/appearance.php | 2 +- htdocs/takepos/admin/bar.php | 2 +- htdocs/takepos/admin/other.php | 2 +- htdocs/takepos/admin/receipt.php | 2 +- htdocs/takepos/admin/setup.php | 2 +- htdocs/takepos/admin/terminal.php | 2 +- htdocs/ticket/agenda.php | 4 ++-- htdocs/ticket/card.php | 8 ++++---- htdocs/ticket/contact.php | 4 ++-- htdocs/ticket/document.php | 4 ++-- htdocs/ticket/list.php | 4 ++-- htdocs/ticket/messaging.php | 4 ++-- htdocs/ticket/stats/index.php | 2 +- htdocs/user/admin/group_extrafields.php | 2 +- htdocs/user/admin/user_extrafields.php | 2 +- htdocs/user/agenda_extsites.php | 2 +- htdocs/user/bank.php | 4 ++-- htdocs/user/card.php | 6 +++--- htdocs/user/clicktodial.php | 2 +- htdocs/user/document.php | 2 +- htdocs/user/group/card.php | 6 +++--- htdocs/user/group/ldap.php | 2 +- htdocs/user/group/perms.php | 2 +- htdocs/user/info.php | 2 +- htdocs/user/ldap.php | 2 +- htdocs/user/note.php | 2 +- htdocs/user/notify/card.php | 2 +- htdocs/user/param_ihm.php | 4 ++-- htdocs/user/perms.php | 2 +- htdocs/variants/admin/admin.php | 2 +- htdocs/variants/card.php | 2 +- htdocs/variants/combinations.php | 6 +++--- htdocs/variants/create.php | 2 +- htdocs/variants/create_val.php | 4 ++-- htdocs/variants/generator.php | 2 +- htdocs/website/index.php | 8 ++++---- htdocs/website/websiteaccount_card.php | 6 +++--- htdocs/zapier/admin/about.php | 2 +- htdocs/zapier/admin/setup.php | 2 +- htdocs/zapier/hook_agenda.php | 2 +- htdocs/zapier/hook_card.php | 6 +++--- htdocs/zapier/hook_document.php | 2 +- htdocs/zapier/hook_note.php | 2 +- 520 files changed, 686 insertions(+), 686 deletions(-) diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index f2c52daa4b0..07d4454feae 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -132,7 +132,7 @@ print load_fiche_titre($langs->trans("MembersSetup"), $linkback, 'title_setup'); $head = member_admin_prepare_head(); -dol_fiche_head($head, 'general', $langs->trans("Members"), -1, 'user'); +print dol_get_fiche_head($head, 'general', $langs->trans("Members"), -1, 'user'); print '
'; print ''; diff --git a/htdocs/adherents/admin/adherent_emails.php b/htdocs/adherents/admin/adherent_emails.php index a3550e4a35a..e5b612e3d86 100644 --- a/htdocs/adherents/admin/adherent_emails.php +++ b/htdocs/adherents/admin/adherent_emails.php @@ -119,7 +119,7 @@ print load_fiche_titre($langs->trans("MembersSetup"), $linkback, 'title_setup'); $head = member_admin_prepare_head(); -dol_fiche_head($head, 'emails', $langs->trans("Members"), -1, 'user'); +print dol_get_fiche_head($head, 'emails', $langs->trans("Members"), -1, 'user'); // TODO Use global form //print ''; diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php index 8ca29286cab..689e7c11be3 100644 --- a/htdocs/adherents/admin/adherent_extrafields.php +++ b/htdocs/adherents/admin/adherent_extrafields.php @@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans("MembersSetup"), $linkback, 'title_setup'); $head = member_admin_prepare_head(); -dol_fiche_head($head, 'attributes', $langs->trans("Members"), -1, 'user'); +print dol_get_fiche_head($head, 'attributes', $langs->trans("Members"), -1, 'user'); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; diff --git a/htdocs/adherents/admin/adherent_type_extrafields.php b/htdocs/adherents/admin/adherent_type_extrafields.php index 5546a99a334..9fef3ad5c21 100644 --- a/htdocs/adherents/admin/adherent_type_extrafields.php +++ b/htdocs/adherents/admin/adherent_type_extrafields.php @@ -73,7 +73,7 @@ print load_fiche_titre($langs->trans("MembersSetup"), $linkback, 'title_setup'); $head = member_admin_prepare_head(); -dol_fiche_head($head, 'attributes_type', $langs->trans("Members"), -1, 'user'); +print dol_get_fiche_head($head, 'attributes_type', $langs->trans("Members"), -1, 'user'); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php index d030c73f530..beaf05ce3fa 100644 --- a/htdocs/adherents/admin/website.php +++ b/htdocs/adherents/admin/website.php @@ -94,7 +94,7 @@ print ''; print ''; print ''; -dol_fiche_head($head, 'website', $langs->trans("Members"), -1, 'user'); +print dol_get_fiche_head($head, 'website', $langs->trans("Members"), -1, 'user'); if ($conf->use_javascript_ajax) { print "\n".''."\n"; llxHeader($moreheadcss.$moreheadjs, $langs->trans("ECMArea"), '', '', '', '', $morejs, '', 0, 0); $head = ecm_prepare_dasboard_head(''); -dol_fiche_head($head, 'index', $langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager"), -1, ''); +print dol_get_fiche_head($head, 'index', $langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager"), -1, ''); // Add filemanager component diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php index e8bf1465fb5..f3708fbe6df 100644 --- a/htdocs/ecm/index_auto.php +++ b/htdocs/ecm/index_auto.php @@ -330,7 +330,7 @@ if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) } $head = ecm_prepare_dasboard_head(''); -dol_fiche_head($head, 'index_auto', $langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager"), -1, ''); +print dol_get_fiche_head($head, 'index_auto', $langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager"), -1, ''); diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php index 8100ff46ba3..6f9f264994b 100644 --- a/htdocs/ecm/search.php +++ b/htdocs/ecm/search.php @@ -119,7 +119,7 @@ print $langs->trans("FeatureNotYetAvailable").'.

'; // Tool bar $head = ecm_prepare_head_fm($ecmdir, $module, $section); -//dol_fiche_head($head, 'search_form', '', 1); +//print dol_get_fiche_head($head, 'search_form', '', 1); print '
'; diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 86ec2ee5c38..baf8d6be46e 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -882,7 +882,7 @@ if ($action == 'create') print ''; } - dol_fiche_head(''); + print dol_get_fiche_head(''); print ''; @@ -1584,7 +1584,7 @@ if ($action == 'create') $res = $object->fetch_optionals(); $head = shipping_prepare_head($object); - dol_fiche_head($head, 'shipping', $langs->trans("Shipment"), -1, 'sending'); + print dol_get_fiche_head($head, 'shipping', $langs->trans("Shipment"), -1, 'sending'); $formconfirm = ''; diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php index 69c5080ea83..d2adaadf484 100644 --- a/htdocs/expedition/contact.php +++ b/htdocs/expedition/contact.php @@ -152,7 +152,7 @@ if ($id > 0 || !empty($ref)) $langs->trans("OrderCard"); $head = shipping_prepare_head($object); - dol_fiche_head($head, 'contact', $langs->trans("Shipment"), -1, 'sending'); + print dol_get_fiche_head($head, 'contact', $langs->trans("Shipment"), -1, 'sending'); // Shipment card diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php index 69f59cb3385..ede667279e6 100644 --- a/htdocs/expedition/document.php +++ b/htdocs/expedition/document.php @@ -94,7 +94,7 @@ if ($id > 0 || !empty($ref)) { $upload_dir = $conf->expedition->dir_output.'/sending/'.dol_sanitizeFileName($object->ref); $head = shipping_prepare_head($object); - dol_fiche_head($head, 'documents', $langs->trans("Shipment"), -1, 'sending'); + print dol_get_fiche_head($head, 'documents', $langs->trans("Shipment"), -1, 'sending'); // Build file list diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php index 199782398a6..64aa415c4ce 100644 --- a/htdocs/expedition/note.php +++ b/htdocs/expedition/note.php @@ -91,7 +91,7 @@ $form = new Form($db); if ($id > 0 || !empty($ref)) { $head = shipping_prepare_head($object); - dol_fiche_head($head, 'note', $langs->trans("Shipment"), -1, 'sending'); + print dol_get_fiche_head($head, 'note', $langs->trans("Shipment"), -1, 'sending'); // Shipment card diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index 152dee7cd36..5b3949dc584 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -250,7 +250,7 @@ if ($id > 0 || !empty($ref)) $res = $object->fetch_optionals(); $head = commande_prepare_head($object); - dol_fiche_head($head, 'shipping', $langs->trans("CustomerOrder"), -1, 'order'); + print dol_get_fiche_head($head, 'shipping', $langs->trans("CustomerOrder"), -1, 'order'); $formconfirm = ''; diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php index 9521cd46d10..d500a97ab71 100644 --- a/htdocs/expedition/stats/index.php +++ b/htdocs/expedition/stats/index.php @@ -204,7 +204,7 @@ $type = 'shipment_stats'; complete_head_from_modules($conf, $langs, null, $head, $h, $type); -dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1); +print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1); print '
'; diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index 4579c1a3e8f..c0896151284 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -1390,7 +1390,7 @@ if ($action == 'create') print ''; print ''; - dol_fiche_head(''); + print dol_get_fiche_head(''); print '
'; print ''; @@ -1527,7 +1527,7 @@ if ($action == 'create') print ''; print ''; - dol_fiche_head($head, 'card', $langs->trans("ExpenseReport"), 0, 'trip'); + print dol_get_fiche_head($head, 'card', $langs->trans("ExpenseReport"), 0, 'trip'); if ($object->status == 99) { @@ -1625,7 +1625,7 @@ if ($action == 'create') print ''; } else { - dol_fiche_head($head, 'card', $langs->trans("ExpenseReport"), -1, 'trip'); + print dol_get_fiche_head($head, 'card', $langs->trans("ExpenseReport"), -1, 'trip'); // Clone confirmation if ($action == 'clone') { diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php index 6814c0a5b0d..531140e1b2a 100644 --- a/htdocs/expensereport/document.php +++ b/htdocs/expensereport/document.php @@ -110,7 +110,7 @@ if ($object->id) $head = expensereport_prepare_head($object); - dol_fiche_head($head, 'documents', $langs->trans("ExpenseReport"), -1, 'trip'); + print dol_get_fiche_head($head, 'documents', $langs->trans("ExpenseReport"), -1, 'trip'); $linkback = ''.$langs->trans("BackToList").''; diff --git a/htdocs/expensereport/info.php b/htdocs/expensereport/info.php index 0b50a69071f..00510e4e5fd 100644 --- a/htdocs/expensereport/info.php +++ b/htdocs/expensereport/info.php @@ -77,7 +77,7 @@ if ($id > 0 || !empty($ref)) $head = expensereport_prepare_head($object); - dol_fiche_head($head, 'info', $langs->trans("ExpenseReport"), -1, 'trip'); + print dol_get_fiche_head($head, 'info', $langs->trans("ExpenseReport"), -1, 'trip'); $linkback = ''.$langs->trans("BackToList").''; diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index 0a264c59a2a..0186bd08103 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -341,7 +341,7 @@ if ($resql) $linkback = ''.$langs->trans("BackToList").''; $head = user_prepare_head($fuser); - dol_fiche_head($head, 'expensereport', $title, -1, 'user'); + print dol_get_fiche_head($head, 'expensereport', $title, -1, 'user'); dol_banner_tab($fuser, 'id', $linkback, $user->rights->user->user->lire || $user->admin); diff --git a/htdocs/expensereport/note.php b/htdocs/expensereport/note.php index 171e8980fab..31667d74a4e 100644 --- a/htdocs/expensereport/note.php +++ b/htdocs/expensereport/note.php @@ -90,7 +90,7 @@ if ($id > 0 || !empty($ref)) $head = expensereport_prepare_head($object); - dol_fiche_head($head, 'note', $langs->trans("ExpenseReport"), -1, 'trip'); + print dol_get_fiche_head($head, 'note', $langs->trans("ExpenseReport"), -1, 'trip'); $linkback = ''.$langs->trans("BackToList").''; diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php index 718e96b12b0..4a5099cc03a 100644 --- a/htdocs/expensereport/payment/card.php +++ b/htdocs/expensereport/payment/card.php @@ -81,7 +81,7 @@ $form = new Form($db); $head = payment_expensereport_prepare_head($object); -dol_fiche_head($head, 'payment', $langs->trans("ExpenseReportPayment"), -1, 'payment'); +print dol_get_fiche_head($head, 'payment', $langs->trans("ExpenseReportPayment"), -1, 'payment'); /* * Confirm deleting of the payment diff --git a/htdocs/expensereport/payment/info.php b/htdocs/expensereport/payment/info.php index b548eb54be2..281e760684d 100644 --- a/htdocs/expensereport/payment/info.php +++ b/htdocs/expensereport/payment/info.php @@ -56,7 +56,7 @@ $object->info($object->id); $head = payment_expensereport_prepare_head($object); -dol_fiche_head($head, 'info', $langs->trans("ExpenseReportPayment"), -1, 'payment'); +print dol_get_fiche_head($head, 'info', $langs->trans("ExpenseReportPayment"), -1, 'payment'); //$linkback = '' . $langs->trans("BackToList") . ''; diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php index 1f0c1e8da4c..54ecd8874a9 100644 --- a/htdocs/expensereport/payment/payment.php +++ b/htdocs/expensereport/payment/payment.php @@ -206,7 +206,7 @@ if ($action == 'create' || empty($action)) print ''; print ''; - dol_fiche_head(null, '0', '', -1); + print dol_get_fiche_head(null, '0', '', -1); $linkback = ''; // $linkback = '' . $langs->trans("BackToList") . ''; @@ -241,7 +241,7 @@ if ($action == 'create' || empty($action)) dol_fiche_end(); - dol_fiche_head(); + print dol_get_fiche_head(); print '
'."\n"; diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php index 2079a2bf045..b789fc57345 100644 --- a/htdocs/expensereport/stats/index.php +++ b/htdocs/expensereport/stats/index.php @@ -201,7 +201,7 @@ $h++; complete_head_from_modules($conf, $langs, null, $head, $h, 'trip_stats'); -dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1); +print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1); print '
'; diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index d7075d86e1b..412167c55f2 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -428,7 +428,7 @@ if ($step == 1 || !$datatoexport) $hselected = $h; $h++; - dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1); + print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -1); print '
'.$langs->trans("SelectExportDataSet").'

'; @@ -489,7 +489,7 @@ if ($step == 2 && $datatoexport) $hselected = $h; $h++; - dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -2); + print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -2); print '
'; print '
'; @@ -687,7 +687,7 @@ if ($step == 3 && $datatoexport) $hselected = $h; $h++; - dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -2); + print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -2); print '
'; print '
'; @@ -875,7 +875,7 @@ if ($step == 4 && $datatoexport) $hselected = $h; $h++; - dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -2); + print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -2); print '
'; print '
'; @@ -1133,7 +1133,7 @@ if ($step == 5 && $datatoexport) $hselected = $h; $h++; - dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -2); + print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -2); /* * Confirmation suppression fichier diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php index c19bce3c9d1..84dfeb7cfd3 100644 --- a/htdocs/fichinter/admin/fichinter_extrafields.php +++ b/htdocs/fichinter/admin/fichinter_extrafields.php @@ -69,7 +69,7 @@ print load_fiche_titre($langs->trans("InterventionsSetup"), $linkback, 'title_se $head = fichinter_admin_prepare_head(); -dol_fiche_head($head, 'attributes', $langs->trans("Interventions"), -1, 'intervention'); +print dol_get_fiche_head($head, 'attributes', $langs->trans("Interventions"), -1, 'intervention'); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; diff --git a/htdocs/fichinter/admin/fichinterdet_extrafields.php b/htdocs/fichinter/admin/fichinterdet_extrafields.php index 768de47cfd0..5a13bdb4b32 100644 --- a/htdocs/fichinter/admin/fichinterdet_extrafields.php +++ b/htdocs/fichinter/admin/fichinterdet_extrafields.php @@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans("InterventionsSetup"), $linkback, 'title_se $head = fichinter_admin_prepare_head(); -dol_fiche_head($head, 'attributesdet', $langs->trans("Interventions"), -1, 'intervention'); +print dol_get_fiche_head($head, 'attributesdet', $langs->trans("Interventions"), -1, 'intervention'); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php index b8ff3714596..0a4bbfe922f 100644 --- a/htdocs/fichinter/card-rec.php +++ b/htdocs/fichinter/card-rec.php @@ -256,7 +256,7 @@ if ($action == 'create') { print ''; print ''; - dol_fiche_head(); + print dol_get_fiche_head(); $rowspan = 4; if (!empty($conf->projet->enabled) && $object->fk_project > 0) $rowspan++; @@ -429,7 +429,7 @@ if ($action == 'create') { } } elseif ($action == 'selsocforcreatefrommodel') { print load_fiche_titre($langs->trans("CreateRepeatableIntervention"), '', 'intervention'); - dol_fiche_head(''); + print dol_get_fiche_head(''); print '
'; print '
'; @@ -461,7 +461,7 @@ if ($action == 'create') { $head = fichinter_rec_prepare_head($object); - dol_fiche_head($head, 'card', $langs->trans("PredefinedInterventional"), 0, 'intervention'); + print dol_get_fiche_head($head, 'card', $langs->trans("PredefinedInterventional"), 0, 'intervention'); // Intervention card $linkback = ''.$langs->trans("BackToList").''; diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index e4afe4b0452..720e6fe71f3 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -882,7 +882,7 @@ if ($action == 'create') print ''; print ''; - dol_fiche_head(''); + print dol_get_fiche_head(''); print '
'; @@ -1037,7 +1037,7 @@ if ($action == 'create') print ''; print ''; - dol_fiche_head(''); + print dol_get_fiche_head(''); if (is_object($objectsrc)) { @@ -1084,7 +1084,7 @@ if ($action == 'create') $head = fichinter_prepare_head($object); - dol_fiche_head($head, 'card', $langs->trans("InterventionCard"), -1, 'intervention'); + print dol_get_fiche_head($head, 'card', $langs->trans("InterventionCard"), -1, 'intervention'); $formconfirm = ''; diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php index 1eb0df5147a..8dd498d5242 100644 --- a/htdocs/fichinter/contact.php +++ b/htdocs/fichinter/contact.php @@ -118,7 +118,7 @@ if ($id > 0 || !empty($ref)) $object->fetch_thirdparty(); $head = fichinter_prepare_head($object); - dol_fiche_head($head, 'contact', $langs->trans("InterventionCard"), -1, 'intervention'); + print dol_get_fiche_head($head, 'contact', $langs->trans("InterventionCard"), -1, 'intervention'); // Intervention card diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php index 49988e27e78..e28345534d7 100644 --- a/htdocs/fichinter/document.php +++ b/htdocs/fichinter/document.php @@ -92,7 +92,7 @@ if ($object->id) $head = fichinter_prepare_head($object); - dol_fiche_head($head, 'documents', $langs->trans("InterventionCard"), -1, 'intervention'); + print dol_get_fiche_head($head, 'documents', $langs->trans("InterventionCard"), -1, 'intervention'); // Build file list diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php index 02ef2ca19d0..320a29f4171 100644 --- a/htdocs/fichinter/info.php +++ b/htdocs/fichinter/info.php @@ -64,7 +64,7 @@ $object->fetch_thirdparty(); $object->info($object->id); $head = fichinter_prepare_head($object); -dol_fiche_head($head, 'info', $langs->trans('InterventionCard'), -1, 'intervention'); +print dol_get_fiche_head($head, 'info', $langs->trans('InterventionCard'), -1, 'intervention'); // Intervention card $linkback = ''.$langs->trans("BackToList").''; diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php index 42003b8a27a..fd18040d037 100644 --- a/htdocs/fichinter/note.php +++ b/htdocs/fichinter/note.php @@ -67,7 +67,7 @@ if ($id > 0 || !empty($ref)) $object->fetch_thirdparty(); $head = fichinter_prepare_head($object); - dol_fiche_head($head, 'note', $langs->trans('InterventionCard'), -1, 'intervention'); + print dol_get_fiche_head($head, 'note', $langs->trans('InterventionCard'), -1, 'intervention'); // Intervention card $linkback = ''.$langs->trans("BackToList").''; diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php index 90d9741fbc3..45d4c2c2c7d 100644 --- a/htdocs/fichinter/stats/index.php +++ b/htdocs/fichinter/stats/index.php @@ -209,7 +209,7 @@ $type = 'fichinter_stats'; complete_head_from_modules($conf, $langs, null, $head, $h, $type); -dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1); +print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1); print '
'; diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index 1ad41c08da0..e6a1a6a5a8c 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -159,7 +159,7 @@ if ($object->id > 0) */ $head = societe_prepare_head($object); - dol_fiche_head($head, 'supplier', $langs->trans("ThirdParty"), -1, 'company'); + print dol_get_fiche_head($head, 'supplier', $langs->trans("ThirdParty"), -1, 'company'); $linkback = ''.$langs->trans("BackToList").''; diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index c4c0957af0b..1d67609ee3a 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1587,7 +1587,7 @@ if ($action == 'create') print ''; if (!empty($currency_tx)) print ''; - dol_fiche_head(''); + print dol_get_fiche_head(''); print '
'; @@ -1804,7 +1804,7 @@ if ($action == 'create') $head = ordersupplier_prepare_head($object); $title = $langs->trans("SupplierOrder"); - dol_fiche_head($head, 'card', $title, -1, 'order'); + print dol_get_fiche_head($head, 'card', $title, -1, 'order'); $formconfirm = ''; diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php index 683658c791e..45178a656ba 100644 --- a/htdocs/fourn/commande/contact.php +++ b/htdocs/fourn/commande/contact.php @@ -131,7 +131,7 @@ if ($id > 0 || !empty($ref)) $object->fetch_thirdparty(); $head = ordersupplier_prepare_head($object); - dol_fiche_head($head, 'contact', $langs->trans("SupplierOrder"), -1, 'order'); + print dol_get_fiche_head($head, 'contact', $langs->trans("SupplierOrder"), -1, 'order'); // Supplier order card diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index c3d0a897362..6f6678b57de 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -532,7 +532,7 @@ if ($id > 0 || !empty($ref)) { $head = ordersupplier_prepare_head($object); $title = $langs->trans("SupplierOrder"); - dol_fiche_head($head, 'dispatch', $title, -1, 'order'); + print dol_get_fiche_head($head, 'dispatch', $title, -1, 'order'); $formconfirm=''; diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php index e266a466e87..bf79f5fa431 100644 --- a/htdocs/fourn/commande/document.php +++ b/htdocs/fourn/commande/document.php @@ -99,7 +99,7 @@ if ($object->id > 0) $head = ordersupplier_prepare_head($object); - dol_fiche_head($head, 'documents', $langs->trans('SupplierOrder'), -1, 'order'); + print dol_get_fiche_head($head, 'documents', $langs->trans('SupplierOrder'), -1, 'order'); // Build file list diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php index 07c84a8fa12..696a07db0b9 100644 --- a/htdocs/fourn/commande/info.php +++ b/htdocs/fourn/commande/info.php @@ -111,7 +111,7 @@ $now = dol_now(); $head = ordersupplier_prepare_head($object); -dol_fiche_head($head, 'info', $langs->trans("SupplierOrder"), -1, 'order'); +print dol_get_fiche_head($head, 'info', $langs->trans("SupplierOrder"), -1, 'order'); // Supplier order card diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php index 53efd68faa6..4bc11647151 100644 --- a/htdocs/fourn/commande/note.php +++ b/htdocs/fourn/commande/note.php @@ -84,7 +84,7 @@ if ($id > 0 || !empty($ref)) $head = ordersupplier_prepare_head($object); $title = $langs->trans("SupplierOrder"); - dol_fiche_head($head, 'note', $title, -1, 'order'); + print dol_get_fiche_head($head, 'note', $title, -1, 'order'); // Supplier order card diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 56f2bef6c6a..41db75f2771 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -1746,7 +1746,7 @@ if ($action == 'create') print ''; if (!empty($currency_tx)) print ''; - dol_fiche_head(); + print dol_get_fiche_head(); print '
'; @@ -2242,7 +2242,7 @@ if ($action == 'create') $head = facturefourn_prepare_head($object); $titre = $langs->trans('SupplierInvoice'); - dol_fiche_head($head, 'card', $titre, -1, 'bill'); + print dol_get_fiche_head($head, 'card', $titre, -1, 'bill'); $formconfirm = ''; diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php index 9be956b32ae..82b6a7777e5 100644 --- a/htdocs/fourn/facture/contact.php +++ b/htdocs/fourn/facture/contact.php @@ -133,7 +133,7 @@ if ($id > 0 || !empty($ref)) $head = facturefourn_prepare_head($object); - dol_fiche_head($head, 'contact', $langs->trans('SupplierInvoice'), -1, 'bill'); + print dol_get_fiche_head($head, 'contact', $langs->trans('SupplierInvoice'), -1, 'bill'); $linkback = ''.$langs->trans("BackToList").''; diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php index f43ef300b01..c8bccb4872e 100644 --- a/htdocs/fourn/facture/document.php +++ b/htdocs/fourn/facture/document.php @@ -90,7 +90,7 @@ llxHeader('', $title, $helpurl); if ($object->id > 0) { $head = facturefourn_prepare_head($object); - dol_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'), -1, 'bill'); + print dol_get_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'), -1, 'bill'); $totalpaye = $object->getSommePaiement(); diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php index 52b6730d9f1..f8522722e64 100644 --- a/htdocs/fourn/facture/info.php +++ b/htdocs/fourn/facture/info.php @@ -65,7 +65,7 @@ $alreadypaid = $object->getSommePaiement(); $head = facturefourn_prepare_head($object); $titre = $langs->trans('SupplierInvoice'); -dol_fiche_head($head, 'info', $langs->trans('SupplierInvoice'), -1, 'bill'); +print dol_get_fiche_head($head, 'info', $langs->trans('SupplierInvoice'), -1, 'bill'); $linkback = ''.$langs->trans("BackToList").''; diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php index 57a0cd103ab..2ca9c077391 100644 --- a/htdocs/fourn/facture/note.php +++ b/htdocs/fourn/facture/note.php @@ -82,7 +82,7 @@ if ($object->id > 0) $head = facturefourn_prepare_head($object); $titre = $langs->trans('SupplierInvoice'); - dol_fiche_head($head, 'note', $titre, -1, 'bill'); + print dol_get_fiche_head($head, 'note', $titre, -1, 'bill'); // Supplier invoice card diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index bd5950151eb..35d13496471 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -473,7 +473,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print ''; print ''; - dol_fiche_head(null); + print dol_get_fiche_head(null); print '
'; diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php index 9d842481188..cfd65a631da 100644 --- a/htdocs/fourn/paiement/card.php +++ b/htdocs/fourn/paiement/card.php @@ -146,7 +146,7 @@ $formfile = new FormFile($db); $head = payment_supplier_prepare_head($object); -dol_fiche_head($head, 'payment', $langs->trans('SupplierPayment'), -1, 'payment'); +print dol_get_fiche_head($head, 'payment', $langs->trans('SupplierPayment'), -1, 'payment'); if ($result > 0) { diff --git a/htdocs/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php index c2fbd32445a..1ca4c113612 100644 --- a/htdocs/fourn/paiement/info.php +++ b/htdocs/fourn/paiement/info.php @@ -45,7 +45,7 @@ llxHeader(); $head = payment_supplier_prepare_head($object); -dol_fiche_head($head, 'info', $langs->trans("SupplierPayment"), 0, 'payment'); +print dol_get_fiche_head($head, 'info', $langs->trans("SupplierPayment"), 0, 'payment'); dol_banner_tab($object, 'id', $linkback, -1, 'rowid', 'ref'); diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php index 540ed1cbc18..e75151fb54a 100644 --- a/htdocs/fourn/recap-fourn.php +++ b/htdocs/fourn/recap-fourn.php @@ -61,7 +61,7 @@ if ($socid > 0) */ $head = societe_prepare_head($societe); - dol_fiche_head($head, 'supplier', $langs->trans("ThirdParty"), 0, 'company'); + print dol_get_fiche_head($head, 'supplier', $langs->trans("ThirdParty"), 0, 'company'); dol_banner_tab($societe, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom'); dol_fiche_end(); diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index 47f7744c5ae..1aac890c458 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -964,7 +964,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') if (empty($conf->global->HOLIDAY_HIDE_BALANCE)) { - dol_fiche_head('', '', '', -1); + print dol_get_fiche_head('', '', '', -1); $out = ''; $typeleaves = $object->getTypes(1, 1); @@ -985,7 +985,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'
'; } - dol_fiche_head(); + print dol_get_fiche_head(); //print ''.$langs->trans('DelayToRequestCP',$object->getConfCP('delayForRequest')).'

'; @@ -1177,7 +1177,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') print ''."\n"; } - dol_fiche_head($head, 'card', $langs->trans("CPTitreMenu"), -1, 'holiday'); + print dol_get_fiche_head($head, 'card', $langs->trans("CPTitreMenu"), -1, 'holiday'); $linkback = ''.$langs->trans("BackToList").''; diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php index bdd791e80f1..c37f403be4d 100644 --- a/htdocs/holiday/document.php +++ b/htdocs/holiday/document.php @@ -96,7 +96,7 @@ if ($object->id) $head = holiday_prepare_head($object); - dol_fiche_head($head, 'documents', $langs->trans("CPTitreMenu"), -1, 'holiday'); + print dol_get_fiche_head($head, 'documents', $langs->trans("CPTitreMenu"), -1, 'holiday'); // Build file list diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index 0cd0489c701..78e838ae058 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -402,7 +402,7 @@ if ($resql) $linkback = ''.$langs->trans("BackToList").''; $head = user_prepare_head($fuser); - dol_fiche_head($head, 'paidholidays', $title, -1, 'user'); + print dol_get_fiche_head($head, 'paidholidays', $title, -1, 'user'); dol_banner_tab($fuser, 'id', $linkback, $user->rights->user->user->lire || $user->admin); diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php index ea266a644e0..b169354bef7 100644 --- a/htdocs/hrm/admin/admin_establishment.php +++ b/htdocs/hrm/admin/admin_establishment.php @@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans("HRMSetup"), $linkback); // Configuration header $head = hrm_admin_prepare_head(); -dol_fiche_head($head, 'establishments', $langs->trans("HRM"), -1, "user"); +print dol_get_fiche_head($head, 'establishments', $langs->trans("HRM"), -1, "user"); $sql = "SELECT e.rowid, e.label, e.address, e.zip, e.town, e.status"; $sql .= " FROM ".MAIN_DB_PREFIX."establishment as e"; diff --git a/htdocs/hrm/admin/admin_hrm.php b/htdocs/hrm/admin/admin_hrm.php index 79bf11f7ec9..f51bb373f62 100644 --- a/htdocs/hrm/admin/admin_hrm.php +++ b/htdocs/hrm/admin/admin_hrm.php @@ -80,7 +80,7 @@ print ''; print ''; print ''; -dol_fiche_head($head, 'parameters', $langs->trans("HRM"), -1, "user"); +print dol_get_fiche_head($head, 'parameters', $langs->trans("HRM"), -1, "user"); print '
'; print ''; diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php index 1f43878babf..11dba56a5d7 100644 --- a/htdocs/hrm/establishment/card.php +++ b/htdocs/hrm/establishment/card.php @@ -167,7 +167,7 @@ if ($action == 'create') print ''; print ''; - dol_fiche_head(); + print dol_get_fiche_head(); print '
'; @@ -262,7 +262,7 @@ if (($id || $ref) && $action == 'edit') if ($action == 'edit') { - dol_fiche_head($head, 'card', $langs->trans("Establishment"), 0, 'building'); + print dol_get_fiche_head($head, 'card', $langs->trans("Establishment"), 0, 'building'); print ''."\n"; print ''; @@ -342,7 +342,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea $res = $object->fetch_optionals(); $head = establishment_prepare_head($object); - dol_fiche_head($head, 'card', $langs->trans("Establishment"), -1, 'building'); + print dol_get_fiche_head($head, 'card', $langs->trans("Establishment"), -1, 'building'); // Confirmation to delete if ($action == 'delete') diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php index 7bd6c5727b7..bb4d04d7d00 100644 --- a/htdocs/hrm/establishment/info.php +++ b/htdocs/hrm/establishment/info.php @@ -118,7 +118,7 @@ if ($object->id > 0) $head = establishment_prepare_head($object); - dol_fiche_head($head, 'info', $langs->trans("Establishment"), -1, 'building'); + print dol_get_fiche_head($head, 'info', $langs->trans("Establishment"), -1, 'building'); // Object card // ------------------------------------------------------------ diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 6c93d96619f..0ef716b0c50 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -330,7 +330,7 @@ if ($step == 1 || !$datatoimport) $head = import_prepare_head($param, 1); - dol_fiche_head($head, 'step1', $langs->trans("NewImport"), -1); + print dol_get_fiche_head($head, 'step1', $langs->trans("NewImport"), -1); print '
'.$langs->trans("SelectImportDataSet").'

'; @@ -390,7 +390,7 @@ if ($step == 2 && $datatoimport) $head = import_prepare_head($param, 2); - dol_fiche_head($head, 'step2', $langs->trans("NewImport"), -2); + print dol_get_fiche_head($head, 'step2', $langs->trans("NewImport"), -2); print '
'; print '
'; @@ -472,7 +472,7 @@ if ($step == 3 && $datatoimport) $head = import_prepare_head($param, 3); - dol_fiche_head($head, 'step3', $langs->trans("NewImport"), -2); + print dol_get_fiche_head($head, 'step3', $langs->trans("NewImport"), -2); /* * Confirm delete file @@ -763,7 +763,7 @@ if ($step == 4 && $datatoimport) $head = import_prepare_head($param, 4); - dol_fiche_head($head, 'step4', $langs->trans("NewImport"), -2); + print dol_get_fiche_head($head, 'step4', $langs->trans("NewImport"), -2); print '
'; print '
'; @@ -1229,7 +1229,7 @@ if ($step == 5 && $datatoimport) print ''; // step 5 print ''; // step 5 - dol_fiche_head($head, 'step5', $langs->trans("NewImport"), -2); + print dol_get_fiche_head($head, 'step5', $langs->trans("NewImport"), -2); print '
'; print '
'; @@ -1652,7 +1652,7 @@ if ($step == 6 && $datatoimport) $head = import_prepare_head($param, 6); - dol_fiche_head($head, 'step6', $langs->trans("NewImport"), -1); + print dol_get_fiche_head($head, 'step6', $langs->trans("NewImport"), -1); print '
'; print '
'; diff --git a/htdocs/intracommreport/admin/intracommreport.php b/htdocs/intracommreport/admin/intracommreport.php index 5c2246ec852..0560809e5a9 100644 --- a/htdocs/intracommreport/admin/intracommreport.php +++ b/htdocs/intracommreport/admin/intracommreport.php @@ -96,7 +96,7 @@ print load_fiche_titre($langs->trans("IntracommReportSetup"), $linkback, 'title_ $head = intracommReportAdminPrepareHead(); -dol_fiche_head($head, 'general', $langs->trans("IntracommReport"), -1, "intracommreport"); +print dol_get_fiche_head($head, 'general', $langs->trans("IntracommReport"), -1, "intracommreport"); print ''; print ''; diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php index 01cc99574f7..46fcce91caa 100644 --- a/htdocs/intracommreport/card.php +++ b/htdocs/intracommreport/card.php @@ -123,7 +123,7 @@ if ($action == 'create') print ''; print ''; - dol_fiche_head(); + print dol_get_fiche_head(); print '
'; @@ -183,7 +183,7 @@ if ($id > 0 && $action != 'edit') { */ $head = intracommreport_prepare_head($object); - dol_fiche_head($head, 'general', $langs->trans("IntracommReport"), -1, 'user'); + print dol_get_fiche_head($head, 'general', $langs->trans("IntracommReport"), -1, 'user'); // Confirm remove report if ($action == 'delete') { @@ -255,7 +255,7 @@ if ($id > 0 && $action != 'edit') { llxHeader("", $title); print load_fiche_titre($langs->trans("IntracommReportDESTitle")); - dol_fiche_head(); + print dol_get_fiche_head(); print ''; print ''; diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php index 2a1646a5d80..40dd90d4049 100644 --- a/htdocs/livraison/card.php +++ b/htdocs/livraison/card.php @@ -284,7 +284,7 @@ if ($action == 'create') // Create. Seems to no be used print ''; print ''; - dol_fiche_head($head, 'delivery', $langs->trans("Shipment"), -1, 'sending'); + print dol_get_fiche_head($head, 'delivery', $langs->trans("Shipment"), -1, 'sending'); /* * Confirmation de la suppression diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php index 5ea03693eb8..acaa2469ee1 100644 --- a/htdocs/loan/card.php +++ b/htdocs/loan/card.php @@ -252,7 +252,7 @@ if ($action == 'create') print ''; print ''; - dol_fiche_head(); + print dol_get_fiche_head(); print '
'; @@ -411,7 +411,7 @@ if ($id > 0) print ''; } - dol_fiche_head($head, 'card', $langs->trans("Loan"), -1, 'bill'); + print dol_get_fiche_head($head, 'card', $langs->trans("Loan"), -1, 'bill'); // Loan card diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php index 442f8768390..599fd386f02 100644 --- a/htdocs/loan/document.php +++ b/htdocs/loan/document.php @@ -87,7 +87,7 @@ if ($object->id) $head = loan_prepare_head($object); - dol_fiche_head($head, 'documents', $langs->trans("Loan"), -1, 'bill'); + print dol_get_fiche_head($head, 'documents', $langs->trans("Loan"), -1, 'bill'); $morehtmlref = '
'; // Ref loan diff --git a/htdocs/loan/info.php b/htdocs/loan/info.php index 21661d787f5..0d9306aa71f 100644 --- a/htdocs/loan/info.php +++ b/htdocs/loan/info.php @@ -58,7 +58,7 @@ $object->info($id); $head = loan_prepare_head($object); -dol_fiche_head($head, 'info', $langs->trans("Loan"), -1, 'bill'); +print dol_get_fiche_head($head, 'info', $langs->trans("Loan"), -1, 'bill'); $morehtmlref = '
'; // Ref loan diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php index 5ff943f31e4..e9a266eb0c0 100644 --- a/htdocs/loan/note.php +++ b/htdocs/loan/note.php @@ -75,7 +75,7 @@ if ($id > 0) $head = loan_prepare_head($object); - dol_fiche_head($head, 'note', $langs->trans("Loan"), -1, 'bill'); + print dol_get_fiche_head($head, 'note', $langs->trans("Loan"), -1, 'bill'); $morehtmlref = '
'; // Ref loan diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php index 15759a8ce7b..e0da043e2e8 100644 --- a/htdocs/loan/payment/card.php +++ b/htdocs/loan/payment/card.php @@ -88,7 +88,7 @@ $head[$h][1] = $langs->trans("PaymentLoan"); $hselected = $h; $h++; -dol_fiche_head($head, $hselected, $langs->trans("PaymentLoan"), -1, 'payment'); +print dol_get_fiche_head($head, $hselected, $langs->trans("PaymentLoan"), -1, 'payment'); /* * Confirm deletion of the payment diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php index 82f114b7b20..5aa83ff4321 100644 --- a/htdocs/loan/payment/payment.php +++ b/htdocs/loan/payment/payment.php @@ -275,7 +275,7 @@ if ($action == 'create') print ''; print ''; - dol_fiche_head(); + print dol_get_fiche_head(); /* print '
'; diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php index 55f715fb050..24492ebcab0 100644 --- a/htdocs/loan/schedule.php +++ b/htdocs/loan/schedule.php @@ -129,7 +129,7 @@ $help_url = 'EN:Module_Loan|FR:Module_Emprunt'; llxHeader("", $title, $help_url); $head = loan_prepare_head($object); -dol_fiche_head($head, 'FinancialCommitment', $langs->trans("Loan"), -1, 'bill'); +print dol_get_fiche_head($head, 'FinancialCommitment', $langs->trans("Loan"), -1, 'bill'); $linkback = ''.$langs->trans("BackToList").''; diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php index cf2cde3e19d..466c40a4e49 100644 --- a/htdocs/margin/admin/margin.php +++ b/htdocs/margin/admin/margin.php @@ -109,7 +109,7 @@ print load_fiche_titre($langs->trans("margesSetup"), $linkback, 'title_setup'); $head = marges_admin_prepare_head(); -dol_fiche_head($head, 'parameters', $langs->trans("Margins"), -1, 'margin'); +print dol_get_fiche_head($head, 'parameters', $langs->trans("Margins"), -1, 'margin'); print '
'; print ''; diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index 7e15b94aede..220715e6f72 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -107,7 +107,7 @@ $picto = 'margin'; print ''; -dol_fiche_head($head, 'agentMargins', $titre, 0, $picto); +print dol_get_fiche_head($head, 'agentMargins', $titre, 0, $picto); print '
'; diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php index f4e5a565d9e..22d23967ebd 100644 --- a/htdocs/margin/checkMargins.php +++ b/htdocs/margin/checkMargins.php @@ -160,7 +160,7 @@ $picto = 'margin'; print ''; print ''; -dol_fiche_head($head, $langs->trans('checkMargins'), $title, 0, $picto); +print dol_get_fiche_head($head, $langs->trans('checkMargins'), $title, 0, $picto); print '
'; diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php index a566c7bd620..1a8a253994b 100644 --- a/htdocs/margin/customerMargins.php +++ b/htdocs/margin/customerMargins.php @@ -88,7 +88,7 @@ $picto = 'margin'; print ''; -dol_fiche_head($head, 'customerMargins', $titre, 0, $picto); +print dol_get_fiche_head($head, 'customerMargins', $titre, 0, $picto); print '
'; diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php index e390be68068..7deeffe92bd 100644 --- a/htdocs/margin/productMargins.php +++ b/htdocs/margin/productMargins.php @@ -100,7 +100,7 @@ $picto = 'margin'; print ''; -dol_fiche_head($head, 'productMargins', $titre, 0, $picto); +print dol_get_fiche_head($head, 'productMargins', $titre, 0, $picto); print '
'; diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php index d5069249cbe..a8ec93df400 100644 --- a/htdocs/margin/tabs/productMargins.php +++ b/htdocs/margin/tabs/productMargins.php @@ -90,7 +90,7 @@ if ($id > 0 || !empty($ref)) $head = product_prepare_head($object); $titre = $langs->trans("CardProduct".$object->type); $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product'); - dol_fiche_head($head, 'margin', $titre, -1, $picto); + print dol_get_fiche_head($head, 'margin', $titre, -1, $picto); $linkback = ''.$langs->trans("BackToList").''; diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php index c9711bd99ef..a31f6007062 100644 --- a/htdocs/margin/tabs/thirdpartyMargins.php +++ b/htdocs/margin/tabs/thirdpartyMargins.php @@ -85,7 +85,7 @@ if ($socid > 0) $head = societe_prepare_head($object); - dol_fiche_head($head, 'margin', $langs->trans("ThirdParty"), -1, 'company'); + print dol_get_fiche_head($head, 'margin', $langs->trans("ThirdParty"), -1, 'company'); $linkback = ''.$langs->trans("BackToList").''; diff --git a/htdocs/modulebuilder/admin/setup.php b/htdocs/modulebuilder/admin/setup.php index b7cadf26341..112ed71ea82 100644 --- a/htdocs/modulebuilder/admin/setup.php +++ b/htdocs/modulebuilder/admin/setup.php @@ -97,7 +97,7 @@ print ''; print load_fiche_titre($langs->trans("ModuleSetup").' '.$langs->trans('Modulebuilder'), $linkback); if (GETPOST('withtab', 'alpha')) { - dol_fiche_head($head, 'modulebuilder', '', -1); + print dol_get_fiche_head($head, 'modulebuilder', '', -1); } print ''.$langs->trans("ModuleBuilderDesc")."
\n"; diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php index 49d097ffc8a..347202215b7 100644 --- a/htdocs/modulebuilder/index.php +++ b/htdocs/modulebuilder/index.php @@ -1745,7 +1745,7 @@ $head[$h][1] = $langs->trans("DangerZone"); $head[$h][2] = 'deletemodule'; $h++; -dol_fiche_head($head, $module, '', -1, '', 0, $infomodulesfound, '', 8); // Modules +print dol_get_fiche_head($head, $module, '', -1, '', 0, $infomodulesfound, '', 8); // Modules if ($module == 'initmodule') { @@ -1875,7 +1875,7 @@ if ($module == 'initmodule') if ($action != 'editfile' || empty($file)) { - dol_fiche_head($head2, $tab, '', -1, '', 0, '', '', 0, 'formodulesuffix'); // Description - level 2 + print dol_get_fiche_head($head2, $tab, '', -1, '', 0, '', '', 0, 'formodulesuffix'); // Description - level 2 print ''.$langs->trans("ModuleBuilderDesc".$tab).''; $infoonmodulepath = ''; @@ -2006,7 +2006,7 @@ if ($module == 'initmodule') print ''; print ''; - dol_fiche_head($head2, $tab, '', -1, '', 0, '', '', 0, 'formodulesuffix'); + print dol_get_fiche_head($head2, $tab, '', -1, '', 0, '', '', 0, 'formodulesuffix'); $doleditor = new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%', ''); print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html')); @@ -2022,7 +2022,7 @@ if ($module == 'initmodule') print ''; } } else { - dol_fiche_head($head2, $tab, '', -1, '', 0, '', '', 0, 'formodulesuffix'); // Level 2 + print dol_get_fiche_head($head2, $tab, '', -1, '', 0, '', '', 0, 'formodulesuffix'); // Level 2 } if ($tab == 'languages') @@ -2269,7 +2269,7 @@ if ($module == 'initmodule') else $tabobj = 'newobject'; } - dol_fiche_head($head3, $tabobj, '', -1, ''); // Level 3 + print dol_get_fiche_head($head3, $tabobj, '', -1, ''); // Level 3 if ($tabobj == 'newobject') { diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php index ebb392810d1..df122c43268 100644 --- a/htdocs/modulebuilder/template/admin/about.php +++ b/htdocs/modulebuilder/template/admin/about.php @@ -75,7 +75,7 @@ print load_fiche_titre($langs->trans($page_name), $linkback, 'object_mymodule@my // Configuration header $head = mymoduleAdminPrepareHead(); -dol_fiche_head($head, 'about', '', 0, 'mymodule@mymodule'); +print dol_get_fiche_head($head, 'about', '', 0, 'mymodule@mymodule'); dol_include_once('/mymodule/core/modules/modMyModule.class.php'); $tmpmodule = new modMyModule($db); diff --git a/htdocs/modulebuilder/template/admin/myobject_extrafields.php b/htdocs/modulebuilder/template/admin/myobject_extrafields.php index 31bd430d6a3..65353f905e6 100644 --- a/htdocs/modulebuilder/template/admin/myobject_extrafields.php +++ b/htdocs/modulebuilder/template/admin/myobject_extrafields.php @@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans("MyModuleSetup"), $linkback, 'title_setup') $head = mymoduleAdminPrepareHead(); -dol_fiche_head($head, 'myobject_extrafields', $langs->trans("MyObjectExtraFields"), -1, 'account'); +print dol_get_fiche_head($head, 'myobject_extrafields', $langs->trans("MyObjectExtraFields"), -1, 'account'); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php index 11116fc33f4..77eed6681e3 100644 --- a/htdocs/modulebuilder/template/admin/setup.php +++ b/htdocs/modulebuilder/template/admin/setup.php @@ -193,7 +193,7 @@ print load_fiche_titre($langs->trans($page_name), $linkback, 'object_mymodule@my // Configuration header $head = mymoduleAdminPrepareHead(); -dol_fiche_head($head, 'settings', '', -1, "mymodule@mymodule"); +print dol_get_fiche_head($head, 'settings', '', -1, "mymodule@mymodule"); // Setup page goes here echo ''.$langs->trans("MyModuleSetupPage").'

'; diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php index c636853e66e..40c7e3fd2ef 100644 --- a/htdocs/modulebuilder/template/myobject_agenda.php +++ b/htdocs/modulebuilder/template/myobject_agenda.php @@ -157,7 +157,7 @@ if ($object->id > 0) $head = myobjectPrepareHead($object); - dol_fiche_head($head, 'agenda', $langs->trans("MyObject"), -1, 'object_'.$object->picto); + print dol_get_fiche_head($head, 'agenda', $langs->trans("MyObject"), -1, 'object_'.$object->picto); // Object card // ------------------------------------------------------------ diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php index c2c24e39e75..9454a373a9e 100644 --- a/htdocs/modulebuilder/template/myobject_card.php +++ b/htdocs/modulebuilder/template/myobject_card.php @@ -215,7 +215,7 @@ if ($action == 'create') if ($backtopage) print ''; if ($backtopageforcancel) print ''; - dol_fiche_head(array(), ''); + print dol_get_fiche_head(array(), ''); // Set some default values //if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue'; @@ -255,7 +255,7 @@ if (($id || $ref) && $action == 'edit') if ($backtopage) print ''; if ($backtopageforcancel) print ''; - dol_fiche_head(); + print dol_get_fiche_head(); print '
'."\n"; @@ -282,7 +282,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea $res = $object->fetch_optionals(); $head = myobjectPrepareHead($object); - dol_fiche_head($head, 'card', $langs->trans("MyObject"), -1, $object->picto); + print dol_get_fiche_head($head, 'card', $langs->trans("MyObject"), -1, $object->picto); $formconfirm = ''; diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php index 29c4d5ddfcb..4ea74dfc0c9 100644 --- a/htdocs/modulebuilder/template/myobject_document.php +++ b/htdocs/modulebuilder/template/myobject_document.php @@ -134,7 +134,7 @@ if ($object->id) */ $head = myobjectPrepareHead($object); - dol_fiche_head($head, 'document', $langs->trans("MyObject"), -1, $object->picto); + print dol_get_fiche_head($head, 'document', $langs->trans("MyObject"), -1, $object->picto); // Build file list diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php index c1c5b93846d..49a9076a0b9 100644 --- a/htdocs/modulebuilder/template/myobject_note.php +++ b/htdocs/modulebuilder/template/myobject_note.php @@ -115,7 +115,7 @@ if ($id > 0 || !empty($ref)) $head = myobjectPrepareHead($object); - dol_fiche_head($head, 'note', $langs->trans("MyObject"), -1, $object->picto); + print dol_get_fiche_head($head, 'note', $langs->trans("MyObject"), -1, $object->picto); // Object card // ------------------------------------------------------------ diff --git a/htdocs/mrp/mo_agenda.php b/htdocs/mrp/mo_agenda.php index c2107296b2b..e6892e949e5 100644 --- a/htdocs/mrp/mo_agenda.php +++ b/htdocs/mrp/mo_agenda.php @@ -131,7 +131,7 @@ if ($object->id > 0) $head = moPrepareHead($object); - dol_fiche_head($head, 'agenda', $langs->trans("MO"), -1, $object->picto); + print dol_get_fiche_head($head, 'agenda', $langs->trans("MO"), -1, $object->picto); // Object card // ------------------------------------------------------------ diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php index e20a57a6e4d..19adf082458 100644 --- a/htdocs/mrp/mo_card.php +++ b/htdocs/mrp/mo_card.php @@ -218,7 +218,7 @@ if ($action == 'create') if ($backtopage) print ''; if ($backtopageforcancel) print ''; - dol_fiche_head(array(), ''); + print dol_get_fiche_head(array(), ''); print '
'."\n"; @@ -323,7 +323,7 @@ if (($id || $ref) && $action == 'edit') if ($backtopage) print ''; if ($backtopageforcancel) print ''; - dol_fiche_head(); + print dol_get_fiche_head(); $object->fields['fk_bom']['disabled'] = 1; @@ -353,7 +353,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea $res = $object->fetch_optionals(); $head = moPrepareHead($object); - dol_fiche_head($head, 'card', $langs->trans("MO"), -1, $object->picto); + print dol_get_fiche_head($head, 'card', $langs->trans("MO"), -1, $object->picto); $formconfirm = ''; diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php index 68e693ca072..42de53412e6 100644 --- a/htdocs/mrp/mo_document.php +++ b/htdocs/mrp/mo_document.php @@ -103,7 +103,7 @@ if ($object->id) */ $head = moPrepareHead($object); - dol_fiche_head($head, 'document', $langs->trans("MO"), -1, $object->picto); + print dol_get_fiche_head($head, 'document', $langs->trans("MO"), -1, $object->picto); // Build file list diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php index 841e787361b..efa6c6f5167 100644 --- a/htdocs/mrp/mo_movements.php +++ b/htdocs/mrp/mo_movements.php @@ -242,7 +242,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea $res = $object->fetch_optionals(); $head = moPrepareHead($object); - dol_fiche_head($head, 'stockmovement', $langs->trans("MO"), -1, $object->picto); + print dol_get_fiche_head($head, 'stockmovement', $langs->trans("MO"), -1, $object->picto); $formconfirm = ''; diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php index f25ebc35d0d..8cdb243e888 100644 --- a/htdocs/mrp/mo_note.php +++ b/htdocs/mrp/mo_note.php @@ -87,7 +87,7 @@ if ($id > 0 || !empty($ref)) $head = moPrepareHead($object); - dol_fiche_head($head, 'note', $langs->trans("MO"), -1, $object->picto); + print dol_get_fiche_head($head, 'note', $langs->trans("MO"), -1, $object->picto); // Object card // ------------------------------------------------------------ diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php index 0d739dbfe91..8ec9c627013 100644 --- a/htdocs/mrp/mo_production.php +++ b/htdocs/mrp/mo_production.php @@ -413,7 +413,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea $res = $object->fetch_optionals(); $head = moPrepareHead($object); - dol_fiche_head($head, 'production', $langs->trans("MO"), -1, $object->picto); + print dol_get_fiche_head($head, 'production', $langs->trans("MO"), -1, $object->picto); $formconfirm = ''; diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php index f5fa5a5ab78..909587ff9bf 100644 --- a/htdocs/opensurvey/card.php +++ b/htdocs/opensurvey/card.php @@ -213,7 +213,7 @@ print ''; $head = opensurvey_prepare_head($object); -dol_fiche_head($head, 'general', $langs->trans("Survey"), -1, 'poll'); +print dol_get_fiche_head($head, 'general', $langs->trans("Survey"), -1, 'poll'); $morehtmlref = ''; diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php index 3327800527d..ffdeaf329dc 100644 --- a/htdocs/opensurvey/results.php +++ b/htdocs/opensurvey/results.php @@ -417,7 +417,7 @@ print ''; $head = opensurvey_prepare_head($object); -dol_fiche_head($head, 'preview', $langs->trans("Survey"), -1, 'poll'); +print dol_get_fiche_head($head, 'preview', $langs->trans("Survey"), -1, 'poll'); $morehtmlref = ''; diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php index e6b3cb3b97e..9d8a895b4ab 100644 --- a/htdocs/opensurvey/wizard/create_survey.php +++ b/htdocs/opensurvey/wizard/create_survey.php @@ -136,7 +136,7 @@ print load_fiche_titre($langs->trans("CreatePoll").' (1 / 2)'); print ''."\n"; print ''; -dol_fiche_head(); +print dol_get_fiche_head(); // Affichage des différents champs textes a remplir print '
'."\n"; diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php index a1ceb3e4810..7e90dedbd90 100644 --- a/htdocs/paybox/admin/paybox.php +++ b/htdocs/paybox/admin/paybox.php @@ -114,7 +114,7 @@ print ''; print ''; print ''; -dol_fiche_head($head, 'payboxaccount', '', -1); +print dol_get_fiche_head($head, 'payboxaccount', '', -1); print $langs->trans("PayBoxDesc")."
\n"; print '
'; diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php index 3cf751f7391..4cf06288730 100644 --- a/htdocs/paypal/admin/paypal.php +++ b/htdocs/paypal/admin/paypal.php @@ -121,7 +121,7 @@ print ''; print ''; -dol_fiche_head($head, 'paypalaccount', '', -1); +print dol_get_fiche_head($head, 'paypalaccount', '', -1); print ''.$langs->trans("PaypalDesc")."
\n"; diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php index b810be417ae..f35741028aa 100644 --- a/htdocs/printing/admin/printing.php +++ b/htdocs/printing/admin/printing.php @@ -116,7 +116,7 @@ if ($mode == 'setup' && $user->admin) print ''; print ''; - dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic'); + print dol_get_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic'); print $langs->trans("PrintingDriverDesc".$driver)."

\n"; @@ -236,7 +236,7 @@ if ($mode == 'setup' && $user->admin) } if ($mode == 'config' && $user->admin) { - dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic'); + print dol_get_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic'); print $langs->trans("PrintingDesc")."

\n"; @@ -289,7 +289,7 @@ if ($mode == 'config' && $user->admin) if ($mode == 'test' && $user->admin) { - dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic'); + print dol_get_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic'); print $langs->trans('PrintTestDesc'.$driver)."

\n"; @@ -327,7 +327,7 @@ if ($mode == 'test' && $user->admin) if ($mode == 'userconf' && $user->admin) { - dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic'); + print dol_get_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic'); print $langs->trans('PrintUserConfDesc'.$driver)."

\n"; diff --git a/htdocs/product/admin/price_rules.php b/htdocs/product/admin/price_rules.php index 64bf5702996..3c08416e000 100644 --- a/htdocs/product/admin/price_rules.php +++ b/htdocs/product/admin/price_rules.php @@ -128,7 +128,7 @@ print load_fiche_titre($title, $linkback, 'title_setup'); print ''; $head = product_admin_prepare_head(); -dol_fiche_head($head, 'generator', $tab, 0, 'product'); +print dol_get_fiche_head($head, 'generator', $tab, 0, 'product'); print $langs->trans("MultiPriceRuleDesc").'

'; diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index 09418b5e896..313a27884ff 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -293,7 +293,7 @@ $linkback = 'trans("StockSetup"), -1, 'stock'); +print dol_get_fiche_head($head, 'attributes', $langs->trans("StockSetup"), -1, 'stock'); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php index acd698d9f37..421af35ca4c 100644 --- a/htdocs/product/agenda.php +++ b/htdocs/product/agenda.php @@ -124,7 +124,7 @@ if ($id > 0 || $ref) $titre = $langs->trans("CardProduct".$object->type); $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product'); - dol_fiche_head($head, 'agenda', $titre, -1, $picto); + print dol_get_fiche_head($head, 'agenda', $titre, -1, $picto); $linkback = ''.$langs->trans("BackToList").''; $object->next_prev_filter = " fk_product_type = ".$object->type; diff --git a/htdocs/product/canvas/product/tpl/card_create.tpl.php b/htdocs/product/canvas/product/tpl/card_create.tpl.php index a06fd9fd24f..042734f8fd3 100644 --- a/htdocs/product/canvas/product/tpl/card_create.tpl.php +++ b/htdocs/product/canvas/product/tpl/card_create.tpl.php @@ -32,7 +32,7 @@ $statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOn trans("NewProduct"), '', 'product'); -dol_fiche_head(''); +print dol_get_fiche_head(''); ?> error) ? '' : $object->error), $object->errors); ?> diff --git a/htdocs/product/canvas/product/tpl/card_edit.tpl.php b/htdocs/product/canvas/product/tpl/card_edit.tpl.php index 7b0b5f35710..6658ea94658 100644 --- a/htdocs/product/canvas/product/tpl/card_edit.tpl.php +++ b/htdocs/product/canvas/product/tpl/card_edit.tpl.php @@ -33,7 +33,7 @@ $statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOn trans("CardProduct".$object->type); -dol_fiche_head($head, 'card', $titre, 0, 'product'); +print dol_get_fiche_head($head, 'card', $titre, 0, 'product'); dol_htmloutput_errors($object->error, $object->errors); ?> diff --git a/htdocs/product/canvas/product/tpl/card_view.tpl.php b/htdocs/product/canvas/product/tpl/card_view.tpl.php index bb62ce0e7ca..2158be2b24d 100644 --- a/htdocs/product/canvas/product/tpl/card_view.tpl.php +++ b/htdocs/product/canvas/product/tpl/card_view.tpl.php @@ -31,7 +31,7 @@ $object = $GLOBALS['object']; $head = product_prepare_head($object); $titre = $langs->trans("CardProduct".$object->type); -dol_fiche_head($head, 'card', $titre, -1, 'product'); +print dol_get_fiche_head($head, 'card', $titre, -1, 'product'); $linkback = ''.$langs->trans("BackToList").''; $object->next_prev_filter = " fk_product_type = ".$object->type; diff --git a/htdocs/product/canvas/service/tpl/card_create.tpl.php b/htdocs/product/canvas/service/tpl/card_create.tpl.php index a51e2fa72b8..13fceff4e22 100644 --- a/htdocs/product/canvas/service/tpl/card_create.tpl.php +++ b/htdocs/product/canvas/service/tpl/card_create.tpl.php @@ -32,7 +32,7 @@ $statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOn trans("NewService"), '', 'service'); -dol_fiche_head(''); +print dol_get_fiche_head(''); ?> control->tpl['error'], $this->control->tpl['errors']); ?> diff --git a/htdocs/product/canvas/service/tpl/card_edit.tpl.php b/htdocs/product/canvas/service/tpl/card_edit.tpl.php index 3b9c89381a4..aa353f55164 100644 --- a/htdocs/product/canvas/service/tpl/card_edit.tpl.php +++ b/htdocs/product/canvas/service/tpl/card_edit.tpl.php @@ -33,7 +33,7 @@ $statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOn trans("CardProduct".$object->type); -dol_fiche_head($head, 'card', $titre, 0, 'service'); +print dol_get_fiche_head($head, 'card', $titre, 0, 'service'); dol_htmloutput_errors($object->error, $object->errors); ?> diff --git a/htdocs/product/canvas/service/tpl/card_view.tpl.php b/htdocs/product/canvas/service/tpl/card_view.tpl.php index f77f5d5d58f..d342d102af0 100644 --- a/htdocs/product/canvas/service/tpl/card_view.tpl.php +++ b/htdocs/product/canvas/service/tpl/card_view.tpl.php @@ -31,7 +31,7 @@ $object = $GLOBALS['object']; $head = product_prepare_head($object); $titre = $langs->trans("CardProduct".$object->type); -dol_fiche_head($head, 'card', $titre, -1, 'service'); +print dol_get_fiche_head($head, 'card', $titre, -1, 'service'); $linkback = ''.$langs->trans("BackToList").''; $object->next_prev_filter = " fk_product_type = ".$object->type; diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 62813ee2a57..43b4eede555 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -990,7 +990,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) $object->country = $tmparray['label']; } - dol_fiche_head(''); + print dol_get_fiche_head(''); print '
'; @@ -1438,7 +1438,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) $head = product_prepare_head($object); $titre = $langs->trans("CardProduct".$object->type); $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product'); - dol_fiche_head($head, 'card', $titre, 0, $picto); + print dol_get_fiche_head($head, 'card', $titre, 0, $picto); print '
'; @@ -1789,7 +1789,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) $titre = $langs->trans("CardProduct".$object->type); $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product'); - dol_fiche_head($head, 'card', $titre, -1, $picto); + print dol_get_fiche_head($head, 'card', $titre, -1, $picto); $linkback = ''.$langs->trans("BackToList").''; $object->next_prev_filter = " fk_product_type = ".$object->type; @@ -2368,7 +2368,7 @@ if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action == print load_fiche_titre($langs->trans("AddToDraft"), '', ''); - dol_fiche_head(''); + print dol_get_fiche_head(''); $html .= ''; diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php index 54c74ec3548..68073eba2ef 100644 --- a/htdocs/product/composition/card.php +++ b/htdocs/product/composition/card.php @@ -187,7 +187,7 @@ llxHeader('', $title, $helpurl); $head = product_prepare_head($object); $titre = $langs->trans("CardProduct".$object->type); $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product'); -dol_fiche_head($head, 'subproduct', $titre, -1, $picto); +print dol_get_fiche_head($head, 'subproduct', $titre, -1, $picto); if ($id > 0 || !empty($ref)) diff --git a/htdocs/product/document.php b/htdocs/product/document.php index 8d06e211bab..9087b457caf 100644 --- a/htdocs/product/document.php +++ b/htdocs/product/document.php @@ -191,7 +191,7 @@ if ($object->id) $titre = $langs->trans("CardProduct".$object->type); $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product'); - dol_fiche_head($head, 'documents', $titre, -1, $picto); + print dol_get_fiche_head($head, 'documents', $titre, -1, $picto); $parameters = array(); $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php index b59319ad985..018c8d3f605 100644 --- a/htdocs/product/dynamic_price/editor.php +++ b/htdocs/product/dynamic_price/editor.php @@ -160,7 +160,7 @@ print ''; print ''; -dol_fiche_head(); +print dol_get_fiche_head(); print '
'.$langs->trans("Quantity").' '; $html .= '
'; diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index d7bf7c44ae1..b9a8d6c3b68 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -385,7 +385,7 @@ if ($id > 0 || $ref) $titre = $langs->trans("CardProduct".$object->type); $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product'); - dol_fiche_head($head, 'suppliers', $titre, -1, $picto); + print dol_get_fiche_head($head, 'suppliers', $titre, -1, $picto); $linkback = ''.$langs->trans("BackToList").''; $object->next_prev_filter = " fk_product_type = ".$object->type; @@ -453,7 +453,7 @@ if ($id > 0 || $ref) print ''; print ''; - dol_fiche_head(); + print dol_get_fiche_head(); print '
'; diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php index f7dbc1f6410..532eca6235c 100644 --- a/htdocs/product/inventory/card.php +++ b/htdocs/product/inventory/card.php @@ -189,7 +189,7 @@ if ($action == 'create') if ($backtopage) print ''; if ($backtopageforcancel) print ''; - dol_fiche_head(array(), ''); + print dol_get_fiche_head(array(), ''); // Set some default values //if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue'; @@ -229,7 +229,7 @@ if (($id || $ref) && $action == 'edit') if ($backtopage) print ''; if ($backtopageforcancel) print ''; - dol_fiche_head(); + print dol_get_fiche_head(); print '
'."\n"; @@ -256,7 +256,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea $res = $object->fetch_optionals(); $head = inventoryPrepareHead($object); - dol_fiche_head($head, 'card', $langs->trans("Inventory"), -1, 'stock'); + print dol_get_fiche_head($head, 'card', $langs->trans("Inventory"), -1, 'stock'); $formconfirm = ''; diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php index 37f1cb9721a..6e48f135e1e 100644 --- a/htdocs/product/inventory/inventory.php +++ b/htdocs/product/inventory/inventory.php @@ -202,7 +202,7 @@ if ($object->id > 0) $res = $object->fetch_optionals(); $head = inventoryPrepareHead($object); - dol_fiche_head($head, 'inventory', $langs->trans("Inventory"), -1, 'stock'); + print dol_get_fiche_head($head, 'inventory', $langs->trans("Inventory"), -1, 'stock'); $formconfirm = ''; diff --git a/htdocs/product/note.php b/htdocs/product/note.php index 2d0cb70fcfe..8195d61515b 100644 --- a/htdocs/product/note.php +++ b/htdocs/product/note.php @@ -92,7 +92,7 @@ if ($id > 0 || !empty($ref)) $titre = $langs->trans("CardProduct".$object->type); $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product'); - dol_fiche_head($head, 'note', $titre, -1, $picto); + print dol_get_fiche_head($head, 'note', $titre, -1, $picto); $linkback = ''.$langs->trans("BackToList").''; $object->next_prev_filter = " fk_product_type = ".$object->type; diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index 7e5015b7813..037d58efed2 100644 --- a/htdocs/product/popuprop.php +++ b/htdocs/product/popuprop.php @@ -105,7 +105,7 @@ $head[$h][2] = 'popularity'; $h++; -dol_fiche_head($head, 'popularity', $langs->trans("Statistics"), -1); +print dol_get_fiche_head($head, 'popularity', $langs->trans("Statistics"), -1); // Array of liens to show diff --git a/htdocs/product/price.php b/htdocs/product/price.php index c97e22b9166..6aae8843cbf 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -703,7 +703,7 @@ $head = product_prepare_head($object); $titre = $langs->trans("CardProduct".$object->type); $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product'); -dol_fiche_head($head, 'price', $titre, -1, $picto); +print dol_get_fiche_head($head, 'price', $titre, -1, $picto); $linkback = ''.$langs->trans("BackToList").''; $object->next_prev_filter = " fk_product_type = ".$object->type; @@ -1148,7 +1148,7 @@ if ($action == 'edit_vat' && ($user->rights->produit->creer || $user->rights->se print ''; print ''; - dol_fiche_head(''); + print dol_get_fiche_head(''); print '
'; @@ -1182,7 +1182,7 @@ if ($action == 'edit_price' && $object->getRights()->creer) print ''; print ''; - dol_fiche_head(''); + print dol_get_fiche_head(''); print '
'; @@ -1312,7 +1312,7 @@ if ($action == 'edit_price' && $object->getRights()->creer) print ''; print ''; - //dol_fiche_head('', '', '', -1); + //print dol_get_fiche_head('', '', '', -1); if ((!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL)) { print $langs->trans('UseMultipriceRules').' price_autogen ? 'checked' : '').'>

'; @@ -1652,7 +1652,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print ''; print ''; - dol_fiche_head(); + print dol_get_fiche_head(); print '
'; print ''; @@ -1738,7 +1738,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print ''; print ''; - dol_fiche_head(); + print dol_get_fiche_head(); print '
'; print ''; diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php index 1d61018467a..0cae0f1b5f6 100644 --- a/htdocs/product/stats/card.php +++ b/htdocs/product/stats/card.php @@ -132,7 +132,7 @@ if ($result && (!empty($id) || !empty($ref))) $titre = $langs->trans("CardProduct".$object->type); $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product'); - dol_fiche_head($head, 'stats', $titre, -1, $picto); + print dol_get_fiche_head($head, 'stats', $titre, -1, $picto); $linkback = ''.$langs->trans("BackToList").''; @@ -163,7 +163,7 @@ if (empty($id) & empty($ref)) $head[$h][2] = 'popularity'; $h++; - dol_fiche_head($head, 'chart', $langs->trans("Statistics"), -1); + print dol_get_fiche_head($head, 'chart', $langs->trans("Statistics"), -1); } diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index 9898c13f21b..13002ea8d55 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -95,7 +95,7 @@ if ($id > 0 || !empty($ref)) $head = product_prepare_head($product); $titre = $langs->trans("CardProduct".$product->type); $picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product'); - dol_fiche_head($head, 'referers', $titre, -1, $picto); + print dol_get_fiche_head($head, 'referers', $titre, -1, $picto); $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php index 162a108029e..c16485f1c35 100644 --- a/htdocs/product/stats/commande_fournisseur.php +++ b/htdocs/product/stats/commande_fournisseur.php @@ -98,7 +98,7 @@ if ($id > 0 || !empty($ref)) { $head = product_prepare_head($product); $titre = $langs->trans("CardProduct".$product->type); $picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product'); - dol_fiche_head($head, 'referers', $titre, -1, $picto); + print dol_get_fiche_head($head, 'referers', $titre, -1, $picto); $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index 194de1c6ddf..711e66e55bc 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -85,7 +85,7 @@ if ($id > 0 || !empty($ref)) $head = product_prepare_head($product); $titre = $langs->trans("CardProduct".$product->type); $picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product'); - dol_fiche_head($head, 'referers', $titre, -1, $picto); + print dol_get_fiche_head($head, 'referers', $titre, -1, $picto); $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 08b20badbe9..83a4ae85eba 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -113,7 +113,7 @@ if ($id > 0 || !empty($ref)) $head = product_prepare_head($product); $titre = $langs->trans("CardProduct".$product->type); $picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product'); - dol_fiche_head($head, 'referers', $titre, -1, $picto); + print dol_get_fiche_head($head, 'referers', $titre, -1, $picto); $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php index f39d4ab73b3..55bc61d459d 100644 --- a/htdocs/product/stats/facture_fournisseur.php +++ b/htdocs/product/stats/facture_fournisseur.php @@ -96,7 +96,7 @@ if ($id > 0 || !empty($ref)) $head = product_prepare_head($product); $titre = $langs->trans("CardProduct".$product->type); $picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product'); - dol_fiche_head($head, 'referers', $titre, -1, $picto); + print dol_get_fiche_head($head, 'referers', $titre, -1, $picto); $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index 6766864b042..18c11af1809 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -96,7 +96,7 @@ if ($id > 0 || !empty($ref)) $head = product_prepare_head($product); $titre = $langs->trans("CardProduct".$product->type); $picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product'); - dol_fiche_head($head, 'referers', $titre, -1, $picto); + print dol_get_fiche_head($head, 'referers', $titre, -1, $picto); $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php index f4d2a5d4644..b5d708d4690 100644 --- a/htdocs/product/stats/supplier_proposal.php +++ b/htdocs/product/stats/supplier_proposal.php @@ -96,7 +96,7 @@ if ($id > 0 || !empty($ref)) $head = product_prepare_head($product); $titre = $langs->trans("CardProduct".$product->type); $picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product'); - dol_fiche_head($head, 'referers', $titre, -1, $picto); + print dol_get_fiche_head($head, 'referers', $titre, -1, $picto); $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index 81ae26390c9..ae44cf65877 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -247,7 +247,7 @@ if ($action == 'create') print ''; print ''; - dol_fiche_head(); + print dol_get_fiche_head(); print '
'; @@ -352,7 +352,7 @@ if ($action == 'create') { $head = stock_prepare_head($object); - dol_fiche_head($head, 'card', $langs->trans("Warehouse"), -1, 'stock'); + print dol_get_fiche_head($head, 'card', $langs->trans("Warehouse"), -1, 'stock'); $formconfirm = ''; @@ -683,7 +683,7 @@ if ($action == 'create') $head = stock_prepare_head($object); - dol_fiche_head($head, 'card', $langs->trans("Warehouse"), 0, 'stock'); + print dol_get_fiche_head($head, 'card', $langs->trans("Warehouse"), 0, 'stock'); print '
'; diff --git a/htdocs/product/stock/fiche-valo.php b/htdocs/product/stock/fiche-valo.php index 494f6042ff1..55ac057985b 100644 --- a/htdocs/product/stock/fiche-valo.php +++ b/htdocs/product/stock/fiche-valo.php @@ -57,7 +57,7 @@ if ($_GET["id"]) $head = stock_prepare_head($entrepot); - dol_fiche_head($head, 'value', $langs->trans("Warehouse"), 0, 'stock'); + print dol_get_fiche_head($head, 'value', $langs->trans("Warehouse"), 0, 'stock'); print '
'; diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php index cb27f37afb6..884deaaefff 100644 --- a/htdocs/product/stock/info.php +++ b/htdocs/product/stock/info.php @@ -50,7 +50,7 @@ $object->info($object->id); $head = stock_prepare_head($object); -dol_fiche_head($head, 'info', $langs->trans("Warehouse"), -1, 'stock'); +print dol_get_fiche_head($head, 'info', $langs->trans("Warehouse"), -1, 'stock'); $linkback = ''.$langs->trans("BackToList").''; diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php index 6d0eb0dc24c..6bf5ac2efa2 100644 --- a/htdocs/product/stock/movement_card.php +++ b/htdocs/product/stock/movement_card.php @@ -531,7 +531,7 @@ if ($resql) { $head = stock_prepare_head($object); - dol_fiche_head($head, 'movements', $langs->trans("Warehouse"), -1, 'stock'); + print dol_get_fiche_head($head, 'movements', $langs->trans("Warehouse"), -1, 'stock'); $linkback = ''.$langs->trans("BackToList").''; diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php index b533d4407a6..3d8c39e7cf2 100644 --- a/htdocs/product/stock/movement_list.php +++ b/htdocs/product/stock/movement_list.php @@ -567,7 +567,7 @@ if ($resql) { $head = stock_prepare_head($object); - dol_fiche_head($head, 'movements', $langs->trans("Warehouse"), -1, 'stock'); + print dol_get_fiche_head($head, 'movements', $langs->trans("Warehouse"), -1, 'stock'); $linkback = ''.$langs->trans("BackToList").''; diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 64c23814ec2..c75d0172be0 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -524,7 +524,7 @@ if ($id > 0 || $ref) $titre = $langs->trans("CardProduct".$object->type); $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product'); - dol_fiche_head($head, 'stock', $titre, -1, $picto); + print dol_get_fiche_head($head, 'stock', $titre, -1, $picto); dol_htmloutput_events(); diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php index dbedba85d99..109c3c2a09d 100644 --- a/htdocs/product/stock/productlot_card.php +++ b/htdocs/product/stock/productlot_card.php @@ -269,7 +269,7 @@ if ($action == 'create') print ''; print ''; - dol_fiche_head(); + print dol_get_fiche_head(); print '
'."\n"; // print ''; @@ -298,7 +298,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea //print load_fiche_titre($langs->trans("Batch")); $head = productlot_prepare_head($object); - dol_fiche_head($head, 'card', $langs->trans("Batch"), -1, 'barcode'); + print dol_get_fiche_head($head, 'card', $langs->trans("Batch"), -1, 'barcode'); if ($action == 'delete') { diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php index 59ab61fb86a..1bbf45851b5 100644 --- a/htdocs/product/stock/productlot_document.php +++ b/htdocs/product/stock/productlot_document.php @@ -112,7 +112,7 @@ llxHeader('', $langs->trans('ProductLot'), ''); if ($object->id) { $head = productlot_prepare_head($object); - dol_fiche_head($head, 'documents', $langs->trans("Batch"), -1, 'barcode'); + print dol_get_fiche_head($head, 'documents', $langs->trans("Batch"), -1, 'barcode'); $parameters = array(); diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index a5fd94236ad..acd77e1f911 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -524,7 +524,7 @@ $head[1][2] = 'replenishorders'; print load_fiche_titre($langs->trans('Replenishment'), '', 'stock'); -dol_fiche_head($head, 'replenish', '', -1, ''); +print dol_get_fiche_head($head, 'replenish', '', -1, ''); print ''.$langs->trans("ReplenishmentStatusDesc").'
'."\n"; if (empty($fk_warhouse) && !empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE)) { diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php index ef8639787b7..382f7ac1d3a 100644 --- a/htdocs/product/stock/replenishorders.php +++ b/htdocs/product/stock/replenishorders.php @@ -106,7 +106,7 @@ $head[1][0] = DOL_URL_ROOT.'/product/stock/replenishorders.php'; $head[1][1] = $texte; $head[1][2] = 'replenishorders'; -dol_fiche_head($head, 'replenishorders', '', -1, ''); +print dol_get_fiche_head($head, 'replenishorders', '', -1, ''); $commandestatic = new CommandeFournisseur($db); diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php index f581242c9f2..1dc01ae65e4 100644 --- a/htdocs/product/stock/stockatdate.php +++ b/htdocs/product/stock/stockatdate.php @@ -326,7 +326,7 @@ $head[1][2] = 'stockatdatefuture'; print load_fiche_titre($langs->trans('StockAtDate'), '', 'stock'); -dol_fiche_head($head, ($mode == 'future' ? 'stockatdatefuture' : 'stockatdatepast'), '', -1, ''); +print dol_get_fiche_head($head, ($mode == 'future' ? 'stockatdatefuture' : 'stockatdatepast'), '', -1, ''); $desc = $langs->trans("StockAtDatePastDesc"); if ($mode == 'future') $desc = $langs->trans("StockAtDateFutureDesc"); diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php index 88cced3b99d..511cd5a8483 100644 --- a/htdocs/product/stock/tpl/stockcorrection.tpl.php +++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php @@ -56,7 +56,7 @@ print load_fiche_titre($langs->trans("StockCorrection"), '', 'generic'); print ''."\n"; -dol_fiche_head(); +print dol_get_fiche_head(); print ''; print ''; diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php index 0164e99bd37..9d2d19c7813 100644 --- a/htdocs/product/stock/tpl/stocktransfer.tpl.php +++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php @@ -55,7 +55,7 @@ print load_fiche_titre($langs->trans("StockTransfer"), '', 'generic'); print ''."\n"; -dol_fiche_head(); +print dol_get_fiche_head(); print ''; print ''; diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php index c6a5d15a0b0..64b80231674 100644 --- a/htdocs/product/traduction.php +++ b/htdocs/product/traduction.php @@ -187,7 +187,7 @@ if (!empty($object->multilangs)) } -dol_fiche_head($head, 'translation', $titre, 0, $picto); +print dol_get_fiche_head($head, 'translation', $titre, 0, $picto); $linkback = ''.$langs->trans("BackToList").''; @@ -307,7 +307,7 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service print ''; print ''; - dol_fiche_head(); + print dol_get_fiche_head(); print '
'.$langs->trans("Label").'
'; print '
'.$langs->trans('Language').''; diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index 1fb12e7202e..794f222e3b8 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -448,7 +448,7 @@ print ''; print ''; $head = project_timesheet_prepare_head($mode, $usertoprocess); -dol_fiche_head($head, 'inputperday', $langs->trans('TimeSpent'), -1, 'projecttask'); +print dol_get_fiche_head($head, 'inputperday', $langs->trans('TimeSpent'), -1, 'projecttask'); // Show description of content print '
'; diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php index 26db00aeeca..cdca5d56aa9 100644 --- a/htdocs/projet/activity/permonth.php +++ b/htdocs/projet/activity/permonth.php @@ -373,7 +373,7 @@ print ''; print ''; $head = project_timesheet_prepare_head($mode, $usertoprocess); -dol_fiche_head($head, 'inputpermonth', $langs->trans('TimeSpent'), -1, 'projecttask'); +print dol_get_fiche_head($head, 'inputpermonth', $langs->trans('TimeSpent'), -1, 'projecttask'); // Show description of content print '
'; diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php index 29f0aa3608d..49e7c3d8951 100644 --- a/htdocs/projet/activity/perweek.php +++ b/htdocs/projet/activity/perweek.php @@ -466,7 +466,7 @@ print ''; print ''; $head = project_timesheet_prepare_head($mode, $usertoprocess); -dol_fiche_head($head, 'inputperweek', $langs->trans('TimeSpent'), -1, 'projecttask'); +print dol_get_fiche_head($head, 'inputperweek', $langs->trans('TimeSpent'), -1, 'projecttask'); // Show description of content print '
'; diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php index f66d305f688..22e479a7caf 100644 --- a/htdocs/projet/admin/project.php +++ b/htdocs/projet/admin/project.php @@ -260,7 +260,7 @@ print load_fiche_titre($langs->trans("ProjectsSetup"), $linkback, 'title_setup') $head = project_admin_prepare_head(); -dol_fiche_head($head, 'project', $langs->trans("Projects"), -1, 'project'); +print dol_get_fiche_head($head, 'project', $langs->trans("Projects"), -1, 'project'); diff --git a/htdocs/projet/admin/project_extrafields.php b/htdocs/projet/admin/project_extrafields.php index da54d0bd5e6..cb0d112b85d 100644 --- a/htdocs/projet/admin/project_extrafields.php +++ b/htdocs/projet/admin/project_extrafields.php @@ -69,7 +69,7 @@ print load_fiche_titre($langs->trans("ProjectsSetup"), $linkback, 'title_setup') $head = project_admin_prepare_head(); -dol_fiche_head($head, 'attributes', $langs->trans("Projects"), -1, 'project'); +print dol_get_fiche_head($head, 'attributes', $langs->trans("Projects"), -1, 'project'); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; diff --git a/htdocs/projet/admin/project_task_extrafields.php b/htdocs/projet/admin/project_task_extrafields.php index b8d1281986b..4aa72bfadca 100644 --- a/htdocs/projet/admin/project_task_extrafields.php +++ b/htdocs/projet/admin/project_task_extrafields.php @@ -69,7 +69,7 @@ print load_fiche_titre($langs->trans("ProjectsSetup"), $linkback, 'title_setup') $head = project_admin_prepare_head(); -dol_fiche_head($head, 'attributes_task', $langs->trans("Projects"), -1, 'project'); +print dol_get_fiche_head($head, 'attributes_task', $langs->trans("Projects"), -1, 'project'); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index c7e22bfb5cd..929ac9beaa0 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -491,7 +491,7 @@ if ($action == 'create' && $user->rights->projet->creer) print ''; print ''; - dol_fiche_head(); + print dol_get_fiche_head(); print ''; @@ -792,7 +792,7 @@ if ($action == 'create' && $user->rights->projet->creer) if ($action == 'edit' && $userWrite > 0) { - dol_fiche_head($head, 'project', $langs->trans("Project"), 0, ($object->public ? 'projectpub' : 'project')); + print dol_get_fiche_head($head, 'project', $langs->trans("Project"), 0, ($object->public ? 'projectpub' : 'project')); print '
'; @@ -963,7 +963,7 @@ if ($action == 'create' && $user->rights->projet->creer) print '
'; } else { - dol_fiche_head($head, 'project', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project')); + print dol_get_fiche_head($head, 'project', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project')); // Project card diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php index 905b57e875f..2ed3e75afa4 100644 --- a/htdocs/projet/comment.php +++ b/htdocs/projet/comment.php @@ -89,7 +89,7 @@ $formfile = new FormFile($db); // Tabs for project $tab = 'project_comment'; $head = project_prepare_head($object); -dol_fiche_head($head, $tab, $langs->trans("Project"), - 1, ($object->public ? 'projectpub' : 'project')); +print dol_get_fiche_head($head, $tab, $langs->trans("Project"), - 1, ($object->public ? 'projectpub' : 'project')); $param = ($mode == 'mine' ? '&mode=mine' : ''); diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index 471e50139f5..48b4653e323 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -142,7 +142,7 @@ if ($id > 0 || !empty($ref)) //print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete; $head = project_prepare_head($object); - dol_fiche_head($head, 'contact', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project')); + print dol_get_fiche_head($head, 'contact', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project')); // Project card diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php index 9015ef0d4d4..2353af4ceb8 100644 --- a/htdocs/projet/document.php +++ b/htdocs/projet/document.php @@ -102,7 +102,7 @@ if ($object->id > 0) //print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete; $head = project_prepare_head($object); - dol_fiche_head($head, 'document', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project')); + print dol_get_fiche_head($head, 'document', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project')); // Files list constructor $filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1); diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 966ad4cae92..533484eed0e 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -129,7 +129,7 @@ $userstatic = new User($db); $userAccess = $object->restrictedProjectArea($user); $head = project_prepare_head($object); -dol_fiche_head($head, 'element', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project')); +print dol_get_fiche_head($head, 'element', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project')); // Project card diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index 3ddd0402db7..628bbfc698a 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -99,7 +99,7 @@ if (($id > 0 && is_numeric($id)) || !empty($ref)) $tab = 'tasks'; $head = project_prepare_head($object); - dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project')); + print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project')); $param = ($mode == 'mine' ? '&mode=mine' : ''); diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php index b3cebaad913..8747fccfd14 100644 --- a/htdocs/projet/info.php +++ b/htdocs/projet/info.php @@ -106,7 +106,7 @@ llxHeader("", $title, $help_url); $head = project_prepare_head($object); -dol_fiche_head($head, 'agenda', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project')); +print dol_get_fiche_head($head, 'agenda', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project')); // Project card diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php index b643c248938..6da188f6f4a 100644 --- a/htdocs/projet/note.php +++ b/htdocs/projet/note.php @@ -79,7 +79,7 @@ if ($id > 0 || !empty($ref)) //print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete; $head = project_prepare_head($object); - dol_fiche_head($head, 'notes', $langs->trans('Project'), -1, ($object->public ? 'projectpub' : 'project')); + print dol_get_fiche_head($head, 'notes', $langs->trans('Project'), -1, ($object->public ? 'projectpub' : 'project')); // Project card diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php index 6d56b2088e9..add142f1f57 100644 --- a/htdocs/projet/stats/index.php +++ b/htdocs/projet/stats/index.php @@ -268,7 +268,7 @@ $h++; complete_head_from_modules($conf, $langs, null, $head, $h, $type); -dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1, ''); +print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1, ''); print '
'; diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index b0c97907f7d..bf5f04f6e63 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -348,7 +348,7 @@ if ($id > 0 || !empty($ref)) $tab = GETPOST('tab') ?GETPOST('tab') : 'tasks'; $head = project_prepare_head($object); - dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project')); + print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project')); $param = '&id='.$object->id; if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage); @@ -512,7 +512,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third print ''; if (!empty($object->id)) print ''; - dol_fiche_head(''); + print dol_get_fiche_head(''); print ''; diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php index 0549710ff25..a8331e20ca1 100644 --- a/htdocs/projet/tasks/comment.php +++ b/htdocs/projet/tasks/comment.php @@ -115,7 +115,7 @@ if ($id > 0 || !empty($ref)) // Tabs for project $tab = 'tasks'; $head = project_prepare_head($projectstatic); - dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project')); + print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project')); $param = ($mode == 'mine' ? '&mode=mine' : ''); @@ -267,7 +267,7 @@ if ($id > 0 || !empty($ref)) $param = ($withproject ? '&withproject=1' : ''); $linkback = $withproject ? ''.$langs->trans("BackToList").'' : ''; - dol_fiche_head($head, 'task_comment', $langs->trans("Task"), -1, 'projecttask'); + print dol_get_fiche_head($head, 'task_comment', $langs->trans("Task"), -1, 'projecttask'); if ($action == 'delete') { diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index 354109f135b..506dc085573 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -175,7 +175,7 @@ if ($id > 0 || !empty($ref)) // Tabs for project $tab = 'tasks'; $head = project_prepare_head($projectstatic); - dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project')); + print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project')); $param = ($mode == 'mine' ? '&mode=mine' : ''); @@ -301,7 +301,7 @@ if ($id > 0 || !empty($ref)) //$arrayofuseridoftask=$object->getListContactId('internal'); $head = task_prepare_head($object); - dol_fiche_head($head, 'task_contact', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition'); + print dol_get_fiche_head($head, 'task_contact', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition'); $param = (GETPOST('withproject') ? '&withproject=1' : ''); diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php index 2a8e3cdd944..aa976667708 100644 --- a/htdocs/projet/tasks/document.php +++ b/htdocs/projet/tasks/document.php @@ -129,7 +129,7 @@ if ($object->id > 0) $tab = 'tasks'; $head = project_prepare_head($projectstatic); - dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project')); + print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project')); $param = ($mode == 'mine' ? '&mode=mine' : ''); @@ -250,7 +250,7 @@ if ($object->id > 0) } $head = task_prepare_head($object); - dol_fiche_head($head, 'task_document', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition'); + print dol_get_fiche_head($head, 'task_document', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition'); // Files list constructor $filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1); diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php index c281da3b877..44ccc181799 100644 --- a/htdocs/projet/tasks/note.php +++ b/htdocs/projet/tasks/note.php @@ -109,7 +109,7 @@ if ($object->id > 0) // Tabs for project $tab = 'tasks'; $head = project_prepare_head($projectstatic); - dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project')); + print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project')); $param = ($mode == 'mine' ? '&mode=mine' : ''); // Project card @@ -229,7 +229,7 @@ if ($object->id > 0) } $head = task_prepare_head($object); - dol_fiche_head($head, 'task_notes', $langs->trans('Task'), -1, 'projecttask', 0, '', 'reposition'); + print dol_get_fiche_head($head, 'task_notes', $langs->trans('Task'), -1, 'projecttask', 0, '', 'reposition'); $param = (GETPOST('withproject') ? '&withproject=1' : ''); diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php index 849650d5473..571560518ab 100644 --- a/htdocs/projet/tasks/stats/index.php +++ b/htdocs/projet/tasks/stats/index.php @@ -133,7 +133,7 @@ $h++; complete_head_from_modules($conf, $langs, null, $head, $h, $type); -dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1, ''); +print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1, ''); print '
'; diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 70caf507412..0f2109986d1 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -221,7 +221,7 @@ if ($id > 0 || !empty($ref)) // Tabs for project $tab = 'tasks'; $head = project_prepare_head($projectstatic); - dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'), 0, '', ''); + print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'), 0, '', ''); $param = ($mode == 'mine' ? '&mode=mine' : ''); @@ -380,7 +380,7 @@ if ($id > 0 || !empty($ref)) print ''; print ''; - dol_fiche_head($head, 'task_task', $langs->trans("Task"), 0, 'projecttask', 0, '', ''); + print dol_get_fiche_head($head, 'task_task', $langs->trans("Task"), 0, 'projecttask', 0, '', ''); print '
'; @@ -463,7 +463,7 @@ if ($id > 0 || !empty($ref)) $param = ($withproject ? '&withproject=1' : ''); $linkback = $withproject ? ''.$langs->trans("BackToList").'' : ''; - dol_fiche_head($head, 'task_task', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition'); + print dol_get_fiche_head($head, 'task_task', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition'); if ($action == 'delete') { diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index dfeb73bb3cc..9bd12ccfad6 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -585,7 +585,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) else $tab = 'tasks'; $head = project_prepare_head($projectstatic); - dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project')); + print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project')); $param = ($mode == 'mine' ? '&mode=mine' : ''); @@ -749,7 +749,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) if (empty($projectidforalltimes)) { $head = task_prepare_head($object); - dol_fiche_head($head, 'task_time', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition'); + print dol_get_fiche_head($head, 'task_time', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition'); if ($action == 'deleteline') { diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index eea293504d2..f1fcfc04e37 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -507,7 +507,7 @@ print '
'; print '
'.$langs->trans("FieldsWithAreMandatory", '*').'
'; //print $langs->trans("FieldsWithIsForPublic",'**').'
'; -dol_fiche_head(''); +print dol_get_fiche_head(''); print '