From cce40d98053a3b5ecc1b20085a77dfcf7642218d Mon Sep 17 00:00:00 2001
From: evilguy4000 <dries.peeters96@gmail.com>
Date: Mon, 15 Jun 2026 11:09:53 +0200
Subject: [PATCH 1/3] fix(invoices): link expenses correctly instead of invoice
 items (#662)

Expenses from the Expenses module were easy to mis-add or lose on save
because generate-from-time always wiped line items and the Add Expense
flow dropped users into the time-entry picker. Preserve items when only
expenses are selected, harden edit-time expense sync, and focus the UI
on the expenses section with an integration test for the full flow.
---
 app/routes/invoices.py                        | 46 ++++++++---
 app/templates/invoices/edit.html              |  5 +-
 .../invoices/generate_from_time.html          | 64 ++++++++++++++-
 tests/test_invoices.py                        | 81 +++++++++++++++++++
 4 files changed, 178 insertions(+), 18 deletions(-)

diff --git a/app/routes/invoices.py b/app/routes/invoices.py
index 4c922088..ecd10c85 100644
--- a/app/routes/invoices.py
+++ b/app/routes/invoices.py
@@ -451,20 +451,24 @@ def edit_invoice(invoice_id):
                     flash(f"Invalid quantity or price for item {i+1}", "error")
                     continue
 
-        # Update expenses
-        expense_ids = request.form.getlist("expense_id[]")
+        # Update expenses (only when the expenses section was submitted)
+        if request.form.get("expenses_sync"):
+            expense_ids = request.form.getlist("expense_id[]")
 
-        # Unlink expenses not in the list
-        for expense in invoice.expenses.all():
-            if str(expense.id) not in expense_ids:
-                expense.unmark_as_invoiced()
+            # Unlink expenses removed from this invoice
+            for expense in invoice.expenses.all():
+                if expense.invoice_id == invoice.id and str(expense.id) not in expense_ids:
+                    expense.unmark_as_invoiced()
 
-        # Link expenses in the list
-        if expense_ids:
+            # Link new expenses from the list
             for expense_id in expense_ids:
                 try:
                     expense = Expense.query.get(int(expense_id))
-                    if expense and not expense.invoiced:
+                    if not expense:
+                        continue
+                    if expense.invoice_id == invoice.id:
+                        continue
+                    if not expense.invoiced:
                         expense.mark_as_invoiced(invoice.id)
                 except (ValueError, AttributeError):
                     continue
@@ -893,8 +897,9 @@ def generate_from_time(invoice_id):
             flash(_("No time entries, costs, expenses, or extra goods selected"), "error")
             return redirect(url_for("invoices.generate_from_time", invoice_id=invoice.id))
 
-        # Clear existing items
-        invoice.items.delete()
+        # Only regenerate invoice items when time entries or project costs are selected
+        if selected_entries or selected_costs:
+            invoice.items.delete()
 
         total_prepaid_allocated = Decimal("0")
         prepaid_allocator = None
@@ -997,6 +1002,8 @@ def generate_from_time(invoice_id):
             flash(_("Could not generate items due to a database error. Please check server logs."), "error")
             return redirect(url_for("invoices.edit_invoice", invoice_id=invoice.id))
 
+        db.session.refresh(invoice)
+
         # If invoice is already sent (not draft), mark time entries as paid
         if invoice.status != "draft":
             from app.services import InvoiceService
@@ -1006,7 +1013,20 @@ def generate_from_time(invoice_id):
             if marked_count > 0:
                 safe_commit("mark_time_entries_paid_from_invoice", {"invoice_id": invoice.id})
 
-        flash(_("Invoice items generated successfully from time entries and costs"), "success")
+        added_parts = []
+        if selected_entries or selected_costs:
+            added_parts.append(_("time entries and costs"))
+        if selected_expenses:
+            added_parts.append(_("expenses"))
+        if selected_goods:
+            added_parts.append(_("extra goods"))
+        if added_parts:
+            flash(
+                _("Successfully added %(parts)s to the invoice.", parts=", ".join(added_parts)),
+                "success",
+            )
+        else:
+            flash(_("Invoice updated successfully"), "success")
         if total_prepaid_allocated and total_prepaid_allocated > 0:
             flash(
                 _(
@@ -1022,6 +1042,7 @@ def generate_from_time(invoice_id):
     from app.services import InvoiceService
 
     data = InvoiceService().get_unbilled_data_for_invoice(invoice)
+    focus = request.args.get("focus", "").strip()
     return render_template(
         "invoices/generate_from_time.html",
         invoice=invoice,
@@ -1038,6 +1059,7 @@ def generate_from_time(invoice_id):
         prepaid_summary=data["prepaid_summary"],
         prepaid_plan_hours=data["prepaid_plan_hours"],
         prepaid_reset_day=data.get("prepaid_reset_day"),
+        focus=focus,
     )
 
 
diff --git a/app/templates/invoices/edit.html b/app/templates/invoices/edit.html
index f2320ff4..b50b76da 100644
--- a/app/templates/invoices/edit.html
+++ b/app/templates/invoices/edit.html
@@ -166,7 +166,8 @@ <h2 class="text-lg font-semibold flex items-center">
                     </div>
                     
                     <div id="invoice-expenses" class="space-y-2">
-                        {% for expense in invoice.expenses %}
+                        <input type="hidden" name="expenses_sync" value="1">
+                        {% for expense in invoice.expenses.all() %}
                         <div class="grid grid-cols-1 md:grid-cols-12 gap-3 p-3 rounded-lg bg-amber-50/50 dark:bg-amber-950/20 border border-amber-200/50 dark:border-amber-800/50 invoice-expense-row min-w-0 hover:shadow-sm transition">
                             <input type="hidden" name="expense_id[]" value="{{ expense.id }}">
                             <div class="md:col-span-3 min-w-0 flex flex-col">
@@ -654,7 +655,7 @@ <h3 class="text-lg font-semibold mb-3">{{ _('Quick Actions') }}</h3>
     // Add expense button - redirect to generate from time page which includes expenses
     const addExpenseBtn = document.getElementById('add-expense');
     addExpenseBtn && addExpenseBtn.addEventListener('click', function() {
-        window.location.href = '{{ url_for("invoices.generate_from_time", invoice_id=invoice.id) }}';
+        window.location.href = '{{ url_for("invoices.generate_from_time", invoice_id=invoice.id, focus="expenses") }}';
     });
 
     // Remove expense handler (unlink from invoice)
diff --git a/app/templates/invoices/generate_from_time.html b/app/templates/invoices/generate_from_time.html
index f508ca3f..4167703e 100644
--- a/app/templates/invoices/generate_from_time.html
+++ b/app/templates/invoices/generate_from_time.html
@@ -3,8 +3,20 @@
 {% block content %}
 <div class="flex flex-col md:flex-row justify-between items-start md:items-center mb-6 gap-4">
     <div>
-        <h1 class="text-2xl font-bold">{{ _('Generate from Time, Costs & Goods') }}</h1>
-        <p class="text-text-muted-light dark:text-text-muted-dark">{{ _('Select unbilled time entries, project costs, and extra goods to add to this invoice') }}</p>
+        <h1 class="text-2xl font-bold">
+            {% if focus == 'expenses' %}
+            {{ _('Add Expenses to Invoice') }}
+            {% else %}
+            {{ _('Generate from Time, Costs & Goods') }}
+            {% endif %}
+        </h1>
+        <p class="text-text-muted-light dark:text-text-muted-dark">
+            {% if focus == 'expenses' %}
+            {{ _('Select billable expenses to link to this invoice. They will appear in the Expenses section, not as invoice items.') }}
+            {% else %}
+            {{ _('Select unbilled time entries, project costs, and extra goods to add to this invoice') }}
+            {% endif %}
+        </p>
     </div>
     <a href="{{ url_for('invoices.edit_invoice', invoice_id=invoice.id) }}" class="btn btn-secondary shrink-0">{{ _('Back to Edit') }}</a>
 </div>
@@ -15,6 +27,16 @@ <h1 class="text-2xl font-bold">{{ _('Generate from Time, Costs & Goods') }}</h1>
             <form method="POST" id="generateFromTimeForm">
                 <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
 
+                {% if focus == 'expenses' %}
+                <div class="mb-4">
+                    <button type="button" id="toggle-time-costs" class="text-sm text-primary hover:underline">
+                        <i class="fas fa-chevron-down mr-1" id="toggle-time-costs-icon"></i>
+                        <span id="toggle-time-costs-label">{{ _('Show time entries and project costs') }}</span>
+                    </button>
+                </div>
+                <div id="time-costs-sections" class="hidden mb-6 space-y-6">
+                {% endif %}
+
                 <div class="mb-6">
                     <h2 class="text-lg font-semibold mb-3">{{ _('Unbilled Time Entries') }}</h2>
                     {% if grouped_time_entries %}
@@ -87,8 +109,15 @@ <h2 class="text-lg font-semibold mb-3">{{ _('Uninvoiced Project Costs') }}</h2>
                     {% endif %}
                 </div>
 
-                <div class="mb-6">
-                    <h2 class="text-lg font-semibold mb-3">{{ _('Uninvoiced Billable Expenses') }}</h2>
+                {% if focus == 'expenses' %}
+                </div>
+                {% endif %}
+
+                <div id="expenses-section" class="mb-6{% if focus == 'expenses' %} rounded-xl border-2 border-amber-400 dark:border-amber-500 bg-amber-50/50 dark:bg-amber-950/20 p-4 ring-2 ring-amber-200/50 dark:ring-amber-800/50{% endif %}">
+                    <h2 class="text-lg font-semibold mb-3 flex items-center">
+                        {% if focus == 'expenses' %}<i class="fas fa-receipt mr-2 text-amber-600"></i>{% endif %}
+                        {{ _('Uninvoiced Billable Expenses') }}
+                    </h2>
                     {% if expenses %}
                     <div class="space-y-2">
                         {% for expense in expenses %}
@@ -187,6 +216,33 @@ <h3 class="text-lg font-semibold mb-3">{{ _('Tips') }}</h3>
 document.addEventListener('DOMContentLoaded', function() {
     const form = document.getElementById('generateFromTimeForm');
     if (!form) return;
+
+    {% if focus == 'expenses' %}
+    const expensesSection = document.getElementById('expenses-section');
+    if (expensesSection) {
+        expensesSection.scrollIntoView({ behavior: 'smooth', block: 'start' });
+    }
+    const toggleBtn = document.getElementById('toggle-time-costs');
+    const timeCostsSections = document.getElementById('time-costs-sections');
+    const toggleIcon = document.getElementById('toggle-time-costs-icon');
+    const toggleLabel = document.getElementById('toggle-time-costs-label');
+    if (toggleBtn && timeCostsSections) {
+        toggleBtn.addEventListener('click', function() {
+            const isHidden = timeCostsSections.classList.contains('hidden');
+            timeCostsSections.classList.toggle('hidden', !isHidden);
+            if (toggleIcon) {
+                toggleIcon.classList.toggle('fa-chevron-down', !isHidden);
+                toggleIcon.classList.toggle('fa-chevron-up', isHidden);
+            }
+            if (toggleLabel) {
+                toggleLabel.textContent = isHidden
+                    ? '{{ _('Hide time entries and project costs') }}'
+                    : '{{ _('Show time entries and project costs') }}';
+            }
+        });
+    }
+    {% endif %}
+
     form.addEventListener('submit', function(e) {
         const anyChecked = form.querySelector('input[name="time_entries[]"]:checked, input[name="project_costs[]"]:checked, input[name="expenses[]"]:checked, input[name="extra_goods[]"]:checked');
         if (!anyChecked) {
diff --git a/tests/test_invoices.py b/tests/test_invoices.py
index a4c4be80..88c2b15c 100644
--- a/tests/test_invoices.py
+++ b/tests/test_invoices.py
@@ -403,6 +403,87 @@ def test_generate_from_time_page_renders_lists(app, client, user, project):
     assert "Total available costs" in html
 
 
+@pytest.mark.routes
+def test_generate_from_time_links_expenses_without_creating_items(app, client, user, project):
+    """Expenses selected on generate-from-time should link to the invoice, not become invoice items."""
+    from factories import ExpenseFactory
+
+    with client.session_transaction() as sess:
+        sess["_user_id"] = str(user.id)
+        sess["_fresh"] = True
+
+    cl = ClientFactory(name="Expense Link Client", email="exp-link@test.com")
+    db.session.commit()
+
+    inv = InvoiceFactory(
+        invoice_number="INV-TEST-EXP-LINK-001",
+        project_id=project.id,
+        client_name=cl.name,
+        client_id=cl.id,
+        due_date=date.today() + timedelta(days=7),
+        created_by=user.id,
+        status="draft",
+    )
+    db.session.commit()
+
+    existing_item = InvoiceItemFactory(
+        invoice_id=inv.id,
+        description="Existing line item",
+        quantity=Decimal("2.00"),
+        unit_price=Decimal("50.00"),
+    )
+    db.session.commit()
+
+    expense1 = ExpenseFactory(
+        user_id=user.id,
+        project_id=project.id,
+        title="Travel Expense 1",
+        description="Taxi to client site",
+        category="travel",
+        amount=Decimal("100.00"),
+        expense_date=date.today(),
+        billable=True,
+        status="approved",
+    )
+    expense2 = ExpenseFactory(
+        user_id=user.id,
+        project_id=project.id,
+        title="Meals Expense",
+        description="Client lunch meeting",
+        category="meals",
+        amount=Decimal("50.00"),
+        expense_date=date.today(),
+        billable=True,
+        status="approved",
+    )
+    db.session.commit()
+
+    resp = client.post(
+        f"/invoices/{inv.id}/generate-from-time",
+        data={"expenses[]": [str(expense1.id), str(expense2.id)]},
+    )
+    assert resp.status_code == 302
+
+    inv = Invoice.query.get(inv.id)
+    linked = inv.expenses.all()
+    assert len(linked) == 2
+    assert {e.id for e in linked} == {expense1.id, expense2.id}
+
+    items = list(inv.items)
+    assert len(items) == 1
+    assert items[0].description == "Existing line item"
+    assert all(item.description not in {"Travel Expense 1", "Meals Expense"} for item in items)
+
+    edit_resp = client.get(f"/invoices/{inv.id}/edit")
+    assert edit_resp.status_code == 200
+    edit_html = edit_resp.get_data(as_text=True)
+    assert "Travel Expense 1" in edit_html
+    assert "Meals Expense" in edit_html
+    assert "Taxi to client site" in edit_html
+    assert "Client lunch meeting" in edit_html
+    assert 'id="invoice-expenses"' in edit_html
+
+
 @pytest.mark.routes
 def test_generate_from_time_applies_prepaid_hours(app, client, user):
     """Ensure prepaid hours are consumed before billing when generating invoice items."""

From ae5e60dfeb1d44a9019dad366cb6b779148704f6 Mon Sep 17 00:00:00 2001
From: evilguy4000 <dries.peeters96@gmail.com>
Date: Mon, 15 Jun 2026 11:16:08 +0200
Subject: [PATCH 2/3] chore(release): bump version to 5.8.2

Document the invoice expenses fix (#662) in CHANGELOG and README,
sync desktop and mobile client versions from setup.py, and update
BUILD_CONFIGURATION.md to match.
---
 CHANGELOG.md                    | 10 ++++++++++
 README.md                       |  4 ++++
 desktop/package-lock.json       |  4 ++--
 desktop/package.json            |  2 +-
 docs/BUILD_CONFIGURATION.md     |  2 +-
 mobile/android/local.properties |  4 ++--
 mobile/pubspec.yaml             |  2 +-
 setup.py                        |  2 +-
 8 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4bd507e..33027df8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [5.8.2] - 2026-06-15
+
+### Fixed
+
+- **Invoice expenses** — Expense records from the Expenses module now link to the invoice Expenses section instead of being misrouted into invoice items or lost on save. Generate-from-time no longer wipes existing line items when only expenses are selected; the Add Expense flow focuses the expenses picker; edit-time expense sync is hardened (#662).
+
+### Documentation
+
+- **Version** — Documented release **5.8.2** to match `setup.py` (single source of truth for the application version).
+
 ## [5.8.1] - 2026-06-10
 
 ### Fixed
diff --git a/README.md b/README.md
index 967ccc01..dfde0a39 100644
--- a/README.md
+++ b/README.md
@@ -90,6 +90,10 @@ TimeTracker has been continuously enhanced with powerful new features! Here's wh
 
 **Current version** is defined in `setup.py` (single source of truth). See [CHANGELOG.md](CHANGELOG.md) for versioned release history.
 
+### ✨ Highlights of v5.8.2
+
+**Patch (5.8.2):** **Invoice expenses** — billable expenses from the Expenses module link to the invoice Expenses section (not invoice items), stay separate with their descriptions, and are no longer wiped when adding expenses to an existing invoice. See [CHANGELOG.md](CHANGELOG.md#582---2026-06-15).
+
 ### ✨ Highlights of v5.8.1
 
 **Patch (5.8.1):** **Quote email** — sending a quote no longer flashes a false error after the email is delivered; fixes the follow-up regression to #652. See [CHANGELOG.md](CHANGELOG.md#581---2026-06-10).
diff --git a/desktop/package-lock.json b/desktop/package-lock.json
index d4dd2db0..42b9f07f 100644
--- a/desktop/package-lock.json
+++ b/desktop/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "timetracker-desktop",
-  "version": "5.8.1",
+  "version": "5.8.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "timetracker-desktop",
-      "version": "5.8.1",
+      "version": "5.8.2",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.16.0",
diff --git a/desktop/package.json b/desktop/package.json
index 578d334c..15f4b887 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "timetracker-desktop",
-  "version": "5.8.1",
+  "version": "5.8.2",
   "description": "TimeTracker desktop app for Windows, Linux, and macOS",
   "main": "src/main/main.js",
   "scripts": {
diff --git a/docs/BUILD_CONFIGURATION.md b/docs/BUILD_CONFIGURATION.md
index b4930a46..5bfbd470 100644
--- a/docs/BUILD_CONFIGURATION.md
+++ b/docs/BUILD_CONFIGURATION.md
@@ -184,7 +184,7 @@ To update the version for all applications:
    ```python
    setup(
        name='timetracker',
-       version='5.8.1',  # Update here
+       version='5.8.2',  # Update here
        ...
    )
    ```
diff --git a/mobile/android/local.properties b/mobile/android/local.properties
index 78ef814e..8f32a35e 100644
--- a/mobile/android/local.properties
+++ b/mobile/android/local.properties
@@ -1,5 +1,5 @@
-flutter.versionCode=50801
-flutter.versionName=5.8.1
+flutter.versionCode=50802
+flutter.versionName=5.8.2
 flutter.sdk=C:\\Flutter\\flutter
 sdk.dir=C:\\Users\\dries\\AppData\\Local\\Android\\Sdk
 flutter.buildMode=release
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 80b95710..df565681 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -1,7 +1,7 @@
 name: timetracker_mobile
 description: TimeTracker mobile app for Android and iOS
 publish_to: 'none'
-version: 5.8.1+1
+version: 5.8.2+1
 
 environment:
   sdk: '>=3.0.0 <4.0.0'
diff --git a/setup.py b/setup.py
index ea0543be..02684094 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@
 
 setup(
     name='timetracker',
-    version='5.8.1',
+    version='5.8.2',
     packages=find_packages(),
     include_package_data=True,
     package_data={

From 137a7ab7e79032a466d8c65f1969daed41882829 Mon Sep 17 00:00:00 2001
From: evilguy4000 <dries.peeters96@gmail.com>
Date: Mon, 15 Jun 2026 11:18:12 +0200
Subject: [PATCH 3/3] (fix): remove .env.local-test & updated gitignore.

---
 .env.local-test | 36 ------------------------------------
 .gitignore      |  1 +
 docs/Untitled   |  1 +
 3 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 .env.local-test
 create mode 100644 docs/Untitled

diff --git a/.env.local-test b/.env.local-test
deleted file mode 100644
index 0e3c0452..00000000
--- a/.env.local-test
+++ /dev/null
@@ -1,36 +0,0 @@
-# Local Testing Environment Variables
-# Copy this file to .env.local-test and modify as needed
-
-# Timezone (default: Europe/Brussels)
-TZ=Europe/Brussels
-
-# Currency (default: EUR)
-CURRENCY=EUR
-
-# Timer settings
-ROUNDING_MINUTES=1
-SINGLE_ACTIVE_TIMER=true
-IDLE_TIMEOUT_MINUTES=30
-
-# User management
-ALLOW_SELF_REGISTER=true
-ADMIN_USERNAMES=admin
-# Security (CHANGE THESE FOR PRODUCTION!)
-SECRET_KEY=local-test-secret-key-change-this-please-override-32plus
-
-# Database (SQLite for local testing)
-DATABASE_URL=sqlite:///data/timetracker.db
-
-# Logging
-LOG_FILE=/app/logs/timetracker.log
-
-# Cookie settings (disabled for local testing)
-SESSION_COOKIE_SECURE=false
-REMEMBER_COOKIE_SECURE=false
-
-# Flask environment
-FLASK_ENV=development
-FLASK_DEBUG=true
-
-# License server (disabled for local testing)
-LICENSE_SERVER_ENABLED=false
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 8254a3f8..bda2c803 100644
--- a/.gitignore
+++ b/.gitignore
@@ -201,6 +201,7 @@ desktop/*.pvk
 
 # Environment backups
 .env.backup
+.env.local-test
 
 # Node.js / Frontend build
 node_modules/
diff --git a/docs/Untitled b/docs/Untitled
new file mode 100644
index 00000000..e2ad24a7
--- /dev/null
+++ b/docs/Untitled
@@ -0,0 +1 @@
+.env.local-test
\ No newline at end of file