From 103ece1715b9f331f30940b715088088b28625b9 Mon Sep 17 00:00:00 2001
From: Du Peng <gnepud@gmail.com>
Date: Tue, 28 May 2024 14:06:22 +0200
Subject: [PATCH 1/2] (bug) member wallet amount calculation error in the excel
 export

---
 CHANGELOG.md                               | 2 ++
 app/views/exports/users_members.xlsx.axlsx | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9827a09f..cc7174c5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Next release
 
+- Fix a bug: member wallet amount calculation error in the excel export
+
 ## v6.3.24 2024 May 28
 
 - Fix a bug: unable to show member children for admin
diff --git a/app/views/exports/users_members.xlsx.axlsx b/app/views/exports/users_members.xlsx.axlsx
index 43cd048b4..edda65255 100644
--- a/app/views/exports/users_members.xlsx.axlsx
+++ b/app/views/exports/users_members.xlsx.axlsx
@@ -72,7 +72,7 @@ wb.add_worksheet(name: ExcelService.name_safe(t('export_members.members'))) do |
       member.invoicing_profile&.organization&.name || '',
       member.invoicing_profile&.organization&.address&.address || '',
       ActionController::Base.helpers.sanitize(member.profile.note, tags: []) || '',
-      member.wallet&.amount ? ActionController::Base.helpers.number_to_currency(member.wallet&.amount / 100.0, locale: CURRENCY_LOCALE) : ''
+      ActionController::Base.helpers.number_to_currency(member.wallet&.amount, locale: CURRENCY_LOCALE) || ''
     ]
     styles = [nil, nil, nil, nil, nil, nil, date, nil, nil, nil, nil, nil, nil, nil,
               nil, nil, nil, date, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil]

From 3b50cbc58f0fc194fb5116eb0c87c73f599be91b Mon Sep 17 00:00:00 2001
From: Du Peng <gnepud@gmail.com>
Date: Tue, 28 May 2024 14:07:09 +0200
Subject: [PATCH 2/2] Version 6.3.25

---
 CHANGELOG.md | 2 ++
 package.json | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc7174c5d..33140723a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Next release
 
+## v6.3.25 2024 May 28
+
 - Fix a bug: member wallet amount calculation error in the excel export
 
 ## v6.3.24 2024 May 28
diff --git a/package.json b/package.json
index 5433339f2..360071f9f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "6.3.24",
+  "version": "6.3.25",
   "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
   "keywords": [
     "fablab",