From de1cf54e2f25cb691831c20862bcf880fd55642c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Mar 2021 00:20:28 +0100 Subject: [PATCH 1/2] Update box_members_by_type.php --- htdocs/core/boxes/box_members_by_type.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/boxes/box_members_by_type.php b/htdocs/core/boxes/box_members_by_type.php index 5d32f9663d5..cf81eaac57c 100644 --- a/htdocs/core/boxes/box_members_by_type.php +++ b/htdocs/core/boxes/box_members_by_type.php @@ -187,7 +187,7 @@ class box_members_by_type extends ModeleBoxes ); $line++; foreach ($AdherentType as $key => $adhtype) { - $SommeA += isset($MemberToValidate[$key]) ? $MemberToValidate[$key] : 0; + $SommeA += isset($MembersToValidate[$key]) ? $MembersToValidate[$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; @@ -198,7 +198,7 @@ class box_members_by_type extends ModeleBoxes ); $this->info_box_contents[$line][] = array( 'td' => 'class="right"', - 'text' => (isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0 ? $MemberToValidate[$key] : '') . ' ' . $staticmember->LibStatut(-1, $adhtype->subscription, 0, 3), + 'text' => (isset($MembersToValidate[$key]) && $MembersToValidate[$key] > 0 ? $MembersToValidate[$key] : '') . ' ' . $staticmember->LibStatut(-1, $adhtype->subscription, 0, 3), 'asis' => 1, ); $this->info_box_contents[$line][] = array( From 429992ee7f9d1d6a3550810855e92ca132216c54 Mon Sep 17 00:00:00 2001 From: ksar <35605507+ksar-ksar@users.noreply.github.com> Date: Tue, 9 Mar 2021 10:46:11 +0100 Subject: [PATCH 2/2] FIX #16590 --- htdocs/install/mysql/tables/llx_c_civility.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/tables/llx_c_civility.sql b/htdocs/install/mysql/tables/llx_c_civility.sql index 2084b876e7b..63fc8fca81f 100644 --- a/htdocs/install/mysql/tables/llx_c_civility.sql +++ b/htdocs/install/mysql/tables/llx_c_civility.sql @@ -19,7 +19,7 @@ create table llx_c_civility ( - rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL + rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, code varchar(6) NOT NULL, label varchar(50), active tinyint DEFAULT 1 NOT NULL,