From ed45a41ee82fe17dc269f7963a36a0e387a04927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 14 Feb 2023 23:06:13 +0100
Subject: [PATCH] use isModEnabled

---
 .../project/doc/doc_generic_project_odt.modules.php  | 12 ++++++------
 .../core/modules/project/doc/pdf_beluga.modules.php  | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index c878ede3a16..c3a8cd796fc 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -945,31 +945,31 @@ class doc_generic_project_odt extends ModelePDFProjects
 						'title' => "ListProposalsAssociatedProject",
 						'class' => 'Propal',
 						'table' => 'propal',
-						'test' => $conf->propal->enabled && $user->hasRight('propal', 'lire')
+						'test' => isModEnabled('propal') && $user->hasRight('propal', 'lire')
 					),
 					'order' => array(
 						'title' => "ListOrdersAssociatedProject",
 						'class' => 'Commande',
 						'table' => 'commande',
-						'test' => $conf->commande->enabled && $user->hasRight('commande', 'lire')
+						'test' => isModEnabled('commande') && $user->hasRight('commande', 'lire')
 					),
 					'invoice' => array(
 						'title' => "ListInvoicesAssociatedProject",
 						'class' => 'Facture',
 						'table' => 'facture',
-						'test' => $conf->facture->enabled && $user->hasRight('facture', 'lire')
+						'test' => isModEnabled('facture') && $user->hasRight('facture', 'lire')
 					),
 					'invoice_predefined' => array(
 						'title' => "ListPredefinedInvoicesAssociatedProject",
 						'class' => 'FactureRec',
 						'table' => 'facture_rec',
-						'test' => $conf->facture->enabled && $user->hasRight('facture', 'lire')
+						'test' => isModEnabled('facture') && $user->hasRight('facture', 'lire')
 					),
 					'proposal_supplier' => array(
 						'title' => "ListSupplierProposalsAssociatedProject",
 						'class' => 'SupplierProposal',
 						'table' => 'supplier_proposal',
-						'test' => $conf->supplier_proposal->enabled && $user->rights->supplier_proposal->lire
+						'test' => isModEnabled('supplier_proposal') && $user->rights->supplier_proposal->lire
 					),
 					'order_supplier' => array(
 						'title' => "ListSupplierOrdersAssociatedProject",
@@ -987,7 +987,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 						'title' => "ListContractAssociatedProject",
 						'class' => 'Contrat',
 						'table' => 'contrat',
-						'test' => $conf->contrat->enabled && $user->hasRight('contrat', 'lire')
+						'test' => isModEnabled('contrat') && $user->hasRight('contrat', 'lire')
 					),
 					'intervention' => array(
 						'title' => "ListFichinterAssociatedProject",
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 98bf61d4f20..e72198e5b22 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -374,7 +374,7 @@ class pdf_beluga extends ModelePDFProjects
 						'class'=>'Propal',
 						'table'=>'propal',
 						'datefieldname'=>'datep',
-						'test'=>$conf->propal->enabled && $user->hasRight('propal', 'lire'),
+						'test'=> isModEnabled('propal') && $user->hasRight('propal', 'lire'),
 						'lang'=>'propal'),
 					'order'=>array(
 						'name'=>"CustomersOrders",
@@ -382,7 +382,7 @@ class pdf_beluga extends ModelePDFProjects
 						'class'=>'Commande',
 						'table'=>'commande',
 						'datefieldname'=>'date_commande',
-						'test'=>$conf->commande->enabled && $user->hasRight('commande', 'lire'),
+						'test'=> isModEnabled('commande') && $user->hasRight('commande', 'lire'),
 						'lang'=>'orders'),
 					'invoice'=>array(
 						'name'=>"CustomersInvoices",
@@ -391,7 +391,7 @@ class pdf_beluga extends ModelePDFProjects
 						'margin'=>'add',
 						'table'=>'facture',
 						'datefieldname'=>'datef',
-						'test'=>$conf->facture->enabled && $user->hasRight('facture', 'lire'),
+						'test'=> isModEnabled('facture') && $user->hasRight('facture', 'lire'),
 						'lang'=>'bills'),
 					'invoice_predefined'=>array(
 						'name'=>"PredefinedInvoices",
@@ -399,7 +399,7 @@ class pdf_beluga extends ModelePDFProjects
 						'class'=>'FactureRec',
 						'table'=>'facture_rec',
 						'datefieldname'=>'datec',
-						'test'=>$conf->facture->enabled && $user->hasRight('facture', 'lire'),
+						'test'=> isModEnabled('facture') && $user->hasRight('facture', 'lire'),
 						'lang'=>'bills'),
 					'order_supplier'=>array(
 						'name'=>"SuppliersOrders",
@@ -424,7 +424,7 @@ class pdf_beluga extends ModelePDFProjects
 						'class'=>'Contrat',
 						'table'=>'contrat',
 						'datefieldname'=>'date_contrat',
-						'test'=>$conf->contrat->enabled && $user->hasRight('contrat', 'lire'),
+						'test'=> isModEnabled('contrat') && $user->hasRight('contrat', 'lire'),
 						'lang'=>'contract'),
 					'intervention'=>array(
 						'name'=>"Interventions",