From 74e46b2de3c6b8dc021f1922ae509d5000b4b95b Mon Sep 17 00:00:00 2001 From: aspangaro Date: Wed, 23 Sep 2015 05:47:49 +0200 Subject: [PATCH 01/19] Salaries : Add label for accessibility --- htdocs/compta/salaries/card.php | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php index f96531b059c..6509eb00d5e 100644 --- a/htdocs/compta/salaries/card.php +++ b/htdocs/compta/salaries/card.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2011-2015 Alexandre Spangaro * Copyright (C) 2014 Laurent Destailleur * Copyright (C) 2015 Jean-François Ferry * Copyright (C) 2015 Charlie BENKE @@ -232,45 +232,45 @@ if ($action == 'create') print ''; print ""; - print ''; - print ''; // Employee print ""; - print ''; // Label - print ''; + print ''; print ""; - print ''; - print ''; // Amount - print ''; + print ''; // Bank if (! empty($conf->banque->enabled)) { - print ''; } // Type payment - print '\n"; print ""; @@ -278,9 +278,10 @@ if ($action == 'create') if (! empty($conf->banque->enabled)) { // Number - print ''."\n"; + print ''; + print ''."\n"; } // Other attributes From 918c323f8f1e1622404ac3d2ecd7e0dee6b60d82 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Wed, 23 Sep 2015 06:37:14 +0200 Subject: [PATCH 02/19] Salaries : Add info card / add field datec / rename field user_creat to user_author --- htdocs/compta/salaries/card.php | 3 +- .../salaries/class/paymentsalary.class.php | 58 ++++++++++++++++--- htdocs/core/lib/salaries.lib.php | 2 - .../install/mysql/migration/3.8.0-3.9.0.sql | 3 + .../mysql/tables/llx_payment_salary.sql | 3 +- 5 files changed, 55 insertions(+), 14 deletions(-) diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php index 6509eb00d5e..6301a3025ec 100644 --- a/htdocs/compta/salaries/card.php +++ b/htdocs/compta/salaries/card.php @@ -83,7 +83,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel")) $object->note=GETPOST("note"); $object->type_payment=GETPOST("paymenttype"); $object->num_payment=GETPOST("num_payment"); - $object->fk_user_creat=$user->id; + $object->fk_user_author=$user->id; // Set user current salary as ref salaray for the payment $fuser=new User($db); @@ -315,7 +315,6 @@ if ($id) dol_fiche_head($head, 'card', $langs->trans("SalaryPayment"), 0, 'payment'); - print '
'.$langs->trans("DatePayment").''; + print ''; print $form->select_date((empty($datep)?-1:$datep),"datep",'','','','add',1,1); print '
'.$langs->trans("DateValue").''; + print '
'; print $form->select_date((empty($datev)?-1:$datev),"datev",'','','','add',1,1); print '
'.$langs->trans("Employee").''; + print ''; print $form->select_dolusers(GETPOST('fk_user','int'),'fk_user',1); print '
'.$langs->trans("Label").'trans("SalaryPayment")).'">
trans("SalaryPayment")).'">
'.$langs->trans("DateStartPeriod").''; + print ''; print $form->select_date($datesp,"datesp",'','','','add'); print '
'.$langs->trans("DateEndPeriod").''; + print '
'; print $form->select_date($dateep,"dateep",'','','','add'); print '
'.$langs->trans("Amount").'
'.$langs->trans("Account").''; + print '
'; $form->select_comptes($_POST["accountid"],"accountid",0,'',1); // Affiche liste des comptes courant print '
'.$langs->trans("PaymentMode").''; + print '
'; $form->select_types_paiements(GETPOST("paymenttype"), "paymenttype"); print "
'.$langs->trans('Numero'); + print '
'; print ""; diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php index cc0029620cb..c30e0749ca2 100644 --- a/htdocs/compta/salaries/class/paymentsalary.class.php +++ b/htdocs/compta/salaries/class/paymentsalary.class.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2011-2015 Alexandre Spangaro * Copyright (C) 2014 Juanjo Menent * * This program is free software; you can redistribute it and/or modify @@ -49,7 +49,7 @@ class PaymentSalary extends CommonObject var $dateep; var $note; var $fk_bank; - var $fk_user_creat; + var $fk_user_author; var $fk_user_modif; @@ -85,7 +85,7 @@ class PaymentSalary extends CommonObject $this->label=trim($this->label); $this->note=trim($this->note); $this->fk_bank=trim($this->fk_bank); - $this->fk_user_creat=trim($this->fk_user_creat); + $this->fk_user_author=trim($this->fk_user_author); $this->fk_user_modif=trim($this->fk_user_modif); // Check parameters @@ -112,7 +112,7 @@ class PaymentSalary extends CommonObject $sql.= " dateep=".$this->db->idate($this->dateep).","; $sql.= " note='".$this->db->escape($this->note)."',"; $sql.= " fk_bank=".($this->fk_bank > 0 ? "'".$this->fk_bank."'":"null").","; - $sql.= " fk_user_creat='".$this->fk_user_creat."',"; + $sql.= " fk_user_author='".$this->fk_user_author."',"; $sql.= " fk_user_modif='".$this->fk_user_modif."'"; $sql.= " WHERE rowid=".$this->id; @@ -171,7 +171,7 @@ class PaymentSalary extends CommonObject $sql.= " s.dateep,"; $sql.= " s.note,"; $sql.= " s.fk_bank,"; - $sql.= " s.fk_user_creat,"; + $sql.= " s.fk_user_author,"; $sql.= " s.fk_user_modif,"; $sql.= " b.fk_account,"; $sql.= " b.fk_type,"; @@ -203,7 +203,7 @@ class PaymentSalary extends CommonObject $this->dateep = $this->db->jdate($obj->dateep); $this->note = $obj->note; $this->fk_bank = $obj->fk_bank; - $this->fk_user_creat = $obj->fk_user_creat; + $this->fk_user_author = $obj->fk_user_author; $this->fk_user_modif = $obj->fk_user_modif; $this->fk_account = $obj->fk_account; $this->fk_type = $obj->fk_type; @@ -275,7 +275,7 @@ class PaymentSalary extends CommonObject $this->dateep=''; $this->note=''; $this->fk_bank=''; - $this->fk_user_creat=''; + $this->fk_user_author=''; $this->fk_user_modif=''; } @@ -290,13 +290,14 @@ class PaymentSalary extends CommonObject global $conf,$langs; $error=0; + $now=dol_now(); // Clean parameters $this->amount=price2num(trim($this->amount)); $this->label=trim($this->label); $this->note=trim($this->note); $this->fk_bank=trim($this->fk_bank); - $this->fk_user_creat=trim($this->fk_user_creat); + $this->fk_user_author=trim($this->fk_user_author); $this->fk_user_modif=trim($this->fk_user_modif); // Check parameters @@ -340,7 +341,8 @@ class PaymentSalary extends CommonObject $sql.= ", label"; $sql.= ", datesp"; $sql.= ", dateep"; - $sql.= ", fk_user_creat"; + $sql.= ", fk_user_author"; + $sql.= ", datec"; $sql.= ", fk_bank"; $sql.= ", entity"; $sql.= ") "; @@ -357,6 +359,7 @@ class PaymentSalary extends CommonObject $sql.= ", '".$this->db->idate($this->datesp)."'"; $sql.= ", '".$this->db->idate($this->dateep)."'"; $sql.= ", '".$user->id."'"; + $sql.= ", '".$this->db->idate($now)."'"; $sql.= ", NULL"; $sql.= ", ".$conf->entity; $sql.= ")"; @@ -511,4 +514,41 @@ class PaymentSalary extends CommonObject return $result; } + /** + * Information on record + * + * @param int $id Id of record + * @return void + */ + function info($id) + { + $sql = 'SELECT ps.rowid, ps.datec, ps.fk_user_author'; + $sql.= ' FROM '.MAIN_DB_PREFIX.'payment_salary as ps'; + $sql.= ' WHERE ps.rowid = '.$id; + + dol_syslog(get_class($this).'::info', LOG_DEBUG); + $result = $this->db->query($sql); + + if ($result) + { + if ($this->db->num_rows($result)) + { + $obj = $this->db->fetch_object($result); + $this->id = $obj->rowid; + if ($obj->fk_user_author) + { + $cuser = new User($this->db); + $cuser->fetch($obj->fk_user_author); + $this->user_creation = $cuser; + } + $this->date_creation = $this->db->jdate($obj->datec); + } + $this->db->free($result); + } + else + { + dol_print_error($this->db); + } + } + } diff --git a/htdocs/core/lib/salaries.lib.php b/htdocs/core/lib/salaries.lib.php index 7c104b4da82..6b25de4b656 100644 --- a/htdocs/core/lib/salaries.lib.php +++ b/htdocs/core/lib/salaries.lib.php @@ -51,12 +51,10 @@ function salaries_prepare_head($object) { $head[$h][2] = 'documents'; $h++; - /* $head[$h][0] = DOL_URL_ROOT.'/compta/salaries/info.php?id='.$object->id; $head[$h][1] = $langs->trans("Info"); $head[$h][2] = 'info'; $h++; - */ complete_head_from_modules($conf,$langs,$object,$head,$h,'salaries', 'remove'); diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql index c2a1d7eb5ec..6375a9296dc 100755 --- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql +++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql @@ -42,3 +42,6 @@ create table llx_overwrite_trans transvalue text )ENGINE=innodb; +ALTER TABLE llx_payment_salary ADD COLUMN datec datetime after tms; +ALTER TABLE llx_payment_salary CHANGE COLUMN fk_user_creat fk_user_author integer; + diff --git a/htdocs/install/mysql/tables/llx_payment_salary.sql b/htdocs/install/mysql/tables/llx_payment_salary.sql index bce4da9904a..38364c6812e 100644 --- a/htdocs/install/mysql/tables/llx_payment_salary.sql +++ b/htdocs/install/mysql/tables/llx_payment_salary.sql @@ -20,6 +20,7 @@ create table llx_payment_salary ( rowid integer AUTO_INCREMENT PRIMARY KEY, tms timestamp, + datec datetime, -- Create date fk_user integer NOT NULL, datep date, -- date de paiement datev date, -- date de valeur (this field should not be here, only into bank tables) @@ -33,6 +34,6 @@ create table llx_payment_salary entity integer DEFAULT 1 NOT NULL, -- multi company id note text, fk_bank integer, - fk_user_creat integer, -- utilisateur qui a cree l'info + fk_user_author integer, -- utilisateur qui a cree l'info fk_user_modif integer -- utilisateur qui a modifié l'info )ENGINE=innodb; \ No newline at end of file From d30d91b165f3ee72ac0ba4a367c553f618956f5e Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Thu, 24 Sep 2015 08:42:39 +0200 Subject: [PATCH 03/19] fix issue #3579 : bad filtering caused by statut filter --- htdocs/compta/facture/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 6a1e7894701..8401cb3f220 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -191,7 +191,7 @@ if ($search_refcustomer) $sql .= natural_search('f.ref_client', $search_refcusto if ($search_societe) $sql .= natural_search('s.nom', $search_societe); if ($search_montant_ht != '') $sql.= natural_search('f.total', $search_montant_ht, 1); if ($search_montant_ttc != '') $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1); -if ($search_status != '') $sql.= " AND f.fk_statut = '".$db->escape($search_status)."'"; +if ($search_status > 0 ) $sql.= " AND f.fk_statut = ".$db->escape($search_status); if ($month > 0) { if ($year > 0 && empty($day)) From b8218782939b2539788eea0b6bc488e2836c0793 Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Thu, 24 Sep 2015 16:53:44 +0200 Subject: [PATCH 04/19] change > 0 by >= 0 as mentionned by raphael --- htdocs/compta/facture/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 8401cb3f220..11931de6a7e 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -191,7 +191,7 @@ if ($search_refcustomer) $sql .= natural_search('f.ref_client', $search_refcusto if ($search_societe) $sql .= natural_search('s.nom', $search_societe); if ($search_montant_ht != '') $sql.= natural_search('f.total', $search_montant_ht, 1); if ($search_montant_ttc != '') $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1); -if ($search_status > 0 ) $sql.= " AND f.fk_statut = ".$db->escape($search_status); +if ($search_status >= 0 ) $sql.= " AND f.fk_statut = ".$db->escape($search_status); if ($month > 0) { if ($year > 0 && empty($day)) From 9f2545b95d00613a1bf0c96375e651b47cd010cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 24 Sep 2015 16:32:48 +0200 Subject: [PATCH 05/19] [Qual] Replaced deprecated dol_clone by native clone --- .../canvas/actions_adherentcard_common.class.php | 3 +-- htdocs/adherents/card.php | 2 +- htdocs/comm/action/class/actioncomm.class.php | 4 ++-- .../askpricesupplier/class/askpricesupplier.class.php | 4 ++-- htdocs/comm/propal/class/propal.class.php | 4 ++-- htdocs/commande/card.php | 2 +- htdocs/commande/class/commande.class.php | 2 +- htdocs/compta/facture/class/facture.class.php | 2 +- .../canvas/actions_contactcard_common.class.php | 2 +- htdocs/contact/card.php | 2 +- htdocs/core/class/fileupload.class.php | 2 +- htdocs/core/class/html.formfile.class.php | 4 +++- htdocs/core/lib/functions.lib.php | 2 +- htdocs/core/menus/standard/empty.php | 4 ++-- .../interface_50_modLdap_Ldapsynchro.class.php | 10 +++++----- htdocs/exports/class/export.class.php | 2 +- htdocs/fourn/class/fournisseur.commande.class.php | 4 ++-- htdocs/product/card.php | 2 +- htdocs/product/fournisseurs.php | 2 +- htdocs/product/stock/class/mouvementstock.class.php | 2 +- htdocs/projet/card.php | 2 +- htdocs/projet/tasks/contact.php | 2 +- htdocs/projet/tasks/document.php | 2 +- htdocs/projet/tasks/note.php | 2 +- htdocs/projet/tasks/task.php | 2 +- htdocs/projet/tasks/time.php | 2 +- htdocs/societe/canvas/actions_card_common.class.php | 2 +- htdocs/societe/soc.php | 4 ++-- htdocs/user/card.php | 6 +++--- htdocs/user/class/user.class.php | 2 +- htdocs/user/group/card.php | 4 ++-- test/phpunit/ContactTest.php | 2 +- test/phpunit/HolidayTest.php | 2 +- 33 files changed, 48 insertions(+), 47 deletions(-) diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php index 6a8660c7f46..06574f7ae10 100644 --- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php +++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php @@ -211,7 +211,7 @@ abstract class ActionsAdherentCardCommon { $this->object->fetch($_POST["adherentid"]); - $this->object->oldcopy=dol_clone($this->object); + $this->object->oldcopy = clone $this->object; $this->assign_post(); @@ -434,4 +434,3 @@ abstract class ActionsAdherentCardCommon } } - diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index a74e19648ea..ae727476f3d 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -268,7 +268,7 @@ if (empty($reshook)) // Create new object if ($result > 0 && ! $error) { - $object->oldcopy=dol_clone($object); + $object->oldcopy = clone $object; // Change values $object->civility_id = trim($_POST["civility_id"]); diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 9d793e16ba0..463f778537b 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -409,8 +409,8 @@ class ActionComm extends CommonObject $this->db->begin(); - // Load source object - $objFrom = dol_clone($this); + // Load source object + $objFrom = clone $this; $this->fetch_optionals(); $this->fetch_userassigned(); diff --git a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php b/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php index bee62cb384d..83333ca5167 100644 --- a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php +++ b/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php @@ -950,8 +950,8 @@ class AskPriceSupplier extends CommonObject foreach($this->lines as $line) $line->fetch_optionals($line->rowid); - // Load source object - $objFrom = dol_clone($this); + // Load source object + $objFrom = clone $this; $objsoc=new Societe($this->db); diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 421b2506e73..418e0e473a4 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -647,7 +647,7 @@ class Propal extends CommonObject $line = new PropaleLigne($this->db); $line->fetch($rowid); - $staticline = clone $line; + $staticline = clone $line; $line->oldline = $staticline; $this->line = $line; @@ -1077,7 +1077,7 @@ class Propal extends CommonObject $line->fetch_optionals($line->rowid); // Load source object - $objFrom = dol_clone($this); + $objFrom = clone $this; $objsoc=new Societe($this->db); diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 83b86ee5525..695f1505065 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -129,7 +129,7 @@ if (empty($reshook)) if ($object->id > 0) { // Because createFromClone modifies the object, we must clone it so that we can restore it later - $orig = dol_clone($object); + $orig = clone $object; $result=$object->createFromClone($socid); if ($result > 0) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 32fe2d52726..d2c0b6c1fc4 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -958,7 +958,7 @@ class Commande extends CommonOrder $line->fetch_optionals($line->rowid); // Load source object - $objFrom = dol_clone($this); + $objFrom = clone $this; // Change socid if needed if (! empty($socid) && $socid != $this->socid) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 3d1558118c1..da985d33b17 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -701,7 +701,7 @@ class Facture extends CommonInvoice $line->fetch_optionals($line->rowid); // Load source object - $objFrom = dol_clone($this); + $objFrom = clone $this; diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php index ad628fd6574..7e43270a32c 100644 --- a/htdocs/contact/canvas/actions_contactcard_common.class.php +++ b/htdocs/contact/canvas/actions_contactcard_common.class.php @@ -207,7 +207,7 @@ abstract class ActionsContactCardCommon { $this->object->fetch($_POST["contactid"]); - $this->object->oldcopy=dol_clone($this->object); + $this->object->oldcopy = clone $this->object; $this->assign_post(); diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index 9778d0c8a71..dedf79afa33 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -289,7 +289,7 @@ if (empty($reshook)) $object->fetch($contactid); - $object->oldcopy=dol_clone($object); + $object->oldcopy = clone$object; $object->old_lastname = GETPOST("old_lastname"); $object->old_firstname = GETPOST("old_firstname"); diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php index cdb7f66ac5f..a38b034747b 100644 --- a/htdocs/core/class/fileupload.class.php +++ b/htdocs/core/class/fileupload.class.php @@ -125,7 +125,7 @@ class FileUpload if (!empty($parent->socid)) { $parent->fetch_thirdparty(); } - $object->$parentObject = dol_clone($parent); + $object->$parentObject = clone $parent; } else { $object->fetch_thirdparty(); } diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 59a418d73a2..b2e06f91550 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -1083,7 +1083,9 @@ class FormFile } } - if ($result > 0) { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]=dol_clone($object_instance); } // Save object into a cache + if ($result > 0) { // Save object into a cache + $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref] = clone $object_instance; + } if ($result == 0) { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]='notfound'; unset($filearray[$key]); } } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 0ae89d01274..810576d8bfa 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -397,7 +397,7 @@ function dol_clone($object) { dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING); - $myclone=clone($object); + $myclone = clone $object; return $myclone; } diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php index 866e01b4959..5c428ca9f13 100644 --- a/htdocs/core/menus/standard/empty.php +++ b/htdocs/core/menus/standard/empty.php @@ -99,7 +99,7 @@ class MenuManager if ($mode == 'jmobile') { - $this->topmenu=dol_clone($this->menu); + $this->topmenu = clone $this->menu; unset($this->menu->liste); } } @@ -205,7 +205,7 @@ class MenuManager if ($mode == 'jmobile') { - $this->leftmenu=dol_clone($this->menu); + $this->leftmenu = clone $this->menu; unset($this->menu->liste); } } diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php index 652a1ec8d6b..7a63a5cdeec 100644 --- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php +++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php @@ -89,7 +89,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers if (empty($object->oldcopy) || ! is_object($object->oldcopy)) { dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING); - $object->oldcopy=dol_clone($object); + $object->oldcopy = clone $object; } $oldinfo=$object->oldcopy->_load_ldap_info(); @@ -126,7 +126,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers if (empty($object->oldcopy) || ! is_object($object->oldcopy)) { dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING); - $object->oldcopy=dol_clone($object); + $object->oldcopy = clone $object; } $oldinfo=$object->oldcopy->_load_ldap_info(); @@ -287,7 +287,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers if (empty($object->oldcopy) || ! is_object($object->oldcopy)) { dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING); - $object->oldcopy=dol_clone($object); + $object->oldcopy = clone $object; } $oldinfo=$object->oldcopy->_load_ldap_info(); @@ -364,7 +364,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers if (empty($object->oldcopy) || ! is_object($object->oldcopy)) { dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING); - $object->oldcopy=dol_clone($object); + $object->oldcopy = clone $object; } $oldinfo=$object->oldcopy->_load_ldap_info(); @@ -493,7 +493,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers if (empty($object->oldcopy) || ! is_object($object->oldcopy)) { dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING); - $object->oldcopy=dol_clone($object); + $object->oldcopy = clone $object; } $oldinfo=$object->oldcopy->_load_ldap_info(); diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index 5602829a908..88e4ecc8596 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -556,7 +556,7 @@ class Export $filename.='.'.$objmodel->getDriverExtension(); $dirname=$conf->export->dir_temp.'/'.$user->id; - $outputlangs=dol_clone($langs); // We clone to have an object we can modify (for example to change output charset by csv handler) without changing original value + $outputlangs = clone $langs; // We clone to have an object we can modify (for example to change output charset by csv handler) without changing original value // Open file dol_mkdir($dirname); diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 233c0510b3a..7b028ec89a1 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -1137,8 +1137,8 @@ class CommandeFournisseur extends CommonOrder $this->db->begin(); - // Load source object - $objFrom = dol_clone($this); + // Load source object + $objFrom = clone $this; $this->id=0; $this->statut=0; diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 18e0153ed77..5ccc59c9798 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -315,7 +315,7 @@ if (empty($reshook)) { if ($object->id > 0) { - $object->oldcopy=dol_clone($object); + $object->oldcopy= clone $object; $object->ref = $ref; $object->label = GETPOST('label'); diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 866abd856b1..a2908dc228a 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -399,7 +399,7 @@ if ($id || $ref) // We don't have supplier, so we try to guess. // For this we build a fictive supplier with same properties than user but using vat) - $mysoc2=dol_clone($mysoc); + $mysoc2 = clone $mysoc; $mysoc2->name='Fictive seller with same country'; $mysoc2->tva_assuj=1; $default_vat=get_default_tva($mysoc2, $mysoc, $product->id, 0); diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php index a612b7137cd..b2dd1e9b83b 100644 --- a/htdocs/product/stock/class/mouvementstock.class.php +++ b/htdocs/product/stock/class/mouvementstock.class.php @@ -433,7 +433,7 @@ class MouvementStock extends CommonObject // Create movement for each subproduct foreach($pids as $key => $value) { - $tmpmove = dol_clone($this); + $tmpmove = clone $this; $tmpmove->_create($user, $pids[$key], $entrepot_id, ($qty * $pqtys[$key]), $type, 0, $label, $inventorycode); // This will also call _createSubProduct making this recursive unset($tmpmove); } diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 24968839960..c62591b9344 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -218,7 +218,7 @@ if (empty($reshook)) if (! $error) { - $object->oldcopy = dol_clone($object); + $object->oldcopy = clone $object; $old_start_date = $object->date_start; diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index 9a8aa5c5608..59dab34b33e 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -176,7 +176,7 @@ if ($id > 0 || ! empty($ref)) $result=$projectstatic->fetch($object->fk_project); if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty(); - $object->project = dol_clone($projectstatic); + $object->project = clone $projectstatic; $userWrite = $projectstatic->restrictedProjectArea($user,'write'); diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php index ee3b9288d3c..1afc949cfa0 100644 --- a/htdocs/projet/tasks/document.php +++ b/htdocs/projet/tasks/document.php @@ -98,7 +98,7 @@ if ($id > 0 || ! empty($ref)) $projectstatic->fetch_thirdparty(); } - $object->project = dol_clone($projectstatic); + $object->project = clone $projectstatic; $upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref); } diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php index 5b479085f61..ba575be30ad 100644 --- a/htdocs/projet/tasks/note.php +++ b/htdocs/projet/tasks/note.php @@ -53,7 +53,7 @@ if ($id > 0 || ! empty($ref)) $projectstatic->fetch($object->fk_project); if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty(); - $object->project = dol_clone($projectstatic); + $object->project = clone $projectstatic; } else { diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 8a3c3cc5d5b..a146d8805ea 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -205,7 +205,7 @@ if ($id > 0 || ! empty($ref)) $result=$projectstatic->fetch($object->fk_project); if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty(); - $object->project = dol_clone($projectstatic); + $object->project = clone $projectstatic; $userWrite = $projectstatic->restrictedProjectArea($user,'write'); diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index f5eab2587cf..db8682e095a 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -215,7 +215,7 @@ if ($id > 0 || ! empty($ref)) $result=$projectstatic->fetch($object->fk_project); if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty(); - $object->project = dol_clone($projectstatic); + $object->project = clone $projectstatic; $userWrite = $projectstatic->restrictedProjectArea($user,'write'); diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index b2b0f954a58..bffff8f3cbe 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -279,7 +279,7 @@ abstract class ActionsCardCommon exit; } - $oldsoccanvas = dol_clone($this->object); + $oldsoccanvas = clone $this->object; // To avoid setting code if third party is not concerned. But if it had values, we keep them. if (empty($this->object->client) && empty($oldsoccanvas->code_client)) $this->object->code_client=''; diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 637110d4a88..8e703118e59 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -232,7 +232,7 @@ if (empty($reshook)) if ($action == 'update') { $ret=$object->fetch($socid); - $object->oldcopy=dol_clone($object); + $object->oldcopy = clone $object; } else $object->canvas=$canvas; @@ -1329,7 +1329,7 @@ else $prefixSupplierIsUsed = $modCodeFournisseur->verif_prefixIsUsed(); } - $object->oldcopy=dol_clone($object); + $object->oldcopy = clone $object; if (GETPOST('name')) { diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 5724101ec1b..6f4487f9947 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -278,7 +278,7 @@ if (($action == 'addgroup' || $action == 'removegroup') && $caneditfield) { $editgroup = new UserGroup($db); $editgroup->fetch($group); - $editgroup->oldcopy=clone($editgroup); + $editgroup->oldcopy=clone $editgroup; $object->fetch($id); if ($action == 'addgroup') $object->SetInGroup($group,($conf->multicompany->transverse_mode?GETPOST("entity"):$editgroup->entity)); @@ -340,7 +340,7 @@ if ($action == 'update' && ! $_POST["cancel"]) { $db->begin(); - $object->oldcopy=clone($object); + $object->oldcopy = clone $object; $object->lastname = GETPOST("lastname",'alpha'); $object->firstname = GETPOST("firstname",'alpha'); @@ -508,7 +508,7 @@ if ($action == 'update' && ! $_POST["cancel"]) { $object->fetch($id); - $object->oldcopy=clone($object); + $object->oldcopy = clone $object; $ret=$object->setPassword($user,$_POST["password"]); if ($ret < 0) diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 34c3084e12d..d7eb96363d8 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1409,7 +1409,7 @@ class User extends CommonObject // Mise a jour if (! $changelater) { - if (! is_object($this->oldcopy)) $this->oldcopy=dol_clone($this); + if (! is_object($this->oldcopy)) $this->oldcopy = clone $this; $this->db->begin(); diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index 3de421e4f4f..05acd6a5a45 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -142,7 +142,7 @@ if ($action == 'adduser' || $action =='removeuser') if ($userid) { $object->fetch($id); - $object->oldcopy=dol_clone($object); + $object->oldcopy = clone $object; $edituser = new User($db); $edituser->fetch($userid); @@ -176,7 +176,7 @@ if ($action == 'update') $object->fetch($id); - $object->oldcopy=dol_clone($object); + $object->oldcopy = clone $object; $object->name = trim($_POST["group"]); $object->nom = $object->name; // For backward compatibility diff --git a/test/phpunit/ContactTest.php b/test/phpunit/ContactTest.php index b638cdc776b..6fb3069d2af 100755 --- a/test/phpunit/ContactTest.php +++ b/test/phpunit/ContactTest.php @@ -189,7 +189,7 @@ class ContactTest extends PHPUnit_Framework_TestCase $langs=$this->savlangs; $db=$this->savdb; - $localobject->oldcopy=dol_clone($localobject); + $localobject->oldcopy = clone $localobject; $localobject->note_private='New private note after update'; $localobject->note_public='New public note after update'; diff --git a/test/phpunit/HolidayTest.php b/test/phpunit/HolidayTest.php index 36556fd9281..065d3678d8e 100644 --- a/test/phpunit/HolidayTest.php +++ b/test/phpunit/HolidayTest.php @@ -183,7 +183,7 @@ class HolidayTest extends PHPUnit_Framework_TestCase $langs=$this->savlangs; $db=$this->savdb; - $localobject->oldcopy=dol_clone($localobject); + $localobject->oldcopy = clone $localobject; $localobject->note_private='New private note after update'; $localobject->note_public='New public note after update'; From 3feffdb84f3004fbf5b3c7288110dd891dde2140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 24 Sep 2015 17:50:39 +0200 Subject: [PATCH 06/19] [Qual] Removed unused deprecated fields --- htdocs/core/modules/modExpenseReport.class.php | 5 +---- htdocs/core/modules/modHoliday.class.php | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php index 123f4fe4aa0..f71605145ea 100644 --- a/htdocs/core/modules/modExpenseReport.class.php +++ b/htdocs/core/modules/modExpenseReport.class.php @@ -75,9 +75,6 @@ class modExpenseReport extends DolibarrModules $this->dirs = array(); $r=0; - // Relative path to module style sheet if exists. Example: '/mymodule/css/mycss.css'. - //$this->style_sheet = '/mymodule/mymodule.css.php'; - // Config pages. Put here list of php page names stored in admmin directory used to setup module. $this->config_page_url = array('expensereport.php'); @@ -345,4 +342,4 @@ class modExpenseReport extends DolibarrModules return $this->_init($sql,$options); } -} \ No newline at end of file +} diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php index b4517b4bfbe..8daba0040d7 100644 --- a/htdocs/core/modules/modHoliday.class.php +++ b/htdocs/core/modules/modHoliday.class.php @@ -76,9 +76,6 @@ class modHoliday extends DolibarrModules $this->dirs = array(); $r=0; - // Relative path to module style sheet if exists. Example: '/mymodule/css/mycss.css'. - //$this->style_sheet = '/mymodule/mymodule.css.php'; - // Config pages. Put here list of php page names stored in admmin directory used to setup module. // $this->config_page_url = array("holiday.php?leftmenu=setup@holiday"); From dabfad15293da52b3ee4d87e116ac3e28cc5afdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 24 Sep 2015 18:27:13 +0200 Subject: [PATCH 07/19] [Qual] Replaced deprecated print_titre() --- htdocs/adherents/admin/adherent_extrafields.php | 4 ++-- htdocs/adherents/admin/adherent_type_extrafields.php | 4 ++-- htdocs/adherents/ldap.php | 2 +- htdocs/admin/agenda_extrafields.php | 4 ++-- htdocs/admin/askpricesupplier.php | 8 ++++---- htdocs/admin/bank.php | 2 +- htdocs/admin/bank_extrafields.php | 4 ++-- htdocs/admin/barcode.php | 6 +++--- htdocs/admin/boxes.php | 6 +++--- htdocs/admin/commande.php | 8 ++++---- htdocs/admin/contract.php | 6 +++--- htdocs/admin/expedition.php | 6 +++--- htdocs/admin/expensereport.php | 4 ++-- htdocs/admin/facture.php | 12 ++++++------ htdocs/admin/fichinter.php | 6 +++--- htdocs/admin/livraison.php | 6 +++--- htdocs/admin/mails.php | 4 ++-- htdocs/admin/order_extrafields.php | 4 ++-- htdocs/admin/orderdet_extrafields.php | 4 ++-- htdocs/admin/pdf.php | 2 +- htdocs/admin/prelevement.php | 2 +- htdocs/admin/propal.php | 10 +++++----- htdocs/admin/sms.php | 4 ++-- htdocs/admin/supplier_invoice.php | 8 ++++---- htdocs/admin/supplier_order.php | 8 ++++---- htdocs/admin/supplierinvoice_extrafields.php | 4 ++-- htdocs/admin/supplierinvoicedet_extrafields.php | 4 ++-- htdocs/admin/supplierorder_extrafields.php | 4 ++-- htdocs/admin/supplierorderdet_extrafields.php | 4 ++-- htdocs/admin/syslog.php | 4 ++-- htdocs/admin/system/constall.php | 4 ++-- htdocs/admin/system/phpinfo.php | 2 +- htdocs/admin/tools/dolibarr_export.php | 2 +- htdocs/categories/admin/categorie_extrafields.php | 4 ++-- htdocs/comm/address.php | 2 +- htdocs/comm/admin/askpricesupplier_extrafields.php | 4 ++-- .../comm/admin/askpricesupplierdet_extrafields.php | 4 ++-- htdocs/comm/admin/propal_extrafields.php | 4 ++-- htdocs/comm/admin/propaldet_extrafields.php | 4 ++-- htdocs/comm/askpricesupplier/card.php | 2 +- .../askpricesupplier/tpl/linkedobjectblock.tpl.php | 2 +- htdocs/comm/mailing/card.php | 2 +- htdocs/comm/propal.php | 2 +- htdocs/comm/propal/tpl/linkedobjectblock.tpl.php | 2 +- htdocs/comm/remx.php | 4 ++-- htdocs/commande/card.php | 2 +- htdocs/commande/tpl/linkedobjectblock.tpl.php | 2 +- htdocs/compta/bank/bilan.php | 2 +- htdocs/compta/facture.php | 2 +- .../facture/admin/facture_cust_extrafields.php | 4 ++-- .../facture/admin/facturedet_cust_extrafields.php | 4 ++-- htdocs/compta/facture/fiche-rec.php | 4 ++-- htdocs/compta/facture/tpl/linkedobjectblock.tpl.php | 2 +- htdocs/compta/localtax/index.php | 4 ++-- htdocs/compta/prelevement/stats.php | 4 ++-- htdocs/compta/tva/clients.php | 4 ++-- htdocs/compta/tva/index.php | 4 ++-- htdocs/compta/ventilation/fournisseur/card.php | 2 +- htdocs/contact/ldap.php | 2 +- htdocs/contrat/admin/contract_extrafields.php | 4 ++-- htdocs/contrat/admin/contractdet_extrafields.php | 4 ++-- htdocs/contrat/tpl/linkedobjectblock.tpl.php | 2 +- htdocs/core/class/html.formfile.class.php | 6 +++--- htdocs/core/lib/company.lib.php | 2 +- htdocs/core/lib/sendings.lib.php | 4 ++-- htdocs/don/admin/donation.php | 6 +++--- htdocs/don/admin/donation_extrafields.php | 4 ++-- htdocs/expedition/shipment.php | 2 +- htdocs/expedition/tpl/linkedobjectblock.tpl.php | 2 +- htdocs/fichinter/admin/fichinter_extrafields.php | 4 ++-- htdocs/fichinter/admin/fichinterdet_extrafields.php | 4 ++-- htdocs/fichinter/apercu.php | 2 +- htdocs/fichinter/tpl/linkedobjectblock.tpl.php | 2 +- htdocs/fourn/commande/dispatch.php | 2 +- htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php | 2 +- htdocs/fourn/facture/card.php | 2 +- htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php | 2 +- htdocs/product/admin/product.php | 4 ++-- htdocs/product/admin/product_extrafields.php | 4 ++-- htdocs/product/stock/mouvement.php | 4 ++-- htdocs/product/stock/product.php | 2 +- htdocs/projet/admin/project.php | 10 +++++----- htdocs/projet/admin/project_extrafields.php | 4 ++-- htdocs/projet/admin/project_task_extrafields.php | 4 ++-- htdocs/public/members/new.php | 2 +- htdocs/resource/element_resource.php | 2 +- htdocs/societe/admin/contact_extrafields.php | 4 ++-- htdocs/societe/admin/societe.php | 10 +++++----- htdocs/societe/admin/societe_extrafields.php | 4 ++-- htdocs/societe/commerciaux.php | 2 +- htdocs/societe/rib.php | 4 ++-- htdocs/societe/soc.php | 2 +- htdocs/user/admin/group_extrafields.php | 4 ++-- htdocs/user/admin/user_extrafields.php | 4 ++-- htdocs/user/group/ldap.php | 2 +- htdocs/user/ldap.php | 2 +- 96 files changed, 185 insertions(+), 185 deletions(-) diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php index 6ac36cac022..e5e2f3bc16f 100644 --- a/htdocs/adherents/admin/adherent_extrafields.php +++ b/htdocs/adherents/admin/adherent_extrafields.php @@ -95,7 +95,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -108,7 +108,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/adherents/admin/adherent_type_extrafields.php b/htdocs/adherents/admin/adherent_type_extrafields.php index 19695a2ef6d..5ef21314598 100644 --- a/htdocs/adherents/admin/adherent_type_extrafields.php +++ b/htdocs/adherents/admin/adherent_type_extrafields.php @@ -98,7 +98,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -111,7 +111,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php index c05dc78af83..89572525c32 100644 --- a/htdocs/adherents/ldap.php +++ b/htdocs/adherents/ldap.php @@ -173,7 +173,7 @@ if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && $conf->global->LDAP_MEMBER_ACT // Affichage attributs LDAP -print_titre($langs->trans("LDAPInformationsForThisMember")); +print load_fiche_titre($langs->trans("LDAPInformationsForThisMember")); print '
'; diff --git a/htdocs/admin/agenda_extrafields.php b/htdocs/admin/agenda_extrafields.php index d7af0bc8d9e..783a12da23d 100644 --- a/htdocs/admin/agenda_extrafields.php +++ b/htdocs/admin/agenda_extrafields.php @@ -100,7 +100,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -113,7 +113,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/admin/askpricesupplier.php b/htdocs/admin/askpricesupplier.php index 485fbb2ef23..a2a30161d5e 100644 --- a/htdocs/admin/askpricesupplier.php +++ b/htdocs/admin/askpricesupplier.php @@ -249,7 +249,7 @@ dol_fiche_head($head, 'general', $langs->trans("CommRequests"), 0, 'askpricesupp /* * Module numerotation */ -print_titre($langs->trans("AskPriceSupplierNumberingModules")); +print load_fiche_titre($langs->trans("AskPriceSupplierNumberingModules")); print '
'; print ''; @@ -351,7 +351,7 @@ print "

\n"; * Document templates generators */ -print_titre($langs->trans("AskPriceSupplierPDFModules")); +print load_fiche_titre($langs->trans("AskPriceSupplierPDFModules")); // Load array def with activated templates $def = array(); @@ -513,7 +513,7 @@ print '
'; * Other options * */ -print_titre($langs->trans("OtherOptions")); +print load_fiche_titre($langs->trans("OtherOptions")); $var=true; print ""; @@ -594,7 +594,7 @@ print '
'; * Directory */ print '
'; -print_titre($langs->trans("PathToDocuments")); +print load_fiche_titre($langs->trans("PathToDocuments")); print "\n"; print "\n"; diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php index 214ac6b68c0..4439de63ed2 100644 --- a/htdocs/admin/bank.php +++ b/htdocs/admin/bank.php @@ -142,7 +142,7 @@ print ''; //Show bank account order -print_titre($langs->trans("BankOrderShow")); +print load_fiche_titre($langs->trans("BankOrderShow")); print '
'; print ''; diff --git a/htdocs/admin/bank_extrafields.php b/htdocs/admin/bank_extrafields.php index d8155c57f1c..91689c10379 100644 --- a/htdocs/admin/bank_extrafields.php +++ b/htdocs/admin/bank_extrafields.php @@ -96,7 +96,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -109,7 +109,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index 7be66a40d4a..4f4a0daa3dd 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -188,7 +188,7 @@ foreach($dirbarcode as $reldir) $var=true; print '
'; -print_titre($langs->trans("BarcodeEncodeModule")); +print load_fiche_titre($langs->trans("BarcodeEncodeModule")); print '
'; print ''; @@ -288,7 +288,7 @@ print "
"; * Autres options * */ -print_titre($langs->trans("OtherOptions")); +print load_fiche_titre($langs->trans("OtherOptions")); print ""; print ''; @@ -358,7 +358,7 @@ print '
'; // Select barcode numbering module if ($conf->produit->enabled) { - print_titre($langs->trans("BarCodeNumberManager")." (".$langs->trans("Product").")"); + print load_fiche_titre($langs->trans("BarCodeNumberManager")." (".$langs->trans("Product").")"); print '
'; print ''; diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 18c63a48798..d4918643c6c 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -323,7 +323,7 @@ $boxtoadd=InfoBox::listBoxes($db,'available',-1,null,$actives); print "
\n"; print "\n\n".''."\n"; -print_titre($langs->trans("BoxesAvailable")); +print load_fiche_titre($langs->trans("BoxesAvailable")); print ''."\n"; print ''."\n"; @@ -385,7 +385,7 @@ print "\n".''."\n"; $boxactivated=InfoBox::listBoxes($db,'activated',-1,null); //var_dump($boxactivated); print "
\n\n"; -print_titre($langs->trans("BoxesActivated")); +print load_fiche_titre($langs->trans("BoxesActivated")); print '
'; print ''; @@ -446,7 +446,7 @@ print '

'; // Other parameters print "\n\n".''."\n"; -print_titre($langs->trans("Other")); +print load_fiche_titre($langs->trans("Other")); print ''; print ''; print ''; diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 3721c54dd79..6ad2b6750af 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -273,7 +273,7 @@ dol_fiche_head($head, 'general', $langs->trans("Orders"), 0, 'order'); * Orders Numbering model */ -print_titre($langs->trans("OrdersNumberingModules")); +print load_fiche_titre($langs->trans("OrdersNumberingModules")); print ''; print ''; @@ -377,7 +377,7 @@ print "

\n"; * Document templates generators */ -print_titre($langs->trans("OrdersModelModule")); +print load_fiche_titre($langs->trans("OrdersModelModule")); // Load array def with activated templates $def = array(); @@ -540,7 +540,7 @@ print "
"; * */ -print_titre($langs->trans("OtherOptions")); +print load_fiche_titre($langs->trans("OtherOptions")); print ''; print ''; print ''; @@ -638,7 +638,7 @@ print '
'; * Notifications */ -print_titre($langs->trans("Notifications")); +print load_fiche_titre($langs->trans("Notifications")); print '
'.$langs->trans("Parameter").'
'; print ''; print ''; diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index 6c2c690d73c..0d373c31f23 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -226,7 +226,7 @@ dol_fiche_head($head, 'contract', $langs->trans("Contracts"), 0, 'contract'); * Contracts Numbering model */ -print_titre($langs->trans("ContractsNumberingModules")); +print load_fiche_titre($langs->trans("ContractsNumberingModules")); print '
'.$langs->trans("Parameter").'
'; print ''; @@ -329,7 +329,7 @@ print '

'; * Documents models for Contracts */ -print_titre($langs->trans("TemplatePDFContracts")); +print load_fiche_titre($langs->trans("TemplatePDFContracts")); // Defini tableau def des modeles $def = array(); @@ -494,7 +494,7 @@ print ''; print ''; print ''; -print_titre($langs->trans("OtherOptions")); +print load_fiche_titre($langs->trans("OtherOptions")); print ''; print ''; print ''; diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index 09382e734ac..06884120047 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -248,7 +248,7 @@ dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup")); * Expedition numbering model */ -print_titre($langs->trans("SendingsNumberingModules")); +print load_fiche_titre($langs->trans("SendingsNumberingModules")); print '
'.$langs->trans("Parameter").'
'; print ''; @@ -354,7 +354,7 @@ print '

'; /* * Documents models for Sendings Receipt */ -print_titre($langs->trans("SendingsReceiptModel")); +print load_fiche_titre($langs->trans("SendingsReceiptModel")); // Defini tableau def de modele invoice $type="shipping"; @@ -516,7 +516,7 @@ print '
'; * Other options * */ -print_titre($langs->trans("OtherOptions")); +print load_fiche_titre($langs->trans("OtherOptions")); $var=true; print ""; diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php index c31db84225c..5eebf25152f 100644 --- a/htdocs/admin/expensereport.php +++ b/htdocs/admin/expensereport.php @@ -244,7 +244,7 @@ dol_fiche_head($head, 'expensereport', $langs->trans("ExpenseReports"), 0, 'trip // Interventions numbering model /* -print_titre($langs->trans("FicheinterNumberingModules")); +print load_fiche_titre($langs->trans("FicheinterNumberingModules")); print '
'; print ''; @@ -346,7 +346,7 @@ print '

'; * Documents models for Interventions */ -print_titre($langs->trans("TemplatePDFExpenseReports")); +print load_fiche_titre($langs->trans("TemplatePDFExpenseReports")); // Defini tableau def des modeles $type='expensereport'; diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 4fd4c049593..e2c31f38929 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -302,7 +302,7 @@ dol_fiche_head($head, 'general', $langs->trans("Invoices"), 0, 'invoice'); * Numbering module */ -print_titre($langs->trans("BillsNumberingModule")); +print load_fiche_titre($langs->trans("BillsNumberingModule")); print ''; print ''; @@ -471,7 +471,7 @@ print '
'; * Document templates generators */ print '
'; -print_titre($langs->trans("BillsPDFModules")); +print load_fiche_titre($langs->trans("BillsPDFModules")); // Load array def with activated templates $type='invoice'; @@ -631,7 +631,7 @@ print ''; * Modes de reglement */ print '
'; -print_titre($langs->trans("SuggestedPaymentModesIfNotDefinedInInvoice")); +print load_fiche_titre($langs->trans("SuggestedPaymentModesIfNotDefinedInInvoice")); print ''; print ''; @@ -726,7 +726,7 @@ print ""; print "
"; -print_titre($langs->trans("OtherOptions")); +print load_fiche_titre($langs->trans("OtherOptions")); print ''; print ''; @@ -805,7 +805,7 @@ print '
'; * Repertoire */ print '
'; -print_titre($langs->trans("PathToDocuments")); +print load_fiche_titre($langs->trans("PathToDocuments")); print ''."\n"; print ''."\n"; @@ -823,7 +823,7 @@ print "
\n"; * Notifications */ print '
'; -print_titre($langs->trans("Notifications")); +print load_fiche_titre($langs->trans("Notifications")); print ''; print ''; print ''; diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index e70960ccbc0..f807ea94890 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -256,7 +256,7 @@ dol_fiche_head($head, 'ficheinter', $langs->trans("Interventions"), 0, 'interven // Interventions numbering model -print_titre($langs->trans("FicheinterNumberingModules")); +print load_fiche_titre($langs->trans("FicheinterNumberingModules")); print '
'.$langs->trans("Parameter").'
'; print ''; @@ -358,7 +358,7 @@ print '

'; * Documents models for Interventions */ -print_titre($langs->trans("TemplatePDFInterventions")); +print load_fiche_titre($langs->trans("TemplatePDFInterventions")); // Defini tableau def des modeles $type='ficheinter'; @@ -512,7 +512,7 @@ print "
"; * */ -print_titre($langs->trans("OtherOptions")); +print load_fiche_titre($langs->trans("OtherOptions")); print ''; print ''; print ''; diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index 41fbe5fc8f4..8dd5cc5ead0 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -237,7 +237,7 @@ dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup")); * Livraison numbering model */ -print_titre($langs->trans("DeliveryOrderNumberingModules")); +print load_fiche_titre($langs->trans("DeliveryOrderNumberingModules")); print '
'.$langs->trans("Parameter").'
'; print ''; @@ -340,7 +340,7 @@ print '
'; * Documents Models for delivery */ print '
'; -print_titre($langs->trans("DeliveryOrderModel")); +print load_fiche_titre($langs->trans("DeliveryOrderModel")); // Defini tableau def de modele $type="delivery"; @@ -487,7 +487,7 @@ print ''; * Autres Options */ print "
"; -print_titre($langs->trans("OtherOptions")); +print load_fiche_titre($langs->trans("OtherOptions")); print ''; print ''; diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 148fcf76268..742ef6149f8 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -660,7 +660,7 @@ else if ($action == 'testconnect') { print '
'; - print_titre($langs->trans("DoTestServerAvailability")); + print load_fiche_titre($langs->trans("DoTestServerAvailability")); // If we use SSL/TLS if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $server='ssl://'.$server; @@ -686,7 +686,7 @@ else if ($action == 'test' || $action == 'testhtml') { print '
'; - print_titre($action == 'testhtml'?$langs->trans("DoTestSendHTML"):$langs->trans("DoTestSend")); + print load_fiche_titre($action == 'testhtml'?$langs->trans("DoTestSendHTML"):$langs->trans("DoTestSend")); // Cree l'objet formulaire mail include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; diff --git a/htdocs/admin/order_extrafields.php b/htdocs/admin/order_extrafields.php index 0c71c3285ad..09be4cfa36e 100644 --- a/htdocs/admin/order_extrafields.php +++ b/htdocs/admin/order_extrafields.php @@ -100,7 +100,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -113,7 +113,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/admin/orderdet_extrafields.php b/htdocs/admin/orderdet_extrafields.php index 9f16d7934b1..80f1e5377d6 100644 --- a/htdocs/admin/orderdet_extrafields.php +++ b/htdocs/admin/orderdet_extrafields.php @@ -101,7 +101,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -114,7 +114,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index 9f12c98e1d8..3f29dc1a24f 100644 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -453,7 +453,7 @@ else // Show * Library */ print '
'; - print_titre($langs->trans("Library")); + print load_fiche_titre($langs->trans("Library")); print '
'."\n"; diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index 31c1e5e7dba..2ac83681405 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -178,7 +178,7 @@ print '
'; if (! empty($conf->global->MAIN_MODULE_NOTIFICATION)) { $langs->load("mails"); - print_titre($langs->trans("Notifications")); + print load_fiche_titre($langs->trans("Notifications")); $sql = "SELECT u.rowid, u.lastname, u.firstname, u.fk_soc, u.email"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index 48c16de3531..5d0054e61eb 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -270,7 +270,7 @@ dol_fiche_head($head, 'general', $langs->trans("Proposals"), 0, 'propal'); /* * Module numerotation */ -print_titre($langs->trans("ProposalsNumberingModules")); +print load_fiche_titre($langs->trans("ProposalsNumberingModules")); print '
'; print ''; @@ -374,7 +374,7 @@ print "

\n"; * Document templates generators */ -print_titre($langs->trans("ProposalsPDFModules")); +print load_fiche_titre($langs->trans("ProposalsPDFModules")); // Load array def with activated templates $def = array(); @@ -536,7 +536,7 @@ print '
'; * Other options * */ -print_titre($langs->trans("OtherOptions")); +print load_fiche_titre($langs->trans("OtherOptions")); $var=true; print ""; @@ -643,7 +643,7 @@ print '
'; * Directory */ print '
'; -print_titre($langs->trans("PathToDocuments")); +print load_fiche_titre($langs->trans("PathToDocuments")); print "\n"; print "\n"; @@ -658,7 +658,7 @@ print "
\n
"; * Notifications */ -print_titre($langs->trans("Notifications")); +print load_fiche_titre($langs->trans("Notifications")); print ''; print ''; print ''; diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index 44bab100730..94a08b274ef 100644 --- a/htdocs/admin/sms.php +++ b/htdocs/admin/sms.php @@ -289,7 +289,7 @@ else if ($_GET["action"] == 'testconnect') { print '
'; - print_titre($langs->trans("DoTestServerAvailability")); + print load_fiche_titre($langs->trans("DoTestServerAvailability")); // If we use SSL/TLS if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $server='ssl://'.$server; @@ -311,7 +311,7 @@ else if ($action == 'test') { print '
'; - print_titre($langs->trans("DoTestSend")); + print load_fiche_titre($langs->trans("DoTestSend")); // Cree l'objet formulaire mail include_once DOL_DOCUMENT_ROOT.'/core/class/html.formsms.class.php'; diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php index 222b813cdbb..aab372f370e 100644 --- a/htdocs/admin/supplier_invoice.php +++ b/htdocs/admin/supplier_invoice.php @@ -205,7 +205,7 @@ dol_fiche_head($head, 'invoice', $langs->trans("Suppliers"), 0, 'company'); // Supplier invoice numbering module -print_titre($langs->trans("SuppliersInvoiceNumberingModel")); +print load_fiche_titre($langs->trans("SuppliersInvoiceNumberingModel")); print '
'.$langs->trans("Parameter").'
'; print ''; @@ -311,7 +311,7 @@ print '

'; * Modeles documents for supplier invoices */ -print_titre($langs->trans("BillsPDFModules")); +print load_fiche_titre($langs->trans("BillsPDFModules")); // Defini tableau def de modele $def = array(); @@ -453,7 +453,7 @@ print '
'; print ''; print ''; -print_titre($langs->trans("OtherOptions")); +print load_fiche_titre($langs->trans("OtherOptions")); print ''; print ''; print ''; @@ -487,7 +487,7 @@ print ''; * Notifications */ -print_titre($langs->trans("Notifications")); +print load_fiche_titre($langs->trans("Notifications")); print '
'.$langs->trans("Parameter").'
'; print ''; print ''; diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php index 11613a82745..fa3f61306d1 100644 --- a/htdocs/admin/supplier_order.php +++ b/htdocs/admin/supplier_order.php @@ -221,7 +221,7 @@ dol_fiche_head($head, 'order', $langs->trans("Suppliers"), 0, 'company'); // Supplier order numbering module -print_titre($langs->trans("OrdersNumberingModules")); +print load_fiche_titre($langs->trans("OrdersNumberingModules")); print '
'.$langs->trans("Parameter").'
'; print ''; @@ -325,7 +325,7 @@ print '

'; * Documents models for supplier orders */ -print_titre($langs->trans("OrdersModelModule")); +print load_fiche_titre($langs->trans("OrdersModelModule")); // Defini tableau def de modele $def = array(); @@ -464,7 +464,7 @@ print '
'; print ''; print ''; -print_titre($langs->trans("OtherOptions")); +print load_fiche_titre($langs->trans("OtherOptions")); print ''; print ''; print ''; @@ -512,7 +512,7 @@ print ''; * Notifications */ -print_titre($langs->trans("Notifications")); +print load_fiche_titre($langs->trans("Notifications")); print '
'.$langs->trans("Parameter").'
'; print ''; print ''; diff --git a/htdocs/admin/supplierinvoice_extrafields.php b/htdocs/admin/supplierinvoice_extrafields.php index 4e9f1fce9ae..060e135aa58 100644 --- a/htdocs/admin/supplierinvoice_extrafields.php +++ b/htdocs/admin/supplierinvoice_extrafields.php @@ -104,7 +104,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -117,7 +117,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/admin/supplierinvoicedet_extrafields.php b/htdocs/admin/supplierinvoicedet_extrafields.php index b6f71ecc00c..92dd8d53133 100644 --- a/htdocs/admin/supplierinvoicedet_extrafields.php +++ b/htdocs/admin/supplierinvoicedet_extrafields.php @@ -104,7 +104,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -117,7 +117,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/admin/supplierorder_extrafields.php b/htdocs/admin/supplierorder_extrafields.php index 135e02a92b4..7fa48c2ccdb 100644 --- a/htdocs/admin/supplierorder_extrafields.php +++ b/htdocs/admin/supplierorder_extrafields.php @@ -100,7 +100,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -113,7 +113,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/admin/supplierorderdet_extrafields.php b/htdocs/admin/supplierorderdet_extrafields.php index 6d422de4d31..fcbb15fc85c 100644 --- a/htdocs/admin/supplierorderdet_extrafields.php +++ b/htdocs/admin/supplierorderdet_extrafields.php @@ -101,7 +101,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -114,7 +114,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index 44002dc4c74..d95cc30f4dd 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -178,7 +178,7 @@ if ($conf->global->MAIN_MODULE_MULTICOMPANY && $user->entity) //print "conf->global->MAIN_FEATURES_LEVEL = ".$conf->global->MAIN_FEATURES_LEVEL."

\n"; // Output mode -print_titre($langs->trans("SyslogOutput")); +print load_fiche_titre($langs->trans("SyslogOutput")); // Mode print ''; @@ -240,7 +240,7 @@ print "\n"; print '
'."\n\n"; -print_titre($langs->trans("SyslogLevel")); +print load_fiche_titre($langs->trans("SyslogLevel")); // Level print ''; diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index 16c63b1b1fd..aba9f5e7263 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -42,7 +42,7 @@ llxHeader(); print_fiche_titre($langs->trans("SummaryConst"),'','title_setup'); -print_titre($langs->trans("ConfigurationFile").' ('.$conffiletoshowshort.')'); +print load_fiche_titre($langs->trans("ConfigurationFile").' ('.$conffiletoshowshort.')'); // Parameters in conf.php file (when a parameter start with ?, it is shown only if defined) $configfileparameters=array( 'dolibarr_main_url_root', @@ -200,7 +200,7 @@ print '
'; // Parameters in database -print_titre($langs->trans("Database")); +print load_fiche_titre($langs->trans("Database")); print '
'.$langs->trans("Parameter").'
'; print ''; print ''; diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php index 89b0f8cd8dc..4a8dcb31d6e 100644 --- a/htdocs/admin/system/phpinfo.php +++ b/htdocs/admin/system/phpinfo.php @@ -67,7 +67,7 @@ print '
'; $phparray=phpinfo_array(); foreach($phparray as $key => $value) { - //print_titre($key); + //print load_fiche_titre($key); print '
'.$langs->trans("Parameter").'
'; print ''; //print ''; diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index 6f1783e5d11..fefb13cd0a0 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -133,7 +133,7 @@ print '
'; trans("BackupDumpWizard")); +print load_fiche_titre($title?$title:$langs->trans("BackupDumpWizard")); print '
'.$langs->trans("Parameter").'
'; print ''; diff --git a/htdocs/categories/admin/categorie_extrafields.php b/htdocs/categories/admin/categorie_extrafields.php index df31e07d95b..26ffa089828 100644 --- a/htdocs/categories/admin/categorie_extrafields.php +++ b/htdocs/categories/admin/categorie_extrafields.php @@ -93,7 +93,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -106,7 +106,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php index 963847aee18..0dd643a4f8f 100644 --- a/htdocs/comm/address.php +++ b/htdocs/comm/address.php @@ -306,7 +306,7 @@ elseif ($action == 'edit') dol_fiche_head($head, 'card', $societe->name); - print_titre($langs->trans("EditAddress")); + print load_fiche_titre($langs->trans("EditAddress")); print "
\n"; if ($socid) diff --git a/htdocs/comm/admin/askpricesupplier_extrafields.php b/htdocs/comm/admin/askpricesupplier_extrafields.php index 4342549c46a..b7140c404fc 100644 --- a/htdocs/comm/admin/askpricesupplier_extrafields.php +++ b/htdocs/comm/admin/askpricesupplier_extrafields.php @@ -128,7 +128,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -141,7 +141,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/comm/admin/askpricesupplierdet_extrafields.php b/htdocs/comm/admin/askpricesupplierdet_extrafields.php index e419b6a3168..dd6c9cc92c5 100644 --- a/htdocs/comm/admin/askpricesupplierdet_extrafields.php +++ b/htdocs/comm/admin/askpricesupplierdet_extrafields.php @@ -130,7 +130,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -143,7 +143,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/comm/admin/propal_extrafields.php b/htdocs/comm/admin/propal_extrafields.php index bd0ce34329d..6ee525d8051 100644 --- a/htdocs/comm/admin/propal_extrafields.php +++ b/htdocs/comm/admin/propal_extrafields.php @@ -94,7 +94,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -107,7 +107,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/comm/admin/propaldet_extrafields.php b/htdocs/comm/admin/propaldet_extrafields.php index 58ab3adf109..583825ce234 100644 --- a/htdocs/comm/admin/propaldet_extrafields.php +++ b/htdocs/comm/admin/propaldet_extrafields.php @@ -101,7 +101,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -114,7 +114,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/comm/askpricesupplier/card.php b/htdocs/comm/askpricesupplier/card.php index 22732c1a19d..29a9b344ba4 100644 --- a/htdocs/comm/askpricesupplier/card.php +++ b/htdocs/comm/askpricesupplier/card.php @@ -1263,7 +1263,7 @@ if ($action == 'create') print '
'; $title = $langs->trans('ProductsAndServices'); - print_titre($title); + print load_fiche_titre($title); print '
'; diff --git a/htdocs/comm/askpricesupplier/tpl/linkedobjectblock.tpl.php b/htdocs/comm/askpricesupplier/tpl/linkedobjectblock.tpl.php index 48d916c6a5c..bf16d01fa1e 100644 --- a/htdocs/comm/askpricesupplier/tpl/linkedobjectblock.tpl.php +++ b/htdocs/comm/askpricesupplier/tpl/linkedobjectblock.tpl.php @@ -29,7 +29,7 @@ $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; echo '
'; -print_titre($langs->trans('RelatedAskPriceSupplier')); +print load_fiche_titre($langs->trans('RelatedAskPriceSupplier')); ?>
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index b7d4f909fa7..2d53fbb06e1 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -958,7 +958,7 @@ else // Affichage formulaire de TEST if ($action == 'test') { - print_titre($langs->trans("TestMailing")); + print load_fiche_titre($langs->trans("TestMailing")); // Create l'objet formulaire mail include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 24b7ab16d69..65a6cdb938e 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1579,7 +1579,7 @@ if ($action == 'create') print '
'; $title = $langs->trans('ProductsAndServices'); - print_titre($title); + print load_fiche_titre($title); print '
'; diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php index 66cde8692ce..6f53fd37a95 100644 --- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php +++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php @@ -34,7 +34,7 @@ $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; echo '
'; -print_titre($langs->trans('RelatedCommercialProposals')); +print load_fiche_titre($langs->trans('RelatedCommercialProposals')); ?>
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index 471232ef708..744f1ff39c7 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -317,7 +317,7 @@ if ($socid > 0) $resql=$db->query($sql); if ($resql) { - print_titre($langs->trans("DiscountStillRemaining")); + print load_fiche_titre($langs->trans("DiscountStillRemaining")); print '
'; print ''; print ''; // Need 120+ for format with AM/PM @@ -457,7 +457,7 @@ if ($socid > 0) if ($resql) $resql2=$db->query($sql2); if ($resql2) { - print_titre($langs->trans("DiscountAlreadyCounted")); + print load_fiche_titre($langs->trans("DiscountAlreadyCounted")); print '
'.$langs->trans("Date").'
'; print ''; print ''; // Need 120+ for format with AM/PM diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 83b86ee5525..54400bb60ef 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1574,7 +1574,7 @@ if ($action == 'create' && $user->rights->commande->creer) // Show origin lines if (! empty($origin) && ! empty($originid) && is_object($objectsrc)) { $title = $langs->trans('ProductsAndServices'); - print_titre($title); + print load_fiche_titre($title); print '
'.$langs->trans("Date").'
'; diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php index a661013802d..bf399c250d9 100644 --- a/htdocs/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php @@ -30,7 +30,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; $langs->load("orders"); echo '
'; -print_titre($langs->trans('RelatedCustomerOrders')); +print load_fiche_titre($langs->trans('RelatedCustomerOrders')); ?>
diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php index edfc84c23cc..7e44778b9bd 100644 --- a/htdocs/compta/bank/bilan.php +++ b/htdocs/compta/bank/bilan.php @@ -58,7 +58,7 @@ function valeur($sql) llxHeader(); -print_titre("Bilan"); +print load_fiche_titre("Bilan"); print '
'; print '
'; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 6b0af5f7043..a1f18a0ae89 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2435,7 +2435,7 @@ if ($action == 'create') print '
'; $title = $langs->trans('ProductsAndServices'); - print_titre($title); + print load_fiche_titre($title); print '
'; diff --git a/htdocs/compta/facture/admin/facture_cust_extrafields.php b/htdocs/compta/facture/admin/facture_cust_extrafields.php index 58d4e46f8dd..128d391e963 100644 --- a/htdocs/compta/facture/admin/facture_cust_extrafields.php +++ b/htdocs/compta/facture/admin/facture_cust_extrafields.php @@ -95,7 +95,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -110,7 +110,7 @@ if ($action == 'edit' && ! empty($attrname)) $langs->load("members"); print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php index e69060aa3cf..db5b4a7c0e2 100644 --- a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php +++ b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php @@ -96,7 +96,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -109,7 +109,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 460c0bffcab..c1f4e5b26ff 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -191,7 +191,7 @@ if ($action == 'create') else if (empty($conf->product->enabled)) $title = $langs->trans("Services"); - print_titre($title); + print load_fiche_titre($title); /* * Invoice lines @@ -456,7 +456,7 @@ else else if (empty($conf->product->enabled)) $title = $langs->trans("Services"); - print_titre($title); + print load_fiche_titre($title); print '
'; print ''; diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php index b295e72f19e..b0c28efe4c0 100644 --- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php @@ -30,7 +30,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; $langs->load("bills"); echo '
'; -print_titre($langs->trans("RelatedCustomerInvoices")); +print load_fiche_titre($langs->trans("RelatedCustomerInvoices")); ?>
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php index 1e8570d7378..b50e1904929 100644 --- a/htdocs/compta/localtax/index.php +++ b/htdocs/compta/localtax/index.php @@ -130,10 +130,10 @@ print '
'; print '
'; print ''; print '
'; -print_titre($langs->transcountry($LTSummary,$mysoc->country_code)); +print load_fiche_titre($langs->transcountry($LTSummary,$mysoc->country_code)); print ' '; -print_titre($langs->transcountry($LTPaid,$mysoc->country_code)); +print load_fiche_titre($langs->transcountry($LTPaid,$mysoc->country_code)); print '
'; diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php index c3667f8b69f..4d81b164e60 100644 --- a/htdocs/compta/prelevement/stats.php +++ b/htdocs/compta/prelevement/stats.php @@ -73,7 +73,7 @@ if ($resql) */ print '
'; -print_titre($langs->trans("WithdrawStatistics")); +print load_fiche_titre($langs->trans("WithdrawStatistics")); $ligne=new LignePrelevement($db,$user); @@ -143,7 +143,7 @@ else * */ print '
'; -print_titre($langs->trans("WithdrawRejectStatistics")); +print load_fiche_titre($langs->trans("WithdrawRejectStatistics")); // Define total and nbtotal diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 0625dd4978d..b2a2d6b2638 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -227,7 +227,7 @@ $vatsup=$langs->trans("VATPaid"); // VAT Received //print "
"; -//print_titre($vatcust); +//print load_fiche_titre($vatcust); print ""; print ""; @@ -306,7 +306,7 @@ if (is_array($coll_list)) { // VAT Paid //print "
"; -//print_titre($vatsup); +//print load_fiche_titre($vatsup); //print "
"; print ""; diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index c84c7d2b633..26e66d66fbe 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -124,12 +124,12 @@ print '
'; print '
'; print ''; print '
'; -print_titre($langs->trans("VATSummary")); +print load_fiche_titre($langs->trans("VATSummary")); // The report mode is the one defined by defaut in tax module setup //print $modetax; //print '('.$langs->trans("SeeVATReportInInputOutputMode",'','').')'; print ''; -print_titre($langs->trans("VATPaid")); +print load_fiche_titre($langs->trans("VATPaid")); print '
'; diff --git a/htdocs/compta/ventilation/fournisseur/card.php b/htdocs/compta/ventilation/fournisseur/card.php index d62694512fc..9c69b613697 100644 --- a/htdocs/compta/ventilation/fournisseur/card.php +++ b/htdocs/compta/ventilation/fournisseur/card.php @@ -101,7 +101,7 @@ if($_GET["id"]) } - print_titre("Ventilation"); + print load_fiche_titre("Ventilation"); print ''; print ''; diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php index 187dea70def..9a8fde8e14f 100644 --- a/htdocs/contact/ldap.php +++ b/htdocs/contact/ldap.php @@ -156,7 +156,7 @@ if (! empty($conf->global->LDAP_CONTACT_ACTIVE) && $conf->global->LDAP_CONTACT_A // Affichage attributs LDAP -print_titre($langs->trans("LDAPInformationsForThisContact")); +print load_fiche_titre($langs->trans("LDAPInformationsForThisContact")); print '
Facture
'; diff --git a/htdocs/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php index 29e060551de..28b00b3464f 100644 --- a/htdocs/contrat/admin/contract_extrafields.php +++ b/htdocs/contrat/admin/contract_extrafields.php @@ -97,7 +97,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -110,7 +110,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/contrat/admin/contractdet_extrafields.php b/htdocs/contrat/admin/contractdet_extrafields.php index 283a400bc80..d34af10ea65 100644 --- a/htdocs/contrat/admin/contractdet_extrafields.php +++ b/htdocs/contrat/admin/contractdet_extrafields.php @@ -97,7 +97,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -110,7 +110,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php index 4daf5deef02..412d07cb726 100644 --- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php +++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php @@ -26,7 +26,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; $langs->load("contracts"); echo '
'; -print_titre($langs->trans('RelatedContracts')); +print load_fiche_titre($langs->trans('RelatedContracts')); ?>
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 59a418d73a2..69a21cc9be5 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -790,7 +790,7 @@ class FormFile $param = (isset($object->id)?'&id='.$object->id:'').$param; // Show list of existing files - if (empty($useinecm)) print_titre($title?$title:$langs->trans("AttachedFiles")); + if (empty($useinecm)) print load_fiche_titre($title?$title:$langs->trans("AttachedFiles")); if (empty($url)) $url=$_SERVER["PHP_SELF"]; print '
'; print ''; @@ -951,7 +951,7 @@ class FormFile dol_syslog(get_class($this).'::list_of_autoecmfiles upload_dir='.$upload_dir.' modulepart='.$modulepart); // Show list of documents - if (empty($useinecm)) print_titre($langs->trans("AttachedFiles")); + if (empty($useinecm)) print load_fiche_titre($langs->trans("AttachedFiles")); if (empty($url)) $url=$_SERVER["PHP_SELF"]; print '
'; print ''; @@ -1192,7 +1192,7 @@ class FormFile $param .= (isset($object->id)?'&id=' . $object->id : ''); // Show list of associated links - print_titre($langs->trans("LinkedFiles")); + print load_fiche_titre($langs->trans("LinkedFiles")); print ''; diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index c979f734b5e..2c60fe83002 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -1394,7 +1394,7 @@ function show_subsidiaries($conf,$langs,$db,$object) { $socstatic = new Societe($db); - print_titre($langs->trans("Subsidiaries")); + print load_fiche_titre($langs->trans("Subsidiaries")); print "\n".'
'."\n"; print ''; diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php index 1c0c589870e..50e3b1e97be 100644 --- a/htdocs/core/lib/sendings.lib.php +++ b/htdocs/core/lib/sendings.lib.php @@ -184,8 +184,8 @@ function show_list_sending_receive($origin,$origin_id,$filter='') if ($num) { - if ($filter) print_titre($langs->trans("OtherSendingsForSameOrder")); - else print_titre($langs->trans("SendingsAndReceivingForSameOrder")); + if ($filter) print load_fiche_titre($langs->trans("OtherSendingsForSameOrder")); + else print load_fiche_titre($langs->trans("SendingsAndReceivingForSameOrder")); print '
'.$langs->trans("Company").'
'; print ''; diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php index 0385977c7dc..6af6d3289e6 100644 --- a/htdocs/don/admin/donation.php +++ b/htdocs/don/admin/donation.php @@ -208,7 +208,7 @@ dol_fiche_head($head, 'general', $langs->trans("Donations"), 0, 'payment'); /* * Params */ -print_titre($langs->trans("Options")); +print load_fiche_titre($langs->trans("Options")); print '
'; print ''; @@ -255,7 +255,7 @@ print ''; if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY)) { print '
'; - print_titre($langs->trans("FrenchOptions")); + print load_fiche_titre($langs->trans("FrenchOptions")); print '
'; print ''; @@ -308,7 +308,7 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY)) // Document templates print '
'; -print_titre($langs->trans("DonationsModels")); +print load_fiche_titre($langs->trans("DonationsModels")); // Defini tableau def de modele $type='donation'; diff --git a/htdocs/don/admin/donation_extrafields.php b/htdocs/don/admin/donation_extrafields.php index 6acb7e5d90e..71082ca6e6b 100644 --- a/htdocs/don/admin/donation_extrafields.php +++ b/htdocs/don/admin/donation_extrafields.php @@ -92,7 +92,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -105,7 +105,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index 07b7cd70a13..82bf1d01e6a 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -656,7 +656,7 @@ if ($id > 0 || ! empty($ref)) { if ($user->rights->expedition->creer) { - print_titre($langs->trans("NewSending")); + print load_fiche_titre($langs->trans("NewSending")); print ''; print ''; diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php index d4a9d1f9af2..4f420957660 100644 --- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php +++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php @@ -29,7 +29,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; $langs->load("sendings"); echo '
'; -print_titre($langs->trans('RelatedShippings')); +print load_fiche_titre($langs->trans('RelatedShippings')); ?>
diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php index e14726e2f5f..b684bf7a665 100644 --- a/htdocs/fichinter/admin/fichinter_extrafields.php +++ b/htdocs/fichinter/admin/fichinter_extrafields.php @@ -96,7 +96,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -109,7 +109,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/fichinter/admin/fichinterdet_extrafields.php b/htdocs/fichinter/admin/fichinterdet_extrafields.php index 281b92750e8..c89f2294eb6 100644 --- a/htdocs/fichinter/admin/fichinterdet_extrafields.php +++ b/htdocs/fichinter/admin/fichinterdet_extrafields.php @@ -97,7 +97,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -110,7 +110,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php index 0d4d3421538..89efad03841 100644 --- a/htdocs/fichinter/apercu.php +++ b/htdocs/fichinter/apercu.php @@ -101,7 +101,7 @@ if ($id > 0 || ! empty($ref)) if (file_exists($file)) { $encfile = urlencode($file); - print_titre($langs->trans("Documents")); + print load_fiche_titre($langs->trans("Documents")); print '
'; print ""; diff --git a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php index 81a82f06627..0dc4a66c083 100644 --- a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php @@ -26,7 +26,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; $langs->load("interventions"); echo '
'; -print_titre($langs->trans('RelatedInterventions')); +print load_fiche_titre($langs->trans('RelatedInterventions')); ?>
".$langs->trans("Intervention")." PDF
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index fd992dbeeb1..57ee36eb8a3 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -613,7 +613,7 @@ if ($id > 0 || ! empty($ref)) { print "
\n"; - print_titre($langs->trans("ReceivingForSameOrder")); + print load_fiche_titre($langs->trans("ReceivingForSameOrder")); print '
'; diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php index cfcb5567bb6..c72386e3728 100644 --- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php @@ -29,7 +29,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; $langs->load("orders"); echo '
'; -print_titre($langs->trans('RelatedSupplierOrders')); +print load_fiche_titre($langs->trans('RelatedSupplierOrders')); ?>
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 332c9b01621..6bd70261a09 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -1590,7 +1590,7 @@ if ($action == 'create') print '
'; $title=$langs->trans('ProductsAndServices'); - print_titre($title); + print load_fiche_titre($title); print '
'; diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php index 8678d22384b..29357b49dc3 100644 --- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php @@ -30,7 +30,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; $langs->load("bills"); echo '
'; -print_titre($langs->trans("RelatedSupplierInvoices")); +print load_fiche_titre($langs->trans("RelatedSupplierInvoices")); ?>
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index 949d180a5ba..9c9d52d610e 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -237,7 +237,7 @@ $form=new Form($db); */ $dirproduct=array('/core/modules/product/'); -print_titre($langs->trans("ProductCodeChecker")); +print load_fiche_titre($langs->trans("ProductCodeChecker")); print '
'."\n"; print ''."\n"; @@ -319,7 +319,7 @@ print '
'; print "
"; -print_titre($langs->trans("ProductOtherConf")); +print load_fiche_titre($langs->trans("ProductOtherConf")); diff --git a/htdocs/product/admin/product_extrafields.php b/htdocs/product/admin/product_extrafields.php index f610b51fe81..c4ae01708cc 100644 --- a/htdocs/product/admin/product_extrafields.php +++ b/htdocs/product/admin/product_extrafields.php @@ -108,7 +108,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -121,7 +121,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 26a2aef8e12..fda21a08084 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -358,7 +358,7 @@ if ($resql) /* if ($action == "correction") { - print_titre($langs->trans("StockCorrection")); + print load_fiche_titre($langs->trans("StockCorrection")); print ''."\n"; print ''; print ''; @@ -399,7 +399,7 @@ if ($resql) if ($action == "transfert") { - print_titre($langs->trans("Transfer")); + print load_fiche_titre($langs->trans("Transfer")); print ''."\n"; print ''; print ''; diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index eb010407ca3..1d92a9994b1 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -617,7 +617,7 @@ if ($id > 0 || $ref) /* if ($_GET["action"] == "definir") { - print_titre($langs->trans("SetStock")); + print load_fiche_titre($langs->trans("SetStock")); print "id\" method=\"post\">\n"; print ''; print ''; diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php index 2b9097b8355..1b6e098fa4d 100644 --- a/htdocs/projet/admin/project.php +++ b/htdocs/projet/admin/project.php @@ -373,7 +373,7 @@ print '
'; * Projects Numbering model */ -print_titre($langs->trans("ProjectsNumberingModules")); +print load_fiche_titre($langs->trans("ProjectsNumberingModules")); print ''; print ''; @@ -477,7 +477,7 @@ print '

'; if (empty($conf->global->PROJECT_HIDE_TASKS)) { // Task numbering module - print_titre($langs->trans("TasksNumberingModules")); + print load_fiche_titre($langs->trans("TasksNumberingModules")); print ''; print ''; @@ -583,7 +583,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) * Document templates generators */ -print_titre($langs->trans("ProjectsModelModule")); +print load_fiche_titre($langs->trans("ProjectsModelModule")); // Defini tableau def de modele $type='project'; @@ -742,7 +742,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) * Modeles documents for Task */ - print_titre($langs->trans("TaskModelModule")); + print load_fiche_titre($langs->trans("TaskModelModule")); // Defini tableau def de modele $type='project_task'; @@ -894,7 +894,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) } -print_titre($langs->trans("Other")); +print load_fiche_titre($langs->trans("Other")); // Other options $form=new Form($db); diff --git a/htdocs/projet/admin/project_extrafields.php b/htdocs/projet/admin/project_extrafields.php index 7a18dc9230f..399b1f53b99 100644 --- a/htdocs/projet/admin/project_extrafields.php +++ b/htdocs/projet/admin/project_extrafields.php @@ -95,7 +95,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -108,7 +108,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/projet/admin/project_task_extrafields.php b/htdocs/projet/admin/project_task_extrafields.php index b64bcabab89..412aad16ca0 100644 --- a/htdocs/projet/admin/project_task_extrafields.php +++ b/htdocs/projet/admin/project_task_extrafields.php @@ -94,7 +94,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -107,7 +107,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index 2856fcb93a3..8b6aad16739 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -367,7 +367,7 @@ $extrafields->fetch_name_optionals_label('adherent'); // fetch optionals attr llxHeaderVierge($langs->trans("NewSubscription")); -print_titre($langs->trans("NewSubscription")); +print load_fiche_titre($langs->trans("NewSubscription")); if (! empty($conf->global->MEMBER_NEWFORM_TEXT)) print $langs->trans($conf->global->MEMBER_NEWFORM_TEXT)."
\n"; else print $langs->trans("NewSubscriptionDesc",$conf->global->MAIN_INFO_SOCIETE_MAIL)."
\n"; diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php index 782b117d1f8..1bda4696a39 100644 --- a/htdocs/resource/element_resource.php +++ b/htdocs/resource/element_resource.php @@ -277,7 +277,7 @@ else if ($mode != 'add' || $resource_obj != $resource_type) { - //print_titre($langs->trans(ucfirst($element_prop['element']).'Singular')); + //print load_fiche_titre($langs->trans(ucfirst($element_prop['element']).'Singular')); // If we have a specific template we use it if(file_exists(dol_buildpath($path.'/core/tpl/resource_'.$element_prop['element'].'_view.tpl.php'))) diff --git a/htdocs/societe/admin/contact_extrafields.php b/htdocs/societe/admin/contact_extrafields.php index 3b11a6985d3..634b3ad83d0 100644 --- a/htdocs/societe/admin/contact_extrafields.php +++ b/htdocs/societe/admin/contact_extrafields.php @@ -95,7 +95,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -108,7 +108,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index 5001ab04cf4..f8580c1e171 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -299,7 +299,7 @@ $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['so // Module to manage customer/supplier code -print_titre($langs->trans("CompanyCodeChecker")); +print load_fiche_titre($langs->trans("CompanyCodeChecker")); print '
'."\n"; print ''."\n"; @@ -381,7 +381,7 @@ print "
"; // Select accountancy code numbering module -print_titre($langs->trans("AccountCodeManager")); +print load_fiche_titre($langs->trans("AccountCodeManager")); print '
'; print ''; @@ -452,7 +452,7 @@ print "
\n"; * Document templates generators */ print '
'; -print_titre($langs->trans("ModelModules")); +print load_fiche_titre($langs->trans("ModelModules")); // Load array def with activated templates $def = array(); @@ -598,7 +598,7 @@ print '
'; print '
'; //IDProf -print_titre($langs->trans("CompanyIdProfChecker")); +print load_fiche_titre($langs->trans("CompanyIdProfChecker")); print ''; print ''; @@ -691,7 +691,7 @@ while ($i < $nbofloop) print "

\n"; -print_titre($langs->trans("Other")); +print load_fiche_titre($langs->trans("Other")); // Autres options $form=new Form($db); diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php index ade27c4aefa..04c0155634b 100644 --- a/htdocs/societe/admin/societe_extrafields.php +++ b/htdocs/societe/admin/societe_extrafields.php @@ -96,7 +96,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -109,7 +109,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php index 498257ea496..05679cef5bb 100644 --- a/htdocs/societe/commerciaux.php +++ b/htdocs/societe/commerciaux.php @@ -234,7 +234,7 @@ if ($_GET["socid"]) $num = $db->num_rows($resql); $i = 0; - print_titre($title); + print load_fiche_titre($title); // Lignes des titres print ''; diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 57ca545a053..ee4259f2e81 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -237,7 +237,7 @@ if ($socid && $action != 'edit' && $action != "create") print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$soc->id."&ribid=".($ribid?$ribid:$id), $langs->trans("DeleteARib"), $langs->trans("ConfirmDeleteRib", $account->getRibLabel()), "confirm_delete", '', 0, 1); } - print_titre($langs->trans("DefaultRIB")); + print load_fiche_titre($langs->trans("DefaultRIB")); print '
'; @@ -357,7 +357,7 @@ if ($socid && $action != 'edit' && $action != "create") * List of bank accounts */ - print_titre($langs->trans("AllRIB")); + print load_fiche_titre($langs->trans("AllRIB")); $rib_list = $soc->get_all_rib(); $var = false; diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 637110d4a88..a35b23fb566 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -2409,7 +2409,7 @@ else $modelmail='thirdparty'; print '
'; - print_titre($langs->trans($titreform)); + print load_fiche_titre($langs->trans($titreform)); // Define output language $outputlangs = $langs; diff --git a/htdocs/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php index a4c417fe996..d020f1afe1f 100644 --- a/htdocs/user/admin/group_extrafields.php +++ b/htdocs/user/admin/group_extrafields.php @@ -96,7 +96,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -109,7 +109,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php index 3ab04f6ef89..b071887a0a2 100644 --- a/htdocs/user/admin/user_extrafields.php +++ b/htdocs/user/admin/user_extrafields.php @@ -95,7 +95,7 @@ if ($action != 'create' && $action != 'edit') if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; } @@ -108,7 +108,7 @@ if ($action == 'create') if ($action == 'edit' && ! empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php index f53775b9b3e..ed7122fe164 100644 --- a/htdocs/user/group/ldap.php +++ b/htdocs/user/group/ldap.php @@ -155,7 +155,7 @@ if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap') print "
\n"; // Affichage attributs LDAP -print_titre($langs->trans("LDAPInformationsForThisGroup")); +print load_fiche_titre($langs->trans("LDAPInformationsForThisGroup")); print '
'; diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php index 2d1ac2f7464..0ee41812c29 100644 --- a/htdocs/user/ldap.php +++ b/htdocs/user/ldap.php @@ -168,7 +168,7 @@ if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap') print "
\n"; // Affichage attributs LDAP -print_titre($langs->trans("LDAPInformationsForThisUser")); +print load_fiche_titre($langs->trans("LDAPInformationsForThisUser")); print '
'; From 631ee837457b624ae708ee3e6414ef510918f214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 24 Sep 2015 18:33:48 +0200 Subject: [PATCH 08/19] [Qual] Replaced deprecated print_fiche_titre() --- dev/skeletons/skeleton_page.php | 2 +- htdocs/accountancy/admin/card.php | 2 +- htdocs/accountancy/admin/export.php | 2 +- htdocs/accountancy/admin/fiscalyear.php | 2 +- htdocs/accountancy/admin/fiscalyear_card.php | 2 +- htdocs/accountancy/admin/index.php | 2 +- htdocs/accountancy/admin/journal.php | 2 +- htdocs/accountancy/bookkeeping/balancebymonth.php | 2 +- htdocs/accountancy/bookkeeping/card.php | 8 ++++---- htdocs/accountancy/customer/card.php | 2 +- htdocs/accountancy/customer/index.php | 2 +- htdocs/accountancy/supplier/card.php | 2 +- htdocs/accountancy/supplier/index.php | 2 +- htdocs/adherents/admin/adherent.php | 10 +++++----- htdocs/adherents/admin/adherent_extrafields.php | 2 +- .../adherents/admin/adherent_type_extrafields.php | 2 +- htdocs/adherents/admin/public.php | 2 +- .../canvas/default/tpl/adherentcard_create.tpl.php | 2 +- .../canvas/default/tpl/adherentcard_edit.tpl.php | 2 +- htdocs/adherents/card.php | 2 +- htdocs/adherents/card_subscriptions.php | 2 +- htdocs/adherents/cartes/carte.php | 2 +- htdocs/adherents/index.php | 2 +- htdocs/adherents/stats/byproperties.php | 4 ++-- htdocs/adherents/stats/geo.php | 2 +- htdocs/adherents/stats/index.php | 2 +- htdocs/adherents/type.php | 4 ++-- 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_xcal.php | 2 +- htdocs/admin/askpricesupplier.php | 2 +- htdocs/admin/bank.php | 2 +- htdocs/admin/bank_extrafields.php | 2 +- htdocs/admin/barcode.php | 2 +- htdocs/admin/boxes.php | 2 +- htdocs/admin/clicktodial.php | 2 +- htdocs/admin/commande.php | 2 +- htdocs/admin/company.php | 2 +- htdocs/admin/compta.php | 2 +- htdocs/admin/confexped.php | 2 +- htdocs/admin/const.php | 2 +- htdocs/admin/contract.php | 2 +- htdocs/admin/delais.php | 2 +- htdocs/admin/dict.php | 2 +- htdocs/admin/ecm.php | 2 +- htdocs/admin/events.php | 2 +- htdocs/admin/expedition.php | 2 +- htdocs/admin/expensereport.php | 2 +- htdocs/admin/external_rss.php | 2 +- htdocs/admin/facture.php | 2 +- htdocs/admin/fckeditor.php | 4 ++-- htdocs/admin/fichinter.php | 2 +- htdocs/admin/geoipmaxmind.php | 2 +- htdocs/admin/ihm.php | 4 ++-- htdocs/admin/index.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_users.php | 2 +- htdocs/admin/limits.php | 2 +- htdocs/admin/livraison.php | 2 +- htdocs/admin/loan.php | 2 +- htdocs/admin/mailing.php | 2 +- htdocs/admin/mailman.php | 6 +++--- htdocs/admin/mails.php | 2 +- 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/notification.php | 6 +++--- htdocs/admin/order_extrafields.php | 2 +- htdocs/admin/orderdet_extrafields.php | 2 +- htdocs/admin/pdf.php | 14 +++++++------- htdocs/admin/perms.php | 2 +- htdocs/admin/prelevement.php | 2 +- htdocs/admin/propal.php | 2 +- htdocs/admin/proxy.php | 2 +- htdocs/admin/salaries.php | 2 +- htdocs/admin/security.php | 2 +- htdocs/admin/security_file.php | 2 +- htdocs/admin/security_other.php | 2 +- htdocs/admin/sms.php | 2 +- htdocs/admin/spip.php | 6 +++--- htdocs/admin/stock.php | 2 +- htdocs/admin/supplier_invoice.php | 2 +- htdocs/admin/supplier_order.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/syslog.php | 2 +- htdocs/admin/system/about.php | 2 +- htdocs/admin/system/browser.php | 2 +- htdocs/admin/system/constall.php | 2 +- htdocs/admin/system/database-tables.php | 2 +- htdocs/admin/system/database.php | 2 +- htdocs/admin/system/dbtable.php | 2 +- htdocs/admin/system/dolibarr.php | 2 +- htdocs/admin/system/filecheck.php | 2 +- htdocs/admin/system/index.php | 2 +- htdocs/admin/system/modules.php | 2 +- htdocs/admin/system/os.php | 2 +- htdocs/admin/system/perf.php | 2 +- htdocs/admin/system/phpinfo.php | 2 +- htdocs/admin/system/web.php | 2 +- htdocs/admin/system/xcache.php | 2 +- htdocs/admin/system/xdebug.php | 2 +- htdocs/admin/taxes.php | 4 ++-- htdocs/admin/tools/dolibarr_export.php | 2 +- htdocs/admin/tools/dolibarr_import.php | 2 +- htdocs/admin/tools/eaccelerator.php | 2 +- htdocs/admin/tools/export.php | 2 +- htdocs/admin/tools/index.php | 2 +- htdocs/admin/tools/purge.php | 2 +- htdocs/admin/tools/update.php | 2 +- htdocs/admin/translation.php | 2 +- htdocs/admin/triggers.php | 2 +- htdocs/admin/user.php | 2 +- htdocs/admin/workflow.php | 2 +- htdocs/api/admin/api.php | 2 +- htdocs/barcode/codeinit.php | 6 +++--- htdocs/barcode/printsheet.php | 2 +- htdocs/bookmarks/admin/bookmark.php | 2 +- htdocs/bookmarks/card.php | 2 +- htdocs/bookmarks/list.php | 2 +- htdocs/cashdesk/admin/cashdesk.php | 2 +- htdocs/categories/admin/categorie.php | 2 +- htdocs/categories/admin/categorie_extrafields.php | 2 +- htdocs/categories/card.php | 2 +- htdocs/categories/categorie.php | 2 +- htdocs/categories/edit.php | 2 +- htdocs/categories/index.php | 2 +- htdocs/comm/action/card.php | 4 ++-- htdocs/comm/action/index.php | 2 +- htdocs/comm/action/peruser.php | 2 +- htdocs/comm/address.php | 2 +- htdocs/comm/admin/askpricesupplier_extrafields.php | 2 +- .../comm/admin/askpricesupplierdet_extrafields.php | 2 +- htdocs/comm/admin/propal_extrafields.php | 2 +- htdocs/comm/admin/propaldet_extrafields.php | 2 +- htdocs/comm/askpricesupplier/card.php | 4 ++-- htdocs/comm/askpricesupplier/index.php | 2 +- htdocs/comm/index.php | 2 +- htdocs/comm/mailing/card.php | 6 +++--- htdocs/comm/mailing/cibles.php | 2 +- htdocs/comm/mailing/index.php | 2 +- htdocs/comm/propal.php | 4 ++-- htdocs/comm/propal/index.php | 2 +- htdocs/comm/propal/stats/index.php | 2 +- htdocs/comm/prospect/index.php | 2 +- htdocs/comm/remise.php | 2 +- htdocs/comm/remx.php | 2 +- htdocs/commande/card.php | 4 ++-- htdocs/commande/index.php | 2 +- htdocs/commande/orderstoinvoice.php | 4 ++-- htdocs/commande/stats/index.php | 2 +- htdocs/compta/bank/account.php | 2 +- htdocs/compta/bank/budget.php | 2 +- htdocs/compta/bank/card.php | 4 ++-- htdocs/compta/bank/categ.php | 2 +- htdocs/compta/bank/index.php | 2 +- htdocs/compta/bank/ligne.php | 2 +- htdocs/compta/bank/rappro.php | 2 +- htdocs/compta/bank/releve.php | 2 +- htdocs/compta/bank/virement.php | 2 +- htdocs/compta/charges/index.php | 10 +++++----- htdocs/compta/deplacement/card.php | 2 +- htdocs/compta/deplacement/index.php | 2 +- htdocs/compta/deplacement/stats/index.php | 2 +- htdocs/compta/facture.php | 4 ++-- .../facture/admin/facture_cust_extrafields.php | 2 +- .../facture/admin/facturedet_cust_extrafields.php | 2 +- htdocs/compta/facture/fiche-rec.php | 2 +- htdocs/compta/facture/mergepdftool.php | 2 +- htdocs/compta/facture/stats/index.php | 2 +- htdocs/compta/hrm.php | 2 +- htdocs/compta/index.php | 2 +- htdocs/compta/localtax/card.php | 2 +- htdocs/compta/localtax/index.php | 2 +- htdocs/compta/localtax/quadri_detail.php | 2 +- htdocs/compta/localtax/reglement.php | 2 +- htdocs/compta/paiement.php | 2 +- htdocs/compta/paiement/cheque/card.php | 2 +- htdocs/compta/paiement/cheque/index.php | 2 +- htdocs/compta/paiement/index.php | 2 +- htdocs/compta/paiement/rapport.php | 2 +- htdocs/compta/paiement_charge.php | 2 +- htdocs/compta/prelevement/create.php | 6 +++--- htdocs/compta/prelevement/fiche-stat.php | 2 +- htdocs/compta/prelevement/index.php | 2 +- htdocs/compta/prelevement/stats.php | 2 +- htdocs/compta/recap-compta.php | 2 +- htdocs/compta/salaries/card.php | 2 +- htdocs/compta/sociales/charges.php | 2 +- htdocs/compta/sociales/index.php | 2 +- htdocs/compta/tva/card.php | 2 +- htdocs/compta/tva/index.php | 2 +- htdocs/compta/tva/quadri.php | 4 ++-- htdocs/compta/tva/quadri_detail.php | 2 +- htdocs/compta/tva/quarter_report.php | 2 +- htdocs/compta/ventilation/card.php | 2 +- .../canvas/default/tpl/contactcard_create.tpl.php | 2 +- .../canvas/default/tpl/contactcard_edit.tpl.php | 2 +- htdocs/contact/card.php | 4 ++-- htdocs/contrat/admin/contract_extrafields.php | 2 +- htdocs/contrat/admin/contractdet_extrafields.php | 2 +- htdocs/contrat/card.php | 2 +- htdocs/contrat/index.php | 2 +- htdocs/core/lib/company.lib.php | 6 +++--- htdocs/core/lib/functions.lib.php | 2 +- htdocs/core/photos_resize.php | 2 +- htdocs/core/tools.php | 2 +- htdocs/cron/admin/cron.php | 2 +- htdocs/cron/card.php | 2 +- htdocs/cron/list.php | 2 +- htdocs/don/admin/donation.php | 2 +- htdocs/don/admin/donation_extrafields.php | 2 +- htdocs/don/card.php | 2 +- htdocs/don/index.php | 2 +- htdocs/don/payment/payment.php | 2 +- htdocs/don/stats/index.php | 2 +- htdocs/ecm/docdir.php | 4 ++-- htdocs/ecm/docother.php | 2 +- htdocs/ecm/index.php | 2 +- htdocs/ecm/index_auto.php | 2 +- htdocs/ecm/search.php | 6 +++--- htdocs/expedition/card.php | 6 +++--- htdocs/expedition/index.php | 2 +- htdocs/expedition/stats/index.php | 2 +- htdocs/expedition/stats/month.php | 2 +- htdocs/expensereport/card.php | 6 +++--- htdocs/expensereport/export_csv.php | 2 +- htdocs/expensereport/index.php | 2 +- htdocs/expensereport/payment/payment.php | 2 +- htdocs/expensereport/stats/index.php | 2 +- htdocs/expensereport/synchro_compta.php | 2 +- htdocs/exports/index.php | 2 +- htdocs/externalsite/admin/externalsite.php | 2 +- htdocs/fichinter/admin/fichinter_extrafields.php | 2 +- .../fichinter/admin/fichinterdet_extrafields.php | 2 +- htdocs/fichinter/card.php | 4 ++-- htdocs/fichinter/index.php | 2 +- htdocs/fourn/commande/card.php | 8 ++++---- htdocs/fourn/commande/index.php | 2 +- htdocs/fourn/commande/orderstoinvoice.php | 4 ++-- htdocs/fourn/facture/card.php | 4 ++-- htdocs/fourn/facture/impayees.php | 2 +- htdocs/fourn/facture/paiement.php | 2 +- htdocs/fourn/index.php | 2 +- htdocs/fourn/recap-fourn.php | 2 +- htdocs/ftp/admin/ftpclient.php | 2 +- htdocs/ftp/index.php | 2 +- htdocs/holiday/card.php | 4 ++-- htdocs/holiday/define_holiday.php | 4 ++-- htdocs/holiday/list.php | 2 +- htdocs/holiday/month_report.php | 2 +- htdocs/imports/index.php | 2 +- htdocs/index.php | 2 +- htdocs/livraison/card.php | 2 +- htdocs/loan/calc.php | 2 +- htdocs/loan/card.php | 2 +- htdocs/loan/index.php | 2 +- htdocs/loan/payment/payment.php | 2 +- htdocs/margin/admin/margin.php | 4 ++-- htdocs/margin/agentMargins.php | 2 +- htdocs/margin/customerMargins.php | 2 +- htdocs/margin/productMargins.php | 2 +- htdocs/opensurvey/card.php | 2 +- htdocs/opensurvey/index.php | 2 +- htdocs/opensurvey/list.php | 2 +- htdocs/opensurvey/wizard/choix_autre.php | 2 +- htdocs/opensurvey/wizard/choix_date.php | 2 +- htdocs/opensurvey/wizard/create_survey.php | 2 +- htdocs/opensurvey/wizard/index.php | 2 +- htdocs/paybox/admin/paybox.php | 2 +- htdocs/paypal/admin/paypal.php | 2 +- htdocs/printing/admin/printing.php | 2 +- htdocs/printing/index.php | 2 +- htdocs/product/admin/dynamic_prices.php | 2 +- htdocs/product/admin/product.php | 2 +- htdocs/product/admin/product_extrafields.php | 2 +- htdocs/product/admin/product_tools.php | 2 +- .../product/canvas/product/tpl/card_create.tpl.php | 2 +- .../product/canvas/product/tpl/card_edit.tpl.php | 2 +- .../product/canvas/service/tpl/card_create.tpl.php | 2 +- .../product/canvas/service/tpl/card_edit.tpl.php | 2 +- htdocs/product/card.php | 4 ++-- htdocs/product/composition/card.php | 6 +++--- htdocs/product/dynamic_price/editor.php | 2 +- htdocs/product/fournisseurs.php | 4 ++-- htdocs/product/index.php | 2 +- htdocs/product/popuprop.php | 2 +- htdocs/product/price.php | 8 ++++---- htdocs/product/stock/card.php | 2 +- htdocs/product/stock/index.php | 2 +- htdocs/product/stock/massstockmove.php | 2 +- htdocs/projet/activity/index.php | 4 ++-- 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 | 2 +- htdocs/projet/element.php | 2 +- htdocs/projet/index.php | 2 +- htdocs/projet/stats/index.php | 2 +- htdocs/projet/tasks.php | 2 +- htdocs/public/members/public_card.php | 2 +- htdocs/resource/add.php | 2 +- htdocs/resource/element_resource.php | 2 +- htdocs/resource/list.php | 2 +- htdocs/societe/admin/contact_extrafields.php | 2 +- htdocs/societe/admin/societe.php | 2 +- htdocs/societe/admin/societe_extrafields.php | 2 +- htdocs/societe/checkvat/checkVatPopup.php | 2 +- htdocs/societe/index.php | 2 +- htdocs/societe/notify/card.php | 6 +++--- htdocs/societe/price.php | 4 ++-- htdocs/societe/soc.php | 4 ++-- htdocs/user/admin/group_extrafields.php | 2 +- htdocs/user/admin/user_extrafields.php | 2 +- htdocs/user/card.php | 4 ++-- htdocs/user/group/card.php | 4 ++-- htdocs/user/group/index.php | 2 +- htdocs/user/hierarchy.php | 2 +- htdocs/user/home.php | 2 +- htdocs/user/index.php | 2 +- htdocs/webservices/admin/webservices.php | 2 +- 329 files changed, 405 insertions(+), 405 deletions(-) diff --git a/dev/skeletons/skeleton_page.php b/dev/skeletons/skeleton_page.php index 2dd9f08e18f..0eb3b01589c 100644 --- a/dev/skeletons/skeleton_page.php +++ b/dev/skeletons/skeleton_page.php @@ -351,7 +351,7 @@ if ($action == 'list' || (empty($id) && $action != 'create')) // Part to create if ($action == 'create') { - print_fiche_titre($langs->trans("NewSkeleton")); + print load_fiche_titre($langs->trans("NewSkeleton")); print ''; print ''; diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php index 51c6a5c6715..925bf818137 100644 --- a/htdocs/accountancy/admin/card.php +++ b/htdocs/accountancy/admin/card.php @@ -139,7 +139,7 @@ $htmlacc = new FormVentilation($db); if ($action == 'create') { - print_fiche_titre($langs->trans('NewAccount')); + print load_fiche_titre($langs->trans('NewAccount')); print '' . "\n"; print ''; diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php index 6ba6c05208a..9bde2d23c14 100644 --- a/htdocs/accountancy/admin/export.php +++ b/htdocs/accountancy/admin/export.php @@ -115,7 +115,7 @@ llxHeader(); $form = new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup'); +print load_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup'); $head = admin_accounting_prepare_head(); diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php index bd530eaa8d7..31ec91958c9 100644 --- a/htdocs/accountancy/admin/fiscalyear.php +++ b/htdocs/accountancy/admin/fiscalyear.php @@ -63,7 +63,7 @@ $title = $langs->trans('FiscalYears'); llxHeader('',$title,LOG_ERR); -print_fiche_titre($langs->trans('FiscalYears')); +print load_fiche_titre($langs->trans('FiscalYears')); $sql = "SELECT f.rowid, f.label, f.date_start, f.date_end, f.statut, f.entity"; $sql.= " FROM ".MAIN_DB_PREFIX."accounting_fiscalyear as f"; diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php index a1692878c55..0e39776946a 100644 --- a/htdocs/accountancy/admin/fiscalyear_card.php +++ b/htdocs/accountancy/admin/fiscalyear_card.php @@ -170,7 +170,7 @@ $form = new Form($db); */ if ($action == 'create') { - print_fiche_titre($langs->trans("NewFiscalYear")); + print load_fiche_titre($langs->trans("NewFiscalYear")); print ''; print ''; diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php index 44b2268dc06..af0bccdf00c 100644 --- a/htdocs/accountancy/admin/index.php +++ b/htdocs/accountancy/admin/index.php @@ -153,7 +153,7 @@ llxHeader(); $form = new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup'); +print load_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup'); $head = admin_accounting_prepare_head($accounting); diff --git a/htdocs/accountancy/admin/journal.php b/htdocs/accountancy/admin/journal.php index e1d4894788a..b55728ee080 100644 --- a/htdocs/accountancy/admin/journal.php +++ b/htdocs/accountancy/admin/journal.php @@ -83,7 +83,7 @@ llxHeader(); $form = new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup'); +print load_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup'); $head = admin_accounting_prepare_head(null); diff --git a/htdocs/accountancy/bookkeeping/balancebymonth.php b/htdocs/accountancy/bookkeeping/balancebymonth.php index 54c239f2db9..c1902c16fee 100644 --- a/htdocs/accountancy/bookkeeping/balancebymonth.php +++ b/htdocs/accountancy/bookkeeping/balancebymonth.php @@ -56,7 +56,7 @@ llxHeader('', $langs->trans("Bookkeeping")); $textprevyear = '' . img_previous() . ''; $textnextyear = ' ' . img_next() . ''; -print_fiche_titre($langs->trans("AccountBalanceByMonth") . ' ' . $textprevyear . ' ' . $langs->trans("Year") . ' ' . $year_start . ' ' . $textnextyear); +print load_fiche_titre($langs->trans("AccountBalanceByMonth") . ' ' . $textprevyear . ' ' . $langs->trans("Year") . ' ' . $year_start . ' ' . $textnextyear); $sql = "SELECT count(*) FROM " . MAIN_DB_PREFIX . "facturedet as fd"; $sql .= " , " . MAIN_DB_PREFIX . "facture as f"; diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php index 515b9898c23..d1bf69a8eee 100644 --- a/htdocs/accountancy/bookkeeping/card.php +++ b/htdocs/accountancy/bookkeeping/card.php @@ -189,7 +189,7 @@ if ($action == 'delete') { } if ($action == 'create') { - print_fiche_titre($langs->trans("CreateMvts")); + print load_fiche_titre($langs->trans("CreateMvts")); $code_journal_array = array ( $conf->global->ACCOUNTING_SELL_JOURNAL => $conf->global->ACCOUNTING_SELL_JOURNAL, @@ -250,7 +250,7 @@ if ($action == 'create') { } if (! empty($book->piece_num)) { - print_fiche_titre($langs->trans("UpdateMvts")); + print load_fiche_titre($langs->trans("UpdateMvts")); print '
'; print ''; @@ -280,7 +280,7 @@ if ($action == 'create') { setEventMessage($book->errors, 'errors'); } else { - print_fiche_titre($langs->trans("ListeMvts")); + print load_fiche_titre($langs->trans("ListeMvts")); print "
"; if (count($book->linesmvt) > 0) { @@ -367,7 +367,7 @@ if ($action == 'create') { } } else { - print_fiche_titre($langs->trans("NoRecords")); + print load_fiche_titre($langs->trans("NoRecords")); } } diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php index 74083cbb215..09e8b24a8ea 100644 --- a/htdocs/accountancy/customer/card.php +++ b/htdocs/accountancy/customer/card.php @@ -108,7 +108,7 @@ if (! empty($id)) { print ''; print ''; - print_fiche_titre($langs->trans('CustomersVentilation'),'','title_setup'); + print load_fiche_titre($langs->trans('CustomersVentilation'),'','title_setup'); dol_fiche_head(); diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php index e4c6104fd1b..ea37f237455 100644 --- a/htdocs/accountancy/customer/index.php +++ b/htdocs/accountancy/customer/index.php @@ -98,7 +98,7 @@ llxHeader('', $langs->trans("CustomersVentilation")); $textprevyear = '' . img_previous() . ''; $textnextyear = ' ' . img_next() . ''; -print_fiche_titre($langs->trans("CustomersVentilation") . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear); +print load_fiche_titre($langs->trans("CustomersVentilation") . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear); print '' . $langs->trans("DescVentilCustomer") . ''; print '
' . $langs->trans("ValidateHistory") . '
'; diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php index 4ba2666973c..f0747c8d29c 100644 --- a/htdocs/accountancy/supplier/card.php +++ b/htdocs/accountancy/supplier/card.php @@ -107,7 +107,7 @@ if (! empty($id)) { print ''; print ''; - print_fiche_titre($langs->trans('SuppliersVentilation'),'','title_setup'); + print load_fiche_titre($langs->trans('SuppliersVentilation'),'','title_setup'); dol_fiche_head(); diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php index 8eaf6681676..954eb60300c 100644 --- a/htdocs/accountancy/supplier/index.php +++ b/htdocs/accountancy/supplier/index.php @@ -95,7 +95,7 @@ llxHeader('', $langs->trans("SuppliersVentilation")); $textprevyear = '' . img_previous() . ''; $textnextyear = ' ' . img_next() . ''; -print_fiche_titre($langs->trans("SuppliersVentilation") . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear); +print load_fiche_titre($langs->trans("SuppliersVentilation") . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear); print '' . $langs->trans("DescVentilSupplier") . ''; print '
' . $langs->trans("ValidateHistory") . '
'; diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index 877c8d785e8..5827e1d22d7 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -111,14 +111,14 @@ llxHeader('',$langs->trans("MembersSetup"),$help_url); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup'); $head = member_admin_prepare_head(); dol_fiche_head($head, 'general', $langs->trans("Members"), 0, 'user'); -print_fiche_titre($langs->trans("MemberMainOptions"),'',''); +print load_fiche_titre($langs->trans("MemberMainOptions"),'',''); print '
'; print ''; print ''; @@ -245,7 +245,7 @@ $constantes=array( 'ADHERENT_CARD_FOOTER_TEXT' ); -print_fiche_titre($langs->trans("MembersCards"),'',''); +print load_fiche_titre($langs->trans("MembersCards"),'',''); form_constantes($constantes); @@ -263,7 +263,7 @@ print '
'; */ $constantes=array('ADHERENT_ETIQUETTE_TYPE','ADHERENT_ETIQUETTE_TEXT'); -print_fiche_titre($langs->trans("MembersTickets"),'',''); +print load_fiche_titre($langs->trans("MembersTickets"),'',''); form_constantes($constantes); @@ -293,7 +293,7 @@ $constantes=array( 'ADHERENT_MAIL_FROM', ); -print_fiche_titre($langs->trans("Other"),'',''); +print load_fiche_titre($langs->trans("Other"),'',''); form_constantes($constantes); diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php index e5e2f3bc16f..32bf1c87b11 100644 --- a/htdocs/adherents/admin/adherent_extrafields.php +++ b/htdocs/adherents/admin/adherent_extrafields.php @@ -65,7 +65,7 @@ llxHeader('',$langs->trans("MembersSetup"),$help_url); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup'); $head = member_admin_prepare_head(); diff --git a/htdocs/adherents/admin/adherent_type_extrafields.php b/htdocs/adherents/admin/adherent_type_extrafields.php index 5ef21314598..835bd05ea5f 100644 --- a/htdocs/adherents/admin/adherent_type_extrafields.php +++ b/htdocs/adherents/admin/adherent_type_extrafields.php @@ -68,7 +68,7 @@ llxHeader('',$langs->trans("MembersSetup"),$help_url); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup'); $head = member_admin_prepare_head(); diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php index 187f71e93a8..3d88d3bb171 100644 --- a/htdocs/adherents/admin/public.php +++ b/htdocs/adherents/admin/public.php @@ -80,7 +80,7 @@ llxHeader('',$langs->trans("MembersSetup"),$help_url); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup'); $head = member_admin_prepare_head(); diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php index 8c44bc48a3f..23059889571 100644 --- a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php +++ b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php @@ -21,7 +21,7 @@ control->tpl['title']); +print load_fiche_titre($this->control->tpl['title']); dol_htmloutput_errors((is_numeric($object->error)?'':$object->error),$object->errors); diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php index 47c144c238f..1d7f7892276 100644 --- a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php +++ b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php @@ -24,7 +24,7 @@ $contact = $GLOBALS['objcanvas']->control->object; control->tpl['title']); +print load_fiche_titre($this->control->tpl['title']); dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors']); diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index a74e19648ea..b6e61f01e09 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -779,7 +779,7 @@ else $adht = new AdherentType($db); - print_fiche_titre($langs->trans("NewMember")); + print load_fiche_titre($langs->trans("NewMember")); if ($conf->use_javascript_ajax) { diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index 71fd6f3caa1..92af9c5981e 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -827,7 +827,7 @@ if ($rowid > 0) { print '
'; - print_fiche_titre($langs->trans("NewCotisation")); + print load_fiche_titre($langs->trans("NewCotisation")); // Define default choice to select $bankdirect=0; // 1 means option by default is write to bank direct with no invoice diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php index 98f5e908e16..dc1b6563c53 100644 --- a/htdocs/adherents/cartes/carte.php +++ b/htdocs/adherents/cartes/carte.php @@ -219,7 +219,7 @@ $form=new Form($db); llxHeader('',$langs->trans("MembersCards")); -print_fiche_titre($langs->trans("LinkToGeneratedPages")); +print load_fiche_titre($langs->trans("LinkToGeneratedPages")); print '
'; print $langs->trans("LinkToGeneratedPagesDesc").'
'; diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 9f404fe1510..d6c17337176 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -46,7 +46,7 @@ $staticmember=new Adherent($db); $statictype=new AdherentType($db); $subscriptionstatic=new Cotisation($db); -print_fiche_titre($langs->trans("MembersArea")); +print load_fiche_titre($langs->trans("MembersArea")); $var=True; diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php index fdb9153ba88..6f5edf529d9 100644 --- a/htdocs/adherents/stats/byproperties.php +++ b/htdocs/adherents/stats/byproperties.php @@ -58,7 +58,7 @@ llxHeader('','','','',0,0,array('http://www.google.com/jsapi')); $title=$langs->trans("MembersStatisticsByProperties"); -print_fiche_titre($title, $mesg); +print load_fiche_titre($title, $mesg); dol_mkdir($dir); @@ -112,7 +112,7 @@ if (! count($data)) } else { - print_fiche_titre($langs->trans("MembersByNature"),'',''); + print load_fiche_titre($langs->trans("MembersByNature"),'',''); } // Print array diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php index 938e3e172b2..3b2ca4c3ecd 100644 --- a/htdocs/adherents/stats/geo.php +++ b/htdocs/adherents/stats/geo.php @@ -64,7 +64,7 @@ if ($mode == 'memberbytown') $title=$langs->trans("MembersStatisticsByTown"); if ($mode == 'memberbyregion') $title=$langs->trans("MembersStatisticsByRegion"); -print_fiche_titre($title, $mesg); +print load_fiche_titre($title, $mesg); dol_mkdir($dir); diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php index 41305d3949d..a3c8fd69aad 100644 --- a/htdocs/adherents/stats/index.php +++ b/htdocs/adherents/stats/index.php @@ -58,7 +58,7 @@ $form=new Form($db); llxHeader(); -print_fiche_titre($langs->trans("SubscriptionsStatistics"), $mesg); +print load_fiche_titre($langs->trans("SubscriptionsStatistics"), $mesg); $dir=$conf->adherent->dir_temp; diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 6c9423b6178..75102ed9f50 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -166,7 +166,7 @@ $form=new Form($db); if (! $rowid && $action != 'create' && $action != 'edit') { - print_fiche_titre($langs->trans("MembersTypes")); + print load_fiche_titre($langs->trans("MembersTypes")); dol_fiche_head(''); @@ -238,7 +238,7 @@ if ($action == 'create') { $object = new AdherentType($db); - print_fiche_titre($langs->trans("NewMemberType")); + print load_fiche_titre($langs->trans("NewMemberType")); print ''; print ''; diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php index 16608a5fae2..287f2a897eb 100644 --- a/htdocs/admin/agenda.php +++ b/htdocs/admin/agenda.php @@ -133,7 +133,7 @@ if (preg_match('/del_(.*)/',$action,$reg)) llxHeader(); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup'); print "
\n"; diff --git a/htdocs/admin/agenda_extrafields.php b/htdocs/admin/agenda_extrafields.php index 783a12da23d..9007ef5ad91 100644 --- a/htdocs/admin/agenda_extrafields.php +++ b/htdocs/admin/agenda_extrafields.php @@ -70,7 +70,7 @@ $textobject=$langs->transnoentitiesnoconv("Agenda"); llxHeader('',$langs->trans("AgendaSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup'); print "
\n"; $head=agenda_prepare_head(); diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php index 2e113f22430..9356674921e 100644 --- a/htdocs/admin/agenda_extsites.php +++ b/htdocs/admin/agenda_extsites.php @@ -127,7 +127,7 @@ $arrayofcss=array(); llxHeader('',$langs->trans("AgendaSetup"),'','',0,0,$arrayofjs,$arrayofcss); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup'); print '
'; print ''; diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php index f892fe7149a..364680757cf 100644 --- a/htdocs/admin/agenda_other.php +++ b/htdocs/admin/agenda_other.php @@ -89,7 +89,7 @@ $formactions=new FormActions($db); llxHeader(); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup'); print "
\n"; diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php index f7abde2280e..dfdac2a8f0f 100644 --- a/htdocs/admin/agenda_xcal.php +++ b/htdocs/admin/agenda_xcal.php @@ -74,7 +74,7 @@ if (! isset($conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY)) $conf->global->MAIN_A llxHeader(); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup'); print '
'; diff --git a/htdocs/admin/askpricesupplier.php b/htdocs/admin/askpricesupplier.php index a2a30161d5e..5644605e625 100644 --- a/htdocs/admin/askpricesupplier.php +++ b/htdocs/admin/askpricesupplier.php @@ -240,7 +240,7 @@ $form=new Form($db); //if ($mesg) print $mesg; $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup'); $head = askpricesupplier_admin_prepare_head(); diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php index 4439de63ed2..8214755fd2b 100644 --- a/htdocs/admin/bank.php +++ b/htdocs/admin/bank.php @@ -87,7 +87,7 @@ llxHeader("",$langs->trans("BankSetupModule")); $form=new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("BankSetupModule"),$linkback,'title_setup'); print ''; diff --git a/htdocs/admin/bank_extrafields.php b/htdocs/admin/bank_extrafields.php index 91689c10379..849cbd9f485 100644 --- a/htdocs/admin/bank_extrafields.php +++ b/htdocs/admin/bank_extrafields.php @@ -66,7 +66,7 @@ llxHeader('',$langs->trans("BankSetupModule"),$help_url); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("BankSetupModule"),$linkback,'title_setup'); $head = bank_admin_prepare_head(null); diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index 4f4a0daa3dd..1d51e552280 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -130,7 +130,7 @@ $help_url='EN:Module_Barcode|FR:Module_Codes_Barre|ES:Módulo Código de barra'; llxHeader('',$langs->trans("BarcodeSetup"),$help_url); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("BarcodeSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("BarcodeSetup"),$linkback,'title_setup'); // Detect bar codes modules $barcodelist=array(); diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index d4918643c6c..6b1eb71fafe 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -219,7 +219,7 @@ $form=new Form($db); llxHeader('',$langs->trans("Boxes")); -print_fiche_titre($langs->trans("Boxes"),'','title_setup'); +print load_fiche_titre($langs->trans("Boxes"),'','title_setup'); print $langs->trans("BoxesDesc")." ".$langs->trans("OnlyActiveElementsAreShown")."
\n"; diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php index b6d7e8b3449..1550c0ebef7 100644 --- a/htdocs/admin/clicktodial.php +++ b/htdocs/admin/clicktodial.php @@ -60,7 +60,7 @@ $wikihelp='EN:Module_ClickToDial_En|FR:Module_ClickToDial|ES:Módulo_ClickTodial llxHeader('',$langs->trans("ClickToDialSetup"),$wikihelp); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("ClickToDialSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("ClickToDialSetup"),$linkback,'title_setup'); print $langs->trans("ClickToDialDesc")."
\n"; diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 6ad2b6750af..c83247a9bbf 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -263,7 +263,7 @@ llxHeader("",$langs->trans("OrdersSetup")); $form=new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup'); $head = order_admin_prepare_head(); diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 17c1414106e..e2b378f5aa2 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -277,7 +277,7 @@ $formcompany=new FormCompany($db); $countrynotdefined=''.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')'; -print_fiche_titre($langs->trans("CompanyFoundation"),'','title_setup'); +print load_fiche_titre($langs->trans("CompanyFoundation"),'','title_setup'); print $langs->trans("CompanyFundationDesc")."
\n"; print "
\n"; diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index 6020cb7947e..633f88b9cfb 100644 --- a/htdocs/admin/compta.php +++ b/htdocs/admin/compta.php @@ -104,7 +104,7 @@ llxHeader(); $form=new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans('ComptaSetup'),$linkback,'title_setup'); +print load_fiche_titre($langs->trans('ComptaSetup'),$linkback,'title_setup'); print '
'; diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php index a6ed0acae30..f8d13421b24 100644 --- a/htdocs/admin/confexped.php +++ b/htdocs/admin/confexped.php @@ -74,7 +74,7 @@ $form=new Form($db); llxHeader("",""); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup'); print '
'; $h = 0; diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index 0f9213fc252..c1eff57571a 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -172,7 +172,7 @@ jQuery(document).ready(function() { trans("OtherSetup"),'','title_setup'); +print load_fiche_titre($langs->trans("OtherSetup"),'','title_setup'); print $langs->trans("ConstDesc")."
\n"; print "
\n"; diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index 0d373c31f23..cf93977fc8b 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -214,7 +214,7 @@ llxHeader(); $form=new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup'); print "
"; diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php index 1a96bac49ad..d569173aafe 100644 --- a/htdocs/admin/delais.php +++ b/htdocs/admin/delais.php @@ -133,7 +133,7 @@ $form = new Form($db); llxHeader(); -print_fiche_titre($langs->trans("DelaysOfToleranceBeforeWarning"),'','title_setup'); +print load_fiche_titre($langs->trans("DelaysOfToleranceBeforeWarning"),'','title_setup'); print $langs->transnoentities("DelaysOfToleranceDesc",img_warning()); print " ".$langs->trans("OnlyActiveElementsAreShown",DOL_URL_ROOT.'/admin/modules.php')."
\n"; diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 17c8bcae048..b5af472a6cf 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -813,7 +813,7 @@ if ($id) $titre.=' - '.$langs->trans($tablib[$id]); $linkback=''.$langs->trans("BackToDictionaryList").''; } -print_fiche_titre($titre,$linkback,'title_setup'); +print load_fiche_titre($titre,$linkback,'title_setup'); if (empty($id)) { diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php index ed75fd141f9..41824fea4c6 100644 --- a/htdocs/admin/ecm.php +++ b/htdocs/admin/ecm.php @@ -70,7 +70,7 @@ $help_url=''; llxHeader('',$langs->trans("ECMSetup"),$help_url); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("ECMSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("ECMSetup"),$linkback,'title_setup'); print '
'; print '
'.$langs->trans("Description").'
'; diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php index ed2a70f1b58..04a46071142 100644 --- a/htdocs/admin/events.php +++ b/htdocs/admin/events.php @@ -73,7 +73,7 @@ if ($action == "save") llxHeader('',$langs->trans("Audit")); //$linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup'); +print load_fiche_titre($langs->trans("SecuritySetup"),'','title_setup'); print $langs->trans("LogEventDesc")."
\n"; print "
\n"; diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index 06884120047..9710929ee17 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -217,7 +217,7 @@ $form=new Form($db); llxHeader("",""); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup'); print '
'; diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php index 5eebf25152f..f1b5eeb1427 100644 --- a/htdocs/admin/expensereport.php +++ b/htdocs/admin/expensereport.php @@ -235,7 +235,7 @@ llxHeader(); $form=new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("ExpenseReportsSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("ExpenseReportsSetup"),$linkback,'title_setup'); $head=expensereport_admin_prepare_head(); diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php index e067b5dcb6e..81f6c093d5e 100644 --- a/htdocs/admin/external_rss.php +++ b/htdocs/admin/external_rss.php @@ -189,7 +189,7 @@ if ($_POST["delete"]) llxHeader('',$langs->trans("ExternalRSSSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("ExternalRSSSetup"), $linkback, 'title_setup'); +print load_fiche_titre($langs->trans("ExternalRSSSetup"), $linkback, 'title_setup'); print '
'; // Formulaire ajout diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index e2c31f38929..b77df2a7f12 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -293,7 +293,7 @@ $form=new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup'); $head = invoice_admin_prepare_head(); dol_fiche_head($head, 'general', $langs->trans("Invoices"), 0, 'invoice'); diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php index 6b608d238f3..b605da7e07b 100644 --- a/htdocs/admin/fckeditor.php +++ b/htdocs/admin/fckeditor.php @@ -136,7 +136,7 @@ if (GETPOST('save','alpha')) llxHeader(); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("AdvancedEditor"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("AdvancedEditor"),$linkback,'title_setup'); print '
'; $var=true; @@ -189,7 +189,7 @@ else show_skin(null,1); print '
'."\n"; - print_fiche_titre($langs->trans("TestSubmitForm"),'(mode='.$mode.')',''); + print load_fiche_titre($langs->trans("TestSubmitForm"),'(mode='.$mode.')',''); print ''; $uselocalbrowser=true; $readonly=($mode=='dolibarr_readonly'?1:0); diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index f807ea94890..ca5e18a4103 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -247,7 +247,7 @@ llxHeader(); $form=new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setup'); $head=fichinter_admin_prepare_head(); diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php index 119f97ac840..5e4c9de6fd7 100644 --- a/htdocs/admin/geoipmaxmind.php +++ b/htdocs/admin/geoipmaxmind.php @@ -76,7 +76,7 @@ $form=new Form($db); llxHeader(); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("GeoIPMaxmindSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("GeoIPMaxmindSetup"),$linkback,'title_setup'); print '
'; $version=''; diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index f3260070fd7..a29171f79e8 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -114,7 +114,7 @@ $form=new Form($db); $formother=new FormOther($db); $formadmin=new FormAdmin($db); -print_fiche_titre($langs->trans("GUISetup"),'','title_setup'); +print load_fiche_titre($langs->trans("GUISetup"),'','title_setup'); print $langs->trans("DisplayDesc")."
\n"; print "
\n"; @@ -132,7 +132,7 @@ if ($action == 'edit') // Edit clearstatcache(); $var=true; - print_fiche_titre($langs->trans("Language"),'',''); + print load_fiche_titre($langs->trans("Language"),'',''); print '
'; print '
'; print ''; diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index 2d47206d6ad..6778f618265 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -43,7 +43,7 @@ llxHeader('',$langs->trans("Setup"),$wikihelp); $form = new Form($db); -print_fiche_titre($langs->trans("SetupArea"),'','title_setup.png'); +print load_fiche_titre($langs->trans("SetupArea"),'','title_setup.png'); if (! empty($conf->global->MAIN_MOTD_SETUPPAGE)) diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php index 53c8777d404..cd55cddbf45 100644 --- a/htdocs/admin/ldap.php +++ b/htdocs/admin/ldap.php @@ -82,7 +82,7 @@ llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:M&o $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup'); $head = ldap_prepare_head(); diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php index a92943b63ba..d24147417e3 100644 --- a/htdocs/admin/ldap_contacts.php +++ b/htdocs/admin/ldap_contacts.php @@ -95,7 +95,7 @@ if ($action == 'setvalue' && $user->admin) llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:Módulo_LDAP'); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup'); $head = ldap_prepare_head(); diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php index f9ced81adba..765a1549038 100644 --- a/htdocs/admin/ldap_groups.php +++ b/htdocs/admin/ldap_groups.php @@ -86,7 +86,7 @@ if ($action == 'setvalue' && $user->admin) llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:Módulo_LDAP'); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup'); $head = ldap_prepare_head(); diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php index 37b0250d04a..ae92c8f38cd 100644 --- a/htdocs/admin/ldap_members.php +++ b/htdocs/admin/ldap_members.php @@ -110,7 +110,7 @@ if ($action == 'setvalue' && $user->admin) llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:Módulo_LDAP'); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup'); $head = ldap_prepare_head(); diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php index 0a293022581..096f844436f 100644 --- a/htdocs/admin/ldap_users.php +++ b/htdocs/admin/ldap_users.php @@ -96,7 +96,7 @@ if ($action == 'setvalue' && $user->admin) llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:Módulo_LDAP'); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup'); $head = ldap_prepare_head(); diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index 9bfb8f801ed..8949fba6d3c 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -88,7 +88,7 @@ $form=new Form($db); llxHeader(); -print_fiche_titre($langs->trans("LimitsSetup"),'','title_setup'); +print load_fiche_titre($langs->trans("LimitsSetup"),'','title_setup'); print $langs->trans("LimitsDesc")."
\n"; diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index 8dd5cc5ead0..9257aada029 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -208,7 +208,7 @@ llxHeader("",""); $form=new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup'); print '
'; diff --git a/htdocs/admin/loan.php b/htdocs/admin/loan.php index a98e44539b9..a966b751955 100644 --- a/htdocs/admin/loan.php +++ b/htdocs/admin/loan.php @@ -78,7 +78,7 @@ llxHeader(); $form = new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans('ConfigLoan'),$linkback,'title_setup'); +print load_fiche_titre($langs->trans('ConfigLoan'),$linkback,'title_setup'); print ''; print ''; diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php index c934a46b8e0..8c4769780fd 100644 --- a/htdocs/admin/mailing.php +++ b/htdocs/admin/mailing.php @@ -81,7 +81,7 @@ if ($action == 'setvalue') llxHeader('',$langs->trans("MailingSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("MailingSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("MailingSetup"),$linkback,'title_setup'); if (! empty($conf->use_javascript_ajax)) { diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php index dc8cf57aa53..686da7fc68c 100644 --- a/htdocs/admin/mailman.php +++ b/htdocs/admin/mailman.php @@ -152,7 +152,7 @@ llxHeader('',$langs->trans("MailmanSpipSetup"),$help_url); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'title_setup'); $head = mailmanspip_admin_prepare_head(); @@ -175,7 +175,7 @@ if (! empty($conf->global->ADHERENT_USE_MAILMAN)) 'ADHERENT_MAILMAN_LISTS' ); - print_fiche_titre($langs->trans('MailmanTitle'), $link,''); + print load_fiche_titre($langs->trans('MailmanTitle'), $link,''); print '
'; @@ -211,7 +211,7 @@ else //$link.=img_$langs->trans("Activate") $link.=img_picto($langs->trans("Disabled"),'switch_off'); $link.=''; - print_fiche_titre($langs->trans('MailmanTitle'), $link,''); + print load_fiche_titre($langs->trans('MailmanTitle'), $link,''); } dol_fiche_end(); diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 742ef6149f8..654d85b572b 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -244,7 +244,7 @@ if (! $server) $server='127.0.0.1'; $wikihelp='EN:Setup EMails|FR:Paramétrage EMails|ES:Configuración EMails'; llxHeader('',$langs->trans("Setup"),$wikihelp); -print_fiche_titre($langs->trans("EMailsSetup"),'','title_setup'); +print load_fiche_titre($langs->trans("EMailsSetup"),'','title_setup'); print $langs->trans("EMailsDesc")."
\n"; print "
\n"; diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php index ad83def9ce8..c0ac9a3df8c 100644 --- a/htdocs/admin/menus.php +++ b/htdocs/admin/menus.php @@ -131,7 +131,7 @@ $formadmin=new FormAdmin($db); $wikihelp='EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones'; llxHeader('',$langs->trans("Setup"),$wikihelp); -print_fiche_titre($langs->trans("Menus"),'','title_setup'); +print load_fiche_titre($langs->trans("Menus"),'','title_setup'); $h = 0; diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index 4ab41c7991e..7c22a17c553 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -270,7 +270,7 @@ if ($action == 'create') }); '; - print_fiche_titre($langs->trans("NewMenu"),'','title_setup'); + print load_fiche_titre($langs->trans("NewMenu"),'','title_setup'); print ''; print ''; @@ -379,7 +379,7 @@ if ($action == 'create') } elseif ($action == 'edit') { - print_fiche_titre($langs->trans("ModifMenu"),'','title_setup'); + print load_fiche_titre($langs->trans("ModifMenu"),'','title_setup'); print '
'; print ''; diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php index 62bf0bbd617..c8699209268 100644 --- a/htdocs/admin/menus/index.php +++ b/htdocs/admin/menus/index.php @@ -214,7 +214,7 @@ $arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css') llxHeader('',$langs->trans("Menus"),'','',0,0,$arrayofjs,$arrayofcss); -print_fiche_titre($langs->trans("Menus"),'','title_setup'); +print load_fiche_titre($langs->trans("Menus"),'','title_setup'); $h = 0; diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php index 8a893b21321..73dc0fe3b85 100644 --- a/htdocs/admin/menus/other.php +++ b/htdocs/admin/menus/other.php @@ -71,7 +71,7 @@ else if ($action == 'disable_layoutmenu') llxHeader('',$langs->trans("Setup")); -print_fiche_titre($langs->trans("Menus"),'','title_setup'); +print load_fiche_titre($langs->trans("Menus"),'','title_setup'); $h = 0; diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php index bab6db29959..fca545e83cd 100644 --- a/htdocs/admin/notification.php +++ b/htdocs/admin/notification.php @@ -115,7 +115,7 @@ $notify = new Notify($db); llxHeader('',$langs->trans("NotificationSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("NotificationSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("NotificationSetup"),$linkback,'title_setup'); print $langs->trans("NotificationsDesc").'

'; @@ -143,7 +143,7 @@ print '
'; if ($conf->societe->enabled) { - print_fiche_titre($langs->trans("ListOfNotificationsPerContact"),'',''); + print load_fiche_titre($langs->trans("ListOfNotificationsPerContact"),'',''); print '
'.$langs->trans("Parameters").''.$langs->trans("Value").'
'; print ''; @@ -186,7 +186,7 @@ if ($conf->societe->enabled) } -print_fiche_titre($langs->trans("ListOfFixedNotifications"),'',''); +print load_fiche_titre($langs->trans("ListOfFixedNotifications"),'',''); print '
'; print ''; diff --git a/htdocs/admin/order_extrafields.php b/htdocs/admin/order_extrafields.php index 09be4cfa36e..ea0f99021cf 100644 --- a/htdocs/admin/order_extrafields.php +++ b/htdocs/admin/order_extrafields.php @@ -70,7 +70,7 @@ $textobject=$langs->transnoentitiesnoconv("Orders"); llxHeader('',$langs->trans("OrdersSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup'); print "
\n"; $head = order_admin_prepare_head(); diff --git a/htdocs/admin/orderdet_extrafields.php b/htdocs/admin/orderdet_extrafields.php index 80f1e5377d6..8e542e3d871 100644 --- a/htdocs/admin/orderdet_extrafields.php +++ b/htdocs/admin/orderdet_extrafields.php @@ -71,7 +71,7 @@ $textobject=$langs->transnoentitiesnoconv("OrderLines"); llxHeader('',$langs->trans("OrdersSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup'); print "
\n"; $head = order_admin_prepare_head(); diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index 3f29dc1a24f..7bd46ac9684 100644 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -93,7 +93,7 @@ $form=new Form($db); $formother=new FormOther($db); $formadmin=new FormAdmin($db); -print_fiche_titre($langs->trans("PDF"),'','title_setup'); +print load_fiche_titre($langs->trans("PDF"),'','title_setup'); print $langs->trans("PDFDesc")."
\n"; print "
\n"; @@ -110,7 +110,7 @@ if ($action == 'edit') // Edit // Misc options - print_fiche_titre($langs->trans("DictionaryPaperFormat"),'','').'
'; + print load_fiche_titre($langs->trans("DictionaryPaperFormat"),'','').'
'; $var=true; print '
'; print ''; @@ -130,7 +130,7 @@ if ($action == 'edit') // Edit // Addresses - print_fiche_titre($langs->trans("PDFAddressForging"),'','').'
'; + print load_fiche_titre($langs->trans("PDFAddressForging"),'','').'
'; $var=true; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; print ''; @@ -212,7 +212,7 @@ if ($action == 'edit') // Edit print '
'; // Other - print_fiche_titre($langs->trans("Other"),'','').'
'; + print load_fiche_titre($langs->trans("Other"),'','').'
'; $var=true; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; print ''; @@ -262,7 +262,7 @@ else // Show $var=true; // Misc options - print_fiche_titre($langs->trans("DictionaryPaperFormat"),'','').'
'; + print load_fiche_titre($langs->trans("DictionaryPaperFormat"),'','').'
'; $var=true; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; print ''; @@ -299,7 +299,7 @@ else // Show print '
'; - print_fiche_titre($langs->trans("PDFAddressForging"),'','').'
'; + print load_fiche_titre($langs->trans("PDFAddressForging"),'','').'
'; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; print ''; @@ -380,7 +380,7 @@ else // Show print '
'; // Other - print_fiche_titre($langs->trans("Other"),'','').'
'; + print load_fiche_titre($langs->trans("Other"),'','').'
'; $var=true; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; print ''; diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index 5bb526352f6..cf9dce45c08 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -64,7 +64,7 @@ if ($action == 'remove') llxHeader('',$langs->trans("DefaultRights")); -print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup'); +print load_fiche_titre($langs->trans("SecuritySetup"),'','title_setup'); print $langs->trans("DefaultRightsDesc"); print " ".$langs->trans("OnlyActiveElementsAreShown")."

\n"; diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index 2ac83681405..43c058de251 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -119,7 +119,7 @@ llxHeader('',$langs->trans("WithdrawalsSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("WithdrawalsSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("WithdrawalsSetup"),$linkback,'title_setup'); print '
'; print ''; diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index 5d0054e61eb..1294888ceb1 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -261,7 +261,7 @@ $form=new Form($db); //if ($mesg) print $mesg; $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup'); $head = propal_admin_prepare_head(); diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index 00d66944c97..100da221ce6 100644 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -81,7 +81,7 @@ $form = new Form($db); llxHeader('',$langs->trans("Proxy")); -print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup'); +print load_fiche_titre($langs->trans("SecuritySetup"),'','title_setup'); print $langs->trans("ProxyDesc")."
\n"; print "
\n"; diff --git a/htdocs/admin/salaries.php b/htdocs/admin/salaries.php index 291c3848a63..bb37e73fc88 100644 --- a/htdocs/admin/salaries.php +++ b/htdocs/admin/salaries.php @@ -77,7 +77,7 @@ llxHeader('',$langs->trans('SalariesSetup')); $form = new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans('SalariesSetup'),$linkback,'title_setup'); +print load_fiche_titre($langs->trans('SalariesSetup'),$linkback,'title_setup'); print ''; print ''; diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php index 0eeef2cbe15..77e5e75f58d 100644 --- a/htdocs/admin/security.php +++ b/htdocs/admin/security.php @@ -185,7 +185,7 @@ $form = new Form($db); llxHeader('',$langs->trans("Passwords")); -print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup'); +print load_fiche_titre($langs->trans("SecuritySetup"),'','title_setup'); print $langs->trans("GeneratedPasswordDesc")."
\n"; print "
\n"; diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php index e72ece4375c..a7afaf0ef0a 100644 --- a/htdocs/admin/security_file.php +++ b/htdocs/admin/security_file.php @@ -111,7 +111,7 @@ $form = new Form($db); llxHeader('',$langs->trans("Files")); -print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup'); +print load_fiche_titre($langs->trans("SecuritySetup"),'','title_setup'); //print $langs->trans("FilesDesc")."
\n"; //print "
\n"; diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index 74101f29710..6c040e8d6d6 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -89,7 +89,7 @@ $form = new Form($db); llxHeader('',$langs->trans("Miscellaneous")); -print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup'); +print load_fiche_titre($langs->trans("SecuritySetup"),'','title_setup'); print $langs->trans("MiscellaneousDesc")."
\n"; print "
\n"; diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index 94a08b274ef..4b7818ecadb 100644 --- a/htdocs/admin/sms.php +++ b/htdocs/admin/sms.php @@ -147,7 +147,7 @@ if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0; $wikihelp='EN:Setup Sms|FR:Paramétrage Sms|ES:Configuración Sms'; llxHeader('',$langs->trans("Setup"),$wikihelp); -print_fiche_titre($langs->trans("SmsSetup"),'','title_setup'); +print load_fiche_titre($langs->trans("SmsSetup"),'','title_setup'); print $langs->trans("SmsDesc")."
\n"; print "
\n"; diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php index 753fef37be6..e46d9b8f5b7 100644 --- a/htdocs/admin/spip.php +++ b/htdocs/admin/spip.php @@ -110,7 +110,7 @@ llxHeader('',$langs->trans("MailmanSpipSetup"),$help_url); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'title_setup'); $head = mailmanspip_admin_prepare_head(); @@ -137,7 +137,7 @@ if (! empty($conf->global->ADHERENT_USE_SPIP)) 'ADHERENT_SPIP_PASS' ); - print_fiche_titre($langs->trans('SPIPTitle'), $link, ''); + print load_fiche_titre($langs->trans('SPIPTitle'), $link, ''); print '
'; form_constantes($constantes); print '
'; @@ -148,7 +148,7 @@ else //$link.=$langs->trans("Activate"); $link.=img_picto($langs->trans("Disabled"),'switch_off'); $link.=''; - print_fiche_titre($langs->trans('SPIPTitle'), $link, ''); + print load_fiche_titre($langs->trans('SPIPTitle'), $link, ''); } diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index 0f6560ad055..2ed2f4f869e 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -113,7 +113,7 @@ if($action) llxHeader('',$langs->trans("StockSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("StockSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("StockSetup"),$linkback,'title_setup'); $form=new Form($db); diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php index aab372f370e..694247e7b81 100644 --- a/htdocs/admin/supplier_invoice.php +++ b/htdocs/admin/supplier_invoice.php @@ -194,7 +194,7 @@ llxHeader("",""); $form=new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup'); print "
"; diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php index fa3f61306d1..861e94c881b 100644 --- a/htdocs/admin/supplier_order.php +++ b/htdocs/admin/supplier_order.php @@ -210,7 +210,7 @@ $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']); llxHeader("",""); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup'); print "
"; diff --git a/htdocs/admin/supplierinvoice_extrafields.php b/htdocs/admin/supplierinvoice_extrafields.php index 060e135aa58..315a88788c2 100644 --- a/htdocs/admin/supplierinvoice_extrafields.php +++ b/htdocs/admin/supplierinvoice_extrafields.php @@ -74,7 +74,7 @@ $textobject=$langs->transnoentitiesnoconv("BillsSuppliers"); llxHeader('',$langs->trans("SuppliersSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup'); print "
\n"; $head = supplierorder_admin_prepare_head(); diff --git a/htdocs/admin/supplierinvoicedet_extrafields.php b/htdocs/admin/supplierinvoicedet_extrafields.php index 92dd8d53133..7e0f0f500fd 100644 --- a/htdocs/admin/supplierinvoicedet_extrafields.php +++ b/htdocs/admin/supplierinvoicedet_extrafields.php @@ -74,7 +74,7 @@ $textobject=$langs->transnoentitiesnoconv("BillsSuppliers"); llxHeader('',$langs->trans("SuppliersSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup'); print "
\n"; $head = supplierorder_admin_prepare_head(); diff --git a/htdocs/admin/supplierorder_extrafields.php b/htdocs/admin/supplierorder_extrafields.php index 7fa48c2ccdb..4dbb8f54760 100644 --- a/htdocs/admin/supplierorder_extrafields.php +++ b/htdocs/admin/supplierorder_extrafields.php @@ -70,7 +70,7 @@ $textobject=$langs->transnoentitiesnoconv("SuppliersOrders"); llxHeader('',$langs->trans("SuppliersSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup'); print "
\n"; $head = supplierorder_admin_prepare_head(); diff --git a/htdocs/admin/supplierorderdet_extrafields.php b/htdocs/admin/supplierorderdet_extrafields.php index fcbb15fc85c..8518c77a8e4 100644 --- a/htdocs/admin/supplierorderdet_extrafields.php +++ b/htdocs/admin/supplierorderdet_extrafields.php @@ -71,7 +71,7 @@ $textobject=$langs->transnoentitiesnoconv("SuppliersOrders"); llxHeader('',$langs->trans("SuppliersSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup'); print "
\n"; $head = supplierorder_admin_prepare_head(); diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index d95cc30f4dd..59921dd3687 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -157,7 +157,7 @@ llxHeader(); $form=new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("SyslogSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("SyslogSetup"),$linkback,'title_setup'); print '
'; $def = array(); diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php index e4bd9d77928..737e0712ea6 100644 --- a/htdocs/admin/system/about.php +++ b/htdocs/admin/system/about.php @@ -38,7 +38,7 @@ $langs->load("members"); llxHeader(); -print_fiche_titre("Dolibarr",'','title_setup'); +print load_fiche_titre("Dolibarr",'','title_setup'); print '
'.img_picto_common('', 'dolibarr_box.png','height="120"').'
'; diff --git a/htdocs/admin/system/browser.php b/htdocs/admin/system/browser.php index 1a68133127d..30ecc448e4d 100644 --- a/htdocs/admin/system/browser.php +++ b/htdocs/admin/system/browser.php @@ -42,7 +42,7 @@ $form=new Form($db); llxHeader(); -print_fiche_titre($langs->trans("InfoBrowser"),'','title_setup'); +print load_fiche_titre($langs->trans("InfoBrowser"),'','title_setup'); $tmp=getBrowserInfo($_SERVER["HTTP_USER_AGENT"]); diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index aba9f5e7263..1ff005e88b2 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -39,7 +39,7 @@ if (!$user->admin) llxHeader(); -print_fiche_titre($langs->trans("SummaryConst"),'','title_setup'); +print load_fiche_titre($langs->trans("SummaryConst"),'','title_setup'); print load_fiche_titre($langs->trans("ConfigurationFile").' ('.$conffiletoshowshort.')'); diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php index 9650b32bd5c..31d35d3f01d 100644 --- a/htdocs/admin/system/database-tables.php +++ b/htdocs/admin/system/database-tables.php @@ -46,7 +46,7 @@ if ($action == 'convert') llxHeader(); -print_fiche_titre($langs->trans("Tables")." ".ucfirst($conf->db->type),'','title_setup'); +print load_fiche_titre($langs->trans("Tables")." ".ucfirst($conf->db->type),'','title_setup'); // Define request to get table description diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php index e6fc31c4426..365cfaa449d 100644 --- a/htdocs/admin/system/database.php +++ b/htdocs/admin/system/database.php @@ -39,7 +39,7 @@ $form=new Form($db); llxHeader(); -print_fiche_titre($langs->trans("InfoDatabase"),'','title_setup'); +print load_fiche_titre($langs->trans("InfoDatabase"),'','title_setup'); // Database print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php index b2e01f65ebb..3fc10bb0f3f 100644 --- a/htdocs/admin/system/dbtable.php +++ b/htdocs/admin/system/dbtable.php @@ -41,7 +41,7 @@ $table=GETPOST('table','alpha'); llxHeader(); -print_fiche_titre($langs->trans("Table") . " ".$table,'','title_setup'); +print load_fiche_titre($langs->trans("Table") . " ".$table,'','title_setup'); // Define request to get table description $base=0; diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index a3788e04023..eeea93a2fea 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -42,7 +42,7 @@ $form=new Form($db); llxHeader(); -print_fiche_titre($langs->trans("InfoDolibarr"),'','title_setup'); +print load_fiche_titre($langs->trans("InfoDolibarr"),'','title_setup'); // Version $var=true; diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php index 14c9ea59d9a..9b7dfb76689 100644 --- a/htdocs/admin/system/filecheck.php +++ b/htdocs/admin/system/filecheck.php @@ -40,7 +40,7 @@ $error=0; llxHeader(); -print_fiche_titre($langs->trans("FileCheckDolibarr"),'','title_setup'); +print load_fiche_titre($langs->trans("FileCheckDolibarr"),'','title_setup'); // Version $var = true; diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php index 133b6cfbfff..3d473640618 100644 --- a/htdocs/admin/system/index.php +++ b/htdocs/admin/system/index.php @@ -45,7 +45,7 @@ if (! $user->admin) accessforbidden(); llxHeader(); -print_fiche_titre($langs->trans("SummarySystem"),'','title_setup'); +print load_fiche_titre($langs->trans("SummarySystem"),'','title_setup'); print '
'; diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php index 1014beba184..d812f6c29ed 100644 --- a/htdocs/admin/system/modules.php +++ b/htdocs/admin/system/modules.php @@ -39,7 +39,7 @@ if (! $user->admin) llxHeader(); -print_fiche_titre($langs->trans("AvailableModules"),'','title_setup'); +print load_fiche_titre($langs->trans("AvailableModules"),'','title_setup'); print $langs->trans("ToActivateModule").'
'; print "
\n"; diff --git a/htdocs/admin/system/os.php b/htdocs/admin/system/os.php index 5c20fda1cd4..2e9e56565c0 100644 --- a/htdocs/admin/system/os.php +++ b/htdocs/admin/system/os.php @@ -35,7 +35,7 @@ if (!$user->admin) llxHeader(); -print_fiche_titre($langs->trans("InfoOS"),'','title_setup'); +print load_fiche_titre($langs->trans("InfoOS"),'','title_setup'); print '
'; print ''; diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php index a5865b29eac..b993b1ea276 100644 --- a/htdocs/admin/system/perf.php +++ b/htdocs/admin/system/perf.php @@ -48,7 +48,7 @@ $nowstring=dol_print_date(dol_now(),'dayhourlog'); llxHeader(); -print_fiche_titre($langs->trans("PerfDolibarr"),'','title_setup'); +print load_fiche_titre($langs->trans("PerfDolibarr"),'','title_setup'); print $langs->trans("YouMayFindPerfAdviceHere",'http://wiki.dolibarr.org/index.php/FAQ_Increase_Performance').' ('.$langs->trans("Reload").')
'; diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php index 4a8dcb31d6e..dfb897ba27c 100644 --- a/htdocs/admin/system/phpinfo.php +++ b/htdocs/admin/system/phpinfo.php @@ -43,7 +43,7 @@ $title='InfoPHP'; if (isset($title)) { - print_fiche_titre($langs->trans($title), '', 'title_setup'); + print load_fiche_titre($langs->trans($title), '', 'title_setup'); } diff --git a/htdocs/admin/system/web.php b/htdocs/admin/system/web.php index 2d51344b68c..d1864b1b409 100644 --- a/htdocs/admin/system/web.php +++ b/htdocs/admin/system/web.php @@ -42,7 +42,7 @@ if (!$user->admin) accessforbidden(); llxHeader(); -print_fiche_titre($langs->trans("InfoWebServer"),'','title_setup'); +print load_fiche_titre($langs->trans("InfoWebServer"),'','title_setup'); print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; print "\n"; diff --git a/htdocs/admin/system/xcache.php b/htdocs/admin/system/xcache.php index e6c0f7ae477..361be2b461a 100644 --- a/htdocs/admin/system/xcache.php +++ b/htdocs/admin/system/xcache.php @@ -35,7 +35,7 @@ $action=GETPOST('action'); llxHeader(); -print_fiche_titre("XCache",'','title_setup'); +print load_fiche_titre("XCache",'','title_setup'); print "
\n"; diff --git a/htdocs/admin/system/xdebug.php b/htdocs/admin/system/xdebug.php index 501f74b414b..4236d8c6019 100644 --- a/htdocs/admin/system/xdebug.php +++ b/htdocs/admin/system/xdebug.php @@ -34,7 +34,7 @@ accessforbidden(); llxHeader(); -print_fiche_titre("XDebug",'','title_setup'); +print load_fiche_titre("XDebug",'','title_setup'); print "
\n"; diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php index 0802b2230ec..36c2f66aa51 100644 --- a/htdocs/admin/taxes.php +++ b/htdocs/admin/taxes.php @@ -114,7 +114,7 @@ llxHeader(); $form=new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans('TaxSetup'),$linkback,'title_setup'); +print load_fiche_titre($langs->trans('TaxSetup'),$linkback,'title_setup'); dol_fiche_head(); @@ -143,7 +143,7 @@ else print "
".$langs->trans("Parameter")."".$langs->trans("Value")."
\n"; print '
'; - print_fiche_titre($langs->trans("SummaryOfVatExigibilityUsedByDefault"),'',''); + print load_fiche_titre($langs->trans("SummaryOfVatExigibilityUsedByDefault"),'',''); //print ' ('.$langs->trans("CanBeChangedWhenMakingInvoice").')'; print ''; diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index fefb13cd0a0..a460f667e2a 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -110,7 +110,7 @@ jQuery(document).ready(function() { trans("Backup"),'','title_setup'); +print load_fiche_titre($langs->trans("Backup"),'','title_setup'); print $langs->trans("BackupDesc",DOL_DATA_ROOT).'

'; diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php index 0826eec832a..e1de295eba5 100644 --- a/htdocs/admin/tools/dolibarr_import.php +++ b/htdocs/admin/tools/dolibarr_import.php @@ -63,7 +63,7 @@ jQuery(document).ready(function() { trans("Restore"),'','title_setup'); +print load_fiche_titre($langs->trans("Restore"),'','title_setup'); print $langs->trans("RestoreDesc",DOL_DATA_ROOT).'

'; ?> diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php index da168eec510..588170fbb90 100644 --- a/htdocs/admin/tools/eaccelerator.php +++ b/htdocs/admin/tools/eaccelerator.php @@ -227,7 +227,7 @@ function create_key_table($list) $form=new Form($db); -print_fiche_titre('Dolibarr eAccelerator '.$info['version'].' control panel','','title_setup'); +print load_fiche_titre('Dolibarr eAccelerator '.$info['version'].' control panel','','title_setup'); $var=true; diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php index f3f21388cc1..500c766ed77 100644 --- a/htdocs/admin/tools/export.php +++ b/htdocs/admin/tools/export.php @@ -95,7 +95,7 @@ $formfile = new FormFile($db); //$help_url='EN:Backups|FR:Sauvegardes|ES:Copias_de_seguridad'; //llxHeader('','',$help_url); -//print_fiche_titre($langs->trans("Backup"),'','title_setup'); +//print load_fiche_titre($langs->trans("Backup"),'','title_setup'); // Start with empty buffer diff --git a/htdocs/admin/tools/index.php b/htdocs/admin/tools/index.php index 4ea716c322b..6d7082728f3 100644 --- a/htdocs/admin/tools/index.php +++ b/htdocs/admin/tools/index.php @@ -42,7 +42,7 @@ if (GETPOST('leftmenu') == 'modulesadmintools') $title=$langs->trans("ModulesSys llxHeader(array(),$title); -print_fiche_titre($title,'','title_setup'); +print load_fiche_titre($title,'','title_setup'); print $langs->trans("SystemToolsAreaDesc").'
'; print "
"; diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php index 9bd700a7c9e..0c5915fd326 100644 --- a/htdocs/admin/tools/purge.php +++ b/htdocs/admin/tools/purge.php @@ -117,7 +117,7 @@ llxHeader(); $form=new Form($db); -print_fiche_titre($langs->trans("Purge"),'','title_setup'); +print load_fiche_titre($langs->trans("Purge"),'','title_setup'); print $langs->trans("PurgeAreaDesc",$dolibarr_main_data_root).'
'; print '
'; diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php index b391ffa0d2a..54a6cab9cbd 100644 --- a/htdocs/admin/tools/update.php +++ b/htdocs/admin/tools/update.php @@ -163,7 +163,7 @@ $dirins_ok=(dol_is_dir($dirins)); $wikihelp='EN:Installation_-_Upgrade|FR:Installation_-_Mise_à_jour|ES:Instalación_-_Actualización'; llxHeader('',$langs->trans("Upgrade"),$wikihelp); -print_fiche_titre($langs->trans("Upgrade"),'','title_setup'); +print load_fiche_titre($langs->trans("Upgrade"),'','title_setup'); print $langs->trans("CurrentVersion").' : '.DOL_VERSION.'
'; diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index cdea31fd7c4..0528d090c52 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -52,7 +52,7 @@ $action=GETPOST('action'); $wikihelp='EN:Setup|FR:Paramétrage|ES:Configuración'; llxHeader('',$langs->trans("Setup"),$wikihelp); -print_fiche_titre($langs->trans("TranslationSetup"),'','title_setup'); +print load_fiche_titre($langs->trans("TranslationSetup"),'','title_setup'); print $langs->trans("TranslationDesc")."
\n"; print "
\n"; diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php index fb7085a6ba8..de59c9136b2 100644 --- a/htdocs/admin/triggers.php +++ b/htdocs/admin/triggers.php @@ -42,7 +42,7 @@ llxHeader("",""); $form = new Form($db); -print_fiche_titre($langs->trans("TriggersAvailable"),'','title_setup'); +print load_fiche_titre($langs->trans("TriggersAvailable"),'','title_setup'); print $langs->trans("TriggersDesc")."
"; print "
\n"; diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php index dc21790ec32..85ea8501107 100644 --- a/htdocs/admin/user.php +++ b/htdocs/admin/user.php @@ -95,7 +95,7 @@ $help_url='EN:Module_Users|FR:Module_Utilisateurs|ES:Módulo_Usuarios'; llxHeader('',$langs->trans("UsersSetup"),$help_url); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup'); $head=user_admin_prepare_head(); diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php index 255fc0f6d9c..bdd84a50a7f 100644 --- a/htdocs/admin/workflow.php +++ b/htdocs/admin/workflow.php @@ -61,7 +61,7 @@ if (preg_match('/del(.*)/',$action,$reg)) llxHeader('',$langs->trans("WorkflowSetup"),''); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("WorkflowSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("WorkflowSetup"),$linkback,'title_setup'); print $langs->trans("WorkflowDesc").'
'; print "
"; diff --git a/htdocs/api/admin/api.php b/htdocs/api/admin/api.php index 740d3eb7e8d..4d3768070ef 100644 --- a/htdocs/api/admin/api.php +++ b/htdocs/api/admin/api.php @@ -59,7 +59,7 @@ if ($action == 'setproductionmode') llxHeader(); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("ApiSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("ApiSetup"),$linkback,'title_setup'); print $langs->trans("ApiDesc")."
\n"; print "
\n"; diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php index bd8f2194fe4..9251b5e7ac9 100644 --- a/htdocs/barcode/codeinit.php +++ b/htdocs/barcode/codeinit.php @@ -191,7 +191,7 @@ $form=new Form($db); llxHeader('',$langs->trans("MassBarcodeInit")); -print_fiche_titre($langs->trans("MassBarcodeInit")); +print load_fiche_titre($langs->trans("MassBarcodeInit")); print '
'; print $langs->trans("MassBarcodeInitDesc").'
'; @@ -211,7 +211,7 @@ if ($conf->societe->enabled) { $nbno=$nbtotal=0; - print_fiche_titre($langs->trans("BarcodeInitForThirdparties"),'','object_company'); + print load_fiche_titre($langs->trans("BarcodeInitForThirdparties"),'','object_company'); print '
'."\n"; $sql="SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."societe where barcode IS NULL or barcode = ''"; $resql=$db->query($sql); @@ -252,7 +252,7 @@ if ($conf->product->enabled || $conf->product->service) $nbno=$nbtotal=0; - print_fiche_titre($langs->trans("BarcodeInitForProductsOrServices"),'','object_product'); + print load_fiche_titre($langs->trans("BarcodeInitForProductsOrServices"),'','object_product'); print '
'."\n"; $sql ="SELECT count(rowid) as nb, fk_product_type, datec"; diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php index b535eb7765d..68673d9c83b 100644 --- a/htdocs/barcode/printsheet.php +++ b/htdocs/barcode/printsheet.php @@ -261,7 +261,7 @@ $form=new Form($db); llxHeader('',$langs->trans("BarCodePrintsheet")); -print_fiche_titre($langs->trans("BarCodePrintsheet")); +print load_fiche_titre($langs->trans("BarCodePrintsheet")); print '
'; print $langs->trans("PageToGenerateBarCodeSheets",$langs->transnoentitiesnoconv("BuildPageToPrint")).'
'; diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php index 51274716eda..05691a227b7 100644 --- a/htdocs/bookmarks/admin/bookmark.php +++ b/htdocs/bookmarks/admin/bookmark.php @@ -59,7 +59,7 @@ if ($action == 'setvalue') llxHeader(); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("BookmarkSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("BookmarkSetup"),$linkback,'title_setup'); print $langs->trans("BookmarkDesc")."
\n"; diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php index a821cf8e94f..a63f7804c85 100644 --- a/htdocs/bookmarks/card.php +++ b/htdocs/bookmarks/card.php @@ -149,7 +149,7 @@ if ($action == 'create') print ''; print ''; - print_fiche_titre($langs->trans("NewBookmark")); + print load_fiche_titre($langs->trans("NewBookmark")); dol_fiche_head($head, $hselected, $langs->trans("Bookmark"),0,'bookmark'); diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php index 7512785d78b..c54111239b9 100644 --- a/htdocs/bookmarks/list.php +++ b/htdocs/bookmarks/list.php @@ -72,7 +72,7 @@ $userstatic=new User($db); llxHeader(); -print_fiche_titre($langs->trans("Bookmarks")); +print load_fiche_titre($langs->trans("Bookmarks")); $sql = "SELECT b.fk_soc as rowid, b.dateb, b.rowid as bid, b.fk_user, b.url, b.target, b.title, b.favicon, b.position,"; $sql.= " u.login, u.lastname, u.firstname"; diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php index 48804958b20..74560e8ff6a 100644 --- a/htdocs/cashdesk/admin/cashdesk.php +++ b/htdocs/cashdesk/admin/cashdesk.php @@ -85,7 +85,7 @@ $formproduct=new FormProduct($db); llxHeader('',$langs->trans("CashDeskSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("CashDeskSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("CashDeskSetup"),$linkback,'title_setup'); print '
'; diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php index 23ebc01f3e2..37ed08703f8 100644 --- a/htdocs/categories/admin/categorie.php +++ b/htdocs/categories/admin/categorie.php @@ -77,7 +77,7 @@ $linkback=''.$langs->trans("BackToM llxHeader('',$langs->trans("Categories"),$help_url); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("CategoriesSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("CategoriesSetup"),$linkback,'title_setup'); $head=categoriesadmin_prepare_head(); diff --git a/htdocs/categories/admin/categorie_extrafields.php b/htdocs/categories/admin/categorie_extrafields.php index 26ffa089828..87e907c696e 100644 --- a/htdocs/categories/admin/categorie_extrafields.php +++ b/htdocs/categories/admin/categorie_extrafields.php @@ -64,7 +64,7 @@ llxHeader('',$langs->trans("Categories"),$help_url); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("CategoriesSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("CategoriesSetup"),$linkback,'title_setup'); $head = categoriesadmin_prepare_head(); diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php index 6c4c1a39bdd..a5e41ee7a3c 100644 --- a/htdocs/categories/card.php +++ b/htdocs/categories/card.php @@ -236,7 +236,7 @@ if ($user->rights->categorie->creer) if ($origin) print ''; if ($catorigin) print ''; - print_fiche_titre($langs->trans("CreateCat")); + print load_fiche_titre($langs->trans("CreateCat")); dol_fiche_head(''); diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 43803d045bb..b573d02bf16 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -641,7 +641,7 @@ function formCategory($db,$object,$typeid,$socid=0,$showclassifyform=1) } print '
'; - print_fiche_titre($title,$linktocreate,''); + print load_fiche_titre($title,$linktocreate,''); // Form to add record into a category if ($showclassifyform) diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php index 28a97d3d89d..b48bf57a385 100644 --- a/htdocs/categories/edit.php +++ b/htdocs/categories/edit.php @@ -121,7 +121,7 @@ $formother = new FormOther($db); llxHeader("","",$langs->trans("Categories")); -print_fiche_titre($langs->trans("ModifCat")); +print load_fiche_titre($langs->trans("ModifCat")); $object->fetch($id); diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index b22b1989673..ff585212dff 100644 --- a/htdocs/categories/index.php +++ b/htdocs/categories/index.php @@ -61,7 +61,7 @@ $arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css') llxHeader('',$title,'','',0,0,$arrayofjs,$arrayofcss); -print_fiche_titre($title); +print load_fiche_titre($title); //print '
'; //print '
'; diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 8eef2b06b8b..1e4b969644c 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -636,8 +636,8 @@ if ($action == 'create') if ($backtopage) print ''; if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) print ''; - if (GETPOST("actioncode") == 'AC_RDV') print_fiche_titre($langs->trans("AddActionRendezVous")); - else print_fiche_titre($langs->trans("AddAnAction")); + if (GETPOST("actioncode") == 'AC_RDV') print load_fiche_titre($langs->trans("AddActionRendezVous")); + else print load_fiche_titre($langs->trans("AddAnAction")); dol_fiche_head(); diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index f445c7f3596..6b3384b92dd 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -414,7 +414,7 @@ else // If javascript off $link.=''; } -print_fiche_titre($s, $link.'     '.$nav, ''); +print load_fiche_titre($s, $link.'     '.$nav, ''); // Load events from database into $eventarray diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 5f8ce1563de..41270d7996e 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -337,7 +337,7 @@ if ($conf->use_javascript_ajax) $link=''; -print_fiche_titre($s, $link.'     '.$nav, ''); +print load_fiche_titre($s, $link.'     '.$nav, ''); // Get event in an array diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php index 0dd643a4f8f..eb3c51b1760 100644 --- a/htdocs/comm/address.php +++ b/htdocs/comm/address.php @@ -211,7 +211,7 @@ if ($action == 'create') $object->country = $tmparray['label']; } - print_fiche_titre($langs->trans("AddAddress")); + print load_fiche_titre($langs->trans("AddAddress")); print "
\n"; diff --git a/htdocs/comm/admin/askpricesupplier_extrafields.php b/htdocs/comm/admin/askpricesupplier_extrafields.php index b7140c404fc..0fb0554203f 100644 --- a/htdocs/comm/admin/askpricesupplier_extrafields.php +++ b/htdocs/comm/admin/askpricesupplier_extrafields.php @@ -60,7 +60,7 @@ llxHeader('',$langs->trans("AskPriceSupplierSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup'); $head = askpricesupplier_admin_prepare_head(); diff --git a/htdocs/comm/admin/askpricesupplierdet_extrafields.php b/htdocs/comm/admin/askpricesupplierdet_extrafields.php index dd6c9cc92c5..09c215d1f3d 100644 --- a/htdocs/comm/admin/askpricesupplierdet_extrafields.php +++ b/htdocs/comm/admin/askpricesupplierdet_extrafields.php @@ -66,7 +66,7 @@ $textobject=$langs->transnoentitiesnoconv("CommRequests"); llxHeader('',$langs->trans("AskPriceSupplierSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup'); $head = askpricesupplier_admin_prepare_head(); diff --git a/htdocs/comm/admin/propal_extrafields.php b/htdocs/comm/admin/propal_extrafields.php index 6ee525d8051..9c55c606e81 100644 --- a/htdocs/comm/admin/propal_extrafields.php +++ b/htdocs/comm/admin/propal_extrafields.php @@ -64,7 +64,7 @@ $textobject=$langs->transnoentitiesnoconv("Proposals"); llxHeader('',$langs->trans("PropalSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup'); $head = propal_admin_prepare_head(); diff --git a/htdocs/comm/admin/propaldet_extrafields.php b/htdocs/comm/admin/propaldet_extrafields.php index 583825ce234..97d4763ace3 100644 --- a/htdocs/comm/admin/propaldet_extrafields.php +++ b/htdocs/comm/admin/propaldet_extrafields.php @@ -72,7 +72,7 @@ $textobject=$langs->transnoentitiesnoconv("Proposals"); llxHeader('',$langs->trans("PropalSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup'); $head = propal_admin_prepare_head(); diff --git a/htdocs/comm/askpricesupplier/card.php b/htdocs/comm/askpricesupplier/card.php index 29a9b344ba4..d47f147b1aa 100644 --- a/htdocs/comm/askpricesupplier/card.php +++ b/htdocs/comm/askpricesupplier/card.php @@ -984,7 +984,7 @@ $now = dol_now(); // Add new askprice if ($action == 'create') { - print_fiche_titre($langs->trans("NewAskPrice")); + print load_fiche_titre($langs->trans("NewAskPrice")); $soc = new Societe($db); if ($socid > 0) @@ -1770,7 +1770,7 @@ if ($action == 'create') print '
'; print '
'; - print_fiche_titre($langs->trans('SendAskByMail')); + print load_fiche_titre($langs->trans('SendAskByMail')); dol_fiche_head(''); diff --git a/htdocs/comm/askpricesupplier/index.php b/htdocs/comm/askpricesupplier/index.php index 681a889ed25..6936defda49 100644 --- a/htdocs/comm/askpricesupplier/index.php +++ b/htdocs/comm/askpricesupplier/index.php @@ -52,7 +52,7 @@ $help_url="EN:Module_Ask_Price_Supplier|FR:Module_Demande_de_prix_fournisseur"; llxHeader("",$langs->trans("AskPriceSupplierArea"),$help_url); -print_fiche_titre($langs->trans("AskPriceSupplierArea")); +print load_fiche_titre($langs->trans("AskPriceSupplierArea")); print '
'; diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 7dc359b4568..6aee0fe939c 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -68,7 +68,7 @@ if (! empty($conf->commande->enabled)) $orderstatic=new Commande($db); llxHeader(); -print_fiche_titre($langs->trans("CommercialArea"),'','title_commercial.png'); +print load_fiche_titre($langs->trans("CommercialArea"),'','title_commercial.png'); print '
'; diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index 2d53fbb06e1..fde56efb25e 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -673,7 +673,7 @@ if ($action == 'create') print ''; print ''; - print_fiche_titre($langs->trans("NewMailing")); + print load_fiche_titre($langs->trans("NewMailing")); dol_fiche_head(); @@ -991,7 +991,7 @@ else } // Print mail content - print_fiche_titre($langs->trans("EMail"),'',''); + print load_fiche_titre($langs->trans("EMail"),'',''); dol_fiche_head(''); @@ -1102,7 +1102,7 @@ else print ''; // Print mail content - print_fiche_titre($langs->trans("EMail"),'',''); + print load_fiche_titre($langs->trans("EMail"),'',''); print ''; // Subject diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 99c73dc4837..cd3ff7b00ee 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -223,7 +223,7 @@ if ($object->fetch($id) >= 0) // Show email selectors if ($allowaddtarget && $user->rights->mailing->creer) { - print_fiche_titre($langs->trans("ToAddRecipientsChooseHere"),($user->admin?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"),1):''),''); + print load_fiche_titre($langs->trans("ToAddRecipientsChooseHere"),($user->admin?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"),1):''),''); print '
'; print ''; diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index 5c6ae896e42..59753ee1904 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -42,7 +42,7 @@ $result=restrictedArea($user,'mailing'); $help_url='EN:Module_EMailing|FR:Module_Mailing|ES:Módulo_Mailing'; llxHeader('','EMailing',$help_url); -print_fiche_titre($langs->trans("MailingArea")); +print load_fiche_titre($langs->trans("MailingArea")); //print '
'; //print '
'; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 65a6cdb938e..7e4547d2ded 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1191,7 +1191,7 @@ $now = dol_now(); // Add new proposal if ($action == 'create') { - print_fiche_titre($langs->trans("NewProp")); + print load_fiche_titre($langs->trans("NewProp")); $soc = new Societe($db); if ($socid > 0) @@ -2287,7 +2287,7 @@ if ($action == 'create') print '
'; print '
'; - print_fiche_titre($langs->trans('SendPropalByMail')); + print load_fiche_titre($langs->trans('SendPropalByMail')); dol_fiche_head(''); diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index 8fc50f853c6..1bcbec9723d 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -52,7 +52,7 @@ $help_url="EN:Module_Commercial_Proposals|FR:Module_Propositions_commerciales|ES llxHeader("",$langs->trans("ProspectionArea"),$help_url); -print_fiche_titre($langs->trans("ProspectionArea")); +print load_fiche_titre($langs->trans("ProspectionArea")); //print ''; //print '
'; diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index 9a2a712e339..e99c7122a10 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -65,7 +65,7 @@ $langs->load('other'); llxHeader('', $langs->trans("ProposalsStatistics")); -print_fiche_titre($langs->trans("ProposalsStatistics"),'','title_commercial.png'); +print load_fiche_titre($langs->trans("ProposalsStatistics"),'','title_commercial.png'); $dir=$conf->propal->dir_temp; diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index f5f600ddd08..fba2fe9d1cd 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -44,7 +44,7 @@ $companystatic=new Societe($db); llxHeader(); -print_fiche_titre($langs->trans("ProspectionArea")); +print load_fiche_titre($langs->trans("ProspectionArea")); //print ''; //print '
'; diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index 6d0d1dedb2a..ea9e1382d40 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -124,7 +124,7 @@ if ($socid > 0) print '
'; print '
'; - print_fiche_titre($langs->trans("NewRelativeDiscount"),'',''); + print load_fiche_titre($langs->trans("NewRelativeDiscount"),'',''); print ''; diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index 744f1ff39c7..957f109268a 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -264,7 +264,7 @@ if ($socid > 0) print '
'; print '
'; - print_fiche_titre($langs->trans("NewGlobalDiscount"),'',''); + print load_fiche_titre($langs->trans("NewGlobalDiscount"),'',''); print ''; print ''; print '
'.$langs->trans("AmountHT").''; diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 54400bb60ef..1af55e25d40 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1233,7 +1233,7 @@ if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); } */ if ($action == 'create' && $user->rights->commande->creer) { - print_fiche_titre($langs->trans('CreateOrder'),'','title_commercial.png'); + print load_fiche_titre($langs->trans('CreateOrder'),'','title_commercial.png'); $soc = new Societe($db); if ($socid > 0) @@ -2376,7 +2376,7 @@ if ($action == 'create' && $user->rights->commande->creer) print '
'; print '
'; - print_fiche_titre($langs->trans('SendOrderByMail')); + print load_fiche_titre($langs->trans('SendOrderByMail')); dol_fiche_head(''); diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index 5baa7b7c30f..d6432a257ba 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -53,7 +53,7 @@ $help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Ped llxHeader("",$langs->trans("Orders"),$help_url); -print_fiche_titre($langs->trans("OrdersArea")); +print load_fiche_titre($langs->trans("OrdersArea")); //print ''; //print '
'; diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index 2896a6e22c6..136ac6c1b89 100644 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -370,7 +370,7 @@ if ($action == 'create' && !$error) $facturestatic=new Facture($db); llxHeader(); - print_fiche_titre($langs->trans('NewBill')); + print load_fiche_titre($langs->trans('NewBill')); $soc = new Societe($db); if ($socid) $res=$soc->fetch($socid); @@ -570,7 +570,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error) $title = $langs->trans('ListOfOrders'); $title.=' - '.$langs->trans('StatusOrderValidated').', '.$langs->trans("StatusOrderSent").', '.$langs->trans('StatusOrderToBill'); $num = $db->num_rows($resql); - print_fiche_titre($title); + print load_fiche_titre($title); $i = 0; $period=$html->select_date($date_start,'date_start',0,0,1,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,1,'',1,0,1); $periodely=$html->select_date($date_starty,'date_start_dely',0,0,1,'',1,0,1).' - '.$html->select_date($date_endy,'date_end_dely',0,0,1,'',1,0,1); diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index ea781a4828f..c4d48d8f72e 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -77,7 +77,7 @@ if ($mode == 'supplier') $dir=$conf->fournisseur->dir_output.'/commande/temp'; } -print_fiche_titre($title,'','title_commercial.png'); +print load_fiche_titre($title,'','title_commercial.png'); dol_mkdir($dir); diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 10e9674ec8d..deed3b1b97a 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -469,7 +469,7 @@ if ($id > 0 || ! empty($ref)) // Form to add a transaction with no invoice if ($user->rights->banque->modifier && $action == 'addline') { - print_fiche_titre($langs->trans("AddBankRecordLong"),'',''); + print load_fiche_titre($langs->trans("AddBankRecordLong"),'',''); print ''; print ''; diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php index f22ce342bf0..c35dec41e7d 100644 --- a/htdocs/compta/bank/budget.php +++ b/htdocs/compta/bank/budget.php @@ -44,7 +44,7 @@ $companystatic=new Societe($db); llxHeader(); // List movements bu category for bank transactions -print_fiche_titre($langs->trans("BankTransactionByCategories"), '', 'title_bank.png'); +print load_fiche_titre($langs->trans("BankTransactionByCategories"), '', 'title_bank.png'); print '
'; print ""; diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php index c6c34d87129..063fee8ca78 100644 --- a/htdocs/compta/bank/card.php +++ b/htdocs/compta/bank/card.php @@ -243,7 +243,7 @@ if ($action == 'create') { $account=new Account($db); - print_fiche_titre($langs->trans("NewFinancialAccount"), '', 'title_bank.png'); + print load_fiche_titre($langs->trans("NewFinancialAccount"), '', 'title_bank.png'); if ($conf->use_javascript_ajax) { @@ -777,7 +777,7 @@ else $account = new Account($db); $account->fetch(GETPOST('id','int')); - print_fiche_titre($langs->trans("EditFinancialAccount"), '', 'title_bank.png'); + print load_fiche_titre($langs->trans("EditFinancialAccount"), '', 'title_bank.png'); if ($conf->use_javascript_ajax) { diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php index 00755959ab9..1d9da7f9f59 100644 --- a/htdocs/compta/bank/categ.php +++ b/htdocs/compta/bank/categ.php @@ -108,7 +108,7 @@ if ($action == 'delete') llxHeader(); -print_fiche_titre($langs->trans("Rubriques"), '', 'title_bank.png'); +print load_fiche_titre($langs->trans("Rubriques"), '', 'title_bank.png'); print ''; print ''; diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index ac175b5b7d7..46b382ed080 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -51,7 +51,7 @@ llxHeader('',$langs->trans('AccountsArea'),$help_url); $link=''; if ($statut == '') $link=''.$langs->trans("IncludeClosedAccount").''; if ($statut == 'all') $link=''.$langs->trans("OnlyOpenedAccount").''; -print_fiche_titre($langs->trans("AccountsArea"),$link, 'title_bank.png'); +print load_fiche_titre($langs->trans("AccountsArea"),$link, 'title_bank.png'); // On charge tableau des comptes financiers (ouverts par defaut) diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 4186dae5561..45a87fea87c 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -553,7 +553,7 @@ if ($result) if ($acct->canBeConciliated() > 0) // Si compte rapprochable { print '
'."\n"; - print_fiche_titre($langs->trans("Reconciliation"), '', 'title_bank.png'); + print load_fiche_titre($langs->trans("Reconciliation"), '', 'title_bank.png'); print ''; print ''; print ''; diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index 8468bfbd5fb..aa9f043b2d5 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -182,7 +182,7 @@ if ($resql) $var=True; $num = $db->num_rows($resql); - print_fiche_titre($langs->trans("Reconciliation").': '.$acct->label.'', '', 'title_bank.png'); + print load_fiche_titre($langs->trans("Reconciliation").': '.$acct->label.'', '', 'title_bank.png'); print '
'; // Show last bank receipts diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 73fd8df531a..9620b00098b 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -285,7 +285,7 @@ else $mesprevnext ="id\">".img_previous()."  "; $mesprevnext.= $langs->trans("AccountStatement")." $num"; $mesprevnext.="   id\">".img_next().""; - print_fiche_titre($langs->trans("AccountStatement").' '.$num.', '.$langs->trans("BankAccount").' : '.$object->getNomUrl(0),$mesprevnext, 'title_bank.png'); + print load_fiche_titre($langs->trans("AccountStatement").' '.$num.', '.$langs->trans("BankAccount").' : '.$object->getNomUrl(0),$mesprevnext, 'title_bank.png'); print '
'; print ""; diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php index d81390a0205..3a64d0cc3d1 100644 --- a/htdocs/compta/bank/virement.php +++ b/htdocs/compta/bank/virement.php @@ -152,7 +152,7 @@ if($error) $amount = GETPOST('amount','int'); } -print_fiche_titre($langs->trans("BankTransfer"), '', 'title_bank.png'); +print load_fiche_titre($langs->trans("BankTransfer"), '', 'title_bank.png'); print $langs->trans("TransferDesc"); print "

"; diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index 45b10f2363c..69b95d16e03 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -75,7 +75,7 @@ if (GETPOST("mode") == 'sconly') $param='&mode=sconly'; if ($sortfield) $param.='&sortfield='.$sortfield; if ($sortorder) $param.='&sortorder='.$sortorder; -print_fiche_titre($title, ($year?"".img_previous()." ".$langs->trans("Year")." $year ".img_next()."":""), 'title_accountancy.png'); +print load_fiche_titre($title, ($year?"".img_previous()." ".$langs->trans("Year")." $year ".img_next()."":""), 'title_accountancy.png'); if ($year) $param.='&year='.$year; @@ -92,7 +92,7 @@ if ($conf->salaries->enabled) { $sal = new PaymentSalary($db); - print_fiche_titre($langs->trans("SalariesPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', ''); + print load_fiche_titre($langs->trans("SalariesPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', ''); $sql = "SELECT s.rowid, s.amount, s.label, s.datep as datep, s.datev as datev, s.datesp, s.dateep, s.salary, u.salary as current_salary"; $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as s, ".MAIN_DB_PREFIX."user as u"; @@ -172,7 +172,7 @@ if ($conf->tax->enabled) // Social contributions only if (GETPOST("mode") != 'sconly') { - print_fiche_titre($langs->trans("SocialContributionsPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', ''); + print load_fiche_titre($langs->trans("SocialContributionsPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', ''); } print '
'; @@ -286,7 +286,7 @@ if ($conf->tax->enabled) $tva = new Tva($db); - print_fiche_titre($langs->trans("VATPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', ''); + print load_fiche_titre($langs->trans("VATPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', ''); $sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm"; $sql.= " FROM ".MAIN_DB_PREFIX."tva as pv"; @@ -386,7 +386,7 @@ while($j<$numlt) $tva = new Tva($db); - print_fiche_titre($langs->transcountry(($j==1?"LT1Payments":"LT2Payments"),$mysoc->country_code).($year?' ('.$langs->trans("Year").' '.$year.')':''), '', ''); + print load_fiche_titre($langs->transcountry(($j==1?"LT1Payments":"LT2Payments"),$mysoc->country_code).($year?' ('.$langs->trans("Year").' '.$year.')':''), '', ''); $sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm, pv.datep as dp"; diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php index 083aeb48986..d4858d5ab29 100644 --- a/htdocs/compta/deplacement/card.php +++ b/htdocs/compta/deplacement/card.php @@ -240,7 +240,7 @@ if ($action == 'create') //WYSIWYG Editor require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; - print_fiche_titre($langs->trans("NewTrip")); + print load_fiche_titre($langs->trans("NewTrip")); $datec = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int')); diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index b8920bb45a4..0d9d63e8bb2 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -91,7 +91,7 @@ if ($result) } -print_fiche_titre($langs->trans("ExpensesArea")); +print load_fiche_titre($langs->trans("ExpensesArea")); print '
'; diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php index 0d0a32a877c..1d9f7b70201 100644 --- a/htdocs/compta/deplacement/stats/index.php +++ b/htdocs/compta/deplacement/stats/index.php @@ -78,7 +78,7 @@ llxHeader(); $title=$langs->trans("TripsAndExpensesStatistics"); $dir=$conf->deplacement->dir_temp; -print_fiche_titre($title, $mesg); +print load_fiche_titre($title, $mesg); dol_mkdir($dir); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index a1f18a0ae89..01b630f1449 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1822,7 +1822,7 @@ if ($action == 'create') $facturestatic = new Facture($db); $extralabels = $extrafields->fetch_name_optionals_label($facturestatic->table_element); - print_fiche_titre($langs->trans('NewBill')); + print load_fiche_titre($langs->trans('NewBill')); $soc = new Societe($db); if ($socid > 0) @@ -3804,7 +3804,7 @@ else if ($id > 0 || ! empty($ref)) print '
'; print '
'; - print_fiche_titre($langs->trans($titreform)); + print load_fiche_titre($langs->trans($titreform)); // Cree l'objet formulaire mail dol_fiche_head(); diff --git a/htdocs/compta/facture/admin/facture_cust_extrafields.php b/htdocs/compta/facture/admin/facture_cust_extrafields.php index 128d391e963..fa2c3ba3a1e 100644 --- a/htdocs/compta/facture/admin/facture_cust_extrafields.php +++ b/htdocs/compta/facture/admin/facture_cust_extrafields.php @@ -65,7 +65,7 @@ $textobject=strtolower($langs->transnoentitiesnoconv("BillsCustomers")); llxHeader('',$langs->trans("BillsSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup'); print '
'; $head = invoice_admin_prepare_head(); diff --git a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php index db5b4a7c0e2..50749f89ab1 100644 --- a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php +++ b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php @@ -66,7 +66,7 @@ $textobject=strtolower($langs->transnoentitiesnoconv("BillsCustomers")); llxHeader('',$langs->trans("BillsSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup'); print '
'; $head = invoice_admin_prepare_head(); diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index c1f4e5b26ff..f01c288e29e 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -118,7 +118,7 @@ $companystatic = new Societe($db); */ if ($action == 'create') { - print_fiche_titre($langs->trans("CreateRepeatableInvoice"),'','title_accountancy.png'); + print load_fiche_titre($langs->trans("CreateRepeatableInvoice"),'','title_accountancy.png'); $object = new Facture($db); // Source invoice $product_static = new Product($db); diff --git a/htdocs/compta/facture/mergepdftool.php b/htdocs/compta/facture/mergepdftool.php index 498d6051f97..72276b77069 100644 --- a/htdocs/compta/facture/mergepdftool.php +++ b/htdocs/compta/facture/mergepdftool.php @@ -544,7 +544,7 @@ if ($resql) $param.=(! empty($option)?"&option=".$option:""); - print_fiche_titre($titre,$link); + print load_fiche_titre($titre,$link); //print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',0); // We don't want pagination on this page print ''; diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php index f86fb1d975b..f61e92687f6 100644 --- a/htdocs/compta/facture/stats/index.php +++ b/htdocs/compta/facture/stats/index.php @@ -75,7 +75,7 @@ if ($mode == 'supplier') $dir=$conf->fournisseur->dir_output.'/facture/temp'; } -print_fiche_titre($title, $mesg, 'title_accountancy.png'); +print load_fiche_titre($title, $mesg, 'title_accountancy.png'); dol_mkdir($dir); diff --git a/htdocs/compta/hrm.php b/htdocs/compta/hrm.php index 4e931ef2b9d..12b410e29af 100644 --- a/htdocs/compta/hrm.php +++ b/htdocs/compta/hrm.php @@ -67,7 +67,7 @@ $childids[]=$user->id; llxHeader(array(),$langs->trans('HRMArea')); -print_fiche_titre($langs->trans("HRMArea"),'', 'title_hrm.png'); +print load_fiche_titre($langs->trans("HRMArea"),'', 'title_hrm.png'); print '
'; diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 5b0e8ec288d..cf5d6c990aa 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -81,7 +81,7 @@ $thirdpartystatic = new Societe($db); llxHeader("",$langs->trans("AccountancyTreasuryArea")); -print_fiche_titre($langs->trans("AccountancyTreasuryArea"),'','title_accountancy.png'); +print load_fiche_titre($langs->trans("AccountancyTreasuryArea"),'','title_accountancy.png'); print '
'; diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php index 308bcac6dc9..579d80ea919 100644 --- a/htdocs/compta/localtax/card.php +++ b/htdocs/compta/localtax/card.php @@ -154,7 +154,7 @@ if ($_GET["action"] == 'create') print ''; print ''; - print_fiche_titre($langs->transcountry($lttype==2?"newLT2Payment":"newLT1Payment",$mysoc->country_code)); + print load_fiche_titre($langs->transcountry($lttype==2?"newLT2Payment":"newLT1Payment",$mysoc->country_code)); if ($mesg) print $mesg; diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php index b50e1904929..c3512fdcc1e 100644 --- a/htdocs/compta/localtax/index.php +++ b/htdocs/compta/localtax/index.php @@ -122,7 +122,7 @@ if($localTaxType==1) { $textprevyear="".img_previous().""; $textnextyear=" ".img_next().""; -print_fiche_titre($langs->transcountry($LT,$mysoc->country_code),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear"); +print load_fiche_titre($langs->transcountry($LT,$mysoc->country_code),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear"); print $langs->trans("LTReportBuildWithOptionDefinedInModule").'
'; print '('.$langs->trans("TaxModuleSetupToModifyRulesLT",DOL_URL_ROOT.'/admin/company.php').')
'; diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php index 7396c625165..0e88980796b 100644 --- a/htdocs/compta/localtax/quadri_detail.php +++ b/htdocs/compta/localtax/quadri_detail.php @@ -116,7 +116,7 @@ $product_static=new Product($db); $payment_static=new Paiement($db); $paymentfourn_static=new PaiementFourn($db); -//print_fiche_titre($langs->trans("VAT"),""); +//print load_fiche_titre($langs->trans("VAT"),""); //$fsearch.='
'; $fsearch.=' '; diff --git a/htdocs/compta/localtax/reglement.php b/htdocs/compta/localtax/reglement.php index 6d8c1bc7a9c..bfe0cb828c0 100644 --- a/htdocs/compta/localtax/reglement.php +++ b/htdocs/compta/localtax/reglement.php @@ -41,7 +41,7 @@ llxHeader(); $localtax_static = new Localtax($db); -print_fiche_titre($langs->transcountry($ltt==2?"LT2Payments":"LT1Payments",$mysoc->country_code)); +print load_fiche_titre($langs->transcountry($ltt==2?"LT2Payments":"LT1Payments",$mysoc->country_code)); $sql = "SELECT rowid, amount, label, f.datev as dm"; $sql.= " FROM ".MAIN_DB_PREFIX."localtax as f "; diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index aaebcf697f3..6d169f48279 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -277,7 +277,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie $title=''; if ($facture->type != 2) $title.=$langs->trans("EnterPaymentReceivedFromCustomer"); if ($facture->type == 2) $title.=$langs->trans("EnterPaymentDueToCustomer"); - print_fiche_titre($title); + print load_fiche_titre($title); // Initialize data for confirmation (this is used because data can be change during confirmation) if ($action == 'add_paiement') diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php index 0b7b3ed0c57..bf6ed4f807a 100644 --- a/htdocs/compta/paiement/cheque/card.php +++ b/htdocs/compta/paiement/cheque/card.php @@ -312,7 +312,7 @@ if ($action == 'new') $hselected = $h; $h++; - print_fiche_titre($langs->trans("Cheques")); + print load_fiche_titre($langs->trans("Cheques")); } else { diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index 362493b7f19..ebe9f6e8461 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -47,7 +47,7 @@ $accountstatic=new Account($db); llxHeader('',$langs->trans("ChequesArea")); -print_fiche_titre($langs->trans("ChequesArea")); +print load_fiche_titre($langs->trans("ChequesArea")); //print '
'; //print '
'; diff --git a/htdocs/compta/paiement/index.php b/htdocs/compta/paiement/index.php index 89a57fdc79f..8575db70288 100644 --- a/htdocs/compta/paiement/index.php +++ b/htdocs/compta/paiement/index.php @@ -29,7 +29,7 @@ if (!$user->admin && $user->societe_id > 0) llxHeader(); -print_fiche_titre("Payments"); +print load_fiche_titre("Payments"); diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php index 142ea7b5a4a..8f23036f6af 100644 --- a/htdocs/compta/paiement/rapport.php +++ b/htdocs/compta/paiement/rapport.php @@ -88,7 +88,7 @@ $formother=new FormOther($db); llxHeader(); $titre=($year?$langs->trans("PaymentsReportsForYear",$year):$langs->trans("PaymentsReports")); -print_fiche_titre($titre,'','title_accountancy.png'); +print load_fiche_titre($titre,'','title_accountancy.png'); // Formulaire de generation print ''; diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index 173226f6ab5..30a3d17ab3f 100644 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -162,7 +162,7 @@ if ($_GET["action"] == 'create') $total = $charge->amount; - print_fiche_titre($langs->trans("DoPayment")); + print load_fiche_titre($langs->trans("DoPayment")); print "
\n"; if ($mesg) diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 64ec4ad1895..7e81e181d11 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -106,7 +106,7 @@ $h++; dol_fiche_head($head, $hselected, $langs->trans("StandingOrders"), 0, 'payment'); */ -print_fiche_titre($langs->trans("NewStandingOrder")); +print load_fiche_titre($langs->trans("NewStandingOrder")); dol_fiche_head(); @@ -183,7 +183,7 @@ if ($resql) $num = $db->num_rows($resql); $i = 0; - print_fiche_titre($langs->trans("InvoiceWaitingWithdraw").($num > 0?' ('.$num.')':''),'',''); + print load_fiche_titre($langs->trans("InvoiceWaitingWithdraw").($num > 0?' ('.$num.')':''),'',''); print ''; print ''; @@ -248,7 +248,7 @@ else */ $limit=5; -print_fiche_titre($langs->trans("LastWithdrawalReceipts",$limit),'',''); +print load_fiche_titre($langs->trans("LastWithdrawalReceipts",$limit),'',''); $sql = "SELECT p.rowid, p.ref, p.amount, p.statut"; $sql.= ", p.datec"; diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index 0e9174ef034..83de06bc13c 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -120,7 +120,7 @@ if ($prev_id) $num = $db->num_rows($resql); $i = 0; - print_fiche_titre($langs->trans("StatisticsByLineStatus"),'',''); + print load_fiche_titre($langs->trans("StatisticsByLineStatus"),'',''); print"\n\n"; print '
'; diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index 36e4ed71341..7c700dfeabb 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -64,7 +64,7 @@ if (prelevement_check_config() < 0) print ''; } -print_fiche_titre($langs->trans("CustomersStandingOrdersArea")); +print load_fiche_titre($langs->trans("CustomersStandingOrdersArea")); print '
'; diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php index 4d81b164e60..5e20815469c 100644 --- a/htdocs/compta/prelevement/stats.php +++ b/htdocs/compta/prelevement/stats.php @@ -45,7 +45,7 @@ $result = restrictedArea($user, 'prelevement','','','bons'); llxHeader('',$langs->trans("WithdrawStatistics")); -print_fiche_titre($langs->trans("Statistics")); +print load_fiche_titre($langs->trans("Statistics")); // Define total and nbtotal $sql = "SELECT sum(pl.amount), count(pl.amount)"; diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index 19ac5705ef1..cfcd0a6f746 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -84,7 +84,7 @@ if ($socid > 0) if (! empty($conf->facture->enabled) && $user->rights->facture->lire) { // Factures - print_fiche_titre($langs->trans("CustomerPreview")); + print load_fiche_titre($langs->trans("CustomerPreview")); print '
'; diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php index f96531b059c..86b1f025a03 100644 --- a/htdocs/compta/salaries/card.php +++ b/htdocs/compta/salaries/card.php @@ -225,7 +225,7 @@ if ($action == 'create') print ''; print ''; - print_fiche_titre($langs->trans("NewSalaryPayment"),'', 'title_accountancy.png'); + print load_fiche_titre($langs->trans("NewSalaryPayment"),'', 'title_accountancy.png'); dol_fiche_head('', ''); diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php index 7be1360287c..29606fa6a9a 100644 --- a/htdocs/compta/sociales/charges.php +++ b/htdocs/compta/sociales/charges.php @@ -232,7 +232,7 @@ llxHeader("",$langs->trans("SocialContribution"),$help_url); // Mode creation if ($action == 'create') { - print_fiche_titre($langs->trans("NewSocialContribution")); + print load_fiche_titre($langs->trans("NewSocialContribution")); $var=false; diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index 3afbba0df79..639bf51fefd 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -136,7 +136,7 @@ if ($resql) if ($year) { - print_fiche_titre($langs->trans("SocialContributions"),($year?"".img_previous()." ".$langs->trans("Year")." $year ".img_next()."":"")); + print load_fiche_titre($langs->trans("SocialContributions"),($year?"".img_previous()." ".$langs->trans("Year")." $year ".img_next()."":"")); } else { diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php index 78883afbc30..688f88759c4 100644 --- a/htdocs/compta/tva/card.php +++ b/htdocs/compta/tva/card.php @@ -188,7 +188,7 @@ if ($id) // Formulaire saisie tva if ($action == 'create') { - print_fiche_titre($langs->trans("VAT") . ' - ' . $langs->trans("New")); + print load_fiche_titre($langs->trans("VAT") . ' - ' . $langs->trans("New")); if (! empty($conf->use_javascript_ajax)) { diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index 26e66d66fbe..a5f45d0c72c 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -116,7 +116,7 @@ $tva = new Tva($db); $textprevyear="".img_previous().""; $textnextyear=" ".img_next().""; -print_fiche_titre($langs->trans("VAT"),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear"); +print load_fiche_titre($langs->trans("VAT"),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear"); print $langs->trans("VATReportBuildWithOptionDefinedInModule").'
'; print '('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')
'; diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php index 3918b56c3bf..a8434a70868 100644 --- a/htdocs/compta/tva/quadri.php +++ b/htdocs/compta/tva/quadri.php @@ -190,12 +190,12 @@ llxHeader(); $textprevyear="".img_previous().""; $textnextyear=" ".img_next().""; -print_fiche_titre($langs->trans("VAT"),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear"); +print load_fiche_titre($langs->trans("VAT"),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear"); echo '
'; echo ''; echo ''; diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index f551e92cb9d..cedc38a2143 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -115,7 +115,7 @@ $product_static=new Product($db); $payment_static=new Paiement($db); $paymentfourn_static=new PaiementFourn($db); -//print_fiche_titre($langs->trans("VAT"),""); +//print load_fiche_titre($langs->trans("VAT"),""); //$fsearch.='
'; $fsearch.=' '; diff --git a/htdocs/compta/tva/quarter_report.php b/htdocs/compta/tva/quarter_report.php index 09a6622147e..e906b65ed4f 100644 --- a/htdocs/compta/tva/quarter_report.php +++ b/htdocs/compta/tva/quarter_report.php @@ -135,7 +135,7 @@ $product_static=new Product($db); $payment_static=new Paiement($db); $paymentfourn_static=new PaiementFourn($db); -//print_fiche_titre($langs->trans("VAT"),""); +//print load_fiche_titre($langs->trans("VAT"),""); //$fsearch.='
'; $fsearch.=' '; diff --git a/htdocs/compta/ventilation/card.php b/htdocs/compta/ventilation/card.php index 7201dfe9e29..463f8884242 100644 --- a/htdocs/compta/ventilation/card.php +++ b/htdocs/compta/ventilation/card.php @@ -112,7 +112,7 @@ if($_GET["id"]) } - print_fiche_titre("Ventilation"); + print load_fiche_titre("Ventilation"); print '
'; -print_fiche_titre($langs->trans("VATSummary")); +print load_fiche_titre($langs->trans("VATSummary")); echo '
'; diff --git a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php index 70d6b41bf35..3fce45b848f 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php @@ -20,7 +20,7 @@ control->tpl['title']); +print load_fiche_titre($this->control->tpl['title']); dol_htmloutput_errors((is_numeric($object->error)?'':$object->error),$object->errors); diff --git a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php index 3be1d16bc8d..c275902d384 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php @@ -23,7 +23,7 @@ $contact = $GLOBALS['objcanvas']->control->object; control->tpl['title']); +print load_fiche_titre($this->control->tpl['title']); dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors']); diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index 9778d0c8a71..df725bc2a7e 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -443,7 +443,7 @@ else $title = $addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress")); $linkback=''; - print_fiche_titre($title,$linkback,'title_companies.png'); + print load_fiche_titre($title,$linkback,'title_companies.png'); // Affiche les erreurs dol_htmloutput_errors(is_numeric($error)?'':$error,$errors); @@ -626,7 +626,7 @@ else // Add personnal information - print_fiche_titre('
'.$langs->trans("PersonalInformations").'
','',''); + print load_fiche_titre('
'.$langs->trans("PersonalInformations").'
','',''); print '
'; diff --git a/htdocs/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php index 28b00b3464f..9711379f458 100644 --- a/htdocs/contrat/admin/contract_extrafields.php +++ b/htdocs/contrat/admin/contract_extrafields.php @@ -67,7 +67,7 @@ $textobject = $langs->transnoentitiesnoconv('Contracts'); llxHeader(); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup'); print '
'; $head=contract_admin_prepare_head(); diff --git a/htdocs/contrat/admin/contractdet_extrafields.php b/htdocs/contrat/admin/contractdet_extrafields.php index d34af10ea65..8014334c008 100644 --- a/htdocs/contrat/admin/contractdet_extrafields.php +++ b/htdocs/contrat/admin/contractdet_extrafields.php @@ -67,7 +67,7 @@ $textobject = $langs->transnoentitiesnoconv('Contracts'); llxHeader(); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup'); print '
'; $head=contract_admin_prepare_head(); diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 429547ed602..d02237f43c5 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -930,7 +930,7 @@ if ($result > 0) *********************************************************************/ if ($action == 'create') { - print_fiche_titre($langs->trans('AddContract'),'','title_commercial.png'); + print load_fiche_titre($langs->trans('AddContract'),'','title_commercial.png'); $soc = new Societe($db); if ($socid>0) $soc->fetch($socid); diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 56cdbe90ca3..3a7b5667db5 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -64,7 +64,7 @@ $now = dol_now(); llxHeader(); -print_fiche_titre($langs->trans("ContractsArea"),'','title_commercial.png'); +print load_fiche_titre($langs->trans("ContractsArea"),'','title_commercial.png'); //print '
'; diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 2c60fe83002..a84c4548706 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -479,7 +479,7 @@ function show_projects($conf,$langs,$db,$object,$backtopage='') } print "\n"; - print_fiche_titre($langs->trans("ProjectsDedicatedToThisThirdParty"),$buttoncreate,''); + print load_fiche_titre($langs->trans("ProjectsDedicatedToThisThirdParty"),$buttoncreate,''); print "\n".'
'; $sql = "SELECT p.rowid as id, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status"; @@ -602,7 +602,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') print "\n"; $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ContactsForCompany") : $langs->trans("ContactsAddressesForCompany")); - print_fiche_titre($title,$buttoncreate,''); + print load_fiche_titre($title,$buttoncreate,''); print ''; print ''; @@ -816,7 +816,7 @@ function show_addresses($conf,$langs,$db,$object,$backtopage='') } print "\n"; - print_fiche_titre($langs->trans("AddressesForCompany"),$buttoncreate,''); + print load_fiche_titre($langs->trans("AddressesForCompany"),$buttoncreate,''); print "\n".'
'."\n"; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 0ae89d01274..d854f1ee78c 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2736,7 +2736,7 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m * @param string $title Title to show * @return string Title to show * @deprecated Use load_fiche_titre instead - * @see print_fiche_titre, load_fiche_titre + * @see load_fiche_titre */ function print_titre($title) { diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php index 217f431b96e..cb929daad3b 100644 --- a/htdocs/core/photos_resize.php +++ b/htdocs/core/photos_resize.php @@ -182,7 +182,7 @@ if ($action == 'confirm_crop') llxHeader($head, $langs->trans("Image"), '', '', 0, 0, array('/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js','/core/js/lib_photosresize.js'), array('/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css')); -print_fiche_titre($langs->trans("ImageEditor")); +print load_fiche_titre($langs->trans("ImageEditor")); $infoarray=dol_getImageSize($dir."/".urldecode($_GET["file"])); $height=$infoarray['height']; diff --git a/htdocs/core/tools.php b/htdocs/core/tools.php index 1375ed5c455..51378c9246a 100644 --- a/htdocs/core/tools.php +++ b/htdocs/core/tools.php @@ -43,7 +43,7 @@ llxHeader("",$langs->trans("Tools"),""); $text=$langs->trans("Tools"); -print_fiche_titre($text); +print load_fiche_titre($text); // Show description of content print $langs->trans("ToolsDesc").'

'; diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php index 0c8e310d2dd..6dc81bcc6a3 100644 --- a/htdocs/cron/admin/cron.php +++ b/htdocs/cron/admin/cron.php @@ -66,7 +66,7 @@ if (!empty($actionsave)) llxHeader(); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("CronSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("CronSetup"),$linkback,'title_setup'); // Configuration header $head = cronadmin_prepare_head(); diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php index f2c4a93e030..5e2766345de 100644 --- a/htdocs/cron/card.php +++ b/htdocs/cron/card.php @@ -230,7 +230,7 @@ if ($action=='edit' || empty($action) || $action=='delete' || $action=='execute' } elseif ($action=='create') { - print_fiche_titre($langs->trans("CronTask"),'','title_setup'); + print load_fiche_titre($langs->trans("CronTask"),'','title_setup'); } if ($conf->use_javascript_ajax) diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index d6c0fbd2070..1f4e5126ed0 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -131,7 +131,7 @@ $pagetitle=$langs->trans("CronList"); llxHeader('',$pagetitle); -print_fiche_titre($pagetitle,'','title_setup'); +print load_fiche_titre($pagetitle,'','title_setup'); print $langs->trans('CronInfo'); diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php index 6af6d3289e6..81ef5431d09 100644 --- a/htdocs/don/admin/donation.php +++ b/htdocs/don/admin/donation.php @@ -199,7 +199,7 @@ $form=new Form($db); llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration'); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("DonationsSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("DonationsSetup"),$linkback,'title_setup'); $head = donation_admin_prepare_head(); diff --git a/htdocs/don/admin/donation_extrafields.php b/htdocs/don/admin/donation_extrafields.php index 71082ca6e6b..df9b2f527bb 100644 --- a/htdocs/don/admin/donation_extrafields.php +++ b/htdocs/don/admin/donation_extrafields.php @@ -62,7 +62,7 @@ $textobject=$langs->transnoentitiesnoconv("Donations"); llxHeader('',$langs->trans("DonationsSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("DonationsSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("DonationsSetup"),$linkback,'title_setup'); $head = donation_admin_prepare_head(); diff --git a/htdocs/don/card.php b/htdocs/don/card.php index b56171b8796..6664550e5c8 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -293,7 +293,7 @@ $formcompany = new FormCompany($db); if ($action == 'create') { - print_fiche_titre($langs->trans("AddDonation")); + print load_fiche_titre($langs->trans("AddDonation")); print ''; print ''; diff --git a/htdocs/don/index.php b/htdocs/don/index.php index 7630ed8d3e7..73c9e56d29c 100644 --- a/htdocs/don/index.php +++ b/htdocs/don/index.php @@ -76,7 +76,7 @@ if ($result) dol_print_error($db); } -print_fiche_titre($langs->trans("DonationsArea")); +print load_fiche_titre($langs->trans("DonationsArea")); print '
'; diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php index c4ed9891be6..da33a92e750 100644 --- a/htdocs/don/payment/payment.php +++ b/htdocs/don/payment/payment.php @@ -162,7 +162,7 @@ if (GETPOST("action") == 'create') $total = $don->amount; - print_fiche_titre($langs->trans("DoPayment")); + print load_fiche_titre($langs->trans("DoPayment")); if ($mesg) { diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php index baeda9b8a82..e205cd9db76 100644 --- a/htdocs/don/stats/index.php +++ b/htdocs/don/stats/index.php @@ -59,7 +59,7 @@ $form=new Form($db); llxHeader(); -print_fiche_titre($langs->trans("StatisticsOfSendings"), $mesg); +print load_fiche_titre($langs->trans("StatisticsOfSendings"), $mesg); dol_mkdir($dir); diff --git a/htdocs/ecm/docdir.php b/htdocs/ecm/docdir.php index b32ba2446d4..9f298e42b32 100644 --- a/htdocs/ecm/docdir.php +++ b/htdocs/ecm/docdir.php @@ -153,7 +153,7 @@ if ($action == 'create') print ''; $title=$langs->trans("ECMNewSection"); - print_fiche_titre($title); + print load_fiche_titre($title); dol_fiche_head(); @@ -193,7 +193,7 @@ if (empty($action) || $action == 'delete_section') //*********************** // List //*********************** - print_fiche_titre($langs->trans("ECMSectionOfDocuments")); + print load_fiche_titre($langs->trans("ECMSectionOfDocuments")); print '
'; /* diff --git a/htdocs/ecm/docother.php b/htdocs/ecm/docother.php index d1fda6b793a..3efe0716228 100644 --- a/htdocs/ecm/docother.php +++ b/htdocs/ecm/docother.php @@ -99,7 +99,7 @@ llxHeader(); $form=new Form($db); -print_fiche_titre($langs->trans("ECMAutoOrg")); +print load_fiche_titre($langs->trans("ECMAutoOrg")); //$head = societe_prepare_head($societe); diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index a6dc5442aa7..64a9c46f0de 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -414,7 +414,7 @@ if (! empty($conf->global->ECM_AUTO_TREE_ENABLED)) if (! empty($conf->projet->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsByProjects")); } } -print_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager")); +print load_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager")); /* print '
'; diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php index 7626774b24c..47239aa3acd 100644 --- a/htdocs/ecm/index_auto.php +++ b/htdocs/ecm/index_auto.php @@ -414,7 +414,7 @@ if (! empty($conf->global->ECM_AUTO_TREE_ENABLED)) } -print_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager")); +print load_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager")); $helptext1=''; $helptext2=''; $helptext1.=$langs->trans("ECMAreaDesc"); diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php index 968318f5b85..729543eff56 100644 --- a/htdocs/ecm/search.php +++ b/htdocs/ecm/search.php @@ -116,7 +116,7 @@ if (! empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[]=array('le //*********************** // List //*********************** -print_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("Search")); +print load_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("Search")); //print $langs->trans("ECMAreaDesc")."
"; //print $langs->trans("ECMAreaDesc2")."
"; @@ -133,7 +133,7 @@ print '
'; // Left area -//print_fiche_titre($langs->trans("ECMSectionsManual")); +//print load_fiche_titre($langs->trans("ECMSectionsManual")); print ''; print ''; @@ -147,7 +147,7 @@ print "
"; //print $langs->trans("ECMSectionManualDesc"); -//print_fiche_titre($langs->trans("ECMSectionAuto")); +//print load_fiche_titre($langs->trans("ECMSectionAuto")); print '
'; print ''; diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 1b871136235..820be464610 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -469,7 +469,7 @@ $product_static = new Product($db); if ($action == 'create2') { - print_fiche_titre($langs->trans("CreateASending")).'
'; + print load_fiche_titre($langs->trans("CreateASending")).'
'; print $langs->trans("ShipmentCreationIsDoneFromOrder"); $action=''; $id=''; $ref=''; } @@ -479,7 +479,7 @@ if ($action == 'create') { $expe = new Expedition($db); - print_fiche_titre($langs->trans("CreateASending")); + print load_fiche_titre($langs->trans("CreateASending")); if (! $origin) { setEventMessage($langs->trans("ErrorBadParameters"),'errors'); @@ -1606,7 +1606,7 @@ else if ($id || $ref) print '
'; print '
'; - print_fiche_titre($langs->trans('SendShippingByEMail')); + print load_fiche_titre($langs->trans('SendShippingByEMail')); dol_fiche_head(''); diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index dbfece18381..c397605645d 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -41,7 +41,7 @@ $shipment=new Expedition($db); $helpurl='EN:Module_Shipments|FR:Module_Expéditions|ES:Módulo_Expediciones'; llxHeader('',$langs->trans("Shipment"),$helpurl); -print_fiche_titre($langs->trans("SendingsArea")); +print load_fiche_titre($langs->trans("SendingsArea")); print '
'; diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php index ca35f97df9b..3dfb0ce3827 100644 --- a/htdocs/expedition/stats/index.php +++ b/htdocs/expedition/stats/index.php @@ -58,7 +58,7 @@ $form=new Form($db); llxHeader(); -print_fiche_titre($langs->trans("StatisticsOfSendings"), $mesg); +print load_fiche_titre($langs->trans("StatisticsOfSendings"), $mesg); dol_mkdir($dir); diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php index f1cf51e3e16..b7d217217c2 100644 --- a/htdocs/expedition/stats/month.php +++ b/htdocs/expedition/stats/month.php @@ -39,7 +39,7 @@ $HEIGHT=DolGraph::getDefaultGraphSizeForStats('height'); $mesg = ''; -print_fiche_titre($langs->trans("StatisticsOfSendings").' '.$_GET["year"], $mesg); +print load_fiche_titre($langs->trans("StatisticsOfSendings").' '.$_GET["year"], $mesg); $stats = new ExpeditionStats($db); $data = $stats->getNbExpeditionByMonth($_GET["year"]); diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index 7220e869350..401bda168eb 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -1089,7 +1089,7 @@ if (! empty($conf->global->DEPLACEMENT_TO_CLEAN)) // Create if ($action == 'create') { - print print_fiche_titre($langs->trans("NewTrip")); + print print load_fiche_titre($langs->trans("NewTrip")); print ''; print ''; @@ -1178,7 +1178,7 @@ else { if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)) { - print_fiche_titre($langs->trans('TripCard')); + print load_fiche_titre($langs->trans('TripCard')); print '
'; print $langs->trans('NotUserRightToView'); @@ -1772,7 +1772,7 @@ else // Add a line if (($object->fk_statut==0 || $object->fk_statut==99) && $action != 'editline') { - print_fiche_titre($langs->trans("AddLine"),'',''); + print load_fiche_titre($langs->trans("AddLine"),'',''); print ''; print ''; diff --git a/htdocs/expensereport/export_csv.php b/htdocs/expensereport/export_csv.php index 817d651c3e8..3cf520c6739 100644 --- a/htdocs/expensereport/export_csv.php +++ b/htdocs/expensereport/export_csv.php @@ -69,7 +69,7 @@ if($num < 1) { llxHeader(); -print_fiche_titre($langs->trans("ExportTripCSV")); +print load_fiche_titre($langs->trans("ExportTripCSV")); print '
'; diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php index f025079fca9..ece9f9260ac 100644 --- a/htdocs/expensereport/index.php +++ b/htdocs/expensereport/index.php @@ -100,7 +100,7 @@ if ($result) } -print_fiche_titre($langs->trans("ExpensesArea")); +print load_fiche_titre($langs->trans("ExpensesArea")); print '
'; diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php index c65e42f709c..94f37389fc9 100644 --- a/htdocs/expensereport/payment/payment.php +++ b/htdocs/expensereport/payment/payment.php @@ -167,7 +167,7 @@ if (GETPOST("action") == 'create') $total = $expensereport->total_ttc; - print_fiche_titre($langs->trans("DoPayment")); + print load_fiche_titre($langs->trans("DoPayment")); if ($mesg) { diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php index 402eb56e01b..bba5ceb1ee1 100644 --- a/htdocs/expensereport/stats/index.php +++ b/htdocs/expensereport/stats/index.php @@ -65,7 +65,7 @@ llxHeader(); $title=$langs->trans("TripsAndExpensesStatistics"); $dir=$conf->expensereport->dir_temp; -print_fiche_titre($title, $mesg); +print load_fiche_titre($title, $mesg); dol_mkdir($dir); diff --git a/htdocs/expensereport/synchro_compta.php b/htdocs/expensereport/synchro_compta.php index 90eb4bd4674..59a6b8926fe 100644 --- a/htdocs/expensereport/synchro_compta.php +++ b/htdocs/expensereport/synchro_compta.php @@ -100,7 +100,7 @@ $html = new Form($db); $submit = isset($_POST['submit'])?true:false; $idAccount=isset($_GET["account"])?$_GET["account"]:$_POST["account"]; -print_fiche_titre($langs->trans("TripSynch")); +print load_fiche_titre($langs->trans("TripSynch")); dol_fiche_head(''); diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index bf002ccde96..8f9f7946e56 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -44,7 +44,7 @@ $form=new Form($db); llxHeader('',$langs->trans("ExportsArea"),'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones'); -print_fiche_titre($langs->trans("ExportsArea")); +print load_fiche_titre($langs->trans("ExportsArea")); print $langs->trans("FormatedExportDesc1").'
'; print $langs->trans("FormatedExportDesc2").' '; diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php index 574d94c90b7..90fb5aff9f0 100644 --- a/htdocs/externalsite/admin/externalsite.php +++ b/htdocs/externalsite/admin/externalsite.php @@ -76,7 +76,7 @@ if ($action == 'update') llxHeader(); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("ExternalSiteSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("ExternalSiteSetup"),$linkback,'title_setup'); print '
'; print $langs->trans("Module100Desc")."
\n"; diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php index b684bf7a665..955b66f0beb 100644 --- a/htdocs/fichinter/admin/fichinter_extrafields.php +++ b/htdocs/fichinter/admin/fichinter_extrafields.php @@ -67,7 +67,7 @@ $textobject=$langs->transnoentitiesnoconv("Interventions"); llxHeader(); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setup'); $head=fichinter_admin_prepare_head(); diff --git a/htdocs/fichinter/admin/fichinterdet_extrafields.php b/htdocs/fichinter/admin/fichinterdet_extrafields.php index c89f2294eb6..776229a4c29 100644 --- a/htdocs/fichinter/admin/fichinterdet_extrafields.php +++ b/htdocs/fichinter/admin/fichinterdet_extrafields.php @@ -67,7 +67,7 @@ $textobject=$langs->transnoentitiesnoconv("Interventions"); llxHeader(); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setup'); $head=fichinter_admin_prepare_head(); diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 3cb613934b9..a247341cdec 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -960,7 +960,7 @@ if ($action == 'create') $soc=new Societe($db); - print_fiche_titre($langs->trans("AddIntervention")); + print load_fiche_titre($langs->trans("AddIntervention")); dol_htmloutput_mesg($mesg); @@ -1804,7 +1804,7 @@ else if ($id > 0 || ! empty($ref)) print '
'; print '
'; - print_fiche_titre($langs->trans('SendInterventionByMail')); + print load_fiche_titre($langs->trans('SendInterventionByMail')); dol_fiche_head(''); diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php index 6885dca361a..81a2db9621c 100644 --- a/htdocs/fichinter/index.php +++ b/htdocs/fichinter/index.php @@ -55,7 +55,7 @@ $help_url="EN:ModuleFichinters|FR:Module_Fiche_Interventions|ES:Módulo_FichaInt llxHeader("",$langs->trans("Interventions"),$help_url); -print_fiche_titre($langs->trans("InterventionsArea")); +print load_fiche_titre($langs->trans("InterventionsArea")); //print ''; //print '
'; diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index bb01b5b8f6a..4667200fdfc 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1408,7 +1408,7 @@ $productstatic = new Product($db); $now=dol_now(); if ($action=='create') { - print_fiche_titre($langs->trans('NewOrder')); + print load_fiche_titre($langs->trans('NewOrder')); dol_htmloutput_events(); @@ -2305,7 +2305,7 @@ elseif (! empty($object->id)) print '
'; print '
'; - print_fiche_titre($langs->trans('SendOrderByMail')); + print load_fiche_titre($langs->trans('SendOrderByMail')); dol_fiche_head(''); @@ -2795,7 +2795,7 @@ elseif (! empty($object->id)) print ''; print ''; print ''; - print_fiche_titre($langs->trans("ToOrder"),'',''); + print load_fiche_titre($langs->trans("ToOrder"),'',''); print ''; //print ''; print '
'.$langs->trans("ToOrder").'
'.$langs->trans("OrderDate").''; @@ -2823,7 +2823,7 @@ elseif (! empty($object->id)) print ''; print ''; print ''; - print_fiche_titre($langs->trans("Receive"),'',''); + print load_fiche_titre($langs->trans("Receive"),'',''); print ''; //print ''; print '
'.$langs->trans("Receive").'
'.$langs->trans("DeliveryDate").''; diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php index c877589851d..cb91a65b341 100644 --- a/htdocs/fourn/commande/index.php +++ b/htdocs/fourn/commande/index.php @@ -48,7 +48,7 @@ $commandestatic = new CommandeFournisseur($db); $userstatic=new User($db); $formfile = new FormFile($db); -print_fiche_titre($langs->trans("SuppliersOrdersArea")); +print load_fiche_titre($langs->trans("SuppliersOrdersArea")); print ''; print '
'; diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php index a1fa57f97f4..6fa03cb0475 100644 --- a/htdocs/fourn/commande/orderstoinvoice.php +++ b/htdocs/fourn/commande/orderstoinvoice.php @@ -262,7 +262,7 @@ $companystatic = new Societe($db); if ($action == 'create' && !$error) { llxHeader(); - print_fiche_titre($langs->trans('NewBill')); + print load_fiche_titre($langs->trans('NewBill')); $soc = new Societe($db); if ($socid) @@ -442,7 +442,7 @@ if (($action != 'create' && $action != 'add') && !$error) { $title = $langs->trans('ListOfSupplierOrders'); $title .= ' - ' . $langs->trans('StatusOrderReceivedAllShort'); $num = $db->num_rows($resql); - print_fiche_titre($title); + print load_fiche_titre($title); $i = 0; $period = $html->select_date($date_start, 'date_start', 0, 0, 1, '', 1, 0, 1) . ' - ' . $html->select_date($date_end, 'date_end', 0, 0, 1, '', 1, 0, 1); $periodely = $html->select_date($date_starty, 'date_start_dely', 0, 0, 1, '', 1, 0, 1) . ' - ' . $html->select_date($date_endy, 'date_end_dely', 0, 0, 1, '', 1, 0, 1); diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 6bd70261a09..5a54cc84068 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -1238,7 +1238,7 @@ if ($action == 'create') $facturestatic = new FactureFournisseur($db); $extralabels = $extrafields->fetch_name_optionals_label($facturestatic->table_element); - print_fiche_titre($langs->trans('NewBill')); + print load_fiche_titre($langs->trans('NewBill')); dol_htmloutput_events(); @@ -2310,7 +2310,7 @@ else print '
'; print '
'; - print_fiche_titre($langs->trans('SendBillByMail')); + print load_fiche_titre($langs->trans('SendBillByMail')); dol_fiche_head(''); diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php index dbe235cdebc..ecb6b990a64 100644 --- a/htdocs/fourn/facture/impayees.php +++ b/htdocs/fourn/facture/impayees.php @@ -181,7 +181,7 @@ if ($user->rights->fournisseur->facture->lire) $link=''; if (empty($option)) $link=''.$langs->trans("ShowUnpaidLateOnly").''; elseif ($option == 'late') $link=''.$langs->trans("ShowUnpaidAll").''; - print_fiche_titre($titre,$link); + print load_fiche_titre($titre,$link); print_barre_liste('','',$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',0); // We don't want pagination on this page $i = 0; diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index 758885cef58..6b574ba3d05 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -271,7 +271,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie $obj = $db->fetch_object($resql); $total = $obj->total; - print_fiche_titre($langs->trans('DoPayment')); + print load_fiche_titre($langs->trans('DoPayment')); print ''; print ''; diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index 29f12fed38f..bc16806cdc2 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/index.php @@ -48,7 +48,7 @@ $companystatic=new Societe($db); llxHeader("",$langs->trans("SuppliersArea")); -print_fiche_titre($langs->trans("SuppliersArea")); +print load_fiche_titre($langs->trans("SuppliersArea")); //print ''; diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php index c09f52b8407..eb976acb4a0 100644 --- a/htdocs/fourn/recap-fourn.php +++ b/htdocs/fourn/recap-fourn.php @@ -86,7 +86,7 @@ if ($socid > 0) if (! empty($conf->fournisseur->enabled) && $user->rights->facture->lire) { // Invoices list - print_fiche_titre($langs->trans("SupplierPreview")); + print load_fiche_titre($langs->trans("SupplierPreview")); print '
'; diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php index 2ba73f0ee2a..de3a470ba90 100644 --- a/htdocs/ftp/admin/ftpclient.php +++ b/htdocs/ftp/admin/ftpclient.php @@ -138,7 +138,7 @@ $form=new Form($db); llxHeader(); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("FTPClientSetup"), $linkback, 'title_setup'); +print load_fiche_titre($langs->trans("FTPClientSetup"), $linkback, 'title_setup'); print '
'; if (! function_exists('ftp_connect')) diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php index afcb32811a9..b26e7b96f86 100644 --- a/htdocs/ftp/index.php +++ b/htdocs/ftp/index.php @@ -396,7 +396,7 @@ $userstatic = new User($db); // List -print_fiche_titre($langs->trans("FTPArea")); +print load_fiche_titre($langs->trans("FTPArea")); print $langs->trans("FTPAreaDesc")."
"; diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index ebda47dd196..0162f29c59c 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -678,7 +678,7 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create else { // Formulaire de demande de congés payés - print_fiche_titre($langs->trans('MenuAddCP'), '', 'title_hrm.png'); + print load_fiche_titre($langs->trans('MenuAddCP'), '', 'title_hrm.png'); // Si il y a une erreur if (GETPOST('error')) { @@ -896,7 +896,7 @@ else $userRequest = new User($db); $userRequest->fetch($cp->fk_user); - //print_fiche_titre($langs->trans('TitreRequestCP')); + //print load_fiche_titre($langs->trans('TitreRequestCP')); // Si il y a une erreur if (GETPOST('error')) diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index 3c5d9f40ab4..62ad088a5ef 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -149,7 +149,7 @@ $userstatic=new User($db); llxHeader(array(),$langs->trans('CPTitreMenu')); -print_fiche_titre($langs->trans('MenuConfCP'), '', 'title_hrm.png'); +print load_fiche_titre($langs->trans('MenuConfCP'), '', 'title_hrm.png'); print '
'.$langs->trans('LastUpdateCP').': '."\n"; if ($holiday->getConfCP('lastUpdate')) print ''.dol_print_date($db->jdate($holiday->getConfCP('lastUpdate')),'dayhour','tzuser').''; @@ -173,7 +173,7 @@ if ($cp_events == 1) print '
'."\n"; print ''; - print_fiche_titre($langs->trans('DefineEventUserCP'),'',''); + print load_fiche_titre($langs->trans('DefineEventUserCP'),'',''); print $langs->trans('MotifCP').' : '; print $holiday->selectEventCP(); diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index 4e10fbf925c..ee4465a4aee 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -198,7 +198,7 @@ else // Si erreur SQL if ($holiday_payes == '-1') { - print_fiche_titre($langs->trans('CPTitreMenu'), '', 'title_hrm.png'); + print load_fiche_titre($langs->trans('CPTitreMenu'), '', 'title_hrm.png'); dol_print_error($db, $langs->trans('Error').' '.$holiday->error); exit(); diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php index caf04e90bd1..e1204429100 100644 --- a/htdocs/holiday/month_report.php +++ b/htdocs/holiday/month_report.php @@ -71,7 +71,7 @@ $sql.= " ORDER BY u.lastname,cp.date_debut"; $result = $db->query($sql); $num = $db->num_rows($result); -print_fiche_titre($langs->trans('MenuReportMonth'), '', 'title_hrm.png'); +print load_fiche_titre($langs->trans('MenuReportMonth'), '', 'title_hrm.png'); // Get month of last update $lastUpdate = $cp->getConfCP('lastUpdate', 0); diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index 360e713f9ab..98da9584308 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.php @@ -41,7 +41,7 @@ $form=new Form($db); llxHeader('',$langs->trans("ImportArea"),'EN:Module_Imports_En|FR:Module_Imports|ES:Módulo_Importaciones'); -print_fiche_titre($langs->trans("ImportArea")); +print load_fiche_titre($langs->trans("ImportArea")); print $langs->trans("FormatedImportDesc1").'
'; print $langs->trans("FormatedImportDesc2").'
'; diff --git a/htdocs/index.php b/htdocs/index.php index 7462b05b3e7..ef87f437084 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -71,7 +71,7 @@ if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$langs->trans("HomeAr llxHeader('',$title); -print_fiche_titre($langs->trans("HomeArea"),'','title_home'); +print load_fiche_titre($langs->trans("HomeArea"),'','title_home'); if (! empty($conf->global->MAIN_MOTD)) { diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php index 54e45080efb..ec4feeb6bf9 100644 --- a/htdocs/livraison/card.php +++ b/htdocs/livraison/card.php @@ -238,7 +238,7 @@ $formfile = new FormFile($db); if ($action == 'create') { - print_fiche_titre($langs->trans("CreateADeliveryOrder")); + print load_fiche_titre($langs->trans("CreateADeliveryOrder")); if ($mesg) { diff --git a/htdocs/loan/calc.php b/htdocs/loan/calc.php index 6c96f01420a..e73b5e0f255 100644 --- a/htdocs/loan/calc.php +++ b/htdocs/loan/calc.php @@ -121,7 +121,7 @@ if (! empty($errors)) { llxHeader(); -print_fiche_titre($langs->trans("LoanCalc")); +print load_fiche_titre($langs->trans("LoanCalc")); print $langs->trans('LoanCalcDesc'); print ''; diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php index 0c8309e7244..c5e60a1aced 100644 --- a/htdocs/loan/card.php +++ b/htdocs/loan/card.php @@ -183,7 +183,7 @@ if ($action == 'create') //WYSIWYG Editor require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; - print_fiche_titre($langs->trans("NewLoan")); + print load_fiche_titre($langs->trans("NewLoan")); $datec = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int')); diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php index 87412dadcd2..31985251300 100644 --- a/htdocs/loan/index.php +++ b/htdocs/loan/index.php @@ -92,7 +92,7 @@ if ($resql) $i = 0; $var=true; - print_fiche_titre($langs->trans("Loans")); + print load_fiche_titre($langs->trans("Loans")); print ''."\n"; print '
'; diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php index a9e33fc54a2..e7416c1aa0d 100644 --- a/htdocs/loan/payment/payment.php +++ b/htdocs/loan/payment/payment.php @@ -156,7 +156,7 @@ if ($_GET["action"] == 'create') { $total = $loan->capital; - print_fiche_titre($langs->trans("DoPayment")); + print load_fiche_titre($langs->trans("DoPayment")); print "
\n"; print ''; diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php index 2ad51c4fb28..0c561f99bc9 100644 --- a/htdocs/margin/admin/margin.php +++ b/htdocs/margin/admin/margin.php @@ -113,14 +113,14 @@ llxHeader('',$langs->trans("margesSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("margesSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("margesSetup"),$linkback,'title_setup'); $head = marges_admin_prepare_head(); dol_fiche_head($head, 'parameters', $langs->trans("Margins"), 0, 'margin'); -print_fiche_titre($langs->trans("MemberMainOptions"),'',''); +print load_fiche_titre($langs->trans("MemberMainOptions"),'',''); print '
'; print ''; print ''; diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index 32525114ee3..bad64c262dd 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -80,7 +80,7 @@ $form = new Form($db); llxHeader('',$langs->trans("Margins").' - '.$langs->trans("Agents")); $text=$langs->trans("Margins"); -//print_fiche_titre($text); +//print load_fiche_titre($text); // Show tabs $head=marges_prepare_head($user); diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php index 79c241a9d7e..93f3220d12c 100644 --- a/htdocs/margin/customerMargins.php +++ b/htdocs/margin/customerMargins.php @@ -66,7 +66,7 @@ $form = new Form($db); llxHeader('',$langs->trans("Margins").' - '.$langs->trans("Clients")); $text=$langs->trans("Margins"); -//print_fiche_titre($text); +//print load_fiche_titre($text); // Show tabs $head=marges_prepare_head($user); diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php index 07d4a75a522..0993f59f631 100644 --- a/htdocs/margin/productMargins.php +++ b/htdocs/margin/productMargins.php @@ -89,7 +89,7 @@ $form = new Form($db); llxHeader('',$langs->trans("Margins").' - '.$langs->trans("Products")); $text=$langs->trans("Margins"); -//print_fiche_titre($text); +//print load_fiche_titre($text); // Show tabs $head=marges_prepare_head($user); diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php index 87373c571f8..200659c856e 100644 --- a/htdocs/opensurvey/card.php +++ b/htdocs/opensurvey/card.php @@ -361,7 +361,7 @@ print '
'; print ''."\n"; -print_fiche_titre($langs->trans("CommentsOfVoters"),'',''); +print load_fiche_titre($langs->trans("CommentsOfVoters"),'',''); // Comment list $comments = $object->getComments(); diff --git a/htdocs/opensurvey/index.php b/htdocs/opensurvey/index.php index 08c8f8d7d95..93e913c1585 100644 --- a/htdocs/opensurvey/index.php +++ b/htdocs/opensurvey/index.php @@ -48,7 +48,7 @@ else dol_print_error($db,''); -print_fiche_titre($langs->trans("OpenSurveyArea")); +print load_fiche_titre($langs->trans("OpenSurveyArea")); print '
'; diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php index cea060d75f4..4844d9f8e59 100644 --- a/htdocs/opensurvey/list.php +++ b/htdocs/opensurvey/list.php @@ -79,7 +79,7 @@ $fieldtosortuser=empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?'firstname': print '
'."\n"; -print_fiche_titre($langs->trans("OpenSurveyArea")); +print load_fiche_titre($langs->trans("OpenSurveyArea")); // List of surveys into database diff --git a/htdocs/opensurvey/wizard/choix_autre.php b/htdocs/opensurvey/wizard/choix_autre.php index 6b4cceaae0d..9797762d6cb 100644 --- a/htdocs/opensurvey/wizard/choix_autre.php +++ b/htdocs/opensurvey/wizard/choix_autre.php @@ -121,7 +121,7 @@ if (empty($_SESSION['titre'])) print ''."\n"; -print_fiche_titre($langs->trans("CreatePoll").' (2 / 2)'); +print load_fiche_titre($langs->trans("CreatePoll").' (2 / 2)'); print '
'. $langs->trans("PollOnChoice") .'

'."\n"; diff --git a/htdocs/opensurvey/wizard/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php index cc08434cd50..6a1efd39617 100644 --- a/htdocs/opensurvey/wizard/choix_date.php +++ b/htdocs/opensurvey/wizard/choix_date.php @@ -330,7 +330,7 @@ else //Debut du formulaire et bandeaux de tete print ''."\n"; -print_fiche_titre($langs->trans("CreatePoll").' (2 / 2)'); +print load_fiche_titre($langs->trans("CreatePoll").' (2 / 2)'); //affichage de l'aide pour les jours print '
'."\n"; diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php index 5f14e6387f1..22dddffbff5 100644 --- a/htdocs/opensurvey/wizard/create_survey.php +++ b/htdocs/opensurvey/wizard/create_survey.php @@ -131,7 +131,7 @@ $arrayofjs=array(); $arrayofcss=array('/opensurvey/css/style.css'); llxHeader('', $langs->trans("OpenSurvey"), '', "", 0, 0, $arrayofjs, $arrayofcss); -print_fiche_titre($langs->trans("CreatePoll").' (1 / 2)'); +print load_fiche_titre($langs->trans("CreatePoll").' (1 / 2)'); //debut du formulaire print ''."\n"; diff --git a/htdocs/opensurvey/wizard/index.php b/htdocs/opensurvey/wizard/index.php index 1f324a52a58..68f75f3bce7 100644 --- a/htdocs/opensurvey/wizard/index.php +++ b/htdocs/opensurvey/wizard/index.php @@ -41,7 +41,7 @@ $arrayofjs=array(); $arrayofcss=array('/opensurvey/css/style.css'); llxHeader('', $langs->trans("Survey"), '', "", 0, 0, $arrayofjs, $arrayofcss); -print_fiche_titre($langs->trans("CreatePoll")); +print load_fiche_titre($langs->trans("CreatePoll")); print ''; print '
'; diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php index 20855975880..5a7301613c4 100644 --- a/htdocs/paybox/admin/paybox.php +++ b/htdocs/paybox/admin/paybox.php @@ -91,7 +91,7 @@ if (empty($conf->global->PAYBOX_IBS_DEVISE)) $conf->global->PAYBOX_IBS_DEVISE=$I llxHeader(); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("PayBoxSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("PayBoxSetup"),$linkback,'title_setup'); print $langs->trans("PayBoxDesc")."
\n"; diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php index a0127cd85d9..fd649b825bc 100644 --- a/htdocs/paypal/admin/paypal.php +++ b/htdocs/paypal/admin/paypal.php @@ -93,7 +93,7 @@ llxHeader('',$langs->trans("PaypalSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("ModuleSetup").' PayPal',$linkback); +print load_fiche_titre($langs->trans("ModuleSetup").' PayPal',$linkback); print '
'; $head=paypaladmin_prepare_head(); diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php index d848b0befce..cc97b7cc9f7 100644 --- a/htdocs/printing/admin/printing.php +++ b/htdocs/printing/admin/printing.php @@ -107,7 +107,7 @@ $form = new Form($db); llxHeader('',$langs->trans("PrintingSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("PrintingSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("PrintingSetup"),$linkback,'title_setup'); $head=printingadmin_prepare_head($mode); diff --git a/htdocs/printing/index.php b/htdocs/printing/index.php index 48795fbab4c..1ff3859565c 100644 --- a/htdocs/printing/index.php +++ b/htdocs/printing/index.php @@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/dolprintipp.class.php'; llxHeader("",$langs->trans("Printing")); -print_fiche_titre($langs->trans("Printing")); +print load_fiche_titre($langs->trans("Printing")); // List Jobs from printing modules $printer = new dolPrintIPP($db,$conf->global->PRINTIPP_HOST,$conf->global->PRINTIPP_PORT,$user->login,$conf->global->PRINTIPP_USER,$conf->global->PRINTIPP_PASSWORD); diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php index f45ea9449c6..79d7cdebfc2 100644 --- a/htdocs/product/admin/dynamic_prices.php +++ b/htdocs/product/admin/dynamic_prices.php @@ -144,7 +144,7 @@ if (!empty($action) && empty($cancel)) { //Header llxHeader("","",$langs->trans("CardProduct".$product->type)); -print_fiche_titre($langs->trans("DynamicPriceConfiguration")); +print load_fiche_titre($langs->trans("DynamicPriceConfiguration")); $form = new Form($db); //Global variables table diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index 9c9d52d610e..9c264f893b3 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -225,7 +225,7 @@ else if (empty($conf->service->enabled)) llxHeader('',$title); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($title,$linkback,'title_setup'); +print load_fiche_titre($title,$linkback,'title_setup'); $head = product_admin_prepare_head(); dol_fiche_head($head, 'general', $tab, 0, 'product'); diff --git a/htdocs/product/admin/product_extrafields.php b/htdocs/product/admin/product_extrafields.php index c4ae01708cc..3c7cc30b7a3 100644 --- a/htdocs/product/admin/product_extrafields.php +++ b/htdocs/product/admin/product_extrafields.php @@ -78,7 +78,7 @@ llxHeader('',$title); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($title,$linkback,'title_setup'); +print load_fiche_titre($title,$linkback,'title_setup'); $head = product_admin_prepare_head(); diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php index deaf53f0bd2..1f2820358e1 100644 --- a/htdocs/product/admin/product_tools.php +++ b/htdocs/product/admin/product_tools.php @@ -246,7 +246,7 @@ $title = $langs->trans('ModulesSystemTools'); llxHeader('',$title); -print_fiche_titre($title,'','title_setup'); +print load_fiche_titre($title,'','title_setup'); print $langs->trans("ProductVatMassChangeDesc").'

'; diff --git a/htdocs/product/canvas/product/tpl/card_create.tpl.php b/htdocs/product/canvas/product/tpl/card_create.tpl.php index 3f5ebdcbc0b..81ddb147fe3 100644 --- a/htdocs/product/canvas/product/tpl/card_create.tpl.php +++ b/htdocs/product/canvas/product/tpl/card_create.tpl.php @@ -22,7 +22,7 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe -trans("Product")); ?> +trans("Product")); ?> 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 9b403c22316..822cb03a6e0 100644 --- a/htdocs/product/canvas/product/tpl/card_edit.tpl.php +++ b/htdocs/product/canvas/product/tpl/card_edit.tpl.php @@ -23,7 +23,7 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe trans("Product")); +print load_fiche_titre($langs->trans("Product")); dol_htmloutput_errors($object->error,$object->errors); ?> diff --git a/htdocs/product/canvas/service/tpl/card_create.tpl.php b/htdocs/product/canvas/service/tpl/card_create.tpl.php index c9bb423d0a2..9d526383a67 100644 --- a/htdocs/product/canvas/service/tpl/card_create.tpl.php +++ b/htdocs/product/canvas/service/tpl/card_create.tpl.php @@ -23,7 +23,7 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe -trans("Service")); ?> +trans("Service")); ?> 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 9f64bebd042..fd403e647c6 100644 --- a/htdocs/product/canvas/service/tpl/card_edit.tpl.php +++ b/htdocs/product/canvas/service/tpl/card_edit.tpl.php @@ -23,7 +23,7 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe trans("Service")); +print load_fiche_titre($langs->trans("Service")); dol_htmloutput_errors($object->error,$object->errors); ?> diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 18e0153ed77..96105cea37d 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -806,7 +806,7 @@ else if ($type==1) $title=$langs->trans("NewService"); else $title=$langs->trans("NewProduct"); $linkback=""; - print_fiche_titre($title,$linkback,'title_products.png'); + print load_fiche_titre($title,$linkback,'title_products.png'); dol_fiche_head(''); @@ -1060,7 +1060,7 @@ else $type = $langs->trans('Product'); if ($object->isservice()) $type = $langs->trans('Service'); - //print_fiche_titre($langs->trans('Modify').' '.$type.' : '.(is_object($object->oldcopy)?$object->oldcopy->ref:$object->ref), ""); + //print load_fiche_titre($langs->trans('Modify').' '.$type.' : '.(is_object($object->oldcopy)?$object->oldcopy->ref:$object->ref), ""); // Main official, simple, and not duplicated code print ''."\n"; diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php index 96e4c955cd6..b813ad786ac 100644 --- a/htdocs/product/composition/card.php +++ b/htdocs/product/composition/card.php @@ -260,7 +260,7 @@ if ($id > 0 || ! empty($ref)) //if (count($prodsfather) > 0) //{ - print_fiche_titre($langs->trans("ProductParentList"),'','').'
'; + print load_fiche_titre($langs->trans("ProductParentList"),'','').'
'; print '
'.$langs->trans("Description").'
'; print ''; print ''; @@ -308,7 +308,7 @@ if ($id > 0 || ! empty($ref)) //if (count($prods_arbo) > 0) //{ $atleastonenotdefined=0; - print_fiche_titre($langs->trans("ProductAssociationList"),'','').'
'; + print load_fiche_titre($langs->trans("ProductAssociationList"),'','').'
'; print ''; print ''; @@ -458,7 +458,7 @@ if ($id > 0 || ! empty($ref)) $rowspan=1; if (! empty($conf->categorie->enabled)) $rowspan++; - print_fiche_titre($langs->trans("ProductToAddSearch"),'',''); + print load_fiche_titre($langs->trans("ProductToAddSearch"),'',''); print ''; print '
'.$langs->trans('ParentProduct').'
'; print ''; diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php index e05ad53a27e..ba00d3be3bd 100644 --- a/htdocs/product/dynamic_price/editor.php +++ b/htdocs/product/dynamic_price/editor.php @@ -163,7 +163,7 @@ if ($action == 'delete') //Header llxHeader("","",$langs->trans("CardProduct".$product->type)); -print_fiche_titre($langs->trans("PriceExpressionEditor")); +print load_fiche_titre($langs->trans("PriceExpressionEditor")); $form = new Form($db); //Form/Table diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 866abd856b1..f7f2c891ac7 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -311,11 +311,11 @@ if ($id || $ref) if ($rowid) { $product->fetch_product_fournisseur_price($rowid, 1); //Ignore the math expression when getting the price - print_fiche_titre($langs->trans("ChangeSupplierPrice")); + print load_fiche_titre($langs->trans("ChangeSupplierPrice")); } else { - print_fiche_titre($langs->trans("AddSupplierPrice")); + print load_fiche_titre($langs->trans("AddSupplierPrice")); } print ''; diff --git a/htdocs/product/index.php b/htdocs/product/index.php index 1b8babd9a36..efa1bc33dcb 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -69,7 +69,7 @@ if ((isset($_GET["type"]) && $_GET["type"] == 1) || empty($conf->product->enable llxHeader("",$langs->trans("ProductsAndServices"),$helpurl); $linkback=""; -print_fiche_titre($transAreaType,$linkback,'title_products.png'); +print load_fiche_titre($transAreaType,$linkback,'title_products.png'); print '
'; diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index 8f419aa3679..c8da665dd98 100644 --- a/htdocs/product/popuprop.php +++ b/htdocs/product/popuprop.php @@ -75,7 +75,7 @@ else if ($type == '1') llxHeader('','',$helpurl); -print_fiche_titre($title, $mesg,'title_products.png'); +print load_fiche_titre($title, $mesg,'title_products.png'); $param = ''; diff --git a/htdocs/product/price.php b/htdocs/product/price.php index b3b884cbd7e..9c1331f61ce 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -683,7 +683,7 @@ if (! $action || $action == 'delete' || $action == 'showlog_customer_price' || $ */ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->service->creer)) { - print_fiche_titre($langs->trans("NewPrice"), ''); + print load_fiche_titre($langs->trans("NewPrice"), ''); if (empty($conf->global->PRODUIT_MULTIPRICES)) { @@ -880,7 +880,7 @@ if ($result) if ($num > 0) { - if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print_fiche_titre($langs->trans("DefaultPrice"),'',''); + if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print load_fiche_titre($langs->trans("DefaultPrice"),'',''); print ''; @@ -1013,7 +1013,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) // Create mode $maxpricesupplier = $object->min_recommended_price(); - print_fiche_titre($langs->trans('PriceByCustomer')); + print load_fiche_titre($langs->trans('PriceByCustomer')); print ''; print ''; @@ -1092,7 +1092,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) // Edit mode $maxpricesupplier = $object->min_recommended_price(); - print_fiche_titre($langs->trans('PriceByCustomer')); + print load_fiche_titre($langs->trans('PriceByCustomer')); $result = $prodcustprice->fetch(GETPOST('lineid', 'int')); if ($result < 0) { diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index 22ed390bc8f..9be03e9dee0 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -174,7 +174,7 @@ llxHeader("",$langs->trans("WarehouseCard"),$help_url); if ($action == 'create') { - print_fiche_titre($langs->trans("NewWarehouse")); + print load_fiche_titre($langs->trans("NewWarehouse")); print "\n"; print ''; diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php index f5d2b9829b8..cfc9f4a7b7a 100644 --- a/htdocs/product/stock/index.php +++ b/htdocs/product/stock/index.php @@ -40,7 +40,7 @@ $result=restrictedArea($user,'stock'); $help_url='EN:Module_Stocks_En|FR:Module_Stock|ES:Módulo_Stocks'; llxHeader("",$langs->trans("Stocks"),$help_url); -print_fiche_titre($langs->trans("StocksArea")); +print load_fiche_titre($langs->trans("StocksArea")); //print '
'; diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php index 1749eb2d8c8..ba322ac9c61 100644 --- a/htdocs/product/stock/massstockmove.php +++ b/htdocs/product/stock/massstockmove.php @@ -325,7 +325,7 @@ $title = $langs->trans('MassMovement'); llxHeader('', $title); -print_fiche_titre($langs->trans("MassStockMovement")).'

'; +print load_fiche_titre($langs->trans("MassStockMovement")).'

'; $titletoadd=$langs->trans("Select"); $titletoaddnoent=$langs->transnoentitiesnoconv("Select"); diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index 39f728263ad..be97ad37a33 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -56,7 +56,7 @@ if ($mine) $title=$langs->trans("MyActivities"); llxHeader("",$title); -print_fiche_titre($title, '', 'title_project'); +print load_fiche_titre($title, '', 'title_project'); if ($mine) print $langs->trans("MyTasksDesc").'

'; else @@ -393,7 +393,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) $num = $db->num_rows($resql); $i = 0; - //print_fiche_titre($langs->trans("TasksOnOpenedProject"),'','').'
'; + //print load_fiche_titre($langs->trans("TasksOnOpenedProject"),'','').'
'; print '
'; print ''; diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php index 1b6e098fa4d..686e764978a 100644 --- a/htdocs/projet/admin/project.php +++ b/htdocs/projet/admin/project.php @@ -314,7 +314,7 @@ llxHeader("",$langs->trans("ProjectsSetup")); $form=new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'title_setup'); $head=project_admin_prepare_head(); diff --git a/htdocs/projet/admin/project_extrafields.php b/htdocs/projet/admin/project_extrafields.php index 399b1f53b99..39786f5ad71 100644 --- a/htdocs/projet/admin/project_extrafields.php +++ b/htdocs/projet/admin/project_extrafields.php @@ -65,7 +65,7 @@ $textobject=$langs->transnoentitiesnoconv("Project"); llxHeader("",$langs->trans("ProjectsSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'title_setup'); $head = project_admin_prepare_head(); diff --git a/htdocs/projet/admin/project_task_extrafields.php b/htdocs/projet/admin/project_task_extrafields.php index 412aad16ca0..e9dc8be64e1 100644 --- a/htdocs/projet/admin/project_task_extrafields.php +++ b/htdocs/projet/admin/project_task_extrafields.php @@ -65,7 +65,7 @@ $textobject=$langs->transnoentitiesnoconv("Project"); llxHeader("",$langs->trans("ProjectsSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'title_setup'); $head = project_admin_prepare_head(); diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 24968839960..0e6b73a59af 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -411,7 +411,7 @@ if ($action == 'create' && $user->rights->projet->creer) $thirdparty=new Societe($db); if ($socid > 0) $thirdparty->fetch($socid); - print_fiche_titre($langs->trans("NewProject"), '', 'title_project'); + print load_fiche_titre($langs->trans("NewProject"), '', 'title_project'); print ''; print ''; diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 5ef872e3185..796d215ea12 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -530,7 +530,7 @@ foreach ($listofreferent as $key => $value) $addform.=''; } - print_fiche_titre($langs->trans($title), $addform, ''); + print load_fiche_titre($langs->trans($title), $addform, ''); print '
'; diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 2625b1f8503..95e4ce98a5e 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -62,7 +62,7 @@ llxHeader("",$langs->trans("Projects"),"EN:Module_Projects|FR:Module_Projets|ES: $text=$langs->trans("Projects"); if ($mine) $text=$langs->trans("MyProjects"); -print_fiche_titre($text,'','title_project.png'); +print load_fiche_titre($text,'','title_project.png'); // Show description of content if ($mine) print $langs->trans("MyProjectsDesc").'

'; diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php index 5e81be3bf78..42d367ce833 100644 --- a/htdocs/projet/stats/index.php +++ b/htdocs/projet/stats/index.php @@ -60,7 +60,7 @@ llxHeader('', $langs->trans('Projects')); $title=$langs->trans("ProjectsStatistics"); $dir=$conf->projet->dir_output.'/temp'; -print_fiche_titre($title,'','title_project.png'); +print load_fiche_titre($title,'','title_project.png'); dol_mkdir($dir); diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 018bf862bba..e4f919c8ed1 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -266,7 +266,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third { if ($id > 0 || ! empty($ref)) print '
'; - print_fiche_titre($langs->trans("NewTask"), '', 'title_project'); + print load_fiche_titre($langs->trans("NewTask"), '', 'title_project'); print ''; print ''; diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php index 8a98ea4c4c3..908ad220f72 100644 --- a/htdocs/public/members/public_card.php +++ b/htdocs/public/members/public_card.php @@ -79,7 +79,7 @@ if ($id > 0) if ($res < 0) { dol_print_error($db,$object->error); exit; } $res=$object->fetch_optionals($object->id,$extralabels); - print_fiche_titre($langs->trans("MemberCard"), '', ''); + print load_fiche_titre($langs->trans("MemberCard"), '', ''); if (empty($object->public)) { diff --git a/htdocs/resource/add.php b/htdocs/resource/add.php index 6243a0d270c..3618230a374 100644 --- a/htdocs/resource/add.php +++ b/htdocs/resource/add.php @@ -123,7 +123,7 @@ if (! $action) { $pagetitle=$langs->trans('AddResource'); llxHeader('',$pagetitle,''); - print_fiche_titre($pagetitle,'','title_generic'); + print load_fiche_titre($pagetitle,'','title_generic'); print ''; print ''; diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php index 1bda4696a39..5c2414d22a2 100644 --- a/htdocs/resource/element_resource.php +++ b/htdocs/resource/element_resource.php @@ -244,7 +244,7 @@ else - //print_fiche_titre($langs->trans('ResourcesLinkedToElement'),'',''); + //print load_fiche_titre($langs->trans('ResourcesLinkedToElement'),'',''); diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php index 29ae4a42803..a1d5e0e209c 100644 --- a/htdocs/resource/list.php +++ b/htdocs/resource/list.php @@ -89,7 +89,7 @@ llxHeader('',$pagetitle,''); $form=new Form($db); -print_fiche_titre($pagetitle,'','title_generic'); +print load_fiche_titre($pagetitle,'','title_generic'); // Confirmation suppression resource line if ($action == 'delete_resource') diff --git a/htdocs/societe/admin/contact_extrafields.php b/htdocs/societe/admin/contact_extrafields.php index 634b3ad83d0..56bf58cf61d 100644 --- a/htdocs/societe/admin/contact_extrafields.php +++ b/htdocs/societe/admin/contact_extrafields.php @@ -65,7 +65,7 @@ llxHeader('',$langs->trans("CompanySetup"),$help_url); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup'); $head = societe_admin_prepare_head(); diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index f8580c1e171..10f5ab29045 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -288,7 +288,7 @@ $help_url='EN:Module Third Parties setup|FR:Paramétrage_du_module_Tiers|ES:Conf llxHeader('',$langs->trans("CompanySetup"),$help_url); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup'); $head = societe_admin_prepare_head(); diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php index 04c0155634b..89f44d53aa7 100644 --- a/htdocs/societe/admin/societe_extrafields.php +++ b/htdocs/societe/admin/societe_extrafields.php @@ -66,7 +66,7 @@ llxHeader('',$langs->trans("CompanySetup"),$help_url); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup'); $head = societe_admin_prepare_head(); diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php index 13d669789e7..152cd5d9a3f 100644 --- a/htdocs/societe/checkvat/checkVatPopup.php +++ b/htdocs/societe/checkvat/checkVatPopup.php @@ -39,7 +39,7 @@ print ''; print '
'; print '
'; -print_fiche_titre($langs->trans("VATIntraCheckableOnEUSite"),'','title_setup'); +print load_fiche_titre($langs->trans("VATIntraCheckableOnEUSite"),'','title_setup'); if (! $_REQUEST["vatNumber"]) diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index d8723ceabcf..c8da9ae9f89 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -48,7 +48,7 @@ $helpurl='EN:Module_Third_Parties|FR:Module_Tiers|ES:Módulo_Terceros'; llxHeader("",$langs->trans("ThirdParties"),$helpurl); $linkback=''; -print_fiche_titre($transAreaType,$linkback,'title_companies.png'); +print load_fiche_titre($transAreaType,$linkback,'title_companies.png'); //print '
'; diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php index 2855e82b076..483c156907a 100644 --- a/htdocs/societe/notify/card.php +++ b/htdocs/societe/notify/card.php @@ -194,7 +194,7 @@ if ($result > 0) print "\n"; // Add notification form - print_fiche_titre($langs->trans("AddNewNotification"),'',''); + print load_fiche_titre($langs->trans("AddNewNotification"),'',''); print ''; print ''; @@ -252,7 +252,7 @@ if ($result > 0) print '
'; // List of active notifications - print_fiche_titre($langs->trans("ListOfActiveNotifications"),'',''); + print load_fiche_titre($langs->trans("ListOfActiveNotifications"),'',''); $var=true; // Line with titles @@ -383,7 +383,7 @@ if ($result > 0) // List of notifications done - print_fiche_titre($langs->trans("ListOfNotificationsDone"),'',''); + print load_fiche_titre($langs->trans("ListOfNotificationsDone"),'',''); $var=true; // Line with titles diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php index f1388530317..20805502c11 100644 --- a/htdocs/societe/price.php +++ b/htdocs/societe/price.php @@ -236,7 +236,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { // Create mode - print_fiche_titre($langs->trans('PriceByCustomer')); + print load_fiche_titre($langs->trans('PriceByCustomer')); print ''; print ''; @@ -309,7 +309,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { // Edit mode - print_fiche_titre($langs->trans('PriceByCustomer')); + print load_fiche_titre($langs->trans('PriceByCustomer')); $result = $prodcustprice->fetch(GETPOST('lineid', 'int')); if ($result < 0) { diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index a35b23fb566..619d3799d1b 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -879,7 +879,7 @@ else /* Show create form */ $linkback=""; - print_fiche_titre($langs->trans("NewThirdParty"),$linkback,'title_companies.png'); + print load_fiche_titre($langs->trans("NewThirdParty"),$linkback,'title_companies.png'); if (! empty($conf->use_javascript_ajax)) { @@ -1284,7 +1284,7 @@ else * Edition */ - //print_fiche_titre($langs->trans("EditCompany")); + //print load_fiche_titre($langs->trans("EditCompany")); if ($socid) { diff --git a/htdocs/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php index d020f1afe1f..aeb3f194daf 100644 --- a/htdocs/user/admin/group_extrafields.php +++ b/htdocs/user/admin/group_extrafields.php @@ -66,7 +66,7 @@ llxHeader('',$langs->trans("UsersSetup"),$help_url); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup'); $head = user_admin_prepare_head(); diff --git a/htdocs/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php index b071887a0a2..8ebdcca9056 100644 --- a/htdocs/user/admin/user_extrafields.php +++ b/htdocs/user/admin/user_extrafields.php @@ -65,7 +65,7 @@ llxHeader('',$langs->trans("UsersSetup"),$help_url); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup'); $head = user_admin_prepare_head(); diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 5724101ec1b..85b90d80f6a 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -627,7 +627,7 @@ if (($action == 'create') || ($action == 'adduserldap')) /* */ /* ************************************************************************** */ - print_fiche_titre($langs->trans("NewUser")); + print load_fiche_titre($langs->trans("NewUser")); print $langs->trans("CreateInternalUserDesc")."
\n"; print "
"; @@ -1614,7 +1614,7 @@ else if ($canreadgroup) { - print_fiche_titre($langs->trans("ListOfGroupsForUser"),'',''); + print load_fiche_titre($langs->trans("ListOfGroupsForUser"),'',''); // On selectionne les groupes auquel fait parti le user $exclude = array(); diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index 3de421e4f4f..3d18ee61e88 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -222,7 +222,7 @@ $fuserstatic = new User($db); if ($action == 'create') { - print_fiche_titre($langs->trans("NewGroup")); + print load_fiche_titre($langs->trans("NewGroup")); print dol_set_focus('#nom'); @@ -374,7 +374,7 @@ else * Liste des utilisateurs dans le groupe */ - print_fiche_titre($langs->trans("ListOfUsersInGroup"),'',''); + print load_fiche_titre($langs->trans("ListOfUsersInGroup"),'',''); // On selectionne les users qui ne sont pas deja dans le groupe $exclude = array(); diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php index 7496d7bc816..b45615455d8 100644 --- a/htdocs/user/group/index.php +++ b/htdocs/user/group/index.php @@ -55,7 +55,7 @@ if (! $sortorder) $sortorder="ASC"; llxHeader(); -print_fiche_titre($langs->trans("ListOfGroups")); +print load_fiche_titre($langs->trans("ListOfGroups")); $sql = "SELECT g.rowid, g.nom as name, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb"; $sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g"; diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php index ccaf6687da9..23356c08889 100644 --- a/htdocs/user/hierarchy.php +++ b/htdocs/user/hierarchy.php @@ -65,7 +65,7 @@ $arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css') llxHeader('',$langs->trans("ListOfUsers"). ' ('.$langs->trans("HierarchicView").')','','',0,0,$arrayofjs,$arrayofcss); -print_fiche_titre($langs->trans("ListOfUsers"). ' ('.$langs->trans("HierarchicView").')', ''); +print load_fiche_titre($langs->trans("ListOfUsers"). ' ('.$langs->trans("HierarchicView").')', ''); diff --git a/htdocs/user/home.php b/htdocs/user/home.php index ba3b3c15586..22b6d54adda 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -53,7 +53,7 @@ $fuserstatic = new User($db); llxHeader(); -print_fiche_titre($langs->trans("MenuUsersAndGroups")); +print load_fiche_titre($langs->trans("MenuUsersAndGroups")); //print '
'; diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 9c8060e7275..f2e53987ed8 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -84,7 +84,7 @@ llxHeader('',$langs->trans("ListOfUsers")); $buttonviewhierarchy=''; -print_fiche_titre($langs->trans("ListOfUsers"), $buttonviewhierarchy); +print load_fiche_titre($langs->trans("ListOfUsers"), $buttonviewhierarchy); $sql = "SELECT u.rowid, u.lastname, u.firstname, u.admin, u.fk_soc, u.login, u.email, u.gender,"; $sql.= " u.datec,"; diff --git a/htdocs/webservices/admin/webservices.php b/htdocs/webservices/admin/webservices.php index 3f97eda6574..97b19ab8ff7 100644 --- a/htdocs/webservices/admin/webservices.php +++ b/htdocs/webservices/admin/webservices.php @@ -63,7 +63,7 @@ if ($actionsave) llxHeader(); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("WebServicesSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("WebServicesSetup"),$linkback,'title_setup'); print $langs->trans("WebServicesDesc")."
\n"; print "
\n"; From 65340667b686f09625aa02570fb66409270464b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 24 Sep 2015 18:42:35 +0200 Subject: [PATCH 09/19] [Qual] Replaced deprecated dol_microtime_float() --- htdocs/core/class/menubase.class.php | 4 ++-- htdocs/core/lib/functions.lib.php | 2 +- htdocs/main.inc.php | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php index 2c21cb3c512..cb370e31d96 100644 --- a/htdocs/core/class/menubase.class.php +++ b/htdocs/core/class/menubase.class.php @@ -511,7 +511,7 @@ class Menubase $sql.= " ORDER BY m.position, m.rowid"; //print $sql; -//$tmp1=dol_microtime_float(); +//$tmp1=microtime(true); //print '>>> 1 0
'; dol_syslog(get_class($this)."::menuLoad mymainmenu=".$mymainmenu." myleftmenu=".$myleftmenu." type_user=".$type_user." menu_handler=".$menu_handler." tabMenu size=".count($tabMenu)."", LOG_DEBUG); $resql = $this->db->query($sql); @@ -575,7 +575,7 @@ class Menubase $title = $langs->trans($menu['titre']); } } -//$tmp4=dol_microtime_float(); +//$tmp4=microtime(true); //print '>>> 3 '.($tmp4 - $tmp3).'
'; // We complete tabMenu diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 0ae89d01274..6bf1bccd223 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4938,7 +4938,7 @@ function printCommonFooter($zone='private') print 'MAIN_OPTIMIZE_SPEED='.(isset($conf->global->MAIN_OPTIMIZE_SPEED)?$conf->global->MAIN_OPTIMIZE_SPEED:'off'); if ($micro_start_time) { - $micro_end_time=dol_microtime_float(); + $micro_end_time = microtime(true); print ' - Build time: '.ceil(1000*($micro_end_time-$micro_start_time)).' ms'; } if (function_exists("memory_get_usage")) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 74a75b234ea..71dc8df10e5 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -35,7 +35,6 @@ //@ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP // For optional tuning. Enabled if environment variable MAIN_SHOW_TUNING_INFO is defined. -// A call first. Is the equivalent function dol_microtime_float not yet loaded. $micro_start_time=0; if (! empty($_SERVER['MAIN_SHOW_TUNING_INFO'])) { From bbaa76fab1addb72e05b0fcf6502675907ba902f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 24 Sep 2015 18:47:01 +0200 Subject: [PATCH 10/19] [Qual] Warning on deprecated number of values Module tabs declarations now uses 6 values including permissions. --- htdocs/core/lib/functions.lib.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 0ae89d01274..ea1669fe4d4 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4855,6 +4855,8 @@ function complete_head_from_modules($conf,$langs,$object,&$head,&$h,$type,$mode= } else if (count($values) == 5) // deprecated { + dol_syslog('Passing 5 values in tabs module_parts is deprecated. Please update to 6 with permissions.', LOG_WARNING); + if ($values[0] != $type) continue; if ($values[3]) $langs->load($values[3]); if (preg_match('/SUBSTITUTION_([^_]+)/i',$values[2],$reg)) From 85c34af0199c96f9e359ba14c95ea708c2613bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 24 Sep 2015 18:54:28 +0200 Subject: [PATCH 11/19] [Qual] Replaced deprecated dol_json_*() --- htdocs/core/ajax/selectsearchbox.php | 2 +- htdocs/core/lib/json.lib.php | 6 ++++++ htdocs/projet/class/projectstats.class.php | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php index c7a1c7f6d30..1783c4794b5 100644 --- a/htdocs/core/ajax/selectsearchbox.php +++ b/htdocs/core/ajax/selectsearchbox.php @@ -43,6 +43,6 @@ if ($conf->projet->enabled) { $arrayresult['searchintoproject']=$langs->trans("SearchIntoProject", $search_boxvalue); } -print dol_json_encode($arrayresult); +print json_encode($arrayresult); if (is_object($db)) $db->close(); diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php index 5a87e253758..6b868663aa7 100644 --- a/htdocs/core/lib/json.lib.php +++ b/htdocs/core/lib/json.lib.php @@ -43,9 +43,12 @@ if (! function_exists('json_encode')) * @param mixed $elements PHP Object to json encode * @return string Json encoded string * @deprecated PHP >= 5.3 supports native json_encode + * @see json_encode() */ function dol_json_encode($elements) { + dol_syslog('dol_json_encode() is deprecated. Please update your code to use native json_encode().', LOG_WARNING); + $num=count($elements); if (is_object($elements)) // Count number of properties for an object { @@ -221,9 +224,12 @@ if (! function_exists('json_decode')) * @param bool $assoc False return an object, true return an array. Try to always use it with true ! * @return mixed Object or Array or false on error * @deprecated PHP >= 5.3 supports native json_decode + * @see json_decode() */ function dol_json_decode($json, $assoc=false) { + dol_syslog('dol_json_decode() is deprecated. Please update your code to use native json_decode().', LOG_WARNING); + $comment = false; $out=''; diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php index 98e9c0ce3e0..0578e3b95de 100644 --- a/htdocs/projet/class/projectstats.class.php +++ b/htdocs/projet/class/projectstats.class.php @@ -371,7 +371,7 @@ class ProjectStats extends Stats if ($foundintocache) // Cache file found and is not too old { dol_syslog(get_class($this) . '::' . __FUNCTION__ . " read data from cache file " . $newpathofdestfile . " " . $filedate . "."); - $data = dol_json_decode(file_get_contents($newpathofdestfile), true); + $data = json_decode(file_get_contents($newpathofdestfile), true); } else { $year = $startyear; while ( $year <= $endyear ) { @@ -397,7 +397,7 @@ class ProjectStats extends Stats if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp); $fp = fopen($newpathofdestfile, 'w'); - fwrite($fp, dol_json_encode($data)); + fwrite($fp, json_encode($data)); fclose($fp); if (! empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK; @@ -460,4 +460,4 @@ class ProjectStats extends Stats // var_dump($res);print '
'; return $res; } -} \ No newline at end of file +} From 67ddb6c94e95df5269892164186afcbb69780b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 24 Sep 2015 20:12:55 +0200 Subject: [PATCH 12/19] [Qual] Cleanup of inherited class properties --- dev/skeletons/skeleton_class.class.php | 15 +-- .../class/accountingaccount.class.php | 5 - .../accountancy/class/bookkeeping.class.php | 5 - .../actions_adherentcard_default.class.php | 6 -- htdocs/adherents/class/adherent.class.php | 20 ---- .../adherents/class/adherent_type.class.php | 9 -- htdocs/adherents/class/cotisation.class.php | 4 - htdocs/categories/class/categorie.class.php | 2 - htdocs/comm/action/class/actioncomm.class.php | 7 -- .../class/askpricesupplier.class.php | 25 ----- htdocs/comm/mailing/class/mailing.class.php | 2 - htdocs/comm/propal/class/propal.class.php | 38 -------- htdocs/commande/class/commande.class.php | 36 ------- htdocs/compta/bank/class/account.class.php | 6 -- .../deplacement/class/deplacement.class.php | 10 -- .../facture/class/facture-rec.class.php | 15 --- htdocs/compta/facture/class/facture.class.php | 95 ------------------- .../compta/localtax/class/localtax.class.php | 3 - .../cheque/class/remisecheque.class.php | 3 - .../compta/paiement/class/paiement.class.php | 4 - .../class/bonprelevement.class.php | 2 - .../salaries/class/paymentsalary.class.php | 4 - .../sociales/class/chargesociales.class.php | 2 - .../class/paymentsocialcontribution.class.php | 4 - htdocs/compta/tva/class/tva.class.php | 4 - .../actions_contactcard_default.class.php | 6 -- htdocs/contact/class/contact.class.php | 16 ---- htdocs/contrat/class/contrat.class.php | 33 ------- htdocs/core/class/commonobject.class.php | 11 ++- htdocs/core/class/commonobjectline.class.php | 3 - htdocs/core/class/commonorder.class.php | 30 ------ htdocs/core/class/fiscalyear.class.php | 3 +- htdocs/core/class/genericobject.class.php | 2 - htdocs/core/class/link.class.php | 1 - .../modules/cheque/pdf/pdf_blochet.class.php | 2 - htdocs/cron/class/cronjob.class.php | 10 -- htdocs/don/class/don.class.php | 12 --- htdocs/don/class/paymentdonation.class.php | 3 - htdocs/expedition/class/expedition.class.php | 21 ---- .../class/expeditionbatch.class.php | 1 - .../class/expensereport.class.php | 9 -- .../class/paymentexpensereport.class.php | 3 - htdocs/fichinter/class/fichinter.class.php | 8 -- htdocs/fourn/class/fournisseur.class.php | 2 - htdocs/fourn/class/paiementfourn.class.php | 15 --- htdocs/holiday/class/holiday.class.php | 5 - htdocs/livraison/class/livraison.class.php | 17 ---- htdocs/loan/class/loan.class.php | 4 - htdocs/loan/class/paymentloan.class.php | 5 - .../class/opensurveysondage.class.php | 5 - htdocs/product/class/product.class.php | 17 ---- htdocs/product/class/productbatch.class.php | 3 - .../class/productcustomerprice.class.php | 5 - .../class/propalmergepdfproduct.class.php | 6 -- htdocs/product/class/service.class.php | 3 - htdocs/product/stock/class/entrepot.class.php | 5 - .../stock/class/mouvementstock.class.php | 3 - htdocs/projet/class/project.class.php | 4 - htdocs/projet/class/projectstats.class.php | 3 +- htdocs/projet/class/task.class.php | 8 -- htdocs/resource/class/resource.class.php | 7 -- .../company/actions_card_company.class.php | 5 - .../actions_card_individual.class.php | 5 - htdocs/societe/class/client.class.php | 2 - .../class/companybankaccount.class.php | 13 --- htdocs/societe/class/societe.class.php | 31 ------ htdocs/user/class/user.class.php | 5 - htdocs/user/class/usergroup.class.php | 3 - 68 files changed, 9 insertions(+), 672 deletions(-) diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php index 2f8c78556e1..1903d6f4572 100644 --- a/dev/skeletons/skeleton_class.class.php +++ b/dev/skeletons/skeleton_class.class.php @@ -35,19 +35,10 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php'; * Class Skeleton_Class * * Put here description of your class + * @see CommonObject */ class Skeleton_Class extends CommonObject { - /** - * @var string Error code (or message) - * @deprecated - * @see Skeleton_Class::errors - */ - public $error; - /** - * @var string[] Error codes (or messages) - */ - public $errors = array(); /** * @var string Id to identify managed objects */ @@ -62,10 +53,6 @@ class Skeleton_Class extends CommonObject */ public $lines = array(); - /** - * @var int ID - */ - public $id; /** * @var mixed Sample property 1 */ diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php index 856306c3304..9277bcd9a70 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/htdocs/accountancy/class/accountingaccount.class.php @@ -30,11 +30,6 @@ */ class AccountingAccount extends CommonObject { - var $db; - var $error; - var $errors; - - var $id; var $rowid; var $datec; // Creation date diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php index 374767fe411..141b122690c 100644 --- a/htdocs/accountancy/class/bookkeeping.class.php +++ b/htdocs/accountancy/class/bookkeeping.class.php @@ -29,11 +29,6 @@ */ class BookKeeping extends CommonObject { - var $db; - var $error; - var $errors; - - var $id; var $doc_date; var $doc_type; var $doc_ref; diff --git a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php index 5c40cb22954..7e0b1291998 100644 --- a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php +++ b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php @@ -30,12 +30,6 @@ include_once DOL_DOCUMENT_ROOT.'/adherents/canvas/actions_adherentcard_common.cl */ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon { - var $db; - var $dirmodule; - var $targetmodule; - var $canvas; - var $card; - /** * Constructor * diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index d83664fd392..445ec659f5a 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -44,18 +44,8 @@ class Adherent extends CommonObject public $table_element='adherent'; protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe - var $error; - var $errors; var $mesgs; - var $id; - - var $ref; - public $ref_ext; - - var $civility_id; - var $firstname; - var $lastname; var $login; var $pass; var $societe; @@ -68,10 +58,6 @@ class Adherent extends CommonObject var $state_code; // Code of department var $state; // Label of department - var $country_id; - var $country_code; - var $country; - var $email; var $skype; var $phone; @@ -80,8 +66,6 @@ class Adherent extends CommonObject var $morphy; var $public; - var $note_private; // Private note - var $note_public; // Public note var $statut; // -1:brouillon, 0:resilie, >=1:valide,paye var $photo; @@ -99,7 +83,6 @@ class Adherent extends CommonObject var $user_login; var $fk_soc; - var $thirdparty; // Loaded by ->fetch_thirdparty() // Fields loaded by fetch_subscriptions() var $first_subscription_date; @@ -110,9 +93,6 @@ class Adherent extends CommonObject var $last_subscription_amount; var $subscriptions=array(); - // var $public; - var $array_options; - var $oldcopy; // To contains a clone of this when we need to save old properties of object public $entity; diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index 23ecfd6ea03..af98d7162da 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -35,18 +35,9 @@ class AdherentType extends CommonObject public $table_element = 'adherent_type'; public $element = 'adherent_type'; - var $id; - - /** - * @var int - */ - public $ref; - var $libelle; - var $statut; var $cotisation; // Soumis a la cotisation var $vote; // droit de vote - var $note; // commentaire var $mail_valid; //mail envoye lors de la validation diff --git a/htdocs/adherents/class/cotisation.class.php b/htdocs/adherents/class/cotisation.class.php index ee9358b51da..40527e6e22e 100644 --- a/htdocs/adherents/class/cotisation.class.php +++ b/htdocs/adherents/class/cotisation.class.php @@ -33,16 +33,12 @@ class Cotisation extends CommonObject public $element='subscription'; public $table_element='cotisation'; - var $id; - var $ref; - var $datec; // Date creation var $datem; // Date modification var $dateh; // Subscription start date (date subscription) var $datef; // Subscription end date var $fk_adherent; var $amount; - var $note; var $fk_bank; diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index ac051a45666..bcb53f8a0f5 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -112,7 +112,6 @@ class Categorie extends CommonObject public $element='category'; public $table_element='categories'; - var $id; var $fk_parent; var $label; var $description; @@ -134,7 +133,6 @@ class Categorie extends CommonObject * @see Categorie::TYPE_CONTACT */ var $type; - var $import_key; var $cats=array(); // Tableau en memoire des categories var $motherof=array(); diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 9d793e16ba0..c4afe4d1ee0 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -107,7 +107,6 @@ class ActionComm extends CommonObject var $transparency; // Transparency (ical standard). Used to say if people assigned to event are busy or not by event. 0=available, 1=busy, 2=busy (refused events) var $priority; // Small int (0 By default) - var $note; // Description var $userassigned = array(); // Array of user ids var $userownerid; // Id of user owner = fk_user_action into table @@ -148,12 +147,6 @@ class ActionComm extends CommonObject */ var $contact; - /** - * Id of project (optional) - * @var int - */ - var $fk_project; - // Properties for links to other objects var $fk_element; // Id of record var $elementtype; // Type of record. This if property ->element of object linked to. diff --git a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php b/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php index bee62cb384d..e8f5c2701ad 100644 --- a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php +++ b/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php @@ -53,18 +53,13 @@ class AskPriceSupplier extends CommonObject */ protected $table_ref_field = 'ref'; - var $id; - var $socid; // Id client - var $client; // Objet societe client (a charger par fetch_client) - var $fk_project; /** * @deprecated * @see user_author_id */ var $author; - var $ref; var $ref_fourn; //Reference saisie lors de l'ajout d'une ligne à la demande var $statut; // 0 (draft), 1 (validated), 2 (signed), 3 (not signed), 4 (billed) var $date; // Date of proposal @@ -99,12 +94,6 @@ class AskPriceSupplier extends CommonObject var $user_valid_id; var $user_close_id; - var $total_ht; // Total net of tax - var $total_tva; // Total VAT - var $total_localtax1; // Total Local Taxes 1 - var $total_localtax2; // Total Local Taxes 2 - var $total_ttc; // Total with tax - /** * @deprecated * @see price_ht @@ -121,22 +110,11 @@ class AskPriceSupplier extends CommonObject */ var $total; - var $cond_reglement_id; var $cond_reglement_code; - var $fk_account; // Id of bank account - var $mode_reglement_id; var $mode_reglement_code; var $remise; var $remise_percent; var $remise_absolue; - /** - * @deprecated - * @see note_public, note_private - */ - var $note; - var $note_private; - var $note_public; - var $shipping_method_id; var $products=array(); var $extraparams=array(); @@ -144,9 +122,6 @@ class AskPriceSupplier extends CommonObject var $lines = array(); var $line; - var $origin; - var $origin_id; - var $labelstatut=array(); var $labelstatut_short=array(); diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php index 1df5a7ad18f..f3866f80b96 100644 --- a/htdocs/comm/mailing/class/mailing.class.php +++ b/htdocs/comm/mailing/class/mailing.class.php @@ -34,8 +34,6 @@ class Mailing extends CommonObject public $element='mailing'; public $table_element='mailing'; - var $id; - var $statut; var $titre; var $sujet; var $body; diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 421b2506e73..384122b02e0 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -54,23 +54,14 @@ class Propal extends CommonObject */ protected $table_ref_field = 'ref'; - var $id; - /** * ID of the client * @var int */ var $socid; - /** - * Client (loaded by fetch_client) - * @var Societe - */ - var $client; var $contactid; - var $fk_project; var $author; - var $ref; var $ref_client; /** @@ -122,12 +113,6 @@ class Propal extends CommonObject var $user_valid_id; var $user_close_id; - var $total_ht; // Total net of tax - var $total_tva; // Total VAT - var $total_localtax1; // Total Local Taxes 1 - var $total_localtax2; // Total Local Taxes 2 - var $total_ttc; // Total with tax - /** * @deprecated * @see total_ht @@ -144,29 +129,14 @@ class Propal extends CommonObject */ var $total; - var $cond_reglement_id; var $cond_reglement_code; - var $fk_account; // Id of bank account - var $mode_reglement_id; var $mode_reglement_code; var $remise; var $remise_percent; var $remise_absolue; - /** - * @deprecated - * @see note_private, note_public - */ - var $note; - var $note_private; - var $note_public; - /** - * @deprecated - */ - var $fk_delivery_address; var $fk_address; var $address_type; var $address; - var $shipping_method_id; var $availability_id; var $availability_code; var $demand_reason_id; @@ -181,19 +151,11 @@ class Propal extends CommonObject var $lines = array(); var $line; - var $origin; - var $origin_id; - var $labelstatut=array(); var $labelstatut_short=array(); var $specimen; - //Incorterms - var $fk_incoterms; - var $location_incoterms; - var $libelle_incoterms; //Used into tooltip - /** * Draft status */ diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 32fe2d52726..7f135afd431 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -51,26 +51,15 @@ class Commande extends CommonOrder */ protected $table_ref_field = 'ref'; - var $id; - /** * Client ID * @var int */ var $socid; - /** - * Client (loaded by fetch_client) - * @var Societe - */ - var $client; - - var $ref; var $ref_client; - var $ref_ext; var $ref_int; var $contactid; - var $fk_project; /** * Status of the order. Check the following constants: @@ -86,16 +75,12 @@ class Commande extends CommonOrder var $billed; // billed or not var $brouillon; - var $cond_reglement_id; var $cond_reglement_code; - var $fk_account; - var $mode_reglement_id; var $mode_reglement_code; var $availability_id; var $availability_code; var $demand_reason_id; var $demand_reason_code; - var $fk_delivery_address; var $address; var $date; // Date commande /** @@ -104,31 +89,15 @@ class Commande extends CommonOrder */ var $date_commande; var $date_livraison; // Date livraison souhaitee - var $shipping_method_id; var $fk_remise_except; var $remise_percent; - var $total_ht; // Total net of tax - var $total_ttc; // Total with tax - var $total_tva; // Total VAT - var $total_localtax1; // Total Local tax 1 - var $total_localtax2; // Total Local tax 2 var $remise_absolue; - var $modelpdf; var $info_bits; var $rang; var $special_code; var $source; // Origin of order - /** - * @deprecated - * @see note_private, note_public - */ - var $note; - var $note_private; - var $note_public; var $extraparams=array(); - var $origin; - var $origin_id; var $linked_objects=array(); var $user_author_id; @@ -138,11 +107,6 @@ class Commande extends CommonOrder */ var $lines = array(); - //Incorterms - var $fk_incoterms; - var $location_incoterms; - var $libelle_incoterms; //Used into tooltip - // Pour board var $nbtodo; var $nbtodolate; diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 8c5a2a727b2..e8978310ca3 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -44,9 +44,7 @@ class Account extends CommonObject * @see id */ var $rowid; - var $id; - var $ref; var $label; //! 1=Compte courant/check/carte, 2=Compte liquide, 0=Compte épargne var $courant; @@ -75,10 +73,6 @@ class Account extends CommonObject var $state_code; var $state; - var $country_id; - var $country_code; - var $country; - var $type_lib=array(); var $account_number; diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index f09875456c2..4b2dce9f14e 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -37,23 +37,13 @@ class Deplacement extends CommonObject public $fk_element = ''; protected $ismultientitymanaged = 0; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe - var $id; - var $datec; // Creation date var $dated; var $fk_user_author; var $fk_user; var $km; - /** - * @deprecated - * @see note_private, note_public - */ - var $note; // TODO deprecated - var $note_private; - var $note_public; var $socid; var $statut; // 0=draft, 1=validated - var $fk_project; var $extraparams=array(); var $statuts=array(); diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 7d0de20ce0b..204092b257a 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -42,35 +42,20 @@ class FactureRec extends Facture public $table_element_line='facturedet_rec'; public $fk_element='fk_facture'; - var $id; - - //! Id customer - var $socid; - //! Customer object (charging by fetch_client) - var $client; - var $number; - var $author; var $date; - var $ref; var $amount; var $remise; var $tva; var $total; - var $note_private; - var $note_public; var $db_table; var $propalid; - var $fk_project; var $rang; var $special_code; var $usenewprice=0; - var $lines=array(); - - /** * Constructor * diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 3d1558118c1..de5cc04c021 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -58,27 +58,15 @@ class Facture extends CommonInvoice */ protected $table_ref_field = 'facnumber'; - var $id; - //! Id client var $socid; - //! Objet societe client (to load with fetch_client method) - /** - * Customer - * @var Societe - */ - var $client; var $author; var $fk_user_author; var $fk_user_valid; - //! Invoice date - var $date; // Invoice date var $date_creation; // Creation date var $date_validation; // Validation date var $datem; - var $ref; var $ref_client; - var $ref_ext; var $ref_int; //Check constants for types var $type = self::TYPE_STANDARD; @@ -90,20 +78,7 @@ class Facture extends CommonInvoice var $total_tva=0; var $total_ttc=0; var $revenuestamp; - /** - * @deprecated - * @see note_private, note_public - */ - var $note; - var $note_private; - var $note_public; - /** - * Invoice status - * @var int - * @see Facture::STATUS_DRAFT, Facture::STATUS_VALIDATED, Facture::STATUS_PAID, Facture::STATUS_ABANDONED - */ - var $statut; //! Fermeture apres paiement partiel: discount_vat, badcustomer, abandon //! Fermeture alors que aucun paiement: replaced (si remplace), abandon var $close_code; @@ -113,18 +88,11 @@ class Facture extends CommonInvoice var $paye; //! id of source invoice if replacement invoice or credit note var $fk_facture_source; - var $origin; - var $origin_id; var $linked_objects=array(); - var $fk_project; var $date_lim_reglement; - var $cond_reglement_id; // Id in llx_c_paiement var $cond_reglement_code; // Code in llx_c_paiement - var $mode_reglement_id; // Id in llx_c_paiement var $mode_reglement_code; // Code in llx_c_paiement - var $fk_account; // Id of bank account var $fk_bank; // Field to store bank id to use when payment mode is withdraw - var $modelpdf; /** * @deprecated */ @@ -139,11 +107,6 @@ class Facture extends CommonInvoice var $fac_rec; - //Incoterms - var $fk_incoterms; - var $location_incoterms; - var $libelle_incoterms; //Used into tooltip - /** * @var int Situation cycle reference number */ @@ -159,64 +122,6 @@ class Facture extends CommonInvoice */ public $situation_final; - /** - * Standard invoice - */ - const TYPE_STANDARD = 0; - - /** - * Replacement invoice - */ - const TYPE_REPLACEMENT = 1; - - /** - * Credit note invoice - */ - const TYPE_CREDIT_NOTE = 2; - - /** - * Deposit invoice - */ - const TYPE_DEPOSIT = 3; - - /** - * Proforma invoice - */ - const TYPE_PROFORMA = 4; - - /** - * Situation invoice - */ - const TYPE_SITUATION = 5; - - /** - * Draft - */ - const STATUS_DRAFT = 0; - - /** - * Validated (need to be paid) - */ - const STATUS_VALIDATED = 1; - - /** - * Classified paid. - * If paid partially, $this->close_code can be: - * - CLOSECODE_DISCOUNTVAT - * - CLOSECODE_BADDEBT - * If paid completelly, this->close_code will be null - */ - const STATUS_CLOSED = 2; - - /** - * Classified abandoned and no payment done. - * $this->close_code can be: - * - CLOSECODE_BADDEBT - * - CLOSECODE_ABANDONED - * - CLOSECODE_REPLACED - */ - const STATUS_ABANDONED = 3; - const CLOSECODE_DISCOUNTVAT = 'discount_vat'; const CLOSECODE_BADDEBT = 'badcustomer'; const CLOSECODE_ABANDONED = 'abandon'; diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php index 04461117271..067c8dc9cbe 100644 --- a/htdocs/compta/localtax/class/localtax.class.php +++ b/htdocs/compta/localtax/class/localtax.class.php @@ -29,15 +29,12 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; */ class Localtax extends CommonObject { - var $id; - var $ref; var $ltt; var $tms; var $datep; var $datev; var $amount; var $label; - var $note; var $fk_bank; var $fk_user_creat; var $fk_user_modif; diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index a95a7ce8756..e70993bcaed 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -36,14 +36,11 @@ class RemiseCheque extends CommonObject public $element='chequereceipt'; public $table_element='bordereau_cheque'; - var $id; var $num; var $intitule; - var $ref_ext; //! Numero d'erreur Plage 1024-1279 var $errno; - public $statut; public $amount; public $date_bordereau; public $account_id; diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index 9baa15a417f..7e92a608c52 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -36,8 +36,6 @@ class Paiement extends CommonObject public $element='payment'; public $table_element='paiement'; - var $id; - var $ref; var $facid; var $datepaye; /** @@ -59,8 +57,6 @@ class Paiement extends CommonObject var $num_paiement; // Numero du CHQ, VIR, etc... var $bank_account; // Id compte bancaire du paiement var $bank_line; // Id de la ligne d'ecriture bancaire - var $fk_account; // Id of bank account - var $note; // fk_paiement dans llx_paiement est l'id du type de paiement (7 pour CHQ, ...) // fk_paiement dans llx_paiement_facture est le rowid du paiement diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index 3f813e00938..38f83c5ac54 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -37,8 +37,6 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; */ class BonPrelevement extends CommonObject { - var $db; - var $date_echeance; var $raison_sociale; var $reference_remise; diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php index cc0029620cb..6c3a91258b8 100644 --- a/htdocs/compta/salaries/class/paymentsalary.class.php +++ b/htdocs/compta/salaries/class/paymentsalary.class.php @@ -34,9 +34,6 @@ class PaymentSalary extends CommonObject //public $element='payment_salary'; //!< Id that identify managed objects //public $table_element='payment_salary'; //!< Name of table without prefix where object is stored - var $id; - var $ref; - var $tms; var $fk_user; var $datep; @@ -47,7 +44,6 @@ class PaymentSalary extends CommonObject var $label; var $datesp; var $dateep; - var $note; var $fk_bank; var $fk_user_creat; var $fk_user_modif; diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index dc70126ab9e..7712fd09029 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -39,8 +39,6 @@ class ChargeSociales extends CommonObject */ protected $table_ref_field = 'ref'; - var $id; - var $ref; var $date_ech; var $lib; var $type; diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php index ade44bff415..e3bf17b3418 100644 --- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php +++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php @@ -33,9 +33,6 @@ class PaymentSocialContribution extends CommonObject public $element='paiementcharge'; //!< Id that identify managed objects public $table_element='paiementcharge'; //!< Name of table without prefix where object is stored - var $id; - var $ref; - var $fk_charge; var $datec=''; var $tms=''; @@ -49,7 +46,6 @@ class PaymentSocialContribution extends CommonObject var $amounts=array(); // Array of amounts var $fk_typepaiement; var $num_paiement; - var $note; var $fk_bank; var $fk_user_creat; var $fk_user_modif; diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php index 68aeeebc2c8..d556a84a804 100644 --- a/htdocs/compta/tva/class/tva.class.php +++ b/htdocs/compta/tva/class/tva.class.php @@ -35,9 +35,6 @@ class Tva extends CommonObject //public $element='tva'; //!< Id that identify managed objects //public $table_element='tva'; //!< Name of table without prefix where object is stored - var $id; - var $ref; - var $tms; var $datep; var $datev; @@ -45,7 +42,6 @@ class Tva extends CommonObject var $type_payment; var $num_payment; var $label; - var $note; var $fk_bank; var $fk_user_creat; var $fk_user_modif; diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php index 3bfcf347c3f..30a52469da2 100644 --- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php +++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php @@ -29,12 +29,6 @@ include_once DOL_DOCUMENT_ROOT.'/contact/canvas/actions_contactcard_common.class */ class ActionsContactCardDefault extends ActionsContactCardCommon { - var $db; - var $dirmodule; - var $targetmodule; - var $canvas; - var $card; - /** * Constructor * diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index f3c0b9bd3f5..9673e1923ac 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -41,11 +41,7 @@ class Contact extends CommonObject public $table_element='socpeople'; protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe - var $id; - var $ref_ext; var $civility_id; // In fact we store civility_code - var $lastname; - var $firstname; var $address; var $zip; var $town; @@ -69,10 +65,6 @@ class Contact extends CommonObject var $state_code; // Code of department var $state; // Label of department - var $country_id; // Id of country - var $country_code; // Code of country - var $country; // Label of country - var $poste; // Position var $socid; // fk_soc @@ -91,13 +83,6 @@ class Contact extends CommonObject var $birthday; var $default_lang; - var $note_public; // Public note - /** - * @deprecated - * @see note_public, note_private - */ - var $note; - var $note_private; // Private note var $no_email; // 1=Don't send e-mail to this contact, 0=do var $ref_facturation; // Nb de reference facture pour lequel il est contact @@ -107,7 +92,6 @@ class Contact extends CommonObject var $user_id; var $user_login; - var $import_key; var $oldcopy; // To contains a clone of this when we need to save old properties of object diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index eea23be7ae8..6fa4e5c46a8 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -50,25 +50,6 @@ class Contrat extends CommonObject */ protected $table_ref_field = 'ref'; - /** - * Id of the contract - * @var int - */ - var $id; - - /** - * Reference of the contract - * @var string - */ - var $ref; - - /** - * External reference of the contract. - * Used by 3rd party services - * @var string - */ - var $ref_ext; - /** * Supplier reference of the contract * @var string @@ -140,26 +121,12 @@ class Contrat extends CommonObject var $commercial_signature_id; var $commercial_suivi_id; - /** - * @var string Private note - */ - var $note_private; - - /** - * @var string Public note - */ - var $note_public; - - var $modelpdf; - /** * @deprecated Use fk_project instead * @see fk_project */ var $fk_projet; - public $fk_project; - var $extraparams=array(); /** diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 2a7834473dc..7b425746345 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -131,6 +131,7 @@ abstract class CommonObject public $thirdparty; /** * @deprecated + * @var Societe A related customer * @see thirdparty */ public $client; @@ -283,27 +284,27 @@ abstract class CommonObject public $note; /** - * @var float + * @var float Total amount before taxes * @see update_price() */ public $total_ht; /** - * @var float + * @var float Total VAT amount * @see update_price() */ public $total_tva; /** - * @var float + * @var float Total local tax 1 amount * @see update_price() */ public $total_localtax1; /** - * @var float + * @var float Total local tax 2 amount * @see update_price() */ public $total_localtax2; /** - * @var float + * @var float Total amount with taxes * @see update_price() */ public $total_ttc; diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php index ef854a2452e..5bcbab5934a 100644 --- a/htdocs/core/class/commonobjectline.class.php +++ b/htdocs/core/class/commonobjectline.class.php @@ -43,9 +43,6 @@ abstract class CommonObjectLine extends CommonObject */ public $rowid; - //! Database handler - public $db; - /** * Product/service unit code ('km', 'm', 'p', ...) * @var string diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php index 5309b5524ee..74d14af0819 100644 --- a/htdocs/core/class/commonorder.class.php +++ b/htdocs/core/class/commonorder.class.php @@ -137,36 +137,6 @@ abstract class CommonOrderLine extends CommonObjectLine public $localtax1_type; public $localtax2_type; - /** - * Total amount before taxes - * @var float - */ - public $total_ht; - - /** - * Total VAT amount - * @var float - */ - public $total_tva; - - /** - * Total local tax 1 amount - * @var float - */ - public $total_localtax1; - - /** - * Total local tax 2 amount - * @var float - */ - public $total_localtax2; - - /** - * Total amount with taxes - * @var float - */ - public $total_ttc; - /** * Liste d'options cumulables: * Bit 0: 0 si TVA normal - 1 si TVA NPR diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php index d20dbf2d4f3..7d4dff8de44 100644 --- a/htdocs/core/class/fiscalyear.class.php +++ b/htdocs/core/class/fiscalyear.class.php @@ -34,7 +34,6 @@ class Fiscalyear extends CommonObject public $fk_element = ''; protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe - var $id; var $rowid; var $label; @@ -324,4 +323,4 @@ class Fiscalyear extends CommonObject } } -} \ No newline at end of file +} diff --git a/htdocs/core/class/genericobject.class.php b/htdocs/core/class/genericobject.class.php index c198525a07b..32960664c17 100644 --- a/htdocs/core/class/genericobject.class.php +++ b/htdocs/core/class/genericobject.class.php @@ -30,8 +30,6 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; class GenericObject extends CommonObject { - var $db; - /** * Constructor * diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php index 0cdc6a8c4a8..2dd34896602 100644 --- a/htdocs/core/class/link.class.php +++ b/htdocs/core/class/link.class.php @@ -31,7 +31,6 @@ class Link extends CommonObject public $element = 'link'; public $table_element = 'links'; - public $id; public $entity; public $datea; public $url; diff --git a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php index a7baec4364f..dd6732d9742 100644 --- a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php +++ b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php @@ -33,8 +33,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/pdf/modules_chequereceipts. */ class BordereauChequeBlochet extends ModeleChequeReceipts { - var $error=''; - var $emetteur; // Objet societe qui emet /** diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php index 26ae969e493..742db0cb461 100644 --- a/htdocs/cron/class/cronjob.class.php +++ b/htdocs/cron/class/cronjob.class.php @@ -30,15 +30,9 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); */ class Cronjob extends CommonObject { - var $db; //!< To store db handler - var $error; //!< To return error code (or message) - var $errors=array(); //!< To return several error codes (or messages) var $element='cronjob'; //!< Id that identify managed objects var $table_element='cronjob'; //!< Name of table without prefix where object is stored - var $id; - - var $ref; //Use for prevnext_ref var $jobtype; var $tms=''; var $datec=''; @@ -63,12 +57,8 @@ class Cronjob extends CommonObject var $status; var $fk_user_author; var $fk_user_mod; - var $note; var $nbrun; var $libname; - var $lines; - - /** diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index 2b84f0d0727..72ccc7a0147 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -39,29 +39,17 @@ class Don extends CommonObject public $fk_element = 'fk_donation'; protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe - var $id; - var $ref; var $date; var $amount; - var $firstname; - var $lastname; var $societe; var $address; var $zip; var $town; - var $country_id; - var $country_code; - var $country; var $email; var $public; var $fk_projet; var $fk_typepayment; var $num_payment; - var $note_private; - var $note_public; - var $statut; - var $modelpdf; - var $projet; /** * @deprecated diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php index 73cbbc39301..9655f454ed5 100644 --- a/htdocs/don/class/paymentdonation.class.php +++ b/htdocs/don/class/paymentdonation.class.php @@ -32,9 +32,7 @@ class PaymentDonation extends CommonObject public $element='payment_donation'; //!< Id that identify managed objects public $table_element='payment_donation'; //!< Name of table without prefix where object is stored - var $id; var $rowid; - var $ref; var $fk_donation; var $datec=''; @@ -44,7 +42,6 @@ class PaymentDonation extends CommonObject var $amounts=array(); // Array of amounts var $typepayment; var $num_payment; - var $note; var $fk_bank; var $fk_user_creat; var $fk_user_modif; diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index edd8aa0cd39..096208742de 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -45,24 +45,15 @@ class Expedition extends CommonObject public $table_element="expedition"; protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe - var $id; var $socid; var $ref_customer; - var $ref_ext; var $ref_int; var $brouillon; var $entrepot_id; - var $modelpdf; - var $origin; - var $origin_id; var $lines=array(); - var $shipping_method_id; var $tracking_number; var $tracking_url; - var $statut; var $billed; - var $note_public; - var $note_private; var $model_pdf; var $trueWeight; @@ -95,20 +86,8 @@ class Expedition extends CommonObject var $date_creation; var $date_valid; - // For Invoicing - var $total_ht; // Total net of tax - var $total_ttc; // Total with tax - var $total_tva; // Total VAT - var $total_localtax1; // Total Local tax 1 - var $total_localtax2; // Total Local tax 2 - var $listmeths; // List of carriers - //Incorterms - var $fk_incoterms; - var $location_incoterms; - var $libelle_incoterms; //Used into tooltip - /** * Constructor * diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php index fd424fc4990..2011bd9c6f9 100644 --- a/htdocs/expedition/class/expeditionbatch.class.php +++ b/htdocs/expedition/class/expeditionbatch.class.php @@ -31,7 +31,6 @@ class ExpeditionLineBatch extends CommonObject var $element='expeditionlignebatch'; //!< Id that identify managed objects private static $_table_element='expeditiondet_batch'; //!< Name of table without prefix where object is stored - var $id; var $sellby; var $eatby; var $batch; diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 78ca120516e..920c6aa16d7 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -29,21 +29,12 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; */ class ExpenseReport extends CommonObject { - var $db; - var $error; var $element='expensereport'; var $table_element='expensereport'; var $table_element_line = 'expensereport_det'; var $fk_element = 'fk_expensereport'; - var $id; - var $ref; var $lignes=array(); - var $total_ht; - var $total_tva; - var $total_ttc; - var $note_public; - var $note_private; var $date_debut; var $date_fin; diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php index 4c9c5843a49..7cda584abbf 100644 --- a/htdocs/expensereport/class/paymentexpensereport.class.php +++ b/htdocs/expensereport/class/paymentexpensereport.class.php @@ -32,9 +32,7 @@ class PaymentExpenseReport extends CommonObject public $element='payment_expensereport'; //!< Id that identify managed objects public $table_element='payment_expensereport'; //!< Name of table without prefix where object is stored - var $id; var $rowid; - var $ref; var $fk_expensereport; var $datec=''; @@ -44,7 +42,6 @@ class PaymentExpenseReport extends CommonObject var $amounts=array(); // Array of amounts var $fk_typepayment; var $num_payment; - var $note; var $fk_bank; var $fk_user_creat; var $fk_user_modif; diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index d0bcee286d0..e63fb8c3da0 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -43,24 +43,16 @@ class Fichinter extends CommonObject */ protected $table_ref_field = 'ref'; - var $id; - var $socid; // Id client - var $client; // Objet societe client (a charger par fetch_client) var $author; - var $ref; var $datec; var $datev; var $datem; var $duration; var $statut; // 0=draft, 1=validated, 2=invoiced var $description; - var $note_private; - var $note_public; - var $fk_project; var $fk_contrat; - var $modelpdf; var $extraparams=array(); var $lines = array(); diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php index 5fc0b3e43dd..c8d1ccb846a 100644 --- a/htdocs/fourn/class/fournisseur.class.php +++ b/htdocs/fourn/class/fournisseur.class.php @@ -33,8 +33,6 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; */ class Fournisseur extends Societe { - var $db; - var $next_prev_filter="te.fournisseur = 1"; // Used to add a filter in Form::showrefnav method diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php index dc66e5abf9a..98876ab2519 100644 --- a/htdocs/fourn/class/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.class.php @@ -36,21 +36,6 @@ class PaiementFourn extends Paiement public $element='payment_supplier'; public $table_element='paiementfourn'; - var $id; - var $ref; - var $facid; - var $datepaye; - var $total; - var $amount; // Total amount of payment - var $amounts=array(); // Array of amounts - var $author; - var $paiementid; // Type de paiement. Stocke dans fk_paiement - // de llx_paiement qui est lie aux types de - //paiement de llx_c_paiement - var $num_paiement; // Numero du CHQ, VIR, etc... - var $bank_account; // Id compte bancaire du paiement - var $bank_line; // Id de la ligne d'ecriture bancaire - var $note; var $statut; //Status of payment. 0 = unvalidated; 1 = validated // fk_paiement dans llx_paiement est l'id du type de paiement (7 pour CHQ, ...) // fk_paiement dans llx_paiement_facture est le rowid du paiement diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index 3e68bb6bce5..6bb253319e0 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -34,16 +34,11 @@ class Holiday extends CommonObject public $element='holiday'; public $table_element='holiday'; - var $db; - var $error; - var $errors=array(); - /** * @deprecated * @see id */ var $rowid; - var $ref; var $fk_user; var $date_create=''; diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index c996c2a1bc5..d8eb9a80e5d 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -43,32 +43,15 @@ class Livraison extends CommonObject public $fk_element="fk_livraison"; public $table_element="livraison"; - var $id; var $brouillon; - var $origin; - var $origin_id; var $socid; var $ref_customer; - var $statut; - - /** - * @deprecated - * @see note_public, note_private - */ - var $note; - var $note_public; - var $note_private; var $date_delivery; // Date really received var $date_creation; var $date_valid; var $model_pdf; - //Incorterms - var $fk_incoterms; - var $location_incoterms; - var $libelle_incoterms; //Used into tooltip - /** * Constructor * diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php index 24ca97b5225..66809b60720 100644 --- a/htdocs/loan/class/loan.class.php +++ b/htdocs/loan/class/loan.class.php @@ -33,17 +33,13 @@ class Loan extends CommonObject public $table='loan'; public $table_element='loan'; - var $id; var $rowid; - var $ref; var $datestart; var $dateend; var $label; var $capital; var $nbterm; var $rate; - var $note_private; - var $note_public; var $paid; var $account_capital; var $account_insurance; diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php index 03517b91adf..09c3e0b4fbc 100644 --- a/htdocs/loan/class/paymentloan.class.php +++ b/htdocs/loan/class/paymentloan.class.php @@ -33,9 +33,6 @@ class PaymentLoan extends CommonObject public $element='payment_loan'; //!< Id that identify managed objects public $table_element='payment_loan'; //!< Name of table without prefix where object is stored - var $id; - var $ref; - var $fk_loan; var $datec=''; var $tms=''; @@ -46,8 +43,6 @@ class PaymentLoan extends CommonObject var $amount_interest; var $fk_typepayment; var $num_payment; - var $note_private; - var $note_public; var $fk_bank; var $fk_user_creat; var $fk_user_modif; diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php index 1ab2352395d..c3be8fc4793 100644 --- a/htdocs/opensurvey/class/opensurveysondage.class.php +++ b/htdocs/opensurvey/class/opensurveysondage.class.php @@ -34,14 +34,9 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); */ class Opensurveysondage extends CommonObject { - var $db; //!< To store db handler - var $error; //!< To return error code (or message) - var $errors=array(); //!< To return several error codes (or messages) var $element='opensurvey_sondage'; //!< Id that identify managed objects var $table_element='opensurvey_sondage'; //!< Name of table without prefix where object is stored - var $id; - var $id_sondage; /** * @deprecated diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 28e05ddd521..35aff5e4cc5 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -55,10 +55,6 @@ class Product extends CommonObject var $regeximgext='\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff'; - //! Identifiant unique - var $id ; - //! Ref - var $ref; /* * @deprecated * @see label @@ -128,8 +124,6 @@ class Product extends CommonObject var $status_batch; var $customcode; // Customs code - var $country_id; // Country origin id - var $country_code; // Country origin code (US, FR, ...) //! Unites de mesure var $weight; @@ -146,10 +140,6 @@ class Product extends CommonObject //! barcode var $barcode; // value - var $barcode_type; // id - var $barcode_type_code; // code (loaded by fetch_barcode). Example 'ean', 'isbn', ... - var $barcode_type_label; // label (loaded by fetch_barcode) - var $barcode_type_coder; // coder (loaded by fetch_barcode). Engine. var $stats_propale=array(); var $stats_commande=array(); @@ -163,10 +153,6 @@ class Product extends CommonObject var $imgWidth; var $imgHeight; - //! Canevas a utiliser si le produit n'est pas un produit generique - var $canvas; - - var $import_key; var $date_creation; var $date_modification; @@ -183,9 +169,6 @@ class Product extends CommonObject var $oldcopy; - //note not visible on orders and invoices - var $note; - var $fk_price_expression; /** diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php index 8eac443c244..44d1025b3db 100644 --- a/htdocs/product/class/productbatch.class.php +++ b/htdocs/product/class/productbatch.class.php @@ -33,15 +33,12 @@ class Productbatch extends CommonObject var $element='productbatch'; //!< Id that identify managed objects private static $_table_element='product_batch'; //!< Name of table without prefix where object is stored - var $id; - var $tms=''; var $fk_product_stock; var $sellby=''; var $eatby=''; var $batch=''; var $qty; - var $import_key; public $warehouseid; diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php index 1bca4579070..8cf659c9b89 100644 --- a/htdocs/product/class/productcustomerprice.class.php +++ b/htdocs/product/class/productcustomerprice.class.php @@ -28,12 +28,8 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php'; */ class Productcustomerprice extends CommonObject { - var $db; // !< To store db handler - var $error; // !< To return error code (or message) - var $errors = array (); // !< To return several error codes (or messages) var $element = 'product_customer_price'; // !< Id that identify managed objects var $table_element = 'product_customer_price'; // !< Name of table without prefix where object is stored - var $id; var $entity; var $datec = ''; var $tms = ''; @@ -49,7 +45,6 @@ class Productcustomerprice extends CommonObject var $localtax1_tx; var $localtax2_tx; var $fk_user; - var $import_key; var $lines = array (); /** diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php index a0a50f9acbd..865589692fb 100644 --- a/htdocs/product/class/propalmergepdfproduct.class.php +++ b/htdocs/product/class/propalmergepdfproduct.class.php @@ -31,13 +31,8 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); */ class Propalmergepdfproduct extends CommonObject { - var $db; //!< To store db handler - var $error; //!< To return error code (or message) - var $errors=array(); //!< To return several error codes (or messages) var $element='propal_merge_pdf_product'; //!< Id that identify managed objects var $table_element='propal_merge_pdf_product'; //!< Name of table without prefix where object is stored - - var $id; var $fk_product; var $file_name; @@ -45,7 +40,6 @@ class Propalmergepdfproduct extends CommonObject var $fk_user_mod; var $datec=''; var $tms=''; - var $import_key; var $lang; var $lines=array(); diff --git a/htdocs/product/class/service.class.php b/htdocs/product/class/service.class.php index 7ba5db47d1c..2cd785527a5 100644 --- a/htdocs/product/class/service.class.php +++ b/htdocs/product/class/service.class.php @@ -29,9 +29,6 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; */ class Service extends CommonObject { - var $db; - - var $id; var $libelle; var $price; var $tms; diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index 006be0e6793..8d1a507ab26 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -35,7 +35,6 @@ class Entrepot extends CommonObject public $element='stock'; public $table_element='entrepot'; - var $id; var $libelle; var $description; //! Statut 1 pour ouvert, 0 pour ferme @@ -46,10 +45,6 @@ class Entrepot extends CommonObject var $zip; var $town; - var $country; - var $country_id; - var $country_code; - /** * Constructor diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php index a612b7137cd..0c92097a82c 100644 --- a/htdocs/product/stock/class/mouvementstock.class.php +++ b/htdocs/product/stock/class/mouvementstock.class.php @@ -30,9 +30,6 @@ */ class MouvementStock extends CommonObject { - var $error; - var $db; - var $product_id; var $entrepot_id; var $qty; diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 094ae60c59e..3b0dd280eb6 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -43,8 +43,6 @@ class Project extends CommonObject */ protected $table_ref_field = 'ref'; - var $id; - var $ref; var $description; /** * @var string @@ -60,8 +58,6 @@ class Project extends CommonObject var $user_author_id; //!< Id of project creator. Not defined if shared project. var $user_close_id; var $public; //!< Tell if this is a public or private project - var $note_private; - var $note_public; var $budget_amount; var $statuts_short; diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php index 98e9c0ce3e0..9e0ea9c3956 100644 --- a/htdocs/projet/class/projectstats.class.php +++ b/htdocs/projet/class/projectstats.class.php @@ -24,7 +24,6 @@ include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php'; */ class ProjectStats extends Stats { - protected $db; private $project; public $userid; public $socid; @@ -460,4 +459,4 @@ class ProjectStats extends Stats // var_dump($res);print '
'; return $res; } -} \ No newline at end of file +} diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index a8dffb8c494..c6c5f65f63d 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -34,11 +34,6 @@ class Task extends CommonObject public $element='project_task'; //!< Id that identify managed objects public $table_element='projet_task'; //!< Name of table without prefix where object is stored - var $id; - - var $ref; - - var $fk_project; var $fk_task_parent; var $label; var $description; @@ -51,9 +46,6 @@ class Task extends CommonObject var $priority; var $fk_user_creat; var $fk_user_valid; - var $statut; - var $note_private; - var $note_public; var $rang; var $timespent_id; diff --git a/htdocs/resource/class/resource.class.php b/htdocs/resource/class/resource.class.php index 3c3f0ee6e49..08881341429 100644 --- a/htdocs/resource/class/resource.class.php +++ b/htdocs/resource/class/resource.class.php @@ -31,15 +31,9 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"; */ class Resource extends CommonObject { - var $db; //!< To store db handler - var $error; //!< To return error code (or message) - var $errors=array(); //!< To return several error codes (or messages) var $element='resource'; //!< Id that identify managed objects var $table_element='resource'; //!< Name of table without prefix where object is stored - var $id; - - var $resource_id; var $resource_type; var $element_id; @@ -50,7 +44,6 @@ class Resource extends CommonObject var $type_label; var $tms=''; - /** * Constructor * diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php index b2c0f82f1e0..c7ed03080f6 100644 --- a/htdocs/societe/canvas/company/actions_card_company.class.php +++ b/htdocs/societe/canvas/company/actions_card_company.class.php @@ -29,11 +29,6 @@ include_once DOL_DOCUMENT_ROOT.'/societe/canvas/actions_card_common.class.php'; */ class ActionsCardCompany extends ActionsCardCommon { - var $dirmodule; - var $targetmodule; - var $canvas; - var $card; - /** * Constructor * diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php index 19921b69d81..f38d0d034ef 100644 --- a/htdocs/societe/canvas/individual/actions_card_individual.class.php +++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php @@ -28,11 +28,6 @@ include_once DOL_DOCUMENT_ROOT.'/societe/canvas/actions_card_common.class.php'; */ class ActionsCardIndividual extends ActionsCardCommon { - var $dirmodule; - var $targetmodule; - var $canvas; - var $card; - /** * Constructor * diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php index f3e7a8dcce9..b4ee6b86249 100644 --- a/htdocs/societe/class/client.class.php +++ b/htdocs/societe/class/client.class.php @@ -29,8 +29,6 @@ include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; */ class Client extends Societe { - var $db; - var $next_prev_filter="te.client in (1,2,3)"; // Used to add a filter in Form::showrefnav method var $cacheprospectstatus=array(); diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 336aab0ebbd..35d03387fec 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -32,21 +32,8 @@ require_once DOL_DOCUMENT_ROOT .'/compta/bank/class/account.class.php'; */ class CompanyBankAccount extends Account { - var $rowid; var $socid; - var $label; - var $bank; - var $courant; - var $clos; - var $code_banque; - var $code_guichet; - var $number; - var $cle_rib; - var $bic; - var $iban; - var $proprio; - var $owner_address; var $default_rib; var $frstrecur; diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 30b696bb8ef..6e705749ba0 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -51,8 +51,6 @@ class Societe extends CommonObject */ protected $ismultientitymanaged = 1; - public $id; - public $name; public $entity; /** @@ -63,9 +61,6 @@ class Societe extends CommonObject */ public $nom; - var $firstname; - var $lastname; - /** * Alias names (commercial, trademark or alias names) * @var string @@ -73,7 +68,6 @@ class Societe extends CommonObject public $name_alias; public $particulier; - public $civility_id; public $address; public $zip; public $town; @@ -113,9 +107,6 @@ class Societe extends CommonObject * @see country */ var $pays; - var $country_id; - var $country_code; - var $country; /** * Phone number @@ -149,26 +140,6 @@ class Societe extends CommonObject * @var string */ var $barcode; - /** - * ID of bardode type - * @var int - */ - var $barcode_type; - /** - * code (loaded by fetch_barcode) - * @var string - */ - var $barcode_type_code; - /** - * label (loaded by fetch_barcode) - * @var string - */ - var $barcode_type_label; - /** - * coder (loaded by fetch_barcode) - * @var string - */ - var $barcode_type_coder; // 6 professional id (usage depends on country) @@ -233,8 +204,6 @@ class Societe extends CommonObject var $forme_juridique; var $remise_percent; - var $mode_reglement_id; - var $cond_reglement_id; var $mode_reglement_supplier_id; var $cond_reglement_supplier_id; var $fk_prospectlevel; diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 34c3084e12d..bb67d33be70 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -44,14 +44,9 @@ class User extends CommonObject protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe var $id=0; - var $ref; - var $ref_ext; var $ldap_sid; var $search_sid; - var $lastname; - var $firstname; var $gender; - var $note; var $email; var $skype; var $job; diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index 687c2077760..50237b0ef61 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -38,16 +38,13 @@ class UserGroup extends CommonObject public $table_element='usergroup'; protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe - var $id; // Group id var $entity; // Entity of group /** * @deprecated * @see name */ var $nom; // Name of group - var $name; // Name of group var $globalgroup; // Global group - var $note; // Note on group var $datec; // Creation date of group var $datem; // Modification date of group var $members=array(); // Array of users From b0b552c378458fdd71ef2a49469249dfbc56e7a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 24 Sep 2015 20:32:05 +0200 Subject: [PATCH 13/19] [Qual] Replaced deprecated select_users() --- htdocs/admin/prelevement.php | 4 ++-- htdocs/bookmarks/card.php | 4 ++-- htdocs/core/class/html.form.class.php | 2 +- htdocs/don/stats/index.php | 2 +- htdocs/expedition/stats/index.php | 2 +- htdocs/expensereport/list.php | 2 +- htdocs/holiday/card.php | 4 ++-- htdocs/projet/tasks.php | 2 +- htdocs/societe/soc.php | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index 31c1e5e7dba..2379da3470c 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -238,11 +238,11 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION)) print "\n"; print ''; print ''; print ''; diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php index a821cf8e94f..be27c87a70a 100644 --- a/htdocs/bookmarks/card.php +++ b/htdocs/bookmarks/card.php @@ -165,7 +165,7 @@ if ($action == 'create') print ''; print ''; // Position @@ -262,7 +262,7 @@ if ($id > 0 && ! preg_match('/^add/i',$action)) print ''; // User print ''; // Year print ''; // User print ''; // Year print ''; } else { print ''; diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index ebda47dd196..a0351418f65 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -782,10 +782,10 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create print ''; print ''; diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 018bf862bba..ce7ee4a6ccc 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -305,7 +305,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third print ''; // Date start diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 637110d4a88..c6c78c409cd 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -1213,7 +1213,7 @@ else print ''; print ''; print ''; } From 5f5ef43e04ff2fcb9440248afa262fc9ddd0706a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 24 Sep 2015 20:35:50 +0200 Subject: [PATCH 14/19] [Qual] Constructors of deprecated classes are deprecated This gives better deprecation hinting. --- htdocs/core/class/cookie.class.php | 5 +++-- htdocs/societe/class/address.class.php | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php index ba519fab365..1d28861a44e 100644 --- a/htdocs/core/class/cookie.class.php +++ b/htdocs/core/class/cookie.class.php @@ -43,9 +43,10 @@ class DolCookie var $cookie; /** - * Constructor + * Constructor * - * @param string $key Personnal key + * @param string $key Personnal key + * @deprecated */ function __construct($key = '') { diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php index db981834760..d8a1687cf9d 100644 --- a/htdocs/societe/class/address.class.php +++ b/htdocs/societe/class/address.class.php @@ -54,9 +54,10 @@ class Address public $lines; /** - * Constructor + * Constructor * - * @param DoliDB $db Database handler + * @param DoliDB $db Database handler + * @deprecated */ function __construct($db) { From c0570a7f84cacb7aeff56e7b13793da1f3ea0f31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 24 Sep 2015 20:40:40 +0200 Subject: [PATCH 15/19] [Qual] Replaced deprecated select_color() --- htdocs/categories/card.php | 2 +- htdocs/categories/edit.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php index 6c4c1a39bdd..0bef6adc2c2 100644 --- a/htdocs/categories/card.php +++ b/htdocs/categories/card.php @@ -256,7 +256,7 @@ if ($user->rights->categorie->creer) // Color print ''; // Parent category diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php index 28a97d3d89d..03957e00396 100644 --- a/htdocs/categories/edit.php +++ b/htdocs/categories/edit.php @@ -156,7 +156,7 @@ print ''; print ''; print ''; print ''; // Parent category From bd7d487c793aa6211594e627cb6d44778dcff180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 24 Sep 2015 20:52:43 +0200 Subject: [PATCH 16/19] [Qual] Do not test deprecated update_note_public() --- test/phpunit/AdherentTest.php | 2 +- test/phpunit/ContactTest.php | 14 +++++++------- test/phpunit/HolidayTest.php | 10 +++++----- test/phpunit/SocieteTest.php | 12 ++++++------ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php index 3a19b195b7c..42b4ff7cf7f 100644 --- a/test/phpunit/AdherentTest.php +++ b/test/phpunit/AdherentTest.php @@ -266,7 +266,7 @@ class AdherentTest extends PHPUnit_Framework_TestCase $result=$localobject->update_note($localobject->note,'_private'); print __METHOD__." id=".$localobject->id." result=".$result."\n"; $this->assertLessThan($result, 0); - $result=$localobject->update_note_public($localobject->note,'_public'); + $result=$localobject->update_note($localobject->note,'_public'); print __METHOD__." id=".$localobject->id." result=".$result."\n"; $this->assertLessThan($result, 0); diff --git a/test/phpunit/ContactTest.php b/test/phpunit/ContactTest.php index b638cdc776b..2c41955e1ad 100755 --- a/test/phpunit/ContactTest.php +++ b/test/phpunit/ContactTest.php @@ -211,14 +211,14 @@ class ContactTest extends PHPUnit_Framework_TestCase $result=$localobject->update($localobject->id,$user); print __METHOD__." id=".$localobject->id." result=".$result."\n"; $this->assertLessThan($result, 0, 'Contact::update error'); - - $result=$localobject->update_note($localobject->note_private,'_private'); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0, 'Contact::update_note error'); - - $result=$localobject->update_note_public($localobject->note_public); + + $result=$localobject->update_note($localobject->note_private,'_private'); print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0, 'Contact::update_note_public error'); + $this->assertLessThan($result, 0, 'Contact::update_note (private) error'); + + $result=$localobject->update_note($localobject->note_public, '_public'); + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0, 'Contact::update_note (public) error'); $newobject=new Contact($this->savdb); $result=$newobject->fetch($localobject->id); diff --git a/test/phpunit/HolidayTest.php b/test/phpunit/HolidayTest.php index 36556fd9281..6867e9159fa 100644 --- a/test/phpunit/HolidayTest.php +++ b/test/phpunit/HolidayTest.php @@ -208,11 +208,11 @@ class HolidayTest extends PHPUnit_Framework_TestCase $result=$localobject->update_note($localobject->note_private,'_private'); print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0, 'Holiday::update_note error'); - - $result=$localobject->update_note_public($localobject->note_public); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0, 'Holiday::update_note_public error'); + $this->assertLessThan($result, 0, 'Holiday::update_note (private) error'); + + $result=$localobject->update_note($localobject->note_public, '_public'); + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0, 'Holiday::update_note (public) error'); $newobject=new Holiday($this->savdb); diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php index 8bcfb247365..24b868b743e 100755 --- a/test/phpunit/SocieteTest.php +++ b/test/phpunit/SocieteTest.php @@ -211,13 +211,13 @@ class SocieteTest extends PHPUnit_Framework_TestCase print __METHOD__." id=".$localobject->id." result=".$result."\n"; $this->assertLessThan($result, 0); - $result=$localobject->update_note($localobject->note_private,'_private'); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0, 'Holiday::update_note_private error'); + $result=$localobject->update_note($localobject->note_private,'_private'); + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0, 'Holiday::update_note (private) error'); - $result=$localobject->update_note_public($localobject->note_public); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0, 'Holiday::update_note_public error'); + $result=$localobject->update_note($localobject->note_public, '_public'); + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0, 'Holiday::update_note (public) error'); $newobject=new Societe($this->savdb); $result=$newobject->fetch($localobject->id); From 57f05e850af04530c0297a06b639ee74cff2b67a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 24 Sep 2015 20:56:50 +0200 Subject: [PATCH 17/19] [Qual] Fixed typo and added hinting --- htdocs/core/class/commonobject.class.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 2a7834473dc..db9e7eb5de3 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -2806,10 +2806,11 @@ abstract class CommonObject // -------------------- /** - * Show linked object block. + * Show linked object block. * - * @return int <0 if KO, >0 if OK - * @deprecated 3.8 Use instead $form->shoLinkedObjectBlock($object) + * @return int <0 if KO, >0 if OK + * @deprecated 3.8 Use instead $form->showLinkedObjectBlock($object) + * @see Form::showLinkedObjectBlock */ function showLinkedObjectBlock() { From 50edf63448a9ab4bbb4f7e635616b1b497e22406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 24 Sep 2015 21:05:58 +0200 Subject: [PATCH 18/19] [Qual] Replaced deprecated displayMarginInfos() --- htdocs/comm/askpricesupplier/card.php | 4 +++- htdocs/comm/propal.php | 4 +++- htdocs/commande/card.php | 4 +++- htdocs/compta/facture.php | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/htdocs/comm/askpricesupplier/card.php b/htdocs/comm/askpricesupplier/card.php index 22732c1a19d..ab015103afa 100644 --- a/htdocs/comm/askpricesupplier/card.php +++ b/htdocs/comm/askpricesupplier/card.php @@ -29,6 +29,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaskpricesupplier.class.php'; +require_once DOL_DOCUMENT_ROOT . '/core/class/html.formmargin.class.php'; require_once DOL_DOCUMENT_ROOT . '/comm/askpricesupplier/class/askpricesupplier.class.php'; require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/modules/askpricesupplier/modules_askpricesupplier.php'; @@ -977,6 +978,7 @@ $form = new Form($db); $formother = new FormOther($db); $formfile = new FormFile($db); $formaskpricesupplier = new FormAskPriceSupplier($db); +$formmargin = new FormMargin($this->db); $companystatic = new Societe($db); $now = dol_now(); @@ -1500,7 +1502,7 @@ if ($action == 'create') // Margin Infos if (! empty($conf->margin->enabled)) { print ''; } print ''; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 24b7ab16d69..86895d7ca68 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -35,6 +35,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formpropal.class.php'; +require_once DOL_DOCUMENT_ROOT . '/core/class/html.formmargin.class.php'; require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php'; require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/modules/propale/modules_propale.php'; @@ -1183,6 +1184,7 @@ $form = new Form($db); $formother = new FormOther($db); $formfile = new FormFile($db); $formpropal = new FormPropal($db); +$formmargin = new FormMargin($this->db); $companystatic = new Societe($db); if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); } @@ -1986,7 +1988,7 @@ if ($action == 'create') // Margin Infos if (! empty($conf->margin->enabled)) { print ''; } print ''; diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 83b86ee5525..9caed2f22a2 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -36,6 +36,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formorder.class.php'; +require_once DOL_DOCUMENT_ROOT . '/core/class/html.formmargin.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/modules/commande/modules_commande.php'; require_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php'; require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php'; @@ -1222,6 +1223,7 @@ llxHeader('', $langs->trans('Order'), 'EN:Customers_Orders|FR:Commandes_Clients| $form = new Form($db); $formfile = new FormFile($db); $formorder = new FormOrder($db); +$formmargin = new FormMargin($db); if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); } /** @@ -2084,7 +2086,7 @@ if ($action == 'create' && $user->rights->commande->creer) // Margin Infos if (! empty($conf->margin->enabled)) { print ''; } else print ''; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 6b0af5f7043..0e04b8f26d5 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -42,6 +42,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/modules/facture/modules_facture.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/discount.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT . '/core/class/html.formmargin.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/invoice.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php'; @@ -1800,6 +1801,7 @@ if (empty($reshook)) $form = new Form($db); $formother = new FormOther($db); $formfile = new FormFile($db); +$formmargin = new FormMargin($this->db); $bankaccountstatic = new Account($db); if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); } @@ -3166,7 +3168,7 @@ else if ($id > 0 || ! empty($ref)) if (! empty($conf->margin->enabled)) { print '
'; - $object->displayMarginInfos($object->statut > 0); + $formmargin->displayMarginInfos($object, $object->statut > 0); } print ''; From 485c369d5517a99ae7a471e68aa2b9df36522b11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 24 Sep 2015 21:10:35 +0200 Subject: [PATCH 19/19] [Qual] Replaced deprecated form_confirm() --- htdocs/compta/bank/document.php | 2 +- htdocs/compta/paiement.php | 2 +- htdocs/contrat/card.php | 6 +++--- htdocs/core/class/html.form.class.php | 8 ++++---- .../tpl/document_actions_post_headers.tpl.php | 2 +- htdocs/expensereport/card.php | 18 +++++++++--------- htdocs/expensereport/synchro_compta.php | 6 +++--- htdocs/fourn/facture/paiement.php | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php index 0b588fa64d0..2290edd8cc5 100644 --- a/htdocs/compta/bank/document.php +++ b/htdocs/compta/bank/document.php @@ -200,7 +200,7 @@ if ($id > 0 || !empty($ref)) { * Confirmation suppression fichier */ if ($action == 'delete') { - $ret = $form->form_confirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&urlfile=' . urlencode($_GET["urlfile"]), + $ret = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&urlfile=' . urlencode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1); diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index aaebcf697f3..15730325699 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -658,7 +658,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie $text.='
'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed"); print ''; } - $form->form_confirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type,$langs->trans('ReceivedCustomersPayments'),$text,'confirm_paiement',$formquestion,$preselectedchoice); + $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type,$langs->trans('ReceivedCustomersPayments'),$text,'confirm_paiement',$formquestion,$preselectedchoice); } print "\n"; diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 429547ed602..3177100b7fb 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -1599,7 +1599,7 @@ else 'text' => $langs->trans("ConfirmMoveToAnotherContractQuestion"), array('type' => 'select', 'name' => 'newcid', 'values' => $arraycontractid)); - $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("MoveToAnotherContract"),$langs->trans("ConfirmMoveToAnotherContract"),"confirm_move",$formquestion); + $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("MoveToAnotherContract"),$langs->trans("ConfirmMoveToAnotherContract"),"confirm_move",$formquestion); print '
'; - print $form->selectarray('user',$internalusers);// select_users(0,'user',0); + print $form->selectarray('user',$internalusers);// select_dolusers(0,'user',0); print ''; - print $form->selectarray('action',$actions);// select_users(0,'user',0); + print $form->selectarray('action',$actions);// select_dolusers(0,'user',0); print '
'.$langs->trans("ChooseIfANewWindowMustBeOpenedOnClickOnBookmark").'
'.$langs->trans("Owner").''; - $form->select_users(isset($_POST['userid'])?$_POST['userid']:$user->id,'userid',1); + $form->select_dolusers(isset($_POST['userid'])?$_POST['userid']:$user->id,'userid',1); print ' 
'.$langs->trans("Owner").''; if ($action == 'edit' && $user->admin) { - $form->select_users(isset($_POST['userid'])?$_POST['userid']:($bookmark->fk_user?$bookmark->fk_user:''),'userid',1); + $form->select_dolusers(isset($_POST['userid'])?$_POST['userid']:($bookmark->fk_user?$bookmark->fk_user:''),'userid',1); } else { diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 3851a67f0cb..50ad2d59acb 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -3581,7 +3581,7 @@ class Form print ''; print ''; print ''; print ''; print '
'; - print $this->select_users($selected,$htmlname,1,$exclude,0,$include); + print $this->select_dolusers($selected,$htmlname,1,$exclude,0,$include); print '
'; diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php index baeda9b8a82..ab900aa6409 100644 --- a/htdocs/don/stats/index.php +++ b/htdocs/don/stats/index.php @@ -244,7 +244,7 @@ print '
'; print '
'.$langs->trans("CreatedBy").''; - print $form->select_users($userid,'userid',1); + print $form->select_dolusers($userid,'userid',1); print '
'.$langs->trans("Year").''; diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php index ca35f97df9b..b9ca2f7c3ae 100644 --- a/htdocs/expedition/stats/index.php +++ b/htdocs/expedition/stats/index.php @@ -243,7 +243,7 @@ print '
'; print '
'.$langs->trans("CreatedBy").''; - print $form->select_users($userid,'userid',1); + print $form->select_dolusers($userid,'userid',1); print '
'.$langs->trans("Year").''; diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index 83961d4f274..54e372053ad 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -214,7 +214,7 @@ if ($resql) // User if ($user->rights->expensereport->readall || $user->rights->expensereport->lire_tous){ print ''; - $html->select_users($search_user,"search_user",1,"",0,''); + $html->select_dolusers($search_user,"search_user",1,"",0,''); print ' '; if (empty($user->rights->holiday->write_all)) { - print $form->select_users($userid,'useridbis',0,'',1); + print $form->select_dolusers($userid,'useridbis',0,'',1); print ''; } - else print $form->select_users(GETPOST('userid')?GETPOST('userid'):$user->id,'userid',0,'',0); + else print $form->select_dolusers(GETPOST('userid')?GETPOST('userid'):$user->id,'userid',0,'',0); print '
'.$langs->trans("AffectedTo").''; $contactsofproject=(! empty($object->id)?$object->getListContactId('internal'):''); - $form->select_users($user->id,'userid',0,'',0,'',$contactsofproject); + $form->select_dolusers($user->id,'userid',0,'',0,'',$contactsofproject); print '
'.fieldLabel('AllocateCommercial','commercial_id').''; - $form->select_users((! empty($object->commercial_id)?$object->commercial_id:$user->id),'commercial_id',1); // Add current user by default + $form->select_dolusers((! empty($object->commercial_id)?$object->commercial_id:$user->id),'commercial_id',1); // Add current user by default print '
'.$langs->trans("Color").''; - print $formother->select_color($color,'color'); + print $formother->selectColor($color,'color'); print '
'.$langs->trans("Color").''; -print $formother->select_color($object->color, 'color'); +print $formother->selectColor($object->color, 'color'); print '
'; - $object->displayMarginInfos(); + $formmargin->displayMarginInfos($object); print '
'; - $object->displayMarginInfos(); + $formmargin->displayMarginInfos($object); print '
'; - $object->displayMarginInfos(); + $formmargin->displayMarginInfos($object); print '
'; } @@ -1611,7 +1611,7 @@ else $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')); $dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear')); $comment = GETPOST('comment'); - $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment),$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",dol_print_date($dateactstart,"%A %d %B %Y")),"confirm_active", '', 0, 1); + $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment),$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",dol_print_date($dateactstart,"%A %d %B %Y")),"confirm_active", '', 0, 1); print '
'; } @@ -1623,7 +1623,7 @@ else $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')); $dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear')); $comment = GETPOST('comment'); - $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService",dol_print_date($dateactend,"%A %d %B %Y")), "confirm_closeline", '', 0, 1); + $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService",dol_print_date($dateactend,"%A %d %B %Y")), "confirm_closeline", '', 0, 1); print '
'; } diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 3851a67f0cb..f2adf4828a0 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -3237,7 +3237,7 @@ class Form $formconfirm.= ($question ? '
': ''); $formconfirm.= '
'."\n"; - $formconfirm.= "\n\n"; + $formconfirm.= "\n\n"; $formconfirm.= ''; - $formconfirm.= "\n"; + $formconfirm.= "\n"; } else { - $formconfirm.= "\n\n"; + $formconfirm.= "\n\n"; $formconfirm.= '
'."\n"; $formconfirm.= ''."\n"; @@ -3345,7 +3345,7 @@ class Form $formconfirm.= "
\n"; $formconfirm.= '
'; - $formconfirm.= "\n"; + $formconfirm.= "\n"; } return $formconfirm; diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php index 84b869cd813..59c4c86a77e 100644 --- a/htdocs/core/tpl/document_actions_post_headers.tpl.php +++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php @@ -28,7 +28,7 @@ if (empty($relativepathwithnofile)) $relativepathwithnofile=''; if ($action == 'delete') { $langs->load("companies"); // Need for string DeleteFile+ConfirmDeleteFiles - $ret = $form->form_confirm( + $ret = $form->formconfirm( $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&urlfile=' . urlencode(GETPOST("urlfile")) . '&linkid=' . GETPOST('linkid', 'int') . (empty($param)?'':$param), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index 7220e869350..f9a22460b6f 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -1321,56 +1321,56 @@ else if ($action == 'save') { - $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("SaveTrip"),$langs->trans("ConfirmSaveTrip"),"confirm_validate","","",1); + $ret=$form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("SaveTrip"),$langs->trans("ConfirmSaveTrip"),"confirm_validate","","",1); if ($ret == 'html') print '
'; } if ($action == 'save_from_refuse') { - $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("SaveTrip"),$langs->trans("ConfirmSaveTrip"),"confirm_save_from_refuse","","",1); + $ret=$form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("SaveTrip"),$langs->trans("ConfirmSaveTrip"),"confirm_save_from_refuse","","",1); if ($ret == 'html') print '
'; } if ($action == 'delete') { - $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("DeleteTrip"),$langs->trans("ConfirmDeleteTrip"),"confirm_delete","","",1); + $ret=$form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("DeleteTrip"),$langs->trans("ConfirmDeleteTrip"),"confirm_delete","","",1); if ($ret == 'html') print '
'; } if ($action == 'validate') { - $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("ValideTrip"),$langs->trans("ConfirmValideTrip"),"confirm_approve","","",1); + $ret=$form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("ValideTrip"),$langs->trans("ConfirmValideTrip"),"confirm_approve","","",1); if ($ret == 'html') print '
'; } if ($action == 'paid') { - $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("PaidTrip"),$langs->trans("ConfirmPaidTrip"),"confirm_paid","","",1); + $ret=$form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("PaidTrip"),$langs->trans("ConfirmPaidTrip"),"confirm_paid","","",1); if ($ret == 'html') print '
'; } if ($action == 'cancel') { $array_input = array('text'=>$langs->trans("ConfirmCancelTrip"), array('type'=>"text",'label'=>$langs->trans("Comment"),'name'=>"detail_cancel",'size'=>"50",'value'=>"")); - $ret=$form->form_confirm($_SEVER["PHP_SELF"]."?id=".$id,$langs->trans("Cancel"),"","confirm_cancel",$array_input,"",1); + $ret=$form->formconfirm($_SEVER["PHP_SELF"]."?id=".$id,$langs->trans("Cancel"),"","confirm_cancel",$array_input,"",1); if ($ret == 'html') print '
'; } if ($action == 'brouillonner'): - $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("BrouillonnerTrip"),$langs->trans("ConfirmBrouillonnerTrip"),"confirm_brouillonner","","",1); + $ret=$form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("BrouillonnerTrip"),$langs->trans("ConfirmBrouillonnerTrip"),"confirm_brouillonner","","",1); if ($ret == 'html') print '
'; endif; if ($action == 'refuse') // Deny { $array_input = array('text'=>$langs->trans("ConfirmRefuseTrip"), array('type'=>"text",'label'=>$langs->trans("Comment"),'name'=>"detail_refuse",'size'=>"50",'value'=>"")); - $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("Deny"),'',"confirm_refuse",$array_input,"yes",1); + $ret=$form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("Deny"),'',"confirm_refuse",$array_input,"yes",1); if ($ret == 'html') print '
'; } if ($action == 'delete_line') { - $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id."&rowid=".GETPOST('rowid'),$langs->trans("DeleteLine"),$langs->trans("ConfirmDeleteLine"),"confirm_delete_line",'','yes',1); + $ret=$form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id."&rowid=".GETPOST('rowid'),$langs->trans("DeleteLine"),$langs->trans("ConfirmDeleteLine"),"confirm_delete_line",'','yes',1); if ($ret == 'html') print '
'; } diff --git a/htdocs/expensereport/synchro_compta.php b/htdocs/expensereport/synchro_compta.php index 90eb4bd4674..5e69b5c6138 100644 --- a/htdocs/expensereport/synchro_compta.php +++ b/htdocs/expensereport/synchro_compta.php @@ -108,13 +108,13 @@ dol_fiche_head(''); if ($_GET["action"] == 'ndfTOaccount'): $idTrip = $_GET['idTrip']; - $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?idTrip=".$idTrip."&account=".$idAccount,$langs->trans("ndfToAccount"),$langs->trans("ConfirmNdfToAccount"),"confirm_ndf_to_account","","",1); + $ret=$html->formconfirm($_SERVER["PHP_SELF"]."?idTrip=".$idTrip."&account=".$idAccount,$langs->trans("ndfToAccount"),$langs->trans("ConfirmNdfToAccount"),"confirm_ndf_to_account","","",1); if ($ret == 'html') print '
'; endif; if ($_GET["action"] == 'accountTOndf'): $idTrip = $_GET['idTrip']; - $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?idTrip=".$idTrip."&account=".$idAccount,$langs->trans("AccountToNdf"),$langs->trans("ConfirmAccountToNdf"),"confirm_account_to_ndf","","",1); + $ret=$html->formconfirm($_SERVER["PHP_SELF"]."?idTrip=".$idTrip."&account=".$idAccount,$langs->trans("AccountToNdf"),$langs->trans("ConfirmAccountToNdf"),"confirm_account_to_ndf","","",1); if ($ret == 'html') print '
'; endif; @@ -212,4 +212,4 @@ dol_fiche_end(); llxFooter(); -$db->close(); \ No newline at end of file +$db->close(); diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index 758885cef58..6b5791318ff 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -438,7 +438,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie $text.='
'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed"); print ''; } - $form->form_confirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type,$langs->trans('PayedSuppliersPayments'),$text,'confirm_paiement',$formquestion,$preselectedchoice); + $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type,$langs->trans('PayedSuppliersPayments'),$text,'confirm_paiement',$formquestion,$preselectedchoice); } print '';