From 359ebb9a7ff4c04bb3b866299111934d04a82dca Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 2 May 2023 17:26:12 +0200 Subject: [PATCH] Debug v18 --- htdocs/compta/index.php | 3 ++- htdocs/compta/sociales/card.php | 2 ++ htdocs/don/class/don.class.php | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 8a8e4245005..9c77eed2540 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -408,7 +408,7 @@ if ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMO // Latest donations -if (isModEnabled('don') && !empty($user->rights->don->lire)) { +if (isModEnabled('don') && $user->hasRight('don', 'lire')) { include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; $langs->load("boxes"); @@ -441,6 +441,7 @@ if (isModEnabled('don') && !empty($user->rights->don->lire)) { print ''.$langs->trans("DateModificationShort").''; print ' '; print ''; + if ($num) { $total_ttc = $totalam = $total_ht = 0; diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php index 45d03f273c3..217018d3fac 100644 --- a/htdocs/compta/sociales/card.php +++ b/htdocs/compta/sociales/card.php @@ -667,6 +667,8 @@ if ($id > 0) { print ''; print '
'; + print '
'; + $nbcols = 3; if (isModEnabled("banque")) { $nbcols++; diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index 2a47767af54..15261d7bbc8 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -30,6 +30,7 @@ */ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/commonpeople.class.php'; /** @@ -37,6 +38,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; */ class Don extends CommonObject { + use CommonPeople; + /** * @var string ID to identify managed object */