From ec8373877be74e71df215e76d17b6b2e6ac3f7ec Mon Sep 17 00:00:00 2001
From: Emanuele <ema.trabattoni@gmail.com>
Date: Wed, 3 Dec 2025 10:21:50 +0100
Subject: [PATCH] fix row merge

---
 cntmanage/flightslot/actions/exportweek.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cntmanage/flightslot/actions/exportweek.py b/cntmanage/flightslot/actions/exportweek.py
index e14f8f6..5930e13 100644
--- a/cntmanage/flightslot/actions/exportweek.py
+++ b/cntmanage/flightslot/actions/exportweek.py
@@ -179,6 +179,8 @@ def export_selected(request: HttpRequest, queryset: QuerySet[WeekPreference]) ->
                                     start_column=max(merge_col_start,1),
                                     end_column=max(c-1,1)) # end merge to previous column
                 prev_cell_val = cell_content
+                if c >= note_index - 1: # Do not merge beyond notes
+                    break
             
             # Incement row counter
             row_offset += 1