From c6a46531fa2937c99755778c65e7f42171187b4e Mon Sep 17 00:00:00 2001
From: Thomas ZILLIOX <thomas.zilliox@innocraft.com>
Date: Mon, 17 Aug 2026 12:48:39 +0200
Subject: [PATCH 1/2] Update the expected file for the percentage columns of
 DEV-15528

Scheduled reports now include the percent-of-total columns, and the
percentages without the metric they belong to are no longer added.
Companion to matomo-org/matomo#24990.
---
 ...__subtable__API.getProcessedReport_day.xml | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/tests/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml b/tests/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
index f5222e7..1ad3e14 100644
--- a/tests/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
+++ b/tests/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
@@ -28,10 +28,6 @@
 			<conversion_rate>The percentage of visits that triggered a conversion. The conversion rate is calculated using the number of visits that converted at least one goal. Visits converting multiple goals are only counted once in the conversion rate.</conversion_rate>
 			<nb_visits_percent_of_total>The percentage of the report's total Visits that this row represents.</nb_visits_percent_of_total>
 			<nb_actions_percent_of_total>The percentage of the report's total Actions that this row represents.</nb_actions_percent_of_total>
-			<nb_visits_converted_percent_of_total>The percentage of the report's total Visits with Conversions that this row represents.</nb_visits_converted_percent_of_total>
-			<nb_conversions_percent_of_total>The percentage of the report's total Conversions that this row represents.</nb_conversions_percent_of_total>
-			<bounce_count_percent_of_total>The percentage of the report's total Bounces that this row represents.</bounce_count_percent_of_total>
-			<revenue_percent_of_total>The percentage of the report's total Revenue that this row represents.</revenue_percent_of_total>
 		</metricsDocumentation>
 		<processedMetrics>
 			<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -50,10 +46,6 @@
 			<conversion_rate>percent</conversion_rate>
 			<nb_visits_percent_of_total>percent</nb_visits_percent_of_total>
 			<nb_actions_percent_of_total>percent</nb_actions_percent_of_total>
-			<nb_visits_converted_percent_of_total>percent</nb_visits_converted_percent_of_total>
-			<nb_conversions_percent_of_total>percent</nb_conversions_percent_of_total>
-			<bounce_count_percent_of_total>percent</bounce_count_percent_of_total>
-			<revenue_percent_of_total>percent</revenue_percent_of_total>
 		</metricTypes>
 		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=CustomVariables&amp;apiAction=getCustomVariablesValuesFromNameId&amp;period=day&amp;date=2010-01-03&amp;idSubtable=1</imageGraphUrl>
 		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=CustomVariables&amp;apiAction=getCustomVariablesValuesFromNameId&amp;period=day&amp;date=2009-12-05,2010-01-03&amp;idSubtable=1</imageGraphEvolutionUrl>
@@ -62,19 +54,15 @@
 	<columns>
 		<label>Custom Variable value</label>
 		<nb_visits>Visits</nb_visits>
+		<nb_visits_percent_of_total>Visits (%)</nb_visits_percent_of_total>
 		<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
 		<nb_actions>Actions</nb_actions>
+		<nb_actions_percent_of_total>Actions (%)</nb_actions_percent_of_total>
 		<nb_users>Users</nb_users>
 		<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
 		<avg_time_on_site>Avg. Time on Website</avg_time_on_site>
 		<bounce_rate>Bounce Rate</bounce_rate>
 		<conversion_rate>Conversion Rate</conversion_rate>
-		<nb_visits_percent_of_total>Visits (% of total)</nb_visits_percent_of_total>
-		<nb_actions_percent_of_total>Actions (% of total)</nb_actions_percent_of_total>
-		<nb_visits_converted_percent_of_total>Visits with Conversions (% of total)</nb_visits_converted_percent_of_total>
-		<nb_conversions_percent_of_total>Conversions (% of total)</nb_conversions_percent_of_total>
-		<bounce_count_percent_of_total>Bounces (% of total)</bounce_count_percent_of_total>
-		<revenue_percent_of_total>Revenue (% of total)</revenue_percent_of_total>
 	</columns>
 	<reportData>
 		<row>
@@ -84,10 +72,6 @@
 			<nb_users>0</nb_users>
 			<nb_visits_percent_of_total>14.3%</nb_visits_percent_of_total>
 			<nb_actions_percent_of_total>16.7%</nb_actions_percent_of_total>
-			<nb_visits_converted_percent_of_total>20%</nb_visits_converted_percent_of_total>
-			<nb_conversions_percent_of_total>16.7%</nb_conversions_percent_of_total>
-			<bounce_count_percent_of_total>0%</bounce_count_percent_of_total>
-			<revenue_percent_of_total>0%</revenue_percent_of_total>
 			<conversion_rate>100%</conversion_rate>
 			<nb_actions_per_visit>4</nb_actions_per_visit>
 			<avg_time_on_site>00:06:04</avg_time_on_site>
@@ -101,10 +85,6 @@
 			<nb_users>0</nb_users>
 			<nb_visits_percent_of_total>28.6%</nb_visits_percent_of_total>
 			<nb_actions_percent_of_total>8.3%</nb_actions_percent_of_total>
-			<nb_visits_converted_percent_of_total>20%</nb_visits_converted_percent_of_total>
-			<nb_conversions_percent_of_total>33.3%</nb_conversions_percent_of_total>
-			<bounce_count_percent_of_total>50%</bounce_count_percent_of_total>
-			<revenue_percent_of_total>50%</revenue_percent_of_total>
 			<conversion_rate>50%</conversion_rate>
 			<nb_actions_per_visit>1</nb_actions_per_visit>
 			<avg_time_on_site>00:03:01</avg_time_on_site>

From c34214d48c4fe5b5cb9001ca656633e803567f6c Mon Sep 17 00:00:00 2001
From: Matt <1169490+caddoo@users.noreply.github.com>
Date: Tue, 18 Aug 2026 11:32:39 +1200
Subject: [PATCH 2/2] Keep the percent of total column label as it is on
 6.x-dev

---
 ...hCustomVariables__subtable__API.getProcessedReport_day.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml b/tests/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
index 1ad3e14..4a35866 100644
--- a/tests/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
+++ b/tests/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
@@ -54,10 +54,10 @@
 	<columns>
 		<label>Custom Variable value</label>
 		<nb_visits>Visits</nb_visits>
-		<nb_visits_percent_of_total>Visits (%)</nb_visits_percent_of_total>
+		<nb_visits_percent_of_total>Visits (% of total)</nb_visits_percent_of_total>
 		<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
 		<nb_actions>Actions</nb_actions>
-		<nb_actions_percent_of_total>Actions (%)</nb_actions_percent_of_total>
+		<nb_actions_percent_of_total>Actions (% of total)</nb_actions_percent_of_total>
 		<nb_users>Users</nb_users>
 		<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
 		<avg_time_on_site>Avg. Time on Website</avg_time_on_site>