diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 7ec39b7eda8..920b06032d3 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -119,6 +119,9 @@ if ($result) { if ($objp->statut == 0) { $MembersResiliated[$objp->rowid] = $objp->somme; } + if ($objp->statut == -2) { + $MembersExcludeded[$objp->rowid] = $objp->somme; + } $i++; } @@ -206,10 +209,12 @@ if ($conf->use_javascript_ajax) { $dataval['notuptodate'][] = array($i, isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0) : 0); $dataval['uptodate'][] = array($i, isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0); $dataval['resiliated'][] = array($i, isset($MembersResiliated[$key]) ? $MembersResiliated[$key] : 0); + $dataval['excluded'][] = array($i, isset($MembersExcluded[$key]) ? $MembersExcluded[$key] : 0); $SommeA += isset($MemberToValidate[$key]) ? $MemberToValidate[$key] : 0; $SommeB += isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0) : 0; $SommeC += isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0; $SommeD += isset($MembersResiliated[$key]) ? $MembersResiliated[$key] : 0; + $SommeE += isset($MembersExcluded[$key]) ? $MembersExcluded รจ[$key] : 0; $i++; } $total = $SommeA + $SommeB + $SommeC + $SommeD; @@ -217,6 +222,7 @@ if ($conf->use_javascript_ajax) { $dataseries[] = array($langs->transnoentitiesnoconv("OutOfDate"), round($SommeB)); $dataseries[] = array($langs->transnoentitiesnoconv("UpToDate"), round($SommeC)); $dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusResiliated"), round($SommeD)); + $dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusExcluded"), round($SommeE)); $dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusToValid"), round($SommeA)); include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php'; @@ -471,6 +477,7 @@ print '