fix: start stats on last complete month

Author: nijel

weblate_web/crm/tests.py

@@ -452,6 +452,30 @@ def test_income_monthly_view_handles_boundary_year(self):
         self.assertEqual(response.status_code, 200)
         self.assertIsNone(response.context["rolling_trend"])
 
+    @responses.activate
+    def test_income_monthly_view_excludes_current_month_from_rolling_trend(self):
+        """Test monthly rolling trend skips the current incomplete month."""
+        cnb_mock_rates()
+        selected_year = 2026
+
+        self.create_test_invoice(2024, 4, InvoiceCategory.HOSTING, Decimal(100))
+        self.create_test_invoice(2024, 9, InvoiceCategory.HOSTING, Decimal(400))
+        self.create_test_invoice(2025, 5, InvoiceCategory.HOSTING, Decimal(500))
+        self.create_test_invoice(
+            selected_year, 4, InvoiceCategory.HOSTING, Decimal(600)
+        )
+
+        with patch.object(
+            IncomeView, "_get_current_date", return_value=date(2026, 4, 15)
+        ):
+            response = self.client.get(
+                reverse("crm:income-month", kwargs={"year": selected_year, "month": 4})
+            )
+
+        self.assertEqual(response.status_code, 200)
+        self.assertIsNone(response.context["rolling_trend"])
+        self.assertNotContains(response, "Rolling trend")
+
     @responses.activate
     def test_income_filters_only_invoices(self):
         """Test that income view only shows INVOICE kind, not quotes."""
@@ -736,6 +760,46 @@ def test_income_yearly_view_uses_local_year_for_trend_month(self):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.context["rolling_trend"]["period_month"], 12)
 
+    @responses.activate
+    def test_income_yearly_view_excludes_current_month_from_rolling_trend(self):
+        """Test yearly rolling trend ends at the last complete month."""
+        cnb_mock_rates()
+        selected_year = 2026
+
+        self.create_test_invoice(2024, 4, InvoiceCategory.HOSTING, Decimal(100))
+        self.create_test_invoice(2024, 9, InvoiceCategory.HOSTING, Decimal(400))
+        self.create_test_invoice(2025, 5, InvoiceCategory.HOSTING, Decimal(500))
+        self.create_test_invoice(
+            selected_year, 3, InvoiceCategory.HOSTING, Decimal(600)
+        )
+        self.create_test_invoice(
+            selected_year, 4, InvoiceCategory.HOSTING, Decimal(700)
+        )
+
+        with patch.object(
+            IncomeView, "_get_current_date", return_value=date(2026, 4, 15)
+        ):
+            response = self.client.get(
+                reverse("crm:income-year", kwargs={"year": selected_year})
+            )
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context["rolling_trend"]["period_month"], 3)
+        self.assertEqual(
+            response.context["rolling_trend"]["rolling_total"], Decimal(1100)
+        )
+        self.assertEqual(
+            response.context["rolling_trend"]["previous_total"], Decimal(500)
+        )
+
+        march_row = response.context["monthly_breakdown_rows"][2]
+        self.assertTrue(march_row["trend_available"])
+        self.assertEqual(march_row["rolling_total"], Decimal(1100))
+
+        april_row = response.context["monthly_breakdown_rows"][3]
+        self.assertEqual(april_row["amount"], Decimal(700))
+        self.assertFalse(april_row["trend_available"])
+
     @responses.activate
     def test_income_yearly_breakdown_trend_uses_single_query(self):
         """Test yearly trend breakdown stays constant-query."""

weblate_web/crm/views.py

@@ -782,6 +782,9 @@ def _get_current_date(self) -> date:
     def _get_current_month_start(self) -> date:
         return self._get_current_date().replace(day=1)
 
+    def _get_last_complete_month_start(self) -> date | None:
+        return self._shift_month(self._get_current_month_start(), -1)
+
     def _build_rolling_window_summary(
         self,
         month_totals: dict[date, Decimal],
@@ -839,7 +842,7 @@ def get_rolling_window_summary(
             period_start = self._get_month_start(year, month)
         except ValueError:
             return None
-        if period_start > self._get_current_month_start():
+        if period_start >= self._get_current_month_start():
             return None
         lookback_start = self._shift_month(period_start, -23)
         month_totals, earliest_month = self._get_month_totals_in_range(
@@ -868,18 +871,18 @@ def get_yearly_breakdown_rows(
         except ValueError:
             return rows
 
-        current_month_start = self._get_current_month_start()
-        if first_month > current_month_start:
+        last_complete_month = self._get_last_complete_month_start()
+        if last_complete_month is None or first_month > last_complete_month:
             return rows
 
-        trend_end_month = min(last_month, current_month_start)
+        trend_end_month = min(last_month, last_complete_month)
         month_totals, earliest_month = self._get_month_totals_in_range(
             self._shift_month(first_month, -23),
             trend_end_month,
         )
         for row in rows:
             period_start = self._get_month_start(year, cast("int", row["month_number"]))
-            if period_start > current_month_start:
+            if period_start > trend_end_month:
                 continue
 
             rolling_summary = self._build_rolling_window_summary(
@@ -898,7 +901,16 @@ def get_yearly_rolling_summary(
         monthly_breakdown_rows: list[dict[str, str | int | Decimal | bool]],
         current_year: int,
     ) -> dict[str, int | Decimal | bool] | None:
-        trend_month = 12 if year < current_year else self._get_current_date().month
+        if year < current_year:
+            trend_month = 12
+        elif year > current_year:
+            return None
+        else:
+            last_complete_month = self._get_last_complete_month_start()
+            if last_complete_month is None or last_complete_month.year != year:
+                return None
+            trend_month = last_complete_month.month
+
         if not 1 <= trend_month <= len(monthly_breakdown_rows):
             return None