From 15c217cc0a726e22b48fcdd38ac8085543a2e3a2 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Mon, 29 Dec 2025 07:34:20 +0100
Subject: [PATCH 01/88] added new db downloader

---
 docker/db-downloader/Dockerfile           |  25 ++
 docker/db-downloader/app.py               | 444 +++++++++++++++++++++
 docker/db-downloader/requirements.txt     |   5 +
 docker/db-downloader/static/app.js        | 457 ++++++++++++++++++++++
 docker/db-downloader/templates/index.html | 189 +++++++++
 5 files changed, 1120 insertions(+)
 create mode 100644 docker/db-downloader/Dockerfile
 create mode 100644 docker/db-downloader/app.py
 create mode 100644 docker/db-downloader/requirements.txt
 create mode 100644 docker/db-downloader/static/app.js
 create mode 100644 docker/db-downloader/templates/index.html

diff --git a/docker/db-downloader/Dockerfile b/docker/db-downloader/Dockerfile
new file mode 100644
index 000000000..760d57da8
--- /dev/null
+++ b/docker/db-downloader/Dockerfile
@@ -0,0 +1,25 @@
+FROM python:3.12-slim-bookworm
+
+RUN apt-get update && apt-get install -y \
+    mariadb-client \
+    openssh-client \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY app.py .
+COPY templates/ ./templates/
+COPY static/ ./static/
+
+RUN mkdir -p /app/downloads /app/ssh-keys
+
+ENV FLASK_APP=app:app
+ENV FLASK_ENV=production
+ENV PYTHONUNBUFFERED=1
+
+EXPOSE 8082
+
+CMD ["gunicorn", "--bind", "0.0.0.0:8082", "--workers", "2", "--threads", "4", "app:app"]
diff --git a/docker/db-downloader/app.py b/docker/db-downloader/app.py
new file mode 100644
index 000000000..d9988ee74
--- /dev/null
+++ b/docker/db-downloader/app.py
@@ -0,0 +1,444 @@
+import os
+import stat
+import uuid
+import gzip
+import struct
+import subprocess
+import threading
+import time
+from datetime import datetime
+from flask import Flask, render_template, request, jsonify, session
+import paramiko
+
+
+# =============================================================================
+# Configuration
+# =============================================================================
+class Config:
+    SCP_HOST = os.getenv('SCP_HOST', 'localhost')
+    SCP_PORT = int(os.getenv('SCP_PORT', 22))
+    SCP_USERNAME = os.getenv('SCP_USERNAME', 'root')
+    SCP_DEFAULT_PATH = os.getenv('SCP_DEFAULT_PATH', '/backups')
+
+    DB_HOST = os.getenv('DB_HOST', 'db')
+    DB_PORT = int(os.getenv('DB_PORT', 3306))
+    DB_USER = os.getenv('DB_USER', 'root')
+    DB_PASSWORD = os.getenv('DB_PASSWORD', '')
+    DB_AVAILABLE = os.getenv('DB_AVAILABLE', 'thetool,addressdb').split(',')
+
+    DOWNLOAD_PATH = '/app/downloads'
+    SSH_KEYS_PATH = '/app/ssh-keys'
+    SECRET_KEY = os.getenv('SECRET_KEY', os.urandom(24).hex())
+
+
+# =============================================================================
+# SFTP Client
+# =============================================================================
+class SFTPClient:
+    def __init__(self, host, port, username):
+        self.host = host
+        self.port = port
+        self.username = username
+        self.client = None
+        self.sftp = None
+
+    def connect_password(self, password):
+        self.client = paramiko.SSHClient()
+        self.client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+        self.client.connect(
+            hostname=self.host, port=self.port, username=self.username,
+            password=password, look_for_keys=False, allow_agent=False
+        )
+        self.sftp = self.client.open_sftp()
+
+    def connect_key(self, key_path, passphrase=None):
+        self.client = paramiko.SSHClient()
+        self.client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+        self.client.connect(
+            hostname=self.host, port=self.port, username=self.username,
+            key_filename=key_path, passphrase=passphrase,
+            look_for_keys=False, allow_agent=False
+        )
+        self.sftp = self.client.open_sftp()
+
+    def list_directory(self, path):
+        entries = []
+        for entry in self.sftp.listdir_attr(path):
+            is_dir = stat.S_ISDIR(entry.st_mode)
+            entries.append({
+                'name': entry.filename,
+                'size': entry.st_size,
+                'size_human': self._human_size(entry.st_size),
+                'mtime': entry.st_mtime,
+                'mtime_human': datetime.fromtimestamp(entry.st_mtime).strftime('%Y-%m-%d %H:%M'),
+                'is_dir': is_dir,
+                'is_sql': entry.filename.endswith(('.sql', '.sql.gz')),
+                'path': os.path.join(path, entry.filename)
+            })
+        return sorted(entries, key=lambda x: (not x['is_dir'], -x['mtime']))
+
+    def get_file_info(self, path):
+        entry = self.sftp.stat(path)
+        return {
+            'name': os.path.basename(path),
+            'size': entry.st_size,
+            'size_human': self._human_size(entry.st_size),
+            'mtime': entry.st_mtime,
+            'mtime_human': datetime.fromtimestamp(entry.st_mtime).strftime('%Y-%m-%d %H:%M'),
+            'path': path
+        }
+
+    def download_file(self, remote_path, local_path, callback=None):
+        self.sftp.get(remote_path, local_path, callback=callback)
+
+    def close(self):
+        if self.sftp:
+            self.sftp.close()
+        if self.client:
+            self.client.close()
+
+    @staticmethod
+    def _human_size(size):
+        for unit in ['B', 'KB', 'MB', 'GB', 'TB']:
+            if size < 1024:
+                return f"{size:.1f} {unit}"
+            size /= 1024
+        return f"{size:.1f} PB"
+
+
+# =============================================================================
+# Database Restore
+# =============================================================================
+class DatabaseRestore:
+    def __init__(self):
+        self.host = Config.DB_HOST
+        self.port = Config.DB_PORT
+        self.user = Config.DB_USER
+        self.password = Config.DB_PASSWORD
+        self.available_dbs = Config.DB_AVAILABLE
+        self.cancelled = False
+
+    def cancel(self):
+        self.cancelled = True
+
+    @staticmethod
+    def get_gzip_uncompressed_size(filepath):
+        with open(filepath, 'rb') as f:
+            f.seek(-4, 2)
+            return struct.unpack('<I', f.read(4))[0]
+
+    def _mysql_cmd(self, *extra_args):
+        return ['mysql', '-h', self.host, '-P', str(self.port), '-u', self.user, f'-p{self.password}'] + list(extra_args)
+
+    def ensure_database_exists(self, target_db):
+        if target_db not in self.available_dbs:
+            raise ValueError(f"Invalid database: {target_db}")
+        cmd = self._mysql_cmd('-e', f"CREATE DATABASE IF NOT EXISTS `{target_db}` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci")
+        result = subprocess.run(cmd, capture_output=True, text=True)
+        if result.returncode != 0:
+            raise Exception(f"Failed to create database: {result.stderr}")
+
+    def clear_database(self, target_db):
+        cmd = self._mysql_cmd('-N', '-e', f"SELECT table_name FROM information_schema.tables WHERE table_schema='{target_db}'")
+        result = subprocess.run(cmd, capture_output=True, text=True)
+        tables = [t.strip() for t in result.stdout.strip().split('\n') if t.strip()]
+
+        if tables:
+            drop_sql = "SET FOREIGN_KEY_CHECKS=0; " + "; ".join(f"DROP TABLE IF EXISTS `{t}`" for t in tables) + "; SET FOREIGN_KEY_CHECKS=1;"
+            subprocess.run(self._mysql_cmd(target_db, '-e', drop_sql), check=True, capture_output=True)
+        return len(tables)
+
+    def restore_from_file(self, file_path, target_db, progress_callback=None):
+        if target_db not in self.available_dbs:
+            raise ValueError(f"Invalid database: {target_db}")
+        self.cancelled = False
+        self.ensure_database_exists(target_db)
+        tables_dropped = self.clear_database(target_db)
+
+        if self.cancelled:
+            raise Exception("Restore cancelled by user")
+
+        mysql_cmd = self._mysql_cmd(target_db)
+        process = None
+
+        try:
+            if file_path.endswith('.gz'):
+                with gzip.open(file_path, 'rb') as f:
+                    process = subprocess.Popen(mysql_cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                    bytes_read = 0
+
+                    while True:
+                        if self.cancelled:
+                            process.terminate()
+                            raise Exception("Restore cancelled by user")
+
+                        chunk = f.read(1024 * 1024)
+                        if not chunk:
+                            break
+
+                        if process.poll() is not None:
+                            raise Exception(f"MySQL terminated: {process.stderr.read().decode()}")
+
+                        try:
+                            process.stdin.write(chunk)
+                            process.stdin.flush()
+                        except BrokenPipeError:
+                            raise Exception(f"MySQL connection lost: {process.stderr.read().decode()}")
+
+                        bytes_read += len(chunk)
+                        if progress_callback:
+                            progress_callback(bytes_read)
+
+                    process.stdin.close()
+                    process.wait(timeout=300)
+
+                    if process.returncode != 0:
+                        raise Exception(f"MySQL restore failed: {process.stderr.read().decode()}")
+            else:
+                with open(file_path, 'rb') as f:
+                    result = subprocess.run(mysql_cmd, stdin=f, capture_output=True, timeout=600)
+                    if result.returncode != 0:
+                        raise Exception(f"MySQL restore failed: {result.stderr.decode()}")
+        except subprocess.TimeoutExpired:
+            if process:
+                process.kill()
+            raise Exception("MySQL restore timed out")
+
+        return {'tables_dropped': tables_dropped, 'file': os.path.basename(file_path), 'database': target_db}
+
+
+# =============================================================================
+# Flask Application
+# =============================================================================
+app = Flask(__name__)
+app.config['SECRET_KEY'] = Config.SECRET_KEY
+
+# Job storage
+jobs = {}
+restorers = {}
+
+
+@app.route('/')
+def index():
+    return render_template('index.html', databases=Config.DB_AVAILABLE, scp_host=Config.SCP_HOST, scp_username=Config.SCP_USERNAME)
+
+
+@app.route('/health')
+def health():
+    return {'status': 'ok'}
+
+
+@app.route('/api/keys', methods=['GET'])
+def list_keys():
+    keys = []
+    if os.path.exists(Config.SSH_KEYS_PATH):
+        keys = [f for f in os.listdir(Config.SSH_KEYS_PATH) if not f.endswith('.pub') and not f.startswith('.')]
+    return jsonify({'success': True, 'keys': keys})
+
+
+@app.route('/api/connect', methods=['POST'])
+def connect():
+    data = request.json
+    auth_type = data.get('auth_type', 'password')
+
+    try:
+        client = SFTPClient(Config.SCP_HOST, Config.SCP_PORT, Config.SCP_USERNAME)
+
+        if auth_type == 'password':
+            if not data.get('password'):
+                return jsonify({'success': False, 'error': 'Password is required'}), 400
+            client.connect_password(data['password'])
+        else:
+            if not data.get('key_file'):
+                return jsonify({'success': False, 'error': 'SSH key file is required'}), 400
+            key_path = os.path.join(Config.SSH_KEYS_PATH, data['key_file'])
+            if not os.path.exists(key_path):
+                return jsonify({'success': False, 'error': 'SSH key file not found'}), 400
+            client.connect_key(key_path, data.get('key_passphrase'))
+
+        files = client.list_directory(Config.SCP_DEFAULT_PATH)
+        client.close()
+
+        session['sftp_auth'] = {
+            'type': auth_type,
+            'password': data.get('password'),
+            'key_file': data.get('key_file'),
+            'key_passphrase': data.get('key_passphrase')
+        }
+        session['connected'] = True
+
+        return jsonify({'success': True, 'files': files, 'path': Config.SCP_DEFAULT_PATH, 'host': Config.SCP_HOST, 'username': Config.SCP_USERNAME})
+    except Exception as e:
+        return jsonify({'success': False, 'error': str(e)}), 400
+
+
+@app.route('/api/browse', methods=['POST'])
+def browse():
+    if not session.get('connected'):
+        return jsonify({'success': False, 'error': 'Not connected'}), 401
+
+    auth = session.get('sftp_auth')
+    if not auth:
+        return jsonify({'success': False, 'error': 'Not authenticated'}), 401
+
+    path = request.json.get('path', Config.SCP_DEFAULT_PATH)
+
+    try:
+        client = SFTPClient(Config.SCP_HOST, Config.SCP_PORT, Config.SCP_USERNAME)
+        if auth['type'] == 'password':
+            client.connect_password(auth['password'])
+        else:
+            client.connect_key(os.path.join(Config.SSH_KEYS_PATH, auth['key_file']), auth.get('key_passphrase'))
+
+        files = client.list_directory(path)
+        client.close()
+        return jsonify({'success': True, 'files': files, 'path': path})
+    except Exception as e:
+        return jsonify({'success': False, 'error': str(e)}), 400
+
+
+@app.route('/api/disconnect', methods=['POST'])
+def disconnect():
+    session.pop('sftp_auth', None)
+    session.pop('connected', None)
+    return jsonify({'success': True})
+
+
+@app.route('/api/databases', methods=['GET'])
+def list_databases():
+    return jsonify({'success': True, 'databases': Config.DB_AVAILABLE})
+
+
+@app.route('/api/restore', methods=['POST'])
+def restore():
+    if not session.get('connected'):
+        return jsonify({'success': False, 'error': 'Not connected to SFTP'}), 401
+
+    data = request.json
+    remote_file = data.get('file')
+    target_db = data.get('database')
+
+    if not remote_file:
+        return jsonify({'success': False, 'error': 'No file selected'}), 400
+    if target_db not in Config.DB_AVAILABLE:
+        return jsonify({'success': False, 'error': f'Invalid database'}), 400
+
+    auth = session.get('sftp_auth')
+    if not auth:
+        return jsonify({'success': False, 'error': 'Not authenticated'}), 401
+
+    job_id = str(uuid.uuid4())
+    jobs[job_id] = {
+        'status': 'starting', 'progress': 0, 'file': os.path.basename(remote_file),
+        'database': target_db, 'started_at': time.time(), 'message': 'Initializing...'
+    }
+
+    thread = threading.Thread(target=run_restore, args=(job_id, remote_file, target_db, dict(auth)))
+    thread.daemon = True
+    thread.start()
+
+    return jsonify({'success': True, 'job_id': job_id})
+
+
+def run_restore(job_id, remote_file, target_db, auth):
+    local_file = os.path.join(Config.DOWNLOAD_PATH, os.path.basename(remote_file))
+    try:
+        if jobs[job_id].get('cancelled'):
+            jobs[job_id].update({'status': 'cancelled', 'message': 'Restore cancelled by user'})
+            return
+
+        jobs[job_id].update({'status': 'downloading', 'message': 'Connecting to remote server...'})
+
+        client = SFTPClient(Config.SCP_HOST, Config.SCP_PORT, Config.SCP_USERNAME)
+        if auth['type'] == 'password':
+            client.connect_password(auth['password'])
+        else:
+            client.connect_key(os.path.join(Config.SSH_KEYS_PATH, auth['key_file']), auth.get('key_passphrase'))
+
+        file_info = client.get_file_info(remote_file)
+        jobs[job_id]['file_size'] = file_info['size_human']
+        jobs[job_id]['message'] = f'Downloading {file_info["size_human"]}...'
+
+        def download_progress(transferred, total):
+            if jobs[job_id].get('cancelled'):
+                raise Exception("Download cancelled by user")
+            jobs[job_id].update({'progress': int((transferred / total) * 45) if total > 0 else 0, 'downloaded': transferred, 'total': total})
+
+        client.download_file(remote_file, local_file, callback=download_progress)
+        client.close()
+
+        if jobs[job_id].get('cancelled'):
+            jobs[job_id].update({'status': 'cancelled', 'message': 'Restore cancelled by user'})
+            if os.path.exists(local_file):
+                os.remove(local_file)
+            return
+
+        jobs[job_id].update({'progress': 45, 'message': 'Download complete. Preparing restore...', 'status': 'restoring'})
+        jobs[job_id]['progress'] = 50
+        jobs[job_id]['message'] = f'Clearing database {target_db}...'
+
+        restorer = DatabaseRestore()
+        restorers[job_id] = restorer
+
+        uncompressed_size = restorer.get_gzip_uncompressed_size(local_file) if local_file.endswith('.gz') else os.path.getsize(local_file)
+
+        def restore_progress(bytes_processed):
+            if jobs[job_id].get('cancelled'):
+                restorer.cancel()
+            pct = 50 + min(45, int((bytes_processed / uncompressed_size) * 45)) if uncompressed_size > 0 else 50
+            jobs[job_id].update({'progress': pct, 'message': f'Restoring to {target_db}... ({bytes_processed // (1024*1024)} MB / {uncompressed_size // (1024*1024)} MB)'})
+
+        result = restorer.restore_from_file(local_file, target_db, progress_callback=restore_progress)
+
+        if os.path.exists(local_file):
+            os.remove(local_file)
+
+        jobs[job_id].update({
+            'status': 'completed', 'progress': 100,
+            'message': f'Restore complete! Dropped {result["tables_dropped"]} tables and imported {result["file"]}',
+            'completed_at': time.time(), 'duration': time.time() - jobs[job_id]['started_at']
+        })
+
+    except Exception as e:
+        error_msg = str(e)
+        if 'cancelled' in error_msg.lower():
+            jobs[job_id].update({'status': 'cancelled', 'message': 'Restore cancelled by user'})
+        else:
+            jobs[job_id].update({'status': 'error', 'error': error_msg, 'message': f'Error: {error_msg}'})
+        if os.path.exists(local_file):
+            os.remove(local_file)
+    finally:
+        restorers.pop(job_id, None)
+
+
+@app.route('/api/status/<job_id>')
+def status(job_id):
+    if job_id not in jobs:
+        return jsonify({'success': False, 'error': 'Job not found'}), 404
+    job = jobs[job_id].copy()
+    job['success'] = True
+    if 'started_at' in job:
+        elapsed = (job.get('completed_at') or time.time()) - job['started_at']
+        job['elapsed'] = f'{int(elapsed // 60)}m {int(elapsed % 60)}s'
+    return jsonify(job)
+
+
+@app.route('/api/jobs', methods=['GET'])
+def list_jobs():
+    return jsonify({'success': True, 'jobs': dict(jobs)})
+
+
+@app.route('/api/cancel/<job_id>', methods=['POST'])
+def cancel(job_id):
+    if job_id not in jobs:
+        return jsonify({'success': False, 'error': 'Job not found'}), 404
+    if jobs[job_id]['status'] in ('completed', 'error', 'cancelled'):
+        return jsonify({'success': False, 'error': 'Job already finished'}), 400
+    jobs[job_id]['cancelled'] = True
+    if job_id in restorers:
+        restorers[job_id].cancel()
+    return jsonify({'success': True, 'message': 'Cancel signal sent'})
+
+
+if __name__ == '__main__':
+    app.run(host='0.0.0.0', port=8082, debug=True)
diff --git a/docker/db-downloader/requirements.txt b/docker/db-downloader/requirements.txt
new file mode 100644
index 000000000..973a9f474
--- /dev/null
+++ b/docker/db-downloader/requirements.txt
@@ -0,0 +1,5 @@
+flask==3.0.0
+gunicorn==21.2.0
+paramiko==3.4.0
+mysql-connector-python==8.2.0
+python-dotenv==1.0.0
diff --git a/docker/db-downloader/static/app.js b/docker/db-downloader/static/app.js
new file mode 100644
index 000000000..c949e1164
--- /dev/null
+++ b/docker/db-downloader/static/app.js
@@ -0,0 +1,457 @@
+// DB Restore Tool - Frontend JavaScript
+
+let currentPath = '';
+let selectedFile = null;
+let isConnected = false;
+let currentJobId = null;
+let pollInterval = null;
+
+// Initialize
+document.addEventListener('DOMContentLoaded', function() {
+    loadAvailableKeys();
+    setupEventListeners();
+});
+
+function setupEventListeners() {
+    // Auth type toggle
+    document.getElementById('auth-type').addEventListener('change', function() {
+        const passwordAuth = document.getElementById('password-auth');
+        const keyAuth = document.getElementById('key-auth');
+        if (this.value === 'password') {
+            passwordAuth.classList.remove('hidden');
+            keyAuth.classList.add('hidden');
+        } else {
+            passwordAuth.classList.add('hidden');
+            keyAuth.classList.remove('hidden');
+        }
+    });
+
+    // Connect form
+    document.getElementById('connect-form').addEventListener('submit', function(e) {
+        e.preventDefault();
+        connect();
+    });
+
+    // Disconnect button
+    document.getElementById('disconnect-btn').addEventListener('click', disconnect);
+
+    // Restore button
+    document.getElementById('restore-btn').addEventListener('click', startRestore);
+
+    // Cancel button
+    document.getElementById('cancel-btn').addEventListener('click', cancelRestore);
+}
+
+async function loadAvailableKeys() {
+    try {
+        const response = await fetch('/api/keys');
+        const data = await response.json();
+        const select = document.getElementById('key-file');
+        select.innerHTML = '<option value="">Select a key...</option>';
+        data.keys.forEach(key => {
+            const option = document.createElement('option');
+            option.value = key;
+            option.textContent = key;
+            select.appendChild(option);
+        });
+    } catch (error) {
+        console.error('Failed to load keys:', error);
+    }
+}
+
+async function connect() {
+    const authType = document.getElementById('auth-type').value;
+    const password = document.getElementById('password').value;
+    const keyFile = document.getElementById('key-file').value;
+    const keyPassphrase = document.getElementById('key-passphrase').value;
+
+    const btn = document.getElementById('connect-btn');
+    btn.disabled = true;
+    btn.textContent = 'Connecting...';
+
+    try {
+        const response = await fetch('/api/connect', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                auth_type: authType,
+                password: password,
+                key_file: keyFile,
+                key_passphrase: keyPassphrase
+            })
+        });
+
+        const data = await response.json();
+
+        if (data.success) {
+            isConnected = true;
+            currentPath = data.path;
+            showStatus('Connected to ' + data.host, 'success');
+            renderFiles(data.files, data.path);
+            updateBreadcrumb(data.path);
+
+            // Toggle buttons
+            btn.classList.add('hidden');
+            document.getElementById('disconnect-btn').classList.remove('hidden');
+
+            // Clear password field for security
+            document.getElementById('password').value = '';
+        } else {
+            showStatus('Connection failed: ' + data.error, 'error');
+        }
+    } catch (error) {
+        showStatus('Connection error: ' + error.message, 'error');
+    } finally {
+        btn.disabled = false;
+        btn.textContent = 'Connect';
+    }
+}
+
+async function disconnect() {
+    try {
+        await fetch('/api/disconnect', { method: 'POST' });
+    } catch (e) {}
+
+    isConnected = false;
+    selectedFile = null;
+    currentPath = '';
+
+    // Reset UI
+    document.getElementById('connect-btn').classList.remove('hidden');
+    document.getElementById('disconnect-btn').classList.add('hidden');
+    document.getElementById('file-browser').innerHTML = `
+        <div class="p-8 text-center text-gray-400">
+            <svg class="w-16 h-16 mx-auto mb-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 14v3m4-3v3m4-3v3M3 21h18M3 10h18M3 7l9-4 9 4M4 10h16v11H4V10z"/>
+            </svg>
+            <p>Connect to browse remote files</p>
+        </div>
+    `;
+    document.getElementById('breadcrumb').innerHTML = '<span class="text-gray-400">Not connected</span>';
+    document.getElementById('selected-file-info').innerHTML = '<p class="text-gray-500 text-sm">No file selected</p>';
+    document.getElementById('restore-btn').disabled = true;
+
+    hideStatus();
+}
+
+async function browse(path) {
+    if (!isConnected) return;
+
+    try {
+        const response = await fetch('/api/browse', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ path: path })
+        });
+
+        const data = await response.json();
+
+        if (data.success) {
+            currentPath = data.path;
+            renderFiles(data.files, data.path);
+            updateBreadcrumb(data.path);
+        } else {
+            showStatus('Browse failed: ' + data.error, 'error');
+        }
+    } catch (error) {
+        showStatus('Browse error: ' + error.message, 'error');
+    }
+}
+
+function renderFiles(files, path) {
+    const container = document.getElementById('file-browser');
+
+    if (files.length === 0) {
+        container.innerHTML = '<div class="p-8 text-center text-gray-400">Empty directory</div>';
+        return;
+    }
+
+    let html = '<div class="divide-y">';
+
+    // Parent directory link
+    if (path !== '/') {
+        const parentPath = path.split('/').slice(0, -1).join('/') || '/';
+        html += `
+            <div class="file-item p-3 cursor-pointer flex items-center" onclick="browse('${parentPath}')">
+                <svg class="w-5 h-5 mr-3 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 17l-5-5m0 0l5-5m-5 5h12"/>
+                </svg>
+                <span class="text-gray-600">..</span>
+            </div>
+        `;
+    }
+
+    files.forEach(file => {
+        const isSelected = selectedFile && selectedFile.path === file.path;
+        const selectedClass = isSelected ? 'selected' : '';
+
+        if (file.is_dir) {
+            html += `
+                <div class="file-item p-3 cursor-pointer flex items-center ${selectedClass}" onclick="browse('${file.path}')">
+                    <svg class="w-5 h-5 mr-3 text-yellow-500" fill="currentColor" viewBox="0 0 24 24">
+                        <path d="M10 4H4a2 2 0 00-2 2v12a2 2 0 002 2h16a2 2 0 002-2V8a2 2 0 00-2-2h-8l-2-2z"/>
+                    </svg>
+                    <span class="flex-1 font-medium">${file.name}</span>
+                </div>
+            `;
+        } else if (file.is_sql) {
+            html += `
+                <div class="file-item p-3 cursor-pointer flex items-center ${selectedClass}" onclick="selectFile(${JSON.stringify(file).replace(/"/g, '&quot;')})">
+                    <svg class="w-5 h-5 mr-3 text-green-500" fill="currentColor" viewBox="0 0 24 24">
+                        <path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8l-6-6z"/>
+                        <path d="M14 2v6h6"/>
+                    </svg>
+                    <span class="flex-1">${file.name}</span>
+                    <span class="text-sm text-gray-500 mr-4">${file.size_human}</span>
+                    <span class="text-sm text-gray-400">${file.mtime_human}</span>
+                </div>
+            `;
+        } else {
+            html += `
+                <div class="file-item p-3 flex items-center opacity-50">
+                    <svg class="w-5 h-5 mr-3 text-gray-400" fill="currentColor" viewBox="0 0 24 24">
+                        <path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8l-6-6z"/>
+                    </svg>
+                    <span class="flex-1 text-gray-500">${file.name}</span>
+                    <span class="text-sm text-gray-400">${file.size_human}</span>
+                </div>
+            `;
+        }
+    });
+
+    html += '</div>';
+    container.innerHTML = html;
+}
+
+function selectFile(file) {
+    selectedFile = file;
+    document.getElementById('selected-file-info').innerHTML = `
+        <p class="font-medium text-gray-800">${file.name}</p>
+        <p class="text-sm text-gray-500">${file.size_human} - ${file.mtime_human}</p>
+    `;
+    document.getElementById('restore-btn').disabled = false;
+
+    // Auto-detect target database from filename
+    const filename = file.name.toLowerCase();
+    const targetDbSelect = document.getElementById('target-db');
+    const availableDbs = Array.from(targetDbSelect.options).map(o => o.value);
+
+    for (const db of availableDbs) {
+        if (filename.includes(db.toLowerCase())) {
+            targetDbSelect.value = db;
+            break;
+        }
+    }
+
+    // Re-render to show selection
+    browse(currentPath);
+}
+
+function updateBreadcrumb(path) {
+    const parts = path.split('/').filter(p => p);
+    let html = `<span class="cursor-pointer hover:text-blue-600" onclick="browse('/')">/</span>`;
+
+    let currentPathBuild = '';
+    parts.forEach((part, index) => {
+        currentPathBuild += '/' + part;
+        const isLast = index === parts.length - 1;
+        html += `
+            <span class="mx-1">/</span>
+            <span class="${isLast ? 'font-medium' : 'cursor-pointer hover:text-blue-600'}"
+                  ${isLast ? '' : `onclick="browse('${currentPathBuild}')"`}>${part}</span>
+        `;
+    });
+
+    document.getElementById('breadcrumb').innerHTML = html;
+}
+
+async function startRestore() {
+    if (!selectedFile) return;
+
+    const targetDb = document.getElementById('target-db').value;
+
+    if (!confirm(`Are you sure you want to restore ${selectedFile.name} to database "${targetDb}"?\n\nThis will DROP ALL TABLES in the database!`)) {
+        return;
+    }
+
+    const btn = document.getElementById('restore-btn');
+    btn.disabled = true;
+    btn.textContent = 'Starting...';
+
+    try {
+        const response = await fetch('/api/restore', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                file: selectedFile.path,
+                database: targetDb
+            })
+        });
+
+        const data = await response.json();
+
+        if (data.success) {
+            currentJobId = data.job_id;
+            showProgressPanel();
+            startPolling();
+        } else {
+            showStatus('Restore failed: ' + data.error, 'error');
+            btn.disabled = false;
+            btn.textContent = 'Start Restore';
+        }
+    } catch (error) {
+        showStatus('Restore error: ' + error.message, 'error');
+        btn.disabled = false;
+        btn.textContent = 'Start Restore';
+    }
+}
+
+function showProgressPanel() {
+    document.getElementById('progress-panel').classList.remove('hidden');
+    document.getElementById('progress-bar').style.width = '0%';
+    document.getElementById('progress-bar').classList.remove('bg-green-600', 'bg-red-600', 'bg-yellow-600');
+    document.getElementById('progress-bar').classList.add('bg-blue-600');
+    document.getElementById('progress-percent').textContent = '0%';
+    document.getElementById('progress-status').textContent = 'Starting...';
+    document.getElementById('progress-message').textContent = 'Initializing...';
+    document.getElementById('cancel-btn').classList.remove('hidden');
+    document.getElementById('cancel-btn').disabled = false;
+    document.getElementById('cancel-btn').textContent = 'Cancel Restore';
+}
+
+function startPolling() {
+    if (pollInterval) clearInterval(pollInterval);
+
+    pollInterval = setInterval(async () => {
+        try {
+            const response = await fetch(`/api/status/${currentJobId}`);
+            const data = await response.json();
+
+            if (data.success) {
+                updateProgress(data);
+
+                if (data.status === 'completed' || data.status === 'error' || data.status === 'cancelled') {
+                    stopPolling();
+                    document.getElementById('restore-btn').disabled = false;
+                    document.getElementById('restore-btn').textContent = 'Start Restore';
+
+                    if (data.status === 'completed') {
+                        showStatus('Restore completed successfully!', 'success');
+                    } else if (data.status === 'cancelled') {
+                        showStatus('Restore was cancelled', 'error');
+                    } else {
+                        showStatus('Restore failed: ' + data.error, 'error');
+                    }
+                }
+            }
+        } catch (error) {
+            console.error('Polling error:', error);
+        }
+    }, 250);
+}
+
+function stopPolling() {
+    if (pollInterval) {
+        clearInterval(pollInterval);
+        pollInterval = null;
+    }
+}
+
+async function cancelRestore() {
+    if (!currentJobId) return;
+
+    if (!confirm('Are you sure you want to cancel the restore?')) {
+        return;
+    }
+
+    const btn = document.getElementById('cancel-btn');
+    btn.disabled = true;
+    btn.textContent = 'Cancelling...';
+
+    try {
+        const response = await fetch(`/api/cancel/${currentJobId}`, {
+            method: 'POST'
+        });
+
+        const data = await response.json();
+
+        if (data.success) {
+            showStatus('Cancellation requested...', 'error');
+        } else {
+            showStatus('Cancel failed: ' + data.error, 'error');
+            btn.disabled = false;
+            btn.textContent = 'Cancel Restore';
+        }
+    } catch (error) {
+        showStatus('Cancel error: ' + error.message, 'error');
+        btn.disabled = false;
+        btn.textContent = 'Cancel Restore';
+    }
+}
+
+function updateProgress(data) {
+    const bar = document.getElementById('progress-bar');
+    const percent = document.getElementById('progress-percent');
+    const status = document.getElementById('progress-status');
+    const message = document.getElementById('progress-message');
+    const elapsed = document.getElementById('progress-elapsed');
+    const cancelBtn = document.getElementById('cancel-btn');
+
+    bar.style.width = data.progress + '%';
+    percent.textContent = data.progress + '%';
+
+    // Update status label
+    const statusLabels = {
+        'starting': 'Starting',
+        'downloading': 'Downloading',
+        'restoring': 'Restoring',
+        'completed': 'Completed',
+        'error': 'Error',
+        'cancelled': 'Cancelled'
+    };
+    status.textContent = statusLabels[data.status] || data.status;
+
+    // Update color based on status
+    bar.classList.remove('bg-green-600', 'bg-red-600', 'bg-yellow-600');
+    if (data.status === 'completed') {
+        bar.classList.remove('bg-blue-600');
+        bar.classList.add('bg-green-600');
+    } else if (data.status === 'error') {
+        bar.classList.remove('bg-blue-600');
+        bar.classList.add('bg-red-600');
+    } else if (data.status === 'cancelled') {
+        bar.classList.remove('bg-blue-600');
+        bar.classList.add('bg-yellow-600');
+    }
+
+    // Show/hide cancel button based on job status
+    if (data.status === 'completed' || data.status === 'error' || data.status === 'cancelled') {
+        cancelBtn.classList.add('hidden');
+    } else {
+        cancelBtn.classList.remove('hidden');
+        cancelBtn.disabled = false;
+        cancelBtn.textContent = 'Cancel Restore';
+    }
+
+    message.textContent = data.message || '';
+    if (data.elapsed) {
+        elapsed.textContent = 'Elapsed: ' + data.elapsed;
+    }
+}
+
+function showStatus(message, type) {
+    const status = document.getElementById('connection-status');
+    status.classList.remove('hidden', 'bg-green-100', 'bg-red-100', 'text-green-800', 'text-red-800');
+
+    if (type === 'success') {
+        status.classList.add('bg-green-100', 'text-green-800');
+    } else if (type === 'error') {
+        status.classList.add('bg-red-100', 'text-red-800');
+    }
+
+    status.textContent = message;
+}
+
+function hideStatus() {
+    document.getElementById('connection-status').classList.add('hidden');
+}
diff --git a/docker/db-downloader/templates/index.html b/docker/db-downloader/templates/index.html
new file mode 100644
index 000000000..1e5909e3d
--- /dev/null
+++ b/docker/db-downloader/templates/index.html
@@ -0,0 +1,189 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>DB Restore Tool</title>
+    <script src="https://cdn.tailwindcss.com"></script>
+    <style>
+        .file-item:hover { background-color: #f3f4f6; }
+        .file-item.selected { background-color: #dbeafe; }
+        .spinner { animation: spin 1s linear infinite; }
+        @keyframes spin { to { transform: rotate(360deg); } }
+    </style>
+</head>
+<body class="bg-gray-100 min-h-screen">
+    <div class="container mx-auto px-4 py-8 max-w-6xl">
+        <!-- Header -->
+        <header class="mb-8">
+            <h1 class="text-3xl font-bold text-gray-800">Database Restore Tool</h1>
+            <p class="text-gray-600">Browse and restore database backups from remote server</p>
+        </header>
+
+        <div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
+            <!-- Connection Panel -->
+            <div class="lg:col-span-1">
+                <div class="bg-white rounded-lg shadow p-6" id="connection-panel">
+                    <h2 class="text-xl font-semibold mb-4 flex items-center">
+                        <svg class="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 14v3m4-3v3m4-3v3M3 21h18M3 10h18M3 7l9-4 9 4M4 10h16v11H4V10z"/>
+                        </svg>
+                        Connection
+                    </h2>
+
+                    <div id="connection-status" class="mb-4 p-3 rounded hidden"></div>
+
+                    <form id="connect-form">
+                        <div class="mb-4">
+                            <label class="block text-sm font-medium text-gray-700 mb-1">Server</label>
+                            <input type="text" value="{{ scp_host }}" disabled
+                                   class="w-full px-3 py-2 border rounded bg-gray-50 text-gray-600">
+                        </div>
+
+                        <div class="mb-4">
+                            <label class="block text-sm font-medium text-gray-700 mb-1">Username</label>
+                            <input type="text" value="{{ scp_username }}" disabled
+                                   class="w-full px-3 py-2 border rounded bg-gray-50 text-gray-600">
+                        </div>
+
+                        <div class="mb-4">
+                            <label class="block text-sm font-medium text-gray-700 mb-1">Authentication</label>
+                            <select id="auth-type" class="w-full px-3 py-2 border rounded">
+                                <option value="password">Password</option>
+                                <option value="key">SSH Key</option>
+                            </select>
+                        </div>
+
+                        <!-- Password Auth -->
+                        <div id="password-auth">
+                            <div class="mb-4">
+                                <label class="block text-sm font-medium text-gray-700 mb-1">Password</label>
+                                <input type="password" id="password" placeholder="Enter password"
+                                       class="w-full px-3 py-2 border rounded focus:ring-2 focus:ring-blue-500">
+                            </div>
+                        </div>
+
+                        <!-- Key Auth -->
+                        <div id="key-auth" class="hidden">
+                            <div class="mb-4">
+                                <label class="block text-sm font-medium text-gray-700 mb-1">SSH Key</label>
+                                <select id="key-file" class="w-full px-3 py-2 border rounded">
+                                    <option value="">Select a key...</option>
+                                </select>
+                            </div>
+                            <div class="mb-4">
+                                <label class="block text-sm font-medium text-gray-700 mb-1">Key Passphrase (optional)</label>
+                                <input type="password" id="key-passphrase" placeholder="Enter passphrase if required"
+                                       class="w-full px-3 py-2 border rounded focus:ring-2 focus:ring-blue-500">
+                            </div>
+                        </div>
+
+                        <button type="submit" id="connect-btn"
+                                class="w-full bg-blue-600 text-white py-2 px-4 rounded hover:bg-blue-700 transition">
+                            Connect
+                        </button>
+
+                        <button type="button" id="disconnect-btn"
+                                class="w-full bg-red-600 text-white py-2 px-4 rounded hover:bg-red-700 transition hidden mt-2">
+                            Disconnect
+                        </button>
+                    </form>
+                </div>
+
+                <!-- Restore Panel -->
+                <div class="bg-white rounded-lg shadow p-6 mt-6" id="restore-panel">
+                    <h2 class="text-xl font-semibold mb-4 flex items-center">
+                        <svg class="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4"/>
+                        </svg>
+                        Restore
+                    </h2>
+
+                    <div id="selected-file-info" class="mb-4 p-3 bg-gray-50 rounded">
+                        <p class="text-gray-500 text-sm">No file selected</p>
+                    </div>
+
+                    <div class="mb-4">
+                        <label class="block text-sm font-medium text-gray-700 mb-1">Target Database</label>
+                        <select id="target-db" class="w-full px-3 py-2 border rounded">
+                            {% for db in databases %}
+                            <option value="{{ db }}">{{ db }}</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+
+                    <div class="bg-yellow-50 border border-yellow-200 rounded p-3 mb-4">
+                        <p class="text-yellow-800 text-sm">
+                            <strong>Warning:</strong> This will DROP all tables in the selected database before restoring!
+                        </p>
+                    </div>
+
+                    <button type="button" id="restore-btn" disabled
+                            class="w-full bg-green-600 text-white py-2 px-4 rounded hover:bg-green-700 transition disabled:bg-gray-400 disabled:cursor-not-allowed">
+                        Start Restore
+                    </button>
+                </div>
+            </div>
+
+            <!-- File Browser Panel -->
+            <div class="lg:col-span-2">
+                <div class="bg-white rounded-lg shadow p-6">
+                    <h2 class="text-xl font-semibold mb-4 flex items-center">
+                        <svg class="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 7v10a2 2 0 002 2h14a2 2 0 002-2V9a2 2 0 00-2-2h-6l-2-2H5a2 2 0 00-2 2z"/>
+                        </svg>
+                        Remote Browser
+                    </h2>
+
+                    <!-- Breadcrumb -->
+                    <div id="breadcrumb" class="mb-4 flex items-center text-sm text-gray-600 overflow-x-auto">
+                        <span class="text-gray-400">Not connected</span>
+                    </div>
+
+                    <!-- File List -->
+                    <div id="file-browser" class="border rounded min-h-[400px] max-h-[600px] overflow-y-auto">
+                        <div class="p-8 text-center text-gray-400">
+                            <svg class="w-16 h-16 mx-auto mb-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 14v3m4-3v3m4-3v3M3 21h18M3 10h18M3 7l9-4 9 4M4 10h16v11H4V10z"/>
+                            </svg>
+                            <p>Connect to browse remote files</p>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- Progress Panel -->
+                <div id="progress-panel" class="bg-white rounded-lg shadow p-6 mt-6 hidden">
+                    <h2 class="text-xl font-semibold mb-4 flex items-center">
+                        <svg class="w-5 h-5 mr-2 spinner" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"/>
+                        </svg>
+                        Restore Progress
+                    </h2>
+
+                    <div class="mb-4">
+                        <div class="flex justify-between text-sm mb-1">
+                            <span id="progress-status">Initializing...</span>
+                            <span id="progress-percent">0%</span>
+                        </div>
+                        <div class="w-full bg-gray-200 rounded-full h-4">
+                            <div id="progress-bar" class="bg-blue-600 h-4 rounded-full transition-all duration-300" style="width: 0%"></div>
+                        </div>
+                    </div>
+
+                    <div id="progress-details" class="text-sm text-gray-600">
+                        <p id="progress-message">Starting...</p>
+                        <p id="progress-elapsed" class="mt-1"></p>
+                    </div>
+
+                    <button type="button" id="cancel-btn"
+                            class="mt-4 w-full bg-red-600 text-white py-2 px-4 rounded hover:bg-red-700 transition hidden">
+                        Cancel Restore
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="{{ url_for('static', filename='js/app.js') }}"></script>
+</body>
+</html>

From d29c30ee2da591f5404d0559dbbbb17d671508d8 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Mon, 29 Dec 2025 07:35:14 +0100
Subject: [PATCH 02/88] added new db downloader

---
 docker-compose.yml | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 2748ee516..c81fccc3f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,8 +32,6 @@ services:
     image: adminer
     ports:
       - "8088:8080"
-    volumes:
-      - ./docker/adminer/php.ini:/etc/php/7.4/cli/conf.d/php.local.ini
 
   phpmyadmin:
     image: phpmyadmin
@@ -41,11 +39,30 @@ services:
       - "8081:80"
     environment:
       - PMA_HOST=db
-      - PMA_UPLOAD_LIMIT=1G
-      - UPLOAD_LIMIT=1G
       - MYSQL_ROOT_PASSWORD=junghan5
     depends_on:
       - db
 
+  db-downloader:
+    build:
+      context: ./docker/db-downloader
+      dockerfile: Dockerfile
+    ports:
+      - "8082:8082"
+    # volumes:
+    #   - ./docker/db-downloader/ssh-keys:/app/ssh-keys:ro
+    environment:
+      - SCP_HOST=thetool-dbbackup.xinon.at
+      - SCP_PORT=22
+      - SCP_USERNAME=xinon
+      - SCP_DEFAULT_PATH=/opt/backup/mysql
+      - DB_HOST=db
+      - DB_PORT=3306
+      - DB_USER=root
+      - DB_PASSWORD=junghan5
+      - DB_AVAILABLE=thetool,addressdb
+    depends_on:
+      - db
+
 volumes:
   vendor:

From 72bcde631d491f5d07d6dbfdc74679ca71e2976f Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Mon, 29 Dec 2025 08:02:53 +0100
Subject: [PATCH 03/88] fixed ont info

---
 Layout/default/Device/Detail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Layout/default/Device/Detail.php b/Layout/default/Device/Detail.php
index afa91e9b1..c4d393830 100644
--- a/Layout/default/Device/Detail.php
+++ b/Layout/default/Device/Detail.php
@@ -711,7 +711,7 @@ foreach ($devicesall as $deviceall) {
             </div>
         </div>
     </div>
-<?php if ($devices->devicetype->devicemanufactor->config_backup > count()):
+<?php if ($devices->devicetype->devicemanufactor->config_backup > 0):
 
     $year = date("Y", time());
     $month = date("n", time());

From bc2c62bbddf979ff68039bbb687d6c1e1bb5d8e2 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Mon, 29 Dec 2025 10:26:48 +0100
Subject: [PATCH 04/88] fixed ont info

---
 .../default/WarehouseArticle/LABEL_BULK.php   | 54 +++++++++++++++++++
 .../WarehouseArticleController.php            | 30 ++++++++++-
 .../WarehouseCategoryController.php           | 34 +++++++++++-
 .../WarehouseArticle/WarehouseArticle.js      |  1 -
 .../WarehouseCategory/WarehouseCategory.js    | 23 ++++++++
 5 files changed, 138 insertions(+), 4 deletions(-)
 create mode 100644 Layout/default/WarehouseArticle/LABEL_BULK.php
 create mode 100644 public/js/pages/WarehouseCategory/WarehouseCategory.js

diff --git a/Layout/default/WarehouseArticle/LABEL_BULK.php b/Layout/default/WarehouseArticle/LABEL_BULK.php
new file mode 100644
index 000000000..12ebdd864
--- /dev/null
+++ b/Layout/default/WarehouseArticle/LABEL_BULK.php
@@ -0,0 +1,54 @@
+<?php
+use chillerlan\QRCode\QRCode;
+use chillerlan\QRCode\QROptions;
+
+// QR code options - small padding, high quality
+$options = new QROptions([
+    'outputType' => QRCode::OUTPUT_IMAGE_PNG,
+    'scale' => 10,
+    'quietzoneSize' => 1,
+]);
+$qrcode = new QRCode($options);
+?>
+<html>
+<head>
+    <meta charset="utf-8">
+    <style>
+        * { margin: 0; padding: 0; }
+        html, body { margin: 0; padding: 0; }
+        body { font-family: Arial, sans-serif; color: #000; }
+        table { border-collapse: collapse; }
+        .label-page { 
+            height: 25mm; 
+            width: 50mm; 
+            overflow: hidden; 
+            page-break-after: always;
+        }
+        /* Last page should not have a break if possible, but wkhtmltopdf handles it fine usually */
+        .label-page:last-child {
+            page-break-after: auto;
+        }
+    </style>
+</head>
+<body>
+<?php foreach($articles as $article): 
+    $qrData = "WA:" . $article->id . ":" . $article->articleNumber;
+    $qrCodeBase64 = $qrcode->render($qrData);
+?>
+<div class="label-page">
+    <table cellpadding="0" cellspacing="0" border="0" style="width: 50mm; height: 25mm;">
+        <tr>
+            <td style="width: 22mm; height: 25mm; vertical-align: middle; text-align: center;">
+                <img src="<?php echo $qrCodeBase64; ?>" style="width: 21mm; height: 21mm;">
+            </td>
+            <td style="height: 25mm; vertical-align: middle; padding-left: 1mm; padding-right: 1mm;">
+                <img src="<?php echo BASEDIR; ?>/public/assets/images/xinon-full-transparent.png" style="width: 24mm; height: auto; display: block; margin-bottom: 1mm;">
+                <div style="font-size: 10px; font-weight: bold; color: #000; text-align: center;"><?php echo htmlspecialchars($article->articleNumber); ?></div>
+                <div style="font-size: 7px; color: #000; margin-top: 1px; word-wrap: break-word; overflow: hidden; text-align: center;"><?php echo htmlspecialchars($article->title); ?></div>
+            </td>
+        </tr>
+    </table>
+</div>
+<?php endforeach; ?>
+</body>
+</html>
diff --git a/application/WarehouseArticle/WarehouseArticleController.php b/application/WarehouseArticle/WarehouseArticleController.php
index c80214bfd..a33c825d5 100644
--- a/application/WarehouseArticle/WarehouseArticleController.php
+++ b/application/WarehouseArticle/WarehouseArticleController.php
@@ -111,7 +111,7 @@ class WarehouseArticleController extends TTCrud {
         if ($categoryId) {
             $category = WarehouseCategory::get($categoryId);
             if ($category && $category->articleNumberPrefix) {
-                $expectedPrefix = $category->articleNumberPrefix;
+                $expectedPrefix = str_pad($category->articleNumberPrefix, 4, '0', STR_PAD_LEFT);
                 $articlePrefix = substr($articleNumber, 0, strlen($expectedPrefix));
                 if ($articlePrefix !== $expectedPrefix) {
                     self::sendError("Artikelnummer muss mit dem Kategorie-Prefix '{$expectedPrefix}' beginnen.");
@@ -178,7 +178,7 @@ class WarehouseArticleController extends TTCrud {
         if (!$category) self::sendError("Kategorie nicht gefunden");
         if (!$category->articleNumberPrefix) self::sendError("Kategorie hat keinen Artikelnummer-Prefix");
 
-        $prefix = $category->articleNumberPrefix;
+        $prefix = str_pad($category->articleNumberPrefix, 4, '0', STR_PAD_LEFT);
         $db = FronkDB::singleton();
 
         // Get all existing article numbers with this prefix, sorted
@@ -262,4 +262,30 @@ class WarehouseArticleController extends TTCrud {
         readfile($filename);
         die();
     }
+
+    protected function printLabelsByCategoryAction() {
+        $categoryId = intval($this->request->categoryId);
+        if (!$categoryId) {
+            self::sendError("Kategorie nicht angegeben", 400);
+        }
+
+        $articles = WarehouseArticleModel::getAll(['category_id' => $categoryId], 10000, 0, ['key' => 'articleNumber', 'order' => 'ASC']);
+        if (empty($articles)) {
+            self::sendError("Keine Artikel in dieser Kategorie gefunden", 404);
+        }
+
+        $pdf_vars = ['articles' => $articles];
+        $pdf = new PdfForm("WarehouseArticle/LABEL_BULK", $pdf_vars);
+        $wkhtmltopdfArgs = "--page-height 25mm --page-width 50mm --margin-top 0 --margin-bottom 0 --margin-left 0 --margin-right 0 --disable-smart-shrinking --encoding utf-8 --dpi 96";
+
+        $filename = $pdf->render($wkhtmltopdfArgs);
+
+        $category = WarehouseCategory::get($categoryId);
+        $categoryName = $category ? $category->name : 'category-' . $categoryId;
+
+        header('Content-Type: application/pdf');
+        header('Content-Disposition: inline; filename="labels-' . str_replace(' ', '_', $categoryName) . '.pdf"');
+        readfile($filename);
+        die();
+    }
 }
diff --git a/application/WarehouseCategory/WarehouseCategoryController.php b/application/WarehouseCategory/WarehouseCategoryController.php
index 26d16ab83..bf396801d 100644
--- a/application/WarehouseCategory/WarehouseCategoryController.php
+++ b/application/WarehouseCategory/WarehouseCategoryController.php
@@ -16,7 +16,39 @@ class WarehouseCategoryController extends TTCrud {
     ];
     // @formatter:on
 
-    protected array $additionalActions = [['key' => 'openHistory', 'title' => 'Historie', 'class' => 'fas fa-history text-primary']];
+    protected array $additionalActions = [
+        ['key' => 'printLabels', 'title' => 'Labels drucken', 'class' => 'fas fa-print text-primary'],
+        ['key' => 'openHistory', 'title' => 'Historie', 'class' => 'fas fa-history text-primary']
+    ];
+
+    protected array $additionalJSVariables = ['WAREHOUSE_ADMIN' => true];
+
+    public function printLabelsAction() {
+        $categoryId = intval($this->request->id);
+        $articles = WarehouseArticleModel::getAll(['category_id' => $categoryId], 10000, 0, ['key' => 'articleNumber', 'order' => 'ASC']);
+
+        if (empty($articles)) {
+            echo "Keine Artikel in dieser Kategorie.";
+            die();
+        }
+
+        $pdf_vars = [
+            'articles' => $articles
+        ];
+
+        $pdf = new PdfForm("WarehouseArticle/LABEL_BULK", $pdf_vars);
+        $wkhtmltopdfArgs = "--page-height 25mm --page-width 50mm --margin-top 0 --margin-bottom 0 --margin-left 0 --margin-right 0 --disable-smart-shrinking --encoding utf-8 --dpi 96";
+
+        $filename = $pdf->render($wkhtmltopdfArgs);
+
+        $category = WarehouseCategory::get($categoryId);
+        $categoryName = $category ? $category->name : 'category-' . $categoryId;
+
+        header('Content-Type: application/pdf');
+        header('Content-Disposition: inline; filename="labels-' . str_replace(' ', '_', $categoryName) . '.pdf"');
+        readfile($filename);
+        die();
+    }
 
     protected function beforeCreate(): bool {
         $this->postData['articleNumberPrefix'] = $this->getNextFreePrefix();
diff --git a/public/js/pages/WarehouseArticle/WarehouseArticle.js b/public/js/pages/WarehouseArticle/WarehouseArticle.js
index 362a3943b..b8ad34990 100644
--- a/public/js/pages/WarehouseArticle/WarehouseArticle.js
+++ b/public/js/pages/WarehouseArticle/WarehouseArticle.js
@@ -423,7 +423,6 @@ Vue.component('warehouse-article-modal', {
                         v-model="formData.articleNumber"
                         placeholder="Wird automatisch generiert"
                         required
-                        disabled
                         form-label
                         sm/>
                     </div>
diff --git a/public/js/pages/WarehouseCategory/WarehouseCategory.js b/public/js/pages/WarehouseCategory/WarehouseCategory.js
new file mode 100644
index 000000000..adc23ef5e
--- /dev/null
+++ b/public/js/pages/WarehouseCategory/WarehouseCategory.js
@@ -0,0 +1,23 @@
+Vue.component('warehouse-category', {
+    //language=Vue
+    template: `
+                <tt-card>
+                  <warehouse-administration-switch/>
+                  <tt-table-crud 
+                    @openHistory="historyModal = true; historyModalId = $event.id"
+                    @printLabels="printLabels($event)"
+                  />
+                  <warehouse-history-modal :show.sync="historyModal" :id="historyModalId"/>
+                </tt-card>
+              `, data() {
+        return {
+            window: window, historyModal: false, historyModalId: null,
+        }
+    },
+    methods: {
+        printLabels(event) {
+            const url = window.TT_CONFIG.BASE_PATH + "/WarehouseCategory/printLabels?id=" + event.id;
+            window.open(url, '_blank');
+        }
+    }
+})

From e2251c3073ed0c88b3392c26077b38e85bf574f9 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Mon, 29 Dec 2025 11:36:50 +0100
Subject: [PATCH 05/88] fixed printing

---
 Layout/default/WarehouseArticle/LABEL.php          | 14 +++++++-------
 Layout/default/WarehouseArticle/LABEL_BULK.php     | 14 +++++++-------
 .../WarehouseArticleController.php                 |  4 ++--
 .../WarehouseCategoryController.php                |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Layout/default/WarehouseArticle/LABEL.php b/Layout/default/WarehouseArticle/LABEL.php
index 4de88a8e9..cb60423b6 100644
--- a/Layout/default/WarehouseArticle/LABEL.php
+++ b/Layout/default/WarehouseArticle/LABEL.php
@@ -18,21 +18,21 @@ $qrCodeBase64 = (new QRCode($options))->render($qrData);
     <meta charset="utf-8">
     <style>
         * { margin: 0; padding: 0; }
-        html, body { height: 25mm; width: 50mm; }
+        html, body { height: 25mm; width: 63mm; overflow: hidden; }
         body { font-family: Arial, sans-serif; color: #000; }
         table { border-collapse: collapse; }
     </style>
 </head>
 <body>
-<table cellpadding="0" cellspacing="0" border="0" style="width: 50mm; height: 25mm;">
+<table cellpadding="0" cellspacing="0" border="0" style="width: 63mm; height: 25mm;">
     <tr>
-        <td style="width: 22mm; height: 25mm; vertical-align: middle; text-align: center;">
-            <img src="<?php echo $qrCodeBase64; ?>" style="width: 21mm; height: 21mm;">
+        <td style="width: 24mm; height: 25mm; position: relative;">
+            <img src="<?php echo $qrCodeBase64; ?>" style="width: 21mm; height: 21mm; position: absolute; top: 50%; left: 50%; margin-top: -10.5mm; margin-left: -10.5mm;">
         </td>
         <td style="height: 25mm; vertical-align: middle; padding-left: 1mm; padding-right: 1mm;">
-            <img src="<?php echo BASEDIR; ?>/public/assets/images/xinon-full-transparent.png" style="width: 24mm; height: auto; display: block; margin-bottom: 1mm;">
-            <div style="font-size: 10px; font-weight: bold; color: #000; text-align: center;"><?php echo htmlspecialchars($articleNumber); ?></div>
-            <div style="font-size: 7px; color: #000; margin-top: 1px; word-wrap: break-word; overflow: hidden; text-align: center;"><?php echo htmlspecialchars($articleTitle); ?></div>
+            <img src="<?php echo BASEDIR; ?>/public/assets/images/xinon-full-transparent.png" style="width: 24mm; height: auto; display: block; margin: 0 auto 1mm auto;">
+            <div style="font-size: 11px; font-weight: bold; color: #000; text-align: center;"><?php echo htmlspecialchars($articleNumber); ?></div>
+            <div style="font-size: 9px; color: #000; margin-top: 1px; word-wrap: break-word; overflow: hidden; text-align: center;"><?php echo htmlspecialchars($articleTitle); ?></div>
         </td>
     </tr>
 </table>
diff --git a/Layout/default/WarehouseArticle/LABEL_BULK.php b/Layout/default/WarehouseArticle/LABEL_BULK.php
index 12ebdd864..b6fa823c7 100644
--- a/Layout/default/WarehouseArticle/LABEL_BULK.php
+++ b/Layout/default/WarehouseArticle/LABEL_BULK.php
@@ -20,7 +20,7 @@ $qrcode = new QRCode($options);
         table { border-collapse: collapse; }
         .label-page { 
             height: 25mm; 
-            width: 50mm; 
+            width: 63mm; 
             overflow: hidden; 
             page-break-after: always;
         }
@@ -36,15 +36,15 @@ $qrcode = new QRCode($options);
     $qrCodeBase64 = $qrcode->render($qrData);
 ?>
 <div class="label-page">
-    <table cellpadding="0" cellspacing="0" border="0" style="width: 50mm; height: 25mm;">
+    <table cellpadding="0" cellspacing="0" border="0" style="width: 63mm; height: 25mm;">
         <tr>
-            <td style="width: 22mm; height: 25mm; vertical-align: middle; text-align: center;">
-                <img src="<?php echo $qrCodeBase64; ?>" style="width: 21mm; height: 21mm;">
+            <td style="width: 24mm; height: 25mm; position: relative;">
+                <img src="<?php echo $qrCodeBase64; ?>" style="width: 21mm; height: 21mm; position: absolute; top: 50%; left: 50%; margin-top: -10.5mm; margin-left: -10.5mm;">
             </td>
             <td style="height: 25mm; vertical-align: middle; padding-left: 1mm; padding-right: 1mm;">
-                <img src="<?php echo BASEDIR; ?>/public/assets/images/xinon-full-transparent.png" style="width: 24mm; height: auto; display: block; margin-bottom: 1mm;">
-                <div style="font-size: 10px; font-weight: bold; color: #000; text-align: center;"><?php echo htmlspecialchars($article->articleNumber); ?></div>
-                <div style="font-size: 7px; color: #000; margin-top: 1px; word-wrap: break-word; overflow: hidden; text-align: center;"><?php echo htmlspecialchars($article->title); ?></div>
+                <img src="<?php echo BASEDIR; ?>/public/assets/images/xinon-full-transparent.png" style="width: 24mm; height: auto; display: block; margin: 0 auto 1mm auto;">
+                <div style="font-size: 11px; font-weight: bold; color: #000; text-align: center;"><?php echo htmlspecialchars($article->articleNumber); ?></div>
+                <div style="font-size: 9px; color: #000; margin-top: 1px; word-wrap: break-word; overflow: hidden; text-align: center;"><?php echo htmlspecialchars($article->title); ?></div>
             </td>
         </tr>
     </table>
diff --git a/application/WarehouseArticle/WarehouseArticleController.php b/application/WarehouseArticle/WarehouseArticleController.php
index a33c825d5..aa09bdc00 100644
--- a/application/WarehouseArticle/WarehouseArticleController.php
+++ b/application/WarehouseArticle/WarehouseArticleController.php
@@ -253,7 +253,7 @@ class WarehouseArticleController extends TTCrud {
         ];
 
         $pdf = new PdfForm("WarehouseArticle/LABEL", $pdf_vars);
-        $wkhtmltopdfArgs = "--page-height 25mm --page-width 50mm --margin-top 0 --margin-bottom 0 --margin-left 0 --margin-right 0 --disable-smart-shrinking --encoding utf-8 --dpi 96";
+        $wkhtmltopdfArgs = "--page-height 25mm --page-width 63mm --margin-top 0 --margin-bottom 0 --margin-left 0 --margin-right 0 --disable-smart-shrinking --encoding utf-8 --dpi 96";
 
         $filename = $pdf->render($wkhtmltopdfArgs);
 
@@ -276,7 +276,7 @@ class WarehouseArticleController extends TTCrud {
 
         $pdf_vars = ['articles' => $articles];
         $pdf = new PdfForm("WarehouseArticle/LABEL_BULK", $pdf_vars);
-        $wkhtmltopdfArgs = "--page-height 25mm --page-width 50mm --margin-top 0 --margin-bottom 0 --margin-left 0 --margin-right 0 --disable-smart-shrinking --encoding utf-8 --dpi 96";
+        $wkhtmltopdfArgs = "--page-height 25mm --page-width 63mm --margin-top 0 --margin-bottom 0 --margin-left 0 --margin-right 0 --disable-smart-shrinking --encoding utf-8 --dpi 96";
 
         $filename = $pdf->render($wkhtmltopdfArgs);
 
diff --git a/application/WarehouseCategory/WarehouseCategoryController.php b/application/WarehouseCategory/WarehouseCategoryController.php
index bf396801d..40fe2a231 100644
--- a/application/WarehouseCategory/WarehouseCategoryController.php
+++ b/application/WarehouseCategory/WarehouseCategoryController.php
@@ -37,7 +37,7 @@ class WarehouseCategoryController extends TTCrud {
         ];
 
         $pdf = new PdfForm("WarehouseArticle/LABEL_BULK", $pdf_vars);
-        $wkhtmltopdfArgs = "--page-height 25mm --page-width 50mm --margin-top 0 --margin-bottom 0 --margin-left 0 --margin-right 0 --disable-smart-shrinking --encoding utf-8 --dpi 96";
+        $wkhtmltopdfArgs = "--page-height 25mm --page-width 63mm --margin-top 0 --margin-bottom 0 --margin-left 0 --margin-right 0 --disable-smart-shrinking --encoding utf-8 --dpi 96";
 
         $filename = $pdf->render($wkhtmltopdfArgs);
 

From 42f79ed9f847946d3dadb9fb158cb97d5f47a230 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Mon, 29 Dec 2025 14:24:58 +0100
Subject: [PATCH 06/88] restricted user management to a couple of users

---
 application/User/UserController.php | 22 ++++++++++++++++++++-
 public/js/pages/User/User.js        | 30 ++++++++++++++++++++---------
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/application/User/UserController.php b/application/User/UserController.php
index 06c1ba42e..eb9f27e23 100644
--- a/application/User/UserController.php
+++ b/application/User/UserController.php
@@ -12,6 +12,9 @@ class UserController extends mfBaseController
 {
     private $me;
 
+    // User IDs allowed to manage (add/edit/delete) users
+    private const ALLOWED_USER_MANAGER_IDS = [2, 5, 9, 6, 89, 145, 24];
+
     protected function init($request = null)
     {
         $this->needlogin = true;
@@ -24,6 +27,11 @@ class UserController extends mfBaseController
         if ($_SERVER['REQUEST_METHOD'] === 'POST') $this->postData = json_decode(file_get_contents('php://input'), true);
     }
 
+    private function canManageUsers(): bool
+    {
+        return in_array($this->me->id, self::ALLOWED_USER_MANAGER_IDS);
+    }
+
     protected function indexAction($request)
     {
         if (!$this->isAdmin()) {
@@ -32,6 +40,7 @@ class UserController extends mfBaseController
 
         Helper::renderVue($this, "User", "Benutzer", [
             "IS_ADMIN" => $this->me->isAdmin(),
+            "CAN_MANAGE_USERS" => $this->canManageUsers(),
             "USERS" => array_map(fn($user) => [
                 "username" => $user->username,
                 "name" => $user->name,
@@ -53,6 +62,7 @@ class UserController extends mfBaseController
 
     protected function formAction() {
         if (!$this->isAdmin()) $this->redirect("Dashboard");
+        if (!$this->canManageUsers()) $this->redirect("User");
 
         $id = $this->request->id;
         $user = ($id && is_numeric($id) && $id > 0) ? new User($id) : new User();
@@ -178,6 +188,7 @@ class UserController extends mfBaseController
 
     protected function generateApikeyAction($request) {
         if (!$this->isAdmin()) $this->redirect("Dashboard");
+        if (!$this->canManageUsers()) $this->redirect("User");
 
         $id = $request['id'];
         if (!is_numeric($id) || $id < 1) {
@@ -207,6 +218,11 @@ class UserController extends mfBaseController
             unset($r->address_id);
         }
 
+        // Only allowed users can create/edit other users
+        if ($this->isAdmin() && !$this->canManageUsers()) {
+            self::redirect('User');
+        }
+
         if (!$id && !$r->username) self::redirect('User');
 
         $user = new User($id);
@@ -569,7 +585,7 @@ class UserController extends mfBaseController
     }
 
     protected function impersonateAction() {
-        if(!$this->me->isAdmin() || $this->me->address_id != 1) {
+        if(!$this->me->isAdmin() || $this->me->address_id != 1 || !$this->canManageUsers()) {
             header("HTTP/1.1 403 Forbidden");
             exit;
         }
@@ -590,6 +606,10 @@ class UserController extends mfBaseController
 
     protected function sendLoginEmailAction()
     {
+        if (!$this->canManageUsers()) {
+            self::sendError("Keine Berechtigung.");
+        }
+
         $id = $this->request->id;
         if (!$id || !is_numeric($id)) {
             self::sendError("Benutzer-ID fehlt oder ist ungültig.");
diff --git a/public/js/pages/User/User.js b/public/js/pages/User/User.js
index b39a9b265..6cb411b16 100644
--- a/public/js/pages/User/User.js
+++ b/public/js/pages/User/User.js
@@ -3,14 +3,14 @@ Vue.component("User", {
       <div>
         <tt-card>
           <tt-table :data="window['TT_CONFIG']['USERS']" :config="UserTableConfig">
-            <template v-slot:top-buttons>
+            <template v-slot:top-buttons v-if="canManageUsers">
               <tt-button @click="window.location = window['TT_CONFIG']['ADD_URL']"
                          additional-class="btn-primary"
                          text="Benutzer hinzufügen"
                          icon="fas fa-plus"/>
             </template>
 
-            <template v-slot:actions="{ row: user }">
+            <template v-slot:actions="{ row: user }" v-if="canManageUsers">
               <div class="d-flex justify-content-center" style="gap: 4px">
                 <tt-button @click="window.location = window['TT_CONFIG']['EDIT_URL'] + '?id=' + user.id"
                            additional-class="btn-outline-primary"
@@ -49,11 +49,14 @@ Vue.component("User", {
         showSendMailModal: false,
         selectedUserForMail: null,
         isSendingMail: false,
-        UserTableConfig: {
-            key: "UserTable",
-            tableHeader: "Benutzer",
-            defaultPageSize: 25,
-            headers: [{text: "Username", key: "username", class: "text-center", sortable: false, priority: 20},
+    }),
+    computed: {
+        canManageUsers() {
+            return window['TT_CONFIG']['CAN_MANAGE_USERS'] === true;
+        },
+        UserTableConfig() {
+            const headers = [
+                {text: "Username", key: "username", class: "text-center", sortable: false, priority: 20},
                 {text: "Name", key: "name", class: "text-center", sortable: false, priority: 18},
                 {text: "Firma", key: "address", class: "text-center", priority: 19},
                 {text: "E-Mail", key: "email", priority: 14},
@@ -79,9 +82,18 @@ Vue.component("User", {
                     filterOptions: [{value: "1", text: "Ist Aktiv", icon: "fa-regular fa-circle-check text-success"},
                         {value: "0", text: "Ist nicht aktiv", icon: "fa-regular fa-circle-xmark text-danger"}],
                 },
-                {text: "Aktionen", key: "actions", class: "text-center", sortable: false, priority: 21, filter: false}]
+            ];
+            if (this.canManageUsers) {
+                headers.push({text: "Aktionen", key: "actions", class: "text-center", sortable: false, priority: 21, filter: false});
+            }
+            return {
+                key: "UserTable",
+                tableHeader: "Benutzer",
+                defaultPageSize: 25,
+                headers: headers
+            };
         }
-    }),
+    },
     methods: {
         openSendMailModal(user) {
             this.selectedUserForMail = user;

From 8eb417da48b2e45ac08bd2390da3cad9105edf6d Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Mon, 29 Dec 2025 15:42:02 +0100
Subject: [PATCH 07/88] added copy button

---
 .../js/pages/ADBNetzgebiet/ADBNetzgebiet.css  | 48 +++++++++++++++++
 .../js/pages/ADBNetzgebiet/ADBNetzgebiet.js   | 52 +++++++++++++++++++
 2 files changed, 100 insertions(+)

diff --git a/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.css b/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.css
index 579e4069b..e45b7ba09 100644
--- a/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.css
+++ b/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.css
@@ -524,6 +524,54 @@
     border: 1px solid #c9e6d8;
 }
 
+/* ===== Copy From Section ===== */
+.tt-scope .copy-from-section {
+    background: #f8fafc;
+    border-radius: 8px;
+    padding: 12px 16px;
+    border: 1px dashed var(--tt-border);
+}
+
+.tt-scope .copy-from-row {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+}
+
+.tt-scope .copy-select {
+    flex: 1;
+    max-width: 350px;
+}
+
+.tt-scope .copy-select select {
+    width: 100%;
+}
+
+.tt-scope .copy-btn {
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    white-space: nowrap;
+}
+
+.tt-scope .copy-btn:disabled {
+    opacity: 0.5;
+    cursor: not-allowed;
+}
+
+.tt-scope .copy-hint {
+    font-size: 11px;
+    color: var(--tt-muted);
+    margin-top: 6px;
+}
+
+.tt-scope .form-divider {
+    border: none;
+    height: 1px;
+    background: var(--tt-border);
+    margin: 4px 0 0 0;
+}
+
 /* ===== Utilities ===== */
 .tt-scope .mono { font-family: var(--tt-mono); }
 .tt-scope .muted { color: var(--tt-muted); }
diff --git a/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.js b/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.js
index ecc100c17..b5bf1dda8 100644
--- a/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.js
+++ b/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.js
@@ -175,6 +175,24 @@ const ADBNetzgebiet = {
         <!-- Edit/Create Modal -->
         <tt-dialog :show="showEditModal" :title="editItem && editItem.id ? 'Netzgebiet bearbeiten' : 'Neues Netzgebiet'" size="wide" @close="showEditModal = false">
           <div v-if="editItem" class="modal-form">
+            <!-- Copy From Section -->
+            <div class="copy-from-section">
+              <div class="copy-from-row">
+                <div class="select copy-select">
+                  <select v-model="copyFromId">
+                    <option value="">Kopieren von...</option>
+                    <option v-for="item in copyableNetzgebiete" :key="item.netzgebiet.id" :value="item.netzgebiet.id">
+                      {{ item.netzgebiet.name }} {{ item.netzgebiet.extref ? '(' + item.netzgebiet.extref + ')' : '' }}
+                    </option>
+                  </select>
+                </div>
+                <button class="ghost-btn copy-btn" @click="copyFromNetzgebiet" :disabled="!copyFromId" title="Felder kopieren">
+                  <i class="fa-duotone fa-copy"></i> Kopieren
+                </button>
+              </div>
+              <div class="copy-hint">Kopiert: Quelle, Freigaben und Optionen</div>
+            </div>
+            <hr class="form-divider" />
             <div class="form-grid">
               <div class="field span-2">
                 <label>Name *</label>
@@ -289,6 +307,7 @@ const ADBNetzgebiet = {
             filterDebounce: null,
             showEditModal: false,
             editItem: null,
+            copyFromId: '',
             showHistoryModal: false,
             historyLoading: false,
             historyItems: [],
@@ -360,6 +379,13 @@ const ADBNetzgebiet = {
         paginationEnd() { return Math.min(this.currentPage * this.pageSize, this.filteredNetzgebiete.length); },
         filteredHistory() {
             return this.historyItems.filter(e => !['edit', 'create'].includes(e.field));
+        },
+        copyableNetzgebiete() {
+            return this.netzgebiete.filter(item => {
+                if (!item.netzgebiet?.id) return false;
+                if (this.editItem?.id && item.netzgebiet.id === this.editItem.id) return false;
+                return true;
+            });
         }
     },
 
@@ -396,6 +422,7 @@ const ADBNetzgebiet = {
             catch { return []; }
         },
         openCreateModal() {
+            this.copyFromId = '';
             this.editItem = {
                 id: null, name: '', extref: '', source: '', source_id: '',
                 freigabe: { interest: true, provision: true, order: true, reorder: true },
@@ -404,6 +431,7 @@ const ADBNetzgebiet = {
             this.showEditModal = true;
         },
         openEditModal(item) {
+            this.copyFromId = '';
             const n = item.netzgebiet;
             let options = {};
             try { options = JSON.parse(n.options || '{}'); } catch {}
@@ -419,6 +447,30 @@ const ADBNetzgebiet = {
             };
             this.showEditModal = true;
         },
+        copyFromNetzgebiet() {
+            if (!this.copyFromId || !this.editItem) return;
+            const source = this.netzgebiete.find(item => item.netzgebiet?.id == this.copyFromId);
+            if (!source) return;
+            const n = source.netzgebiet;
+
+            // Copy source
+            if (n.source) this.editItem.source = n.source;
+
+            // Copy freigabe
+            let freigabeArr = [];
+            try { freigabeArr = JSON.parse(n.freigabe || '[]') || []; } catch {}
+            ['interest', 'provision', 'order', 'reorder'].forEach(f => {
+                this.editItem.freigabe[f] = freigabeArr.includes(f);
+            });
+
+            // Copy options
+            let options = {};
+            try { options = JSON.parse(n.options || '{}'); } catch {}
+            this.editItem.options = { ...this.defaultOptions, ...options };
+
+            window.notify?.('success', `Felder von "${n.name}" kopiert.`);
+            this.copyFromId = '';
+        },
         async saveNetzgebiet() {
             if (!this.editItem?.name) return;
             this.isSaving = true;

From 11d6ee8728948ae1c683b4ed97d0ed70c363ea08 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Tue, 30 Dec 2025 09:33:05 +0100
Subject: [PATCH 08/88] fixed sorting

---
 .../AssetManagement/AssetManagementController.php        | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/application/AssetManagement/AssetManagementController.php b/application/AssetManagement/AssetManagementController.php
index 9db10b068..af710d615 100644
--- a/application/AssetManagement/AssetManagementController.php
+++ b/application/AssetManagement/AssetManagementController.php
@@ -7,7 +7,7 @@ class AssetManagementController extends TTCrud
 
     // Simplified columns for better layout, details are in the 'assetDetails' slot
     protected array $columns = [
-        ['key' => 'assetDetails', 'text' => 'Gerät', 'modal' => false, 'table' => ['filter' => 'search']],
+        ['key' => 'assetDetails', 'text' => 'Gerät', 'modal' => false, 'table' => ['filter' => 'search', 'sortable' => true]],
         ['key' => 'currentUser', 'text' => 'Status', 'modal' => false, 'table' => ['sortable' => false, 'filter' => false]],
         ['key' => 'location', 'text' => 'Lagerort', 'required' => true, 'modal' => ['type' => 'text'], 'table' => ['filter' => 'search']],
         ['key' => 'serviceDueDate', 'text' => 'Service fällig', 'required' => false, 'modal' => ['type' => 'date'], 'table' => ['filter' => 'date']],
@@ -42,7 +42,12 @@ class AssetManagementController extends TTCrud
         $json = json_decode(file_get_contents('php://input'), true);
         $pagination = $json['pagination'] ?? ['page' => 1, 'per_page' => 10];
         $filters = $json['filters'] ?? [];
-        $order = $json['order'] ?? ['key' => 'id', 'order' => 'DESC'];
+        $order = $json['order'] ?? ['key' => 'name', 'order' => 'ASC'];
+
+        // Map virtual column 'assetDetails' to actual 'name' column for sorting
+        if (isset($order['key']) && $order['key'] === 'assetDetails') {
+            $order['key'] = 'name';
+        }
 
         // Fetch paginated assets
         $assets = AssetManagementModel::getAll($filters, $pagination['per_page'], ($pagination['page'] - 1) * $pagination['per_page'], $order);

From 19098d67b35b5db8f71083e2c3fae5c52ba5e3cf Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 1 Jan 2026 13:05:51 +0100
Subject: [PATCH 09/88] Added unit_count fields to ADBNetzgebiet

---
 application/ADBNetzgebiet/ADBNetzgebiet.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/application/ADBNetzgebiet/ADBNetzgebiet.php b/application/ADBNetzgebiet/ADBNetzgebiet.php
index 54d60385e..b560bddd6 100644
--- a/application/ADBNetzgebiet/ADBNetzgebiet.php
+++ b/application/ADBNetzgebiet/ADBNetzgebiet.php
@@ -41,6 +41,10 @@ class ADBNetzgebiet extends mfBaseModelV2 {
     public ?string $source_id = null;
     public ?string $borderpoly = null;
     public ?string $freigabe = '["interest", "provision", "order", "reorder"]';
+    public int $unit_count = 0;
+    public int $unit_count_sd = 0;
+    public int $unit_count_md = 0;
+    public int $unit_create_oaid = 0;
     public ?string $options = '{"create_address_parts": 0, "update_freigabe": 1, "update_address": 1, "hausnummer_dont_overwrite_netzgebiet": 0, "create_preorder": 0, "preorder_only_oaid": 0, "wo_ignore_status": 0, "delete_units": 0, "mph_min_homes_tool_automatic_count": 3, "unit_create_oaid": 0}';
     public int $create;
     public int $edit;

From 672d92bff9fd179770ae04b5ef1251a99d2b4c19 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Mon, 5 Jan 2026 12:44:26 +0100
Subject: [PATCH 10/88] PreorderBilling: fixed error when creating detail pdf
 while sending invoice emails

---
 application/PreorderBillingInvoice/PreorderBillingInvoice.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/PreorderBillingInvoice/PreorderBillingInvoice.php b/application/PreorderBillingInvoice/PreorderBillingInvoice.php
index 96b755201..0ca11cae6 100644
--- a/application/PreorderBillingInvoice/PreorderBillingInvoice.php
+++ b/application/PreorderBillingInvoice/PreorderBillingInvoice.php
@@ -6,6 +6,7 @@ use chillerlan\QRCode\Output\QROutputInterface;
 
 class PreorderBillingInvoice extends mfBaseModel {
     protected $forcestr = ["company", "zip", "email", "phone"];
+    private $owner;
     private $netowner;
     private $positions;
     private $pdf;

From 62ed7f4a5d11577ea329cc8dd92f8a6e1efaf7f7 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Wed, 7 Jan 2026 09:49:43 +0000
Subject: [PATCH 11/88] fixed wrong boolean association

---
 public/js/pages/User/User.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/pages/User/User.js b/public/js/pages/User/User.js
index 6cb411b16..fe5cce0ab 100644
--- a/public/js/pages/User/User.js
+++ b/public/js/pages/User/User.js
@@ -52,7 +52,7 @@ Vue.component("User", {
     }),
     computed: {
         canManageUsers() {
-            return window['TT_CONFIG']['CAN_MANAGE_USERS'] === true;
+            return window['TT_CONFIG']['CAN_MANAGE_USERS'] === '1';
         },
         UserTableConfig() {
             const headers = [
@@ -118,4 +118,4 @@ Vue.component("User", {
             this.selectedUserForMail = null;
         }
     }
-});
\ No newline at end of file
+});

From 2912da08ba50652cda0ae1bdc846177f46cfa9c0 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Wed, 7 Jan 2026 13:30:42 +0100
Subject: [PATCH 12/88] Upgraded OFAA OAID scripts for ofaa API v2

---
 scripts/preorder/ofaa-oaid/include/config.php | 5 +++--
 scripts/preorder/ofaa-oaid/include/rest.php   | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/preorder/ofaa-oaid/include/config.php b/scripts/preorder/ofaa-oaid/include/config.php
index 6f6352a3f..e8aacab9e 100644
--- a/scripts/preorder/ofaa-oaid/include/config.php
+++ b/scripts/preorder/ofaa-oaid/include/config.php
@@ -6,7 +6,7 @@ $batch_size = 0;
 
 $oauth_url = "https://sso.yio.at/auth/realms/oaid/protocol/openid-connect/token";
 
-$baseurl = "https://api.oaid.at/v1";
+$baseurl = "https://api.oaid.at/v2";
 $client_id = "oaid.ofaa.esteiermark";
 $client_secret = "4a5b09ed-956c-4721-bb53-3a144fc5f55a";
 $tenant = "ofaa.esteiermark";
@@ -21,7 +21,8 @@ $ep_list_oaids = $baseurl."/pip/codes/";
 $ep_request_oaid = $baseurl."/pip/codes/";
 $ep_confirm_oaid = $baseurl."/pip/codes/{oaid}/token/";
 
-$default_scope = ["oaid:mgm:read","oaid:codes:read","oaid:codes:write"];
+//$default_scope = ["oaid:mgm:read","oaid:codes:read","oaid:codes:write"];
+$default_scope = ["read","write"]; // since v2
 $access_token = "";
 
 $token_file = __DIR__."/.access_token";
diff --git a/scripts/preorder/ofaa-oaid/include/rest.php b/scripts/preorder/ofaa-oaid/include/rest.php
index b30b5d4da..88122c112 100644
--- a/scripts/preorder/ofaa-oaid/include/rest.php
+++ b/scripts/preorder/ofaa-oaid/include/rest.php
@@ -44,7 +44,7 @@ function getRestUrl($url, $headers, $params = [], $debug = false) {
   
   if($debug) {
     var_dump($_url, $ctx_options);
-    exit;
+    //exit;
   }
   
   $ctx = stream_context_create($ctx_options);
@@ -59,7 +59,7 @@ function getRestUrl($url, $headers, $params = [], $debug = false) {
       } elseif($response_code == "401") {
         return "__err__401";
       } else {
-        die("getRestUrl(): $h_line");
+        die("getRestUrl():\n$h_line\n$output");
       }
     }
   }

From 8cebb77bf496a659d9aac8ffcd80da16d272147b Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Wed, 7 Jan 2026 14:36:00 +0100
Subject: [PATCH 13/88] OFAA OAID API v2

---
 .../ofaa-oaid/confirm-single-oaid.php         |  9 ++---
 .../ofaa-oaid/create-and-confirm-oaid.php     | 10 ++---
 scripts/preorder/ofaa-oaid/include/config.php |  2 +-
 scripts/preorder/ofaa-oaid/include/rest.php   | 40 +++++++++++++++----
 scripts/preorder/ofaa-oaid/list-oaid-csv.php  | 17 ++++++--
 5 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/scripts/preorder/ofaa-oaid/confirm-single-oaid.php b/scripts/preorder/ofaa-oaid/confirm-single-oaid.php
index 9ce26f09d..8bc307272 100755
--- a/scripts/preorder/ofaa-oaid/confirm-single-oaid.php
+++ b/scripts/preorder/ofaa-oaid/confirm-single-oaid.php
@@ -27,18 +27,17 @@ $headers = [
 ];
 
 $confirm_url = str_replace("{oaid}", $oaid, $ep_confirm_oaid);
-$out = putRestUrl($confirm_url, $headers, ["token" => "confirmed"], "application/json");
-if($output == "__err__401") {
+$out = patchRestUrl($confirm_url, $headers, ["token" => "confirmed"], "application/json");
+if($out == "__err__401") {
   $access_token = fetchAccessToken($oauth_url, $client_id, $client_secret, $default_scope);
   $headers = [
     "Authorization: Bearer $access_token",
     "Accept: application/json",
     "Content-type: application/json",
   ];
-  $out = putRestUrl($confirm_url, $headers, ["token" => "confirmed"], "application/json");
-  $u++;
+  $out = patchRestUrl($confirm_url, $headers, ["token" => "confirmed"], "application/json");
 }
 
-echo "$oaid_name confirmed.\n";
+echo "$oaid confirmed.\n";
 
 
diff --git a/scripts/preorder/ofaa-oaid/create-and-confirm-oaid.php b/scripts/preorder/ofaa-oaid/create-and-confirm-oaid.php
index 224256879..fc7320ba1 100755
--- a/scripts/preorder/ofaa-oaid/create-and-confirm-oaid.php
+++ b/scripts/preorder/ofaa-oaid/create-and-confirm-oaid.php
@@ -37,7 +37,7 @@ $u = 0;
 echo "Creating and confirming $batch_size version ".$content['version']." OAIDs for tenant ".$content['tenant']."\n";
 
 for($i = 0; $i < $batch_size; $i++) {
-  $content['external_id'] = guidv4();
+  $content['customer_reference'] = guidv4();
   
   $output = postRestUrl($ep_request_oaid, $headers, $content, "application/json");
   if($output == "__err__401") {
@@ -61,16 +61,16 @@ for($i = 0; $i < $batch_size; $i++) {
   $c++;
   
   $oaid = $output_json->oaid;
-  $tenant = $output_json->tenant;
+  //$tenant = $output_json->tenant;
   $token = $output_json->token;
   $status = $output_json->status;
-  $external_id = $output_json->external_id;
+  $customer_reference = $output_json->customer_reference;
 
   //echo "oaid: $oaid, tenant: $tenant, token: $token, status: $status, external_id: $external_id\n";
 
   if($token == "requested") {
     $confirm_url = str_replace("{oaid}", $oaid, $ep_confirm_oaid);
-    $out = putRestUrl($confirm_url, $headers, ["token" => "confirmed"], "application/json");
+    $out = patchRestUrl($confirm_url, $headers, ["token" => "confirmed"], "application/json");
     if($out == "__err__401") {
       $access_token = fetchAccessToken($oauth_url, $client_id, $client_secret, $default_scope);
       $headers = [
@@ -78,7 +78,7 @@ for($i = 0; $i < $batch_size; $i++) {
         "Accept: application/json",
         "Content-type: application/json",
       ];
-      $out = putRestUrl($confirm_url, $headers, ["token" => "confirmed"], "application/json");
+      $out = patchRestUrl($confirm_url, $headers, ["token" => "confirmed"], "application/json");
     }
     echo ".";
     $u++;
diff --git a/scripts/preorder/ofaa-oaid/include/config.php b/scripts/preorder/ofaa-oaid/include/config.php
index e8aacab9e..22b66b2e4 100644
--- a/scripts/preorder/ofaa-oaid/include/config.php
+++ b/scripts/preorder/ofaa-oaid/include/config.php
@@ -19,7 +19,7 @@ $client_secret = "6e74e7e8-0cc2-43df-83c2-12937452b916";
 $ep_mgm_credits = $baseurl."/pip/mgm/credits/";
 $ep_list_oaids = $baseurl."/pip/codes/";
 $ep_request_oaid = $baseurl."/pip/codes/";
-$ep_confirm_oaid = $baseurl."/pip/codes/{oaid}/token/";
+$ep_confirm_oaid = $baseurl."/pip/codes/{oaid}/";
 
 //$default_scope = ["oaid:mgm:read","oaid:codes:read","oaid:codes:write"];
 $default_scope = ["read","write"]; // since v2
diff --git a/scripts/preorder/ofaa-oaid/include/rest.php b/scripts/preorder/ofaa-oaid/include/rest.php
index 88122c112..4e5c3730e 100644
--- a/scripts/preorder/ofaa-oaid/include/rest.php
+++ b/scripts/preorder/ofaa-oaid/include/rest.php
@@ -1,4 +1,6 @@
-<?php 
+<?php
+
+$rest_last_api_request_nexturl = "";
 
 function fetchAccessToken($oauth_url, $client_id, $client_secret, $scopes = ["oaid:codes:read"]) {
   //echo "called fetchAccessToken $oauth_url\n";
@@ -30,6 +32,8 @@ function fetchAccessToken($oauth_url, $client_id, $client_secret, $scopes = ["oa
 }
 
 function getRestUrl($url, $headers, $params = [], $debug = false) {
+  global $rest_last_api_request_nexturl;
+
   //echo "called getRestUrl $url\n";
   $ctx_options = ["http" => [
     "ignore_errors" => true,
@@ -49,26 +53,45 @@ function getRestUrl($url, $headers, $params = [], $debug = false) {
   
   $ctx = stream_context_create($ctx_options);
   $output = file_get_contents($_url, false, $ctx);
-  
+
+  if($debug) {
+    echo $output;
+  }
+
+  $_return = "";
+  $http_status_line = "";
+
   foreach($http_response_header as $h_line) {
-    $m = [];
+    if($debug) {
+      echo "HEADER: " . trim($h_line) . "\n";
+    }
     if(preg_match('/HTTP\/\d+(?:\.\d+) ([245]\d+)/', $h_line, $m)) {
+      $http_status_line = $h_line;
       $response_code = $m[1];
       if(substr($response_code, 0, 1) == "2") {
-        return $output;
+        $_return = $output;
       } elseif($response_code == "401") {
-        return "__err__401";
-      } else {
-        die("getRestUrl():\n$h_line\n$output");
+        $_return = "__err__401";
       }
     }
+
+    if(preg_match('/^Link: .*<([^>]+)>; rel=next/', $h_line, $m)) {
+        $rest_last_api_request_nexturl = $m[1];
+    }
   }
+
+  if(!$_return) die("getRestUrl():\n$http_status_line\n$output");
+  return $_return;
 }
 
 function putRestUrl($url, $headers, $content, $content_type = "application/x-www-form-urlencoded", $follow_location = true, $debug = false) {
   return postRestUrl($url, $headers, $content, $content_type, $follow_location, $debug, 'PUT');
 }
 
+function patchRestUrl($url, $headers, $content, $content_type = "application/x-www-form-urlencoded", $follow_location = true, $debug = false) {
+    return postRestUrl($url, $headers, $content, $content_type, $follow_location, $debug, 'PATCH');
+}
+
 function postRestUrl($url, $headers, $content, $content_type = "application/x-www-form-urlencoded", $follow_location = true, $debug = false, $method = "POST") {
   //echo "called postResturl $url\n";
   $ctx_options = ["http" => [
@@ -84,6 +107,9 @@ function postRestUrl($url, $headers, $content, $content_type = "application/x-ww
   if($method == "PUT") {
     $ctx_options["http"]["method"] = "PUT";
   }
+  if($method == "PATCH") {
+    $ctx_options["http"]["method"] = "PATCH";
+  }
   
   if($content_type == "application/x-www-form-urlencoded") {
     $ctx_options["http"]["content"] = http_build_query($content);
diff --git a/scripts/preorder/ofaa-oaid/list-oaid-csv.php b/scripts/preorder/ofaa-oaid/list-oaid-csv.php
index 54b07ea3f..87381588e 100755
--- a/scripts/preorder/ofaa-oaid/list-oaid-csv.php
+++ b/scripts/preorder/ofaa-oaid/list-oaid-csv.php
@@ -15,15 +15,24 @@ if(!$access_token) {
 $headers[] = "Accept: application/json";
 $headers[] = "Authorization: Bearer $access_token";
 
+$request_url = $ep_list_oaids;
+$page_size = 500;
 $page = 1;
+$page_param = ["_page_size" => $page_size];
+$last_ref = false;
 while(1) {
-  $output = getRestUrl($ep_list_oaids, $headers, ["tenant"=> $tenant, "_page" => $page]);
+  if($rest_last_api_request_nexturl) {
+      $request_url = $rest_last_api_request_nexturl;
+      $page_param = [];
+  }
+
+  $output = getRestUrl($request_url, $headers, $page_param);
   if($output == "__err__401") {
     $access_token = fetchAccessToken($oauth_url, $client_id, $client_secret, $default_scope);
     $headers = [];
     $headers[] = "Accept: application/json";
     $headers[] = "Authorization: Bearer $access_token";
-    $output = getRestUrl($ep_list_oaids, $headers, ["tenant"=> $tenant, "_page" => $page]);
+    $output = getRestUrl($request_url, $headers, $page_param);
   }
 
   $output_values = json_decode($output);
@@ -39,12 +48,14 @@ while(1) {
   
   foreach($output_values as $oaid_obj) {
     echo $oaid_obj->oaid.";";
-    echo $oaid_obj->external_id.";";
+    echo $oaid_obj->customer_reference.";";
     echo ";";
     if($oaid_obj->token != "confirmed") {
       file_put_contents( "php://stderr", "; ".$oaid_obj->token );
     }
     echo "\n";
+    $last_ref = $oaid_obj->customer_reference;
+    //$last_ref = $oaid_obj->oaid;
   }
   $page++;
 }

From e0458ef264fce57e4afe7771b210fcfd0f2f3a3c Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Wed, 7 Jan 2026 18:08:05 +0100
Subject: [PATCH 14/88] added netzgebiet copy button

---
 .../ADBNetzgebiet/ADBNetzgebietController.php | 36 +++++++++++++++++++
 .../js/pages/ADBNetzgebiet/ADBNetzgebiet.js   | 20 +++++++++++
 2 files changed, 56 insertions(+)

diff --git a/application/ADBNetzgebiet/ADBNetzgebietController.php b/application/ADBNetzgebiet/ADBNetzgebietController.php
index c4304dcd3..911f7c0ee 100644
--- a/application/ADBNetzgebiet/ADBNetzgebietController.php
+++ b/application/ADBNetzgebiet/ADBNetzgebietController.php
@@ -23,6 +23,7 @@ class ADBNetzgebietController extends mfBaseController {
         Helper::renderVue3($this, $this->mod, "Netzgebietverwaltung", [
             "GET_URL" => $this::getUrl("ADBNetzgebiet/getNetzgebiete"),
             "SAVE_URL" => $this::getUrl("ADBNetzgebiet/save"),
+            "COPY_URL" => $this::getUrl("ADBNetzgebiet/copy"),
             "HISTORY_URL" => $this::getUrl("ADBNetzgebiet/getHistory"),
             "NETWORK_URL" => $this::getUrl("Network/Index"),
             "NETWORK_CREATE_URL" => $this::getUrl("Network/add"),
@@ -130,6 +131,41 @@ class ADBNetzgebietController extends mfBaseController {
         self::returnJson(['success' => true, 'data' => $history]);
     }
 
+    protected function copyAction(): void {
+        $data = $this->postData;
+        if (empty($data['id'])) {
+            self::sendError("ID of the Netzgebiet to be copied is missing.");
+            return;
+        }
+
+        $original = ADBNetzgebiet::get($data['id']);
+        if (!$original) {
+            self::sendError("Netzgebiet not found.");
+            return;
+        }
+
+        $copy = new ADBNetzgebiet();
+        $copy->name = null;
+        $copy->extref = null;
+        $copy->rimo_id = $original->rimo_id;
+        $copy->source = $original->source;
+        $copy->source_id = null;
+        $copy->borderpoly = $original->borderpoly;
+        $copy->freigabe = $original->freigabe;
+        $copy->options = $original->options;
+
+        if (!$copy->save()) {
+            self::sendError("Failed to copy Netzgebiet.");
+            return;
+        }
+
+        self::returnJson([
+            'success' => true,
+            'message' => 'Netzgebiet copied.',
+            'id' => $copy->getId()
+        ]);
+    }
+
     // TODO: Implement RIMO API check
     protected function checkRimoSourceIdAction(): void {
         self::returnJson(['success' => false, 'message' => "RIMO API check not available."]);
diff --git a/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.js b/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.js
index b5bf1dda8..433eca40f 100644
--- a/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.js
+++ b/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.js
@@ -135,6 +135,7 @@ const ADBNetzgebiet = {
                   </td>
                   <td class="col-actions">
                     <button class="icon-btn" @click.prevent="openEditModal(item)" title="Bearbeiten"><i class="fa-duotone fa-pen"></i></button>
+                    <button class="icon-btn" @click.prevent="copyNetzgebiet(item)" title="Kopieren"><i class="fa-duotone fa-copy"></i></button>
                     <button class="icon-btn" @click.prevent="openHistoryModal(item)" title="Verlauf"><i class="fa-duotone fa-clock-rotate-left"></i></button>
                   </td>
                 </tr>
@@ -471,6 +472,25 @@ const ADBNetzgebiet = {
             window.notify?.('success', `Felder von "${n.name}" kopiert.`);
             this.copyFromId = '';
         },
+        async copyNetzgebiet(item) {
+            if (!confirm(`Wollen Sie das Netzgebiet "${item.netzgebiet.name}" kopieren?`)) return;
+
+            this.isSaving = true;
+            try {
+                const response = await axios.post(window.TT_CONFIG.COPY_URL, { id: item.netzgebiet.id });
+                if (response.data.success) {
+                    window.notify?.('success', response.data.message);
+                    await this.fetchNetzgebiete();
+                } else {
+                    window.notify?.('error', response.data.message || 'Fehler beim Kopieren.');
+                }
+            } catch (error) {
+                console.error('Fehler:', error);
+                window.notify?.('error', 'Netzwerkfehler beim Kopieren.');
+            } finally {
+                this.isSaving = false;
+            }
+        },
         async saveNetzgebiet() {
             if (!this.editItem?.name) return;
             this.isSaving = true;

From 6517ce2d1450269712d155f1b5e709a2a88ef519 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Wed, 7 Jan 2026 18:37:17 +0100
Subject: [PATCH 15/88] added netzgebiet copy button

---
 .../ADBNetzgebiet/ADBNetzgebietController.php | 36 -------------------
 .../js/pages/ADBNetzgebiet/ADBNetzgebiet.js   | 35 +++++++++---------
 2 files changed, 18 insertions(+), 53 deletions(-)

diff --git a/application/ADBNetzgebiet/ADBNetzgebietController.php b/application/ADBNetzgebiet/ADBNetzgebietController.php
index 911f7c0ee..c4304dcd3 100644
--- a/application/ADBNetzgebiet/ADBNetzgebietController.php
+++ b/application/ADBNetzgebiet/ADBNetzgebietController.php
@@ -23,7 +23,6 @@ class ADBNetzgebietController extends mfBaseController {
         Helper::renderVue3($this, $this->mod, "Netzgebietverwaltung", [
             "GET_URL" => $this::getUrl("ADBNetzgebiet/getNetzgebiete"),
             "SAVE_URL" => $this::getUrl("ADBNetzgebiet/save"),
-            "COPY_URL" => $this::getUrl("ADBNetzgebiet/copy"),
             "HISTORY_URL" => $this::getUrl("ADBNetzgebiet/getHistory"),
             "NETWORK_URL" => $this::getUrl("Network/Index"),
             "NETWORK_CREATE_URL" => $this::getUrl("Network/add"),
@@ -131,41 +130,6 @@ class ADBNetzgebietController extends mfBaseController {
         self::returnJson(['success' => true, 'data' => $history]);
     }
 
-    protected function copyAction(): void {
-        $data = $this->postData;
-        if (empty($data['id'])) {
-            self::sendError("ID of the Netzgebiet to be copied is missing.");
-            return;
-        }
-
-        $original = ADBNetzgebiet::get($data['id']);
-        if (!$original) {
-            self::sendError("Netzgebiet not found.");
-            return;
-        }
-
-        $copy = new ADBNetzgebiet();
-        $copy->name = null;
-        $copy->extref = null;
-        $copy->rimo_id = $original->rimo_id;
-        $copy->source = $original->source;
-        $copy->source_id = null;
-        $copy->borderpoly = $original->borderpoly;
-        $copy->freigabe = $original->freigabe;
-        $copy->options = $original->options;
-
-        if (!$copy->save()) {
-            self::sendError("Failed to copy Netzgebiet.");
-            return;
-        }
-
-        self::returnJson([
-            'success' => true,
-            'message' => 'Netzgebiet copied.',
-            'id' => $copy->getId()
-        ]);
-    }
-
     // TODO: Implement RIMO API check
     protected function checkRimoSourceIdAction(): void {
         self::returnJson(['success' => false, 'message' => "RIMO API check not available."]);
diff --git a/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.js b/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.js
index 433eca40f..35fd8c3fc 100644
--- a/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.js
+++ b/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.js
@@ -473,23 +473,24 @@ const ADBNetzgebiet = {
             this.copyFromId = '';
         },
         async copyNetzgebiet(item) {
-            if (!confirm(`Wollen Sie das Netzgebiet "${item.netzgebiet.name}" kopieren?`)) return;
-
-            this.isSaving = true;
-            try {
-                const response = await axios.post(window.TT_CONFIG.COPY_URL, { id: item.netzgebiet.id });
-                if (response.data.success) {
-                    window.notify?.('success', response.data.message);
-                    await this.fetchNetzgebiete();
-                } else {
-                    window.notify?.('error', response.data.message || 'Fehler beim Kopieren.');
-                }
-            } catch (error) {
-                console.error('Fehler:', error);
-                window.notify?.('error', 'Netzwerkfehler beim Kopieren.');
-            } finally {
-                this.isSaving = false;
-            }
+            this.copyFromId = '';
+            const n = item.netzgebiet;
+            let options = {};
+            try { options = JSON.parse(n.options || '{}'); } catch {}
+            let freigabeArr = [];
+            try { freigabeArr = JSON.parse(n.freigabe || '[]') || []; } catch {}
+            const freigabeObj = {};
+            ['interest', 'provision', 'order', 'reorder'].forEach(f => freigabeObj[f] = freigabeArr.includes(f));
+            this.editItem = {
+                id: null,
+                name: '',
+                extref: '',
+                source: n.source || '',
+                source_id: '',
+                freigabe: freigabeObj,
+                options: { ...this.defaultOptions, ...options }
+            };
+            this.showEditModal = true;
         },
         async saveNetzgebiet() {
             if (!this.editItem?.name) return;

From cf37f5055ec3ad1e82c96acfd58313e183a2e3e7 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Thu, 8 Jan 2026 10:07:06 +0100
Subject: [PATCH 16/88] fixed path issue with db downloader

---
 docker/db-downloader/templates/index.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docker/db-downloader/templates/index.html b/docker/db-downloader/templates/index.html
index 1e5909e3d..2ea9fed98 100644
--- a/docker/db-downloader/templates/index.html
+++ b/docker/db-downloader/templates/index.html
@@ -6,8 +6,6 @@
     <title>DB Restore Tool</title>
     <script src="https://cdn.tailwindcss.com"></script>
     <style>
-        .file-item:hover { background-color: #f3f4f6; }
-        .file-item.selected { background-color: #dbeafe; }
         .spinner { animation: spin 1s linear infinite; }
         @keyframes spin { to { transform: rotate(360deg); } }
     </style>
@@ -166,7 +164,7 @@
                             <span id="progress-percent">0%</span>
                         </div>
                         <div class="w-full bg-gray-200 rounded-full h-4">
-                            <div id="progress-bar" class="bg-blue-600 h-4 rounded-full transition-all duration-300" style="width: 0%"></div>
+                            <div id="progress-bar" class="bg-blue-600 h-4 rounded-full transition-all duration-300" style="width: 0"></div>
                         </div>
                     </div>
 
@@ -184,6 +182,6 @@
         </div>
     </div>
 
-    <script src="{{ url_for('static', filename='js/app.js') }}"></script>
+    <script src="{{ url_for('static', filename='app.js') }}"></script>
 </body>
 </html>

From 5a8aedaf79eccebba2a2ba592a389c3aa577cbe0 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Thu, 8 Jan 2026 10:12:51 +0100
Subject: [PATCH 17/88] fixed the second copy button

---
 .../js/pages/ADBNetzgebiet/ADBNetzgebiet.js   | 62 +++----------------
 1 file changed, 7 insertions(+), 55 deletions(-)

diff --git a/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.js b/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.js
index 35fd8c3fc..46c51c14e 100644
--- a/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.js
+++ b/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.js
@@ -124,8 +124,7 @@ const ADBNetzgebiet = {
                     <template v-if="item.related.consent_projects.length">
                       <a v-for="cons in item.related.consent_projects.slice(0, 1)" :key="cons.id"
                          :href="window.TT_CONFIG.CONSENT_URL + '?id=' + cons.id"
-                         target="_blank" class="related-link">
-                        {{ cons.name }}
+                         target="_blank" class="related-link" v-html="formatConsentName(cons.name)">
                       </a>
                       <span v-if="item.related.consent_projects.length > 1" class="more-badge">+{{ item.related.consent_projects.length - 1 }}</span>
                     </template>
@@ -176,24 +175,6 @@ const ADBNetzgebiet = {
         <!-- Edit/Create Modal -->
         <tt-dialog :show="showEditModal" :title="editItem && editItem.id ? 'Netzgebiet bearbeiten' : 'Neues Netzgebiet'" size="wide" @close="showEditModal = false">
           <div v-if="editItem" class="modal-form">
-            <!-- Copy From Section -->
-            <div class="copy-from-section">
-              <div class="copy-from-row">
-                <div class="select copy-select">
-                  <select v-model="copyFromId">
-                    <option value="">Kopieren von...</option>
-                    <option v-for="item in copyableNetzgebiete" :key="item.netzgebiet.id" :value="item.netzgebiet.id">
-                      {{ item.netzgebiet.name }} {{ item.netzgebiet.extref ? '(' + item.netzgebiet.extref + ')' : '' }}
-                    </option>
-                  </select>
-                </div>
-                <button class="ghost-btn copy-btn" @click="copyFromNetzgebiet" :disabled="!copyFromId" title="Felder kopieren">
-                  <i class="fa-duotone fa-copy"></i> Kopieren
-                </button>
-              </div>
-              <div class="copy-hint">Kopiert: Quelle, Freigaben und Optionen</div>
-            </div>
-            <hr class="form-divider" />
             <div class="form-grid">
               <div class="field span-2">
                 <label>Name *</label>
@@ -308,7 +289,6 @@ const ADBNetzgebiet = {
             filterDebounce: null,
             showEditModal: false,
             editItem: null,
-            copyFromId: '',
             showHistoryModal: false,
             historyLoading: false,
             historyItems: [],
@@ -380,13 +360,6 @@ const ADBNetzgebiet = {
         paginationEnd() { return Math.min(this.currentPage * this.pageSize, this.filteredNetzgebiete.length); },
         filteredHistory() {
             return this.historyItems.filter(e => !['edit', 'create'].includes(e.field));
-        },
-        copyableNetzgebiete() {
-            return this.netzgebiete.filter(item => {
-                if (!item.netzgebiet?.id) return false;
-                if (this.editItem?.id && item.netzgebiet.id === this.editItem.id) return false;
-                return true;
-            });
         }
     },
 
@@ -397,6 +370,12 @@ const ADBNetzgebiet = {
     async mounted() { await this.fetchNetzgebiete(); },
 
     methods: {
+        formatConsentName(name) {
+            if (name && name.startsWith('Glasfaserprojekt')) {
+                return name.replace('Glasfaserprojekt', 'Glasfaserprojekt<br>');
+            }
+            return name;
+        },
         debouncedFilter() {
             clearTimeout(this.filterDebounce);
             this.filterDebounce = setTimeout(() => this.currentPage = 1, 300);
@@ -423,7 +402,6 @@ const ADBNetzgebiet = {
             catch { return []; }
         },
         openCreateModal() {
-            this.copyFromId = '';
             this.editItem = {
                 id: null, name: '', extref: '', source: '', source_id: '',
                 freigabe: { interest: true, provision: true, order: true, reorder: true },
@@ -432,7 +410,6 @@ const ADBNetzgebiet = {
             this.showEditModal = true;
         },
         openEditModal(item) {
-            this.copyFromId = '';
             const n = item.netzgebiet;
             let options = {};
             try { options = JSON.parse(n.options || '{}'); } catch {}
@@ -448,32 +425,7 @@ const ADBNetzgebiet = {
             };
             this.showEditModal = true;
         },
-        copyFromNetzgebiet() {
-            if (!this.copyFromId || !this.editItem) return;
-            const source = this.netzgebiete.find(item => item.netzgebiet?.id == this.copyFromId);
-            if (!source) return;
-            const n = source.netzgebiet;
-
-            // Copy source
-            if (n.source) this.editItem.source = n.source;
-
-            // Copy freigabe
-            let freigabeArr = [];
-            try { freigabeArr = JSON.parse(n.freigabe || '[]') || []; } catch {}
-            ['interest', 'provision', 'order', 'reorder'].forEach(f => {
-                this.editItem.freigabe[f] = freigabeArr.includes(f);
-            });
-
-            // Copy options
-            let options = {};
-            try { options = JSON.parse(n.options || '{}'); } catch {}
-            this.editItem.options = { ...this.defaultOptions, ...options };
-
-            window.notify?.('success', `Felder von "${n.name}" kopiert.`);
-            this.copyFromId = '';
-        },
         async copyNetzgebiet(item) {
-            this.copyFromId = '';
             const n = item.netzgebiet;
             let options = {};
             try { options = JSON.parse(n.options || '{}'); } catch {}

From 6558caf2f34bd97639b8513162b1998ca2412d5c Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Thu, 8 Jan 2026 09:38:01 +0000
Subject: [PATCH 18/88] Adb netzgebiet/add manual rimo import

---
 .../ADBNetzgebiet/ADBNetzgebietController.php | 190 ++++++++++++++++++
 .../js/pages/ADBNetzgebiet/ADBNetzgebiet.js   | 140 ++++++++++++-
 scripts/adb-rimo-import/rimo-import.php       |   2 +-
 3 files changed, 329 insertions(+), 3 deletions(-)

diff --git a/application/ADBNetzgebiet/ADBNetzgebietController.php b/application/ADBNetzgebiet/ADBNetzgebietController.php
index c4304dcd3..414546f4a 100644
--- a/application/ADBNetzgebiet/ADBNetzgebietController.php
+++ b/application/ADBNetzgebiet/ADBNetzgebietController.php
@@ -24,6 +24,9 @@ class ADBNetzgebietController extends mfBaseController {
             "GET_URL" => $this::getUrl("ADBNetzgebiet/getNetzgebiete"),
             "SAVE_URL" => $this::getUrl("ADBNetzgebiet/save"),
             "HISTORY_URL" => $this::getUrl("ADBNetzgebiet/getHistory"),
+            "START_RIMO_IMPORT_URL" => $this::getUrl("ADBNetzgebiet/startRimoImport"),
+            "GET_RIMO_IMPORT_STATUS_URL" => $this::getUrl("ADBNetzgebiet/getRimoImportStatus"),
+            "GET_RIMO_IMPORT_LOG_URL" => $this::getUrl("ADBNetzgebiet/getRimoImportLog"),
             "NETWORK_URL" => $this::getUrl("Network/Index"),
             "NETWORK_CREATE_URL" => $this::getUrl("Network/add"),
             "CAMPAIGN_URL" => $this::getUrl("Preordercampaign/edit"),
@@ -130,6 +133,193 @@ class ADBNetzgebietController extends mfBaseController {
         self::returnJson(['success' => true, 'data' => $history]);
     }
 
+    protected function startRimoImportAction(): void {
+        $id = $_GET['id'] ?? null;
+        if (empty($id)) {
+            self::returnJson(['success' => false, 'message' => "Netzgebiet ID required."]);
+            return;
+        }
+
+        $netzgebiet = ADBNetzgebiet::get($id);
+        if (!$netzgebiet || !$netzgebiet->id) {
+            self::returnJson(['success' => false, 'message' => "Netzgebiet not found."]);
+            return;
+        }
+
+        if (strpos($netzgebiet->source, 'rimo-') !== 0) {
+            self::returnJson(['success' => false, 'message' => "This action is only for RIMO-source Netzgebiete."]);
+            return;
+        }
+
+        if (empty($netzgebiet->source_id)) {
+            self::returnJson(['success' => false, 'message' => "Netzgebiet has no Source ID."]);
+            return;
+        }
+
+        $safeSourceId = preg_replace('/[^a-zA-Z0-9_-]/', '_', $netzgebiet->source_id);
+        $importTempDir = TEMP_DIR . "/ADBNetzgebietRimoImport/";
+        $logDir = $importTempDir . $safeSourceId;
+        $logFile = $logDir . "/import.log";
+        $lockFile = $logDir . "/import.lock";
+
+        if (is_dir($importTempDir)) {
+            foreach (glob($importTempDir . "*") as $dir) {
+                if (is_dir($dir) && (time() - filemtime($dir)) > 86400) {
+                    // simple cleanup
+                    if (file_exists($dir . "/import.log")) @unlink($dir . "/import.log");
+                    if (file_exists($dir . "/import.lock")) @unlink($dir . "/import.lock");
+                    @rmdir($dir);
+                }
+            }
+        }
+
+        if (!is_dir($logDir)) {
+            mkdir($logDir, 0755, true);
+        }
+
+        if (file_exists($lockFile)) {
+            if ((time() - filemtime($lockFile)) > 3600) { // stale lock for 1h
+                @unlink($lockFile);
+            } else {
+                self::returnJson(['success' => false, 'message' => "Import is already running.", 'status' => 'running']);
+                return;
+            }
+        }
+
+        if (file_exists($logFile) && (time() - filemtime($logFile)) < 900) {
+            $remaining = 900 - (time() - filemtime($logFile));
+            self::returnJson(['success' => false, 'message' => "Please wait before starting another import.", 'status' => 'cooldown', 'remaining' => $remaining]);
+            return;
+        }
+
+        touch($lockFile);
+
+        $projectRoot = dirname(dirname(__DIR__));
+        $scriptRelativePath = 'scripts/adb-rimo-import/rimo-import.php';
+        $scriptFullPath = $projectRoot . '/' . $scriptRelativePath;
+
+        if (!file_exists($scriptFullPath)) {
+            self::returnJson(['success' => false, 'message' => "Import script not found."]);
+            return;
+        }
+
+        $php_executable = "php";
+        $command = "$php_executable $scriptRelativePath " . escapeshellarg($netzgebiet->source_id);
+        
+        $bgCommand = 'cd ' . escapeshellarg($projectRoot) . ' && ' . $command . ' > ' . escapeshellarg($logFile) . ' 2>&1 & echo $!';
+        $pid = shell_exec($bgCommand);
+
+        if(empty($pid) || !is_numeric(trim($pid))) {
+            self::returnJson(['success' => false, 'message' => "Failed to start background process."]);
+            return;
+        }
+        
+        file_put_contents($lockFile, trim($pid));
+
+        self::returnJson(['success' => true, 'message' => 'RIMO import started.']);
+    }
+
+    protected function getRimoImportStatusAction(): void {
+        $ids = $this->postData['ids'] ?? [];
+        if (empty($ids)) {
+            self::returnJson(['success' => true, 'data' => []]);
+            return;
+        }
+
+        $statuses = [];
+        foreach ($ids as $id) {
+            $netzgebiet = ADBNetzgebiet::get($id);
+            if (!$netzgebiet || !$netzgebiet->id || strpos($netzgebiet->source, 'rimo-') !== 0 || empty($netzgebiet->source_id)) {
+                $statuses[$id] = ['status' => 'not_applicable'];
+                continue;
+            }
+
+            $safeSourceId = preg_replace('/[^a-zA-Z0-9_-]/', '_', $netzgebiet->source_id);
+            $logDir = TEMP_DIR . "/ADBNetzgebietRimoImport/" . $safeSourceId;
+            $logFile = $logDir . "/import.log";
+            $lockFile = $logDir . "/import.lock";
+
+            if (file_exists($lockFile)) {
+                $pid = trim(file_get_contents($lockFile));
+                // Check if process is still running. posix_getpgid returns false if process does not exist.
+                if (is_numeric($pid) && posix_getpgid((int)$pid) !== false) {
+                    $statuses[$id] = ['status' => 'running'];
+                } else {
+                    // Stale lock file, process is gone.
+                    @unlink($lockFile);
+                    // Check for cooldown based on log file from the finished process
+                    if (file_exists($logFile) && (time() - filemtime($logFile)) < 900) {
+                        $statuses[$id] = [
+                            'status' => 'cooldown',
+                            'remaining' => 900 - (time() - filemtime($logFile))
+                        ];
+                    } else {
+                        $statuses[$id] = ['status' => 'idle'];
+                    }
+                }
+            } elseif (file_exists($logFile) && (time() - filemtime($logFile)) < 900) {
+                $statuses[$id] = [
+                    'status' => 'cooldown',
+                    'remaining' => 900 - (time() - filemtime($logFile))
+                ];
+            } else {
+                $statuses[$id] = ['status' => 'idle'];
+            }
+        }
+        self::returnJson(['success' => true, 'data' => $statuses]);
+    }
+
+    protected function getRimoImportLogAction(): void {
+        $id = $_GET['id'] ?? null;
+        if (empty($id)) {
+            self::returnJson(['success' => false, 'message' => "Netzgebiet ID required."]);
+            return;
+        }
+
+        $netzgebiet = ADBNetzgebiet::get($id);
+        if (!$netzgebiet || !$netzgebiet->id || empty($netzgebiet->source_id)) {
+            self::returnJson(['success' => false, 'message' => "Netzgebiet not found or not applicable."]);
+            return;
+        }
+
+        $safeSourceId = preg_replace('/[^a-zA-Z0-9_-]/', '_', $netzgebiet->source_id);
+        $logDir = TEMP_DIR . "/ADBNetzgebietRimoImport/" . $safeSourceId;
+        $logFile = $logDir . "/import.log";
+        $lockFile = $logDir . "/import.lock";
+
+        $logContent = "";
+        if (file_exists($logFile)) {
+            $logContent = file_get_contents($logFile);
+        }
+
+        $status = 'idle';
+        if (file_exists($lockFile)) {
+            $pid = trim(file_get_contents($lockFile));
+            if (is_numeric($pid) && posix_getpgid((int)$pid) !== false) {
+                $status = 'running';
+            } else {
+                @unlink($lockFile); // Stale lock, process is gone
+            }
+        }
+
+        if ($status !== 'running') {
+            if (file_exists($logFile) && (time() - filemtime($logFile)) < 900) {
+                $status = 'cooldown';
+            } else {
+                $status = file_exists($logFile) ? 'finished' : 'idle';
+            }
+        }
+
+        self::returnJson([
+            'success' => true,
+            'data' => [
+                'log' => $logContent,
+                'status' => $status,
+                'timestamp' => file_exists($logFile) ? filemtime($logFile) : null
+            ]
+        ]);
+    }
+
     // TODO: Implement RIMO API check
     protected function checkRimoSourceIdAction(): void {
         self::returnJson(['success' => false, 'message' => "RIMO API check not available."]);
diff --git a/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.js b/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.js
index 46c51c14e..35cadf513 100644
--- a/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.js
+++ b/public/js/pages/ADBNetzgebiet/ADBNetzgebiet.js
@@ -133,6 +133,14 @@ const ADBNetzgebiet = {
                     </a>
                   </td>
                   <td class="col-actions">
+                    <button
+                        v-if="item.netzgebiet.source && item.netzgebiet.source.startsWith('rimo-')"
+                        class="icon-btn"
+                        @click.prevent="handleRimoImportClick(item)"
+                        :title="getImportButtonTitle(item.netzgebiet.id)"
+                        :disabled="getImportButtonDisabled(item.netzgebiet.id)">
+                      <i class="fa-duotone" :class="getImportButtonIcon(item.netzgebiet.id)"></i>
+                    </button>
                     <button class="icon-btn" @click.prevent="openEditModal(item)" title="Bearbeiten"><i class="fa-duotone fa-pen"></i></button>
                     <button class="icon-btn" @click.prevent="copyNetzgebiet(item)" title="Kopieren"><i class="fa-duotone fa-copy"></i></button>
                     <button class="icon-btn" @click.prevent="openHistoryModal(item)" title="Verlauf"><i class="fa-duotone fa-clock-rotate-left"></i></button>
@@ -274,6 +282,25 @@ const ADBNetzgebiet = {
             </div>
           </div>
         </tt-dialog>
+
+        <!-- RIMO Import Log Modal -->
+        <tt-dialog :show="showRimoLogModal" :title="rimoLogTitle" size="large" @close="closeRimoLogModal">
+            <div v-if="!rimoLogContent && rimoLogStatus === 'running'" class="table-placeholder compact">
+                <i class="fa-duotone fa-spinner fa-spin"></i>
+                <span>Lade Log...</span>
+            </div>
+            <div v-else-if="!rimoLogContent" class="table-placeholder compact">
+                <i class="fa-duotone fa-file-lines"></i>
+                <span>Kein Log vorhanden.</span>
+            </div>
+            <pre v-else class="log-view" style="white-space: pre-wrap; word-break: break-all; max-height: 60vh; overflow-y: auto; background: #f5f5f5; padding: 10px; border-radius: 5px;">{{ rimoLogContent }}</pre>
+            <template #footer>
+                <div class="footer-status" style="margin-right: auto; font-size: 12px; color: #666;">
+                    Status: <strong :style="{color: rimoLogStatus === 'running' ? 'blue' : (rimoLogStatus === 'cooldown' ? 'orange' : 'green')}">{{ rimoLogStatus }}</strong>
+                </div>
+                <button class="ghost-btn" @click="closeRimoLogModal">Schließen</button>
+            </template>
+        </tt-dialog>
       </div>
     `,
 
@@ -294,6 +321,16 @@ const ADBNetzgebiet = {
             historyItems: [],
             historyTitle: 'Verlauf',
             expandedIds: {},
+
+            // RIMO Import
+            importStatus: {},
+            showRimoLogModal: false,
+            rimoLogContent: '',
+            rimoLogTitle: '',
+            rimoLogStatus: 'idle',
+            rimoLogInterval: null,
+            statusInterval: null,
+
             freigabeLabels: { interest: 'Interest', provision: 'Provision', order: 'Order', reorder: 'Reorder' },
             freigabeOptions: [
                 { key: 'interest', label: 'Interest' },
@@ -367,12 +404,21 @@ const ADBNetzgebiet = {
         filteredNetzgebiete() { if (this.currentPage > this.totalPages) this.currentPage = 1; }
     },
 
-    async mounted() { await this.fetchNetzgebiete(); },
+    async mounted() {
+        await this.fetchNetzgebiete();
+        this.fetchImportStatus();
+        this.statusInterval = setInterval(this.fetchImportStatus, 15000); // Poll every 15s
+    },
+
+    beforeDestroy() {
+        clearInterval(this.statusInterval);
+        clearInterval(this.rimoLogInterval);
+    },
 
     methods: {
         formatConsentName(name) {
             if (name && name.startsWith('Glasfaserprojekt')) {
-                return name.replace('Glasfaserprojekt', 'Glasfaserprojekt<br>');
+                return name.replace('Glasfaserprojekt', 'Glasfaserprojekt<br />');
             }
             return name;
         },
@@ -476,6 +522,96 @@ const ADBNetzgebiet = {
             } catch { window.notify?.('error', 'Verlauf konnte nicht geladen werden.'); }
             finally { this.historyLoading = false; }
         },
+
+        // RIMO Import Methods
+        async fetchImportStatus() {
+            const rimoIds = this.netzgebiete
+                .filter(item => item.netzgebiet.source && item.netzgebiet.source.startsWith('rimo-'))
+                .map(item => item.netzgebiet.id);
+            if (!rimoIds.length) return;
+            try {
+                const response = await axios.post(window.TT_CONFIG.GET_RIMO_IMPORT_STATUS_URL, { ids: rimoIds });
+                if (response.data.success) {
+                    this.importStatus = response.data.data;
+                }
+            } catch (error) {
+                console.error("Could not fetch RIMO import statuses.", error);
+            }
+        },
+        handleRimoImportClick(item) {
+            const status = this.importStatus[item.netzgebiet.id]?.status || 'idle';
+            if (status === 'running') {
+                this.openRimoLogModal(item);
+            } else if (status === 'cooldown') {
+                const remaining = this.importStatus[item.netzgebiet.id]?.remaining || 0;
+                window.notify?.('info', `Bitte warten Sie noch ${Math.ceil(remaining / 60)} Minuten.`);
+                this.openRimoLogModal(item);
+            } else {
+                this.startRimoImport(item);
+            }
+        },
+        getImportButtonTitle(id) {
+            const status = this.importStatus[id]?.status || 'idle';
+            if (status === 'running') return 'Import-Log anzeigen';
+            if (status === 'cooldown') return 'Manueller RIMO-Import (Abkühlphase)';
+            return 'Manuellen RIMO-Import starten';
+        },
+        getImportButtonDisabled(id) {
+            const status = this.importStatus[id]?.status || 'idle';
+            return false; // Never truly disabled, just changes action
+        },
+        getImportButtonIcon(id) {
+            const status = this.importStatus[id]?.status || 'idle';
+            if (status === 'running') return 'fa-spinner fa-spin';
+            if (status === 'cooldown') return 'fa-hourglass-half';
+            return 'fa-rocket';
+        },
+        async startRimoImport(item) {
+            try {
+                const response = await axios.get(window.TT_CONFIG.START_RIMO_IMPORT_URL + '?id=' + item.netzgebiet.id);
+                if (response.data.success) {
+                    window.notify?.('success', 'RIMO Import gestartet.');
+                    this.importStatus[item.netzgebiet.id] = { status: 'running' };
+                    this.openRimoLogModal(item);
+                } else {
+                    window.notify?.('error', response.data.message || 'Import konnte nicht gestartet werden.');
+                }
+            } catch (error) {
+                window.notify?.('error', 'Fehler beim Starten des Imports.');
+                console.error(error);
+            }
+        },
+        openRimoLogModal(item) {
+            this.rimoLogTitle = `RIMO Import: ${item.netzgebiet.name}`;
+            this.showRimoLogModal = true;
+            this.fetchRimoLog(item); // initial fetch
+            this.rimoLogInterval = setInterval(() => this.fetchRimoLog(item), 3000);
+        },
+        closeRimoLogModal() {
+            this.showRimoLogModal = false;
+            clearInterval(this.rimoLogInterval);
+            this.rimoLogContent = '';
+            this.rimoLogTitle = '';
+            this.rimoLogStatus = 'idle';
+        },
+        async fetchRimoLog(item) {
+            try {
+                const response = await axios.get(window.TT_CONFIG.GET_RIMO_IMPORT_LOG_URL + '?id=' + item.netzgebiet.id);
+                if (response.data.success) {
+                    this.rimoLogContent = response.data.data.log;
+                    this.rimoLogStatus = response.data.data.status;
+                    // If no longer running, stop polling
+                    if (this.rimoLogStatus !== 'running') {
+                        clearInterval(this.rimoLogInterval);
+                        this.fetchImportStatus(); // refresh overall status
+                    }
+                }
+            } catch (error) {
+                console.error('Could not fetch RIMO log.', error);
+                clearInterval(this.rimoLogInterval);
+            }
+        },
+        
         translateAction(action) { return { create: 'Erstellt', update: 'Geändert', delete: 'Gelöscht' }[action] || action; },
         translateField(field) {
             return { name: 'Name', extref: 'ExtRef', source: 'Quelle', source_id: 'Source ID',
diff --git a/scripts/adb-rimo-import/rimo-import.php b/scripts/adb-rimo-import/rimo-import.php
index 1b9829a8b..41205a64f 100755
--- a/scripts/adb-rimo-import/rimo-import.php
+++ b/scripts/adb-rimo-import/rimo-import.php
@@ -7,7 +7,7 @@ use ADBRimoImport\ADBAddressHelper;
 //use ADBRimoImport\importer\CitycomImporter;
 
 //require 'vendor/autoload.php';
-require("../../config/config.php");
+require(__DIR__ . "/../../config/config.php");
 require("ADBAddressHelper/address_helper.php");
 
 define('FRONKDB_SQLDEBUG', false);

From bafdb64195c54f1ca7dc44a755960a4f22da450b Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Thu, 8 Jan 2026 11:51:56 +0100
Subject: [PATCH 19/88] added new router

---
 Layout/default/Cpeprovisioning/Index.php       |  3 +++
 .../CpeprovisioningController.php              | 18 +++++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Layout/default/Cpeprovisioning/Index.php b/Layout/default/Cpeprovisioning/Index.php
index 398cdb01a..9e1209544 100644
--- a/Layout/default/Cpeprovisioning/Index.php
+++ b/Layout/default/Cpeprovisioning/Index.php
@@ -318,6 +318,9 @@ $pagination_entity_name = "Zu provisionierende CPEs";
                                                         <option value="FritzBox 6490 Cable" <?= ($product->cpeprovisioning->routertype == "FritzBox 6490 Cable") ? "selected='selected'" : "" ?>>
                                                             FritzBox 6490 Cable (Inet, Phone, IPTV)
                                                         </option>
+                                                        <option value="FritzBox 6670 Cable" <?= ($product->cpeprovisioning->routertype == "FritzBox 6670 Cable") ? "selected='selected'" : "" ?>>
+                                                            FritzBox 6670 Cable (Inet, Phone, IPTV)
+                                                        </option>
                                                     <?php endif; ?>
                                                 </select>
                                             </div>
diff --git a/application/Cpeprovisioning/CpeprovisioningController.php b/application/Cpeprovisioning/CpeprovisioningController.php
index f66ed1e8d..a55928198 100644
--- a/application/Cpeprovisioning/CpeprovisioningController.php
+++ b/application/Cpeprovisioning/CpeprovisioningController.php
@@ -549,23 +549,23 @@ class CpeprovisioningController extends mfBaseController {
                 "ORDER_URL" => $this->getUrl("Order"),
                 "NETWORKS" => NetworkModel::getAll(),
                 "ROUTER_OPTIONS" => [
+                    ['value' => 'FritzBox 4050', 'text' => 'FritzBox 4050 (Inet, Phone IPTV)'],
+                    ['value' => 'FritzBox 7530', 'text' => 'FritzBox 7530 (Inet, Phone, IPTV)'],
+                    ['value' => 'FritzBox 7690', 'text' => 'FritzBox 7690 (Inet, Phone, IPTV)'],
+                    ['value' => 'FritzBox 6670 Cable', 'text' => 'FritzBox 6670 Cable (Inet, Phone, IPTV)'],
                     // General Options
                     ['value' => 'eigener Router', 'text' => 'Eigener Router'],
                     ['value' => 'anderes CPE', 'text' => 'Anderes CPE'],
-                    // PPPoE/DHCP Routers
-                    ['value' => 'TP-Link Archer C80', 'text' => 'TP-Link Archer C80 (Inet, IPTV)'],
-                    ['value' => 'FritzBox 4040', 'text' => 'FritzBox 4040 (Inet, IPTV)'],
-                    ['value' => 'FritzBox 4050', 'text' => 'FritzBox 4050 (Inet, Phone IPTV)'],
-                    ['value' => 'FritzBox 5530', 'text' => 'FritzBox 5530 (Inet FiberP2P, Phone, IPTV)'],
-                    ['value' => 'FritzBox 7530', 'text' => 'FritzBox 7530 (Inet, Phone, IPTV)'],
-                    ['value' => 'FritzBox 7590', 'text' => 'FritzBox 7590 (Inet, Phone, IPTV)'],
-                    ['value' => 'FritzBox 7690', 'text' => 'FritzBox 7690 (Inet, Phone, IPTV)'],
                     // Static Routers
                     ['value' => 'Mikrotik HAP AC', 'text' => 'Mikrotik HAP AC (Inet, IPTV)'],
                     ['value' => 'Mikrotik HEX S', 'text' => 'Mikrotik HEX S (Inet, IPTV)'],
                     ['value' => 'Mikrotik RB3011', 'text' => 'Mikrotik RB3011 (Inet, IPTV)'],
-                    // CMTS Routers
+                    // Legacy
                     ['value' => 'FritzBox 6490 Cable', 'text' => 'FritzBox 6490 Cable (Inet, Phone, IPTV)'],
+                    ['value' => 'FritzBox 4040', 'text' => 'FritzBox 4040 (Inet, IPTV)'],
+                    ['value' => 'FritzBox 5530', 'text' => 'FritzBox 5530 (Inet FiberP2P, Phone, IPTV)'],
+                    ['value' => 'FritzBox 7590', 'text' => 'FritzBox 7590 (Inet, Phone, IPTV)'],
+                    ['value' => 'TP-Link Archer C80', 'text' => 'TP-Link Archer C80 (Inet, IPTV)'],
                 ],
                 "ROUTER_SHIPPING_DATA" => [
                     "TP-Link Archer C80" => ["weight" => 1, "length" => 35, "width" => 24, "height" => 8],

From 8ecf78dbde5cde9d922c71345d6e9cbf92403261 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 8 Jan 2026 12:48:32 +0100
Subject: [PATCH 20/88] Fixed home OAID filter in AddressDB

---
 application/ADBHausnummer/ADBHausnummerModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/ADBHausnummer/ADBHausnummerModel.php b/application/ADBHausnummer/ADBHausnummerModel.php
index d589558f7..8703b8cd8 100644
--- a/application/ADBHausnummer/ADBHausnummerModel.php
+++ b/application/ADBHausnummer/ADBHausnummerModel.php
@@ -147,7 +147,7 @@ class ADBHausnummerModel {
 
         $sql .= " WHERE $where";
 
-        if (!empty($filter['home_oaid_rimo_id'])) {
+        if (!empty($filter['home_oaid_rimo_id']) && !$join_tables) {
             $sql .= " GROUP BY Hausnummer.id";
         }
 

From 21b9677f3d9eb48bf53f9130984d2c6922a58a32 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Mon, 12 Jan 2026 16:16:41 +0100
Subject: [PATCH 21/88] custom preorder notifications: handling empty
 emailaddress and sending errors

---
 scripts/preorder/custom_notifications/init.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/scripts/preorder/custom_notifications/init.php b/scripts/preorder/custom_notifications/init.php
index a040370a6..2d1eb03ed 100644
--- a/scripts/preorder/custom_notifications/init.php
+++ b/scripts/preorder/custom_notifications/init.php
@@ -56,6 +56,9 @@ function sendPreorderEmail($mailtemplate, $preordercampaign, $preorder, $email_t
         }
     }
 
+    $email_to = trim($preorder->email);
+    if(!$email_to) return false;
+
     $subject = $mailtemplate->getVariableReplacedSubject($replacers);
     $body = '<html lang="de"><head><meta charset="utf-8" /></head><body>';
     $body .= $mailtemplate->renderBody($replacers);
@@ -71,7 +74,7 @@ function sendPreorderEmail($mailtemplate, $preordercampaign, $preorder, $email_t
         $email->setBody($body);
     }
     $email->setFrom($preordercampaign->from_email, $preordercampaign->from_email_name);
-    $email->setTo($preorder->email);
+    $email->setTo($email_to);
     $email->setHeader("X-".ucfirst(MFAPPNAME)."-pid", $preorder->id);
     $email->setHeader("X-".ucfirst(MFAPPNAME)."-ps", '300-custom');
     // add attachments
@@ -81,12 +84,15 @@ function sendPreorderEmail($mailtemplate, $preordercampaign, $preorder, $email_t
             logMessage("Adding attachment: " . $file->filename);
             $email->addAttachment($file->file->getFullPath(), null, $file->filename, $file->file->mimetype ?: null);
         }
-        $email->send();
+        if(!$email->send()) {
+            logMessage("Error sending email for Preorder ID {$preorder->id}");
+            return false;
+        }
         logMessage("Email sent successfully for Preorder ID: $preorder->id, Campaign: $preordercampaign->name, Type: $email_type");
         $psn_log = PreorderStatusnotificationLog::create([
             "preorder_id" => $preorder->id,
             "email_type" => $email_type,
-            "email" => $preorder->email,
+            "email" => $email_to,
         ]);
         $psn_log->save();
     } catch (Exception $e) {

From 7cc3c7917443008b44b79047434666d8fcf90e32 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Tue, 13 Jan 2026 07:07:03 +0100
Subject: [PATCH 22/88] added stuff to manualinvoice

---
 .../ManualInvoice/ManualInvoiceController.php | 162 +++++++--
 .../ManualInvoice/ManualInvoiceModel.php      |   2 +
 ...000_add_lock_exported_to_manualinvoice.php |  39 +++
 .../js/pages/ManualInvoice/ManualInvoice.js   |  30 +-
 .../ManualInvoice/create-mock-invoices.php    | 314 ++++++++++++++++++
 5 files changed, 512 insertions(+), 35 deletions(-)
 create mode 100644 db/migrations/20260113120000_add_lock_exported_to_manualinvoice.php
 create mode 100644 scripts/ManualInvoice/create-mock-invoices.php

diff --git a/application/ManualInvoice/ManualInvoiceController.php b/application/ManualInvoice/ManualInvoiceController.php
index caa91d659..f2225af5e 100644
--- a/application/ManualInvoice/ManualInvoiceController.php
+++ b/application/ManualInvoice/ManualInvoiceController.php
@@ -208,8 +208,6 @@ class ManualInvoiceController extends TTCrud
         $post = json_decode(file_get_contents('php://input'), true);
         $id = $post['id'] ?? null;
         $recipientEmail = $post['email'] ?? null;
-        $subject = $post['subject'] ?? 'Ihre Rechnung von XINON GmbH';
-        $bodyText = $post['body'] ?? 'Sehr geehrte Damen und Herren,\n\nanbei erhalten Sie Ihre Rechnung.\n\nMit freundlichen Grüßen\nIhr Xinon Team';
 
         if (!$id || !$recipientEmail) {
             self::returnJson(['success' => false, 'message' => 'ID oder E-Mail-Adresse fehlt']);
@@ -222,6 +220,19 @@ class ManualInvoiceController extends TTCrud
             return;
         }
 
+        // Format invoice date for display
+        $invoiceDateFormatted = date('d.m.Y', $invoice->invoice_date);
+
+        // Set default subject and body with invoice number and date
+        $defaultSubject = "Ihre Rechnung {$invoice->invoice_number} vom {$invoiceDateFormatted}";
+        $defaultBody = "Sehr geehrte Damen und Herren,\n\nanbei erhalten Sie Ihre Rechnung Nr. {$invoice->invoice_number} vom {$invoiceDateFormatted}.\n\nMit freundlichen Grüßen\nIhr XINON Team";
+
+        $subject = $post['subject'] ?? $defaultSubject;
+        $bodyText = $post['body'] ?? $defaultBody;
+
+        // Convert literal \n strings to actual newlines (in case frontend sends escaped strings)
+        $bodyText = str_replace('\n', "\n", $bodyText);
+
         // Generate PDF
         $pdf_filename = $this->createPDFAction(true);
         if (!$pdf_filename || !file_exists($pdf_filename)) {
@@ -232,19 +243,33 @@ class ManualInvoiceController extends TTCrud
         $pdfContent = file_get_contents($pdf_filename);
 
         // --- HTML Email Generation ---
-        $logoToolPath = BASEDIR . '/public/assets/images/the-tool-logo.png';
         $logoXinonPath = BASEDIR . '/public/assets/images/xinon-full.png';
-        $logoToolExists = file_exists($logoToolPath);
         $logoXinonExists = file_exists($logoXinonPath);
 
-        // Construct HTML Body
-        $html = '<!DOCTYPE html><html lang="de"><head><meta charset="UTF-8"><title>Rechnung</title><style>body { font-family: Arial, sans-serif; color: #333; }</style></head><body style="margin:0;padding:20px;background-color:#f3f4f6;">';
-        $html .= '<div style="background-color:#fff;padding:20px;border-radius:8px;max-width:600px;margin:0 auto;box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1);">';
+        // Construct HTML Body with Outlook compatibility
+        $html = '<!DOCTYPE html>';
+        $html .= '<html lang="de" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">';
+        $html .= '<head>';
+        $html .= '<meta charset="UTF-8">';
+        $html .= '<meta http-equiv="X-UA-Compatible" content="IE=edge">';
+        $html .= '<meta name="viewport" content="width=device-width, initial-scale=1.0">';
+        $html .= '<title>Rechnung</title>';
+        $html .= '<!--[if mso]><xml><o:OfficeDocumentSettings><o:PixelsPerInch>96</o:PixelsPerInch></o:OfficeDocumentSettings></xml><![endif]-->';
+        $html .= '<style>body { font-family: Arial, sans-serif; color: #333; margin: 0; padding: 0; }</style>';
+        $html .= '</head>';
+        $html .= '<body style="margin:0;padding:20px;background-color:#f3f4f6;">';
 
-        // Logos
-        $html .= '<div style="text-align:center;margin-bottom:20px;border-bottom: 1px solid #e5e7eb;padding-bottom: 15px;">';
-        if ($logoToolExists) $html .= '<img src="cid:logo_thetool" alt="The Tool" style="height:40px;margin-right:15px;vertical-align:middle;">';
-        if ($logoXinonExists) $html .= '<img src="cid:logo_xinon" alt="Xinon" style="height:40px;vertical-align:middle;">';
+        // Outlook-safe container table
+        $html .= '<!--[if mso]><table role="presentation" width="600" cellspacing="0" cellpadding="0" border="0" align="center"><tr><td><![endif]-->';
+        $html .= '<div style="background-color:#fff;padding:20px;border-radius:8px;max-width:600px;margin:0 auto;">';
+
+        // Logo with Outlook-safe sizing
+        $html .= '<div style="text-align:center;margin-bottom:20px;border-bottom:1px solid #e5e7eb;padding-bottom:15px;">';
+        if ($logoXinonExists) {
+            $html .= '<!--[if mso]><table role="presentation" width="100%" cellspacing="0" cellpadding="0" border="0"><tr><td align="center"><![endif]-->';
+            $html .= '<img src="cid:logo_xinon" alt="XINON GmbH" width="150" height="50" style="display:block;width:150px;height:50px;max-width:150px;margin:0 auto;">';
+            $html .= '<!--[if mso]></td></tr></table><![endif]-->';
+        }
         $html .= '</div>';
 
         $html .= '<h2 style="color:#00558c;text-align:center;font-size:20px;margin-bottom:20px;">' . htmlspecialchars($subject) . '</h2>';
@@ -254,7 +279,9 @@ class ManualInvoiceController extends TTCrud
 
         $html .= '<br><div style="border-top:1px solid #eee;padding-top:20px;font-size:12px;color:#999;text-align:center;">';
         $html .= 'XINON GmbH | <a href="https://www.xinon.at" style="color:#00558c;text-decoration:none;">www.xinon.at</a>';
-        $html .= '</div></div></body></html>';
+        $html .= '</div></div>';
+        $html .= '<!--[if mso]></td></tr></table><![endif]-->';
+        $html .= '</body></html>';
 
         $mail = new PHPMailer(true);
         try {
@@ -269,12 +296,11 @@ class ManualInvoiceController extends TTCrud
             $mail->SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS;
             $mail->Port       = 587;
 
-            // Logos
-            if ($logoToolExists) $mail->addEmbeddedImage($logoToolPath, 'logo_thetool');
+            // Logo embedding
             if ($logoXinonExists) $mail->addEmbeddedImage($logoXinonPath, 'logo_xinon');
 
             $mail->addReplyTo('backoffice@xinon.at', 'XINON Backoffice');
-            $mail->setFrom('thetool@xinon.at', 'XINON TheTool');
+            $mail->setFrom('thetool@xinon.at', 'XINON GmbH - Rechnungswesen');
 
             $customerName = trim(($invoice->company ?: '') . ' ' . $invoice->firstname . ' ' . $invoice->lastname);
             $mail->addAddress($recipientEmail, $customerName);
@@ -283,7 +309,10 @@ class ManualInvoiceController extends TTCrud
             $mail->Body = $html;
             $mail->AltBody = strip_tags($bodyText);
 
-            $mail->addStringAttachment($pdfContent, $invoice->invoice_number . '_Rechnung.pdf', 'base64', 'application/pdf');
+            // Attachment filename: YYYY-MM-DD_InvoiceNumber_Rechnung.pdf
+            $invoiceDateFile = date('Y-m-d', $invoice->invoice_date);
+            $attachmentFilename = "{$invoiceDateFile}_{$invoice->invoice_number}_Rechnung.pdf";
+            $mail->addStringAttachment($pdfContent, $attachmentFilename, 'base64', 'application/pdf');
 
             $mail->send();
 
@@ -349,20 +378,21 @@ class ManualInvoiceController extends TTCrud
             $data['invoice_date'] = strtotime($data['invoice_date']);
         }
 
-        $data = array_merge([
-            'invoice_number' => ManualInvoiceModel::getNextInvoiceNumber(),
-            'invoice_date' => $data['invoice_date'] ?? time(),
-            'status' => 'erstellt',
-            'fibu_payment_skonto' => 0,
-            'fibu_payment_skonto_rate' => 0,
-            'gesamtrabatt' => 0,
-            'total' => 0,
-            'total_gross' => 0,
-            'create_by' => $me->id,
-            'edit_by' => $me->id,
-            'create' => time(),
-            'edit' => time()
-        ], $data);
+        // Always generate invoice number (override any null from frontend)
+        $data['invoice_number'] = ManualInvoiceModel::getNextInvoiceNumber();
+        $data['invoice_date'] = $data['invoice_date'] ?? time();
+        $data['status'] = 'erstellt';
+        $data['fibu_payment_skonto'] = $data['fibu_payment_skonto'] ?? 0;
+        $data['fibu_payment_skonto_rate'] = $data['fibu_payment_skonto_rate'] ?? 0;
+        $data['gesamtrabatt'] = $data['gesamtrabatt'] ?? 0;
+        $data['total'] = $data['total'] ?? 0;
+        $data['total_gross'] = $data['total_gross'] ?? 0;
+        $data['lock'] = 0;
+        $data['exported'] = 0;
+        $data['create_by'] = $me->id;
+        $data['edit_by'] = $me->id;
+        $data['create'] = time();
+        $data['edit'] = time();
 
         return true;
     }
@@ -389,9 +419,15 @@ class ManualInvoiceController extends TTCrud
             unset($data['positions']);
         }
 
-        if (isset($data['id']) && ($invoice = ManualInvoiceModel::get($data['id'])) && $invoice->status === 'exportiert') {
-            $this->infoMessages['update'] = 'Rechnung wurde bereits exportiert und kann nicht mehr bearbeitet werden';
-            return false;
+        if (isset($data['id']) && ($invoice = ManualInvoiceModel::get($data['id']))) {
+            if ($invoice->lock == 1) {
+                $this->infoMessages['update'] = 'Rechnung ist gesperrt und kann nicht bearbeitet werden';
+                return false;
+            }
+            if ($invoice->status === 'exportiert') {
+                $this->infoMessages['update'] = 'Rechnung wurde bereits exportiert und kann nicht mehr bearbeitet werden';
+                return false;
+            }
         }
 
         // Convert invoice_date from string to timestamp if needed
@@ -626,6 +662,12 @@ class ManualInvoiceController extends TTCrud
 
         if (!$originalInvoiceId || empty($positions) || !($originalInvoice = ManualInvoiceModel::get($originalInvoiceId))) {
             self::returnJson(['success' => false, 'message' => 'Ungültige Anfrage']);
+            return;
+        }
+
+        if ($originalInvoice->lock == 1) {
+            self::returnJson(['success' => false, 'message' => 'Originalrechnung ist gesperrt und kann nicht gutgeschrieben werden']);
+            return;
         }
 
         $me = new User();
@@ -673,6 +715,8 @@ class ManualInvoiceController extends TTCrud
             'vatgroup_id' => $originalInvoice->vatgroup_id,
             'credit_for_invoice_id' => $originalInvoiceId,
             'status' => 'erstellt',
+            'lock' => 0,
+            'exported' => 0,
             'create' => time(),
             'edit' => time(),
             'create_by' => $me->id,
@@ -681,6 +725,7 @@ class ManualInvoiceController extends TTCrud
 
         if (!($creditInvoiceId = ManualInvoiceModel::create($invoiceData))) {
             self::returnJson(['success' => false, 'message' => 'Fehler beim Erstellen der Gutschrift']);
+            return;
         }
 
         foreach ($positions as $pos) {
@@ -718,7 +763,11 @@ class ManualInvoiceController extends TTCrud
     protected function beforeDelete(): bool {
         if ($id = $this->request->id) {
             $invoice = ManualInvoiceModel::get($id);
-            if ($invoice && $invoice->status === 'exported') {
+            if ($invoice && $invoice->lock == 1) {
+                $this->infoMessages['delete'] = 'Rechnung ist gesperrt und kann nicht gelöscht werden';
+                return false;
+            }
+            if ($invoice && ($invoice->status === 'exported' || $invoice->status === 'exportiert')) {
                 $this->infoMessages['delete'] = 'Rechnung wurde bereits exportiert und kann nicht gelöscht werden';
                 return false;
             }
@@ -732,4 +781,49 @@ class ManualInvoiceController extends TTCrud
         }
         return true;
     }
+
+    protected function getArticleVatInfoAction() {
+        $articleId = $_GET['article_id'] ?? null;
+        $vatarea = $_GET['vatarea'] ?? 'domestic';
+
+        if (!$articleId) {
+            self::returnJson(['success' => false, 'message' => 'Article ID required']);
+            return;
+        }
+
+        $article = WarehouseArticleModel::get($articleId);
+        if (!$article) {
+            self::returnJson(['success' => false, 'message' => 'Article not found']);
+            return;
+        }
+
+        // Map revenueAccount to vatgroup_id
+        // revenueAccount 0 = Dienstleistungen = vatgroup_id 2
+        // revenueAccount 1 = Handelswaren = vatgroup_id 3
+        $vatgroupId = $article->revenueAccount == 0 ? 2 : 3;
+
+        // Get vatrate for this vatgroup and area
+        $vatrate = VatrateModel::getFirst(['vatgroup_id' => $vatgroupId, 'area' => $vatarea]);
+
+        if (!$vatrate) {
+            self::returnJson(['success' => false, 'message' => 'Vatrate not found for vatgroup ' . $vatgroupId . ' and area ' . $vatarea]);
+            return;
+        }
+
+        self::returnJson([
+            'success' => true,
+            'article' => [
+                'id' => $article->id,
+                'title' => $article->title,
+                'articleNumber' => $article->articleNumber,
+                'description' => $article->description,
+                'revenueAccount' => $article->revenueAccount
+            ],
+            'vatgroup_id' => $vatgroupId,
+            'fibu_cost_account' => $vatrate->account,
+            'fibu_cost_account_legacy' => $vatrate->legacy_account,
+            'fibu_taxcode' => $vatrate->taxcode,
+            'vatrate' => $vatrate->rate
+        ]);
+    }
 }
\ No newline at end of file
diff --git a/application/ManualInvoice/ManualInvoiceModel.php b/application/ManualInvoice/ManualInvoiceModel.php
index 77408527e..7c6d82560 100644
--- a/application/ManualInvoice/ManualInvoiceModel.php
+++ b/application/ManualInvoice/ManualInvoiceModel.php
@@ -44,6 +44,8 @@ class ManualInvoiceModel extends TTCrudBaseModel {
     public ?int $bmd_export_date;
     public ?int $date_delivered;
     public string $status;
+    public int $lock = 0;
+    public int $exported = 0;
     public ?int $credit_for_invoice_id;
     public int $create_by;
     public int $edit_by;
diff --git a/db/migrations/20260113120000_add_lock_exported_to_manualinvoice.php b/db/migrations/20260113120000_add_lock_exported_to_manualinvoice.php
new file mode 100644
index 000000000..c2a09bfe7
--- /dev/null
+++ b/db/migrations/20260113120000_add_lock_exported_to_manualinvoice.php
@@ -0,0 +1,39 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class AddLockExportedToManualinvoice extends AbstractMigration
+{
+    public function up(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+            $table = $this->table("ManualInvoice");
+
+            $table->addColumn("lock", "integer", [
+                "null" => false,
+                "default" => 0,
+                "limit" => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY,
+                "after" => "status"
+            ]);
+
+            $table->addColumn("exported", "integer", [
+                "null" => false,
+                "default" => 0,
+                "limit" => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY,
+                "after" => "lock"
+            ]);
+
+            $table->save();
+        }
+    }
+
+    public function down(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+            $table = $this->table("ManualInvoice");
+            $table->removeColumn("lock")->save();
+            $table->removeColumn("exported")->save();
+        }
+    }
+}
diff --git a/public/js/pages/ManualInvoice/ManualInvoice.js b/public/js/pages/ManualInvoice/ManualInvoice.js
index 4ce7a72cd..a8699e002 100644
--- a/public/js/pages/ManualInvoice/ManualInvoice.js
+++ b/public/js/pages/ManualInvoice/ManualInvoice.js
@@ -170,7 +170,7 @@ Vue.component('manual-invoice-modal', {
               <tt-textarea label="Einleitender Text" v-model="invoiceData.einleitender_text" rows="3" sm row/>
             </tt-card>
             <tt-card><template v-slot:header><h5><i class="fas fa-list-ol mr-2"></i>Positionen</h5></template>
-              <tt-positions-manager group-mode ref="positionsManager" v-model="invoiceData.positions" :config="positionsConfig" />
+              <tt-positions-manager group-mode ref="positionsManager" v-model="invoiceData.positions" :config="positionsConfig" @updateField-article_id="onArticleSelected" />
             </tt-card>
             <tt-card><template v-slot:header><h5><i class="fas fa-paragraph mr-2"></i>Texte & Rabatt</h5></template>
               <tt-input label="Gesamtrabatt (%)" v-model.number="invoiceData.gesamtrabatt" sm row type="number" placeholder="0"/>
@@ -208,6 +208,12 @@ Vue.component('manual-invoice-modal', {
             billingTypeOptions: [{value: 'invoice', text: 'Rechnung'}, {value: 'sepa', text: 'SEPA'}],
             positionsConfig: {
                 fields: {
+                    article_id: {
+                        type: 'autocomplete',
+                        label: 'Artikel (optional)',
+                        apiUrl: '/WarehouseArticle/autocomplete',
+                        customFieldReference: 'WarehouseArticle'
+                    },
                     product_name: { type: 'input', label: 'Bezeichnung' },
                     product_info: { type: 'input', label: 'Zusatzinfo' },
                     amount: { type: 'input', label: 'Menge', inputType: 'number' },
@@ -330,6 +336,28 @@ Vue.component('manual-invoice-modal', {
             if (e.ctrlKey && e.key === 'q') { e.preventDefault(); this.togglePreviewVisibility(); }
         },
         togglePreviewVisibility() { if (!this.isLargeScreen) this.showPreviewOnSmallScreen = !this.showPreviewOnSmallScreen; },
+        async onArticleSelected(articleId) {
+            if (!articleId) return;
+            try {
+                const { data } = await axios.get(`${window.TT_CONFIG.BASE_PATH}/ManualInvoice/getArticleVatInfo?article_id=${articleId}`);
+                if (data.success && this.$refs.positionsManager) {
+                    // Update the formData in the positions manager
+                    const pm = this.$refs.positionsManager;
+                    if (data.article) {
+                        pm.$set(pm.formData, 'product_name', data.article.title);
+                        pm.$set(pm.formData, 'product_info', data.article.description || '');
+                    }
+                    pm.$set(pm.formData, 'vatrate', parseFloat(data.vatrate) || 20);
+                    pm.$set(pm.formData, 'fibu_cost_account', data.fibu_cost_account);
+                    pm.$set(pm.formData, 'fibu_cost_account_legacy', data.fibu_cost_account_legacy);
+                    pm.$set(pm.formData, 'fibu_taxcode', data.fibu_taxcode);
+                    // Store vatgroup_id on invoice level if needed
+                    this.invoiceData.vatgroup_id = data.vatgroup_id;
+                }
+            } catch (e) {
+                console.error('Error fetching article VAT info:', e);
+            }
+        },
         debouncedPreviewUpdate() {
             clearTimeout(this.previewDebounceTimer);
             this.previewDebounceTimer = setTimeout(() => this.updatePdfPreview(), 2000);
diff --git a/scripts/ManualInvoice/create-mock-invoices.php b/scripts/ManualInvoice/create-mock-invoices.php
new file mode 100644
index 000000000..57cc5835e
--- /dev/null
+++ b/scripts/ManualInvoice/create-mock-invoices.php
@@ -0,0 +1,314 @@
+#!/usr/bin/php
+<?php
+require("../../config/config.php");
+
+define('FRONKDB_SQLDEBUG', false);
+error_reporting(E_ALL & ~(E_NOTICE | E_STRICT | E_DEPRECATED));
+
+require_once(LIBDIR."/mvcfronk/mfRouter/mfRouter.php");
+require_once(LIBDIR."/mvcfronk/mfBase/mfBaseModel.php");
+require_once(LIBDIR."/mvcfronk/mfBase/mfBaseController.php");
+
+$layout = \Layout::singleton();
+
+$me = new User(1);
+define("INTERNAL_USER_ID", $me->id);
+define("INTERNAL_USER_USERNAME", $me->username);
+
+echo "========================================\n";
+echo "Creating 20 mock manual invoices...\n";
+echo "========================================\n\n";
+
+$db = FronkDB::singleton();
+
+// Get random customers with valid data for invoicing
+$customerSql = "SELECT * FROM Address
+                WHERE customer_number IS NOT NULL
+                AND customer_number > 0
+                AND (company IS NOT NULL OR firstname IS NOT NULL)
+                AND street IS NOT NULL
+                AND zip IS NOT NULL
+                AND city IS NOT NULL
+                ORDER BY RAND()
+                LIMIT 50";
+$customerRes = $db->query($customerSql);
+$customers = [];
+while ($row = $db->fetch_object($customerRes)) {
+    $customers[] = $row;
+}
+
+if (empty($customers)) {
+    echo "ERROR: No valid customers found in database!\n";
+    exit(1);
+}
+
+echo "Found " . count($customers) . " random customers to use.\n\n";
+
+// Get last 20 shipping notes for position data
+$sql = "SELECT * FROM WarehouseShippingNote ORDER BY `create` DESC LIMIT 20";
+$res = $db->query($sql);
+
+$shippingNotes = [];
+while ($row = $db->fetch_object($res)) {
+    $shippingNotes[] = new WarehouseShippingNote($row);
+}
+
+$count = 0;
+$errors = 0;
+
+foreach ($shippingNotes as $index => $shippingNote) {
+    echo "Processing shipping note #{$shippingNote->id}...\n";
+
+    // Pick a random customer
+    $customer = $customers[array_rand($customers)];
+    $address = new Address($customer->id);
+
+    if (!$address || !$address->id) {
+        echo "  - Skipping: Could not load customer address\n";
+        $errors++;
+        continue;
+    }
+
+    // Build positions from shipping note
+    $positions = json_decode($shippingNote->positions, true) ?: [];
+    $enrichedPositions = [];
+
+    foreach ($positions as $position) {
+        if (isset($position['article'])) {
+            $article = WarehouseArticleModel::get($position['article']);
+            if (!$article) continue;
+
+            $prices = json_decode($article->cheapestSellPrice, true) ?: [];
+            $price = 0;
+            foreach ($prices as $p) {
+                if (isset($p['price'])) {
+                    $price = $p['price'];
+                    break;
+                }
+            }
+            // Use random price if no price found
+            if ($price == 0) {
+                $price = rand(10, 500);
+            }
+
+            $enrichedPositions[] = [
+                'product_name' => $article->articleNumber . " | " . $article->title,
+                'product_info' => $article->description ?: '',
+                'amount' => $position['amount'] ?: 1,
+                'unit' => $article->unit ?: 'Stk.',
+                'price' => $price,
+                'discount' => 0,
+                'vatrate' => 20,
+                'article_id' => $article->id
+            ];
+        } elseif (isset($position['articlePacket'])) {
+            $packet = WarehouseArticlePacketModel::get($position['articlePacket']);
+            if (!$packet) continue;
+
+            $enrichedPositions[] = [
+                'product_name' => $packet->title,
+                'product_info' => $packet->description ?? '',
+                'amount' => $position['amount'] ?: 1,
+                'unit' => 'Pau.',
+                'price' => rand(50, 300),
+                'discount' => 0,
+                'vatrate' => 20
+            ];
+        } elseif (isset($position['articleText'])) {
+            $enrichedPositions[] = [
+                'product_name' => $position['articleText'],
+                'product_info' => '',
+                'amount' => $position['amount'] ?? 1,
+                'unit' => 'Stk.',
+                'price' => rand(10, 100),
+                'discount' => 0,
+                'vatrate' => 20
+            ];
+        }
+    }
+
+    // Add hours entries
+    $hoursEntries = json_decode($shippingNote->hoursEntries, true) ?: [];
+    foreach ($hoursEntries as $hoursEntry) {
+        $hourCount = floatval(str_replace(",", ".", $hoursEntry['hourCount'] ?? 0));
+        if ($hourCount <= 0) continue;
+
+        $userName = 'Mitarbeiter';
+        if (!empty($hoursEntry['userId']) && is_numeric($hoursEntry['userId'])) {
+            $user = UserModel::getOne($hoursEntry['userId']);
+            $userName = $user ? $user->name : 'Mitarbeiter';
+        } elseif (!empty($hoursEntry['userId_text'])) {
+            $userName = $hoursEntry['userId_text'];
+        }
+
+        $enrichedPositions[] = [
+            'product_name' => 'Arbeitsstunden - ' . $userName,
+            'product_info' => 'Datum: ' . (isset($hoursEntry['date']) ? date('d.m.Y', strtotime($hoursEntry['date'])) : date('d.m.Y')),
+            'amount' => $hourCount,
+            'unit' => 'h',
+            'price' => 60,
+            'discount' => 0,
+            'vatrate' => 20
+        ];
+    }
+
+    // If still no positions, create some mock positions
+    if (empty($enrichedPositions)) {
+        $mockPositions = [
+            ['name' => 'Beratungsleistung', 'unit' => 'h', 'price' => 85],
+            ['name' => 'Installationsarbeiten', 'unit' => 'Pau.', 'price' => 250],
+            ['name' => 'Netzwerkkabel Cat6', 'unit' => 'm', 'price' => 3.50],
+            ['name' => 'Router TP-Link', 'unit' => 'Stk.', 'price' => 89.90],
+            ['name' => 'Montage vor Ort', 'unit' => 'h', 'price' => 65],
+        ];
+
+        // Add 1-3 random mock positions
+        $numPositions = rand(1, 3);
+        for ($i = 0; $i < $numPositions; $i++) {
+            $mock = $mockPositions[array_rand($mockPositions)];
+            $enrichedPositions[] = [
+                'product_name' => $mock['name'],
+                'product_info' => 'Mock-Position für Testzwecke',
+                'amount' => rand(1, 10),
+                'unit' => $mock['unit'],
+                'price' => $mock['price'],
+                'discount' => rand(0, 1) ? rand(5, 15) : 0,
+                'vatrate' => 20
+            ];
+        }
+    }
+
+    // Use random invoice date within last 90 days
+    $randomDaysAgo = rand(0, 90);
+    $invoiceDate = strtotime("-{$randomDaysAgo} days");
+
+    // Create invoice data
+    $invoiceData = [
+        'invoice_number' => ManualInvoiceModel::getNextInvoiceNumber(),
+        'invoice_date' => $invoiceDate,
+        'owner_id' => $address->id,
+        'billingaddress_id' => $address->id,
+        'customer_number' => $address->customer_number,
+        'company' => $address->company,
+        'firstname' => $address->firstname,
+        'lastname' => $address->lastname,
+        'street' => $address->street,
+        'zip' => $address->zip,
+        'city' => $address->city,
+        'country' => $address->country ?: 'Österreich',
+        'email' => $address->email,
+        'uid' => $address->uid,
+        'fibu_account_number' => $address->fibu_account_number,
+        'fibu_payment_due' => $address->fibu_payment_due ?: 14,
+        'fibu_payment_skonto' => $address->fibu_payment_skonto ?: 0,
+        'fibu_payment_skonto_rate' => $address->fibu_payment_skonto_rate ?: 0,
+        'billing_type' => $address->billing_type ?: 'invoice',
+        'billing_delivery' => $address->billing_delivery ?: 'email',
+        'bank_account_bank' => $address->bank_account_bank,
+        'bank_account_owner' => $address->bank_account_owner,
+        'bank_account_iban' => $address->bank_account_iban,
+        'bank_account_bic' => $address->bank_account_bic,
+        'sepa_date' => $address->sepa_date ? (is_numeric($address->sepa_date) ? date('Y-m-d', $address->sepa_date) : $address->sepa_date) : null,
+        'leistungszeitraum' => date('m/Y', $invoiceDate),
+        'einleitender_text' => 'Testrechnung basierend auf Lieferschein #' . $shippingNote->id,
+        'externe_referenz' => 'TEST-LS-' . $shippingNote->id,
+        'gesamtrabatt' => rand(0, 1) ? rand(0, 10) : 0,
+        'total' => 0,
+        'total_gross' => 0,
+        'vatgroup_id' => rand(1, 3),
+        'status' => 'erstellt',
+        'lock' => 0,
+        'exported' => 0,
+        'create_by' => 1,
+        'edit_by' => 1,
+        'create' => time(),
+        'edit' => time()
+    ];
+
+    // Create the invoice
+    $invoiceId = ManualInvoiceModel::create($invoiceData);
+
+    if (!$invoiceId) {
+        echo "  - Error creating invoice\n";
+        $errors++;
+        continue;
+    }
+
+    // Create positions
+    $total = 0;
+    $totalGross = 0;
+    $gesamtrabatt = floatval($invoiceData['gesamtrabatt']);
+
+    foreach ($enrichedPositions as $pos) {
+        $amount = floatval($pos['amount']);
+        $price = floatval($pos['price']);
+        $discount = floatval($pos['discount'] ?? 0);
+        $vatrate = floatval($pos['vatrate'] ?? 20);
+
+        // Validate amount is within reasonable bounds
+        if ($amount <= 0 || $amount > 999999) {
+            $amount = 1;
+        }
+        if ($price < 0 || $price > 999999) {
+            $price = 0;
+        }
+
+        $priceTotal = $amount * $price * (1 - $discount / 100);
+        $priceTotalAfterGesamtrabatt = $priceTotal * (1 - $gesamtrabatt / 100);
+        $priceGross = $priceTotalAfterGesamtrabatt * (1 + $vatrate / 100);
+
+        // Use direct SQL to bypass model validation for mock data
+        $posProduct = $db->escape($pos['product_name']);
+        $posInfo = $db->escape($pos['product_info'] ?? '');
+        $posProductId = intval($pos['article_id'] ?? 0);
+        $posUnit = $db->escape($pos['unit'] ?? 'Stk.');
+        $posTime = time();
+
+        // Ensure values are numeric and within DB limits
+        $amount = round($amount, 2);
+        $price = round($price, 2);
+        $priceTotal = round($priceTotal, 2);
+        $priceGross = round($priceGross, 2);
+
+        $insertSql = "INSERT INTO ManualInvoiceposition
+            (manualinvoice_id, position_group, product_id, product_name, product_info, amount, unit, price, discount, vatrate, price_total, price_gross, matchcode, fibu_cost_account, fibu_cost_account_legacy, fibu_taxcode, contract_id, billing_id, create_by, edit_by, `create`, edit)
+            VALUES
+            ($invoiceId, NULL, $posProductId, '$posProduct', '$posInfo', $amount, '$posUnit', $price, $discount, $vatrate, $priceTotal, $priceGross, NULL, NULL, NULL, NULL, 0, NULL, 1, 1, $posTime, $posTime)";
+
+        try {
+            $db->query($insertSql);
+        } catch (Throwable $e) {
+            echo "    Warning: Position skipped (amount=$amount, price=$price): " . $e->getMessage() . "\n";
+            continue;
+        }
+
+        $total += $priceTotal;
+        $totalGross += $priceGross;
+    }
+
+    // Apply gesamtrabatt to total
+    $totalAfterRabatt = $total * (1 - $gesamtrabatt / 100);
+
+    // Update invoice totals using direct SQL (bypass model validation)
+    $db->query("UPDATE ManualInvoice SET total = " . floatval($totalAfterRabatt) . ", total_gross = " . floatval($totalGross) . " WHERE id = " . intval($invoiceId));
+
+    // Create journal entry using direct SQL
+    $journalText = $db->escape('Mock-Rechnung erstellt (basierend auf LS #' . $shippingNote->id . ')');
+    $journalTime = time();
+    $db->query("INSERT INTO ManualInvoiceJournal (manualinvoiceId, text, statusChange, createBy, `create`)
+                VALUES ($invoiceId, '$journalText', 'erstellt', 1, $journalTime)");
+
+    $invoiceNumber = $invoiceData['invoice_number'];
+    $customerName = trim(($address->company ?: '') . ' ' . $address->firstname . ' ' . $address->lastname);
+    echo "  - Created invoice #{$invoiceId} ({$invoiceNumber})\n";
+    echo "    Customer: {$customerName}\n";
+    echo "    Positions: " . count($enrichedPositions) . ", Total: €" . number_format($totalAfterRabatt, 2) . "\n";
+    $count++;
+}
+
+echo "\n========================================\n";
+echo "Mock invoice creation complete!\n";
+echo "Created: {$count} invoices\n";
+echo "Errors/Skipped: {$errors}\n";
+echo "========================================\n";
+echo "\nNOTE: No emails were sent. These are test invoices only.\n";

From 48435bc33ff36196f49561cf0d4744573428e24f Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Tue, 13 Jan 2026 07:11:56 +0100
Subject: [PATCH 23/88] changed validity of warehouseoffer

---
 Layout/default/WarehouseOffer/PDF_MAIN.php           |  6 ++++--
 .../WarehouseOffer/WarehouseOfferController.php      | 12 ++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Layout/default/WarehouseOffer/PDF_MAIN.php b/Layout/default/WarehouseOffer/PDF_MAIN.php
index 88888077d..37bde4d2f 100644
--- a/Layout/default/WarehouseOffer/PDF_MAIN.php
+++ b/Layout/default/WarehouseOffer/PDF_MAIN.php
@@ -61,8 +61,10 @@ if ($includeTax) {
 }
 
 $formattedOfferDate = date("d.m.Y", $offerDate);
-$validityDays = isset($validity) ? (int)$validity : 14;
-$formattedValidUntil = date("d.m.Y", strtotime("+$validityDays days", $offerDate));
+$validityDays = isset($validity) ? (int)$validity : 31;
+// Use versionDate (when this version was created) for validity calculation, fallback to offerDate
+$validityBaseDate = isset($versionDate) ? $versionDate : $offerDate;
+$formattedValidUntil = date("d.m.Y", strtotime("+$validityDays days", $validityBaseDate));
 
 ?>
 <!DOCTYPE html>
diff --git a/application/WarehouseOffer/WarehouseOfferController.php b/application/WarehouseOffer/WarehouseOfferController.php
index 8658804f4..771e3ae58 100644
--- a/application/WarehouseOffer/WarehouseOfferController.php
+++ b/application/WarehouseOffer/WarehouseOfferController.php
@@ -56,7 +56,7 @@ class WarehouseOfferController extends TTCrud
         $this->postData['offerNumber'] = 'AN' . date('Y') . '-' . str_pad($currentCount + 1, 4, '0', STR_PAD_LEFT);
         $this->postData['status'] = 'new';
         $this->postData['version'] = 1;
-        $this->postData['validity'] = 14;
+        $this->postData['validity'] = 31;
         $this->postData['alternativePositions'] = json_encode([]);
         return true;
     }
@@ -366,10 +366,13 @@ class WarehouseOfferController extends TTCrud
         $version = $this->request->version ?? null;
         $offerData = null;
 
+        $versionDate = null; // Date when this version was created (for validity calculation)
+
         if ($version) {
             $historyEntry = WarehouseHistoryModel::getOneByVersion($id, $this->mod, $version);
             if ($historyEntry && !empty($historyEntry->data)) {
                 $offerData = json_decode($historyEntry->data);
+                $versionDate = $historyEntry->create; // Use version creation date
             }
         }
 
@@ -377,6 +380,10 @@ class WarehouseOfferController extends TTCrud
             $offer = WarehouseOfferModel::get($id);
             if (!$offer || !$offer->id) self::sendError('Angebot nicht gefunden');
             $offerData = $offer;
+
+            // Get latest history entry for current version's date
+            $latestHistory = WarehouseHistoryModel::getOneByVersion($id, $this->mod, $offer->version);
+            $versionDate = $latestHistory ? $latestHistory->create : $offer->create;
         }
 
 
@@ -432,11 +439,12 @@ class WarehouseOfferController extends TTCrud
             "alternativeTotal" => $alternativeTotal,
             "offerNumber" => $offerData->offerNumber,
             "offerDate" => $offerData->create,
+            "versionDate" => $versionDate ?? $offerData->create, // Date for validity calculation
             "offerEditorName" => $editor ? $editor->name : 'Unbekannt',
             "includeTax" => true,
             "vatRate" => 0.20,
             "offerText" => $offerData->notes ?? '',
-            "validity" => $offerData->validity ?? 14,
+            "validity" => $offerData->validity ?? 31,
             "closingText" => $offerData->closingText ?? '',
             "bank_iban" => TT_INVOICE_BANK_IBAN,
             "bank_bic" => TT_INVOICE_BANK_BIC,

From a513507b8f84cf5b0fa1974f725a8a2df010e68e Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Tue, 13 Jan 2026 09:41:46 +0000
Subject: [PATCH 24/88] updated filter-vorlage

---
 Layout/default/Preorder/Index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index 6a1a44cbb..69eb2fbe2 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -888,7 +888,7 @@ $pagination_entity_name = "Vorbestellungen";
                                         Filter-Vorlagen <i class="fas fa-caret-down"></i>
                                     </button>
                                     <ul class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-                                        <li><a class="dropdown-item" href="<?=self::getUrl("Preorder", "Index", ["filter" => ["status" => [21,22,23,24,25], "rimo_workorder" => 1, "borderpoint" => "all"]])?>">Gelöschte Bestellungen mit Workorder</a></li>
+                                        <li><a class="dropdown-item" href="<?=self::getUrl("Preorder", "Index", ["filter" => ["status" => [21,22,23,24,25,930,931,932,933,934], "rimo_workorder" => 1, "rimo_workorder_status" => ["Clarify","Accepted","Plan released","Assigned","Executed","Documented","Review"]]])?>">Gelöschte Bestellungen mit Workorder</a></li>
                                         <li><a class="dropdown-item" href="<?=self::getUrl("Preorder", "Index", ["filter" => ["preorder_status_flags" => [4], "connection_type" => ["apartment", "apartment-building"], "borderpoint" => "all"]])?>">Wohnung - Verkabelung erledigt</a></li>
                                         <li><a class="dropdown-item" href="<?=self::getUrl("Preorder", "Index", ["filter" => ["status" => [21,22,23,24,25]]])?>">Storniert</a></li>
                                         <?php if ($me->isAdmin() || $me->address->id == 209): ?>

From 51b63acbde9bfbaf4cac1aaf86bc7e5e9bacd899 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Tue, 13 Jan 2026 12:44:45 +0100
Subject: [PATCH 25/88] initial commit of mobile app

---
 .claude/settings.local.json                   |   12 +
 Layout/default/MobileApp/App.php              |   77 +
 .../default/MobileApp/WarehouseStocktake.php  |   78 +
 Layout/default/menu.php                       |    1 +
 .../WarehouseStocktakeHandler.php             |  473 ++++++
 application/MobileApp/MobileAppController.php |  451 ++++++
 .../Lager/Inventur/InventurHandler.php        |  443 ++++++
 .../Lager/Movement/MovementHandler.php        |  346 +++++
 .../MobileApp/Shared/MobileAppBaseHandler.php |  113 ++
 .../WarehouseMovementController.php           |  258 ++++
 .../WarehouseMovementModel.php                |  137 ++
 ...3130000_create_warehouse_lagerbewegung.php |   42 +
 ...40000_rename_lagerbewegung_to_movement.php |   21 +
 public/.htaccess                              |   26 +
 public/mobile/app.js                          |  581 ++++++++
 public/mobile/components/LoginScreen.js       |  639 ++++++++
 public/mobile/components/MainMenu.js          |   66 +
 public/mobile/manifest.json                   |   26 +
 public/mobile/modules/lager/LagerModule.js    |  166 +++
 .../mobile/modules/lager/inventur/Scanner.js  |  437 ++++++
 .../modules/lager/inventur/StocktakeList.js   |  151 ++
 .../modules/lager/movement/MovementForm.js    | 1308 +++++++++++++++++
 public/mobile/shared/auth.js                  |  199 +++
 public/mobile/shared/base.css                 |  324 ++++
 public/mobile/sw.js                           |   84 ++
 public/mobile/warehouse-stocktake/app.css     |  168 +++
 public/mobile/warehouse-stocktake/app.js      |  182 +++
 .../components/LoginScreen.js                 |  207 +++
 .../warehouse-stocktake/components/Scanner.js |  607 ++++++++
 .../components/StocktakeList.js               |  266 ++++
 .../mobile/warehouse-stocktake/manifest.json  |   27 +
 public/mobile/warehouse-stocktake/sw.js       |  109 ++
 32 files changed, 8025 insertions(+)
 create mode 100644 .claude/settings.local.json
 create mode 100644 Layout/default/MobileApp/App.php
 create mode 100644 Layout/default/MobileApp/WarehouseStocktake.php
 create mode 100644 application/MobileApp/Apps/WarehouseStocktake/WarehouseStocktakeHandler.php
 create mode 100644 application/MobileApp/MobileAppController.php
 create mode 100644 application/MobileApp/Modules/Lager/Inventur/InventurHandler.php
 create mode 100644 application/MobileApp/Modules/Lager/Movement/MovementHandler.php
 create mode 100644 application/MobileApp/Shared/MobileAppBaseHandler.php
 create mode 100644 application/WarehouseMovement/WarehouseMovementController.php
 create mode 100644 application/WarehouseMovement/WarehouseMovementModel.php
 create mode 100644 db/migrations/20260113130000_create_warehouse_lagerbewegung.php
 create mode 100644 db/migrations/20260113140000_rename_lagerbewegung_to_movement.php
 create mode 100644 public/mobile/app.js
 create mode 100644 public/mobile/components/LoginScreen.js
 create mode 100644 public/mobile/components/MainMenu.js
 create mode 100644 public/mobile/manifest.json
 create mode 100644 public/mobile/modules/lager/LagerModule.js
 create mode 100644 public/mobile/modules/lager/inventur/Scanner.js
 create mode 100644 public/mobile/modules/lager/inventur/StocktakeList.js
 create mode 100644 public/mobile/modules/lager/movement/MovementForm.js
 create mode 100644 public/mobile/shared/auth.js
 create mode 100644 public/mobile/shared/base.css
 create mode 100644 public/mobile/sw.js
 create mode 100644 public/mobile/warehouse-stocktake/app.css
 create mode 100644 public/mobile/warehouse-stocktake/app.js
 create mode 100644 public/mobile/warehouse-stocktake/components/LoginScreen.js
 create mode 100644 public/mobile/warehouse-stocktake/components/Scanner.js
 create mode 100644 public/mobile/warehouse-stocktake/components/StocktakeList.js
 create mode 100644 public/mobile/warehouse-stocktake/manifest.json
 create mode 100644 public/mobile/warehouse-stocktake/sw.js

diff --git a/.claude/settings.local.json b/.claude/settings.local.json
new file mode 100644
index 000000000..64b936302
--- /dev/null
+++ b/.claude/settings.local.json
@@ -0,0 +1,12 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(docker-compose up:*)",
+      "Bash(python:*)",
+      "Bash(cat:*)",
+      "Bash(find:*)",
+      "Bash(docker-compose exec:*)",
+      "mcp__sequentialthinking__sequentialthinking"
+    ]
+  }
+}
diff --git a/Layout/default/MobileApp/App.php b/Layout/default/MobileApp/App.php
new file mode 100644
index 000000000..b60ddf599
--- /dev/null
+++ b/Layout/default/MobileApp/App.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * MobileApp PWA View Template
+ *
+ * Main shell for the unified Mobile App.
+ * Vue handles internal navigation between modules.
+ */
+?>
+<!DOCTYPE html>
+<html lang="de">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
+    <title>Xinon Mobile</title>
+    <link rel="shortcut icon" href="/assets/images/favicon.ico">
+
+    <!-- PWA Configuration -->
+    <link rel="manifest" href="/mobile/manifest.json">
+    <meta name="theme-color" content="#005384">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+    <meta name="apple-mobile-web-app-title" content="Xinon">
+
+    <!-- External Libraries (CDN) -->
+    <script src="https://cdn.tailwindcss.com"></script>
+    <script src="https://cdn.jsdelivr.net/npm/vue@3.4.27/dist/vue.global.prod.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/axios@1.7.2/dist/axios.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/html5-qrcode@2.3.8/html5-qrcode.min.js"></script>
+
+    <!-- Shared Styles -->
+    <link rel="stylesheet" href="/mobile/shared/base.css">
+
+    <!-- App Configuration -->
+    <script>
+        window.TT_CONFIG = <?= json_encode($JSGlobals ?? []) ?>;
+
+        // Tailwind configuration
+        tailwind.config = {
+            darkMode: 'class',
+            theme: {
+                extend: {
+                    colors: {
+                        'primary': '#005384',
+                        'secondary': '#fac41b',
+                    },
+                }
+            }
+        };
+    </script>
+</head>
+<body class="transition-colors duration-300 overflow-hidden">
+    <div id="app" class="h-screen w-screen overflow-hidden antialiased">
+        <!-- Loading state while Vue initializes -->
+        <div class="flex items-center justify-center h-full bg-slate-100 dark:bg-slate-900">
+            <div class="text-center">
+                <img src="/assets/images/xinon-full-transparent.png" class="h-12 mx-auto mb-4 dark:hidden">
+                <img src="/assets/images/xinon-full-transparent-white.png" class="h-12 mx-auto mb-4 hidden dark:block">
+                <div class="animate-pulse text-slate-500 dark:text-slate-400">Lädt...</div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Load Vue app as ES module -->
+    <script type="module" src="/mobile/app.js"></script>
+
+    <!-- Register Service Worker -->
+    <script>
+        if ('serviceWorker' in navigator) {
+            window.addEventListener('load', () => {
+                navigator.serviceWorker.register('/mobile/sw.js')
+                    .then(reg => console.log('SW registered:', reg.scope))
+                    .catch(err => console.log('SW registration failed:', err));
+            });
+        }
+    </script>
+</body>
+</html>
diff --git a/Layout/default/MobileApp/WarehouseStocktake.php b/Layout/default/MobileApp/WarehouseStocktake.php
new file mode 100644
index 000000000..6ba94de1a
--- /dev/null
+++ b/Layout/default/MobileApp/WarehouseStocktake.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Warehouse Stocktake PWA View Template
+ *
+ * This is the HTML shell for the Warehouse Stocktake PWA.
+ * The Vue application is loaded via ES modules.
+ */
+?>
+<!DOCTYPE html>
+<html lang="de">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
+    <title>Lager Inventur</title>
+    <link rel="shortcut icon" href="/assets/images/favicon.ico">
+
+    <!-- PWA Configuration -->
+    <link rel="manifest" href="/mobile/warehouse-stocktake/manifest.json">
+    <meta name="theme-color" content="#005384">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+    <meta name="apple-mobile-web-app-title" content="Inventur">
+
+    <!-- External Libraries (CDN) -->
+    <script src="https://cdn.tailwindcss.com"></script>
+    <script src="https://cdn.jsdelivr.net/npm/vue@3.4.27/dist/vue.global.prod.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/axios@1.7.2/dist/axios.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/html5-qrcode@2.3.8/html5-qrcode.min.js"></script>
+
+    <!-- Shared Styles -->
+    <link rel="stylesheet" href="/mobile/shared/base.css">
+    <link rel="stylesheet" href="/mobile/warehouse-stocktake/app.css">
+
+    <!-- App Configuration -->
+    <script>
+        window.TT_CONFIG = <?= json_encode($JSGlobals ?? []) ?>;
+
+        // Tailwind configuration
+        tailwind.config = {
+            darkMode: 'class',
+            theme: {
+                extend: {
+                    colors: {
+                        'primary': '#005384',
+                        'secondary': '#fac41b',
+                    },
+                }
+            }
+        };
+    </script>
+</head>
+<body class="transition-colors duration-300 overflow-hidden">
+    <div id="app" class="h-screen w-screen overflow-hidden antialiased">
+        <!-- Loading state while Vue initializes -->
+        <div class="flex items-center justify-center h-full bg-slate-100 dark:bg-slate-900">
+            <div class="text-center">
+                <img src="/assets/images/xinon-full-transparent.png" class="h-12 mx-auto mb-4 dark:hidden">
+                <img src="/assets/images/xinon-full-transparent-white.png" class="h-12 mx-auto mb-4 hidden dark:block">
+                <div class="animate-pulse text-slate-500 dark:text-slate-400">Lädt...</div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Load Vue app as ES module -->
+    <script type="module" src="/mobile/warehouse-stocktake/app.js"></script>
+
+    <!-- Register Service Worker -->
+    <script>
+        if ('serviceWorker' in navigator) {
+            window.addEventListener('load', () => {
+                navigator.serviceWorker.register('/mobile/warehouse-stocktake/sw.js')
+                    .then(reg => console.log('SW registered:', reg.scope))
+                    .catch(err => console.log('SW registration failed:', err));
+            });
+        }
+    </script>
+</body>
+</html>
diff --git a/Layout/default/menu.php b/Layout/default/menu.php
index baf61ddc7..82ce59296 100644
--- a/Layout/default/menu.php
+++ b/Layout/default/menu.php
@@ -185,6 +185,7 @@
                         <?php if($me->can("WarehouseAdmin") || $me->can("WarehouseUser")): ?><li><a href="<?=self::getUrl("WarehouseShippingNote")?>"><i class="far fa-fw fa-shipping-fast text-info"></i> Lieferscheine</a></li><?php endif; ?>
                         <?php if($me->can("WarehouseAdmin") || $me->can("WarehouseUser")): ?><li><a href="<?=self::getUrl("WarehouseProject")?>"><i class="fas fa-fw fa-project-diagram text-info"></i> Projekte</a></li><?php endif; ?>
                         <?php if($me->can("WarehouseAdmin")): ?><li><a href="<?=self::getUrl("WarehouseStocktake")?>"><i class="far fa-fw fa-clipboard-check text-info"></i> Inventur</a></li><?php endif; ?>
+                        <?php if($me->can("WarehouseAdmin") || $me->can("WarehouseUser")): ?><li><a href="<?=self::getUrl("WarehouseMovement")?>"><i class="far fa-fw fa-arrow-right-arrow-left text-info"></i> Lagerbewegung</a></li><?php endif; ?>
 
                         <?php if($me->can("WarehouseAdmin")): ?><li><a href="<?=self::getUrl("WarehouseDistributor")?>"><i class="far fa-fw fa-cogs text-info"></i> Administration</a></li><?php endif; ?>
 
diff --git a/application/MobileApp/Apps/WarehouseStocktake/WarehouseStocktakeHandler.php b/application/MobileApp/Apps/WarehouseStocktake/WarehouseStocktakeHandler.php
new file mode 100644
index 000000000..a9773471c
--- /dev/null
+++ b/application/MobileApp/Apps/WarehouseStocktake/WarehouseStocktakeHandler.php
@@ -0,0 +1,473 @@
+<?php
+
+require_once APPDIR . 'MobileApp/Shared/MobileAppBaseHandler.php';
+
+/**
+ * Warehouse Stocktake Handler
+ *
+ * Handles all endpoints for the Warehouse Stocktake PWA.
+ * Migrated from WarehouseStocktakePWAController with new structure.
+ */
+class WarehouseStocktakeHandler extends MobileAppBaseHandler {
+
+    protected $requiredPermission = 'WarehouseUser';
+    protected $appName = 'WarehouseStocktake';
+    protected $viewTemplate = 'MobileApp/WarehouseStocktake';
+
+    /**
+     * Get active stocktakes that user can participate in
+     * GET /MobileApp/WarehouseStocktake/getActiveStocktakes
+     */
+    public function getActiveStocktakesAction() {
+        $stocktakes = WarehouseStocktakeModel::getAll(['status' => 'in_progress']);
+
+        $result = [];
+        foreach ($stocktakes as $stocktake) {
+            $location = $stocktake->getLocation();
+            $result[] = [
+                'id' => $stocktake->id,
+                'stocktakeNumber' => $stocktake->stocktakeNumber,
+                'title' => $stocktake->title,
+                'locationName' => $location ? $location->title : 'Unbekannt',
+                'totalScannedItems' => $stocktake->totalScannedItems,
+                'startedAt' => $stocktake->startedAt ? date('d.m.Y H:i', $stocktake->startedAt) : null,
+            ];
+        }
+
+        self::returnJson(['success' => true, 'stocktakes' => $result]);
+    }
+
+    /**
+     * Get stocktake details
+     * GET /MobileApp/WarehouseStocktake/getStocktake?id=X
+     */
+    public function getStocktakeAction() {
+        $id = intval($this->request->id);
+        if (!$id) {
+            self::returnJson(['success' => false, 'message' => 'Keine Inventur-ID angegeben']);
+            return;
+        }
+
+        $stocktake = WarehouseStocktakeModel::get($id);
+        if (!$stocktake) {
+            self::returnJson(['success' => false, 'message' => 'Inventur nicht gefunden']);
+            return;
+        }
+
+        $location = $stocktake->getLocation();
+
+        self::returnJson([
+            'success' => true,
+            'stocktake' => [
+                'id' => $stocktake->id,
+                'stocktakeNumber' => $stocktake->stocktakeNumber,
+                'title' => $stocktake->title,
+                'status' => $stocktake->status,
+                'locationId' => $stocktake->warehouseLocationId,
+                'locationName' => $location ? $location->title : 'Unbekannt',
+                'totalScannedItems' => $stocktake->totalScannedItems,
+                'startedAt' => $stocktake->startedAt ? date('d.m.Y H:i', $stocktake->startedAt) : null,
+            ]
+        ]);
+    }
+
+    /**
+     * Get article by QR code or article number
+     * GET /MobileApp/WarehouseStocktake/getArticle?code=X
+     */
+    public function getArticleAction() {
+        $code = $this->request->code;
+
+        if (!$code) {
+            self::returnJson(['success' => false, 'message' => 'Kein Code angegeben']);
+            return;
+        }
+
+        $articleId = null;
+
+        // Try to parse QR code format: WA:articleId:articleNumber (Warehouse Article)
+        // Also accept WH: for backwards compatibility
+        if (preg_match('/^(?:WA|WH):(\d+):/', $code, $matches)) {
+            $articleId = intval($matches[1]);
+        } else {
+            // Try to find by article number
+            $article = WarehouseArticleModel::getFirst(['articleNumber' => $code]);
+            if ($article) {
+                $articleId = $article->id;
+            }
+        }
+
+        if (!$articleId) {
+            self::returnJson(['success' => false, 'message' => 'Artikel nicht gefunden']);
+            return;
+        }
+
+        $article = WarehouseArticleModel::get($articleId);
+        if (!$article) {
+            self::returnJson(['success' => false, 'message' => 'Artikel nicht gefunden']);
+            return;
+        }
+
+        // Get category name
+        $category = WarehouseCategory::get($article->category_id);
+
+        self::returnJson([
+            'success' => true,
+            'article' => [
+                'id' => $article->id,
+                'articleNumber' => $article->articleNumber,
+                'title' => $article->title,
+                'description' => $article->description ?? '',
+                'unit' => $article->unit ?? 'Stk.',
+                'categoryName' => $category ? $category->name : '',
+            ]
+        ]);
+    }
+
+    /**
+     * Search articles by text with optional category filter
+     * GET /MobileApp/WarehouseStocktake/searchArticles?query=X&categoryId=Y
+     */
+    public function searchArticlesAction() {
+        $query = $this->request->query ?? '';
+        $categoryId = intval($this->request->categoryId ?? 0);
+
+        $db = $this->db();
+        $conditions = ["(isEndOfLife IS NULL OR isEndOfLife = 0)"];
+
+        if ($query && strlen($query) >= 2) {
+            $escapedQuery = $db->escape($query);
+            $conditions[] = "(articleNumber LIKE '%{$escapedQuery}%' OR title LIKE '%{$escapedQuery}%' OR description LIKE '%{$escapedQuery}%')";
+        }
+
+        if ($categoryId > 0) {
+            $conditions[] = "category_id = {$categoryId}";
+        }
+
+        if (count($conditions) === 1 && !$categoryId) {
+            self::returnJson(['success' => true, 'articles' => []]);
+            return;
+        }
+
+        $whereClause = implode(' AND ', $conditions);
+        $result = $db->query("SELECT id, articleNumber, title, unit, category_id
+                              FROM WarehouseArticle
+                              WHERE {$whereClause}
+                              ORDER BY title ASC
+                              LIMIT 50");
+
+        $articles = [];
+        while ($row = $result->fetch_assoc()) {
+            $articles[] = [
+                'id' => intval($row['id']),
+                'articleNumber' => $row['articleNumber'],
+                'title' => $row['title'],
+                'unit' => $row['unit'] ?? 'Stk.',
+                'categoryId' => intval($row['category_id'] ?? 0),
+            ];
+        }
+
+        self::returnJson(['success' => true, 'articles' => $articles]);
+    }
+
+    /**
+     * Get all categories for browsing
+     * GET /MobileApp/WarehouseStocktake/getCategories
+     */
+    public function getCategoriesAction() {
+        $db = $this->db();
+        $res = $db->query("SELECT id, name FROM WarehouseCategory ORDER BY name ASC");
+
+        $categories = [];
+        while ($row = $res->fetch_assoc()) {
+            $categories[] = [
+                'id' => intval($row['id']),
+                'name' => $row['name'],
+            ];
+        }
+        self::returnJson(['success' => true, 'categories' => $categories]);
+    }
+
+    /**
+     * Check if article is already scanned in stocktake
+     * GET /MobileApp/WarehouseStocktake/checkAlreadyScanned?stocktakeId=X&articleId=Y
+     */
+    public function checkAlreadyScannedAction() {
+        $stocktakeId = intval($this->request->stocktakeId);
+        $articleId = intval($this->request->articleId);
+
+        if (!$stocktakeId || !$articleId) {
+            self::returnJson(['success' => false, 'message' => 'Fehlende Parameter']);
+            return;
+        }
+
+        $existing = WarehouseStocktakeItemModel::getFirst([
+            'stocktakeId' => $stocktakeId,
+            'articleId' => $articleId,
+            'overwrittenById' => null
+        ]);
+
+        if ($existing) {
+            $db = $this->db();
+            $scannedByResult = $db->query("SELECT name FROM Worker WHERE id = {$existing->scannedBy}");
+            $scannedByRow = $scannedByResult->fetch_assoc();
+
+            self::returnJson([
+                'success' => true,
+                'alreadyScanned' => true,
+                'existingItem' => [
+                    'id' => $existing->id,
+                    'countedQuantity' => $existing->countedQuantity,
+                    'scannedAt' => $existing->scannedAt ? date('d.m.Y H:i', $existing->scannedAt) : null,
+                    'scannedBy' => $scannedByRow ? $scannedByRow['name'] : 'Unbekannt',
+                ]
+            ]);
+        } else {
+            self::returnJson(['success' => true, 'alreadyScanned' => false]);
+        }
+    }
+
+    /**
+     * Submit a scanned item
+     * POST /MobileApp/WarehouseStocktake/submitScan
+     */
+    public function submitScanAction() {
+        $postData = $this->getPostData();
+
+        $stocktakeId = intval($postData['stocktakeId'] ?? 0);
+        $articleId = intval($postData['articleId'] ?? 0);
+        $quantity = floatval($postData['quantity'] ?? 0);
+        $rack = $postData['rack'] ?? null;
+        $shelf = $postData['shelf'] ?? null;
+        $note = $postData['note'] ?? null;
+        $overwrite = boolval($postData['overwrite'] ?? false);
+        $overwriteItemId = intval($postData['overwriteItemId'] ?? 0);
+
+        if (!$stocktakeId || !$articleId) {
+            self::returnJson(['success' => false, 'message' => 'Fehlende Parameter']);
+            return;
+        }
+
+        if ($quantity <= 0) {
+            self::returnJson(['success' => false, 'message' => 'Menge muss größer als 0 sein']);
+            return;
+        }
+
+        // Verify stocktake exists and is in progress
+        $stocktake = WarehouseStocktakeModel::get($stocktakeId);
+        if (!$stocktake) {
+            self::returnJson(['success' => false, 'message' => 'Inventur nicht gefunden']);
+            return;
+        }
+
+        if ($stocktake->status !== 'in_progress') {
+            self::returnJson(['success' => false, 'message' => 'Inventur ist nicht aktiv']);
+            return;
+        }
+
+        // Verify article exists
+        $article = WarehouseArticleModel::get($articleId);
+        if (!$article) {
+            self::returnJson(['success' => false, 'message' => 'Artikel nicht gefunden']);
+            return;
+        }
+
+        $db = $this->db();
+
+        // If overwrite mode is enabled, mark existing item as overwritten
+        if ($overwrite && $overwriteItemId) {
+            // Create new entry
+            $db->query("INSERT INTO WarehouseStocktakeItem
+                        (stocktakeId, articleId, countedQuantity, rack, shelf, note, scannedAt, scannedBy, createBy, `create`)
+                        VALUES ({$stocktakeId}, {$articleId}, {$quantity},
+                        " . ($rack ? "'{$db->escape($rack)}'" : "NULL") . ",
+                        " . ($shelf ? "'{$db->escape($shelf)}'" : "NULL") . ",
+                        " . ($note ? "'{$db->escape($note)}'" : "NULL") . ",
+                        " . time() . ", {$this->user->id}, {$this->user->id}, " . time() . ")");
+
+            $itemId = $db->insert_id;
+
+            // Mark old item as overwritten by new item
+            $db->query("UPDATE WarehouseStocktakeItem SET overwrittenById = {$itemId} WHERE id = {$overwriteItemId}");
+
+            $finalQuantity = $quantity;
+
+            // Log the overwrite
+            WarehouseStocktakeLogModel::log($stocktakeId, 'overwritten', $itemId, [
+                'articleId' => $articleId,
+                'articleNumber' => $article->articleNumber,
+                'articleTitle' => $article->title,
+                'quantity' => $quantity,
+                'overwrittenItemId' => $overwriteItemId,
+            ]);
+
+            // Update stocktake progress
+            $stocktake->updateProgress();
+
+            self::returnJson([
+                'success' => true,
+                'message' => "'{$article->title}' überschrieben ({$quantity} {$article->unit})",
+                'item' => [
+                    'id' => $itemId,
+                    'articleId' => $articleId,
+                    'articleNumber' => $article->articleNumber,
+                    'articleTitle' => $article->title,
+                    'countedQuantity' => $finalQuantity,
+                    'unit' => $article->unit ?? 'Stk.',
+                    'rack' => $rack,
+                    'shelf' => $shelf,
+                    'isOverwrite' => true,
+                ]
+            ]);
+            return;
+        }
+
+        // Check if this article was already scanned in this stocktake (non-overwritten)
+        $existing = WarehouseStocktakeItemModel::getFirst([
+            'stocktakeId' => $stocktakeId,
+            'articleId' => $articleId,
+            'overwrittenById' => null
+        ]);
+
+        if ($existing) {
+            // Update existing entry - add to quantity
+            $newQuantity = $existing->countedQuantity + $quantity;
+            $db->query("UPDATE WarehouseStocktakeItem SET
+                        countedQuantity = {$newQuantity},
+                        rack = " . ($rack ? "'{$db->escape($rack)}'" : "rack") . ",
+                        shelf = " . ($shelf ? "'{$db->escape($shelf)}'" : "shelf") . ",
+                        scannedAt = " . time() . ",
+                        scannedBy = {$this->user->id}
+                        WHERE id = {$existing->id}");
+
+            $itemId = $existing->id;
+            $finalQuantity = $newQuantity;
+            $isUpdate = true;
+        } else {
+            // Create new entry
+            $db->query("INSERT INTO WarehouseStocktakeItem
+                        (stocktakeId, articleId, countedQuantity, rack, shelf, note, scannedAt, scannedBy, createBy, `create`)
+                        VALUES ({$stocktakeId}, {$articleId}, {$quantity},
+                        " . ($rack ? "'{$db->escape($rack)}'" : "NULL") . ",
+                        " . ($shelf ? "'{$db->escape($shelf)}'" : "NULL") . ",
+                        " . ($note ? "'{$db->escape($note)}'" : "NULL") . ",
+                        " . time() . ", {$this->user->id}, {$this->user->id}, " . time() . ")");
+
+            $itemId = $db->insert_id;
+            $finalQuantity = $quantity;
+            $isUpdate = false;
+        }
+
+        // Update stocktake progress
+        $stocktake->updateProgress();
+
+        // Log the scan
+        WarehouseStocktakeLogModel::log($stocktakeId, 'scanned', $itemId, [
+            'articleId' => $articleId,
+            'articleNumber' => $article->articleNumber,
+            'articleTitle' => $article->title,
+            'quantity' => $quantity,
+            'totalQuantity' => $finalQuantity,
+            'rack' => $rack,
+            'shelf' => $shelf,
+            'isUpdate' => $isUpdate,
+        ]);
+
+        self::returnJson([
+            'success' => true,
+            'message' => $isUpdate
+                ? "Menge für '{$article->title}' erhöht auf {$finalQuantity}"
+                : "'{$article->title}' hinzugefügt ({$quantity} {$article->unit})",
+            'item' => [
+                'id' => $itemId,
+                'articleId' => $articleId,
+                'articleNumber' => $article->articleNumber,
+                'articleTitle' => $article->title,
+                'countedQuantity' => $finalQuantity,
+                'unit' => $article->unit ?? 'Stk.',
+                'rack' => $rack,
+                'shelf' => $shelf,
+                'isUpdate' => $isUpdate,
+            ]
+        ]);
+    }
+
+    /**
+     * Get recent scans for current user in a stocktake
+     * GET /MobileApp/WarehouseStocktake/getMyScans?stocktakeId=X
+     */
+    public function getMyScansAction() {
+        $stocktakeId = intval($this->request->stocktakeId);
+
+        if (!$stocktakeId) {
+            self::returnJson(['success' => false, 'message' => 'Keine Inventur-ID angegeben']);
+            return;
+        }
+
+        $db = $this->db();
+        $result = $db->query("SELECT si.*, wa.articleNumber, wa.title as articleTitle, wa.unit
+                              FROM WarehouseStocktakeItem si
+                              JOIN WarehouseArticle wa ON wa.id = si.articleId
+                              WHERE si.stocktakeId = {$stocktakeId}
+                              AND si.scannedBy = {$this->user->id}
+                              ORDER BY si.scannedAt DESC
+                              LIMIT 50");
+
+        $items = [];
+        while ($row = $result->fetch_assoc()) {
+            $items[] = [
+                'id' => intval($row['id']),
+                'articleId' => intval($row['articleId']),
+                'articleNumber' => $row['articleNumber'],
+                'articleTitle' => $row['articleTitle'],
+                'countedQuantity' => floatval($row['countedQuantity']),
+                'unit' => $row['unit'] ?? 'Stk.',
+                'rack' => $row['rack'],
+                'shelf' => $row['shelf'],
+                'scannedAt' => $row['scannedAt'] ? date('H:i', $row['scannedAt']) : null,
+            ];
+        }
+
+        self::returnJson(['success' => true, 'items' => $items]);
+    }
+
+    /**
+     * Get progress stats
+     * GET /MobileApp/WarehouseStocktake/getProgress?stocktakeId=X
+     */
+    public function getProgressAction() {
+        $stocktakeId = intval($this->request->stocktakeId);
+
+        if (!$stocktakeId) {
+            self::returnJson(['success' => false, 'message' => 'Keine Inventur-ID angegeben']);
+            return;
+        }
+
+        $stocktake = WarehouseStocktakeModel::get($stocktakeId);
+        if (!$stocktake) {
+            self::returnJson(['success' => false, 'message' => 'Inventur nicht gefunden']);
+            return;
+        }
+
+        $db = $this->db();
+
+        // Total scanned items
+        $totalResult = $db->query("SELECT COUNT(*) as count FROM WarehouseStocktakeItem WHERE stocktakeId = {$stocktakeId}");
+        $totalRow = $totalResult->fetch_assoc();
+        $totalScanned = intval($totalRow['count']);
+
+        // My scanned items
+        $myResult = $db->query("SELECT COUNT(*) as count FROM WarehouseStocktakeItem WHERE stocktakeId = {$stocktakeId} AND scannedBy = {$this->user->id}");
+        $myRow = $myResult->fetch_assoc();
+        $myScanned = intval($myRow['count']);
+
+        self::returnJson([
+            'success' => true,
+            'progress' => [
+                'totalScanned' => $totalScanned,
+                'myScanned' => $myScanned,
+                'status' => $stocktake->status,
+            ]
+        ]);
+    }
+}
diff --git a/application/MobileApp/MobileAppController.php b/application/MobileApp/MobileAppController.php
new file mode 100644
index 000000000..96f62b246
--- /dev/null
+++ b/application/MobileApp/MobileAppController.php
@@ -0,0 +1,451 @@
+<?php
+
+/**
+ * MobileApp Controller
+ *
+ * Main dispatcher for the Mobile PWA application.
+ *
+ * URL Structure:
+ * - /MobileApp                           → Main app (Vue SPA)
+ * - /MobileApp/auth/{action}             → Auth endpoints (login/logout/check)
+ * - /MobileApp/{module}/{submodule}      → Module view (handled by Vue SPA)
+ * - /MobileApp/{module}/{submodule}/{action} → API endpoints
+ *
+ * Example:
+ * - /MobileApp                           → Shows main menu
+ * - /MobileApp/Lager/Inventur            → Shows stocktake (handled by Vue)
+ * - /MobileApp/Lager/Inventur/getActiveStocktakes → API call
+ */
+class MobileAppController extends mfBaseController {
+
+    protected $user;
+
+    protected function init() {
+        // We handle auth ourselves
+        $this->needlogin = false;
+
+        // Try to load user if session exists
+        $me = mfValuecache::singleton()->get("me");
+        if (!$me) {
+            if (mfLoginController::isLoggedIn()) {
+                $me = new User();
+                $me->loadMe();
+                mfValuecache::singleton()->set("me", $me);
+            }
+        }
+        $this->user = $me;
+    }
+
+    /**
+     * Main dispatcher
+     */
+    public function indexAction() {
+        $module = $this->request->module ?? null;
+        $submodule = $this->request->submodule ?? null;
+        $endpoint = $this->request->endpoint ?? null;
+
+        // Auth endpoints: /MobileApp/auth/{action}
+        if (strtolower($module) === 'auth') {
+            return $this->handleAuth($submodule ?? 'check');
+        }
+
+        // API call: /MobileApp/{module}/{submodule}/{endpoint}
+        if ($module && $submodule && $endpoint) {
+            return $this->handleApiCall($module, $submodule, $endpoint);
+        }
+
+        // Everything else: render the main Vue SPA
+        // The Vue app handles internal routing for /MobileApp, /MobileApp/Lager, /MobileApp/Lager/Inventur, etc.
+        return $this->renderApp();
+    }
+
+    /**
+     * Render the main Vue SPA
+     */
+    protected function renderApp() {
+        $this->layout()->setTemplate("MobileApp/App");
+        $this->layout()->set("JSGlobals", [
+            'BASE_PATH' => '/MobileApp',
+            'USER' => $this->user ? [
+                'id' => $this->user->id,
+                'name' => $this->user->name,
+                'username' => $this->user->username,
+            ] : null,
+            'INITIAL_PATH' => $_SERVER['REQUEST_URI'] ?? '/MobileApp',
+        ]);
+    }
+
+    /**
+     * Handle authentication endpoints
+     */
+    protected function handleAuth($action) {
+        switch (strtolower($action)) {
+            case 'login':
+                return $this->authLogin();
+            case 'verify2fa':
+                return $this->authVerify2FA();
+            case 'resend2fa':
+                return $this->authResend2FA();
+            case 'logout':
+                return $this->authLogout();
+            case 'check':
+                return $this->authCheck();
+            default:
+                self::returnJson(['success' => false, 'error' => 'Unknown auth endpoint'], 404);
+        }
+    }
+
+    /**
+     * POST /MobileApp/auth/login
+     *
+     * Step 1 of authentication. If 2FA is required, returns requires2FA: true
+     * and the frontend should proceed to verify2fa endpoint.
+     */
+    protected function authLogin() {
+        if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
+            self::returnJson(['success' => false, 'error' => 'Method not allowed'], 405);
+            return;
+        }
+
+        $postData = json_decode(file_get_contents('php://input'), true) ?? [];
+        $username = $postData['username'] ?? '';
+        $password = $postData['password'] ?? '';
+        $rememberMe = $postData['rememberMe'] ?? false;
+
+        if (!$username || !$password) {
+            self::returnJson(['success' => false, 'message' => 'Benutzername und Passwort erforderlich']);
+            return;
+        }
+
+        $db = FronkDB::singleton();
+        $escapedUsername = $db->escape($username);
+
+        $res = $db->select(MFUSERTABLE, "*", "username='$escapedUsername'");
+        if (!$db->num_rows($res)) {
+            sleep(1);
+            self::returnJson(['success' => false, 'message' => 'Ungültige Anmeldedaten']);
+            return;
+        }
+
+        $userRow = $db->fetch_object($res);
+
+        if ($userRow->active == 0) {
+            self::returnJson(['success' => false, 'message' => 'Benutzer ist deaktiviert']);
+            return;
+        }
+
+        $hash = $userRow->password;
+        $salt = substr($hash, 0, 16);
+        $passhash = mfLoginController::generatePasswordHash($password, $salt);
+
+        if ($passhash !== $hash) {
+            sleep(1);
+            self::returnJson(['success' => false, 'message' => 'Ungültige Anmeldedaten']);
+            return;
+        }
+
+        // Check if 2FA is required
+        if ($userRow->twofactor !== "0") {
+            // Generate and send 2FA code
+            $twoFactor = new UserTwofactor($userRow->id);
+            $twoFactor->sendCode();
+
+            // Store pending auth in session for 2FA verification
+            $_SESSION['mobileapp_2fa_pending'] = [
+                'user_id' => $userRow->id,
+                'username' => $userRow->username,
+                'remember_me' => $rememberMe,
+                'timestamp' => time()
+            ];
+
+            // Determine delivery method for UI feedback
+            $deliveryMethod = $userRow->twofactor == 1 ? 'email' : 'sms';
+            $maskedTarget = $deliveryMethod === 'email'
+                ? $this->maskEmail($userRow->email)
+                : $this->maskPhone($userRow->mobile);
+
+            self::returnJson([
+                'success' => false,
+                'requires2FA' => true,
+                'deliveryMethod' => $deliveryMethod,
+                'maskedTarget' => $maskedTarget,
+                'message' => 'Verifizierungscode wurde gesendet'
+            ]);
+            return;
+        }
+
+        // No 2FA - complete login directly
+        $this->completeLogin($userRow, $rememberMe);
+    }
+
+    /**
+     * POST /MobileApp/auth/verify2fa
+     *
+     * Step 2 of authentication - verify the 2FA code
+     */
+    protected function authVerify2FA() {
+        if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
+            self::returnJson(['success' => false, 'error' => 'Method not allowed'], 405);
+            return;
+        }
+
+        $postData = json_decode(file_get_contents('php://input'), true) ?? [];
+        $code = $postData['code'] ?? '';
+
+        // Check for pending 2FA session
+        if (!isset($_SESSION['mobileapp_2fa_pending'])) {
+            self::returnJson(['success' => false, 'message' => 'Keine ausstehende Verifizierung']);
+            return;
+        }
+
+        $pending = $_SESSION['mobileapp_2fa_pending'];
+
+        // Check if pending session is expired (10 minutes max)
+        if (time() - $pending['timestamp'] > 600) {
+            unset($_SESSION['mobileapp_2fa_pending']);
+            self::returnJson(['success' => false, 'message' => 'Sitzung abgelaufen. Bitte erneut anmelden.', 'expired' => true]);
+            return;
+        }
+
+        if (!$code || strlen($code) !== 5) {
+            self::returnJson(['success' => false, 'message' => 'Bitte gib den 5-stelligen Code ein']);
+            return;
+        }
+
+        $db = FronkDB::singleton();
+        $userId = intval($pending['user_id']);
+
+        // Get user's 2FA code and timestamp
+        $res = $db->select(MFUSERTABLE, "twofactorcode, twofactortimestamp, username", "id = {$userId}");
+        if (!$db->num_rows($res)) {
+            unset($_SESSION['mobileapp_2fa_pending']);
+            self::returnJson(['success' => false, 'message' => 'Benutzer nicht gefunden']);
+            return;
+        }
+
+        $userRow = $db->fetch_object($res);
+        $storedCode = $userRow->twofactorcode;
+        $codeTimestamp = intval($userRow->twofactortimestamp);
+
+        // Check if code is expired (5 minutes)
+        if (time() - $codeTimestamp > 300) {
+            self::returnJson(['success' => false, 'message' => 'Code abgelaufen. Bitte neuen Code anfordern.', 'codeExpired' => true]);
+            return;
+        }
+
+        // Verify code
+        if ($code !== $storedCode) {
+            sleep(1); // Rate limiting
+            self::returnJson(['success' => false, 'message' => 'Ungültiger Code']);
+            return;
+        }
+
+        // Clear the 2FA code
+        $twoFactor = new UserTwofactor($userId);
+        $twoFactor->removeCode();
+
+        // Clear pending session
+        unset($_SESSION['mobileapp_2fa_pending']);
+
+        // Get full user row for login completion
+        $res = $db->select(MFUSERTABLE, "*", "id = {$userId}");
+        $userRow = $db->fetch_object($res);
+
+        // Complete login
+        $this->completeLogin($userRow, $pending['remember_me']);
+    }
+
+    /**
+     * POST /MobileApp/auth/resend2fa
+     *
+     * Resend the 2FA code
+     */
+    protected function authResend2FA() {
+        if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
+            self::returnJson(['success' => false, 'error' => 'Method not allowed'], 405);
+            return;
+        }
+
+        // Check for pending 2FA session
+        if (!isset($_SESSION['mobileapp_2fa_pending'])) {
+            self::returnJson(['success' => false, 'message' => 'Keine ausstehende Verifizierung']);
+            return;
+        }
+
+        $pending = $_SESSION['mobileapp_2fa_pending'];
+
+        // Check if pending session is expired (10 minutes max)
+        if (time() - $pending['timestamp'] > 600) {
+            unset($_SESSION['mobileapp_2fa_pending']);
+            self::returnJson(['success' => false, 'message' => 'Sitzung abgelaufen. Bitte erneut anmelden.', 'expired' => true]);
+            return;
+        }
+
+        // Resend 2FA code
+        $twoFactor = new UserTwofactor($pending['user_id']);
+        $twoFactor->sendCode();
+
+        self::returnJson([
+            'success' => true,
+            'message' => 'Neuer Code wurde gesendet'
+        ]);
+    }
+
+    /**
+     * Complete the login process after password (and optionally 2FA) verification
+     */
+    protected function completeLogin($userRow, $rememberMe) {
+        $db = FronkDB::singleton();
+
+        $db->update(MFUSERTABLE, [
+            'ip' => $_SERVER['REMOTE_ADDR'],
+            'sessionid' => session_id()
+        ], "id = {$userRow->id}");
+
+        $_SESSION[MFAPPNAME . '_username'] = $userRow->username;
+        $_SESSION[MFAPPNAME . '_ip'] = $_SERVER['REMOTE_ADDR'];
+
+        if ($rememberMe) {
+            UserToken::generateToken($userRow->id);
+        }
+
+        $user = new User();
+        $user->loadMe();
+
+        self::returnJson([
+            'success' => true,
+            'user' => [
+                'id' => $user->id,
+                'name' => $user->name,
+                'username' => $user->username,
+            ]
+        ]);
+    }
+
+    /**
+     * Mask email address for privacy (e.g., j***@example.com)
+     */
+    protected function maskEmail($email) {
+        if (!$email) return '***';
+        $parts = explode('@', $email);
+        if (count($parts) !== 2) return '***';
+        $local = $parts[0];
+        $domain = $parts[1];
+        $masked = strlen($local) > 1 ? $local[0] . str_repeat('*', min(5, strlen($local) - 1)) : '*';
+        return $masked . '@' . $domain;
+    }
+
+    /**
+     * Mask phone number for privacy (e.g., +43***123)
+     */
+    protected function maskPhone($phone) {
+        if (!$phone) return '***';
+        $phone = preg_replace('/\s+/', '', $phone);
+        if (strlen($phone) < 6) return '***';
+        return substr($phone, 0, 3) . str_repeat('*', strlen($phone) - 6) . substr($phone, -3);
+    }
+
+    /**
+     * POST /MobileApp/auth/logout
+     */
+    protected function authLogout() {
+        mfLoginController::staticLogout();
+        self::returnJson(['success' => true]);
+    }
+
+    /**
+     * GET /MobileApp/auth/check
+     */
+    protected function authCheck() {
+        if (mfLoginController::isLoggedIn()) {
+            $user = new User();
+            $user->loadMe();
+
+            if ($user->id) {
+                self::returnJson([
+                    'authenticated' => true,
+                    'user' => [
+                        'id' => $user->id,
+                        'name' => $user->name,
+                        'username' => $user->username,
+                    ]
+                ]);
+                return;
+            }
+        }
+
+        UserToken::checkToken();
+
+        if (isset($_SESSION[MFAPPNAME . '_username']) && $_SESSION[MFAPPNAME . '_username']) {
+            $user = new User();
+            $user->loadMe();
+
+            if ($user->id) {
+                self::returnJson([
+                    'authenticated' => true,
+                    'user' => [
+                        'id' => $user->id,
+                        'name' => $user->name,
+                        'username' => $user->username,
+                    ]
+                ]);
+                return;
+            }
+        }
+
+        self::returnJson(['authenticated' => false]);
+    }
+
+    /**
+     * Handle API calls to module endpoints
+     * /MobileApp/{module}/{submodule}/{endpoint}
+     */
+    protected function handleApiCall($module, $submodule, $endpoint) {
+        // Normalize names
+        $moduleName = ucfirst(strtolower($module));
+        $submoduleName = ucfirst(strtolower($submodule));
+
+        // Check authentication for API calls
+        if (!$this->user || !$this->user->id) {
+            self::returnJson(['success' => false, 'error' => 'Not authenticated'], 401);
+            return;
+        }
+
+        // Build handler path
+        $handlerFile = APPDIR . "MobileApp/Modules/{$moduleName}/{$submoduleName}/{$submoduleName}Handler.php";
+
+        if (!file_exists($handlerFile)) {
+            self::returnJson(['success' => false, 'error' => "Module not found: {$moduleName}/{$submoduleName}"], 404);
+            return;
+        }
+
+        require_once $handlerFile;
+
+        $handlerClass = "{$submoduleName}Handler";
+
+        if (!class_exists($handlerClass)) {
+            self::returnJson(['success' => false, 'error' => "Handler class not found"], 500);
+            return;
+        }
+
+        $handler = new $handlerClass($this->request, $this->user, $this);
+
+        // Check permissions
+        if (!$handler->checkPermission()) {
+            self::returnJson(['success' => false, 'error' => 'Permission denied'], 403);
+            return;
+        }
+
+        // Route to method
+        $method = $endpoint . 'Action';
+        if (method_exists($handler, $method)) {
+            return $handler->$method();
+        }
+
+        if (method_exists($handler, $endpoint)) {
+            return $handler->$endpoint();
+        }
+
+        self::returnJson(['success' => false, 'error' => "Endpoint not found: {$endpoint}"], 404);
+    }
+}
diff --git a/application/MobileApp/Modules/Lager/Inventur/InventurHandler.php b/application/MobileApp/Modules/Lager/Inventur/InventurHandler.php
new file mode 100644
index 000000000..75c1b36f3
--- /dev/null
+++ b/application/MobileApp/Modules/Lager/Inventur/InventurHandler.php
@@ -0,0 +1,443 @@
+<?php
+
+require_once APPDIR . 'MobileApp/Shared/MobileAppBaseHandler.php';
+
+/**
+ * Inventur (Stocktake) Handler
+ *
+ * Handles all endpoints for the Lager > Inventur module.
+ * API Base: /MobileApp/Lager/Inventur/{action}
+ */
+class InventurHandler extends MobileAppBaseHandler {
+
+    protected $requiredPermission = 'WarehouseUser';
+
+    /**
+     * Get active stocktakes
+     * GET /MobileApp/Lager/Inventur/getActiveStocktakes
+     */
+    public function getActiveStocktakesAction() {
+        $stocktakes = WarehouseStocktakeModel::getAll(['status' => 'in_progress']);
+
+        $result = [];
+        foreach ($stocktakes as $stocktake) {
+            $location = $stocktake->getLocation();
+            $result[] = [
+                'id' => $stocktake->id,
+                'stocktakeNumber' => $stocktake->stocktakeNumber,
+                'title' => $stocktake->title,
+                'locationName' => $location ? $location->title : 'Unbekannt',
+                'totalScannedItems' => $stocktake->totalScannedItems,
+                'startedAt' => $stocktake->startedAt ? date('d.m.Y H:i', $stocktake->startedAt) : null,
+            ];
+        }
+
+        self::returnJson(['success' => true, 'stocktakes' => $result]);
+    }
+
+    /**
+     * Get stocktake details
+     */
+    public function getStocktakeAction() {
+        $id = intval($this->request->id);
+        if (!$id) {
+            self::returnJson(['success' => false, 'message' => 'Keine Inventur-ID angegeben']);
+            return;
+        }
+
+        $stocktake = WarehouseStocktakeModel::get($id);
+        if (!$stocktake) {
+            self::returnJson(['success' => false, 'message' => 'Inventur nicht gefunden']);
+            return;
+        }
+
+        $location = $stocktake->getLocation();
+
+        self::returnJson([
+            'success' => true,
+            'stocktake' => [
+                'id' => $stocktake->id,
+                'stocktakeNumber' => $stocktake->stocktakeNumber,
+                'title' => $stocktake->title,
+                'status' => $stocktake->status,
+                'locationId' => $stocktake->warehouseLocationId,
+                'locationName' => $location ? $location->title : 'Unbekannt',
+                'totalScannedItems' => $stocktake->totalScannedItems,
+                'startedAt' => $stocktake->startedAt ? date('d.m.Y H:i', $stocktake->startedAt) : null,
+            ]
+        ]);
+    }
+
+    /**
+     * Get article by QR code or article number
+     */
+    public function getArticleAction() {
+        $code = $this->request->code;
+
+        if (!$code) {
+            self::returnJson(['success' => false, 'message' => 'Kein Code angegeben']);
+            return;
+        }
+
+        $articleId = null;
+
+        if (preg_match('/^(?:WA|WH):(\d+):/', $code, $matches)) {
+            $articleId = intval($matches[1]);
+        } else {
+            $article = WarehouseArticleModel::getFirst(['articleNumber' => $code]);
+            if ($article) {
+                $articleId = $article->id;
+            }
+        }
+
+        if (!$articleId) {
+            self::returnJson(['success' => false, 'message' => 'Artikel nicht gefunden']);
+            return;
+        }
+
+        $article = WarehouseArticleModel::get($articleId);
+        if (!$article) {
+            self::returnJson(['success' => false, 'message' => 'Artikel nicht gefunden']);
+            return;
+        }
+
+        $category = WarehouseCategory::get($article->category_id);
+
+        self::returnJson([
+            'success' => true,
+            'article' => [
+                'id' => $article->id,
+                'articleNumber' => $article->articleNumber,
+                'title' => $article->title,
+                'description' => $article->description ?? '',
+                'unit' => $article->unit ?? 'Stk.',
+                'categoryName' => $category ? $category->name : '',
+            ]
+        ]);
+    }
+
+    /**
+     * Search articles
+     */
+    public function searchArticlesAction() {
+        $query = $this->request->query ?? '';
+        $categoryId = intval($this->request->categoryId ?? 0);
+
+        $db = $this->db();
+        $conditions = ["(isEndOfLife IS NULL OR isEndOfLife = 0)"];
+
+        if ($query && strlen($query) >= 2) {
+            $escapedQuery = $db->escape($query);
+            $conditions[] = "(articleNumber LIKE '%{$escapedQuery}%' OR title LIKE '%{$escapedQuery}%' OR description LIKE '%{$escapedQuery}%')";
+        }
+
+        if ($categoryId > 0) {
+            $conditions[] = "category_id = {$categoryId}";
+        }
+
+        if (count($conditions) === 1 && !$categoryId) {
+            self::returnJson(['success' => true, 'articles' => []]);
+            return;
+        }
+
+        $whereClause = implode(' AND ', $conditions);
+        $result = $db->query("SELECT id, articleNumber, title, unit, category_id
+                              FROM WarehouseArticle
+                              WHERE {$whereClause}
+                              ORDER BY title ASC
+                              LIMIT 50");
+
+        $articles = [];
+        while ($row = $result->fetch_assoc()) {
+            $articles[] = [
+                'id' => intval($row['id']),
+                'articleNumber' => $row['articleNumber'],
+                'title' => $row['title'],
+                'unit' => $row['unit'] ?? 'Stk.',
+                'categoryId' => intval($row['category_id'] ?? 0),
+            ];
+        }
+
+        self::returnJson(['success' => true, 'articles' => $articles]);
+    }
+
+    /**
+     * Get categories
+     */
+    public function getCategoriesAction() {
+        $db = $this->db();
+        $res = $db->query("SELECT id, name FROM WarehouseCategory ORDER BY name ASC");
+
+        $categories = [];
+        while ($row = $res->fetch_assoc()) {
+            $categories[] = [
+                'id' => intval($row['id']),
+                'name' => $row['name'],
+            ];
+        }
+        self::returnJson(['success' => true, 'categories' => $categories]);
+    }
+
+    /**
+     * Check if already scanned
+     */
+    public function checkAlreadyScannedAction() {
+        $stocktakeId = intval($this->request->stocktakeId);
+        $articleId = intval($this->request->articleId);
+
+        if (!$stocktakeId || !$articleId) {
+            self::returnJson(['success' => false, 'message' => 'Fehlende Parameter']);
+            return;
+        }
+
+        $existing = WarehouseStocktakeItemModel::getFirst([
+            'stocktakeId' => $stocktakeId,
+            'articleId' => $articleId,
+            'overwrittenById' => null
+        ]);
+
+        if ($existing) {
+            $db = $this->db();
+            $scannedByResult = $db->query("SELECT name FROM Worker WHERE id = {$existing->scannedBy}");
+            $scannedByRow = $scannedByResult->fetch_assoc();
+
+            self::returnJson([
+                'success' => true,
+                'alreadyScanned' => true,
+                'existingItem' => [
+                    'id' => $existing->id,
+                    'countedQuantity' => $existing->countedQuantity,
+                    'scannedAt' => $existing->scannedAt ? date('d.m.Y H:i', $existing->scannedAt) : null,
+                    'scannedBy' => $scannedByRow ? $scannedByRow['name'] : 'Unbekannt',
+                ]
+            ]);
+        } else {
+            self::returnJson(['success' => true, 'alreadyScanned' => false]);
+        }
+    }
+
+    /**
+     * Submit scan
+     */
+    public function submitScanAction() {
+        $postData = $this->getPostData();
+
+        $stocktakeId = intval($postData['stocktakeId'] ?? 0);
+        $articleId = intval($postData['articleId'] ?? 0);
+        $quantity = floatval($postData['quantity'] ?? 0);
+        $rack = $postData['rack'] ?? null;
+        $shelf = $postData['shelf'] ?? null;
+        $note = $postData['note'] ?? null;
+        $overwrite = boolval($postData['overwrite'] ?? false);
+        $overwriteItemId = intval($postData['overwriteItemId'] ?? 0);
+
+        if (!$stocktakeId || !$articleId) {
+            self::returnJson(['success' => false, 'message' => 'Fehlende Parameter']);
+            return;
+        }
+
+        if ($quantity <= 0) {
+            self::returnJson(['success' => false, 'message' => 'Menge muss größer als 0 sein']);
+            return;
+        }
+
+        $stocktake = WarehouseStocktakeModel::get($stocktakeId);
+        if (!$stocktake) {
+            self::returnJson(['success' => false, 'message' => 'Inventur nicht gefunden']);
+            return;
+        }
+
+        if ($stocktake->status !== 'in_progress') {
+            self::returnJson(['success' => false, 'message' => 'Inventur ist nicht aktiv']);
+            return;
+        }
+
+        $article = WarehouseArticleModel::get($articleId);
+        if (!$article) {
+            self::returnJson(['success' => false, 'message' => 'Artikel nicht gefunden']);
+            return;
+        }
+
+        $db = $this->db();
+
+        if ($overwrite && $overwriteItemId) {
+            $db->query("INSERT INTO WarehouseStocktakeItem
+                        (stocktakeId, articleId, countedQuantity, rack, shelf, note, scannedAt, scannedBy, createBy, `create`)
+                        VALUES ({$stocktakeId}, {$articleId}, {$quantity},
+                        " . ($rack ? "'{$db->escape($rack)}'" : "NULL") . ",
+                        " . ($shelf ? "'{$db->escape($shelf)}'" : "NULL") . ",
+                        " . ($note ? "'{$db->escape($note)}'" : "NULL") . ",
+                        " . time() . ", {$this->user->id}, {$this->user->id}, " . time() . ")");
+
+            $itemId = $db->insert_id;
+            $db->query("UPDATE WarehouseStocktakeItem SET overwrittenById = {$itemId} WHERE id = {$overwriteItemId}");
+            $finalQuantity = $quantity;
+
+            WarehouseStocktakeLogModel::log($stocktakeId, 'overwritten', $itemId, [
+                'articleId' => $articleId,
+                'articleNumber' => $article->articleNumber,
+                'articleTitle' => $article->title,
+                'quantity' => $quantity,
+                'overwrittenItemId' => $overwriteItemId,
+            ]);
+
+            $stocktake->updateProgress();
+
+            self::returnJson([
+                'success' => true,
+                'message' => "'{$article->title}' überschrieben ({$quantity} {$article->unit})",
+                'item' => [
+                    'id' => $itemId,
+                    'articleId' => $articleId,
+                    'articleNumber' => $article->articleNumber,
+                    'articleTitle' => $article->title,
+                    'countedQuantity' => $finalQuantity,
+                    'unit' => $article->unit ?? 'Stk.',
+                    'rack' => $rack,
+                    'shelf' => $shelf,
+                    'isOverwrite' => true,
+                ]
+            ]);
+            return;
+        }
+
+        $existing = WarehouseStocktakeItemModel::getFirst([
+            'stocktakeId' => $stocktakeId,
+            'articleId' => $articleId,
+            'overwrittenById' => null
+        ]);
+
+        if ($existing) {
+            $newQuantity = $existing->countedQuantity + $quantity;
+            $db->query("UPDATE WarehouseStocktakeItem SET
+                        countedQuantity = {$newQuantity},
+                        rack = " . ($rack ? "'{$db->escape($rack)}'" : "rack") . ",
+                        shelf = " . ($shelf ? "'{$db->escape($shelf)}'" : "shelf") . ",
+                        scannedAt = " . time() . ",
+                        scannedBy = {$this->user->id}
+                        WHERE id = {$existing->id}");
+
+            $itemId = $existing->id;
+            $finalQuantity = $newQuantity;
+            $isUpdate = true;
+        } else {
+            $db->query("INSERT INTO WarehouseStocktakeItem
+                        (stocktakeId, articleId, countedQuantity, rack, shelf, note, scannedAt, scannedBy, createBy, `create`)
+                        VALUES ({$stocktakeId}, {$articleId}, {$quantity},
+                        " . ($rack ? "'{$db->escape($rack)}'" : "NULL") . ",
+                        " . ($shelf ? "'{$db->escape($shelf)}'" : "NULL") . ",
+                        " . ($note ? "'{$db->escape($note)}'" : "NULL") . ",
+                        " . time() . ", {$this->user->id}, {$this->user->id}, " . time() . ")");
+
+            $itemId = $db->insert_id;
+            $finalQuantity = $quantity;
+            $isUpdate = false;
+        }
+
+        $stocktake->updateProgress();
+
+        WarehouseStocktakeLogModel::log($stocktakeId, 'scanned', $itemId, [
+            'articleId' => $articleId,
+            'articleNumber' => $article->articleNumber,
+            'articleTitle' => $article->title,
+            'quantity' => $quantity,
+            'totalQuantity' => $finalQuantity,
+            'rack' => $rack,
+            'shelf' => $shelf,
+            'isUpdate' => $isUpdate,
+        ]);
+
+        self::returnJson([
+            'success' => true,
+            'message' => $isUpdate
+                ? "Menge für '{$article->title}' erhöht auf {$finalQuantity}"
+                : "'{$article->title}' hinzugefügt ({$quantity} {$article->unit})",
+            'item' => [
+                'id' => $itemId,
+                'articleId' => $articleId,
+                'articleNumber' => $article->articleNumber,
+                'articleTitle' => $article->title,
+                'countedQuantity' => $finalQuantity,
+                'unit' => $article->unit ?? 'Stk.',
+                'rack' => $rack,
+                'shelf' => $shelf,
+                'isUpdate' => $isUpdate,
+            ]
+        ]);
+    }
+
+    /**
+     * Get my scans
+     */
+    public function getMyScansAction() {
+        $stocktakeId = intval($this->request->stocktakeId);
+
+        if (!$stocktakeId) {
+            self::returnJson(['success' => false, 'message' => 'Keine Inventur-ID angegeben']);
+            return;
+        }
+
+        $db = $this->db();
+        $result = $db->query("SELECT si.*, wa.articleNumber, wa.title as articleTitle, wa.unit
+                              FROM WarehouseStocktakeItem si
+                              JOIN WarehouseArticle wa ON wa.id = si.articleId
+                              WHERE si.stocktakeId = {$stocktakeId}
+                              AND si.scannedBy = {$this->user->id}
+                              ORDER BY si.scannedAt DESC
+                              LIMIT 50");
+
+        $items = [];
+        while ($row = $result->fetch_assoc()) {
+            $items[] = [
+                'id' => intval($row['id']),
+                'articleId' => intval($row['articleId']),
+                'articleNumber' => $row['articleNumber'],
+                'articleTitle' => $row['articleTitle'],
+                'countedQuantity' => floatval($row['countedQuantity']),
+                'unit' => $row['unit'] ?? 'Stk.',
+                'rack' => $row['rack'],
+                'shelf' => $row['shelf'],
+                'scannedAt' => $row['scannedAt'] ? date('H:i', $row['scannedAt']) : null,
+            ];
+        }
+
+        self::returnJson(['success' => true, 'items' => $items]);
+    }
+
+    /**
+     * Get progress
+     */
+    public function getProgressAction() {
+        $stocktakeId = intval($this->request->stocktakeId);
+
+        if (!$stocktakeId) {
+            self::returnJson(['success' => false, 'message' => 'Keine Inventur-ID angegeben']);
+            return;
+        }
+
+        $stocktake = WarehouseStocktakeModel::get($stocktakeId);
+        if (!$stocktake) {
+            self::returnJson(['success' => false, 'message' => 'Inventur nicht gefunden']);
+            return;
+        }
+
+        $db = $this->db();
+
+        $totalResult = $db->query("SELECT COUNT(*) as count FROM WarehouseStocktakeItem WHERE stocktakeId = {$stocktakeId}");
+        $totalRow = $totalResult->fetch_assoc();
+        $totalScanned = intval($totalRow['count']);
+
+        $myResult = $db->query("SELECT COUNT(*) as count FROM WarehouseStocktakeItem WHERE stocktakeId = {$stocktakeId} AND scannedBy = {$this->user->id}");
+        $myRow = $myResult->fetch_assoc();
+        $myScanned = intval($myRow['count']);
+
+        self::returnJson([
+            'success' => true,
+            'progress' => [
+                'totalScanned' => $totalScanned,
+                'myScanned' => $myScanned,
+                'status' => $stocktake->status,
+            ]
+        ]);
+    }
+}
diff --git a/application/MobileApp/Modules/Lager/Movement/MovementHandler.php b/application/MobileApp/Modules/Lager/Movement/MovementHandler.php
new file mode 100644
index 000000000..19451ad01
--- /dev/null
+++ b/application/MobileApp/Modules/Lager/Movement/MovementHandler.php
@@ -0,0 +1,346 @@
+<?php
+
+require_once APPDIR . 'MobileApp/Shared/MobileAppBaseHandler.php';
+
+/**
+ * Movement (Stock Movement) Handler
+ *
+ * Handles all endpoints for the Lager > Movement module.
+ * API Base: /MobileApp/Lager/Movement/{action}
+ */
+class MovementHandler extends MobileAppBaseHandler {
+
+    protected $requiredPermission = 'WarehouseUser';
+
+    /**
+     * Get available locations (Office + Außenlager only)
+     * GET /MobileApp/Lager/Movement/getLocations
+     */
+    public function getLocationsAction() {
+        $allLocations = WarehouseLocationModel::getAll();
+        $locations = [];
+
+        foreach ($allLocations as $location) {
+            $title = strtolower($location->title);
+            if ($title === 'k1 fladnitz 150' || $title === 'aussenlager-extern') {
+                $locations[] = [
+                    'id' => $location->id,
+                    'title' => $location->title,
+                ];
+            }
+        }
+
+        self::returnJson(['success' => true, 'locations' => $locations]);
+    }
+
+    /**
+     * Get article by QR code or article number
+     * GET /MobileApp/Lager/Movement/getArticle?code=X
+     */
+    public function getArticleAction() {
+        $code = $this->request->code;
+
+        if (!$code) {
+            self::returnJson(['success' => false, 'message' => 'Kein Code angegeben']);
+            return;
+        }
+
+        $articleId = null;
+
+        // Check for QR code format WA:ID: or WH:ID:
+        if (preg_match('/^(?:WA|WH):(\d+):/', $code, $matches)) {
+            $articleId = intval($matches[1]);
+        } else {
+            // Try to find by article number
+            $article = WarehouseArticleModel::getFirst(['articleNumber' => $code]);
+            if ($article) {
+                $articleId = $article->id;
+            }
+        }
+
+        if (!$articleId) {
+            self::returnJson(['success' => false, 'message' => 'Artikel nicht gefunden']);
+            return;
+        }
+
+        $article = WarehouseArticleModel::get($articleId);
+        if (!$article) {
+            self::returnJson(['success' => false, 'message' => 'Artikel nicht gefunden']);
+            return;
+        }
+
+        $category = WarehouseCategory::get($article->category_id);
+
+        self::returnJson([
+            'success' => true,
+            'article' => [
+                'id' => $article->id,
+                'articleNumber' => $article->articleNumber,
+                'title' => $article->title,
+                'description' => $article->description ?? '',
+                'unit' => $article->unit ?? 'Stk.',
+                'categoryName' => $category ? $category->name : '',
+            ]
+        ]);
+    }
+
+    /**
+     * Search articles
+     * GET /MobileApp/Lager/Movement/searchArticles?query=X
+     */
+    public function searchArticlesAction() {
+        $query = $this->request->query ?? '';
+
+        $db = $this->db();
+        $conditions = ["(isEndOfLife IS NULL OR isEndOfLife = 0)"];
+
+        if ($query && strlen($query) >= 2) {
+            $escapedQuery = $db->escape($query);
+            $conditions[] = "(articleNumber LIKE '%{$escapedQuery}%' OR title LIKE '%{$escapedQuery}%' OR description LIKE '%{$escapedQuery}%')";
+        } else {
+            self::returnJson(['success' => true, 'articles' => []]);
+            return;
+        }
+
+        $whereClause = implode(' AND ', $conditions);
+        $result = $db->query("SELECT id, articleNumber, title, unit, category_id
+                              FROM WarehouseArticle
+                              WHERE {$whereClause}
+                              ORDER BY title ASC
+                              LIMIT 50");
+
+        $articles = [];
+        while ($row = $result->fetch_assoc()) {
+            $articles[] = [
+                'id' => intval($row['id']),
+                'articleNumber' => $row['articleNumber'],
+                'title' => $row['title'],
+                'unit' => $row['unit'] ?? 'Stk.',
+            ];
+        }
+
+        self::returnJson(['success' => true, 'articles' => $articles]);
+    }
+
+    /**
+     * Get reason categories for a movement type
+     * GET /MobileApp/Lager/Movement/getReasonCategories?type=IN|OUT|ADJUSTMENT
+     */
+    public function getReasonCategoriesAction() {
+        $type = $this->request->type ?? null;
+
+        $categories = WarehouseMovementModel::getReasonCategories($type);
+
+        if ($type && is_array($categories)) {
+            $items = [];
+            foreach ($categories as $key => $label) {
+                $items[] = ['value' => $key, 'text' => $label];
+            }
+            self::returnJson(['success' => true, 'categories' => $items]);
+        } else {
+            self::returnJson(['success' => true, 'categories' => $categories]);
+        }
+    }
+
+    /**
+     * Get current stock for an article at a location
+     * GET /MobileApp/Lager/Movement/getCurrentStock?articleId=X&locationId=X
+     */
+    public function getCurrentStockAction() {
+        $articleId = intval($this->request->articleId ?? 0);
+        $locationId = intval($this->request->locationId ?? 0);
+
+        if (!$articleId || !$locationId) {
+            self::returnJson(['success' => true, 'currentStock' => 0]);
+            return;
+        }
+
+        $existingItems = WarehouseItemModel::getAll([
+            'articleId' => $articleId,
+            'warehouseLocationId' => $locationId
+        ]);
+
+        $currentStock = count($existingItems) > 0 ? floatval($existingItems[0]->quantity) : 0;
+
+        self::returnJson(['success' => true, 'currentStock' => $currentStock]);
+    }
+
+    /**
+     * Submit a stock movement
+     * POST /MobileApp/Lager/Movement/submitMovement
+     */
+    public function submitMovementAction() {
+        $postData = $this->getPostData();
+
+        $movementType = $postData['movementType'] ?? '';
+        $articleId = intval($postData['articleId'] ?? 0);
+        $locationId = intval($postData['locationId'] ?? 0);
+        $quantity = floatval($postData['quantity'] ?? 0);
+        $reasonCategory = $postData['reasonCategory'] ?? '';
+        $note = $postData['note'] ?? null;
+
+        // Validate required fields
+        if (!in_array($movementType, ['IN', 'OUT', 'ADJUSTMENT'])) {
+            self::returnJson(['success' => false, 'message' => 'Ungültiger Bewegungstyp']);
+            return;
+        }
+
+        if ($articleId <= 0) {
+            self::returnJson(['success' => false, 'message' => 'Kein Artikel ausgewählt']);
+            return;
+        }
+
+        if ($locationId <= 0) {
+            self::returnJson(['success' => false, 'message' => 'Kein Lagerort ausgewählt']);
+            return;
+        }
+
+        if ($quantity <= 0) {
+            self::returnJson(['success' => false, 'message' => 'Menge muss größer als 0 sein']);
+            return;
+        }
+
+        if (empty($reasonCategory)) {
+            self::returnJson(['success' => false, 'message' => 'Bitte Grund auswählen']);
+            return;
+        }
+
+        // Get article info
+        $article = WarehouseArticleModel::get($articleId);
+        if (!$article) {
+            self::returnJson(['success' => false, 'message' => 'Artikel nicht gefunden']);
+            return;
+        }
+
+        $db = $this->db();
+
+        // Find or create WarehouseItem for this article at this location
+        $existingItems = WarehouseItemModel::getAll([
+            'articleId' => $articleId,
+            'warehouseLocationId' => $locationId
+        ]);
+
+        $warehouseItem = count($existingItems) > 0 ? $existingItems[0] : null;
+        $currentQty = $warehouseItem ? floatval($warehouseItem->quantity) : 0;
+
+        // Calculate new quantity based on movement type
+        // Note: Negative stock is allowed (items can be taken out even if stock is 0)
+        switch ($movementType) {
+            case 'IN':
+                $newQty = $currentQty + $quantity;
+                break;
+            case 'OUT':
+                $newQty = $currentQty - $quantity;
+                // Negative stock is allowed - no validation needed
+                break;
+            case 'ADJUSTMENT':
+                // For adjustment, quantity is the new absolute value
+                $newQty = $quantity;
+                break;
+            default:
+                $newQty = $currentQty;
+        }
+
+        // Update or create WarehouseItem
+        $warehouseItemId = null;
+        if ($warehouseItem) {
+            $db->query("UPDATE WarehouseItem SET quantity = {$newQty} WHERE id = {$warehouseItem->id}");
+            $warehouseItemId = $warehouseItem->id;
+        } else {
+            $db->query("INSERT INTO WarehouseItem (articleId, warehouseLocationId, quantity, createBy, `create`)
+                        VALUES ({$articleId}, {$locationId}, {$newQty}, {$this->user->id}, " . time() . ")");
+            $warehouseItemId = $db->insert_id;
+        }
+
+        // Create the movement record
+        $noteEscaped = $note ? "'" . $db->escape($note) . "'" : "NULL";
+        $db->query("INSERT INTO WarehouseMovement
+                    (movementType, articleId, warehouseLocationId, warehouseItemId, quantity, quantityBefore, quantityAfter, reasonCategory, note, userId, createBy, `create`)
+                    VALUES ('{$movementType}', {$articleId}, {$locationId}, {$warehouseItemId}, {$quantity}, {$currentQty}, {$newQty}, '{$db->escape($reasonCategory)}', {$noteEscaped}, {$this->user->id}, {$this->user->id}, " . time() . ")");
+
+        $movementId = $db->insert_id;
+
+        // Generate movement number
+        $movementNumber = WarehouseMovementModel::generateMovementNumber();
+        $db->query("UPDATE WarehouseMovement SET movementNumber = '{$movementNumber}' WHERE id = {$movementId}");
+
+        // Get type label for message
+        $typeLabels = ['IN' => 'Einbuchung', 'OUT' => 'Ausbuchung', 'ADJUSTMENT' => 'Korrektur'];
+        $typeLabel = $typeLabels[$movementType] ?? $movementType;
+
+        self::returnJson([
+            'success' => true,
+            'message' => "{$typeLabel} erfolgreich: {$quantity} x {$article->title}",
+            'movement' => [
+                'id' => $movementId,
+                'movementNumber' => $movementNumber,
+                'movementType' => $movementType,
+                'articleId' => $articleId,
+                'articleTitle' => $article->title,
+                'quantity' => $quantity,
+                'quantityBefore' => $currentQty,
+                'quantityAfter' => $newQty,
+            ]
+        ]);
+    }
+
+    /**
+     * Get recent movements by current user
+     * GET /MobileApp/Lager/Movement/getMyMovements
+     */
+    public function getMyMovementsAction() {
+        $locationId = intval($this->request->locationId ?? 0);
+        $limit = intval($this->request->limit ?? 20);
+
+        $db = $this->db();
+
+        $whereClause = "m.userId = {$this->user->id}";
+        if ($locationId > 0) {
+            $whereClause .= " AND m.warehouseLocationId = {$locationId}";
+        }
+
+        $result = $db->query("SELECT m.*, wa.articleNumber, wa.title as articleTitle, wa.unit, wl.title as locationTitle
+                              FROM WarehouseMovement m
+                              LEFT JOIN WarehouseArticle wa ON wa.id = m.articleId
+                              LEFT JOIN WarehouseLocation wl ON wl.id = m.warehouseLocationId
+                              WHERE {$whereClause}
+                              ORDER BY m.`create` DESC
+                              LIMIT {$limit}");
+
+        $movements = [];
+        while ($row = $result->fetch_assoc()) {
+            $movements[] = [
+                'id' => intval($row['id']),
+                'movementNumber' => $row['movementNumber'],
+                'movementType' => $row['movementType'],
+                'articleId' => intval($row['articleId']),
+                'articleNumber' => $row['articleNumber'],
+                'articleTitle' => $row['articleTitle'],
+                'unit' => $row['unit'] ?? 'Stk.',
+                'locationTitle' => $row['locationTitle'],
+                'quantity' => floatval($row['quantity']),
+                'quantityBefore' => floatval($row['quantityBefore']),
+                'quantityAfter' => floatval($row['quantityAfter']),
+                'reasonCategory' => $row['reasonCategory'],
+                'note' => $row['note'],
+                'create' => date('d.m.Y H:i', $row['create']),
+            ];
+        }
+
+        self::returnJson(['success' => true, 'movements' => $movements]);
+    }
+
+    /**
+     * Get movement types with labels
+     * GET /MobileApp/Lager/Movement/getMovementTypes
+     */
+    public function getMovementTypesAction() {
+        $types = [
+            ['value' => 'IN', 'text' => 'Einbuchung', 'icon' => 'plus-circle', 'color' => 'green'],
+            ['value' => 'OUT', 'text' => 'Ausbuchung', 'icon' => 'minus-circle', 'color' => 'red'],
+            ['value' => 'ADJUSTMENT', 'text' => 'Korrektur', 'icon' => 'edit', 'color' => 'yellow'],
+        ];
+
+        self::returnJson(['success' => true, 'types' => $types]);
+    }
+}
diff --git a/application/MobileApp/Shared/MobileAppBaseHandler.php b/application/MobileApp/Shared/MobileAppBaseHandler.php
new file mode 100644
index 000000000..508d77e7d
--- /dev/null
+++ b/application/MobileApp/Shared/MobileAppBaseHandler.php
@@ -0,0 +1,113 @@
+<?php
+
+/**
+ * Base Handler for Mobile App endpoints
+ *
+ * All app handlers should extend this class.
+ * Provides common functionality for authentication, permissions, and responses.
+ */
+abstract class MobileAppBaseHandler {
+
+    /** @var object Request object */
+    protected $request;
+
+    /** @var User|null Current user */
+    protected $user;
+
+    /** @var MobileAppController Parent controller */
+    protected $controller;
+
+    /** @var string Required permission for this app (override in subclass) */
+    protected $requiredPermission = null;
+
+    /** @var string App name (used for view rendering) */
+    protected $appName = '';
+
+    /** @var string View template path */
+    protected $viewTemplate = '';
+
+    /**
+     * Constructor
+     */
+    public function __construct($request, $user, $controller) {
+        $this->request = $request;
+        $this->user = $user;
+        $this->controller = $controller;
+    }
+
+    /**
+     * Check if user has required permission
+     * @return bool
+     */
+    public function checkPermission() {
+        // If no permission required, allow access
+        if (!$this->requiredPermission) {
+            return true;
+        }
+
+        // If no user, deny access
+        if (!$this->user || !$this->user->id) {
+            return false;
+        }
+
+        // Check permission
+        return $this->user->can($this->requiredPermission);
+    }
+
+    /**
+     * Render the app view
+     * Override in subclass if custom rendering needed
+     */
+    public function renderView() {
+        $layout = $this->controller->layout();
+
+        // Set template
+        if ($this->viewTemplate) {
+            $layout->setTemplate($this->viewTemplate);
+        } else {
+            $layout->setTemplate("MobileApp/{$this->appName}");
+        }
+
+        // Set default JS globals
+        $layout->set("JSGlobals", $this->getJSGlobals());
+    }
+
+    /**
+     * Get JS globals to pass to frontend
+     * Override in subclass to add app-specific globals
+     */
+    protected function getJSGlobals() {
+        $globals = [
+            'BASE_PATH' => '/MobileApp/' . $this->appName,
+            'APP_NAME' => $this->appName,
+        ];
+
+        if ($this->user && $this->user->id) {
+            $globals['USER_ID'] = $this->user->id;
+            $globals['USER_NAME'] = $this->user->name;
+        }
+
+        return $globals;
+    }
+
+    /**
+     * Return JSON response (shorthand)
+     */
+    protected static function returnJson($data, $statusCode = 200) {
+        mfBaseController::returnJson($data, $statusCode);
+    }
+
+    /**
+     * Get POST data from JSON body
+     */
+    protected function getPostData() {
+        return json_decode(file_get_contents('php://input'), true) ?? [];
+    }
+
+    /**
+     * Get database instance
+     */
+    protected function db() {
+        return FronkDB::singleton();
+    }
+}
diff --git a/application/WarehouseMovement/WarehouseMovementController.php b/application/WarehouseMovement/WarehouseMovementController.php
new file mode 100644
index 000000000..df04de7a9
--- /dev/null
+++ b/application/WarehouseMovement/WarehouseMovementController.php
@@ -0,0 +1,258 @@
+<?php
+
+class WarehouseMovementController extends TTCrud {
+    protected string $headerTitle = 'Lagerbewegung';
+    protected string $createText = 'Bewegung erstellen';
+    protected bool $reopenOnCreate = true;
+
+    protected array $columns = [
+        ['key' => 'movementNumber', 'text' => 'Bewegungs-Nr.', 'required' => false,
+         'modal' => false,
+         'table' => ['priority' => 10]],
+        ['key' => 'movementType', 'text' => 'Typ', 'required' => true,
+         'modal' => ['type' => 'select', 'items' => []],
+         'table' => ['priority' => 9, 'filter' => 'iconSelect', 'filterOptions' => [
+             ['value' => 'IN', 'text' => 'Einbuchung', 'icon' => 'fas fa-plus-circle text-success'],
+             ['value' => 'OUT', 'text' => 'Ausbuchung', 'icon' => 'fas fa-minus-circle text-danger'],
+             ['value' => 'ADJUSTMENT', 'text' => 'Korrektur', 'icon' => 'fas fa-edit text-warning'],
+         ]]],
+        ['key' => 'articleId', 'text' => 'Artikel', 'required' => true,
+         'modal' => ['type' => 'articleSelect'],
+         'table' => ['priority' => 8, 'sortable' => false, 'filter' => 'text']],
+        ['key' => 'warehouseLocationId', 'text' => 'Lagerort', 'required' => true,
+         'modal' => ['type' => 'select', 'items' => []],
+         'table' => ['priority' => 7, 'filter' => 'select']],
+        ['key' => 'quantity', 'text' => 'Menge', 'required' => true,
+         'modal' => ['type' => 'number', 'step' => '0.01', 'min' => '0.01'],
+         'table' => ['priority' => 6, 'filter' => false]],
+        ['key' => 'quantityBefore', 'text' => 'Bestand vorher', 'required' => false,
+         'modal' => false,
+         'table' => ['priority' => 5, 'filter' => false]],
+        ['key' => 'quantityAfter', 'text' => 'Bestand nachher', 'required' => false,
+         'modal' => false,
+         'table' => ['priority' => 4, 'filter' => false]],
+        ['key' => 'reasonCategory', 'text' => 'Grund', 'required' => true,
+         'modal' => ['type' => 'select', 'items' => [], 'dependsOn' => 'movementType'],
+         'table' => ['priority' => 3, 'filter' => false]],
+        ['key' => 'note', 'text' => 'Notiz', 'required' => false,
+         'modal' => ['type' => 'textarea'],
+         'table' => ['priority' => 2, 'filter' => false]],
+        ['key' => 'create', 'text' => 'Erstellt', 'required' => false,
+         'modal' => false,
+         'table' => ['priority' => 1, 'filter' => 'dateRange']],
+    ];
+
+    protected array $additionalActions = [];
+
+    protected array $permissionCheck = ['WarehouseUser'];
+
+    protected array $infoMessages = [
+        'create' => 'Lagerbewegung wurde erstellt',
+        'update' => 'Lagerbewegung wurde aktualisiert',
+        'delete' => 'Lagerbewegung wurde gelöscht',
+        'noChanges' => 'Keine Änderungen',
+    ];
+
+    public function prepareCrudConfig() {
+        // Populate movement type dropdown
+        $movementTypes = [
+            ['value' => 'IN', 'text' => 'Einbuchung'],
+            ['value' => 'OUT', 'text' => 'Ausbuchung'],
+            ['value' => 'ADJUSTMENT', 'text' => 'Korrektur'],
+        ];
+
+        // Populate locations dropdown (Office + Außenlager only)
+        $allLocations = WarehouseLocationModel::getAll();
+        $locations = [];
+        foreach ($allLocations as $location) {
+            $title = strtolower($location->title);
+            if ($title === 'k1 fladnitz 150' || $title === 'aussenlager-extern') {
+                $locations[] = ['value' => $location->id, 'text' => $location->title];
+            }
+        }
+
+        // Get all reason categories for initial load
+        $allReasons = WarehouseMovementModel::getReasonCategories();
+        $reasonItems = [];
+        foreach ($allReasons as $type => $categories) {
+            foreach ($categories as $key => $label) {
+                $reasonItems[] = ['value' => $key, 'text' => $label, 'group' => $type];
+            }
+        }
+
+        foreach ($this->columns as &$col) {
+            if ($col['key'] === 'movementType') {
+                $col['modal']['items'] = $movementTypes;
+            }
+            if ($col['key'] === 'warehouseLocationId') {
+                $col['modal']['items'] = $locations;
+                $col['table']['filterOptions'] = $locations;
+            }
+            if ($col['key'] === 'reasonCategory') {
+                $col['modal']['items'] = $reasonItems;
+            }
+        }
+
+        $this->additionalJSVariables['REASON_CATEGORIES'] = $allReasons;
+    }
+
+    protected function beforeCreate(): bool {
+        // Validate required fields
+        $movementType = $this->postData['movementType'] ?? '';
+        $articleId = intval($this->postData['articleId'] ?? 0);
+        $locationId = intval($this->postData['warehouseLocationId'] ?? 0);
+        $quantity = floatval($this->postData['quantity'] ?? 0);
+
+        if (!in_array($movementType, ['IN', 'OUT', 'ADJUSTMENT'])) {
+            $this->returnJson(['success' => false, 'message' => 'Ungültiger Bewegungstyp']);
+            return false;
+        }
+
+        if ($articleId <= 0) {
+            $this->returnJson(['success' => false, 'message' => 'Kein Artikel ausgewählt']);
+            return false;
+        }
+
+        if ($locationId <= 0) {
+            $this->returnJson(['success' => false, 'message' => 'Kein Lagerort ausgewählt']);
+            return false;
+        }
+
+        if ($quantity <= 0) {
+            $this->returnJson(['success' => false, 'message' => 'Menge muss größer als 0 sein']);
+            return false;
+        }
+
+        // Find or create WarehouseItem for this article at this location
+        $db = FronkDB::singleton();
+        $existingItems = WarehouseItemModel::getAll([
+            'articleId' => $articleId,
+            'warehouseLocationId' => $locationId
+        ]);
+
+        $warehouseItem = count($existingItems) > 0 ? $existingItems[0] : null;
+        $currentQty = $warehouseItem ? floatval($warehouseItem->quantity) : 0;
+
+        // Calculate new quantity based on movement type
+        // Note: Negative stock is allowed (items can be taken out even if stock is 0)
+        switch ($movementType) {
+            case 'IN':
+                $newQty = $currentQty + $quantity;
+                break;
+            case 'OUT':
+                $newQty = $currentQty - $quantity;
+                // Negative stock is allowed - no validation needed
+                break;
+            case 'ADJUSTMENT':
+                // For adjustment, quantity is the new absolute value
+                $newQty = $quantity;
+                break;
+            default:
+                $newQty = $currentQty;
+        }
+
+        // Store before/after quantities
+        $this->postData['quantityBefore'] = $currentQty;
+        $this->postData['quantityAfter'] = $newQty;
+        $this->postData['userId'] = $this->user->id;
+
+        // Update or create WarehouseItem
+        if ($warehouseItem) {
+            $db->query("UPDATE WarehouseItem SET quantity = {$newQty} WHERE id = {$warehouseItem->id}");
+            $this->postData['warehouseItemId'] = $warehouseItem->id;
+        } else {
+            $db->query("INSERT INTO WarehouseItem (articleId, warehouseLocationId, quantity, createBy, `create`)
+                        VALUES ({$articleId}, {$locationId}, {$newQty}, {$this->user->id}, " . time() . ")");
+            $this->postData['warehouseItemId'] = $db->insert_id();
+        }
+
+        return true;
+    }
+
+    protected function afterCreate($postData) {
+        // Generate movement number
+        $movement = WarehouseMovementModel::get($postData['id']);
+        if ($movement) {
+            $movementNumber = WarehouseMovementModel::generateMovementNumber();
+            $db = FronkDB::singleton();
+            $db->query("UPDATE WarehouseMovement SET movementNumber = '{$movementNumber}' WHERE id = {$movement->id}");
+        }
+    }
+
+    protected function customRowsHandler($rows) {
+        return array_map(fn($row) => $this->formatRow((array)$row), $rows);
+    }
+
+    protected function formatRow($row) {
+        // Format movement type with badge
+        $typeLabels = [
+            'IN' => '<span class="badge bg-success">Einbuchung</span>',
+            'OUT' => '<span class="badge bg-danger">Ausbuchung</span>',
+            'ADJUSTMENT' => '<span class="badge bg-warning">Korrektur</span>',
+        ];
+        $row['movementType'] = $typeLabels[$row['movementType']] ?? $row['movementType'];
+
+        // Format article
+        if (!empty($row['articleId'])) {
+            $article = ArticleModel::get($row['articleId']);
+            if ($article) {
+                $row['articleId'] = "<strong>{$article->articleNumber}</strong><br><small class='text-muted'>{$article->title}</small>";
+            }
+        }
+
+        // Format quantities
+        $row['quantityBefore'] = $row['quantityBefore'] !== null ? number_format((float)$row['quantityBefore'], 2, ',', '.') : '-';
+        $row['quantityAfter'] = $row['quantityAfter'] !== null ? number_format((float)$row['quantityAfter'], 2, ',', '.') : '-';
+        $row['quantity'] = number_format((float)$row['quantity'], 2, ',', '.');
+
+        // Format reason category
+        $row['reasonCategory'] = WarehouseMovementModel::getReasonCategories()[$row['movementType']][$row['reasonCategory']] ?? $row['reasonCategory'];
+
+        // Format create date
+        if (!empty($row['create'])) {
+            $row['create'] = date('d.m.Y H:i', $row['create']);
+        }
+
+        return $row;
+    }
+
+    /**
+     * Get reason categories for a specific movement type
+     */
+    protected function getReasonCategoriesAction() {
+        $type = $this->request->type ?? null;
+        $categories = WarehouseMovementModel::getReasonCategories($type);
+
+        if ($type && is_array($categories)) {
+            $items = [];
+            foreach ($categories as $key => $label) {
+                $items[] = ['value' => $key, 'text' => $label];
+            }
+            self::returnJson(['success' => true, 'categories' => $items]);
+        } else {
+            self::returnJson(['success' => true, 'categories' => $categories]);
+        }
+    }
+
+    /**
+     * Get current stock for an article at a location
+     */
+    protected function getCurrentStockAction() {
+        $articleId = intval($this->request->articleId ?? 0);
+        $locationId = intval($this->request->locationId ?? 0);
+
+        if (!$articleId || !$locationId) {
+            self::returnJson(['success' => false, 'currentStock' => 0]);
+            return;
+        }
+
+        $existingItems = WarehouseItemModel::getAll([
+            'articleId' => $articleId,
+            'warehouseLocationId' => $locationId
+        ]);
+
+        $currentStock = count($existingItems) > 0 ? floatval($existingItems[0]->quantity) : 0;
+
+        self::returnJson(['success' => true, 'currentStock' => $currentStock]);
+    }
+}
diff --git a/application/WarehouseMovement/WarehouseMovementModel.php b/application/WarehouseMovement/WarehouseMovementModel.php
new file mode 100644
index 000000000..23cfd4407
--- /dev/null
+++ b/application/WarehouseMovement/WarehouseMovementModel.php
@@ -0,0 +1,137 @@
+<?php
+
+class WarehouseMovementModel extends TTCrudBaseModel {
+    public int $id;
+    public ?string $movementNumber = null;
+    public string $movementType;
+    public int $articleId;
+    public int $warehouseLocationId;
+    public ?int $warehouseItemId = null;
+    public float $quantity;
+    public ?float $quantityBefore = null;
+    public ?float $quantityAfter = null;
+    public string $reasonCategory;
+    public ?string $note = null;
+    public int $userId;
+    public int $createBy;
+    public int $create;
+
+    /**
+     * Generate next movement number (WM-YYYY-X000001)
+     */
+    public static function generateMovementNumber(): string {
+        $year = date('Y');
+        $prefix = "WM-{$year}-X";
+
+        $db = FronkDB::singleton();
+        $result = $db->query("SELECT movementNumber FROM WarehouseMovement
+                              WHERE movementNumber LIKE '{$prefix}%'
+                              ORDER BY movementNumber DESC LIMIT 1");
+
+        if ($row = $result->fetch_assoc()) {
+            $lastNumber = intval(substr($row['movementNumber'], -6));
+            $nextNumber = $lastNumber + 1;
+        } else {
+            $nextNumber = 1;
+        }
+
+        return $prefix . str_pad((string)$nextNumber, 6, '0', STR_PAD_LEFT);
+    }
+
+    /**
+     * Get reason categories for a movement type
+     */
+    public static function getReasonCategories(?string $type = null): array {
+        $categories = [
+            'IN' => [
+                'Warenlieferung' => 'Warenlieferung',
+                'Rueckgabe' => 'Rückgabe',
+                'Gefunden' => 'Gefunden/Inventurdifferenz',
+                'UmlagerungEingang' => 'Umlagerung (Eingang)',
+                'Erstbestand' => 'Erstbestand',
+                'Sonstiges' => 'Sonstiges'
+            ],
+            'OUT' => [
+                'Verbrauch' => 'Verbrauch',
+                'Beschaedigung' => 'Beschädigung/Defekt',
+                'Verlust' => 'Verlust/Schwund',
+                'UmlagerungAusgang' => 'Umlagerung (Ausgang)',
+                'Entsorgung' => 'Entsorgung',
+                'Sonstiges' => 'Sonstiges'
+            ],
+            'ADJUSTMENT' => [
+                'Inventurkorrektur' => 'Inventurkorrektur',
+                'Buchungsfehler' => 'Buchungsfehler',
+                'Systemkorrektur' => 'Systemkorrektur',
+                'SonstigeKorrektur' => 'Sonstige Korrektur'
+            ]
+        ];
+
+        if ($type && isset($categories[$type])) {
+            return $categories[$type];
+        }
+
+        return $categories;
+    }
+
+    /**
+     * Get movement type labels
+     */
+    public static function getMovementTypes(): array {
+        return [
+            'IN' => 'Einbuchung',
+            'OUT' => 'Ausbuchung',
+            'ADJUSTMENT' => 'Korrektur'
+        ];
+    }
+
+    /**
+     * Get article object
+     */
+    public function getArticle(): ?ArticleModel {
+        return ArticleModel::get($this->articleId);
+    }
+
+    /**
+     * Get location object
+     */
+    public function getLocation(): ?WarehouseLocationModel {
+        return WarehouseLocationModel::get($this->warehouseLocationId);
+    }
+
+    /**
+     * Get user who made the movement
+     */
+    public function getUser(): ?UserModel {
+        return UserModel::get($this->userId);
+    }
+
+    /**
+     * Get warehouse item if linked
+     */
+    public function getWarehouseItem(): ?WarehouseItemModel {
+        if (!$this->warehouseItemId) return null;
+        return WarehouseItemModel::get($this->warehouseItemId);
+    }
+
+    /**
+     * Get formatted movement type label
+     */
+    public function getMovementTypeLabel(): string {
+        $types = self::getMovementTypes();
+        return $types[$this->movementType] ?? $this->movementType;
+    }
+
+    /**
+     * Get formatted reason category label
+     */
+    public function getReasonCategoryLabel(): string {
+        $allCategories = self::getReasonCategories();
+        foreach ($allCategories as $typeCategories) {
+            if (isset($typeCategories[$this->reasonCategory])) {
+                return $typeCategories[$this->reasonCategory];
+            }
+        }
+        return $this->reasonCategory;
+    }
+}
diff --git a/db/migrations/20260113130000_create_warehouse_lagerbewegung.php b/db/migrations/20260113130000_create_warehouse_lagerbewegung.php
new file mode 100644
index 000000000..fea8726bf
--- /dev/null
+++ b/db/migrations/20260113130000_create_warehouse_lagerbewegung.php
@@ -0,0 +1,42 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class CreateWarehouseLagerbewegung extends AbstractMigration
+{
+    public function up(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            $lagerbewegung = $this->table('WarehouseLagerbewegung');
+            $lagerbewegung
+                ->addColumn('movementNumber', 'string', ['limit' => 50, 'null' => true])
+                ->addColumn('movementType', 'enum', ['values' => ['IN', 'OUT', 'ADJUSTMENT']])
+                ->addColumn('articleId', 'integer', ['signed' => false])
+                ->addColumn('warehouseLocationId', 'integer', ['signed' => true])
+                ->addColumn('warehouseItemId', 'integer', ['null' => true, 'signed' => true])
+                ->addColumn('quantity', 'decimal', ['precision' => 10, 'scale' => 2])
+                ->addColumn('quantityBefore', 'decimal', ['precision' => 10, 'scale' => 2, 'null' => true])
+                ->addColumn('quantityAfter', 'decimal', ['precision' => 10, 'scale' => 2, 'null' => true])
+                ->addColumn('reasonCategory', 'string', ['limit' => 50])
+                ->addColumn('note', 'text', ['null' => true])
+                ->addColumn('userId', 'integer', ['signed' => false])
+                ->addColumn('createBy', 'integer', ['signed' => false])
+                ->addColumn('create', 'integer')
+                ->addIndex(['movementNumber'], ['unique' => true])
+                ->addIndex(['articleId'])
+                ->addIndex(['warehouseLocationId'])
+                ->addIndex(['movementType'])
+                ->addIndex(['userId'])
+                ->addIndex(['create'])
+                ->create();
+        }
+    }
+
+    public function down(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            $this->table('WarehouseLagerbewegung')->drop()->save();
+        }
+    }
+}
diff --git a/db/migrations/20260113140000_rename_lagerbewegung_to_movement.php b/db/migrations/20260113140000_rename_lagerbewegung_to_movement.php
new file mode 100644
index 000000000..b368d3754
--- /dev/null
+++ b/db/migrations/20260113140000_rename_lagerbewegung_to_movement.php
@@ -0,0 +1,21 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class RenameLagerbewegungToMovement extends AbstractMigration
+{
+    public function up(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            $this->table('WarehouseLagerbewegung')->rename('WarehouseMovement')->save();
+        }
+    }
+
+    public function down(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            $this->table('WarehouseMovement')->rename('WarehouseLagerbewegung')->save();
+        }
+    }
+}
diff --git a/public/.htaccess b/public/.htaccess
index efdafabbc..7485068b2 100644
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -25,6 +25,32 @@ RewriteCond %{REQUEST_FILENAME} !-l
 RewriteRule ^api/(v\d+)/([^/]+)(/.+)$ index.php?action=Api&apiv=$1&apicall=$2&apiparams=$3 [QSA]
 
 
+# MobileApp routing: /MobileApp/{module}/{submodule}/{action}
+# Example: /MobileApp/Lager/Inventur/getActiveStocktakes
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond %{REQUEST_FILENAME} !-l
+RewriteRule ^MobileApp/([^/]+)/([^/]+)/([^/]+)/?$ index.php?action=MobileApp&module=$1&submodule=$2&endpoint=$3 [QSA,L]
+
+# /MobileApp/{module}/{submodule} - e.g., /MobileApp/Lager/Inventur
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond %{REQUEST_FILENAME} !-l
+RewriteRule ^MobileApp/([^/]+)/([^/]+)/?$ index.php?action=MobileApp&module=$1&submodule=$2 [QSA,L]
+
+# /MobileApp/{module} - e.g., /MobileApp/auth or /MobileApp/Lager
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond %{REQUEST_FILENAME} !-l
+RewriteRule ^MobileApp/([^/]+)/?$ index.php?action=MobileApp&module=$1 [QSA,L]
+
+# /MobileApp - Main app
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond %{REQUEST_FILENAME} !-l
+RewriteRule ^MobileApp/?$ index.php?action=MobileApp [QSA,L]
+
+
 # regular web calls
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
diff --git a/public/mobile/app.js b/public/mobile/app.js
new file mode 100644
index 000000000..537c82703
--- /dev/null
+++ b/public/mobile/app.js
@@ -0,0 +1,581 @@
+/**
+ * MobileApp PWA - Main Vue Application
+ *
+ * Unified mobile app with module navigation.
+ * Routes: /MobileApp -> Home, /MobileApp/Lager -> Module, /MobileApp/Lager/Inventur -> Submodule
+ */
+
+import { authState, checkAuth, login, logout } from '/mobile/shared/auth.js';
+import LoginScreen from '/mobile/components/LoginScreen.js';
+import MainMenu from '/mobile/components/MainMenu.js';
+import LagerModule from '/mobile/modules/lager/LagerModule.js';
+
+const { createApp, ref, computed, onMounted, onUnmounted, watch } = Vue;
+
+// Check if running as installed PWA
+const isPWAInstalled = () => {
+    // Check display-mode standalone (Android Chrome, desktop)
+    if (window.matchMedia('(display-mode: standalone)').matches) return true;
+    // Check iOS Safari standalone mode
+    if (window.navigator.standalone === true) return true;
+    // Check if launched from TWA (Trusted Web Activity)
+    if (document.referrer.includes('android-app://')) return true;
+    return false;
+};
+
+// Check if we should require PWA installation
+const shouldRequirePWA = () => {
+    const hostname = window.location.hostname;
+    // Only require PWA on production domain
+    return hostname === 'thetool.xinon.at';
+};
+
+// Parse initial path from config
+const parseInitialRoute = () => {
+    const initialPath = window.TT_CONFIG?.INITIAL_PATH || '/MobileApp';
+    const parts = initialPath.replace('/MobileApp', '').split('/').filter(Boolean);
+    return {
+        module: parts[0] || null,
+        submodule: parts[1] || null
+    };
+};
+
+const App = {
+    components: {
+        LoginScreen,
+        MainMenu,
+        LagerModule
+    },
+
+    setup() {
+        // ==================== STATE ====================
+        const currentView = ref('loading');
+        const user = ref(null);
+        const toast = ref({ show: false, message: '', type: 'success' });
+        const theme = ref('system');
+        const showSettings = ref(false);
+
+        // Module-specific settings
+        const lagerSimpleMode = ref(false);
+
+        // Navigation state
+        const currentModule = ref(null);
+        const currentSubmodule = ref(null);
+
+        // PWA Install state
+        const showInstallPrompt = ref(false);
+        const deferredInstallPrompt = ref(null);
+        const isIOS = ref(/iPad|iPhone|iPod/.test(navigator.userAgent));
+        const isAndroid = ref(/Android/.test(navigator.userAgent));
+
+        // Can go back?
+        const canGoBack = computed(() => currentModule.value !== null);
+
+        // ==================== THEME ====================
+        const applyTheme = () => {
+            const isDark = localStorage.theme === 'dark' ||
+                (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches);
+            document.documentElement.classList.toggle('dark', isDark);
+
+            const metaThemeColor = document.querySelector('meta[name="theme-color"]');
+            if (metaThemeColor) {
+                metaThemeColor.setAttribute('content', isDark ? '#0f172a' : '#005384');
+            }
+        };
+
+        const setTheme = (newTheme) => {
+            theme.value = newTheme;
+            if (newTheme === 'system') {
+                localStorage.removeItem('theme');
+            } else {
+                localStorage.setItem('theme', newTheme);
+            }
+            applyTheme();
+        };
+
+        // ==================== PWA INSTALL ====================
+        const handleInstallPrompt = (e) => {
+            // Prevent Chrome's default install prompt
+            e.preventDefault();
+            // Store the event for later use
+            deferredInstallPrompt.value = e;
+        };
+
+        const triggerInstall = async () => {
+            if (!deferredInstallPrompt.value) return;
+
+            // Show the install prompt
+            deferredInstallPrompt.value.prompt();
+
+            // Wait for user response
+            const { outcome } = await deferredInstallPrompt.value.userChoice;
+
+            if (outcome === 'accepted') {
+                showInstallPrompt.value = false;
+                // Reload to get standalone mode
+                window.location.reload();
+            }
+
+            deferredInstallPrompt.value = null;
+        };
+
+        // ==================== LAGER SETTINGS ====================
+        const loadLagerSettings = () => {
+            try {
+                const saved = localStorage.getItem('movement_settings');
+                if (saved) {
+                    const settings = JSON.parse(saved);
+                    lagerSimpleMode.value = settings.simpleMode || false;
+                }
+            } catch (e) {}
+        };
+
+        const setLagerSimpleMode = (value) => {
+            lagerSimpleMode.value = value;
+            try {
+                const saved = localStorage.getItem('movement_settings');
+                const settings = saved ? JSON.parse(saved) : {};
+                settings.simpleMode = value;
+                localStorage.setItem('movement_settings', JSON.stringify(settings));
+            } catch (e) {}
+        };
+
+        // ==================== NAVIGATION ====================
+        const navigate = (module, submodule = null) => {
+            currentModule.value = module;
+            currentSubmodule.value = submodule;
+
+            // Update browser URL
+            let path = '/MobileApp';
+            if (module) path += '/' + module;
+            if (submodule) path += '/' + submodule;
+            history.pushState({ module, submodule }, '', path);
+        };
+
+        const goHome = () => {
+            navigate(null, null);
+        };
+
+        const goBack = () => {
+            if (currentSubmodule.value) {
+                navigate(currentModule.value, null);
+            } else if (currentModule.value) {
+                navigate(null, null);
+            }
+        };
+
+        // Handle browser back button
+        window.addEventListener('popstate', (event) => {
+            if (event.state) {
+                currentModule.value = event.state.module;
+                currentSubmodule.value = event.state.submodule;
+            } else {
+                currentModule.value = null;
+                currentSubmodule.value = null;
+            }
+        });
+
+        // ==================== AUTH ====================
+        const handleLogin = async (credentials) => {
+            // Handle 2FA success (already verified in LoginScreen)
+            if (credentials._2faSuccess) {
+                user.value = credentials.user;
+                currentView.value = 'app';
+                showToast('Erfolgreich angemeldet', 'success');
+                return { success: true };
+            }
+
+            const result = await login(credentials);
+            if (result.success) {
+                user.value = result.user;
+                currentView.value = 'app';
+                showToast('Erfolgreich angemeldet', 'success');
+            }
+            return result;
+        };
+
+        const handleLogout = async () => {
+            await logout();
+            user.value = null;
+            currentModule.value = null;
+            currentSubmodule.value = null;
+            currentView.value = 'login';
+            showToast('Abgemeldet', 'success');
+        };
+
+        // ==================== TOAST ====================
+        const showToast = (message, type = 'success') => {
+            toast.value = { show: true, message, type };
+            setTimeout(() => {
+                toast.value.show = false;
+            }, 3000);
+        };
+
+        // ==================== COMPUTED ====================
+        const currentComponent = computed(() => {
+            if (currentView.value !== 'app') return null;
+            if (!currentModule.value) return 'MainMenu';
+            if (currentModule.value.toLowerCase() === 'lager') return 'LagerModule';
+            return 'MainMenu';
+        });
+
+        const breadcrumbs = computed(() => {
+            const crumbs = [{ label: 'Home', module: null, submodule: null }];
+            if (currentModule.value) {
+                crumbs.push({ label: currentModule.value, module: currentModule.value, submodule: null });
+            }
+            if (currentSubmodule.value) {
+                crumbs.push({ label: currentSubmodule.value, module: currentModule.value, submodule: currentSubmodule.value });
+            }
+            return crumbs;
+        });
+
+        // ==================== LIFECYCLE ====================
+        onMounted(async () => {
+            // Initialize theme
+            const savedTheme = localStorage.getItem('theme');
+            if (savedTheme) {
+                theme.value = savedTheme;
+            }
+            applyTheme();
+            window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', applyTheme);
+
+            // Load module settings
+            loadLagerSettings();
+
+            // Listen for beforeinstallprompt (Android)
+            window.addEventListener('beforeinstallprompt', handleInstallPrompt);
+
+            // Check if PWA is required but not installed
+            if (shouldRequirePWA() && !isPWAInstalled()) {
+                showInstallPrompt.value = true;
+                currentView.value = 'install';
+                return;
+            }
+
+            // Check authentication
+            const result = await checkAuth();
+            if (result.authenticated) {
+                user.value = result.user;
+                currentView.value = 'app';
+
+                // Parse initial route
+                const initialRoute = parseInitialRoute();
+                currentModule.value = initialRoute.module;
+                currentSubmodule.value = initialRoute.submodule;
+
+                // Set initial history state
+                history.replaceState(
+                    { module: initialRoute.module, submodule: initialRoute.submodule },
+                    '',
+                    window.location.pathname
+                );
+            } else {
+                currentView.value = 'login';
+            }
+        });
+
+        return {
+            currentView,
+            user,
+            toast,
+            theme,
+            showSettings,
+            currentModule,
+            currentSubmodule,
+            currentComponent,
+            canGoBack,
+            breadcrumbs,
+            handleLogin,
+            handleLogout,
+            navigate,
+            goHome,
+            goBack,
+            showToast,
+            setTheme,
+            lagerSimpleMode,
+            setLagerSimpleMode,
+            // PWA Install
+            showInstallPrompt,
+            deferredInstallPrompt,
+            isIOS,
+            isAndroid,
+            triggerInstall,
+        };
+    },
+
+    template: `
+        <div class="relative h-full w-full bg-slate-50 dark:bg-slate-900 transition-colors duration-300">
+            <!-- Loading State -->
+            <div v-if="currentView === 'loading'" class="flex items-center justify-center h-full">
+                <div class="text-center">
+                    <img src="/assets/images/xinon-full-transparent.png" class="h-12 mx-auto mb-4 dark:hidden">
+                    <img src="/assets/images/xinon-full-transparent-white.png" class="h-12 mx-auto mb-4 hidden dark:block">
+                    <div class="animate-pulse text-slate-500 dark:text-slate-400">Lädt...</div>
+                </div>
+            </div>
+
+            <!-- PWA Install Prompt -->
+            <div v-else-if="currentView === 'install'" class="min-h-screen flex items-center justify-center p-4 relative overflow-hidden">
+                <!-- Network Background (same as login) -->
+                <div class="absolute inset-0 bg-gradient-to-br from-slate-900 via-slate-800 to-slate-900">
+                    <div class="absolute inset-0 opacity-40" style="background-image: linear-gradient(to right, rgba(0, 83, 132, 0.15) 1px, transparent 1px), linear-gradient(to bottom, rgba(0, 83, 132, 0.15) 1px, transparent 1px); background-size: 50px 50px;"></div>
+                    <div class="absolute w-3 h-3 bg-cyan-400 rounded-full network-node" style="top: 12%; left: 18%; box-shadow: 0 0 25px 8px rgba(34, 211, 238, 0.6);"></div>
+                    <div class="absolute w-2.5 h-2.5 bg-blue-400 rounded-full network-node" style="top: 22%; left: 78%; animation-delay: 0.5s; box-shadow: 0 0 20px 6px rgba(96, 165, 250, 0.6);"></div>
+                    <div class="absolute w-3 h-3 bg-cyan-300 rounded-full network-node-slow" style="top: 72%; left: 12%; animation-delay: 1s; box-shadow: 0 0 25px 8px rgba(103, 232, 249, 0.6);"></div>
+                    <div class="absolute w-2.5 h-2.5 bg-blue-300 rounded-full network-node" style="top: 82%; left: 85%; animation-delay: 0.3s; box-shadow: 0 0 20px 6px rgba(147, 197, 253, 0.6);"></div>
+                </div>
+
+                <!-- Install Card -->
+                <div class="relative bg-white/95 dark:bg-slate-800/95 backdrop-blur-sm rounded-2xl shadow-2xl p-6 w-full max-w-sm border border-white/20 dark:border-slate-700/50">
+                    <div class="mb-6">
+                        <img src="/assets/images/xinon-full-transparent.png" class="h-14 mx-auto dark:hidden" alt="Logo">
+                        <img src="/assets/images/xinon-full-transparent-white.png" class="h-14 mx-auto hidden dark:block" alt="Logo">
+                    </div>
+
+                    <div class="text-center mb-6">
+                        <div class="w-16 h-16 bg-primary/10 rounded-2xl flex items-center justify-center mx-auto mb-4">
+                            <svg xmlns="http://www.w3.org/2000/svg" class="h-8 w-8 text-primary" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 18h.01M8 21h8a2 2 0 002-2V5a2 2 0 00-2-2H8a2 2 0 00-2 2v14a2 2 0 002 2z" />
+                            </svg>
+                        </div>
+                        <h2 class="text-xl font-bold text-slate-800 dark:text-white mb-2">App installieren</h2>
+                        <p class="text-sm text-slate-500 dark:text-slate-400">
+                            Für die beste Erfahrung installiere die App auf deinem Gerät.
+                        </p>
+                    </div>
+
+                    <!-- Android Install Button -->
+                    <div v-if="isAndroid && deferredInstallPrompt">
+                        <button
+                            @click="triggerInstall"
+                            class="w-full py-3 px-4 bg-primary text-white font-bold rounded-xl hover:bg-primary/90 focus:ring-4 focus:ring-primary/30 transition flex items-center justify-center gap-2"
+                        >
+                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4" />
+                            </svg>
+                            App installieren
+                        </button>
+                    </div>
+
+                    <!-- iOS Instructions -->
+                    <div v-else-if="isIOS" class="space-y-4">
+                        <div class="bg-slate-50 dark:bg-slate-700/50 rounded-xl p-4">
+                            <p class="text-sm font-medium text-slate-700 dark:text-slate-300 mb-3">So installierst du die App:</p>
+                            <ol class="text-sm text-slate-600 dark:text-slate-400 space-y-3">
+                                <li class="flex items-start gap-3">
+                                    <span class="flex-shrink-0 w-6 h-6 bg-primary/10 text-primary rounded-full flex items-center justify-center text-xs font-bold">1</span>
+                                    <span>Tippe auf das <strong>Teilen</strong>-Symbol
+                                        <svg xmlns="http://www.w3.org/2000/svg" class="inline h-4 w-4 text-primary" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8.684 13.342C8.886 12.938 9 12.482 9 12c0-.482-.114-.938-.316-1.342m0 2.684a3 3 0 110-2.684m0 2.684l6.632 3.316m-6.632-6l6.632-3.316m0 0a3 3 0 105.367-2.684 3 3 0 00-5.367 2.684zm0 9.316a3 3 0 105.368 2.684 3 3 0 00-5.368-2.684z" />
+                                        </svg>
+                                    </span>
+                                </li>
+                                <li class="flex items-start gap-3">
+                                    <span class="flex-shrink-0 w-6 h-6 bg-primary/10 text-primary rounded-full flex items-center justify-center text-xs font-bold">2</span>
+                                    <span>Scrolle und wähle <strong>"Zum Home-Bildschirm"</strong></span>
+                                </li>
+                                <li class="flex items-start gap-3">
+                                    <span class="flex-shrink-0 w-6 h-6 bg-primary/10 text-primary rounded-full flex items-center justify-center text-xs font-bold">3</span>
+                                    <span>Tippe auf <strong>"Hinzufügen"</strong></span>
+                                </li>
+                            </ol>
+                        </div>
+                    </div>
+
+                    <!-- Android Manual Instructions (fallback) -->
+                    <div v-else-if="isAndroid" class="space-y-4">
+                        <div class="bg-slate-50 dark:bg-slate-700/50 rounded-xl p-4">
+                            <p class="text-sm font-medium text-slate-700 dark:text-slate-300 mb-3">So installierst du die App:</p>
+                            <ol class="text-sm text-slate-600 dark:text-slate-400 space-y-3">
+                                <li class="flex items-start gap-3">
+                                    <span class="flex-shrink-0 w-6 h-6 bg-primary/10 text-primary rounded-full flex items-center justify-center text-xs font-bold">1</span>
+                                    <span>Tippe auf das <strong>Menü</strong> (⋮) oben rechts</span>
+                                </li>
+                                <li class="flex items-start gap-3">
+                                    <span class="flex-shrink-0 w-6 h-6 bg-primary/10 text-primary rounded-full flex items-center justify-center text-xs font-bold">2</span>
+                                    <span>Wähle <strong>"App installieren"</strong> oder <strong>"Zum Startbildschirm hinzufügen"</strong></span>
+                                </li>
+                                <li class="flex items-start gap-3">
+                                    <span class="flex-shrink-0 w-6 h-6 bg-primary/10 text-primary rounded-full flex items-center justify-center text-xs font-bold">3</span>
+                                    <span>Bestätige mit <strong>"Installieren"</strong></span>
+                                </li>
+                            </ol>
+                        </div>
+                    </div>
+
+                    <!-- Desktop / Unknown -->
+                    <div v-else class="space-y-4">
+                        <div class="bg-amber-50 dark:bg-amber-900/20 border border-amber-200 dark:border-amber-800 rounded-xl p-4">
+                            <p class="text-sm text-amber-700 dark:text-amber-400">
+                                <strong>Hinweis:</strong> Diese App ist für mobile Geräte optimiert. Bitte öffne diese Seite auf deinem Smartphone und installiere die App.
+                            </p>
+                        </div>
+                    </div>
+
+                    <div class="mt-4 pt-4 border-t border-slate-100 dark:border-slate-700 text-center">
+                        <p class="text-xs text-slate-400 dark:text-slate-500">
+                            powered by <span class="font-semibold">XINON</span>
+                        </p>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Login Screen -->
+            <LoginScreen
+                v-else-if="currentView === 'login'"
+                @login="handleLogin"
+                :theme="theme"
+                @set-theme="setTheme"
+            />
+
+            <!-- Main App -->
+            <template v-else-if="currentView === 'app'">
+                <div class="h-full flex flex-col">
+                    <!-- Persistent Header -->
+                    <header class="bg-white dark:bg-slate-800 border-b border-slate-200 dark:border-slate-700 px-2 py-2 flex items-center safe-area-top flex-shrink-0 z-10">
+                        <!-- Left: Back Button -->
+                        <button
+                            @click="goBack"
+                            :class="[
+                                'w-10 h-10 flex items-center justify-center rounded-full transition',
+                                canGoBack
+                                    ? 'text-slate-600 dark:text-slate-300 hover:bg-slate-100 dark:hover:bg-slate-700'
+                                    : 'text-transparent pointer-events-none'
+                            ]"
+                        >
+                            <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7" />
+                            </svg>
+                        </button>
+
+                        <!-- Center: Logo -->
+                        <div class="flex-1 flex justify-center">
+                            <img src="/assets/images/xinon-full-transparent.png" class="h-7 dark:hidden" alt="Logo">
+                            <img src="/assets/images/xinon-full-transparent-white.png" class="h-7 hidden dark:block" alt="Logo">
+                        </div>
+
+                        <!-- Right: Settings -->
+                        <button
+                            @click="showSettings = true"
+                            class="w-10 h-10 flex items-center justify-center rounded-full text-slate-500 dark:text-slate-400 hover:bg-slate-100 dark:hover:bg-slate-700 transition"
+                        >
+                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z" />
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
+                            </svg>
+                        </button>
+                    </header>
+
+                    <!-- Content Area -->
+                    <main class="flex-1 overflow-y-auto">
+                        <MainMenu
+                            v-if="!currentModule"
+                            :user="user"
+                            @navigate="navigate"
+                        />
+
+                        <LagerModule
+                            v-else-if="currentModule?.toLowerCase() === 'lager'"
+                            :user="user"
+                            :submodule="currentSubmodule"
+                            :simple-mode="lagerSimpleMode"
+                            @navigate="navigate"
+                            @toast="showToast"
+                        />
+                    </main>
+                </div>
+
+                <!-- Settings Panel -->
+                <transition name="slide-right">
+                    <div v-if="showSettings" class="fixed inset-0 z-50">
+                        <div class="absolute inset-0 bg-black/40" @click="showSettings = false"></div>
+                        <div class="absolute right-0 top-0 bottom-0 w-72 bg-white dark:bg-slate-800 shadow-xl flex flex-col">
+                            <div class="safe-area-top border-b border-slate-200 dark:border-slate-700 px-4 py-3 flex items-center justify-between">
+                                <h2 class="font-semibold text-slate-800 dark:text-white">Einstellungen</h2>
+                                <button @click="showSettings = false" class="p-1.5 hover:bg-slate-100 dark:hover:bg-slate-700 rounded-full text-slate-500">
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+                                    </svg>
+                                </button>
+                            </div>
+                            <div class="flex-1 overflow-y-auto">
+                                <!-- User Info -->
+                                <div class="px-4 py-3 border-b border-slate-100 dark:border-slate-700">
+                                    <p class="font-medium text-slate-800 dark:text-white">{{ user?.name }}</p>
+                                    <p class="text-sm text-slate-500 dark:text-slate-400">{{ user?.username }}</p>
+                                </div>
+
+                                <!-- Theme Selection -->
+                                <div class="px-4 py-3">
+                                    <p class="text-xs font-medium text-slate-500 dark:text-slate-400 uppercase tracking-wide mb-2">Farbschema</p>
+                                    <div class="flex space-x-2">
+                                        <button
+                                            @click="setTheme('light')"
+                                            :class="[theme === 'light' ? 'ring-2 ring-primary bg-primary/5' : 'bg-slate-100 dark:bg-slate-700', 'flex-1 py-2 rounded-lg text-sm font-medium text-slate-700 dark:text-slate-300']"
+                                        >Hell</button>
+                                        <button
+                                            @click="setTheme('dark')"
+                                            :class="[theme === 'dark' ? 'ring-2 ring-primary bg-primary/5' : 'bg-slate-100 dark:bg-slate-700', 'flex-1 py-2 rounded-lg text-sm font-medium text-slate-700 dark:text-slate-300']"
+                                        >Dunkel</button>
+                                        <button
+                                            @click="setTheme('system')"
+                                            :class="[theme === 'system' ? 'ring-2 ring-primary bg-primary/5' : 'bg-slate-100 dark:bg-slate-700', 'flex-1 py-2 rounded-lg text-sm font-medium text-slate-700 dark:text-slate-300']"
+                                        >Auto</button>
+                                    </div>
+                                </div>
+
+                                <!-- Lager Settings -->
+                                <div class="px-4 py-3 border-t border-slate-100 dark:border-slate-700">
+                                    <p class="text-xs font-medium text-slate-500 dark:text-slate-400 uppercase tracking-wide mb-3">Lager</p>
+                                    <div class="flex items-center justify-between">
+                                        <div>
+                                            <p class="font-medium text-slate-800 dark:text-white text-sm">Simpel Modus</p>
+                                            <p class="text-xs text-slate-500 dark:text-slate-400">Weniger Optionen</p>
+                                        </div>
+                                        <button
+                                            @click="setLagerSimpleMode(!lagerSimpleMode)"
+                                            :class="[
+                                                'relative w-11 h-6 rounded-full transition-colors',
+                                                lagerSimpleMode ? 'bg-green-500' : 'bg-slate-300 dark:bg-slate-600'
+                                            ]"
+                                        >
+                                            <span :class="[
+                                                'absolute top-0.5 w-5 h-5 bg-white rounded-full shadow transition-transform',
+                                                lagerSimpleMode ? 'left-5' : 'left-0.5'
+                                            ]"></span>
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <!-- Logout at bottom -->
+                            <div class="p-3 border-t border-slate-100 dark:border-slate-700">
+                                <button
+                                    @click="showSettings = false; handleLogout()"
+                                    class="w-full py-2.5 px-4 text-red-600 dark:text-red-400 font-medium rounded-lg hover:bg-red-50 dark:hover:bg-red-900/20 transition flex items-center justify-center"
+                                >
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-2" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1" />
+                                    </svg>
+                                    Abmelden
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </transition>
+            </template>
+
+            <!-- Toast Notifications -->
+            <transition name="slide-up">
+                <div v-if="toast.show" class="toast-container">
+                    <div :class="['toast', 'toast-' + toast.type]">
+                        {{ toast.message }}
+                    </div>
+                </div>
+            </transition>
+        </div>
+    `
+};
+
+createApp(App).mount('#app');
diff --git a/public/mobile/components/LoginScreen.js b/public/mobile/components/LoginScreen.js
new file mode 100644
index 000000000..47acf087f
--- /dev/null
+++ b/public/mobile/components/LoginScreen.js
@@ -0,0 +1,639 @@
+/**
+ * LoginScreen Component
+ *
+ * Displays the login form for the PWA with 2FA support.
+ * Features:
+ * - Username/password authentication
+ * - 2FA verification with OTP auto-detection (Web OTP API for Android, autocomplete for iOS)
+ * - Remember me option
+ */
+
+import { login, verify2FA, resend2FA } from '/mobile/shared/auth.js';
+
+export default {
+    name: 'LoginScreen',
+    emits: ['login', 'set-theme'],
+    props: {
+        theme: {
+            type: String,
+            default: 'system'
+        }
+    },
+
+    setup(props, { emit }) {
+        const { ref, onMounted, onUnmounted, nextTick } = Vue;
+
+        // Login form state
+        const username = ref('');
+        const password = ref('');
+        const rememberMe = ref(true);
+        const showPassword = ref(false);
+
+        // 2FA state
+        const show2FA = ref(false);
+        const otpCode = ref('');
+        const otpDigits = ref(['', '', '', '', '']);
+        const deliveryMethod = ref('');
+        const maskedTarget = ref('');
+        const resendCooldown = ref(0);
+
+        // General state
+        const error = ref('');
+        const success = ref('');
+        const loading = ref(false);
+        const showThemePicker = ref(!localStorage.getItem('theme'));
+
+        // OTP input refs
+        let otpInputRefs = [];
+        let otpAbortController = null;
+        let resendTimer = null;
+
+        // Handle login form submission
+        const handleSubmit = async () => {
+            if (!username.value || !password.value) {
+                error.value = 'Bitte Benutzername und Passwort eingeben';
+                return;
+            }
+
+            loading.value = true;
+            error.value = '';
+
+            try {
+                // Call login API directly
+                const result = await login({
+                    username: username.value,
+                    password: password.value,
+                    rememberMe: rememberMe.value
+                });
+
+                if (result.requires2FA) {
+                    // Show 2FA verification screen
+                    show2FA.value = true;
+                    deliveryMethod.value = result.deliveryMethod;
+                    maskedTarget.value = result.maskedTarget;
+                    success.value = result.message;
+                    error.value = '';
+
+                    // Start resend cooldown
+                    startResendCooldown();
+
+                    // Focus first OTP input after render
+                    await nextTick();
+                    focusOtpInput(0);
+
+                    // Try Web OTP API for SMS
+                    if (result.deliveryMethod === 'sms') {
+                        startWebOTP();
+                    }
+                } else if (result.success) {
+                    // Direct login success (no 2FA) - notify parent
+                    emit('login', { _2faSuccess: true, user: result.user });
+                } else {
+                    error.value = result.message || 'Login fehlgeschlagen';
+                }
+            } catch (e) {
+                error.value = 'Ein Fehler ist aufgetreten';
+            } finally {
+                loading.value = false;
+            }
+        };
+
+        // Handle 2FA verification
+        const handleVerify2FA = async () => {
+            const code = otpDigits.value.join('');
+
+            if (code.length !== 5) {
+                error.value = 'Bitte gib den 5-stelligen Code ein';
+                return;
+            }
+
+            loading.value = true;
+            error.value = '';
+            success.value = '';
+
+            try {
+                const result = await verify2FA(code);
+
+                if (result.success) {
+                    // Emit the successful result to parent (which handles navigation)
+                    emit('login', { _2faSuccess: true, user: result.user });
+                } else {
+                    error.value = result.message || 'Ungültiger Code';
+
+                    if (result.expired || result.codeExpired) {
+                        // Session or code expired - go back to login
+                        resetTo2FA();
+                    }
+                }
+            } catch (e) {
+                error.value = 'Ein Fehler ist aufgetreten';
+            } finally {
+                loading.value = false;
+            }
+        };
+
+        // Handle resend 2FA code
+        const handleResend = async () => {
+            if (resendCooldown.value > 0) return;
+
+            loading.value = true;
+            error.value = '';
+
+            try {
+                const result = await resend2FA();
+
+                if (result.success) {
+                    success.value = result.message || 'Neuer Code wurde gesendet';
+                    startResendCooldown();
+
+                    // Clear OTP inputs
+                    otpDigits.value = ['', '', '', '', ''];
+                    focusOtpInput(0);
+
+                    // Restart Web OTP if SMS
+                    if (deliveryMethod.value === 'sms') {
+                        startWebOTP();
+                    }
+                } else {
+                    error.value = result.message || 'Code konnte nicht gesendet werden';
+
+                    if (result.expired) {
+                        resetTo2FA();
+                    }
+                }
+            } catch (e) {
+                error.value = 'Ein Fehler ist aufgetreten';
+            } finally {
+                loading.value = false;
+            }
+        };
+
+        // Go back to login form
+        const backToLogin = () => {
+            show2FA.value = false;
+            otpDigits.value = ['', '', '', '', ''];
+            error.value = '';
+            success.value = '';
+            abortWebOTP();
+        };
+
+        // Reset after session expired
+        const resetTo2FA = () => {
+            show2FA.value = false;
+            password.value = '';
+            otpDigits.value = ['', '', '', '', ''];
+            error.value = 'Sitzung abgelaufen. Bitte erneut anmelden.';
+        };
+
+        // Start resend cooldown (30 seconds)
+        const startResendCooldown = () => {
+            resendCooldown.value = 30;
+            if (resendTimer) clearInterval(resendTimer);
+            resendTimer = setInterval(() => {
+                resendCooldown.value--;
+                if (resendCooldown.value <= 0) {
+                    clearInterval(resendTimer);
+                }
+            }, 1000);
+        };
+
+        // OTP input handlers
+        const focusOtpInput = (index) => {
+            const inputs = document.querySelectorAll('.otp-input');
+            if (inputs[index]) {
+                inputs[index].focus();
+            }
+        };
+
+        const handleOtpInput = (index, event) => {
+            const value = event.target.value;
+
+            // Only allow digits
+            if (!/^\d*$/.test(value)) {
+                event.target.value = otpDigits.value[index];
+                return;
+            }
+
+            // Handle paste of full code
+            if (value.length > 1) {
+                const digits = value.replace(/\D/g, '').slice(0, 5).split('');
+                digits.forEach((digit, i) => {
+                    if (i < 5) otpDigits.value[i] = digit;
+                });
+                focusOtpInput(Math.min(digits.length, 4));
+
+                // Auto-submit if complete
+                if (otpDigits.value.join('').length === 5) {
+                    handleVerify2FA();
+                }
+                return;
+            }
+
+            otpDigits.value[index] = value;
+
+            // Move to next input
+            if (value && index < 4) {
+                focusOtpInput(index + 1);
+            }
+
+            // Auto-submit when complete
+            if (otpDigits.value.join('').length === 5) {
+                handleVerify2FA();
+            }
+        };
+
+        const handleOtpKeydown = (index, event) => {
+            // Handle backspace
+            if (event.key === 'Backspace' && !otpDigits.value[index] && index > 0) {
+                focusOtpInput(index - 1);
+            }
+        };
+
+        const handleOtpPaste = (event) => {
+            event.preventDefault();
+            const pastedData = event.clipboardData.getData('text');
+            const digits = pastedData.replace(/\D/g, '').slice(0, 5).split('');
+
+            digits.forEach((digit, i) => {
+                if (i < 5) otpDigits.value[i] = digit;
+            });
+
+            focusOtpInput(Math.min(digits.length, 4));
+
+            // Auto-submit if complete
+            if (otpDigits.value.join('').length === 5) {
+                handleVerify2FA();
+            }
+        };
+
+        // Web OTP API for automatic SMS code detection (Android)
+        const startWebOTP = async () => {
+            if (!('OTPCredential' in window)) {
+                console.log('Web OTP API not supported');
+                return;
+            }
+
+            abortWebOTP();
+            otpAbortController = new AbortController();
+
+            try {
+                const otp = await navigator.credentials.get({
+                    otp: { transport: ['sms'] },
+                    signal: otpAbortController.signal
+                });
+
+                if (otp && otp.code) {
+                    // Extract 5-digit code from SMS
+                    const code = otp.code.replace(/\D/g, '').slice(0, 5);
+                    if (code.length === 5) {
+                        code.split('').forEach((digit, i) => {
+                            otpDigits.value[i] = digit;
+                        });
+                        // Auto-submit
+                        handleVerify2FA();
+                    }
+                }
+            } catch (err) {
+                if (err.name !== 'AbortError') {
+                    console.log('Web OTP error:', err);
+                }
+            }
+        };
+
+        const abortWebOTP = () => {
+            if (otpAbortController) {
+                otpAbortController.abort();
+                otpAbortController = null;
+            }
+        };
+
+        // Theme picker
+        const selectTheme = (newTheme) => {
+            emit('set-theme', newTheme);
+            showThemePicker.value = false;
+        };
+
+        // Cleanup
+        onUnmounted(() => {
+            abortWebOTP();
+            if (resendTimer) clearInterval(resendTimer);
+        });
+
+        return {
+            // Login state
+            username,
+            password,
+            rememberMe,
+            showPassword,
+
+            // 2FA state
+            show2FA,
+            otpDigits,
+            deliveryMethod,
+            maskedTarget,
+            resendCooldown,
+
+            // General state
+            error,
+            success,
+            loading,
+            showThemePicker,
+
+            // Methods
+            handleSubmit,
+            handleVerify2FA,
+            handleResend,
+            backToLogin,
+            handleOtpInput,
+            handleOtpKeydown,
+            handleOtpPaste,
+            selectTheme
+        };
+    },
+
+    template: `
+        <div class="min-h-screen flex items-center justify-center p-4 relative overflow-hidden">
+            <!-- Animated Network Background -->
+            <div class="absolute inset-0 bg-gradient-to-br from-slate-900 via-slate-800 to-slate-900">
+                <!-- Fiber grid pattern -->
+                <div class="absolute inset-0 opacity-40" style="background-image:
+                    linear-gradient(to right, rgba(0, 83, 132, 0.15) 1px, transparent 1px),
+                    linear-gradient(to bottom, rgba(0, 83, 132, 0.15) 1px, transparent 1px);
+                    background-size: 50px 50px;"></div>
+
+                <!-- Glowing nodes with enhanced animation -->
+                <div class="absolute w-3 h-3 bg-cyan-400 rounded-full network-node" style="top: 12%; left: 18%; box-shadow: 0 0 25px 8px rgba(34, 211, 238, 0.6);"></div>
+                <div class="absolute w-2.5 h-2.5 bg-blue-400 rounded-full network-node" style="top: 22%; left: 78%; animation-delay: 0.5s; box-shadow: 0 0 20px 6px rgba(96, 165, 250, 0.6);"></div>
+                <div class="absolute w-3 h-3 bg-cyan-300 rounded-full network-node-slow" style="top: 72%; left: 12%; animation-delay: 1s; box-shadow: 0 0 25px 8px rgba(103, 232, 249, 0.6);"></div>
+                <div class="absolute w-2.5 h-2.5 bg-blue-300 rounded-full network-node" style="top: 82%; left: 85%; animation-delay: 0.3s; box-shadow: 0 0 20px 6px rgba(147, 197, 253, 0.6);"></div>
+                <div class="absolute w-2 h-2 bg-cyan-400 rounded-full network-node-slow" style="top: 42%; left: 8%; animation-delay: 0.7s; box-shadow: 0 0 15px 5px rgba(34, 211, 238, 0.5);"></div>
+                <div class="absolute w-2.5 h-2.5 bg-blue-400 rounded-full network-node" style="top: 32%; left: 92%; animation-delay: 1.2s; box-shadow: 0 0 20px 6px rgba(96, 165, 250, 0.6);"></div>
+                <div class="absolute w-2 h-2 bg-cyan-300 rounded-full network-node" style="top: 58%; left: 88%; animation-delay: 0.9s; box-shadow: 0 0 15px 5px rgba(103, 232, 249, 0.5);"></div>
+                <div class="absolute w-2 h-2 bg-blue-300 rounded-full network-node-slow" style="top: 88%; left: 45%; animation-delay: 0.4s; box-shadow: 0 0 15px 5px rgba(147, 197, 253, 0.5);"></div>
+                <div class="absolute w-1.5 h-1.5 bg-cyan-400 rounded-full network-node" style="top: 5%; left: 55%; animation-delay: 1.5s; box-shadow: 0 0 12px 4px rgba(34, 211, 238, 0.5);"></div>
+                <div class="absolute w-1.5 h-1.5 bg-blue-400 rounded-full network-node-slow" style="top: 95%; left: 25%; animation-delay: 0.8s; box-shadow: 0 0 12px 4px rgba(96, 165, 250, 0.5);"></div>
+
+                <!-- Connection lines (SVG) with animations -->
+                <svg class="absolute inset-0 w-full h-full network-lines" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none">
+                    <defs>
+                        <linearGradient id="lineGrad1" x1="0%" y1="0%" x2="100%" y2="0%">
+                            <stop offset="0%" style="stop-color:rgb(34, 211, 238);stop-opacity:0" />
+                            <stop offset="50%" style="stop-color:rgb(34, 211, 238);stop-opacity:1" />
+                            <stop offset="100%" style="stop-color:rgb(34, 211, 238);stop-opacity:0" />
+                        </linearGradient>
+                        <linearGradient id="lineGrad2" x1="0%" y1="0%" x2="100%" y2="100%">
+                            <stop offset="0%" style="stop-color:rgb(96, 165, 250);stop-opacity:0" />
+                            <stop offset="50%" style="stop-color:rgb(96, 165, 250);stop-opacity:1" />
+                            <stop offset="100%" style="stop-color:rgb(96, 165, 250);stop-opacity:0" />
+                        </linearGradient>
+                        <linearGradient id="lineGrad3" x1="0%" y1="100%" x2="100%" y2="0%">
+                            <stop offset="0%" style="stop-color:rgb(103, 232, 249);stop-opacity:0" />
+                            <stop offset="50%" style="stop-color:rgb(103, 232, 249);stop-opacity:1" />
+                            <stop offset="100%" style="stop-color:rgb(103, 232, 249);stop-opacity:0" />
+                        </linearGradient>
+                    </defs>
+                    <!-- Main network connections -->
+                    <line x1="18%" y1="12%" x2="78%" y2="22%" stroke="url(#lineGrad1)" stroke-width="1.5"/>
+                    <line x1="78%" y1="22%" x2="85%" y2="82%" stroke="url(#lineGrad2)" stroke-width="1.5"/>
+                    <line x1="18%" y1="12%" x2="12%" y2="72%" stroke="url(#lineGrad1)" stroke-width="1.5"/>
+                    <line x1="12%" y1="72%" x2="85%" y2="82%" stroke="url(#lineGrad2)" stroke-width="1.5"/>
+                    <line x1="8%" y1="42%" x2="18%" y2="12%" stroke="url(#lineGrad3)" stroke-width="1.5"/>
+                    <line x1="92%" y1="32%" x2="78%" y2="22%" stroke="url(#lineGrad2)" stroke-width="1.5"/>
+                    <!-- Additional connections -->
+                    <line x1="12%" y1="72%" x2="45%" y2="88%" stroke="url(#lineGrad1)" stroke-width="1.5"/>
+                    <line x1="45%" y1="88%" x2="85%" y2="82%" stroke="url(#lineGrad3)" stroke-width="1.5"/>
+                    <line x1="88%" y1="58%" x2="92%" y2="32%" stroke="url(#lineGrad2)" stroke-width="1.5"/>
+                    <line x1="88%" y1="58%" x2="85%" y2="82%" stroke="url(#lineGrad1)" stroke-width="1.5"/>
+                    <line x1="8%" y1="42%" x2="12%" y2="72%" stroke="url(#lineGrad3)" stroke-width="1.5"/>
+                    <line x1="55%" y1="5%" x2="78%" y2="22%" stroke="url(#lineGrad1)" stroke-width="1.5"/>
+                    <line x1="55%" y1="5%" x2="18%" y2="12%" stroke="url(#lineGrad2)" stroke-width="1.5"/>
+                    <line x1="25%" y1="95%" x2="45%" y2="88%" stroke="url(#lineGrad3)" stroke-width="1.5"/>
+                    <line x1="25%" y1="95%" x2="12%" y2="72%" stroke="url(#lineGrad1)" stroke-width="1.5"/>
+                    <!-- Cross connections -->
+                    <line x1="18%" y1="12%" x2="88%" y2="58%" stroke="url(#lineGrad2)" stroke-width="1"/>
+                    <line x1="8%" y1="42%" x2="78%" y2="22%" stroke="url(#lineGrad3)" stroke-width="1"/>
+                    <line x1="12%" y1="72%" x2="92%" y2="32%" stroke="url(#lineGrad1)" stroke-width="1"/>
+                </svg>
+
+                <!-- Flowing data lines overlay -->
+                <svg class="absolute inset-0 w-full h-full opacity-50" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none">
+                    <line x1="18%" y1="12%" x2="78%" y2="22%" stroke="rgb(34, 211, 238)" stroke-width="2" class="network-line-flow"/>
+                    <line x1="12%" y1="72%" x2="85%" y2="82%" stroke="rgb(96, 165, 250)" stroke-width="2" class="network-line-flow" style="animation-delay: 2s;"/>
+                    <line x1="8%" y1="42%" x2="18%" y2="12%" stroke="rgb(103, 232, 249)" stroke-width="2" class="network-line-flow" style="animation-delay: 4s;"/>
+                    <line x1="55%" y1="5%" x2="78%" y2="22%" stroke="rgb(34, 211, 238)" stroke-width="2" class="network-line-flow" style="animation-delay: 1s;"/>
+                    <line x1="45%" y1="88%" x2="85%" y2="82%" stroke="rgb(96, 165, 250)" stroke-width="2" class="network-line-flow" style="animation-delay: 3s;"/>
+                </svg>
+
+                <!-- Subtle radial glow -->
+                <div class="absolute inset-0" style="background: radial-gradient(ellipse at 30% 20%, rgba(0, 83, 132, 0.2) 0%, transparent 50%);"></div>
+                <div class="absolute inset-0" style="background: radial-gradient(ellipse at 70% 80%, rgba(34, 211, 238, 0.15) 0%, transparent 40%);"></div>
+                <div class="absolute inset-0" style="background: radial-gradient(ellipse at 90% 40%, rgba(96, 165, 250, 0.1) 0%, transparent 35%);"></div>
+            </div>
+
+            <!-- Theme Picker Modal -->
+            <transition name="fade">
+                <div v-if="showThemePicker" class="fixed inset-0 bg-black bg-opacity-60 z-50 flex items-center justify-center p-4">
+                    <div class="bg-white dark:bg-slate-800 rounded-2xl p-6 w-full max-w-xs text-center shadow-2xl border border-slate-200 dark:border-slate-700">
+                        <h3 class="font-bold text-lg mb-2 text-slate-800 dark:text-white">Willkommen!</h3>
+                        <p class="text-sm text-slate-600 dark:text-slate-300 mb-6">Wähle dein bevorzugtes Farbschema.</p>
+                        <div class="flex flex-col space-y-3">
+                            <button @click="selectTheme('light')" class="w-full px-4 py-3 bg-slate-100 text-slate-800 font-semibold rounded-xl hover:bg-slate-200 transition flex items-center justify-center gap-2">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 3v1m0 16v1m9-9h-1M4 12H3m15.364 6.364l-.707-.707M6.343 6.343l-.707-.707m12.728 0l-.707.707M6.343 17.657l-.707.707M16 12a4 4 0 11-8 0 4 4 0 018 0z" />
+                                </svg>
+                                Hell
+                            </button>
+                            <button @click="selectTheme('dark')" class="w-full px-4 py-3 bg-slate-700 text-white font-semibold rounded-xl hover:bg-slate-600 transition flex items-center justify-center gap-2">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20.354 15.354A9 9 0 018.646 3.646 9.003 9.003 0 0012 21a9.003 9.003 0 008.354-5.646z" />
+                                </svg>
+                                Dunkel
+                            </button>
+                            <button @click="selectTheme('system')" class="w-full mt-1 text-sm text-slate-500 dark:text-slate-400 hover:text-slate-700 dark:hover:text-slate-300 transition">
+                                Automatisch (System)
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </transition>
+
+            <!-- Login/2FA Form Container -->
+            <div class="relative bg-white/95 dark:bg-slate-800/95 backdrop-blur-sm rounded-2xl shadow-2xl p-6 w-full max-w-sm border border-white/20 dark:border-slate-700/50">
+                <div class="mb-5">
+                    <img src="/assets/images/xinon-full-transparent.png" class="h-14 mx-auto dark:hidden" alt="Logo">
+                    <img src="/assets/images/xinon-full-transparent-white.png" class="h-14 mx-auto hidden dark:block" alt="Logo">
+                </div>
+
+                <!-- 2FA Verification Screen -->
+                <template v-if="show2FA">
+                    <div class="text-center mb-6">
+                        <div class="w-16 h-16 bg-primary/10 rounded-full flex items-center justify-center mx-auto mb-4">
+                            <svg v-if="deliveryMethod === 'sms'" xmlns="http://www.w3.org/2000/svg" class="h-8 w-8 text-primary" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 18h.01M8 21h8a2 2 0 002-2V5a2 2 0 00-2-2H8a2 2 0 00-2 2v14a2 2 0 002 2z" />
+                            </svg>
+                            <svg v-else xmlns="http://www.w3.org/2000/svg" class="h-8 w-8 text-primary" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" />
+                            </svg>
+                        </div>
+                        <h2 class="text-xl font-bold text-slate-800 dark:text-white">
+                            Verifizierung
+                        </h2>
+                        <p class="text-sm text-slate-500 dark:text-slate-400 mt-2">
+                            Code wurde gesendet an<br>
+                            <span class="font-medium text-slate-700 dark:text-slate-300">{{ maskedTarget }}</span>
+                        </p>
+                    </div>
+
+                    <!-- OTP Input -->
+                    <div class="mb-6">
+                        <div class="flex justify-center space-x-2">
+                            <input
+                                v-for="(digit, index) in otpDigits"
+                                :key="index"
+                                type="text"
+                                inputmode="numeric"
+                                :autocomplete="index === 0 ? 'one-time-code' : 'off'"
+                                maxlength="5"
+                                class="otp-input w-12 h-14 text-center text-2xl font-bold border-2 border-slate-300 rounded-lg focus:border-primary focus:ring-2 focus:ring-primary/30 transition dark:bg-slate-700 dark:border-slate-600 dark:text-white"
+                                :value="digit"
+                                @input="handleOtpInput(index, $event)"
+                                @keydown="handleOtpKeydown(index, $event)"
+                                @paste="handleOtpPaste"
+                            >
+                        </div>
+                        <p class="text-xs text-slate-400 dark:text-slate-500 text-center mt-3">
+                            Code ist 5 Minuten gültig
+                        </p>
+                    </div>
+
+                    <!-- Success Message -->
+                    <div v-if="success" class="mb-4 p-3 bg-green-50 dark:bg-green-900/30 border border-green-200 dark:border-green-800 rounded-lg">
+                        <p class="text-sm text-green-600 dark:text-green-400">{{ success }}</p>
+                    </div>
+
+                    <!-- Error Message -->
+                    <div v-if="error" class="mb-4 p-3 bg-red-50 dark:bg-red-900/30 border border-red-200 dark:border-red-800 rounded-lg">
+                        <p class="text-sm text-red-600 dark:text-red-400">{{ error }}</p>
+                    </div>
+
+                    <!-- Verify Button -->
+                    <button
+                        @click="handleVerify2FA"
+                        :disabled="loading || otpDigits.join('').length !== 5"
+                        class="w-full py-3 px-4 bg-primary text-white font-bold rounded-lg hover:bg-primary/90 focus:ring-4 focus:ring-primary/30 transition disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-center"
+                    >
+                        <svg v-if="loading" class="animate-spin -ml-1 mr-2 h-5 w-5 text-white" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+                            <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+                            <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+                        </svg>
+                        {{ loading ? 'Wird verifiziert...' : 'Verifizieren' }}
+                    </button>
+
+                    <!-- Resend and Back buttons -->
+                    <div class="mt-4 flex flex-col items-center space-y-3">
+                        <button
+                            @click="handleResend"
+                            :disabled="resendCooldown > 0 || loading"
+                            class="text-sm text-primary hover:underline disabled:text-slate-400 disabled:no-underline"
+                        >
+                            {{ resendCooldown > 0 ? 'Neuer Code in ' + resendCooldown + 's' : 'Neuen Code senden' }}
+                        </button>
+                        <button
+                            @click="backToLogin"
+                            class="text-sm text-slate-500 dark:text-slate-400 hover:text-slate-700 dark:hover:text-slate-300"
+                        >
+                            Zurück zur Anmeldung
+                        </button>
+                    </div>
+                </template>
+
+                <!-- Login Form -->
+                <template v-else>
+                    <form @submit.prevent="handleSubmit" class="space-y-4">
+                        <div>
+                            <label class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-1">
+                                Benutzername
+                            </label>
+                            <input
+                                v-model="username"
+                                type="text"
+                                autocomplete="username"
+                                autocapitalize="none"
+                                class="w-full p-3 border border-slate-300 rounded-xl focus:ring-2 focus:ring-primary focus:border-primary transition dark:bg-slate-700 dark:border-slate-600 dark:text-white"
+                                placeholder="Benutzername eingeben"
+                            >
+                        </div>
+
+                        <div>
+                            <label class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-1">
+                                Passwort
+                            </label>
+                            <div class="relative">
+                                <input
+                                    v-model="password"
+                                    :type="showPassword ? 'text' : 'password'"
+                                    autocomplete="current-password"
+                                    class="w-full p-3 pr-12 border border-slate-300 rounded-xl focus:ring-2 focus:ring-primary focus:border-primary transition dark:bg-slate-700 dark:border-slate-600 dark:text-white"
+                                    placeholder="Passwort eingeben"
+                                >
+                                <button
+                                    type="button"
+                                    @click="showPassword = !showPassword"
+                                    class="absolute right-3 top-1/2 -translate-y-1/2 text-slate-400 hover:text-slate-600 dark:hover:text-slate-300"
+                                >
+                                    <svg v-if="!showPassword" xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z" />
+                                    </svg>
+                                    <svg v-else xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13.875 18.825A10.05 10.05 0 0112 19c-4.478 0-8.268-2.943-9.543-7a9.97 9.97 0 011.563-3.029m5.858.908a3 3 0 114.243 4.243M9.878 9.878l4.242 4.242M9.88 9.88l-3.29-3.29m7.532 7.532l3.29 3.29M3 3l3.59 3.59m0 0A9.953 9.953 0 0112 5c4.478 0 8.268 2.943 9.543 7a10.025 10.025 0 01-4.132 5.411m0 0L21 21" />
+                                    </svg>
+                                </button>
+                            </div>
+                        </div>
+
+                        <!-- Beautiful Toggle Switch -->
+                        <div class="flex items-center justify-between py-1">
+                            <span class="text-sm text-slate-600 dark:text-slate-300">Angemeldet bleiben</span>
+                            <button
+                                type="button"
+                                @click="rememberMe = !rememberMe"
+                                :class="[
+                                    'relative w-11 h-6 rounded-full transition-colors duration-200',
+                                    rememberMe ? 'bg-primary' : 'bg-slate-300 dark:bg-slate-600'
+                                ]"
+                            >
+                                <span :class="[
+                                    'absolute top-0.5 w-5 h-5 bg-white rounded-full shadow-md transition-transform duration-200',
+                                    rememberMe ? 'left-5' : 'left-0.5'
+                                ]"></span>
+                            </button>
+                        </div>
+
+                        <div v-if="error" class="p-3 bg-red-50 dark:bg-red-900/30 border border-red-200 dark:border-red-800 rounded-xl">
+                            <p class="text-sm text-red-600 dark:text-red-400">{{ error }}</p>
+                        </div>
+
+                        <button
+                            type="submit"
+                            :disabled="loading"
+                            class="w-full py-3 px-4 bg-primary text-white font-bold rounded-xl hover:bg-primary/90 focus:ring-4 focus:ring-primary/30 transition disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-center"
+                        >
+                            <svg v-if="loading" class="animate-spin -ml-1 mr-2 h-5 w-5 text-white" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+                                <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+                                <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+                            </svg>
+                            {{ loading ? 'Wird angemeldet...' : 'Anmelden' }}
+                        </button>
+                    </form>
+                </template>
+
+                <div class="mt-3 pt-3 border-t border-slate-100 dark:border-slate-700 text-center">
+                    <p class="text-xs text-slate-400 dark:text-slate-500">
+                        powered by <span class="font-semibold">XINON</span>
+                    </p>
+                </div>
+            </div>
+        </div>
+    `
+};
diff --git a/public/mobile/components/MainMenu.js b/public/mobile/components/MainMenu.js
new file mode 100644
index 000000000..6efe3d0d8
--- /dev/null
+++ b/public/mobile/components/MainMenu.js
@@ -0,0 +1,66 @@
+/**
+ * MainMenu Component
+ *
+ * Displays the main module menu for the MobileApp.
+ * Shows available modules like "Lager" that the user can access.
+ */
+
+export default {
+    name: 'MainMenu',
+    emits: ['navigate'],
+    props: {
+        user: Object
+    },
+
+    setup(props, { emit }) {
+        // Available modules
+        const modules = [
+            {
+                id: 'Lager',
+                name: 'Lager',
+                icon: 'warehouse',
+                color: 'bg-blue-500',
+                iconColor: 'text-blue-500'
+            }
+            // Future modules can be added here
+        ];
+
+        const openModule = (moduleId) => {
+            emit('navigate', moduleId, null);
+        };
+
+        return {
+            modules,
+            openModule
+        };
+    },
+
+    template: `
+        <div class="p-3">
+            <!-- Module List -->
+            <div class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden shadow-sm">
+                <button
+                    v-for="(module, index) in modules"
+                    :key="module.id"
+                    @click="openModule(module.id)"
+                    :class="[
+                        'w-full flex items-center px-4 py-3.5 hover:bg-slate-50 dark:hover:bg-slate-700/50 active:bg-slate-100 dark:active:bg-slate-700 transition text-left',
+                        index !== modules.length - 1 ? 'border-b border-slate-100 dark:border-slate-700' : ''
+                    ]"
+                >
+                    <div :class="[module.color, 'w-10 h-10 rounded-lg flex items-center justify-center flex-shrink-0']">
+                        <svg v-if="module.icon === 'warehouse'" xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-white" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 14v3m4-3v3m4-3v3M3 21h18M3 10h18M3 7l9-4 9 4M4 10h16v11H4V10z" />
+                        </svg>
+                    </div>
+                    <span class="ml-3 font-medium text-slate-800 dark:text-white flex-1">
+                        {{ module.name }}
+                    </span>
+                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-slate-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
+                    </svg>
+                </button>
+            </div>
+        </div>
+    `
+};
diff --git a/public/mobile/manifest.json b/public/mobile/manifest.json
new file mode 100644
index 000000000..eeb099605
--- /dev/null
+++ b/public/mobile/manifest.json
@@ -0,0 +1,26 @@
+{
+    "name": "Xinon Mobile",
+    "short_name": "Xinon",
+    "description": "Mobile-optimierte Tools für Xinon",
+    "start_url": "/MobileApp",
+    "scope": "/MobileApp",
+    "display": "standalone",
+    "orientation": "portrait",
+    "background_color": "#f1f5f9",
+    "theme_color": "#005384",
+    "icons": [
+        {
+            "src": "/assets/images/xinon-sm.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "purpose": "any maskable"
+        },
+        {
+            "src": "/assets/images/xinon-sm.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "any maskable"
+        }
+    ],
+    "categories": ["business", "productivity"]
+}
diff --git a/public/mobile/modules/lager/LagerModule.js b/public/mobile/modules/lager/LagerModule.js
new file mode 100644
index 000000000..5e25a0c35
--- /dev/null
+++ b/public/mobile/modules/lager/LagerModule.js
@@ -0,0 +1,166 @@
+/**
+ * Lager Module
+ *
+ * Main module for warehouse management.
+ * Shows submodules: Inventur (stocktake)
+ */
+
+import StocktakeList from '/mobile/modules/lager/inventur/StocktakeList.js';
+import Scanner from '/mobile/modules/lager/inventur/Scanner.js';
+import MovementForm from '/mobile/modules/lager/movement/MovementForm.js';
+
+export default {
+    name: 'LagerModule',
+    emits: ['navigate', 'toast'],
+    props: {
+        user: Object,
+        submodule: String,
+        simpleMode: Boolean
+    },
+    components: {
+        StocktakeList,
+        Scanner,
+        MovementForm
+    },
+
+    setup(props, { emit }) {
+        const { ref, computed, watch } = Vue;
+
+        // Submodules available in Lager
+        const submodules = [
+            {
+                id: 'Inventur',
+                name: 'Inventur',
+                icon: 'clipboard',
+                color: 'bg-green-500'
+            },
+            {
+                id: 'Movement',
+                name: 'Lagerbewegung',
+                icon: 'arrows',
+                color: 'bg-blue-500'
+            }
+        ];
+
+        // Scanner state
+        const selectedStocktake = ref(null);
+        const showScanner = ref(false);
+
+        // Current view based on submodule
+        const currentView = computed(() => {
+            if (!props.submodule) return 'menu';
+            if (props.submodule.toLowerCase() === 'inventur') {
+                return showScanner.value ? 'scanner' : 'inventur';
+            }
+            if (props.submodule.toLowerCase() === 'movement') {
+                return 'movement';
+            }
+            return 'menu';
+        });
+
+        // Watch for submodule changes
+        watch(() => props.submodule, (newVal) => {
+            if (!newVal) {
+                showScanner.value = false;
+                selectedStocktake.value = null;
+            }
+        });
+
+        const openSubmodule = (submoduleId) => {
+            emit('navigate', 'Lager', submoduleId);
+        };
+
+        const goBack = () => {
+            if (showScanner.value) {
+                showScanner.value = false;
+                selectedStocktake.value = null;
+            }
+        };
+
+        const openScanner = (stocktake) => {
+            selectedStocktake.value = stocktake;
+            showScanner.value = true;
+        };
+
+        const closeScanner = () => {
+            showScanner.value = false;
+            selectedStocktake.value = null;
+        };
+
+        const showToast = (message, type) => {
+            emit('toast', message, type);
+        };
+
+        return {
+            submodules,
+            selectedStocktake,
+            showScanner,
+            currentView,
+            openSubmodule,
+            goBack,
+            openScanner,
+            closeScanner,
+            showToast
+        };
+    },
+
+    template: `
+        <div class="h-full">
+            <!-- Submodule Menu -->
+            <template v-if="currentView === 'menu'">
+                <div class="p-3">
+                    <div class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden shadow-sm">
+                        <button
+                            v-for="(sub, index) in submodules"
+                            :key="sub.id"
+                            @click="openSubmodule(sub.id)"
+                            :class="[
+                                'w-full flex items-center px-4 py-3.5 hover:bg-slate-50 dark:hover:bg-slate-700/50 active:bg-slate-100 dark:active:bg-slate-700 transition text-left',
+                                index !== submodules.length - 1 ? 'border-b border-slate-100 dark:border-slate-700' : ''
+                            ]"
+                        >
+                            <div :class="[sub.color, 'w-10 h-10 rounded-lg flex items-center justify-center flex-shrink-0']">
+                                <svg v-if="sub.icon === 'clipboard'" xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-white" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-3 7h3m-3 4h3m-6-4h.01M9 16h.01" />
+                                </svg>
+                                <svg v-else-if="sub.icon === 'arrows'" xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-white" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 16V4m0 0L3 8m4-4l4 4m6 0v12m0 0l4-4m-4 4l-4-4" />
+                                </svg>
+                            </div>
+                            <span class="ml-3 font-medium text-slate-800 dark:text-white flex-1">
+                                {{ sub.name }}
+                            </span>
+                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-slate-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
+                            </svg>
+                        </button>
+                    </div>
+                </div>
+            </template>
+
+            <!-- Inventur: Stocktake List -->
+            <StocktakeList
+                v-else-if="currentView === 'inventur'"
+                :user="user"
+                @select="openScanner"
+            />
+
+            <!-- Inventur: Scanner -->
+            <Scanner
+                v-else-if="currentView === 'scanner'"
+                :stocktake="selectedStocktake"
+                :user="user"
+                @close="closeScanner"
+                @toast="showToast"
+            />
+
+            <!-- Movement: Movement Form -->
+            <MovementForm
+                v-else-if="currentView === 'movement'"
+                :user="user"
+                :simple-mode="simpleMode"
+                @toast="showToast"
+            />
+        </div>
+    `
+};
diff --git a/public/mobile/modules/lager/inventur/Scanner.js b/public/mobile/modules/lager/inventur/Scanner.js
new file mode 100644
index 000000000..0697fbc67
--- /dev/null
+++ b/public/mobile/modules/lager/inventur/Scanner.js
@@ -0,0 +1,437 @@
+/**
+ * Scanner Component (Inventur)
+ *
+ * The main scanning interface for stocktakes.
+ * Uses the new API path: /MobileApp/Lager/Inventur/{action}
+ */
+
+// Inventur-specific API
+const inventurApi = {
+    get: (endpoint) => fetch(`/MobileApp/Lager/Inventur/${endpoint}`).then(r => r.json()),
+    post: (endpoint, data) => fetch(`/MobileApp/Lager/Inventur/${endpoint}`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(data)
+    }).then(r => r.json())
+};
+
+export default {
+    name: 'Scanner',
+    emits: ['close', 'toast'],
+    props: {
+        stocktake: { type: Object, required: true },
+        user: { type: Object, required: true }
+    },
+
+    setup(props, { emit }) {
+        const { ref, onMounted, onUnmounted, nextTick, computed } = Vue;
+
+        // State
+        const currentTab = ref('scan');
+        const isLoading = ref(false);
+
+        // Scanner
+        const scanner = ref(null);
+        const isScannerActive = ref(false);
+        const scannerError = ref('');
+
+        // Article
+        const scannedArticle = ref(null);
+        const quantity = ref('1');
+        const rack = ref('');
+        const shelf = ref('');
+
+        // Search
+        const searchQuery = ref('');
+        const searchResults = ref([]);
+        const categories = ref([]);
+        const selectedCategory = ref(0);
+        const isSearching = ref(false);
+
+        // History
+        const recentScans = ref([]);
+        const isLoadingHistory = ref(false);
+
+        // Warning
+        const alreadyScannedWarning = ref(null);
+
+        // Keypad
+        const showKeypad = ref(false);
+
+        // Computed
+        const canSubmit = computed(() => {
+            return scannedArticle.value && parseFloat(quantity.value) > 0 && !isLoading.value;
+        });
+
+        // Scanner functions
+        const startScanner = async () => {
+            scannerError.value = '';
+            try {
+                scanner.value = new Html5Qrcode('qr-reader');
+                await scanner.value.start(
+                    { facingMode: 'environment' },
+                    { fps: 10, qrbox: { width: 250, height: 250 }, aspectRatio: 1.0 },
+                    onScanSuccess,
+                    () => {}
+                );
+                isScannerActive.value = true;
+            } catch (err) {
+                scannerError.value = 'Kamera konnte nicht gestartet werden. Bitte Berechtigungen prüfen.';
+            }
+        };
+
+        const stopScanner = async () => {
+            if (scanner.value && isScannerActive.value) {
+                try { await scanner.value.stop(); } catch (e) {}
+                isScannerActive.value = false;
+            }
+        };
+
+        const onScanSuccess = async (decodedText) => {
+            await stopScanner();
+            await lookupArticle(decodedText);
+        };
+
+        // Article lookup
+        const lookupArticle = async (code) => {
+            isLoading.value = true;
+            alreadyScannedWarning.value = null;
+
+            try {
+                const result = await inventurApi.get(`getArticle?code=${encodeURIComponent(code)}`);
+
+                if (result.success) {
+                    scannedArticle.value = result.article;
+                    const checkResult = await inventurApi.get(
+                        `checkAlreadyScanned?stocktakeId=${props.stocktake.id}&articleId=${result.article.id}`
+                    );
+                    if (checkResult.success && checkResult.alreadyScanned) {
+                        alreadyScannedWarning.value = checkResult.existingItem;
+                    }
+                    quantity.value = '1';
+                } else {
+                    emit('toast', result.message || 'Artikel nicht gefunden', 'error');
+                    await startScanner();
+                }
+            } catch (e) {
+                emit('toast', 'Fehler beim Laden des Artikels', 'error');
+                await startScanner();
+            } finally {
+                isLoading.value = false;
+            }
+        };
+
+        // Submit
+        const submitScan = async (overwrite = false) => {
+            if (!canSubmit.value) return;
+            isLoading.value = true;
+
+            try {
+                const payload = {
+                    stocktakeId: props.stocktake.id,
+                    articleId: scannedArticle.value.id,
+                    quantity: parseFloat(quantity.value),
+                    rack: rack.value || null,
+                    shelf: shelf.value || null,
+                    overwrite: overwrite,
+                    overwriteItemId: overwrite && alreadyScannedWarning.value ? alreadyScannedWarning.value.id : 0
+                };
+
+                const result = await inventurApi.post('submitScan', payload);
+
+                if (result.success) {
+                    emit('toast', result.message, 'success');
+                    scannedArticle.value = null;
+                    quantity.value = '1';
+                    rack.value = '';
+                    shelf.value = '';
+                    alreadyScannedWarning.value = null;
+                    await startScanner();
+                } else {
+                    emit('toast', result.message || 'Fehler beim Speichern', 'error');
+                }
+            } catch (e) {
+                emit('toast', 'Netzwerkfehler', 'error');
+            } finally {
+                isLoading.value = false;
+            }
+        };
+
+        // Search
+        const loadCategories = async () => {
+            const result = await inventurApi.get('getCategories');
+            if (result.success) categories.value = result.categories;
+        };
+
+        const searchArticles = async () => {
+            if (searchQuery.value.length < 2 && !selectedCategory.value) {
+                searchResults.value = [];
+                return;
+            }
+            isSearching.value = true;
+            try {
+                const params = new URLSearchParams();
+                if (searchQuery.value) params.set('query', searchQuery.value);
+                if (selectedCategory.value) params.set('categoryId', selectedCategory.value);
+                const result = await inventurApi.get(`searchArticles?${params}`);
+                if (result.success) searchResults.value = result.articles;
+            } catch (e) {} finally {
+                isSearching.value = false;
+            }
+        };
+
+        const selectSearchResult = async (article) => {
+            await stopScanner();
+            scannedArticle.value = article;
+            quantity.value = '1';
+            currentTab.value = 'scan';
+
+            const checkResult = await inventurApi.get(
+                `checkAlreadyScanned?stocktakeId=${props.stocktake.id}&articleId=${article.id}`
+            );
+            if (checkResult.success && checkResult.alreadyScanned) {
+                alreadyScannedWarning.value = checkResult.existingItem;
+            }
+        };
+
+        // History
+        const loadHistory = async () => {
+            isLoadingHistory.value = true;
+            try {
+                const result = await inventurApi.get(`getMyScans?stocktakeId=${props.stocktake.id}`);
+                if (result.success) recentScans.value = result.items;
+            } catch (e) {} finally {
+                isLoadingHistory.value = false;
+            }
+        };
+
+        // Keypad
+        const appendDigit = (digit) => {
+            if (digit === '.' && quantity.value.includes('.')) return;
+            if (quantity.value === '0' && digit !== '.') {
+                quantity.value = digit;
+            } else {
+                quantity.value += digit;
+            }
+        };
+
+        const deleteDigit = () => {
+            quantity.value = quantity.value.length > 1 ? quantity.value.slice(0, -1) : '0';
+        };
+
+        const clearQuantity = () => { quantity.value = '0'; };
+
+        // Navigation
+        const handleClose = async () => {
+            await stopScanner();
+            emit('close');
+        };
+
+        const switchTab = async (tab) => {
+            currentTab.value = tab;
+            if (tab === 'scan' && !scannedArticle.value) {
+                await nextTick();
+                await startScanner();
+            } else if (tab === 'search') {
+                await stopScanner();
+                await loadCategories();
+            } else if (tab === 'history') {
+                await stopScanner();
+                await loadHistory();
+            }
+        };
+
+        const cancelScan = async () => {
+            scannedArticle.value = null;
+            alreadyScannedWarning.value = null;
+            quantity.value = '1';
+            await startScanner();
+        };
+
+        onMounted(async () => { await startScanner(); });
+        onUnmounted(async () => { await stopScanner(); });
+
+        return {
+            currentTab, isLoading, isScannerActive, scannerError,
+            scannedArticle, quantity, rack, shelf,
+            searchQuery, searchResults, categories, selectedCategory, isSearching,
+            recentScans, isLoadingHistory,
+            alreadyScannedWarning, showKeypad, canSubmit,
+            startScanner, stopScanner, submitScan, searchArticles, selectSearchResult,
+            loadHistory, appendDigit, deleteDigit, clearQuantity,
+            handleClose, switchTab, cancelScan
+        };
+    },
+
+    template: `
+        <div class="flex flex-col h-full">
+            <!-- Title bar with close -->
+            <div class="flex items-center justify-between px-3 py-2 bg-white dark:bg-slate-800 border-b border-slate-200 dark:border-slate-700">
+                <span class="text-sm font-medium text-slate-600 dark:text-slate-300 truncate flex-1">{{ stocktake.title || 'Inventur #' + stocktake.stocktakeNumber }}</span>
+                <button @click="handleClose" class="ml-2 p-1.5 rounded-full text-slate-500 hover:bg-slate-100 dark:hover:bg-slate-700 transition">
+                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+                    </svg>
+                </button>
+            </div>
+
+            <!-- Tabs -->
+            <div class="flex bg-slate-100 dark:bg-slate-900 border-b border-slate-200 dark:border-slate-700 px-3 py-2">
+                <button @click="switchTab('scan')" :class="[currentTab === 'scan' ? 'bg-white dark:bg-slate-800 shadow-sm' : 'text-slate-500 dark:text-slate-400']" class="flex-1 py-2 text-sm font-medium rounded-lg transition">Scannen</button>
+                <button @click="switchTab('search')" :class="[currentTab === 'search' ? 'bg-white dark:bg-slate-800 shadow-sm' : 'text-slate-500 dark:text-slate-400']" class="flex-1 py-2 text-sm font-medium rounded-lg transition mx-1">Suche</button>
+                <button @click="switchTab('history')" :class="[currentTab === 'history' ? 'bg-white dark:bg-slate-800 shadow-sm' : 'text-slate-500 dark:text-slate-400']" class="flex-1 py-2 text-sm font-medium rounded-lg transition">Verlauf</button>
+            </div>
+
+            <!-- Content -->
+            <main class="flex-grow overflow-y-auto bg-slate-50 dark:bg-slate-900">
+                <!-- SCAN TAB -->
+                <div v-if="currentTab === 'scan'" class="p-4 space-y-4">
+                    <!-- Scanner -->
+                    <div v-if="!scannedArticle" class="space-y-4">
+                        <div id="qr-reader" class="w-full rounded-lg overflow-hidden bg-black"></div>
+                        <div v-if="scannerError" class="p-4 bg-red-50 dark:bg-red-900/30 rounded-lg">
+                            <p class="text-sm text-red-600 dark:text-red-400">{{ scannerError }}</p>
+                            <button @click="startScanner" class="mt-2 text-sm font-medium text-primary">Erneut versuchen</button>
+                        </div>
+                        <p class="text-center text-sm text-slate-500 dark:text-slate-400">QR-Code scannen oder Artikel suchen</p>
+                    </div>
+
+                    <!-- Scanned Article -->
+                    <div v-else class="space-y-4">
+                        <!-- Warning -->
+                        <div v-if="alreadyScannedWarning" class="p-4 bg-amber-50 dark:bg-amber-900/30 border border-amber-200 dark:border-amber-800 rounded-lg">
+                            <div class="flex items-start">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-amber-500 mr-2 flex-shrink-0 mt-0.5" viewBox="0 0 20 20" fill="currentColor">
+                                    <path fill-rule="evenodd" d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z" clip-rule="evenodd" />
+                                </svg>
+                                <div>
+                                    <p class="font-medium text-amber-800 dark:text-amber-300">Bereits gescannt</p>
+                                    <p class="text-sm text-amber-700 dark:text-amber-400 mt-1">
+                                        Menge: {{ alreadyScannedWarning.countedQuantity }}<br>
+                                        Von: {{ alreadyScannedWarning.scannedBy }}<br>
+                                        Am: {{ alreadyScannedWarning.scannedAt }}
+                                    </p>
+                                </div>
+                            </div>
+                        </div>
+
+                        <!-- Article Info -->
+                        <div class="bg-white dark:bg-slate-800 p-4 rounded-lg shadow-sm">
+                            <h3 class="font-bold text-lg text-slate-800 dark:text-white">{{ scannedArticle.title }}</h3>
+                            <p class="text-sm text-slate-500 dark:text-slate-400 mt-1">Art.-Nr.: {{ scannedArticle.articleNumber }}</p>
+                            <p v-if="scannedArticle.categoryName" class="text-sm text-slate-500 dark:text-slate-400">Kategorie: {{ scannedArticle.categoryName }}</p>
+                        </div>
+
+                        <!-- Quantity -->
+                        <div class="bg-white dark:bg-slate-800 p-4 rounded-lg shadow-sm">
+                            <label class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
+                                Menge ({{ scannedArticle.unit || 'Stk.' }})
+                            </label>
+                            <div @click="showKeypad = true" class="w-full p-4 text-3xl font-bold text-center border-2 border-slate-300 dark:border-slate-600 rounded-lg cursor-pointer hover:border-primary transition text-slate-800 dark:text-white">
+                                {{ quantity }}
+                            </div>
+                        </div>
+
+                        <!-- Rack/Shelf -->
+                        <div class="grid grid-cols-2 gap-3">
+                            <div>
+                                <label class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-1">Regal</label>
+                                <input v-model="rack" type="text" class="w-full p-3 border border-slate-300 dark:border-slate-600 rounded-lg dark:bg-slate-800 dark:text-white" placeholder="z.B. A1">
+                            </div>
+                            <div>
+                                <label class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-1">Fach</label>
+                                <input v-model="shelf" type="text" class="w-full p-3 border border-slate-300 dark:border-slate-600 rounded-lg dark:bg-slate-800 dark:text-white" placeholder="z.B. 3">
+                            </div>
+                        </div>
+
+                        <!-- Buttons -->
+                        <div class="space-y-2">
+                            <button v-if="alreadyScannedWarning" @click="submitScan(false)" :disabled="!canSubmit" class="w-full py-4 bg-green-600 text-white font-bold rounded-lg disabled:opacity-50">Zur Menge addieren</button>
+                            <button v-if="alreadyScannedWarning" @click="submitScan(true)" :disabled="!canSubmit" class="w-full py-4 bg-amber-600 text-white font-bold rounded-lg disabled:opacity-50">Überschreiben</button>
+                            <button v-if="!alreadyScannedWarning" @click="submitScan(false)" :disabled="!canSubmit" class="w-full py-4 bg-green-600 text-white font-bold rounded-lg disabled:opacity-50">
+                                {{ isLoading ? 'Speichert...' : 'Speichern' }}
+                            </button>
+                            <button @click="cancelScan" class="w-full py-3 text-slate-600 dark:text-slate-400 font-medium">Abbrechen</button>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- SEARCH TAB -->
+                <div v-else-if="currentTab === 'search'" class="p-4 space-y-4">
+                    <div class="sticky top-0 bg-slate-100 dark:bg-slate-900 pb-2 space-y-3">
+                        <input v-model="searchQuery" @input="searchArticles" type="search" placeholder="Artikel suchen..." class="w-full p-3 border border-slate-300 dark:border-slate-600 rounded-lg dark:bg-slate-800 dark:text-white">
+                        <select v-model="selectedCategory" @change="searchArticles" class="w-full p-3 border border-slate-300 dark:border-slate-600 rounded-lg dark:bg-slate-800 dark:text-white">
+                            <option :value="0">Alle Kategorien</option>
+                            <option v-for="cat in categories" :key="cat.id" :value="cat.id">{{ cat.name }}</option>
+                        </select>
+                    </div>
+
+                    <div v-if="isSearching" class="text-center py-8">
+                        <div class="animate-spin h-8 w-8 border-4 border-primary border-t-transparent rounded-full mx-auto"></div>
+                    </div>
+
+                    <div v-else-if="searchResults.length === 0" class="text-center py-8">
+                        <p class="text-slate-500 dark:text-slate-400">{{ searchQuery.length < 2 ? 'Mindestens 2 Zeichen eingeben' : 'Keine Artikel gefunden' }}</p>
+                    </div>
+
+                    <div v-else class="space-y-2">
+                        <div v-for="article in searchResults" :key="article.id" @click="selectSearchResult(article)" class="bg-white dark:bg-slate-800 p-3 rounded-lg shadow-sm cursor-pointer hover:shadow-md active:scale-[0.98] transition">
+                            <p class="font-medium text-slate-800 dark:text-white">{{ article.title }}</p>
+                            <p class="text-sm text-slate-500 dark:text-slate-400">{{ article.articleNumber }}</p>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- HISTORY TAB -->
+                <div v-else-if="currentTab === 'history'" class="p-4">
+                    <div v-if="isLoadingHistory" class="space-y-3">
+                        <div v-for="i in 5" :key="i" class="bg-white dark:bg-slate-800 p-3 rounded-lg shadow-sm animate-pulse">
+                            <div class="h-4 bg-slate-200 dark:bg-slate-700 rounded w-3/4 mb-2"></div>
+                            <div class="h-3 bg-slate-200 dark:bg-slate-700 rounded w-1/2"></div>
+                        </div>
+                    </div>
+
+                    <div v-else-if="recentScans.length === 0" class="text-center py-8">
+                        <p class="text-slate-500 dark:text-slate-400">Noch keine Scans</p>
+                    </div>
+
+                    <div v-else class="space-y-2">
+                        <div v-for="scan in recentScans" :key="scan.id" class="bg-white dark:bg-slate-800 p-3 rounded-lg shadow-sm">
+                            <div class="flex justify-between items-start">
+                                <div>
+                                    <p class="font-medium text-slate-800 dark:text-white">{{ scan.articleTitle }}</p>
+                                    <p class="text-sm text-slate-500 dark:text-slate-400">{{ scan.articleNumber }}</p>
+                                </div>
+                                <div class="text-right">
+                                    <p class="font-bold text-slate-800 dark:text-white">{{ scan.countedQuantity }} {{ scan.unit }}</p>
+                                    <p class="text-xs text-slate-400">{{ scan.scannedAt }}</p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </main>
+
+            <!-- Keypad -->
+            <transition name="slide-up">
+                <div v-if="showKeypad" class="fixed inset-0 bg-black bg-opacity-50 z-50 flex items-end">
+                    <div class="bg-white dark:bg-slate-800 w-full rounded-t-2xl p-4 safe-area-bottom">
+                        <div class="flex justify-between items-center mb-4">
+                            <button @click="clearQuantity" class="px-4 py-2 text-red-500 font-medium">C</button>
+                            <div class="text-2xl font-bold text-slate-800 dark:text-white">{{ quantity }}</div>
+                            <button @click="showKeypad = false" class="px-4 py-2 text-primary font-medium">Fertig</button>
+                        </div>
+                        <div class="grid grid-cols-3 gap-2">
+                            <button v-for="d in ['1','2','3','4','5','6','7','8','9','.','0']" :key="d" @click="appendDigit(d)" class="py-4 text-xl font-bold bg-slate-100 dark:bg-slate-700 rounded-lg active:bg-slate-200 dark:active:bg-slate-600 text-slate-800 dark:text-white">{{ d }}</button>
+                            <button @click="deleteDigit" class="py-4 text-xl font-bold bg-slate-100 dark:bg-slate-700 rounded-lg active:bg-slate-200 dark:active:bg-slate-600 text-slate-800 dark:text-white">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 mx-auto" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2M3 12l6.414 6.414a2 2 0 001.414.586H19a2 2 0 002-2V7a2 2 0 00-2-2h-8.172a2 2 0 00-1.414.586L3 12z" />
+                                </svg>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </transition>
+        </div>
+    `
+};
diff --git a/public/mobile/modules/lager/inventur/StocktakeList.js b/public/mobile/modules/lager/inventur/StocktakeList.js
new file mode 100644
index 000000000..4fd749571
--- /dev/null
+++ b/public/mobile/modules/lager/inventur/StocktakeList.js
@@ -0,0 +1,151 @@
+/**
+ * StocktakeList Component (Inventur)
+ *
+ * Displays a list of active stocktakes.
+ * Uses the new API path: /MobileApp/Lager/Inventur/{action}
+ */
+
+import { api } from '/mobile/shared/auth.js';
+
+// Override API base for Inventur
+const inventurApi = {
+    get: (endpoint) => fetch(`/MobileApp/Lager/Inventur/${endpoint}`).then(r => r.json()),
+    post: (endpoint, data) => fetch(`/MobileApp/Lager/Inventur/${endpoint}`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(data)
+    }).then(r => r.json())
+};
+
+export default {
+    name: 'StocktakeList',
+    emits: ['select'],
+    props: {
+        user: Object
+    },
+
+    setup(props, { emit }) {
+        const { ref, onMounted } = Vue;
+
+        const stocktakes = ref([]);
+        const isLoading = ref(true);
+        const error = ref('');
+
+        const fetchStocktakes = async () => {
+            isLoading.value = true;
+            error.value = '';
+
+            try {
+                const result = await inventurApi.get('getActiveStocktakes');
+
+                if (result.success) {
+                    stocktakes.value = result.stocktakes;
+                } else {
+                    error.value = result.error || 'Fehler beim Laden';
+                }
+            } catch (e) {
+                error.value = 'Netzwerkfehler';
+            } finally {
+                isLoading.value = false;
+            }
+        };
+
+        const selectStocktake = (stocktake) => {
+            emit('select', stocktake);
+        };
+
+        onMounted(() => {
+            fetchStocktakes();
+        });
+
+        return {
+            stocktakes,
+            isLoading,
+            error,
+            fetchStocktakes,
+            selectStocktake
+        };
+    },
+
+    template: `
+        <div class="h-full flex flex-col">
+            <!-- Refresh bar -->
+            <div class="flex items-center justify-between px-3 py-2 bg-white dark:bg-slate-800 border-b border-slate-200 dark:border-slate-700">
+                <span class="text-sm font-medium text-slate-600 dark:text-slate-300">Aktive Inventuren</span>
+                <button
+                    @click="fetchStocktakes"
+                    class="p-2 rounded-full text-slate-500 hover:bg-slate-100 dark:hover:bg-slate-700 transition"
+                    :disabled="isLoading"
+                >
+                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" :class="{ 'animate-spin': isLoading }" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15" />
+                    </svg>
+                </button>
+            </div>
+
+            <!-- Content -->
+            <div class="flex-1 overflow-y-auto p-3">
+                <!-- Loading -->
+                <div v-if="isLoading" class="space-y-3">
+                    <div v-for="i in 3" :key="i" class="bg-white dark:bg-slate-800 p-4 rounded-xl shadow-sm animate-pulse">
+                        <div class="h-5 bg-slate-200 dark:bg-slate-700 rounded w-3/4 mb-2"></div>
+                        <div class="h-4 bg-slate-200 dark:bg-slate-700 rounded w-1/2 mb-3"></div>
+                        <div class="h-3 bg-slate-200 dark:bg-slate-700 rounded w-1/3"></div>
+                    </div>
+                </div>
+
+                <!-- Error -->
+                <div v-else-if="error" class="text-center py-8">
+                    <svg xmlns="http://www.w3.org/2000/svg" class="h-12 w-12 mx-auto text-red-400 mb-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
+                    </svg>
+                    <p class="text-slate-500 dark:text-slate-400 mb-4">{{ error }}</p>
+                    <button @click="fetchStocktakes" class="px-4 py-2 bg-primary text-white rounded-lg font-medium">
+                        Erneut versuchen
+                    </button>
+                </div>
+
+                <!-- Empty -->
+                <div v-else-if="stocktakes.length === 0" class="text-center py-8">
+                    <svg xmlns="http://www.w3.org/2000/svg" class="h-12 w-12 mx-auto text-slate-300 dark:text-slate-600 mb-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2" />
+                    </svg>
+                    <p class="text-slate-500 dark:text-slate-400">Keine aktiven Inventuren</p>
+                </div>
+
+                <!-- Stocktake List -->
+                <div v-else class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden shadow-sm">
+                    <button
+                        v-for="(stocktake, index) in stocktakes"
+                        :key="stocktake.id"
+                        @click="selectStocktake(stocktake)"
+                        :class="[
+                            'w-full text-left px-4 py-3 hover:bg-slate-50 dark:hover:bg-slate-700/50 active:bg-slate-100 dark:active:bg-slate-700 transition',
+                            index !== stocktakes.length - 1 ? 'border-b border-slate-100 dark:border-slate-700' : ''
+                        ]"
+                    >
+                        <div class="flex justify-between items-start">
+                            <div class="flex-1 min-w-0">
+                                <h3 class="font-medium text-slate-800 dark:text-white truncate">
+                                    {{ stocktake.title || 'Inventur #' + stocktake.stocktakeNumber }}
+                                </h3>
+                                <p class="text-sm text-slate-500 dark:text-slate-400 mt-0.5">
+                                    {{ stocktake.locationName }}
+                                </p>
+                            </div>
+                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-slate-400 flex-shrink-0 ml-2" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
+                            </svg>
+                        </div>
+                        <div class="flex items-center mt-2 text-xs text-slate-400 dark:text-slate-500">
+                            <span class="font-medium text-slate-600 dark:text-slate-400">{{ stocktake.totalScannedItems || 0 }}</span>
+                            <span class="ml-1">Artikel</span>
+                            <span class="mx-2">·</span>
+                            <span>{{ stocktake.startedAt || 'Nicht gestartet' }}</span>
+                        </div>
+                    </button>
+                </div>
+            </div>
+        </div>
+    `
+};
diff --git a/public/mobile/modules/lager/movement/MovementForm.js b/public/mobile/modules/lager/movement/MovementForm.js
new file mode 100644
index 000000000..d10b8fe1e
--- /dev/null
+++ b/public/mobile/modules/lager/movement/MovementForm.js
@@ -0,0 +1,1308 @@
+/**
+ * MovementForm Component (WarehouseMovement)
+ *
+ * The main interface for stock movements (IN/OUT/ADJUSTMENT).
+ * API: /MobileApp/Lager/Movement/{action}
+ */
+
+const movementApi = {
+    get: (endpoint) => fetch(`/MobileApp/Lager/Movement/${endpoint}`).then(r => r.json()),
+    post: (endpoint, data) => fetch(`/MobileApp/Lager/Movement/${endpoint}`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(data)
+    }).then(r => r.json())
+};
+
+// Custom BottomSheet Select Component
+const BottomSheetSelect = {
+    name: 'BottomSheetSelect',
+    emits: ['update:modelValue'],
+    props: {
+        modelValue: [String, Number],
+        options: { type: Array, default: () => [] },
+        label: { type: String, default: '' },
+        placeholder: { type: String, default: 'Auswählen...' },
+        valueKey: { type: String, default: 'value' },
+        labelKey: { type: String, default: 'text' },
+        icon: { type: String, default: null },
+        position: { type: String, default: 'bottom' } // 'bottom' or 'top'
+    },
+    setup(props, { emit }) {
+        const isOpen = Vue.ref(false);
+
+        const selectedLabel = Vue.computed(() => {
+            const option = props.options.find(o =>
+                (typeof o === 'object' ? o[props.valueKey] : o) === props.modelValue
+            );
+            if (!option) return props.placeholder;
+            return typeof option === 'object' ? option[props.labelKey] : option;
+        });
+
+        const select = (option) => {
+            const value = typeof option === 'object' ? option[props.valueKey] : option;
+            emit('update:modelValue', value);
+            isOpen.value = false;
+        };
+
+        return { isOpen, selectedLabel, select };
+    },
+    template: `
+        <div>
+            <!-- Trigger Button -->
+            <button
+                @click="isOpen = true"
+                type="button"
+                class="w-full flex items-center justify-between px-4 py-3 bg-white dark:bg-slate-800 border border-slate-200 dark:border-slate-700 rounded-xl shadow-sm hover:border-slate-300 dark:hover:border-slate-600 transition active:scale-[0.98]"
+            >
+                <div class="flex items-center gap-3">
+                    <div v-if="icon" class="w-8 h-8 rounded-lg bg-slate-100 dark:bg-slate-700 flex items-center justify-center">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-slate-500 dark:text-slate-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path v-if="icon === 'location'" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17.657 16.657L13.414 20.9a1.998 1.998 0 01-2.827 0l-4.244-4.243a8 8 0 1111.314 0z" />
+                            <path v-if="icon === 'location'" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 11a3 3 0 11-6 0 3 3 0 016 0z" />
+                            <path v-if="icon === 'clipboard'" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2" />
+                        </svg>
+                    </div>
+                    <div class="text-left">
+                        <p v-if="label" class="text-xs text-slate-400 dark:text-slate-500 font-medium">{{ label }}</p>
+                        <p class="font-medium text-slate-800 dark:text-white">{{ selectedLabel }}</p>
+                    </div>
+                </div>
+                <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-slate-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+                </svg>
+            </button>
+
+            <!-- Sheet Overlay -->
+            <teleport to="body">
+                <transition name="fade">
+                    <div v-if="isOpen" class="fixed inset-0 bg-black/50 z-50" @click="isOpen = false"></div>
+                </transition>
+
+                <!-- Top Sheet -->
+                <transition :name="position === 'top' ? 'slide-down' : 'slide-up'">
+                    <div v-if="isOpen" :class="[
+                        'fixed left-0 right-0 z-50 bg-white dark:bg-slate-800 shadow-xl max-h-[60vh] flex flex-col',
+                        position === 'top' ? 'top-0 rounded-b-2xl safe-area-top' : 'bottom-0 rounded-t-2xl safe-area-bottom'
+                    ]">
+                        <!-- Handle -->
+                        <div v-if="position === 'bottom'" class="flex justify-center py-3">
+                            <div class="w-10 h-1 bg-slate-300 dark:bg-slate-600 rounded-full"></div>
+                        </div>
+                        <!-- Title -->
+                        <div v-if="label" :class="['px-4', position === 'top' ? 'pt-4 pb-2' : 'pb-2']">
+                            <h3 class="font-semibold text-lg text-slate-800 dark:text-white">{{ label }}</h3>
+                        </div>
+                        <!-- Options -->
+                        <div class="overflow-y-auto flex-1 px-2 pb-4">
+                            <button
+                                v-for="option in options"
+                                :key="typeof option === 'object' ? option[valueKey] : option"
+                                @click="select(option)"
+                                :class="[
+                                    'w-full flex items-center justify-between px-4 py-3.5 rounded-xl mb-1 transition',
+                                    (typeof option === 'object' ? option[valueKey] : option) === modelValue
+                                        ? 'bg-primary/10 dark:bg-primary/20'
+                                        : 'hover:bg-slate-100 dark:hover:bg-slate-700/50 active:bg-slate-200 dark:active:bg-slate-700'
+                                ]"
+                            >
+                                <span :class="[
+                                    'font-medium',
+                                    (typeof option === 'object' ? option[valueKey] : option) === modelValue
+                                        ? 'text-primary'
+                                        : 'text-slate-700 dark:text-slate-200'
+                                ]">
+                                    {{ typeof option === 'object' ? option[labelKey] : option }}
+                                </span>
+                                <svg
+                                    v-if="(typeof option === 'object' ? option[valueKey] : option) === modelValue"
+                                    xmlns="http://www.w3.org/2000/svg"
+                                    class="h-5 w-5 text-primary"
+                                    viewBox="0 0 20 20"
+                                    fill="currentColor"
+                                >
+                                    <path fill-rule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd" />
+                                </svg>
+                            </button>
+                        </div>
+                        <!-- Handle at bottom for top sheet -->
+                        <div v-if="position === 'top'" class="flex justify-center py-3">
+                            <div class="w-10 h-1 bg-slate-300 dark:bg-slate-600 rounded-full"></div>
+                        </div>
+                    </div>
+                </transition>
+            </teleport>
+        </div>
+    `
+};
+
+export default {
+    name: 'MovementForm',
+    emits: ['toast'],
+    props: {
+        user: { type: Object, required: true },
+        simpleMode: { type: Boolean, default: false }
+    },
+    components: {
+        BottomSheetSelect
+    },
+
+    setup(props, { emit }) {
+        const { ref, onMounted, onUnmounted, nextTick, computed, watch } = Vue;
+
+        // ==================== CONSTANTS ====================
+        const STORAGE_KEY = 'movement_settings';
+        const LOCATION_COORDS = {
+            office: { lat: 46.99552810791587, lng: 15.7751923956463, name: 'K1 Fladnitz 150' },
+            aussenlager: { lat: 46.99909466636262, lng: 15.77571245012429, name: 'Aussenlager-Extern' }
+        };
+        const GPS_ACCURACY_THRESHOLD = 100; // meters
+
+        // ==================== CONFIG ====================
+        const locations = ref([]);
+        const movementTypes = [
+            { value: 'IN', text: 'Einbuchung', icon: 'plus', color: 'green', defaultReason: 'Warenlieferung' },
+            { value: 'OUT', text: 'Ausbuchung', icon: 'minus', color: 'red', defaultReason: 'Verbrauch' },
+            { value: 'ADJUSTMENT', text: 'Korrektur', icon: 'edit', color: 'yellow', defaultReason: 'Inventurkorrektur' }
+        ];
+        const reasonCategories = ref({});
+
+        // ==================== SELECTION STATE ====================
+        const selectedLocation = ref(null);
+        const selectedType = ref('IN');
+
+        // ==================== GPS STATE ====================
+        const detectedLocation = ref(null);
+        const gpsStatus = ref('idle'); // 'idle', 'detecting', 'detected', 'error'
+        const gpsDistance = ref(null);
+
+        // ==================== MODE TOGGLES ====================
+        const turboMode = ref(false);
+        const batchMode = ref(false);
+
+        // ==================== BATCH CART ====================
+        const cartItems = ref([]);
+        const showCart = ref(false);
+
+        // ==================== TABS ====================
+        const currentTab = ref('scan');
+
+        // ==================== LOADING ====================
+        const isLoading = ref(false);
+        const isInitialized = ref(false);
+
+        // ==================== SCANNER ====================
+        const scanner = ref(null);
+        const isScannerActive = ref(false);
+        const scannerError = ref('');
+
+        // ==================== ARTICLE ====================
+        const scannedArticle = ref(null);
+        const currentStock = ref(0);
+        const quantity = ref('1');
+        const selectedReason = ref('');
+        const note = ref('');
+
+        // ==================== SEARCH ====================
+        const searchQuery = ref('');
+        const searchResults = ref([]);
+        const isSearching = ref(false);
+
+        // ==================== HISTORY ====================
+        const recentMovements = ref([]);
+        const isLoadingHistory = ref(false);
+
+        // ==================== KEYPAD ====================
+        const showKeypad = ref(false);
+        const showNote = ref(false);
+
+        // ==================== UNDO STATE ====================
+        const lastMovement = ref(null);
+        const showUndo = ref(false);
+        let undoTimeout = null;
+
+        // ==================== COMPUTED ====================
+        const canSubmit = computed(() => {
+            return scannedArticle.value &&
+                   selectedLocation.value &&
+                   selectedType.value &&
+                   parseFloat(quantity.value) > 0 &&
+                   selectedReason.value &&
+                   !isLoading.value;
+        });
+
+        const typeColor = computed(() => {
+            const type = movementTypes.find(t => t.value === selectedType.value);
+            return type ? type.color : 'blue';
+        });
+
+        const reasonOptions = computed(() => {
+            const reasons = reasonCategories.value[selectedType.value];
+            if (!reasons) return [];
+            return Object.entries(reasons).map(([key, label]) => ({
+                value: key,
+                text: label
+            }));
+        });
+
+        const cartTotal = computed(() => cartItems.value.length);
+
+        // Filtered movement types (hide ADJUSTMENT in simple mode)
+        const filteredMovementTypes = computed(() => {
+            if (props.simpleMode) {
+                return movementTypes.filter(t => t.value !== 'ADJUSTMENT');
+            }
+            return movementTypes;
+        });
+
+        // GPS distance formatting and color
+        const formattedGpsDistance = computed(() => {
+            if (gpsDistance.value === null) return '';
+            if (gpsDistance.value >= 1000) {
+                return (gpsDistance.value / 1000).toFixed(1) + 'km';
+            }
+            return gpsDistance.value + 'm';
+        });
+
+        const gpsDistanceColor = computed(() => {
+            if (gpsDistance.value === null) return 'text-slate-400';
+            // Green: within 200m (auto-selected range)
+            if (gpsDistance.value <= 200) return 'text-green-500';
+            // Yellow: 200m - 500m (getting far)
+            if (gpsDistance.value <= 500) return 'text-yellow-500';
+            // Red: over 500m (probably wrong location)
+            return 'text-red-500';
+        });
+
+        // ==================== LOCALSTORAGE PERSISTENCE ====================
+        const saveSettings = () => {
+            const settings = {
+                locationId: selectedLocation.value,
+                type: selectedType.value,
+                turboMode: turboMode.value,
+                batchMode: batchMode.value
+            };
+            localStorage.setItem(STORAGE_KEY, JSON.stringify(settings));
+        };
+
+        const loadSettings = () => {
+            try {
+                const saved = localStorage.getItem(STORAGE_KEY);
+                if (saved) {
+                    return JSON.parse(saved);
+                }
+            } catch (e) {}
+            return null;
+        };
+
+        // Load settings IMMEDIATELY (synchronously) before anything else
+        const savedSettings = loadSettings();
+        if (savedSettings) {
+            if (savedSettings.type) selectedType.value = savedSettings.type;
+            if (savedSettings.turboMode !== undefined) turboMode.value = savedSettings.turboMode;
+            if (savedSettings.batchMode !== undefined) batchMode.value = savedSettings.batchMode;
+            // locationId will be applied after locations are loaded
+        }
+
+        // ==================== GPS DETECTION ====================
+        const calculateDistance = (lat1, lng1, lat2, lng2) => {
+            const R = 6371e3; // Earth's radius in meters
+            const φ1 = lat1 * Math.PI / 180;
+            const φ2 = lat2 * Math.PI / 180;
+            const Δφ = (lat2 - lat1) * Math.PI / 180;
+            const Δλ = (lng2 - lng1) * Math.PI / 180;
+            const a = Math.sin(Δφ/2) * Math.sin(Δφ/2) +
+                      Math.cos(φ1) * Math.cos(φ2) *
+                      Math.sin(Δλ/2) * Math.sin(Δλ/2);
+            const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
+            return R * c;
+        };
+
+        const detectLocation = () => {
+            if (!navigator.geolocation) {
+                gpsStatus.value = 'error';
+                return;
+            }
+
+            gpsStatus.value = 'detecting';
+
+            navigator.geolocation.getCurrentPosition(
+                (position) => {
+                    const { latitude, longitude, accuracy } = position.coords;
+
+                    // Calculate distances to both locations
+                    const distToOffice = calculateDistance(latitude, longitude, LOCATION_COORDS.office.lat, LOCATION_COORDS.office.lng);
+                    const distToAussen = calculateDistance(latitude, longitude, LOCATION_COORDS.aussenlager.lat, LOCATION_COORDS.aussenlager.lng);
+
+                    // Find closest location
+                    const closest = distToOffice < distToAussen
+                        ? { name: 'office', distance: distToOffice }
+                        : { name: 'aussenlager', distance: distToAussen };
+
+                    gpsDistance.value = Math.round(closest.distance);
+
+                    // Only auto-select if accuracy is good and we're reasonably close
+                    if (accuracy <= GPS_ACCURACY_THRESHOLD && closest.distance < 500) {
+                        // Find matching location in our locations list
+                        const matchingLoc = locations.value.find(loc =>
+                            loc.title.toLowerCase() === LOCATION_COORDS[closest.name].name.toLowerCase()
+                        );
+                        if (matchingLoc) {
+                            detectedLocation.value = matchingLoc.id;
+                            // Only auto-set if user hasn't saved a preference
+                            if (!savedSettings?.locationId) {
+                                selectedLocation.value = matchingLoc.id;
+                            }
+                            gpsStatus.value = 'detected';
+                        }
+                    } else {
+                        gpsStatus.value = 'detected';
+                    }
+                },
+                (error) => {
+                    gpsStatus.value = 'error';
+                },
+                { enableHighAccuracy: true, timeout: 10000, maximumAge: 60000 }
+            );
+        };
+
+        // ==================== QUICK ACTIONS ====================
+        const quickAction = async (type, reason) => {
+            selectedType.value = type;
+            await nextTick();
+            selectedReason.value = reason;
+            saveSettings();
+            currentTab.value = 'scan';
+            if (!scannedArticle.value) {
+                await startScanner();
+            }
+        };
+
+        // ==================== LOAD INITIAL DATA ====================
+        const loadInitialData = async () => {
+            try {
+                const [locResult, reasonResult] = await Promise.all([
+                    movementApi.get('getLocations'),
+                    movementApi.get('getReasonCategories')
+                ]);
+
+                if (locResult.success) {
+                    locations.value = locResult.locations;
+
+                    // Try to restore saved location (from already-loaded settings), otherwise use first
+                    if (savedSettings?.locationId && locations.value.find(l => l.id === savedSettings.locationId)) {
+                        selectedLocation.value = savedSettings.locationId;
+                    } else if (locations.value.length > 0) {
+                        selectedLocation.value = locations.value[0].id;
+                    }
+
+                    // Start GPS detection after locations are loaded
+                    detectLocation();
+                }
+
+                if (reasonResult.success) {
+                    reasonCategories.value = reasonResult.categories;
+                    updateReasonOptions();
+                }
+
+                isInitialized.value = true;
+            } catch (e) {
+                emit('toast', 'Fehler beim Laden der Konfiguration', 'error');
+            }
+        };
+
+        // ==================== REASON OPTIONS ====================
+        const updateReasonOptions = () => {
+            const reasons = reasonCategories.value?.[selectedType.value];
+            if (reasons && typeof reasons === 'object') {
+                const keys = Object.keys(reasons);
+                if (keys.length > 0) {
+                    selectedReason.value = keys[0];
+                }
+            } else {
+                // Fallback defaults
+                const defaults = { 'IN': 'Warenlieferung', 'OUT': 'Verbrauch', 'ADJUSTMENT': 'Inventurkorrektur' };
+                if (defaults[selectedType.value]) {
+                    selectedReason.value = defaults[selectedType.value];
+                }
+            }
+        };
+
+        // ==================== WATCHERS ====================
+        watch(selectedType, () => {
+            updateReasonOptions();
+            saveSettings();
+        });
+
+        watch(selectedLocation, () => {
+            saveSettings();
+            if (scannedArticle.value) {
+                loadCurrentStock();
+            }
+        });
+
+        // Ensure location is always selected when locations are loaded
+        watch(locations, (newLocations) => {
+            if (newLocations.length > 0 && !selectedLocation.value) {
+                // Try saved settings first
+                if (savedSettings?.locationId && newLocations.find(l => l.id === savedSettings.locationId)) {
+                    selectedLocation.value = savedSettings.locationId;
+                } else {
+                    selectedLocation.value = newLocations[0].id;
+                }
+            }
+        }, { immediate: true });
+
+        watch(() => props.simpleMode, (newVal) => {
+            if (newVal) {
+                // Reset to IN/OUT if ADJUSTMENT was selected
+                if (selectedType.value === 'ADJUSTMENT') {
+                    selectedType.value = 'OUT';
+                }
+                // Switch away from history tab
+                if (currentTab.value === 'history') {
+                    currentTab.value = 'scan';
+                }
+                // Disable turbo/batch modes in simple mode
+                turboMode.value = false;
+                batchMode.value = false;
+            }
+        });
+
+        watch(turboMode, () => {
+            saveSettings();
+        });
+
+        watch(batchMode, () => {
+            saveSettings();
+        });
+
+        // Also update reason when categories are loaded
+        watch(reasonCategories, () => {
+            updateReasonOptions();
+        }, { deep: true });
+
+        // ==================== SCANNER FUNCTIONS ====================
+        const startScanner = async () => {
+            scannerError.value = '';
+            try {
+                scanner.value = new Html5Qrcode('qr-reader-movement');
+                await scanner.value.start(
+                    { facingMode: 'environment' },
+                    { fps: 10, qrbox: { width: 250, height: 250 }, aspectRatio: 1.0 },
+                    onScanSuccess,
+                    () => {}
+                );
+                isScannerActive.value = true;
+            } catch (err) {
+                scannerError.value = 'Kamera konnte nicht gestartet werden. Bitte Berechtigungen prüfen.';
+            }
+        };
+
+        const stopScanner = async () => {
+            if (scanner.value && isScannerActive.value) {
+                try { await scanner.value.stop(); } catch (e) {}
+                isScannerActive.value = false;
+            }
+        };
+
+        const onScanSuccess = async (decodedText) => {
+            await stopScanner();
+            await lookupArticle(decodedText);
+        };
+
+        // Article lookup
+        const lookupArticle = async (code) => {
+            isLoading.value = true;
+
+            try {
+                const result = await movementApi.get(`getArticle?code=${encodeURIComponent(code)}`);
+
+                if (result.success) {
+                    scannedArticle.value = result.article;
+                    await loadCurrentStock();
+                    quantity.value = '1';
+
+                    // Ensure reason is set
+                    if (!selectedReason.value) {
+                        updateReasonOptions();
+                    }
+
+                    // TURBO MODE: Auto-submit with qty=1 and default reason
+                    if (turboMode.value && !batchMode.value) {
+                        await turboSubmit(result.article);
+                        return;
+                    }
+
+                    // BATCH MODE: Add to cart and continue scanning
+                    if (batchMode.value) {
+                        addToCart(result.article);
+                        return;
+                    }
+                } else {
+                    emit('toast', result.message || 'Artikel nicht gefunden', 'error');
+                    await startScanner();
+                }
+            } catch (e) {
+                emit('toast', 'Fehler beim Laden des Artikels', 'error');
+                await startScanner();
+            } finally {
+                isLoading.value = false;
+            }
+        };
+
+        // ==================== TURBO MODE ====================
+        const turboSubmit = async (article) => {
+            const typeConfig = movementTypes.find(t => t.value === selectedType.value);
+            const defaultReason = typeConfig?.defaultReason || selectedReason.value;
+
+            try {
+                const payload = {
+                    movementType: selectedType.value,
+                    articleId: article.id,
+                    locationId: selectedLocation.value,
+                    quantity: 1,
+                    reasonCategory: defaultReason,
+                    note: null
+                };
+
+                const result = await movementApi.post('submitMovement', payload);
+
+                if (result.success) {
+                    // Store for undo
+                    lastMovement.value = result.movement;
+                    showUndo.value = true;
+                    if (undoTimeout) clearTimeout(undoTimeout);
+                    undoTimeout = setTimeout(() => { showUndo.value = false; }, 5000);
+
+                    // Show quick toast
+                    const typeLabel = selectedType.value === 'IN' ? '+' : selectedType.value === 'OUT' ? '-' : '±';
+                    emit('toast', `${typeLabel}1 ${article.title}`, 'success');
+
+                    // Reset and restart scanner
+                    scannedArticle.value = null;
+                    currentStock.value = 0;
+                    await startScanner();
+                } else {
+                    emit('toast', result.message || 'Fehler', 'error');
+                    // Fall back to normal mode
+                    scannedArticle.value = article;
+                }
+            } catch (e) {
+                emit('toast', 'Netzwerkfehler', 'error');
+                scannedArticle.value = article;
+            }
+        };
+
+        // ==================== BATCH/CART MODE ====================
+        const addToCart = (article) => {
+            // Check if already in cart
+            const existing = cartItems.value.find(item => item.article.id === article.id);
+            if (existing) {
+                existing.quantity += 1;
+                emit('toast', `${article.title} (${existing.quantity}x)`, 'success');
+            } else {
+                cartItems.value.push({
+                    article: article,
+                    quantity: 1,
+                    stock: currentStock.value
+                });
+                emit('toast', `+ ${article.title}`, 'success');
+            }
+
+            // Reset and restart scanner
+            scannedArticle.value = null;
+            currentStock.value = 0;
+            startScanner();
+        };
+
+        const updateCartQuantity = (index, qty) => {
+            if (qty <= 0) {
+                cartItems.value.splice(index, 1);
+            } else {
+                cartItems.value[index].quantity = qty;
+            }
+        };
+
+        const removeFromCart = (index) => {
+            cartItems.value.splice(index, 1);
+        };
+
+        const clearCart = () => {
+            cartItems.value = [];
+            showCart.value = false;
+        };
+
+        const submitCart = async () => {
+            if (cartItems.value.length === 0) return;
+            isLoading.value = true;
+
+            const typeConfig = movementTypes.find(t => t.value === selectedType.value);
+            const defaultReason = typeConfig?.defaultReason || selectedReason.value;
+            let successCount = 0;
+            let errorCount = 0;
+
+            for (const item of cartItems.value) {
+                try {
+                    const payload = {
+                        movementType: selectedType.value,
+                        articleId: item.article.id,
+                        locationId: selectedLocation.value,
+                        quantity: item.quantity,
+                        reasonCategory: defaultReason,
+                        note: null
+                    };
+
+                    const result = await movementApi.post('submitMovement', payload);
+                    if (result.success) {
+                        successCount++;
+                    } else {
+                        errorCount++;
+                    }
+                } catch (e) {
+                    errorCount++;
+                }
+            }
+
+            isLoading.value = false;
+
+            if (errorCount === 0) {
+                emit('toast', `${successCount} Bewegungen erfolgreich`, 'success');
+                clearCart();
+            } else {
+                emit('toast', `${successCount} OK, ${errorCount} Fehler`, 'error');
+            }
+        };
+
+        // Load current stock for article at location
+        const loadCurrentStock = async () => {
+            if (!scannedArticle.value || !selectedLocation.value) {
+                currentStock.value = 0;
+                return;
+            }
+
+            try {
+                const result = await movementApi.get(
+                    `getCurrentStock?articleId=${scannedArticle.value.id}&locationId=${selectedLocation.value}`
+                );
+                currentStock.value = result.success ? result.currentStock : 0;
+            } catch (e) {
+                currentStock.value = 0;
+            }
+        };
+
+        // Submit movement
+        const submitMovement = async () => {
+            if (!canSubmit.value) return;
+            isLoading.value = true;
+
+            try {
+                const payload = {
+                    movementType: selectedType.value,
+                    articleId: scannedArticle.value.id,
+                    locationId: selectedLocation.value,
+                    quantity: parseFloat(quantity.value),
+                    reasonCategory: selectedReason.value,
+                    note: note.value || null
+                };
+
+                const result = await movementApi.post('submitMovement', payload);
+
+                if (result.success) {
+                    emit('toast', result.message, 'success');
+                    // Reset form
+                    scannedArticle.value = null;
+                    currentStock.value = 0;
+                    quantity.value = '1';
+                    note.value = '';
+                    showNote.value = false;
+                    await startScanner();
+                } else {
+                    emit('toast', result.message || 'Fehler beim Speichern', 'error');
+                }
+            } catch (e) {
+                emit('toast', 'Netzwerkfehler', 'error');
+            } finally {
+                isLoading.value = false;
+            }
+        };
+
+        // Search
+        const searchArticles = async () => {
+            if (searchQuery.value.length < 2) {
+                searchResults.value = [];
+                return;
+            }
+            isSearching.value = true;
+            try {
+                const result = await movementApi.get(`searchArticles?query=${encodeURIComponent(searchQuery.value)}`);
+                if (result.success) searchResults.value = result.articles;
+            } catch (e) {} finally {
+                isSearching.value = false;
+            }
+        };
+
+        const selectSearchResult = async (article) => {
+            await stopScanner();
+            scannedArticle.value = article;
+            await loadCurrentStock();
+            quantity.value = '1';
+            showNote.value = false;
+            // Ensure reason is set
+            if (!selectedReason.value) {
+                updateReasonOptions();
+            }
+            currentTab.value = 'scan';
+        };
+
+        // History
+        const loadHistory = async () => {
+            isLoadingHistory.value = true;
+            try {
+                const params = selectedLocation.value ? `?locationId=${selectedLocation.value}` : '';
+                const result = await movementApi.get(`getMyMovements${params}`);
+                if (result.success) recentMovements.value = result.movements;
+            } catch (e) {} finally {
+                isLoadingHistory.value = false;
+            }
+        };
+
+        // Keypad
+        const appendDigit = (digit) => {
+            if (digit === '.' && quantity.value.includes('.')) return;
+            if (quantity.value === '0' && digit !== '.') {
+                quantity.value = digit;
+            } else {
+                quantity.value += digit;
+            }
+        };
+
+        const deleteDigit = () => {
+            quantity.value = quantity.value.length > 1 ? quantity.value.slice(0, -1) : '0';
+        };
+
+        const clearQuantity = () => { quantity.value = '0'; };
+
+        // Navigation
+        const switchTab = async (tab) => {
+            currentTab.value = tab;
+            if (tab === 'scan' && !scannedArticle.value) {
+                await nextTick();
+                await startScanner();
+            } else if (tab === 'search') {
+                await stopScanner();
+            } else if (tab === 'history') {
+                await stopScanner();
+                await loadHistory();
+            }
+        };
+
+        const cancelScan = async () => {
+            scannedArticle.value = null;
+            currentStock.value = 0;
+            quantity.value = '1';
+            note.value = '';
+            showNote.value = false;
+            await startScanner();
+        };
+
+        // Get type badge classes
+        const getTypeBadgeClass = (type) => {
+            const colors = {
+                'IN': 'bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-400',
+                'OUT': 'bg-red-100 text-red-800 dark:bg-red-900/30 dark:text-red-400',
+                'ADJUSTMENT': 'bg-yellow-100 text-yellow-800 dark:bg-yellow-900/30 dark:text-yellow-400'
+            };
+            return colors[type] || 'bg-slate-100 text-slate-800';
+        };
+
+        onMounted(async () => {
+            await loadInitialData();
+            await startScanner();
+        });
+
+        onUnmounted(async () => {
+            await stopScanner();
+        });
+
+        return {
+            // Config
+            locations, movementTypes, reasonCategories, reasonOptions,
+            selectedLocation, selectedType,
+            // GPS
+            detectedLocation, gpsStatus, gpsDistance, detectLocation, formattedGpsDistance, gpsDistanceColor,
+            // Mode toggles
+            turboMode, batchMode, filteredMovementTypes,
+            // Cart
+            cartItems, cartTotal, showCart,
+            addToCart, updateCartQuantity, removeFromCart, clearCart, submitCart,
+            // Quick actions
+            quickAction,
+            // Undo
+            lastMovement, showUndo,
+            // Tabs & Loading
+            currentTab, isLoading, isInitialized,
+            isScannerActive, scannerError,
+            // Article
+            scannedArticle, currentStock, quantity, selectedReason, note,
+            // Search
+            searchQuery, searchResults, isSearching,
+            // History
+            recentMovements, isLoadingHistory,
+            // UI
+            showKeypad, showNote, canSubmit, typeColor,
+            // Functions
+            startScanner, stopScanner, submitMovement,
+            searchArticles, selectSearchResult, loadHistory,
+            appendDigit, deleteDigit, clearQuantity,
+            switchTab, cancelScan, getTypeBadgeClass
+        };
+    },
+
+    template: `
+        <div class="flex flex-col h-full">
+            <!-- Config bar -->
+            <div class="bg-slate-50 dark:bg-slate-900 border-b border-slate-200 dark:border-slate-700 px-3 py-3 space-y-3">
+                <!-- Location selector with GPS indicator -->
+                <div class="relative">
+                    <BottomSheetSelect
+                        v-model="selectedLocation"
+                        :options="locations"
+                        value-key="id"
+                        label-key="title"
+                        label="Lagerort"
+                        icon="location"
+                        placeholder="Lagerort wählen..."
+                        position="top"
+                    />
+                    <!-- GPS Status indicator -->
+                    <div class="absolute right-12 top-1/2 -translate-y-1/2">
+                        <div v-if="gpsStatus === 'detecting'" class="flex items-center gap-1 text-xs text-slate-400">
+                            <div class="w-2 h-2 bg-blue-400 rounded-full animate-pulse"></div>
+                            GPS...
+                        </div>
+                        <div v-else-if="gpsStatus === 'detected'" :class="['flex items-center gap-1 text-xs', gpsDistanceColor]">
+                            <svg xmlns="http://www.w3.org/2000/svg" class="h-3 w-3" viewBox="0 0 20 20" fill="currentColor">
+                                <path fill-rule="evenodd" d="M5.05 4.05a7 7 0 119.9 9.9L10 18.9l-4.95-4.95a7 7 0 010-9.9zM10 11a2 2 0 100-4 2 2 0 000 4z" clip-rule="evenodd" />
+                            </svg>
+                            {{ formattedGpsDistance }}
+                        </div>
+                        <div v-else-if="gpsStatus === 'error'" class="flex items-center gap-1 text-xs text-slate-400">
+                            <svg xmlns="http://www.w3.org/2000/svg" class="h-3 w-3" viewBox="0 0 20 20" fill="currentColor">
+                                <path fill-rule="evenodd" d="M5.05 4.05a7 7 0 119.9 9.9L10 18.9l-4.95-4.95a7 7 0 010-9.9zM10 11a2 2 0 100-4 2 2 0 000 4z" clip-rule="evenodd" />
+                            </svg>
+                            <span class="line-through">GPS</span>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- Movement Type - Segmented Control -->
+                <div class="bg-white dark:bg-slate-800 p-1.5 rounded-xl shadow-sm flex gap-1">
+                    <button
+                        v-for="type in filteredMovementTypes"
+                        :key="type.value"
+                        @click="selectedType = type.value"
+                        :class="[
+                            'flex-1 py-2.5 px-2 rounded-lg font-medium text-sm transition-all flex items-center justify-center gap-1.5',
+                            selectedType === type.value
+                                ? type.value === 'IN'
+                                    ? 'bg-green-500 text-white shadow-sm'
+                                    : type.value === 'OUT'
+                                        ? 'bg-red-500 text-white shadow-sm'
+                                        : 'bg-yellow-500 text-white shadow-sm'
+                                : 'text-slate-500 dark:text-slate-400 hover:bg-slate-100 dark:hover:bg-slate-700'
+                        ]"
+                    >
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path v-if="type.value === 'IN'" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4" />
+                            <path v-else-if="type.value === 'OUT'" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20 12H4" />
+                            <path v-else stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" />
+                        </svg>
+                        <span class="hidden sm:inline">{{ type.text }}</span>
+                        <span class="sm:hidden">{{ type.value === 'IN' ? 'Ein' : type.value === 'OUT' ? 'Aus' : 'Korr.' }}</span>
+                    </button>
+                </div>
+
+                <!-- Mode Toggles & Quick Actions Bar (hidden in simple mode) -->
+                <div v-if="!simpleMode" class="flex items-center gap-2">
+                    <!-- Turbo Mode Toggle -->
+                    <button
+                        @click="turboMode = !turboMode"
+                        :class="[
+                            'flex items-center gap-1.5 px-3 py-2 rounded-lg text-xs font-medium transition-all',
+                            turboMode
+                                ? 'bg-orange-500 text-white'
+                                : 'bg-white dark:bg-slate-800 text-slate-500 dark:text-slate-400 border border-slate-200 dark:border-slate-700'
+                        ]"
+                    >
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 10V3L4 14h7v7l9-11h-7z" />
+                        </svg>
+                        Turbo
+                    </button>
+
+                    <!-- Batch Mode Toggle -->
+                    <button
+                        @click="batchMode = !batchMode"
+                        :class="[
+                            'flex items-center gap-1.5 px-3 py-2 rounded-lg text-xs font-medium transition-all',
+                            batchMode
+                                ? 'bg-purple-500 text-white'
+                                : 'bg-white dark:bg-slate-800 text-slate-500 dark:text-slate-400 border border-slate-200 dark:border-slate-700'
+                        ]"
+                    >
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 3h2l.4 2M7 13h10l4-8H5.4M7 13L5.4 5M7 13l-2.293 2.293c-.63.63-.184 1.707.707 1.707H17m0 0a2 2 0 100 4 2 2 0 000-4zm-8 2a2 2 0 11-4 0 2 2 0 014 0z" />
+                        </svg>
+                        Sammel
+                        <span v-if="cartTotal > 0" class="bg-white/30 px-1.5 rounded-full">{{ cartTotal }}</span>
+                    </button>
+
+                    <!-- Quick Actions -->
+                    <div class="flex-1"></div>
+                    <button
+                        @click="quickAction('OUT', 'Verbrauch')"
+                        class="flex items-center gap-1 px-3 py-2 rounded-lg text-xs font-medium bg-red-100 dark:bg-red-900/30 text-red-600 dark:text-red-400 hover:bg-red-200 dark:hover:bg-red-900/50 transition"
+                    >
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20 12H4" />
+                        </svg>
+                        Schnell
+                    </button>
+                </div>
+            </div>
+
+            <!-- Tabs -->
+            <div class="flex bg-slate-100 dark:bg-slate-900 border-b border-slate-200 dark:border-slate-700 px-3 py-2">
+                <button @click="switchTab('scan')" :class="[currentTab === 'scan' ? 'bg-white dark:bg-slate-800 shadow-sm' : 'text-slate-500 dark:text-slate-400']" class="flex-1 py-2 text-sm font-medium rounded-lg transition">Scannen</button>
+                <button @click="switchTab('search')" :class="[currentTab === 'search' ? 'bg-white dark:bg-slate-800 shadow-sm' : 'text-slate-500 dark:text-slate-400']" class="flex-1 py-2 text-sm font-medium rounded-lg transition mx-1">Suche</button>
+                <button v-if="!simpleMode" @click="switchTab('history')" :class="[currentTab === 'history' ? 'bg-white dark:bg-slate-800 shadow-sm' : 'text-slate-500 dark:text-slate-400']" class="flex-1 py-2 text-sm font-medium rounded-lg transition">Verlauf</button>
+            </div>
+
+            <!-- Content -->
+            <main class="flex-grow overflow-y-auto bg-slate-50 dark:bg-slate-900">
+                <!-- Loading -->
+                <div v-if="!isInitialized" class="flex items-center justify-center h-full">
+                    <div class="animate-spin h-8 w-8 border-4 border-primary border-t-transparent rounded-full"></div>
+                </div>
+
+                <!-- SCAN TAB -->
+                <div v-else-if="currentTab === 'scan'" class="p-4 space-y-4">
+                    <!-- Scanner -->
+                    <div v-if="!scannedArticle" class="space-y-4">
+                        <div id="qr-reader-movement" class="w-full rounded-lg overflow-hidden bg-black"></div>
+                        <div v-if="scannerError" class="p-4 bg-red-50 dark:bg-red-900/30 rounded-lg">
+                            <p class="text-sm text-red-600 dark:text-red-400">{{ scannerError }}</p>
+                            <button @click="startScanner" class="mt-2 text-sm font-medium text-primary">Erneut versuchen</button>
+                        </div>
+                        <p class="text-center text-sm text-slate-500 dark:text-slate-400">QR-Code scannen oder Artikel suchen</p>
+                    </div>
+
+                    <!-- Scanned Article Form (Compact) -->
+                    <div v-else class="space-y-3">
+                        <!-- Article + Stock (Combined) -->
+                        <div class="bg-white dark:bg-slate-800 p-3 rounded-xl shadow-sm">
+                            <div class="flex items-start justify-between gap-3">
+                                <div class="flex-1 min-w-0">
+                                    <h3 class="font-bold text-slate-800 dark:text-white truncate">{{ scannedArticle.title }}</h3>
+                                    <p class="text-xs text-slate-500 dark:text-slate-400">{{ scannedArticle.articleNumber }}</p>
+                                </div>
+                                <div :class="['text-right flex-shrink-0 px-2 py-1 rounded-lg', currentStock < 0 ? 'bg-orange-100 dark:bg-orange-900/30' : 'bg-slate-100 dark:bg-slate-700']">
+                                    <span :class="['font-bold text-lg', currentStock < 0 ? 'text-orange-600 dark:text-orange-400' : 'text-slate-700 dark:text-slate-200']">
+                                        {{ currentStock }}
+                                    </span>
+                                    <span class="text-xs text-slate-500 dark:text-slate-400 ml-1">{{ scannedArticle.unit || 'Stk.' }}</span>
+                                </div>
+                            </div>
+                        </div>
+
+                        <!-- Quantity (Compact) -->
+                        <div @click="showKeypad = true" :class="[
+                            'flex items-center justify-between p-3 rounded-xl cursor-pointer transition active:scale-[0.98]',
+                            selectedType === 'IN' ? 'bg-green-500 text-white' : '',
+                            selectedType === 'OUT' ? 'bg-red-500 text-white' : '',
+                            selectedType === 'ADJUSTMENT' ? 'bg-yellow-500 text-white' : ''
+                        ]">
+                            <span class="font-medium">Menge</span>
+                            <span class="text-2xl font-bold">
+                                {{ selectedType === 'OUT' ? '-' : selectedType === 'IN' ? '+' : '' }}{{ quantity }}
+                            </span>
+                        </div>
+
+                        <!-- Reason + Note Button (Combined Row) -->
+                        <div class="flex gap-2 items-stretch">
+                            <div class="flex-1">
+                                <BottomSheetSelect
+                                    v-model="selectedReason"
+                                    :options="reasonOptions"
+                                    value-key="value"
+                                    label-key="text"
+                                    label="Grund"
+                                    icon="clipboard"
+                                    placeholder="Grund..."
+                                />
+                            </div>
+                            <button
+                                @click="showNote = !showNote"
+                                :class="[
+                                    'w-14 rounded-xl flex items-center justify-center transition flex-shrink-0',
+                                    showNote || note ? 'bg-primary text-white' : 'bg-white dark:bg-slate-800 text-slate-400 border border-slate-200 dark:border-slate-700'
+                                ]"
+                            >
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" />
+                                </svg>
+                            </button>
+                        </div>
+
+                        <!-- Note (Expandable) -->
+                        <div v-if="showNote" class="bg-white dark:bg-slate-800 rounded-xl shadow-sm overflow-hidden">
+                            <textarea
+                                v-model="note"
+                                rows="2"
+                                class="w-full p-3 border-0 bg-transparent text-slate-800 dark:text-white resize-none focus:ring-0"
+                                placeholder="Notiz hinzufügen..."
+                            ></textarea>
+                        </div>
+
+                        <!-- Buttons Row -->
+                        <div class="flex gap-2">
+                            <button
+                                @click="cancelScan"
+                                class="flex-1 py-3 font-medium rounded-xl bg-slate-200 dark:bg-slate-700 text-slate-600 dark:text-slate-300 transition active:scale-[0.98]"
+                            >
+                                Abbrechen
+                            </button>
+                            <button
+                                @click="submitMovement"
+                                :disabled="!canSubmit"
+                                :class="[
+                                    'flex-[2] py-3 font-bold rounded-xl text-white transition active:scale-[0.98] disabled:opacity-50 disabled:active:scale-100',
+                                    selectedType === 'IN' ? 'bg-green-600' : '',
+                                    selectedType === 'OUT' ? 'bg-red-600' : '',
+                                    selectedType === 'ADJUSTMENT' ? 'bg-yellow-600' : ''
+                                ]"
+                            >
+                                {{ isLoading ? 'Speichert...' : (selectedType === 'IN' ? 'Einbuchen' : selectedType === 'OUT' ? 'Ausbuchen' : 'Korrigieren') }}
+                            </button>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- SEARCH TAB -->
+                <div v-else-if="currentTab === 'search'" class="p-4 space-y-4">
+                    <div class="sticky top-0 bg-slate-50 dark:bg-slate-900 pb-2">
+                        <input
+                            v-model="searchQuery"
+                            @input="searchArticles"
+                            type="search"
+                            placeholder="Artikel suchen..."
+                            class="w-full p-3 border border-slate-300 dark:border-slate-600 rounded-lg dark:bg-slate-800 dark:text-white"
+                        >
+                    </div>
+
+                    <div v-if="isSearching" class="text-center py-8">
+                        <div class="animate-spin h-8 w-8 border-4 border-primary border-t-transparent rounded-full mx-auto"></div>
+                    </div>
+
+                    <div v-else-if="searchResults.length === 0" class="text-center py-8">
+                        <p class="text-slate-500 dark:text-slate-400">{{ searchQuery.length < 2 ? 'Mindestens 2 Zeichen eingeben' : 'Keine Artikel gefunden' }}</p>
+                    </div>
+
+                    <div v-else class="space-y-2">
+                        <div
+                            v-for="article in searchResults"
+                            :key="article.id"
+                            @click="selectSearchResult(article)"
+                            class="bg-white dark:bg-slate-800 p-3 rounded-lg shadow-sm cursor-pointer hover:shadow-md active:scale-[0.98] transition"
+                        >
+                            <p class="font-medium text-slate-800 dark:text-white">{{ article.title }}</p>
+                            <p class="text-sm text-slate-500 dark:text-slate-400">{{ article.articleNumber }}</p>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- HISTORY TAB -->
+                <div v-else-if="currentTab === 'history'" class="p-4">
+                    <div v-if="isLoadingHistory" class="space-y-3">
+                        <div v-for="i in 5" :key="i" class="bg-white dark:bg-slate-800 p-3 rounded-lg shadow-sm animate-pulse">
+                            <div class="h-4 bg-slate-200 dark:bg-slate-700 rounded w-3/4 mb-2"></div>
+                            <div class="h-3 bg-slate-200 dark:bg-slate-700 rounded w-1/2"></div>
+                        </div>
+                    </div>
+
+                    <div v-else-if="recentMovements.length === 0" class="text-center py-8">
+                        <p class="text-slate-500 dark:text-slate-400">Noch keine Bewegungen</p>
+                    </div>
+
+                    <div v-else class="space-y-2">
+                        <div v-for="movement in recentMovements" :key="movement.id" class="bg-white dark:bg-slate-800 p-3 rounded-lg shadow-sm">
+                            <div class="flex justify-between items-start">
+                                <div class="flex-1 min-w-0">
+                                    <div class="flex items-center gap-2 mb-1">
+                                        <span :class="['px-2 py-0.5 text-xs font-medium rounded', getTypeBadgeClass(movement.movementType)]">
+                                            {{ movement.movementType === 'IN' ? 'Einbuchung' : movement.movementType === 'OUT' ? 'Ausbuchung' : 'Korrektur' }}
+                                        </span>
+                                        <span class="text-xs text-slate-400">{{ movement.locationTitle }}</span>
+                                    </div>
+                                    <p class="font-medium text-slate-800 dark:text-white truncate">{{ movement.articleTitle }}</p>
+                                    <p class="text-sm text-slate-500 dark:text-slate-400">{{ movement.articleNumber }}</p>
+                                </div>
+                                <div class="text-right ml-2">
+                                    <p :class="[
+                                        'font-bold',
+                                        movement.movementType === 'IN' ? 'text-green-600 dark:text-green-400' : '',
+                                        movement.movementType === 'OUT' ? 'text-red-600 dark:text-red-400' : '',
+                                        movement.movementType === 'ADJUSTMENT' ? 'text-yellow-600 dark:text-yellow-400' : ''
+                                    ]">
+                                        {{ movement.movementType === 'IN' ? '+' : movement.movementType === 'OUT' ? '-' : '' }}{{ movement.quantity }} {{ movement.unit }}
+                                    </p>
+                                    <p class="text-xs text-slate-400">{{ movement.create }}</p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </main>
+
+            <!-- Keypad -->
+            <transition name="slide-up">
+                <div v-if="showKeypad" class="fixed inset-0 bg-black bg-opacity-50 z-50 flex items-end">
+                    <div class="bg-white dark:bg-slate-800 w-full rounded-t-2xl p-4 safe-area-bottom">
+                        <div class="flex justify-between items-center mb-4">
+                            <button @click="clearQuantity" class="px-4 py-2 text-red-500 font-medium">C</button>
+                            <div class="text-2xl font-bold text-slate-800 dark:text-white">{{ quantity }}</div>
+                            <button @click="showKeypad = false" class="px-4 py-2 text-primary font-medium">Fertig</button>
+                        </div>
+                        <div class="grid grid-cols-3 gap-2">
+                            <button
+                                v-for="d in ['1','2','3','4','5','6','7','8','9','.','0']"
+                                :key="d"
+                                @click="appendDigit(d)"
+                                class="py-4 text-xl font-bold bg-slate-100 dark:bg-slate-700 rounded-lg active:bg-slate-200 dark:active:bg-slate-600 text-slate-800 dark:text-white"
+                            >{{ d }}</button>
+                            <button @click="deleteDigit" class="py-4 text-xl font-bold bg-slate-100 dark:bg-slate-700 rounded-lg active:bg-slate-200 dark:active:bg-slate-600 text-slate-800 dark:text-white">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 mx-auto" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2M3 12l6.414 6.414a2 2 0 001.414.586H19a2 2 0 002-2V7a2 2 0 00-2-2h-8.172a2 2 0 00-1.414.586L3 12z" />
+                                </svg>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </transition>
+
+            <!-- Floating Cart Button (when batch mode active and has items) -->
+            <transition name="scale">
+                <button
+                    v-if="batchMode && cartTotal > 0"
+                    @click="showCart = true"
+                    class="fixed bottom-6 right-4 w-14 h-14 bg-purple-500 text-white rounded-full shadow-lg flex items-center justify-center z-40 active:scale-95 transition"
+                >
+                    <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 3h2l.4 2M7 13h10l4-8H5.4M7 13L5.4 5M7 13l-2.293 2.293c-.63.63-.184 1.707.707 1.707H17m0 0a2 2 0 100 4 2 2 0 000-4zm-8 2a2 2 0 11-4 0 2 2 0 014 0z" />
+                    </svg>
+                    <span class="absolute -top-1 -right-1 bg-white text-purple-600 text-xs font-bold w-5 h-5 rounded-full flex items-center justify-center">{{ cartTotal }}</span>
+                </button>
+            </transition>
+
+            <!-- Cart Modal -->
+            <transition name="slide-up">
+                <div v-if="showCart" class="fixed inset-0 bg-black/50 z-50 flex items-end">
+                    <div class="bg-white dark:bg-slate-800 w-full rounded-t-2xl shadow-xl max-h-[85vh] flex flex-col safe-area-bottom">
+                        <!-- Header -->
+                        <div class="flex items-center justify-between px-4 py-3 border-b border-slate-200 dark:border-slate-700">
+                            <h3 class="font-bold text-lg text-slate-800 dark:text-white flex items-center gap-2">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-purple-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 3h2l.4 2M7 13h10l4-8H5.4M7 13L5.4 5M7 13l-2.293 2.293c-.63.63-.184 1.707.707 1.707H17m0 0a2 2 0 100 4 2 2 0 000-4zm-8 2a2 2 0 11-4 0 2 2 0 014 0z" />
+                                </svg>
+                                Sammelkorb ({{ cartTotal }})
+                            </h3>
+                            <button @click="showCart = false" class="p-2 hover:bg-slate-100 dark:hover:bg-slate-700 rounded-full">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-slate-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+                                </svg>
+                            </button>
+                        </div>
+
+                        <!-- Cart Items -->
+                        <div class="flex-1 overflow-y-auto p-4 space-y-2">
+                            <div v-if="cartItems.length === 0" class="text-center py-8 text-slate-400">
+                                Korb ist leer
+                            </div>
+                            <div
+                                v-for="(item, index) in cartItems"
+                                :key="item.article.id"
+                                class="bg-slate-50 dark:bg-slate-700/50 p-3 rounded-xl flex items-center gap-3"
+                            >
+                                <div class="flex-1 min-w-0">
+                                    <p class="font-medium text-slate-800 dark:text-white truncate">{{ item.article.title }}</p>
+                                    <p class="text-xs text-slate-500 dark:text-slate-400">{{ item.article.articleNumber }}</p>
+                                </div>
+                                <!-- Quantity Controls -->
+                                <div class="flex items-center gap-2">
+                                    <button
+                                        @click="updateCartQuantity(index, item.quantity - 1)"
+                                        class="w-8 h-8 rounded-lg bg-slate-200 dark:bg-slate-600 flex items-center justify-center text-slate-600 dark:text-slate-300"
+                                    >-</button>
+                                    <span class="w-8 text-center font-bold text-slate-800 dark:text-white">{{ item.quantity }}</span>
+                                    <button
+                                        @click="updateCartQuantity(index, item.quantity + 1)"
+                                        class="w-8 h-8 rounded-lg bg-slate-200 dark:bg-slate-600 flex items-center justify-center text-slate-600 dark:text-slate-300"
+                                    >+</button>
+                                </div>
+                                <!-- Remove -->
+                                <button @click="removeFromCart(index)" class="p-2 text-red-500 hover:bg-red-50 dark:hover:bg-red-900/20 rounded-lg">
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
+                                    </svg>
+                                </button>
+                            </div>
+                        </div>
+
+                        <!-- Footer -->
+                        <div class="p-4 border-t border-slate-200 dark:border-slate-700 space-y-2">
+                            <button
+                                @click="submitCart"
+                                :disabled="cartItems.length === 0 || isLoading"
+                                :class="[
+                                    'w-full py-4 font-bold rounded-xl text-white transition disabled:opacity-50',
+                                    selectedType === 'IN' ? 'bg-green-500' : selectedType === 'OUT' ? 'bg-red-500' : 'bg-yellow-500'
+                                ]"
+                            >
+                                {{ isLoading ? 'Buche...' : 'Alle ' + (selectedType === 'IN' ? 'einbuchen' : selectedType === 'OUT' ? 'ausbuchen' : 'korrigieren') }}
+                            </button>
+                            <button @click="clearCart" class="w-full py-2 text-slate-500 dark:text-slate-400 font-medium">
+                                Korb leeren
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </transition>
+
+            <!-- Mode Indicator Banner -->
+            <transition name="slide-up">
+                <div
+                    v-if="turboMode && !scannedArticle"
+                    class="fixed bottom-0 left-0 right-0 bg-orange-500 text-white text-center py-2 text-sm font-medium z-30 safe-area-bottom"
+                >
+                    <span class="flex items-center justify-center gap-2">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 10V3L4 14h7v7l9-11h-7z" />
+                        </svg>
+                        TURBO: Scan = Sofort buchen (1x)
+                    </span>
+                </div>
+            </transition>
+
+            <!-- Undo Toast -->
+            <transition name="slide-up">
+                <div v-if="showUndo" class="fixed bottom-16 left-4 right-4 bg-slate-800 dark:bg-slate-700 text-white rounded-xl p-3 flex items-center justify-between z-40 shadow-lg">
+                    <span class="text-sm">{{ lastMovement?.articleTitle }} gebucht</span>
+                    <button class="px-3 py-1 bg-white/20 rounded-lg text-sm font-medium hover:bg-white/30 transition">
+                        Rückgängig
+                    </button>
+                </div>
+            </transition>
+        </div>
+    `
+};
diff --git a/public/mobile/shared/auth.js b/public/mobile/shared/auth.js
new file mode 100644
index 000000000..57ce12eef
--- /dev/null
+++ b/public/mobile/shared/auth.js
@@ -0,0 +1,199 @@
+/**
+ * MobileApp Shared Authentication Module
+ *
+ * Provides authentication utilities for all mobile PWAs:
+ * - checkAuth() - Check if user is authenticated
+ * - login() - Authenticate user
+ * - logout() - Clear session
+ * - api - Generic API helper
+ */
+
+// Base API path for all MobileApp endpoints
+const API_BASE = '/MobileApp';
+
+// Shared auth state (can be imported by components)
+export const authState = {
+    user: null,
+    isAuthenticated: false
+};
+
+/**
+ * Check if user is currently authenticated
+ * @returns {Promise<{authenticated: boolean, user?: object}>}
+ */
+export async function checkAuth() {
+    try {
+        const res = await fetch(`${API_BASE}/auth/check`, {
+            credentials: 'same-origin'
+        });
+        const data = await res.json();
+
+        authState.isAuthenticated = data.authenticated;
+        authState.user = data.user || null;
+
+        return data;
+    } catch (e) {
+        console.error('Auth check failed:', e);
+        authState.isAuthenticated = false;
+        authState.user = null;
+        return { authenticated: false };
+    }
+}
+
+/**
+ * Authenticate user with credentials
+ * @param {object} credentials - { username, password, rememberMe }
+ * @returns {Promise<{success: boolean, user?: object, message?: string}>}
+ */
+export async function login({ username, password, rememberMe = true }) {
+    try {
+        const res = await fetch(`${API_BASE}/auth/login`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            credentials: 'same-origin',
+            body: JSON.stringify({ username, password, rememberMe })
+        });
+
+        const data = await res.json();
+
+        if (data.success) {
+            authState.isAuthenticated = true;
+            authState.user = data.user;
+        }
+
+        return data;
+    } catch (e) {
+        console.error('Login failed:', e);
+        return { success: false, message: 'Netzwerkfehler' };
+    }
+}
+
+/**
+ * Verify 2FA code
+ * @param {string} code - 5-digit verification code
+ * @returns {Promise<{success: boolean, user?: object, message?: string}>}
+ */
+export async function verify2FA(code) {
+    try {
+        const res = await fetch(`${API_BASE}/auth/verify2fa`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            credentials: 'same-origin',
+            body: JSON.stringify({ code })
+        });
+
+        const data = await res.json();
+
+        if (data.success) {
+            authState.isAuthenticated = true;
+            authState.user = data.user;
+        }
+
+        return data;
+    } catch (e) {
+        console.error('2FA verification failed:', e);
+        return { success: false, message: 'Netzwerkfehler' };
+    }
+}
+
+/**
+ * Resend 2FA code
+ * @returns {Promise<{success: boolean, message?: string}>}
+ */
+export async function resend2FA() {
+    try {
+        const res = await fetch(`${API_BASE}/auth/resend2fa`, {
+            method: 'POST',
+            credentials: 'same-origin'
+        });
+
+        return await res.json();
+    } catch (e) {
+        console.error('Resend 2FA failed:', e);
+        return { success: false, message: 'Netzwerkfehler' };
+    }
+}
+
+/**
+ * Logout current user
+ * @returns {Promise<{success: boolean}>}
+ */
+export async function logout() {
+    try {
+        await fetch(`${API_BASE}/auth/logout`, {
+            method: 'POST',
+            credentials: 'same-origin'
+        });
+    } catch (e) {
+        console.error('Logout request failed:', e);
+    }
+
+    authState.isAuthenticated = false;
+    authState.user = null;
+
+    return { success: true };
+}
+
+/**
+ * Generic API helper for app-specific endpoints
+ * Usage: api.get('WarehouseStocktake/getActiveStocktakes')
+ *        api.post('WarehouseStocktake/submitScan', { ... })
+ */
+export const api = {
+    /**
+     * GET request
+     * @param {string} endpoint - Endpoint path (e.g., 'WarehouseStocktake/getArticle?code=123')
+     * @returns {Promise<object>}
+     */
+    get: async (endpoint) => {
+        try {
+            const res = await fetch(`${API_BASE}/${endpoint}`, {
+                credentials: 'same-origin'
+            });
+
+            // Check for auth errors
+            if (res.status === 401) {
+                authState.isAuthenticated = false;
+                authState.user = null;
+                return { success: false, error: 'Not authenticated', authError: true };
+            }
+
+            return await res.json();
+        } catch (e) {
+            console.error(`API GET ${endpoint} failed:`, e);
+            return { success: false, error: 'Netzwerkfehler' };
+        }
+    },
+
+    /**
+     * POST request with JSON body
+     * @param {string} endpoint - Endpoint path
+     * @param {object} data - Request body
+     * @returns {Promise<object>}
+     */
+    post: async (endpoint, data = {}) => {
+        try {
+            const res = await fetch(`${API_BASE}/${endpoint}`, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                credentials: 'same-origin',
+                body: JSON.stringify(data)
+            });
+
+            // Check for auth errors
+            if (res.status === 401) {
+                authState.isAuthenticated = false;
+                authState.user = null;
+                return { success: false, error: 'Not authenticated', authError: true };
+            }
+
+            return await res.json();
+        } catch (e) {
+            console.error(`API POST ${endpoint} failed:`, e);
+            return { success: false, error: 'Netzwerkfehler' };
+        }
+    }
+};
+
+// Export API_BASE for components that need to build URLs
+export { API_BASE };
diff --git a/public/mobile/shared/base.css b/public/mobile/shared/base.css
new file mode 100644
index 000000000..f201ee9ae
--- /dev/null
+++ b/public/mobile/shared/base.css
@@ -0,0 +1,324 @@
+/**
+ * MobileApp Shared Base Styles
+ *
+ * Common styles for all mobile PWAs including:
+ * - Dark mode support
+ * - PWA-specific optimizations
+ * - Common animations
+ * - Utility classes
+ */
+
+/* ==================== ROOT & DARK MODE ==================== */
+
+:root {
+    --color-primary: #005384;
+    --color-secondary: #fac41b;
+    --color-success: #22c55e;
+    --color-danger: #ef4444;
+    --color-warning: #f59e0b;
+}
+
+/* Dark mode is toggled by adding 'dark' class to <html> */
+.dark {
+    color-scheme: dark;
+}
+
+
+/* ==================== PWA OPTIMIZATIONS ==================== */
+
+html, body {
+    /* Prevents rubber-band scroll on iOS and pull-to-refresh on Android */
+    overscroll-behavior: none;
+    /* Prevent text selection on double tap */
+    -webkit-user-select: none;
+    user-select: none;
+    /* Smooth font rendering */
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    /* Prevent zoom on input focus (iOS) */
+    touch-action: manipulation;
+}
+
+/* Allow text selection in inputs and textareas */
+input, textarea, [contenteditable] {
+    -webkit-user-select: text;
+    user-select: text;
+}
+
+/* Safe area insets for notched devices */
+.safe-area-top {
+    padding-top: env(safe-area-inset-top);
+}
+
+.safe-area-bottom {
+    padding-bottom: env(safe-area-inset-bottom);
+}
+
+
+/* ==================== ANIMATIONS ==================== */
+
+/* Slide transition for panels */
+.slide-enter-active,
+.slide-leave-active {
+    transition: transform 0.35s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.slide-enter-from,
+.slide-leave-to {
+    transform: translateX(100%);
+}
+
+/* Slide up transition for modals */
+.slide-up-enter-active,
+.slide-up-leave-active {
+    transition: transform 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.slide-up-enter-from,
+.slide-up-leave-to {
+    transform: translateY(100%);
+}
+
+/* Slide down transition for top sheets */
+.slide-down-enter-active,
+.slide-down-leave-active {
+    transition: transform 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.slide-down-enter-from,
+.slide-down-leave-to {
+    transform: translateY(-100%);
+}
+
+/* Fade transition */
+.fade-enter-active,
+.fade-leave-active {
+    transition: opacity 0.2s ease-in-out;
+}
+
+.fade-enter-from,
+.fade-leave-to {
+    opacity: 0;
+}
+
+/* Overlay transition */
+.overlay-enter-active,
+.overlay-leave-active {
+    transition: opacity 0.35s ease;
+}
+
+.overlay-enter-from,
+.overlay-leave-to {
+    opacity: 0;
+}
+
+/* Scale in transition */
+.scale-enter-active,
+.scale-leave-active {
+    transition: transform 0.2s ease, opacity 0.2s ease;
+}
+
+.scale-enter-from,
+.scale-leave-to {
+    transform: scale(0.95);
+    opacity: 0;
+}
+
+/* Spinner animation */
+@keyframes spin {
+    from { transform: rotate(0deg); }
+    to { transform: rotate(360deg); }
+}
+
+.spin {
+    animation: spin 1s linear infinite;
+}
+
+/* Pulse animation for loading states */
+@keyframes pulse {
+    0%, 100% { opacity: 1; }
+    50% { opacity: 0.5; }
+}
+
+.pulse {
+    animation: pulse 1.5s ease-in-out infinite;
+}
+
+/* Network background animations */
+@keyframes node-glow {
+    0%, 100% {
+        transform: scale(1);
+        opacity: 0.8;
+    }
+    50% {
+        transform: scale(1.4);
+        opacity: 1;
+    }
+}
+
+@keyframes node-glow-slow {
+    0%, 100% {
+        transform: scale(1);
+        opacity: 0.7;
+    }
+    50% {
+        transform: scale(1.3);
+        opacity: 1;
+    }
+}
+
+@keyframes line-pulse {
+    0%, 100% { opacity: 0.3; }
+    50% { opacity: 0.6; }
+}
+
+@keyframes line-flow {
+    0% { stroke-dashoffset: 1000; }
+    100% { stroke-dashoffset: 0; }
+}
+
+.network-node {
+    animation: node-glow 2s ease-in-out infinite;
+}
+
+.network-node-slow {
+    animation: node-glow-slow 3s ease-in-out infinite;
+}
+
+.network-lines {
+    animation: line-pulse 3s ease-in-out infinite;
+}
+
+.network-line-flow {
+    stroke-dasharray: 20 30;
+    animation: line-flow 8s linear infinite;
+}
+
+
+/* ==================== PANEL EFFECTS ==================== */
+
+/* Background blur effect when panel is open */
+.panel-open {
+    transform: scale(0.95);
+    filter: blur(4px);
+    opacity: 0.7;
+    transition: transform 0.35s cubic-bezier(0.4, 0, 0.2, 1),
+                filter 0.35s,
+                opacity 0.35s;
+}
+
+.list-container {
+    transition: transform 0.35s cubic-bezier(0.4, 0, 0.2, 1),
+                filter 0.35s,
+                opacity 0.35s;
+}
+
+
+/* ==================== OVERLAY ==================== */
+
+.overlay {
+    position: fixed;
+    inset: 0;
+    background-color: rgba(0, 0, 0, 0.4);
+    transition: opacity 0.35s ease;
+    z-index: 15;
+}
+
+
+/* ==================== TOAST NOTIFICATIONS ==================== */
+
+.toast-container {
+    position: fixed;
+    bottom: calc(1rem + env(safe-area-inset-bottom));
+    left: 1rem;
+    right: 1rem;
+    z-index: 100;
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
+    pointer-events: none;
+}
+
+.toast {
+    padding: 0.75rem 1rem;
+    border-radius: 0.5rem;
+    font-size: 0.875rem;
+    font-weight: 500;
+    text-align: center;
+    pointer-events: auto;
+    box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1);
+}
+
+.toast-success {
+    background-color: var(--color-success);
+    color: white;
+}
+
+.toast-error {
+    background-color: var(--color-danger);
+    color: white;
+}
+
+.toast-warning {
+    background-color: var(--color-warning);
+    color: white;
+}
+
+
+/* ==================== FORM ELEMENTS ==================== */
+
+/* Prevent iOS zoom on input focus */
+input[type="text"],
+input[type="password"],
+input[type="email"],
+input[type="number"],
+input[type="tel"],
+input[type="search"],
+textarea,
+select {
+    font-size: 16px !important;
+}
+
+/* Remove tap highlight on mobile */
+button, a, input, select, textarea {
+    -webkit-tap-highlight-color: transparent;
+}
+
+/* Better focus styles for accessibility */
+button:focus-visible,
+input:focus-visible,
+select:focus-visible,
+textarea:focus-visible {
+    outline: 2px solid var(--color-primary);
+    outline-offset: 2px;
+}
+
+
+/* ==================== UTILITIES ==================== */
+
+/* Hide scrollbar but allow scrolling */
+.hide-scrollbar {
+    -ms-overflow-style: none;
+    scrollbar-width: none;
+}
+
+.hide-scrollbar::-webkit-scrollbar {
+    display: none;
+}
+
+/* Loading overlay */
+.loading-overlay {
+    position: fixed;
+    inset: 0;
+    background-color: rgba(0, 0, 0, 0.5);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 50;
+}
+
+/* Numeric keypad input */
+.numeric-input {
+    font-variant-numeric: tabular-nums;
+    letter-spacing: 0.05em;
+}
diff --git a/public/mobile/sw.js b/public/mobile/sw.js
new file mode 100644
index 000000000..80ee45176
--- /dev/null
+++ b/public/mobile/sw.js
@@ -0,0 +1,84 @@
+/**
+ * MobileApp Service Worker
+ * Provides basic caching for the PWA shell and assets.
+ */
+
+const CACHE_NAME = 'xinon-mobile-v1';
+const ASSETS_TO_CACHE = [
+    '/MobileApp',
+    '/mobile/app.js',
+    '/mobile/shared/auth.js',
+    '/mobile/shared/base.css',
+    '/mobile/components/LoginScreen.js',
+    '/mobile/components/MainMenu.js',
+    '/mobile/modules/lager/LagerModule.js',
+    '/mobile/modules/lager/inventur/StocktakeList.js',
+    '/mobile/modules/lager/inventur/Scanner.js',
+    '/assets/images/xinon-full-transparent.png',
+    '/assets/images/xinon-full-transparent-white.png',
+    '/assets/images/xinon-sm.png'
+];
+
+// Install: cache assets
+self.addEventListener('install', (event) => {
+    event.waitUntil(
+        caches.open(CACHE_NAME)
+            .then(cache => cache.addAll(ASSETS_TO_CACHE))
+            .then(() => self.skipWaiting())
+    );
+});
+
+// Activate: clean old caches
+self.addEventListener('activate', (event) => {
+    event.waitUntil(
+        caches.keys().then(cacheNames => {
+            return Promise.all(
+                cacheNames
+                    .filter(name => name !== CACHE_NAME)
+                    .map(name => caches.delete(name))
+            );
+        }).then(() => self.clients.claim())
+    );
+});
+
+// Fetch: network-first for API, cache-first for assets
+self.addEventListener('fetch', (event) => {
+    // Only handle GET requests
+    if (event.request.method !== 'GET') return;
+
+    const url = new URL(event.request.url);
+
+    // API calls: network only
+    if (url.pathname.startsWith('/MobileApp/') &&
+        url.pathname !== '/MobileApp' &&
+        url.pathname !== '/MobileApp/') {
+        return;
+    }
+
+    // Everything else: cache-first, falling back to network
+    event.respondWith(
+        caches.match(event.request).then(cached => {
+            if (cached) {
+                // Return cached, but update in background
+                fetch(event.request).then(response => {
+                    if (response.ok) {
+                        caches.open(CACHE_NAME).then(cache => {
+                            cache.put(event.request, response);
+                        });
+                    }
+                }).catch(() => {});
+                return cached;
+            }
+
+            return fetch(event.request).then(response => {
+                if (response.ok && url.origin === location.origin) {
+                    const clone = response.clone();
+                    caches.open(CACHE_NAME).then(cache => {
+                        cache.put(event.request, clone);
+                    });
+                }
+                return response;
+            });
+        })
+    );
+});
diff --git a/public/mobile/warehouse-stocktake/app.css b/public/mobile/warehouse-stocktake/app.css
new file mode 100644
index 000000000..7aa7294d7
--- /dev/null
+++ b/public/mobile/warehouse-stocktake/app.css
@@ -0,0 +1,168 @@
+/**
+ * Warehouse Stocktake PWA - App-Specific Styles
+ */
+
+/* QR Scanner Container */
+#qr-reader {
+    width: 100%;
+    max-width: 400px;
+    margin: 0 auto;
+    border-radius: 0.5rem;
+    overflow: hidden;
+}
+
+#qr-reader video {
+    border-radius: 0.5rem;
+}
+
+/* Hide default html5-qrcode UI elements we don't need */
+#qr-reader__status_span,
+#qr-reader__dashboard_section_csr,
+#qr-reader__dashboard_section_swaplink {
+    display: none !important;
+}
+
+/* Scanner frame styling */
+#qr-reader__scan_region {
+    background: transparent !important;
+}
+
+#qr-reader__scan_region img {
+    opacity: 0.3;
+}
+
+/* Keypad styling */
+.keypad-button {
+    min-height: 60px;
+}
+
+/* Numeric display */
+.quantity-display {
+    font-variant-numeric: tabular-nums;
+    letter-spacing: 0.05em;
+}
+
+/* Tab indicator animation */
+.tab-indicator {
+    transition: transform 0.3s ease, width 0.3s ease;
+}
+
+/* Card hover effect */
+.stocktake-card:active {
+    transform: scale(0.98);
+}
+
+/* Search results scrolling */
+.search-results {
+    max-height: calc(100vh - 280px);
+    overflow-y: auto;
+}
+
+/* History list */
+.history-list {
+    max-height: calc(100vh - 200px);
+    overflow-y: auto;
+}
+
+/* Already scanned badge pulse */
+@keyframes pulse-amber {
+    0%, 100% {
+        box-shadow: 0 0 0 0 rgba(245, 158, 11, 0.4);
+    }
+    50% {
+        box-shadow: 0 0 0 8px rgba(245, 158, 11, 0);
+    }
+}
+
+.already-scanned-pulse {
+    animation: pulse-amber 2s ease-in-out infinite;
+}
+
+/* Toast slide up animation (complementing base.css) */
+.toast-enter-active {
+    animation: toast-slide-up 0.3s ease-out;
+}
+
+.toast-leave-active {
+    animation: toast-slide-down 0.3s ease-in;
+}
+
+@keyframes toast-slide-up {
+    from {
+        transform: translateY(100%);
+        opacity: 0;
+    }
+    to {
+        transform: translateY(0);
+        opacity: 1;
+    }
+}
+
+@keyframes toast-slide-down {
+    from {
+        transform: translateY(0);
+        opacity: 1;
+    }
+    to {
+        transform: translateY(100%);
+        opacity: 0;
+    }
+}
+
+/* Settings panel slide */
+.settings-panel {
+    transform: translateX(100%);
+    transition: transform 0.3s ease-out;
+}
+
+.settings-panel.open {
+    transform: translateX(0);
+}
+
+/* Loading spinner */
+.spinner {
+    border: 3px solid rgba(0, 83, 132, 0.1);
+    border-top-color: #005384;
+    border-radius: 50%;
+    width: 40px;
+    height: 40px;
+    animation: spin 1s linear infinite;
+}
+
+/* Dark mode specific overrides */
+.dark .spinner {
+    border-color: rgba(250, 196, 27, 0.1);
+    border-top-color: #fac41b;
+}
+
+/* Scan success flash */
+@keyframes scan-flash {
+    0% {
+        background-color: rgba(34, 197, 94, 0.3);
+    }
+    100% {
+        background-color: transparent;
+    }
+}
+
+.scan-success-flash {
+    animation: scan-flash 0.5s ease-out;
+}
+
+/* Custom scrollbar for webkit browsers */
+.custom-scrollbar::-webkit-scrollbar {
+    width: 6px;
+}
+
+.custom-scrollbar::-webkit-scrollbar-track {
+    background: transparent;
+}
+
+.custom-scrollbar::-webkit-scrollbar-thumb {
+    background-color: rgba(0, 0, 0, 0.2);
+    border-radius: 3px;
+}
+
+.dark .custom-scrollbar::-webkit-scrollbar-thumb {
+    background-color: rgba(255, 255, 255, 0.2);
+}
diff --git a/public/mobile/warehouse-stocktake/app.js b/public/mobile/warehouse-stocktake/app.js
new file mode 100644
index 000000000..b7b09ab45
--- /dev/null
+++ b/public/mobile/warehouse-stocktake/app.js
@@ -0,0 +1,182 @@
+/**
+ * Warehouse Stocktake PWA - Main Vue Application
+ *
+ * This is the entry point for the Warehouse Stocktake PWA.
+ * It manages authentication state and routes between views.
+ */
+
+// Import shared modules
+import { api, authState, checkAuth, login, logout } from '/mobile/shared/auth.js';
+
+// Import components
+import LoginScreen from './components/LoginScreen.js';
+import StocktakeList from './components/StocktakeList.js';
+import Scanner from './components/Scanner.js';
+
+const { createApp, ref, computed, onMounted, watch, nextTick } = Vue;
+
+const App = {
+    components: {
+        LoginScreen,
+        StocktakeList,
+        Scanner
+    },
+
+    setup() {
+        // ==================== STATE ====================
+        const currentView = ref('loading'); // 'loading', 'login', 'list', 'scanner'
+        const user = ref(null);
+        const selectedStocktake = ref(null);
+        const toast = ref({ show: false, message: '', type: 'success' });
+        const theme = ref('system');
+
+        // ==================== THEME ====================
+        const applyTheme = () => {
+            const isDark = localStorage.theme === 'dark' ||
+                (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches);
+            document.documentElement.classList.toggle('dark', isDark);
+
+            const metaThemeColor = document.querySelector('meta[name="theme-color"]');
+            if (metaThemeColor) {
+                metaThemeColor.setAttribute('content', isDark ? '#0f172a' : '#005384');
+            }
+        };
+
+        const setTheme = (newTheme) => {
+            theme.value = newTheme;
+            if (newTheme === 'system') {
+                localStorage.removeItem('theme');
+            } else {
+                localStorage.setItem('theme', newTheme);
+            }
+            applyTheme();
+        };
+
+        // ==================== AUTH ====================
+        const handleLogin = async (credentials) => {
+            const result = await login(credentials);
+            if (result.success) {
+                user.value = result.user;
+                currentView.value = 'list';
+                showToast('Erfolgreich angemeldet', 'success');
+            }
+            return result;
+        };
+
+        const handleLogout = async () => {
+            await logout();
+            user.value = null;
+            selectedStocktake.value = null;
+            currentView.value = 'login';
+            showToast('Abgemeldet', 'success');
+        };
+
+        // ==================== NAVIGATION ====================
+        const openScanner = (stocktake) => {
+            selectedStocktake.value = stocktake;
+            currentView.value = 'scanner';
+        };
+
+        const closeScanner = () => {
+            selectedStocktake.value = null;
+            currentView.value = 'list';
+        };
+
+        // ==================== TOAST ====================
+        const showToast = (message, type = 'success') => {
+            toast.value = { show: true, message, type };
+            setTimeout(() => {
+                toast.value.show = false;
+            }, 3000);
+        };
+
+        // ==================== LIFECYCLE ====================
+        onMounted(async () => {
+            // Initialize theme
+            const savedTheme = localStorage.getItem('theme');
+            if (savedTheme) {
+                theme.value = savedTheme;
+            }
+            applyTheme();
+            window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', applyTheme);
+
+            // Check authentication
+            const result = await checkAuth();
+            if (result.authenticated) {
+                user.value = result.user;
+                currentView.value = 'list';
+            } else {
+                currentView.value = 'login';
+            }
+        });
+
+        return {
+            // State
+            currentView,
+            user,
+            selectedStocktake,
+            toast,
+            theme,
+
+            // Methods
+            handleLogin,
+            handleLogout,
+            openScanner,
+            closeScanner,
+            showToast,
+            setTheme,
+        };
+    },
+
+    template: `
+        <div class="relative h-full w-full bg-slate-100 dark:bg-slate-900 transition-colors duration-300">
+            <!-- Loading State -->
+            <div v-if="currentView === 'loading'" class="flex items-center justify-center h-full">
+                <div class="text-center">
+                    <img src="/assets/images/xinon-full-transparent.png" class="h-12 mx-auto mb-4 dark:hidden">
+                    <img src="/assets/images/xinon-full-transparent-white.png" class="h-12 mx-auto mb-4 hidden dark:block">
+                    <div class="animate-pulse text-slate-500 dark:text-slate-400">Lädt...</div>
+                </div>
+            </div>
+
+            <!-- Login Screen -->
+            <LoginScreen
+                v-else-if="currentView === 'login'"
+                @login="handleLogin"
+                :theme="theme"
+                @set-theme="setTheme"
+            />
+
+            <!-- Stocktake List -->
+            <StocktakeList
+                v-else-if="currentView === 'list'"
+                :user="user"
+                :theme="theme"
+                @select="openScanner"
+                @logout="handleLogout"
+                @set-theme="setTheme"
+            />
+
+            <!-- Scanner View -->
+            <Scanner
+                v-else-if="currentView === 'scanner'"
+                :stocktake="selectedStocktake"
+                :user="user"
+                @close="closeScanner"
+                @toast="showToast"
+            />
+
+            <!-- Toast Notifications -->
+            <transition name="slide-up">
+                <div v-if="toast.show" class="toast-container">
+                    <div :class="['toast', 'toast-' + toast.type]">
+                        {{ toast.message }}
+                    </div>
+                </div>
+            </transition>
+        </div>
+    `
+};
+
+// Mount the app
+createApp(App).mount('#app');
diff --git a/public/mobile/warehouse-stocktake/components/LoginScreen.js b/public/mobile/warehouse-stocktake/components/LoginScreen.js
new file mode 100644
index 000000000..b7b5382d9
--- /dev/null
+++ b/public/mobile/warehouse-stocktake/components/LoginScreen.js
@@ -0,0 +1,207 @@
+/**
+ * LoginScreen Component
+ *
+ * Displays the login form for the PWA.
+ * Handles username/password authentication with remember me option.
+ */
+
+export default {
+    name: 'LoginScreen',
+    emits: ['login', 'set-theme'],
+    props: {
+        theme: {
+            type: String,
+            default: 'system'
+        }
+    },
+
+    setup(props, { emit }) {
+        const { ref } = Vue;
+
+        // Form state
+        const username = ref('');
+        const password = ref('');
+        const rememberMe = ref(true);
+        const error = ref('');
+        const loading = ref(false);
+        const showPassword = ref(false);
+
+        // Theme picker (shown on first visit)
+        const showThemePicker = ref(!localStorage.getItem('theme'));
+
+        const handleSubmit = async () => {
+            if (!username.value || !password.value) {
+                error.value = 'Bitte Benutzername und Passwort eingeben';
+                return;
+            }
+
+            loading.value = true;
+            error.value = '';
+
+            try {
+                const result = await new Promise((resolve) => {
+                    // Emit returns undefined, we need to wait for parent to call back
+                    const loginPromise = emit('login', {
+                        username: username.value,
+                        password: password.value,
+                        rememberMe: rememberMe.value
+                    });
+
+                    // The parent will return the result
+                    resolve(loginPromise);
+                });
+
+                if (result && !result.success) {
+                    error.value = result.message || 'Login fehlgeschlagen';
+                    if (result.requires2FA) {
+                        error.value = 'Zwei-Faktor-Authentifizierung wird derzeit nicht unterstützt.';
+                    }
+                }
+            } catch (e) {
+                error.value = 'Ein Fehler ist aufgetreten';
+            } finally {
+                loading.value = false;
+            }
+        };
+
+        const selectTheme = (newTheme) => {
+            emit('set-theme', newTheme);
+            showThemePicker.value = false;
+        };
+
+        return {
+            username,
+            password,
+            rememberMe,
+            error,
+            loading,
+            showPassword,
+            showThemePicker,
+            handleSubmit,
+            selectTheme
+        };
+    },
+
+    template: `
+        <div class="min-h-screen flex items-center justify-center bg-slate-100 dark:bg-slate-900 p-4">
+            <!-- Theme Picker Modal (First Visit) -->
+            <transition name="fade">
+                <div v-if="showThemePicker" class="fixed inset-0 bg-black bg-opacity-60 z-50 flex items-center justify-center p-4">
+                    <div class="bg-white dark:bg-slate-800 rounded-lg p-6 w-full max-w-xs text-center shadow-2xl">
+                        <h3 class="font-bold text-lg mb-2 text-slate-800 dark:text-white">Willkommen!</h3>
+                        <p class="text-sm text-slate-600 dark:text-slate-300 mb-6">Wähle dein bevorzugtes Farbschema.</p>
+                        <div class="flex flex-col space-y-3">
+                            <button @click="selectTheme('light')" class="w-full px-4 py-3 bg-slate-200 text-slate-800 font-bold rounded-md hover:bg-slate-300 transition">
+                                Hell
+                            </button>
+                            <button @click="selectTheme('dark')" class="w-full px-4 py-3 bg-slate-700 text-white font-bold rounded-md hover:bg-slate-600 transition">
+                                Dunkel
+                            </button>
+                            <button @click="selectTheme('system')" class="w-full mt-2 text-sm text-slate-500 dark:text-slate-400 hover:underline">
+                                Systemstandard
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </transition>
+
+            <!-- Login Form -->
+            <div class="bg-white dark:bg-slate-800 rounded-xl shadow-lg p-6 w-full max-w-sm">
+                <!-- Logo -->
+                <div class="mb-8">
+                    <img src="/assets/images/xinon-full-transparent.png" class="h-10 mx-auto dark:hidden" alt="Logo">
+                    <img src="/assets/images/xinon-full-transparent-white.png" class="h-10 mx-auto hidden dark:block" alt="Logo">
+                </div>
+
+                <!-- Title -->
+                <h1 class="text-xl font-bold text-center text-slate-800 dark:text-white mb-6">
+                    Lager Inventur
+                </h1>
+
+                <!-- Form -->
+                <form @submit.prevent="handleSubmit" class="space-y-4">
+                    <!-- Username -->
+                    <div>
+                        <label class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-1">
+                            Benutzername
+                        </label>
+                        <input
+                            v-model="username"
+                            type="text"
+                            autocomplete="username"
+                            autocapitalize="none"
+                            class="w-full p-3 border border-slate-300 rounded-lg focus:ring-2 focus:ring-primary focus:border-primary transition dark:bg-slate-700 dark:border-slate-600 dark:text-white"
+                            placeholder="Benutzername eingeben"
+                        >
+                    </div>
+
+                    <!-- Password -->
+                    <div>
+                        <label class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-1">
+                            Passwort
+                        </label>
+                        <div class="relative">
+                            <input
+                                v-model="password"
+                                :type="showPassword ? 'text' : 'password'"
+                                autocomplete="current-password"
+                                class="w-full p-3 pr-12 border border-slate-300 rounded-lg focus:ring-2 focus:ring-primary focus:border-primary transition dark:bg-slate-700 dark:border-slate-600 dark:text-white"
+                                placeholder="Passwort eingeben"
+                            >
+                            <button
+                                type="button"
+                                @click="showPassword = !showPassword"
+                                class="absolute right-3 top-1/2 -translate-y-1/2 text-slate-400 hover:text-slate-600 dark:hover:text-slate-300"
+                            >
+                                <svg v-if="!showPassword" xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z" />
+                                </svg>
+                                <svg v-else xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13.875 18.825A10.05 10.05 0 0112 19c-4.478 0-8.268-2.943-9.543-7a9.97 9.97 0 011.563-3.029m5.858.908a3 3 0 114.243 4.243M9.878 9.878l4.242 4.242M9.88 9.88l-3.29-3.29m7.532 7.532l3.29 3.29M3 3l3.59 3.59m0 0A9.953 9.953 0 0112 5c4.478 0 8.268 2.943 9.543 7a10.025 10.025 0 01-4.132 5.411m0 0L21 21" />
+                                </svg>
+                            </button>
+                        </div>
+                    </div>
+
+                    <!-- Remember Me -->
+                    <label class="flex items-center cursor-pointer">
+                        <input
+                            v-model="rememberMe"
+                            type="checkbox"
+                            class="w-4 h-4 rounded border-slate-300 text-primary focus:ring-primary dark:border-slate-600 dark:bg-slate-700"
+                        >
+                        <span class="ml-2 text-sm text-slate-600 dark:text-slate-300">
+                            Angemeldet bleiben
+                        </span>
+                    </label>
+
+                    <!-- Error Message -->
+                    <div v-if="error" class="p-3 bg-red-50 dark:bg-red-900/30 border border-red-200 dark:border-red-800 rounded-lg">
+                        <p class="text-sm text-red-600 dark:text-red-400">{{ error }}</p>
+                    </div>
+
+                    <!-- Submit Button -->
+                    <button
+                        type="submit"
+                        :disabled="loading"
+                        class="w-full py-3 px-4 bg-primary text-white font-bold rounded-lg hover:bg-primary/90 focus:ring-4 focus:ring-primary/30 transition disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-center"
+                    >
+                        <svg v-if="loading" class="animate-spin -ml-1 mr-2 h-5 w-5 text-white" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+                            <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+                            <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+                        </svg>
+                        {{ loading ? 'Wird angemeldet...' : 'Anmelden' }}
+                    </button>
+                </form>
+
+                <!-- Footer -->
+                <div class="mt-8 text-center">
+                    <p class="text-xs text-slate-400 dark:text-slate-500">
+                        powered by XINON GmbH
+                    </p>
+                </div>
+            </div>
+        </div>
+    `
+};
diff --git a/public/mobile/warehouse-stocktake/components/Scanner.js b/public/mobile/warehouse-stocktake/components/Scanner.js
new file mode 100644
index 000000000..64dc52088
--- /dev/null
+++ b/public/mobile/warehouse-stocktake/components/Scanner.js
@@ -0,0 +1,607 @@
+/**
+ * Scanner Component
+ *
+ * The main scanning interface for the stocktake.
+ * Features:
+ * - QR code scanning via camera
+ * - Manual article search
+ * - Quantity input with custom keypad
+ * - Recent scans list
+ */
+
+import { api } from '/mobile/shared/auth.js';
+
+export default {
+    name: 'Scanner',
+    emits: ['close', 'toast'],
+    props: {
+        stocktake: {
+            type: Object,
+            required: true
+        },
+        user: {
+            type: Object,
+            required: true
+        }
+    },
+
+    setup(props, { emit }) {
+        const { ref, onMounted, onUnmounted, nextTick, computed } = Vue;
+
+        // ==================== STATE ====================
+        const currentTab = ref('scan'); // 'scan', 'search', 'history'
+        const isLoading = ref(false);
+
+        // Scanner state
+        const scanner = ref(null);
+        const isScannerActive = ref(false);
+        const scannerError = ref('');
+
+        // Article state
+        const scannedArticle = ref(null);
+        const quantity = ref('1');
+        const rack = ref('');
+        const shelf = ref('');
+
+        // Search state
+        const searchQuery = ref('');
+        const searchResults = ref([]);
+        const categories = ref([]);
+        const selectedCategory = ref(0);
+        const isSearching = ref(false);
+
+        // History state
+        const recentScans = ref([]);
+        const isLoadingHistory = ref(false);
+
+        // Already scanned warning
+        const alreadyScannedWarning = ref(null);
+
+        // Custom keypad
+        const showKeypad = ref(false);
+
+        // ==================== COMPUTED ====================
+        const canSubmit = computed(() => {
+            return scannedArticle.value &&
+                   parseFloat(quantity.value) > 0 &&
+                   !isLoading.value;
+        });
+
+        // ==================== SCANNER ====================
+        const startScanner = async () => {
+            scannerError.value = '';
+
+            try {
+                // Initialize scanner
+                scanner.value = new Html5Qrcode('qr-reader');
+
+                await scanner.value.start(
+                    { facingMode: 'environment' },
+                    {
+                        fps: 10,
+                        qrbox: { width: 250, height: 250 },
+                        aspectRatio: 1.0
+                    },
+                    onScanSuccess,
+                    onScanError
+                );
+
+                isScannerActive.value = true;
+            } catch (err) {
+                console.error('Scanner start error:', err);
+                scannerError.value = 'Kamera konnte nicht gestartet werden. Bitte Berechtigungen prüfen.';
+            }
+        };
+
+        const stopScanner = async () => {
+            if (scanner.value && isScannerActive.value) {
+                try {
+                    await scanner.value.stop();
+                } catch (e) {
+                    console.error('Scanner stop error:', e);
+                }
+                isScannerActive.value = false;
+            }
+        };
+
+        const onScanSuccess = async (decodedText) => {
+            // Stop scanner temporarily
+            await stopScanner();
+
+            // Look up article
+            await lookupArticle(decodedText);
+        };
+
+        const onScanError = (errorMessage) => {
+            // Silent - this fires constantly when no QR code is detected
+        };
+
+        // ==================== ARTICLE LOOKUP ====================
+        const lookupArticle = async (code) => {
+            isLoading.value = true;
+            alreadyScannedWarning.value = null;
+
+            try {
+                const result = await api.get(`WarehouseStocktake/getArticle?code=${encodeURIComponent(code)}`);
+
+                if (result.success) {
+                    scannedArticle.value = result.article;
+
+                    // Check if already scanned
+                    const checkResult = await api.get(
+                        `WarehouseStocktake/checkAlreadyScanned?stocktakeId=${props.stocktake.id}&articleId=${result.article.id}`
+                    );
+
+                    if (checkResult.success && checkResult.alreadyScanned) {
+                        alreadyScannedWarning.value = checkResult.existingItem;
+                    }
+
+                    // Reset quantity
+                    quantity.value = '1';
+                } else {
+                    emit('toast', result.message || 'Artikel nicht gefunden', 'error');
+                    // Restart scanner
+                    await startScanner();
+                }
+            } catch (e) {
+                emit('toast', 'Fehler beim Laden des Artikels', 'error');
+                await startScanner();
+            } finally {
+                isLoading.value = false;
+            }
+        };
+
+        // ==================== SUBMIT SCAN ====================
+        const submitScan = async (overwrite = false) => {
+            if (!canSubmit.value) return;
+
+            isLoading.value = true;
+
+            try {
+                const payload = {
+                    stocktakeId: props.stocktake.id,
+                    articleId: scannedArticle.value.id,
+                    quantity: parseFloat(quantity.value),
+                    rack: rack.value || null,
+                    shelf: shelf.value || null,
+                    overwrite: overwrite,
+                    overwriteItemId: overwrite && alreadyScannedWarning.value ? alreadyScannedWarning.value.id : 0
+                };
+
+                const result = await api.post('WarehouseStocktake/submitScan', payload);
+
+                if (result.success) {
+                    emit('toast', result.message, 'success');
+
+                    // Reset state
+                    scannedArticle.value = null;
+                    quantity.value = '1';
+                    rack.value = '';
+                    shelf.value = '';
+                    alreadyScannedWarning.value = null;
+
+                    // Restart scanner
+                    await startScanner();
+                } else {
+                    emit('toast', result.message || 'Fehler beim Speichern', 'error');
+                }
+            } catch (e) {
+                emit('toast', 'Netzwerkfehler', 'error');
+            } finally {
+                isLoading.value = false;
+            }
+        };
+
+        // ==================== SEARCH ====================
+        const loadCategories = async () => {
+            const result = await api.get('WarehouseStocktake/getCategories');
+            if (result.success) {
+                categories.value = result.categories;
+            }
+        };
+
+        const searchArticles = async () => {
+            if (searchQuery.value.length < 2 && !selectedCategory.value) {
+                searchResults.value = [];
+                return;
+            }
+
+            isSearching.value = true;
+
+            try {
+                const params = new URLSearchParams();
+                if (searchQuery.value) params.set('query', searchQuery.value);
+                if (selectedCategory.value) params.set('categoryId', selectedCategory.value);
+
+                const result = await api.get(`WarehouseStocktake/searchArticles?${params}`);
+
+                if (result.success) {
+                    searchResults.value = result.articles;
+                }
+            } catch (e) {
+                console.error('Search error:', e);
+            } finally {
+                isSearching.value = false;
+            }
+        };
+
+        const selectSearchResult = async (article) => {
+            await stopScanner();
+            scannedArticle.value = article;
+            quantity.value = '1';
+            currentTab.value = 'scan';
+
+            // Check if already scanned
+            const checkResult = await api.get(
+                `WarehouseStocktake/checkAlreadyScanned?stocktakeId=${props.stocktake.id}&articleId=${article.id}`
+            );
+
+            if (checkResult.success && checkResult.alreadyScanned) {
+                alreadyScannedWarning.value = checkResult.existingItem;
+            }
+        };
+
+        // ==================== HISTORY ====================
+        const loadHistory = async () => {
+            isLoadingHistory.value = true;
+
+            try {
+                const result = await api.get(`WarehouseStocktake/getMyScans?stocktakeId=${props.stocktake.id}`);
+
+                if (result.success) {
+                    recentScans.value = result.items;
+                }
+            } catch (e) {
+                console.error('History load error:', e);
+            } finally {
+                isLoadingHistory.value = false;
+            }
+        };
+
+        // ==================== KEYPAD ====================
+        const appendDigit = (digit) => {
+            if (digit === '.' && quantity.value.includes('.')) return;
+            if (quantity.value === '0' && digit !== '.') {
+                quantity.value = digit;
+            } else {
+                quantity.value += digit;
+            }
+        };
+
+        const deleteDigit = () => {
+            if (quantity.value.length > 1) {
+                quantity.value = quantity.value.slice(0, -1);
+            } else {
+                quantity.value = '0';
+            }
+        };
+
+        const clearQuantity = () => {
+            quantity.value = '0';
+        };
+
+        // ==================== LIFECYCLE ====================
+        const handleClose = async () => {
+            await stopScanner();
+            emit('close');
+        };
+
+        const switchTab = async (tab) => {
+            currentTab.value = tab;
+
+            if (tab === 'scan' && !scannedArticle.value) {
+                await nextTick();
+                await startScanner();
+            } else if (tab === 'search') {
+                await stopScanner();
+                await loadCategories();
+            } else if (tab === 'history') {
+                await stopScanner();
+                await loadHistory();
+            }
+        };
+
+        const cancelScan = async () => {
+            scannedArticle.value = null;
+            alreadyScannedWarning.value = null;
+            quantity.value = '1';
+            await startScanner();
+        };
+
+        onMounted(async () => {
+            await startScanner();
+        });
+
+        onUnmounted(async () => {
+            await stopScanner();
+        });
+
+        return {
+            // State
+            currentTab,
+            isLoading,
+            isScannerActive,
+            scannerError,
+            scannedArticle,
+            quantity,
+            rack,
+            shelf,
+            searchQuery,
+            searchResults,
+            categories,
+            selectedCategory,
+            isSearching,
+            recentScans,
+            isLoadingHistory,
+            alreadyScannedWarning,
+            showKeypad,
+            canSubmit,
+
+            // Methods
+            startScanner,
+            stopScanner,
+            submitScan,
+            searchArticles,
+            selectSearchResult,
+            loadHistory,
+            appendDigit,
+            deleteDigit,
+            clearQuantity,
+            handleClose,
+            switchTab,
+            cancelScan
+        };
+    },
+
+    template: `
+        <div class="flex flex-col h-full bg-slate-100 dark:bg-slate-900">
+            <!-- Header -->
+            <header class="bg-white dark:bg-slate-800 shadow-sm p-4 flex-shrink-0">
+                <div class="flex items-center justify-between">
+                    <button @click="handleClose" class="p-2 -ml-2 rounded-full hover:bg-slate-100 dark:hover:bg-slate-700">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 text-slate-600 dark:text-slate-300" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7" />
+                        </svg>
+                    </button>
+                    <h1 class="text-lg font-bold text-slate-800 dark:text-white truncate px-2">
+                        {{ stocktake.title || 'Inventur #' + stocktake.stocktakeNumber }}
+                    </h1>
+                    <div class="w-10"></div>
+                </div>
+
+                <!-- Tabs -->
+                <div class="flex mt-4 bg-slate-100 dark:bg-slate-700 rounded-lg p-1">
+                    <button
+                        @click="switchTab('scan')"
+                        :class="[currentTab === 'scan' ? 'bg-white dark:bg-slate-600 shadow' : '']"
+                        class="flex-1 py-2 text-sm font-medium rounded-md transition text-slate-700 dark:text-slate-200"
+                    >
+                        Scannen
+                    </button>
+                    <button
+                        @click="switchTab('search')"
+                        :class="[currentTab === 'search' ? 'bg-white dark:bg-slate-600 shadow' : '']"
+                        class="flex-1 py-2 text-sm font-medium rounded-md transition text-slate-700 dark:text-slate-200"
+                    >
+                        Suche
+                    </button>
+                    <button
+                        @click="switchTab('history')"
+                        :class="[currentTab === 'history' ? 'bg-white dark:bg-slate-600 shadow' : '']"
+                        class="flex-1 py-2 text-sm font-medium rounded-md transition text-slate-700 dark:text-slate-200"
+                    >
+                        Verlauf
+                    </button>
+                </div>
+            </header>
+
+            <!-- Content -->
+            <main class="flex-grow overflow-y-auto">
+                <!-- SCAN TAB -->
+                <div v-if="currentTab === 'scan'" class="p-4 space-y-4">
+                    <!-- Scanner or Article View -->
+                    <div v-if="!scannedArticle" class="space-y-4">
+                        <!-- QR Scanner -->
+                        <div id="qr-reader" class="w-full rounded-lg overflow-hidden bg-black"></div>
+
+                        <!-- Scanner Error -->
+                        <div v-if="scannerError" class="p-4 bg-red-50 dark:bg-red-900/30 rounded-lg">
+                            <p class="text-sm text-red-600 dark:text-red-400">{{ scannerError }}</p>
+                            <button @click="startScanner" class="mt-2 text-sm font-medium text-primary">
+                                Erneut versuchen
+                            </button>
+                        </div>
+
+                        <p class="text-center text-sm text-slate-500 dark:text-slate-400">
+                            QR-Code scannen oder Artikel suchen
+                        </p>
+                    </div>
+
+                    <!-- Scanned Article -->
+                    <div v-else class="space-y-4">
+                        <!-- Already Scanned Warning -->
+                        <div v-if="alreadyScannedWarning" class="p-4 bg-amber-50 dark:bg-amber-900/30 border border-amber-200 dark:border-amber-800 rounded-lg">
+                            <div class="flex items-start">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-amber-500 mr-2 flex-shrink-0 mt-0.5" viewBox="0 0 20 20" fill="currentColor">
+                                    <path fill-rule="evenodd" d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z" clip-rule="evenodd" />
+                                </svg>
+                                <div>
+                                    <p class="font-medium text-amber-800 dark:text-amber-300">Bereits gescannt</p>
+                                    <p class="text-sm text-amber-700 dark:text-amber-400 mt-1">
+                                        Menge: {{ alreadyScannedWarning.countedQuantity }}<br>
+                                        Von: {{ alreadyScannedWarning.scannedBy }}<br>
+                                        Am: {{ alreadyScannedWarning.scannedAt }}
+                                    </p>
+                                </div>
+                            </div>
+                        </div>
+
+                        <!-- Article Info -->
+                        <div class="bg-white dark:bg-slate-800 p-4 rounded-lg shadow-sm">
+                            <h3 class="font-bold text-lg text-slate-800 dark:text-white">
+                                {{ scannedArticle.title }}
+                            </h3>
+                            <p class="text-sm text-slate-500 dark:text-slate-400 mt-1">
+                                Art.-Nr.: {{ scannedArticle.articleNumber }}
+                            </p>
+                            <p v-if="scannedArticle.categoryName" class="text-sm text-slate-500 dark:text-slate-400">
+                                Kategorie: {{ scannedArticle.categoryName }}
+                            </p>
+                        </div>
+
+                        <!-- Quantity Input -->
+                        <div class="bg-white dark:bg-slate-800 p-4 rounded-lg shadow-sm">
+                            <label class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
+                                Menge ({{ scannedArticle.unit || 'Stk.' }})
+                            </label>
+                            <div
+                                @click="showKeypad = true"
+                                class="w-full p-4 text-3xl font-bold text-center border-2 border-slate-300 dark:border-slate-600 rounded-lg cursor-pointer hover:border-primary transition text-slate-800 dark:text-white"
+                            >
+                                {{ quantity }}
+                            </div>
+                        </div>
+
+                        <!-- Optional Fields -->
+                        <div class="grid grid-cols-2 gap-3">
+                            <div>
+                                <label class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-1">Regal</label>
+                                <input v-model="rack" type="text" class="w-full p-3 border border-slate-300 dark:border-slate-600 rounded-lg dark:bg-slate-800 dark:text-white" placeholder="z.B. A1">
+                            </div>
+                            <div>
+                                <label class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-1">Fach</label>
+                                <input v-model="shelf" type="text" class="w-full p-3 border border-slate-300 dark:border-slate-600 rounded-lg dark:bg-slate-800 dark:text-white" placeholder="z.B. 3">
+                            </div>
+                        </div>
+
+                        <!-- Action Buttons -->
+                        <div class="space-y-2">
+                            <button
+                                v-if="alreadyScannedWarning"
+                                @click="submitScan(false)"
+                                :disabled="!canSubmit"
+                                class="w-full py-4 bg-green-600 text-white font-bold rounded-lg disabled:opacity-50 disabled:cursor-not-allowed"
+                            >
+                                Zur Menge addieren
+                            </button>
+                            <button
+                                v-if="alreadyScannedWarning"
+                                @click="submitScan(true)"
+                                :disabled="!canSubmit"
+                                class="w-full py-4 bg-amber-600 text-white font-bold rounded-lg disabled:opacity-50 disabled:cursor-not-allowed"
+                            >
+                                Überschreiben
+                            </button>
+                            <button
+                                v-if="!alreadyScannedWarning"
+                                @click="submitScan(false)"
+                                :disabled="!canSubmit"
+                                class="w-full py-4 bg-green-600 text-white font-bold rounded-lg disabled:opacity-50 disabled:cursor-not-allowed"
+                            >
+                                {{ isLoading ? 'Speichert...' : 'Speichern' }}
+                            </button>
+                            <button @click="cancelScan" class="w-full py-3 text-slate-600 dark:text-slate-400 font-medium">
+                                Abbrechen
+                            </button>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- SEARCH TAB -->
+                <div v-else-if="currentTab === 'search'" class="p-4 space-y-4">
+                    <div class="sticky top-0 bg-slate-100 dark:bg-slate-900 pb-2 space-y-3">
+                        <input
+                            v-model="searchQuery"
+                            @input="searchArticles"
+                            type="search"
+                            placeholder="Artikel suchen..."
+                            class="w-full p-3 border border-slate-300 dark:border-slate-600 rounded-lg dark:bg-slate-800 dark:text-white"
+                        >
+                        <select
+                            v-model="selectedCategory"
+                            @change="searchArticles"
+                            class="w-full p-3 border border-slate-300 dark:border-slate-600 rounded-lg dark:bg-slate-800 dark:text-white"
+                        >
+                            <option :value="0">Alle Kategorien</option>
+                            <option v-for="cat in categories" :key="cat.id" :value="cat.id">{{ cat.name }}</option>
+                        </select>
+                    </div>
+
+                    <div v-if="isSearching" class="text-center py-8">
+                        <div class="animate-spin h-8 w-8 border-4 border-primary border-t-transparent rounded-full mx-auto"></div>
+                    </div>
+
+                    <div v-else-if="searchResults.length === 0" class="text-center py-8">
+                        <p class="text-slate-500 dark:text-slate-400">
+                            {{ searchQuery.length < 2 ? 'Mindestens 2 Zeichen eingeben' : 'Keine Artikel gefunden' }}
+                        </p>
+                    </div>
+
+                    <div v-else class="space-y-2">
+                        <div
+                            v-for="article in searchResults"
+                            :key="article.id"
+                            @click="selectSearchResult(article)"
+                            class="bg-white dark:bg-slate-800 p-3 rounded-lg shadow-sm cursor-pointer hover:shadow-md active:scale-[0.98] transition"
+                        >
+                            <p class="font-medium text-slate-800 dark:text-white">{{ article.title }}</p>
+                            <p class="text-sm text-slate-500 dark:text-slate-400">{{ article.articleNumber }}</p>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- HISTORY TAB -->
+                <div v-else-if="currentTab === 'history'" class="p-4">
+                    <div v-if="isLoadingHistory" class="space-y-3">
+                        <div v-for="i in 5" :key="i" class="bg-white dark:bg-slate-800 p-3 rounded-lg shadow-sm animate-pulse">
+                            <div class="h-4 bg-slate-200 dark:bg-slate-700 rounded w-3/4 mb-2"></div>
+                            <div class="h-3 bg-slate-200 dark:bg-slate-700 rounded w-1/2"></div>
+                        </div>
+                    </div>
+
+                    <div v-else-if="recentScans.length === 0" class="text-center py-8">
+                        <p class="text-slate-500 dark:text-slate-400">Noch keine Scans</p>
+                    </div>
+
+                    <div v-else class="space-y-2">
+                        <div v-for="scan in recentScans" :key="scan.id" class="bg-white dark:bg-slate-800 p-3 rounded-lg shadow-sm">
+                            <div class="flex justify-between items-start">
+                                <div>
+                                    <p class="font-medium text-slate-800 dark:text-white">{{ scan.articleTitle }}</p>
+                                    <p class="text-sm text-slate-500 dark:text-slate-400">{{ scan.articleNumber }}</p>
+                                </div>
+                                <div class="text-right">
+                                    <p class="font-bold text-slate-800 dark:text-white">{{ scan.countedQuantity }} {{ scan.unit }}</p>
+                                    <p class="text-xs text-slate-400">{{ scan.scannedAt }}</p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </main>
+
+            <!-- Custom Keypad Modal -->
+            <transition name="slide-up">
+                <div v-if="showKeypad" class="fixed inset-0 bg-black bg-opacity-50 z-50 flex items-end">
+                    <div class="bg-white dark:bg-slate-800 w-full rounded-t-2xl p-4 safe-area-bottom">
+                        <div class="flex justify-between items-center mb-4">
+                            <button @click="clearQuantity" class="px-4 py-2 text-red-500 font-medium">C</button>
+                            <div class="text-2xl font-bold text-slate-800 dark:text-white">{{ quantity }}</div>
+                            <button @click="showKeypad = false" class="px-4 py-2 text-primary font-medium">Fertig</button>
+                        </div>
+                        <div class="grid grid-cols-3 gap-2">
+                            <button v-for="d in ['1','2','3','4','5','6','7','8','9','.','0']" :key="d" @click="appendDigit(d)" class="py-4 text-xl font-bold bg-slate-100 dark:bg-slate-700 rounded-lg active:bg-slate-200 dark:active:bg-slate-600 text-slate-800 dark:text-white">
+                                {{ d }}
+                            </button>
+                            <button @click="deleteDigit" class="py-4 text-xl font-bold bg-slate-100 dark:bg-slate-700 rounded-lg active:bg-slate-200 dark:active:bg-slate-600 text-slate-800 dark:text-white">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 mx-auto" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2M3 12l6.414 6.414a2 2 0 001.414.586H19a2 2 0 002-2V7a2 2 0 00-2-2h-8.172a2 2 0 00-1.414.586L3 12z" />
+                                </svg>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </transition>
+        </div>
+    `
+};
diff --git a/public/mobile/warehouse-stocktake/components/StocktakeList.js b/public/mobile/warehouse-stocktake/components/StocktakeList.js
new file mode 100644
index 000000000..d9b63f49a
--- /dev/null
+++ b/public/mobile/warehouse-stocktake/components/StocktakeList.js
@@ -0,0 +1,266 @@
+/**
+ * StocktakeList Component
+ *
+ * Displays a list of active stocktakes that the user can participate in.
+ * Includes settings menu with theme toggle and logout.
+ */
+
+import { api } from '/mobile/shared/auth.js';
+
+export default {
+    name: 'StocktakeList',
+    emits: ['select', 'logout', 'set-theme'],
+    props: {
+        user: {
+            type: Object,
+            default: null
+        },
+        theme: {
+            type: String,
+            default: 'system'
+        }
+    },
+
+    setup(props, { emit }) {
+        const { ref, onMounted } = Vue;
+
+        // State
+        const stocktakes = ref([]);
+        const isLoading = ref(true);
+        const error = ref('');
+        const isSettingsOpen = ref(false);
+
+        // Fetch stocktakes
+        const fetchStocktakes = async () => {
+            isLoading.value = true;
+            error.value = '';
+
+            try {
+                const result = await api.get('WarehouseStocktake/getActiveStocktakes');
+
+                if (result.success) {
+                    stocktakes.value = result.stocktakes;
+                } else {
+                    error.value = result.error || 'Fehler beim Laden';
+                }
+            } catch (e) {
+                error.value = 'Netzwerkfehler';
+            } finally {
+                isLoading.value = false;
+            }
+        };
+
+        const selectStocktake = (stocktake) => {
+            emit('select', stocktake);
+        };
+
+        const handleLogout = () => {
+            isSettingsOpen.value = false;
+            emit('logout');
+        };
+
+        const setTheme = (newTheme) => {
+            emit('set-theme', newTheme);
+        };
+
+        onMounted(() => {
+            fetchStocktakes();
+        });
+
+        return {
+            stocktakes,
+            isLoading,
+            error,
+            isSettingsOpen,
+            fetchStocktakes,
+            selectStocktake,
+            handleLogout,
+            setTheme
+        };
+    },
+
+    template: `
+        <div class="flex flex-col h-full bg-slate-100 dark:bg-slate-900">
+            <!-- Overlay for settings -->
+            <transition name="fade">
+                <div v-if="isSettingsOpen" @click="isSettingsOpen = false" class="overlay"></div>
+            </transition>
+
+            <!-- Header -->
+            <header class="bg-white dark:bg-slate-800 shadow-sm p-4 flex-shrink-0 z-10">
+                <div class="flex items-center justify-between">
+                    <!-- Refresh Button -->
+                    <button
+                        @click="fetchStocktakes"
+                        class="p-2 rounded-full text-slate-600 dark:text-slate-300 hover:bg-slate-100 dark:hover:bg-slate-700 active:bg-slate-200 dark:active:bg-slate-600 transition"
+                    >
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" :class="{ 'animate-spin': isLoading }" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15" />
+                        </svg>
+                    </button>
+
+                    <!-- Logo -->
+                    <div>
+                        <img src="/assets/images/xinon-full-transparent.png" class="h-8 w-auto dark:hidden" alt="Logo">
+                        <img src="/assets/images/xinon-full-transparent-white.png" class="h-8 w-auto hidden dark:block" alt="Logo">
+                    </div>
+
+                    <!-- Settings Button -->
+                    <button
+                        @click="isSettingsOpen = true"
+                        class="p-2 rounded-full text-slate-600 dark:text-slate-300 hover:bg-slate-100 dark:hover:bg-slate-700 active:bg-slate-200 dark:active:bg-slate-600 transition"
+                    >
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z" />
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
+                        </svg>
+                    </button>
+                </div>
+
+                <!-- Title -->
+                <h1 class="text-xl font-bold text-slate-800 dark:text-white mt-4">
+                    Aktive Inventuren
+                </h1>
+                <p v-if="user" class="text-sm text-slate-500 dark:text-slate-400">
+                    Angemeldet als {{ user.name }}
+                </p>
+            </header>
+
+            <!-- Content -->
+            <main class="flex-grow overflow-y-auto p-4">
+                <!-- Loading State -->
+                <div v-if="isLoading" class="space-y-3">
+                    <div v-for="i in 3" :key="i" class="bg-white dark:bg-slate-800 p-4 rounded-lg shadow animate-pulse">
+                        <div class="h-5 bg-slate-200 dark:bg-slate-700 rounded w-3/4 mb-2"></div>
+                        <div class="h-4 bg-slate-200 dark:bg-slate-700 rounded w-1/2 mb-3"></div>
+                        <div class="h-3 bg-slate-200 dark:bg-slate-700 rounded w-1/3"></div>
+                    </div>
+                </div>
+
+                <!-- Error State -->
+                <div v-else-if="error" class="text-center py-8">
+                    <svg xmlns="http://www.w3.org/2000/svg" class="h-12 w-12 mx-auto text-red-400 mb-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
+                    </svg>
+                    <p class="text-slate-500 dark:text-slate-400 mb-4">{{ error }}</p>
+                    <button @click="fetchStocktakes" class="px-4 py-2 bg-primary text-white rounded-lg font-medium">
+                        Erneut versuchen
+                    </button>
+                </div>
+
+                <!-- Empty State -->
+                <div v-else-if="stocktakes.length === 0" class="text-center py-8">
+                    <svg xmlns="http://www.w3.org/2000/svg" class="h-12 w-12 mx-auto text-slate-300 dark:text-slate-600 mb-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2" />
+                    </svg>
+                    <p class="text-slate-500 dark:text-slate-400">Keine aktiven Inventuren</p>
+                </div>
+
+                <!-- Stocktake List -->
+                <div v-else class="space-y-3">
+                    <div
+                        v-for="stocktake in stocktakes"
+                        :key="stocktake.id"
+                        @click="selectStocktake(stocktake)"
+                        class="bg-white dark:bg-slate-800 p-4 rounded-lg shadow-sm cursor-pointer hover:shadow-md active:scale-[0.98] transition"
+                    >
+                        <div class="flex justify-between items-start">
+                            <div>
+                                <h3 class="font-bold text-slate-800 dark:text-white">
+                                    {{ stocktake.title || 'Inventur #' + stocktake.stocktakeNumber }}
+                                </h3>
+                                <p class="text-sm text-slate-500 dark:text-slate-400 mt-1">
+                                    {{ stocktake.locationName }}
+                                </p>
+                            </div>
+                            <div class="text-right">
+                                <span class="inline-flex items-center px-2 py-1 rounded-full text-xs font-medium bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-400">
+                                    Aktiv
+                                </span>
+                            </div>
+                        </div>
+                        <div class="flex justify-between items-center mt-3 pt-3 border-t border-slate-100 dark:border-slate-700">
+                            <div class="text-sm text-slate-500 dark:text-slate-400">
+                                <span class="font-medium text-slate-700 dark:text-slate-300">{{ stocktake.totalScannedItems || 0 }}</span>
+                                Artikel gescannt
+                            </div>
+                            <div class="text-xs text-slate-400 dark:text-slate-500">
+                                {{ stocktake.startedAt || 'Nicht gestartet' }}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </main>
+
+            <!-- Settings Panel -->
+            <transition name="slide">
+                <div v-if="isSettingsOpen" class="fixed inset-y-0 right-0 w-80 max-w-full bg-white dark:bg-slate-800 shadow-xl z-20 flex flex-col">
+                    <div class="p-4 border-b border-slate-200 dark:border-slate-700 flex items-center justify-between">
+                        <h2 class="text-lg font-bold text-slate-800 dark:text-white">Einstellungen</h2>
+                        <button @click="isSettingsOpen = false" class="p-2 rounded-full hover:bg-slate-100 dark:hover:bg-slate-700">
+                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-slate-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+                            </svg>
+                        </button>
+                    </div>
+
+                    <div class="flex-grow overflow-y-auto p-4 space-y-6">
+                        <!-- User Info -->
+                        <div v-if="user" class="pb-4 border-b border-slate-200 dark:border-slate-700">
+                            <p class="text-sm text-slate-500 dark:text-slate-400">Angemeldet als</p>
+                            <p class="font-medium text-slate-800 dark:text-white">{{ user.name }}</p>
+                        </div>
+
+                        <!-- Theme Settings -->
+                        <div>
+                            <h3 class="text-sm font-semibold text-slate-700 dark:text-slate-300 mb-3">Farbschema</h3>
+                            <div class="grid grid-cols-3 gap-2">
+                                <button
+                                    @click="setTheme('light')"
+                                    :class="{'ring-2 ring-primary': theme === 'light'}"
+                                    class="p-2 text-sm font-medium rounded-lg border border-slate-300 dark:border-slate-600 hover:bg-slate-50 dark:hover:bg-slate-700 transition text-slate-700 dark:text-slate-300"
+                                >
+                                    Hell
+                                </button>
+                                <button
+                                    @click="setTheme('dark')"
+                                    :class="{'ring-2 ring-primary': theme === 'dark'}"
+                                    class="p-2 text-sm font-medium rounded-lg border border-slate-300 dark:border-slate-600 hover:bg-slate-50 dark:hover:bg-slate-700 transition text-slate-700 dark:text-slate-300"
+                                >
+                                    Dunkel
+                                </button>
+                                <button
+                                    @click="setTheme('system')"
+                                    :class="{'ring-2 ring-primary': theme === 'system'}"
+                                    class="p-2 text-sm font-medium rounded-lg border border-slate-300 dark:border-slate-600 hover:bg-slate-50 dark:hover:bg-slate-700 transition text-slate-700 dark:text-slate-300"
+                                >
+                                    System
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+
+                    <!-- Footer -->
+                    <div class="p-4 border-t border-slate-200 dark:border-slate-700 space-y-4">
+                        <button
+                            @click="handleLogout"
+                            class="w-full flex items-center justify-center px-4 py-3 text-red-600 dark:text-red-400 font-medium rounded-lg hover:bg-red-50 dark:hover:bg-red-900/20 transition"
+                        >
+                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-2" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1" />
+                            </svg>
+                            Abmelden
+                        </button>
+
+                        <div class="text-center">
+                            <img src="/assets/images/xinon-sm.png" class="h-8 mx-auto mb-2" alt="XINON">
+                            <p class="text-xs text-slate-400 dark:text-slate-500">
+                                powered by XINON GmbH
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </transition>
+        </div>
+    `
+};
diff --git a/public/mobile/warehouse-stocktake/manifest.json b/public/mobile/warehouse-stocktake/manifest.json
new file mode 100644
index 000000000..415b4b751
--- /dev/null
+++ b/public/mobile/warehouse-stocktake/manifest.json
@@ -0,0 +1,27 @@
+{
+  "name": "Lager Inventur",
+  "short_name": "Inventur",
+  "description": "PWA für Lager-Inventur und Artikelerfassung",
+  "start_url": "/MobileApp/WarehouseStocktake",
+  "display": "standalone",
+  "background_color": "#0f172a",
+  "theme_color": "#005384",
+  "orientation": "portrait-primary",
+  "scope": "/MobileApp/",
+  "icons": [
+    {
+      "src": "/assets/images/xinon-sm-192.png",
+      "sizes": "192x192",
+      "type": "image/png",
+      "purpose": "any maskable"
+    },
+    {
+      "src": "/assets/images/xinon-sm-512.png",
+      "sizes": "512x512",
+      "type": "image/png",
+      "purpose": "any maskable"
+    }
+  ],
+  "categories": ["business", "productivity"],
+  "lang": "de-DE"
+}
diff --git a/public/mobile/warehouse-stocktake/sw.js b/public/mobile/warehouse-stocktake/sw.js
new file mode 100644
index 000000000..8c240672d
--- /dev/null
+++ b/public/mobile/warehouse-stocktake/sw.js
@@ -0,0 +1,109 @@
+/**
+ * Warehouse Stocktake PWA - Service Worker
+ *
+ * Provides basic caching for the app shell (offline-first for static assets).
+ * API calls are always fetched from network.
+ */
+
+const CACHE_NAME = 'warehouse-stocktake-v1';
+
+// Static assets to cache for offline use
+const ASSETS_TO_CACHE = [
+    '/MobileApp/WarehouseStocktake',
+    '/mobile/warehouse-stocktake/app.js',
+    '/mobile/warehouse-stocktake/app.css',
+    '/mobile/warehouse-stocktake/components/LoginScreen.js',
+    '/mobile/warehouse-stocktake/components/StocktakeList.js',
+    '/mobile/warehouse-stocktake/components/Scanner.js',
+    '/mobile/shared/auth.js',
+    '/mobile/shared/base.css',
+    '/assets/images/xinon-full-transparent.png',
+    '/assets/images/xinon-full-transparent-white.png',
+    '/assets/images/xinon-sm.png',
+    '/assets/images/favicon.ico'
+];
+
+// Install event - cache static assets
+self.addEventListener('install', (event) => {
+    event.waitUntil(
+        caches.open(CACHE_NAME)
+            .then(cache => {
+                console.log('[SW] Caching app shell');
+                return cache.addAll(ASSETS_TO_CACHE);
+            })
+            .then(() => self.skipWaiting())
+    );
+});
+
+// Activate event - clean up old caches
+self.addEventListener('activate', (event) => {
+    event.waitUntil(
+        caches.keys()
+            .then(cacheNames => {
+                return Promise.all(
+                    cacheNames
+                        .filter(name => name !== CACHE_NAME)
+                        .map(name => {
+                            console.log('[SW] Deleting old cache:', name);
+                            return caches.delete(name);
+                        })
+                );
+            })
+            .then(() => self.clients.claim())
+    );
+});
+
+// Fetch event - network first for API, cache first for assets
+self.addEventListener('fetch', (event) => {
+    const { request } = event;
+    const url = new URL(request.url);
+
+    // Skip non-GET requests
+    if (request.method !== 'GET') {
+        return;
+    }
+
+    // Skip CDN requests (Vue, Tailwind, etc.)
+    if (url.hostname !== self.location.hostname) {
+        return;
+    }
+
+    // API calls - always go to network (no caching)
+    if (url.pathname.startsWith('/MobileApp/') &&
+        !url.pathname.endsWith('/WarehouseStocktake') &&
+        url.pathname !== '/MobileApp/WarehouseStocktake') {
+        return;
+    }
+
+    // Static assets - cache first, fallback to network
+    event.respondWith(
+        caches.match(request)
+            .then(cachedResponse => {
+                if (cachedResponse) {
+                    // Return cached version, but also update cache in background
+                    event.waitUntil(
+                        fetch(request)
+                            .then(networkResponse => {
+                                if (networkResponse.ok) {
+                                    caches.open(CACHE_NAME)
+                                        .then(cache => cache.put(request, networkResponse));
+                                }
+                            })
+                            .catch(() => {})
+                    );
+                    return cachedResponse;
+                }
+
+                // Not in cache - fetch from network and cache
+                return fetch(request)
+                    .then(networkResponse => {
+                        if (networkResponse.ok) {
+                            const responseToCache = networkResponse.clone();
+                            caches.open(CACHE_NAME)
+                                .then(cache => cache.put(request, responseToCache));
+                        }
+                        return networkResponse;
+                    });
+            })
+    );
+});

From 4c483a5379f12f6225efdd36a3d3ae7034b3ab9d Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Wed, 14 Jan 2026 14:07:34 +0100
Subject: [PATCH 26/88] changed Rimoapi::addRemark() to take api key parameter

---
 application/Preorder/PreorderController.php | 8 +++++++-
 lib/Rimoapi/Rimoapi.php                     | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index 2379756eb..2cd55e6ec 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -1420,8 +1420,14 @@ class PreorderController extends mfBaseController {
 
         $new_remark = date("d.m.Y").": ".$new_remark;
 
+        $api_creds = $preorder->getNetownerRimoApiCredentials();
+        $this->log->debug(__METHOD__.": Rimo Api Creds: ".print_r($api_creds, true));
+        if(!$api_creds) return false;
+
+        $apikey = $api_creds["prod"]["key"];
+
         // upload remark to Rimo
-        if(!Rimoapi::addRemark($workorder->rimo_id, $new_remark)) {
+        if(!Rimoapi::addRemark($apikey, $workorder->rimo_id, $new_remark)) {
             return false;
         }
 
diff --git a/lib/Rimoapi/Rimoapi.php b/lib/Rimoapi/Rimoapi.php
index f50c1fe2c..16f1e8218 100644
--- a/lib/Rimoapi/Rimoapi.php
+++ b/lib/Rimoapi/Rimoapi.php
@@ -553,13 +553,13 @@ class Rimoapi {
         return $resp_data;
     }
 
-    public static function addRemark($object_id, $text) {
+    public static function addRemark($apikey, $object_id, $text) {
         if(!$object_id || !$text) return false;
 
         $log = mfLoghandler::singleton();
 
         $params = [];
-        $params['apiKey'] = RIMO_API_JSON_APIKEY;
+        $params['apiKey'] = $apikey;
         $params['objectId'] = $object_id;
         $params['text'] = $text;
 

From 76be480f7b3022079a9aa01870343ba2ab99c340 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 15 Jan 2026 14:16:22 +0100
Subject: [PATCH 27/88] Changed Citycom order flow to new estmk activation
 workflow

---
 .../Preorder/include/preorder-detail.php      |  2 +
 .../Modules/Operationaldata/SnoppCitycom.php  | 34 ++++++--
 application/Preorder/Preorder.php             | 14 +++-
 application/PreorderCtag/PreorderCtag.php     | 10 +--
 ...60115121818_preorder_ctag_add_ext_name.php | 35 +++++++++
 lib/Citycom/OanApiClient.php                  | 19 ++++-
 lib/Citycom/OanApiHelper.php                  | 77 ++++++++++++++++---
 scripts/adb-rimo-import/importer/citycom.php  |  8 +-
 .../preorder/citycom/order-mgmt-services.php  | 29 +++++--
 9 files changed, 195 insertions(+), 33 deletions(-)
 create mode 100644 db/migrations/20260115121818_preorder_ctag_add_ext_name.php

diff --git a/Layout/default/Preorder/include/preorder-detail.php b/Layout/default/Preorder/include/preorder-detail.php
index 31849a571..6329d86f8 100644
--- a/Layout/default/Preorder/include/preorder-detail.php
+++ b/Layout/default/Preorder/include/preorder-detail.php
@@ -697,6 +697,7 @@
                                                     <th>ctag</th>
                                                     <th>Typ</th>
                                                     <th>External ID</th>
+                                                    <th>External Name</th>
                                                     <th>External State</th>
                                                 </tr>
                                                 <?php if(is_array($preorder->ctags) && count($preorder->ctags)): ?>
@@ -706,6 +707,7 @@
                                                         <td class="text-monospace"><?=$ctag->ctag?></td>
                                                         <td class="text-monospace"><?=$ctag->service_type?></td>
                                                         <td class="text-monospace"><?=htmlentities($ctag->ext_id)?></td>
+                                                        <td class="text-monospace"><?=htmlentities($ctag->ext_name)?></td>
                                                         <td class="text-monospace"><?=htmlentities($ctag->ext_status)?></td>
                                                     </tr>
                                                     <?php endforeach; ?>
diff --git a/application/Api/v1/Modules/Operationaldata/SnoppCitycom.php b/application/Api/v1/Modules/Operationaldata/SnoppCitycom.php
index 75bdbade4..f5d51a2bb 100644
--- a/application/Api/v1/Modules/Operationaldata/SnoppCitycom.php
+++ b/application/Api/v1/Modules/Operationaldata/SnoppCitycom.php
@@ -85,13 +85,13 @@ class SnoppCitycom extends Modules\ApiControllerModule
         $bb_down = $this->post["bb_down"];
         $execution_date = false;
 
-        if($this->post["execution_date"]) {
+        /*if($this->post["execution_date"]) {
             try {
                 $execution_date = new \DateTime($this->post["execution_date"]);
             } catch(\Exception $e) {
                 return \mfResponse::BadRequest(["message" => "Invalid Timestamp format"]);
             }
-        }
+        }*/
 
 
         if(!is_numeric($bb_down) || !$bb_down || !is_numeric($bb_up) || !$bb_up || !$bb_down > 10000 || $bb_up > 10000) {
@@ -118,6 +118,10 @@ class SnoppCitycom extends Modules\ApiControllerModule
 
         // if all services are ordered and active, finish order and return active
         $ctag = PreorderCtag::getFirstActive(["preorder_id" => $preorder->id, "service_type" => "inet"]);
+        if(!$ctag) {
+            return \mfResponse::NotFound(["message" => "Home not found"]);
+        }
+
         if($ctag->ext_id && $ctag->ext_status == "finished") {
             if($preorder->status->code < 500) {
                 $preorder->setNewStatusCode(500);
@@ -132,7 +136,7 @@ class SnoppCitycom extends Modules\ApiControllerModule
             return \mfResponse::Ok(["message" => "ONT not yet installed. Deferred", "activation_status" => "deferred"]);
         }
 
-
+        /*
         $cc_home_id = \Citycom_OanApiHelper::hausnummerExtrefToCitycomId($wohneinheit->extref);
         $data["up"] = $bb_up;
         $data["down"] = $bb_down;
@@ -159,10 +163,30 @@ class SnoppCitycom extends Modules\ApiControllerModule
         // order Service at Citycom and set Preorder to 500 Finished
         if(!$cc_api->orderServices($preorder, $cc_home_id, $data)) {
             return \mfResponse::InternalServerError(["message" => "Error activating service"]);
+        }*/
+
+        // update product at citycom
+        //$cc_home_id = \Citycom_OanApiHelper::hausnummerExtrefToCitycomId($wohneinheit->extref);
+        $data["up"] = $bb_up;
+        $data["down"] = $bb_down;
+        $data["product_name"] = false;
+
+        if($preorder->campaign->fulfillment == "citycom_oan") {
+            $data["product_name"] = "Estmk Greenstream OAN $bb_down/$bb_up";
         }
 
-        // live check if service is active, if not return deferred
-        $ctag = PreorderCtag::getFirstActive(["preorder_id" => $preorder->id, "service_type" => "inet"]);
+        $cc_api_client = new \Citycom_OanApiClient(CITYCOM_OAN_API_USER, CITYCOM_OAN_API_PASS);
+        $cc_api = new \Citycom_OanApiHelper($cc_api_client);
+
+        // try to update product with bandwidth provided by snopp.
+        // updateService() only updates if values are changed.
+        if(!$cc_api->updateService($ctag->ext_id, $data)) {
+            $this->log->error(__METHOD__.": Error updating service {$ctag->ext_id} for preorder {$preorder->id}");
+            //return \mfResponse::InternalServerError(["message" => "Error activating service"]);
+        }
+
+        // check if service is active, if not return deferred
+        //$ctag = PreorderCtag::getFirstActive(["preorder_id" => $preorder->id, "service_type" => "inet"]);
         if($ctag->ext_id && $ctag->ext_status == "finished") {
             if($preorder->status->code < 500) {
                 $preorder->setNewStatusCode(500);
diff --git a/application/Preorder/Preorder.php b/application/Preorder/Preorder.php
index fffeb2fbe..af01ffe27 100644
--- a/application/Preorder/Preorder.php
+++ b/application/Preorder/Preorder.php
@@ -736,19 +736,27 @@ class Preorder extends mfBaseModel {
         $first_ctag = $search_ctag - ($search_ctag % $ctags_per_home);
         $last_ctag = $first_ctag + $ctags_per_home - 1;
 
+        $mgmt_ctag_exists = false;
+
         $mgmt_ctag = null;
         $ctag_range = [];
         for($i = $first_ctag; $i <= $last_ctag; $i++) {
-            if(!PreorderCtag::getFirstActive(["stag" => $stag, "ctag" => $i, "network" => $network_name])) {
-                if($i == $last_ctag) {
+            $ctag = PreorderCtag::getFirstActive(["stag" => $stag, "ctag" => $i, "network" => $network_name]);
+            if(!$ctag) {
+                if($i == $last_ctag && !$mgmt_ctag_exists) {
                     // mgmt ctag should be the last in range
                     $mgmt_ctag = $i;
                     continue;
                 }
                 $ctag_range[] = $i;
-
+            } else {
+                if($ctag->service_type == "mgmt") {
+                    $this->log->debug(__METHOD__.": mgmt ctag ($i / stag $stag) exists already\n");
+                    $mgmt_ctag_exists = true;
+                }
             }
         }
+
         return [$ctag_range, $mgmt_ctag];
     }
 
diff --git a/application/PreorderCtag/PreorderCtag.php b/application/PreorderCtag/PreorderCtag.php
index db3f194f0..85f589cda 100644
--- a/application/PreorderCtag/PreorderCtag.php
+++ b/application/PreorderCtag/PreorderCtag.php
@@ -1,10 +1,8 @@
 <?php
 
 class PreorderCtag extends mfBaseModel {
-    protected $forcestr = ["product_name","product_info","matchcode"];
+    protected $forcestr = ["network","ext_id","ext_name"];
     private $preorder;
-    private $invoice;
-    private $adb_wohneinheit;
     private $creator;
     private $editor;
 
@@ -153,7 +151,7 @@ class PreorderCtag extends mfBaseModel {
         $model = new PreorderCtag();
 
         $table_fields = [
-            "preorder_id", "network", "stag", "ctag", "service_type", "ext_id", "ext_status", "deleted",
+            "preorder_id", "network", "stag", "ctag", "service_type", "ext_id", "ext_name", "ext_status", "deleted",
             "create_by","edit_by","create","edit"
         ];
 
@@ -203,7 +201,7 @@ class PreorderCtag extends mfBaseModel {
         $where = self::getSqlFilter($filter);
         $sql = "SELECT PreorderCtag.* FROM PreorderCtag
                 WHERE $where 
-                ORDER BY preorder_id,stag,ctag LIMIT 1";
+                ORDER BY ctag LIMIT 1";
         //var_dump($sql);exit;
         mfLoghandler::singleton()->debug($sql);
         $res = $db->query($sql);
@@ -230,7 +228,7 @@ class PreorderCtag extends mfBaseModel {
         $where = self::getSqlFilter($filter);
         $sql = "SELECT PreorderCtag.* FROM PreorderCtag
                 WHERE $where 
-                ORDER BY preorder_id DESC,stag DESC,ctag DESC LIMIT 1";
+                ORDER BY ctag DESC LIMIT 1";
         //var_dump($sql);exit;
         mfLoghandler::singleton()->debug($sql);
         $res = $db->query($sql);
diff --git a/db/migrations/20260115121818_preorder_ctag_add_ext_name.php b/db/migrations/20260115121818_preorder_ctag_add_ext_name.php
new file mode 100644
index 000000000..d225a7036
--- /dev/null
+++ b/db/migrations/20260115121818_preorder_ctag_add_ext_name.php
@@ -0,0 +1,35 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class PreorderCtagAddExtName extends AbstractMigration
+{
+    public function up(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+            $table = $this->table("PreorderCtag");
+            $table->renameColumn("ext_id", "ext_name");
+            $table->addColumn("ext_id", "string", ["null" => true, "default" => null, "length" => 255, "after" => "service_type"]);
+            $table->update();
+        }
+        
+        if($this->getEnvironment() == "addressdb") {
+          
+        }
+    }
+
+    public function down(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+            $table = $this->table("PreorderCtag");
+            $table->removeColumn("ext_id");
+            $table->renameColumn("ext_name", "ext_id");
+            $table->update();
+        }
+        
+        if($this->getEnvironment() == "addressdb") {
+          
+        }
+    }
+}
diff --git a/lib/Citycom/OanApiClient.php b/lib/Citycom/OanApiClient.php
index c5f61c546..7d61e91f7 100644
--- a/lib/Citycom/OanApiClient.php
+++ b/lib/Citycom/OanApiClient.php
@@ -219,6 +219,21 @@ class Citycom_OanApiClient {
 
         $url = str_replace("{service_id}", $service_id, $this->baseurl.CITYCOM_OAN_API_EP_UPDATE_SERVICES);
 
+        $ctx_options = [
+            "http" => [
+                "ignore_errors" => true,
+                "method" => "PUT",
+                "content" => json_encode($data),
+                "header" => [
+                    "Accept: application/json",
+                    "Content-type: application/json",
+                    "Authorization: Bearer ".$this->token,
+                ],
+            ]
+        ];
+
+        $result = $this->runApiRequest($url, $ctx_options);
+        return $result;
     }
 
     public function cancelService($service_id, $data) {
@@ -449,7 +464,7 @@ class Citycom_OanApiClient {
         $output = file_get_contents($final_url, false, $ctx);
 
         $resp = json_decode($output);
-        //var_dump($resp);
+        //var_dump($resp);exit;
         if(!is_object($resp) || (property_exists($resp, "success") && !$resp->success)) {
             $this->lastError = $output;
             return false;
@@ -459,6 +474,8 @@ class Citycom_OanApiClient {
 
         if(is_array($response)) {
             $return_data = $response;
+        } elseif(is_object($response) && (!property_exists($response, "data") || !is_array($response->data))) {
+            $return_data = $response;
         } elseif(is_object($response) && property_exists($response, "data") && is_array($response->data)) {
             $return_data = $response->data;
 
diff --git a/lib/Citycom/OanApiHelper.php b/lib/Citycom/OanApiHelper.php
index ccd3bacc7..46e345e1e 100644
--- a/lib/Citycom/OanApiHelper.php
+++ b/lib/Citycom/OanApiHelper.php
@@ -94,7 +94,7 @@ class Citycom_OanApiHelper {
             $execution_date = date("Y-m-d");
         }
 
-
+        $ctag_range_search = false;
 
         if(array_key_exists("ctag_range_search", $data) && $data["ctag_range_search"]) {
             $ctag_range_search = $data["ctag_range_search"];
@@ -116,21 +116,21 @@ class Citycom_OanApiHelper {
         // order all services and save ctags
         $cc_service_types = $this->api->getServiceTypes();
 
-        $this->log->debug(print_r($want_services, true));
+        $this->log->debug(__METHOD__.": Want services: ".print_r($want_services, true));
 
         $allowed_service_types = array_merge(CITYCOM_OAN_API_SERVICES_FOR_ORDER, CITYCOM_OAN_API_SERVICES_FOR_RESERVATION);
 
         // check if we have these services already
         foreach($cc_service_types as $stype) {
             if(!in_array($stype->name, $allowed_service_types)) continue;
-            $ctag_service_type = array_flip($allowed_service_types)[$stype->name];
+            $ctag_service_type = (array_flip($allowed_service_types))[$stype->name];
             if(PreorderCtag::getFirstActive(["preorder_id" => $preorder->id, "service_type" => $ctag_service_type])) {
                 // service was ordered already, remove from want_services
                 unset($want_services[$ctag_service_type]);
             }
         }
 
-        $this->log->debug(print_r($want_services, true));
+        $this->log->debug(__METHOD__.": Want services after filtering: ".print_r($want_services, true));
 
         $new_services = [];
 
@@ -140,26 +140,32 @@ class Citycom_OanApiHelper {
             list($ctags, $mgmt_ctag) = $preorder->getNextFreeCtags();
         }
 
-        $this->log->debug(print_r($ctags, true));
+        //var_dump($ctags);
+        //var_dump($mgmt_ctag);
+
+        $this->log->debug(__METHOD__.": ctags: ".print_r($ctags, true));
+        $this->log->debug(__METHOD__.": mgmt ctag: ".print_r($mgmt_ctag, true));
 
         if(!is_array($ctags)) {
             $this->log->error(__METHOD__.": No Free Ctags (Preorder ".$preorder->id.")");
             return false;
         }
 
-        if(count($ctags) < count($want_services)) {
+        $ctag_count = count($ctags);
+        if($mgmt_ctag) $ctag_count++;
+        if($ctag_count < count($want_services)) {
             $this->log->error(__METHOD__.": Not enough New Free CTags for Preorder ".$preorder->id);
             return false;
         }
 
 
-
         $preorder_ctag_data = [
             "preorder_id" => $preorder->id,
             "network" => "citycom-oan",
             "stag" => $preorder->adb_hausnummer->vlan_stag,
         ];
 
+
         $service_count = 0;
         foreach($cc_service_types as $stype) {
             // was this service type requested
@@ -169,7 +175,7 @@ class Citycom_OanApiHelper {
             if($mgmt_ctag && $stype->name == $allowed_service_types["mgmt"]) {
                 $ctag = $mgmt_ctag;
             } else {
-                $ctag = $ctags[$service_count];
+                $ctag = array_shift($ctags);
             }
             $ctag_service_type = array_flip($allowed_service_types)[$stype->name];
             if(!$ctag_service_type) {
@@ -185,6 +191,7 @@ class Citycom_OanApiHelper {
                 "ctag" => $ctag,
             ];
 
+            //echo "Creating Service ".$stype->name." on sublocation $sublocation_id with product_id $product_id and ctag $ctag\n";
             $this->log->info(__METHOD__.": Creating Service ".$stype->name." on sublocation $sublocation_id with product_id $product_id and ctag $ctag");
             //continue;
 
@@ -247,11 +254,61 @@ class Citycom_OanApiHelper {
 
         }
 
-
-
         return true;
     }
 
+    /**
+     * Updates service values if nesseccary
+     *
+     * @param $service_ext_num
+     * @param $data
+     * @return bool
+     */
+    public function updateService($service_ext_id, $data) {
+        // get service and compare data
+        $services = $this->api->getServices();
+        if(!$services) {
+            $this->log->error(__METHOD__.": Error getting services.");
+            return false;
+        }
+
+        $service = false;
+        foreach($services as $cc_service) {
+            if($cc_service->id == $service_ext_id) {
+                $service = $cc_service;
+                break;
+            }
+        }
+
+        if(!$service) {
+            $this->log->error(__METHOD__.": Service not available.");
+            return false;
+        }
+
+        $service_data = [];
+
+        // update service if nesseccary
+        if(array_key_exists("product_name", $data) && $data["product_name"] && $service->product->name != $data["product_name"]) {
+            $product_data["up"] = $data["up"];
+            $product_data["down"] = $data["down"];
+            $product_data["name"] = $data["product_name"];
+            $product_id = $this->findOrCreateProduct($product_data);
+            if(!$product_id) {
+                $this->log->error(__METHOD__.": Cannot find or create product ".$product_data["name"]);
+                return false;
+            }
+
+            $service_data["product_id"] = $product_id;
+        }
+
+        if(!count($service_data)) return true;
+        $result = $this->api->updateService($service, $service_data);
+
+        if($result) return true;
+        return false;
+
+    }
+
 
 
     public static function citycomIdToHausnummerExtref($id) {
diff --git a/scripts/adb-rimo-import/importer/citycom.php b/scripts/adb-rimo-import/importer/citycom.php
index 42c39f12c..fe39a1013 100644
--- a/scripts/adb-rimo-import/importer/citycom.php
+++ b/scripts/adb-rimo-import/importer/citycom.php
@@ -254,8 +254,12 @@ class CitycomImporter {
             $ctag = \PreorderCtag::getFirstActive(["preorder_id" => $preorder->id, "stag" => $stag, "service_type" => $stypes[$service->service_type]]);
             //echo "====\n";
             //echo $preorder->id." - ".$service->service_number." - ".$service->location->sublocation->id." - ".$service->service_type." - $stag\n";
-            if($ctag && $ctag->ext_id != $service->service_number) {
-                $ctag->ext_id = $service->service_number;
+            if($ctag && $ctag->ext_id != $service->id) {
+                $ctag->ext_id = $service->id;
+                $ctag->save();
+            }
+            if($ctag && $ctag->ext_name != $service->service_number) {
+                $ctag->ext_name = $service->service_number;
                 $ctag->save();
             }
             if($ctag && $ctag->ext_status != $service->state) {
diff --git a/scripts/preorder/citycom/order-mgmt-services.php b/scripts/preorder/citycom/order-mgmt-services.php
index 3d0515fbb..df6140f8a 100644
--- a/scripts/preorder/citycom/order-mgmt-services.php
+++ b/scripts/preorder/citycom/order-mgmt-services.php
@@ -1,5 +1,9 @@
 #!/usr/bin/php
 <?php
+/*
+ * Looks for new Citycom OAN Orders and orders all services with ctags
+ * from Citycom OAN API
+ */
 
 //require 'vendor/autoload.php';
 require("../../../config/config.php");
@@ -37,23 +41,36 @@ foreach(PreordercampaignModel::search(["fulfillment" => "citycom_oan"]) as $camp
             }
         }
 
-        if($has_inet_service || $has_mgmt_service) continue;
+        if($has_inet_service) continue;
 
         $sublocation_id = \Citycom_OanApiHelper::hausnummerExtrefToCitycomId($preorder->adb_wohneinheit->extref);
         $data = [
             "down" => 100,
             "up" => 100,
-            "product_name" => "Estmk Greenstream OAN Mgmt",
+            "product_name" => "Estmk Greenstream OAN Default",
             "execution_date" => false,
-            "services" => CITYCOM_OAN_API_SERVICES_FOR_RESERVATION,
-
         ];
 
-        $log->info(__METHOD__.": Ordering mgmt service for preorder ".$preorder->id);
+        $services_to_order = array_merge(CITYCOM_OAN_API_SERVICES_FOR_RESERVATION, CITYCOM_OAN_API_SERVICES_FOR_ORDER);
+        if($has_mgmt_service) {
+            $services_to_order = CITYCOM_OAN_API_SERVICES_FOR_ORDER;
+        }
+        $data["services"] = $services_to_order;
+
+        $existing_ctag = \PreorderCtag::getFirstActive(["preorder_id" => $preorder->id]);
+        if($existing_ctag) {
+            $data["ctag_range_search"] = $existing_ctag->ctag;
+        }
+
+        //echo "{$preorder->id}\n";
+        //var_dump($data);exit;
+
+        $log->info(__FILE__.": Ordering Citycom services for preorder ".$preorder->id);
         if(!$cc_helper->orderServices($preorder, $sublocation_id, $data)) {
-            $log->error(__METHOD__.": Error ordering mgmt service for preorder ".$preorder->id);
+            $log->error(__FILE__.": Error ordering Citycom services for preorder ".$preorder->id);
             continue;
         }
+        //continue;
 
         // TODO check for new service @ citycom -> 230
         $cc_services = $cc->getServices();

From bcb61b9a3c33f9f8af83dc8ed139904fe5674e16 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 15 Jan 2026 14:27:43 +0100
Subject: [PATCH 28/88] Fixed updating ext_id in
 citycom/order-mgmt-services.php

---
 scripts/preorder/citycom/order-mgmt-services.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/preorder/citycom/order-mgmt-services.php b/scripts/preorder/citycom/order-mgmt-services.php
index df6140f8a..30e142de1 100644
--- a/scripts/preorder/citycom/order-mgmt-services.php
+++ b/scripts/preorder/citycom/order-mgmt-services.php
@@ -96,8 +96,12 @@ foreach(PreordercampaignModel::search(["fulfillment" => "citycom_oan"]) as $camp
             if(!$stag) continue;
 
             $ctag = \PreorderCtag::getFirstActive(["preorder_id" => $preorder->id, "stag" => $stag, "service_type" => $stypes[$cc_service->service_type]]);
-            if($ctag && $ctag->ext_id != $cc_service->service_number) {
-                $ctag->ext_id = $cc_service->service_number;
+            if($ctag && $ctag->ext_id != $cc_service->id) {
+                $ctag->ext_id = $cc_service->id;
+                $ctag->save();
+            }
+            if($ctag && $ctag->ext_name != $cc_service->service_number) {
+                $ctag->ext_name = $cc_service->service_number;
                 $ctag->save();
             }
             if($ctag && $ctag->ext_status != $cc_service->state) {

From b7838c2b21fa5d1eb8899bb4d6df5d2e494431dc Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 15 Jan 2026 14:46:26 +0100
Subject: [PATCH 29/88] Fixed citycom api updateService()

---
 lib/Citycom/OanApiHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Citycom/OanApiHelper.php b/lib/Citycom/OanApiHelper.php
index 46e345e1e..3d1e39b7b 100644
--- a/lib/Citycom/OanApiHelper.php
+++ b/lib/Citycom/OanApiHelper.php
@@ -302,7 +302,7 @@ class Citycom_OanApiHelper {
         }
 
         if(!count($service_data)) return true;
-        $result = $this->api->updateService($service, $service_data);
+        $result = $this->api->updateService($service->id, $service_data);
 
         if($result) return true;
         return false;

From bba978a61d4fd29191288ea9f061516bc9c7c1fb Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 15 Jan 2026 14:54:16 +0100
Subject: [PATCH 30/88] Fixed Citycom Oan Api updateService()

---
 lib/Citycom/OanApiHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Citycom/OanApiHelper.php b/lib/Citycom/OanApiHelper.php
index 3d1e39b7b..969b8a27c 100644
--- a/lib/Citycom/OanApiHelper.php
+++ b/lib/Citycom/OanApiHelper.php
@@ -298,7 +298,7 @@ class Citycom_OanApiHelper {
                 return false;
             }
 
-            $service_data["product_id"] = $product_id;
+            $service_data["product"] = $product_id;
         }
 
         if(!count($service_data)) return true;

From 6897e803006aeb9b2b72dfa1d9117bc55e305c9e Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 15 Jan 2026 15:40:22 +0100
Subject: [PATCH 31/88] Invoice: Implicitly rounding price totals

---
 application/Invoice/InvoiceController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/Invoice/InvoiceController.php b/application/Invoice/InvoiceController.php
index 6d44febed..f96dd6615 100644
--- a/application/Invoice/InvoiceController.php
+++ b/application/Invoice/InvoiceController.php
@@ -681,6 +681,8 @@ class InvoiceController extends mfBaseController {
                     }
 
                     // save Invoiceposition
+                    // first round price
+                    $position->price_gross = round($position->price_gross, 4);
                     if (!$position->save()) {
                         $invoice->rollbackTransaction();
                         die("Error saving Invoiceposition");
@@ -703,7 +705,7 @@ class InvoiceController extends mfBaseController {
                 }
 
                 $invoice->total = $total_net;
-                $invoice->total_gross = $total_gross;
+                $invoice->total_gross = round($total_gross, 4);
                 //$invoice->total_vat = $total_vat;
 
                 if (!$invoice->save()) {

From 217aa1faa01092edd861f1e4d3062c0bd23eedaf Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 15 Jan 2026 15:50:30 +0100
Subject: [PATCH 32/88] fixed trash-can icon buttons in Order/Form

---
 Layout/default/Order/Form.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Layout/default/Order/Form.php b/Layout/default/Order/Form.php
index a513c694e..f09c3a82c 100644
--- a/Layout/default/Order/Form.php
+++ b/Layout/default/Order/Form.php
@@ -597,7 +597,7 @@
                       </div>
                       <div class="row">
                         <div class="col-md-12 delete-button-container">
-                          <i class="btn btn-outline-danger  fas fa-trash-can pointer" style="font-size: 1.5em" onclick="toggleDeletePos(<?=$i?>)"></i>
+                            <a href="#" class="btn btn-xl btn-outline-danger" onclick="toggleDeletePos(<?=$i?>); return false;"><i class="fas fa-fw fa-trash-can fa-xl pointer"></i></a>
                         </div>
                         
                       </div>
@@ -828,7 +828,7 @@
                       </div>
                       <div class="row">
                         <div class="col-md-12 delete-button-container">
-                          <i class="btn btn-outline-info  fas fa-trash-can pointer" title="Inhalte löschen" style="font-size: 1.5em" onclick="clearNewPos(<?=$i?>)"></i>
+                          <a href="#" class="btn btn-xl btn-outline-info" title="Inhalte löschen" onclick="clearNewPos(<?=$i?>); return false;"><i class="fas fa-fw fa-trash-can fa-xl pointer"></i></a>
                         </div>
                       </div>
                     </div>
@@ -1893,7 +1893,7 @@
     } else {
       $('#products-' + id + '-delete').val(0);
       //$('#position-' + id + ' .delete-button-container i').removeClass("fa-trash-can-slash").addClass("fa-trash-can");
-      $('#position-' + id + ' .delete-button-container').html('<i class="btn btn-outline-danger fas fa-trash-can pointer" style="font-size: 1.5em" onclick="toggleDeletePos(' + id + ')"></i>');
+      $('#position-' + id + ' .delete-button-container').html('<a href="#" class="btn btn-xl btn-outline-info" title="Inhalte löschen" onclick="toggleDeletePos(' + id + '); return false;"><i class="fas fa-fw fa-trash-can fa-xl pointer"></i></a>');
       //$('#position-' + id + ' .delete-button-container i').removeClass("btn-outline-white fa-trash-can-slash").addClass("text-danger fa-trash-can");
       $('#position-' + id).removeClass('text-white deleted');
       
@@ -1932,7 +1932,7 @@
           </div> \
           <div class="row"> \
             <div class="col-md-12 delete-button-container"> \
-              <i class="btn btn-outline-info  fas fa-trash-can pointer" title="Inhalte löschen" style="font-size: 1.5em" onclick="clearNewPos(' + i +')"></i> \
+              <a href="#" class="btn btn-xl btn-outline-info" title="Inhalte löschen" onclick="clearNewPos(' + i +'); return false;"><i class="fas fa-fw fa-trash-can fa-xl pointer"></i></a> \
             </div> \
           </div> \
         </div> \

From 450545695aefa4074b4eedc9371a91b0bc9acf36 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 15 Jan 2026 15:52:09 +0100
Subject: [PATCH 33/88] Preorder Map network outlines tweak

---
 Layout/default/Preorder/Index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index 6a1a44cbb..ce132a676 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -1359,7 +1359,7 @@ $pagination_entity_name = "Vorbestellungen";
         * Globals for map display
         */
         var borderpolies = [];
-        <?php if($me->is("Admin")): ?>
+        <?php if($me->is("Admin") && !isset($campaign)): ?>
             <?php foreach(ADBNetzgebietModel::search(["borderpoly" => true]) as $bp_netz): ?>
             borderpolies.push([<?=$bp_netz->borderpoly?>]);
             <?php endforeach; ?>

From 603bfa0f157ac072df669ef48fc8bd82eda90164 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 15 Jan 2026 15:53:46 +0100
Subject: [PATCH 34/88] Changed status change to single call in Preorder/Cif
 api

---
 application/Api/v1/Modules/Preorder/Cif.php | 36 +++------------------
 1 file changed, 4 insertions(+), 32 deletions(-)

diff --git a/application/Api/v1/Modules/Preorder/Cif.php b/application/Api/v1/Modules/Preorder/Cif.php
index 8e60be040..6a34e818f 100644
--- a/application/Api/v1/Modules/Preorder/Cif.php
+++ b/application/Api/v1/Modules/Preorder/Cif.php
@@ -43,22 +43,8 @@ class Cif extends Modules\ApiControllerModule {
       return \mfResponse::NotFound(["message" => "Preorder not found"]);
     }
     
-    // set status to 200
-    if($preorder->status->code < 200) {
-      $new_status = \PreorderstatusModel::getFirst(["code" => 200]);
-      if(!$new_status) {
-        return \mfResponse::InternalServerError();
-      }
-      $preorder->status_id = $new_status->id;
-      $preorder->save();
-    }
-
-    $sflag = \PreorderStatusflagModel::getFirst(["code" => 200]);
-    $sflag->preorder_id = $preorder->id;
-    if(!$sflag->value->value) {
-      $sflag->value->value = 1;
-      $sflag->value->save();
-    }
+    // set status flag 200
+    $preorder->setStatusFlag(200, 1);
     
     return \mfResponse::Ok(["message" => "Status successfully updated."]);
     
@@ -134,22 +120,8 @@ class Cif extends Modules\ApiControllerModule {
       return \mfResponse::NotFound(["message" => "Invalid ciftoken"]);
     }
     
-    // set status to 200
-    if($preorder->status->code < 200) {
-      $new_status = \PreorderstatusModel::getFirst(["code" => 200]);
-      if(!$new_status) {
-        return \mfResponse::InternalServerError();
-      }
-      $preorder->status_id = $new_status->id;
-      $preorder->save();
-    }
-
-    $sflag = \PreorderStatusflagModel::getFirst(["code" => 200]);
-    $sflag->preorder_id = $preorder->id;
-    if(!$sflag->value->value) {
-        $sflag->value->value = 1;
-        $sflag->value->save();
-    }
+    // set status flag 200
+    $preorder->setStatusFlag(200, 1);
     
     return \mfResponse::Ok(["message" => "Status successfully updated."]);
     

From d30f40c7e692d2fc562864fa43228bcc7570dc23 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 15 Jan 2026 15:54:12 +0100
Subject: [PATCH 35/88] formatting fix

---
 application/Emailnotification/Emailnotification.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/Emailnotification/Emailnotification.php b/application/Emailnotification/Emailnotification.php
index a686a9067..4906b0ca6 100644
--- a/application/Emailnotification/Emailnotification.php
+++ b/application/Emailnotification/Emailnotification.php
@@ -32,7 +32,7 @@ class Emailnotification {
     if($object_data !== false) $this->object_data = $object_data;
   }
   
-  public function addAttachment($filepath = null, $content = null, $name = false, $c_type = "application/octet-stream", $disposition = "attachment", $encoding = "base64" ,  $charset = "utf-8") {
+  public function addAttachment($filepath = null, $content = null, $name = false, $c_type = "application/octet-stream", $disposition = "attachment", $encoding = "base64", $charset = "utf-8") {
     $attachment = [
         "file" => $filepath,
         "content" => $content,

From 0e4c0e1220c08c6c0664104fa96856ee34704b65 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 15 Jan 2026 16:09:38 +0100
Subject: [PATCH 36/88] removed claude settings

---
 .claude/settings.local.json | 12 ------------
 .gitignore                  |  1 +
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 .claude/settings.local.json

diff --git a/.claude/settings.local.json b/.claude/settings.local.json
deleted file mode 100644
index 64b936302..000000000
--- a/.claude/settings.local.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(docker-compose up:*)",
-      "Bash(python:*)",
-      "Bash(cat:*)",
-      "Bash(find:*)",
-      "Bash(docker-compose exec:*)",
-      "mcp__sequentialthinking__sequentialthinking"
-    ]
-  }
-}
diff --git a/.gitignore b/.gitignore
index 7940ae3c2..81ebe75ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ composer.lock
 .project
 .settings
 .idea
+.claude/
 nbproject
 config/config.php
 scripts/addressdb/import

From 9a5ee1ab1b22d292fbb03cf46bae23bf6e8b523a Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 15 Jan 2026 16:26:29 +0100
Subject: [PATCH 37/88] Fixed oaid assignment in rimo

---
 application/OpenAccessId/OpenAccessId.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/application/OpenAccessId/OpenAccessId.php b/application/OpenAccessId/OpenAccessId.php
index 04f70a191..edaffa7ca 100644
--- a/application/OpenAccessId/OpenAccessId.php
+++ b/application/OpenAccessId/OpenAccessId.php
@@ -173,7 +173,11 @@ class OpenAccessId extends mfBaseModel {
         $resp_data = Rimoapi::assignOaid($this->oaid, $ftu_data['id']);
         
         // update OAID export data
+
         $exp_data_update = json_decode($this->export_data);
+        if(!property_exists($exp_data_update, "rimo")) {
+            $exp_data_update->rimo = new StdClass();
+        }
         $exp_data_update->rimo->ftu_id = $ftu_data['id'];
         $exp_data_update->rimo->ftu_name = $ftu_data['name'];
         $exp_data_update->rimo->ftu_assigned_date = date("U");

From e431f74a75d44bf6e7fd793f67002b11d1324715 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 15 Jan 2026 16:32:42 +0100
Subject: [PATCH 38/88] Fixed AddressdbAPI::getClusters() filter

---
 application/Api/v1/AddressdbApicontroller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/Api/v1/AddressdbApicontroller.php b/application/Api/v1/AddressdbApicontroller.php
index 06d579716..ad59a805e 100644
--- a/application/Api/v1/AddressdbApicontroller.php
+++ b/application/Api/v1/AddressdbApicontroller.php
@@ -131,7 +131,7 @@ class AddressdbApicontroller extends mfBaseApicontroller {
     protected function getClusters() {
         $cluster_search = [];
         if(count($this->filter_salescluster_ids)) {
-            $cluster_search['netzgebiet_id'] = $this->filter_salescluster_ids;
+            $cluster_search['id'] = $this->filter_salescluster_ids;
         }
         $clusters = [];
         foreach(ADBNetzgebietModel::search($cluster_search) as $cluster) {

From 590c32b72062cdc94a024f614e3a95ea53f94576 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 15 Jan 2026 17:00:56 +0100
Subject: [PATCH 39/88] Added new icon for ported-out numbers

---
 Layout/default/Voicenumberblock/include/block-detail.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Layout/default/Voicenumberblock/include/block-detail.php b/Layout/default/Voicenumberblock/include/block-detail.php
index 918bd4ebb..72c6bf5d3 100644
--- a/Layout/default/Voicenumberblock/include/block-detail.php
+++ b/Layout/default/Voicenumberblock/include/block-detail.php
@@ -21,10 +21,12 @@
         <td><?=$number?></td>
         <td>
           <?php if($num->active): ?>
-          <span class="text-success"><i class="fas fa-check"></i></span>
-          <small class="text-monospace">(seit <?=($num->id) ? date("d.m.Y H:i:s", $num->activated_date) : ""?>)</small>
+            <span class="text-success"><i class="fas fa-check"></i></span>
+            <small class="text-monospace">(seit <?=($num->id) ? date("d.m.Y H:i:s", $num->activated_date) : ""?>)</small>
+          <?php elseif($num->disabled): ?>
+              <span class="text-success text-danger" title="Nummer wurde wegportiert"><i class="far fa-anchor"></i><i class="far fa-file-export"></i></span>
           <?php else: ?>
-          <span class="text-danger"><i class="fas fa-times"></i></span>
+            <span class="text-danger"><i class="fas fa-times"></i></span>
           <?php endif; ?>
         </td>
         <td><a href="<?=self::getUrl("Contract", "view", ["id" => $num->contract_id])?>"><?=$num->contract_id?></a></td>

From 069112bcfa7a39fe5230c09887a34e7d4244b67d Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 15 Jan 2026 17:06:52 +0100
Subject: [PATCH 40/88] changed bg color for ported out numbers

---
 Layout/default/Voicenumberblock/include/block-detail.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Layout/default/Voicenumberblock/include/block-detail.php b/Layout/default/Voicenumberblock/include/block-detail.php
index 72c6bf5d3..61594e0c9 100644
--- a/Layout/default/Voicenumberblock/include/block-detail.php
+++ b/Layout/default/Voicenumberblock/include/block-detail.php
@@ -17,14 +17,14 @@
       </tr>
       <?php $i = 0; foreach(range((array_key_exists($block->id, $num_from) ? $num_from[$block->id] : $block->first), $block->last) as $number): ?>
       <?php $num = VoicenumberModel::getFirst(['voicenumberblock_id' => $block->id, 'number' => $number]) ?>
-      <tr>
+      <tr class="<?=($num->disabled) ? "bg-secondary text-white" : ""?>">
         <td><?=$number?></td>
         <td>
           <?php if($num->active): ?>
             <span class="text-success"><i class="fas fa-check"></i></span>
             <small class="text-monospace">(seit <?=($num->id) ? date("d.m.Y H:i:s", $num->activated_date) : ""?>)</small>
           <?php elseif($num->disabled): ?>
-              <span class="text-success text-danger" title="Nummer wurde wegportiert"><i class="far fa-anchor"></i><i class="far fa-file-export"></i></span>
+              <span class="text-success text-danger" title="Nummer wurde wegportiert"><i class="far fa-anchor bg-white" style="padding: 2px;"></i> <i class="far fa-file-export bg-white" style="padding: 2px;"></i></span>
           <?php else: ?>
             <span class="text-danger"><i class="fas fa-times"></i></span>
           <?php endif; ?>

From 3241b8027db4dd52266769fa2a508b3bba9b6379 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 15 Jan 2026 18:09:39 +0100
Subject: [PATCH 41/88] Added new Voicenumber delete_reason

---
 Layout/default/Voicenumber/Form.php           |  1 +
 .../Voicenumberblock/include/block-detail.php |  2 +-
 .../Voicenumber/VoicenumberController.php     | 10 ++++--
 application/Voicenumber/VoicenumberModel.php  |  1 +
 ...oicenumber_add_disable_reason_canceled.php | 33 +++++++++++++++++++
 5 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 db/migrations/20260115165426_voicenumber_add_disable_reason_canceled.php

diff --git a/Layout/default/Voicenumber/Form.php b/Layout/default/Voicenumber/Form.php
index 1d2e94ac7..ed90b52e4 100644
--- a/Layout/default/Voicenumber/Form.php
+++ b/Layout/default/Voicenumber/Form.php
@@ -117,6 +117,7 @@
                         <option></option>
                         <option value="ported_out" <?=($number->disabled_reason == "ported_out") ? "selected='selected'" : ""?>>Zu neuem Provider portiert</option>
                         <option value="ported_back" <?=($number->disabled_reason == "ported_back") ? "selected='selected'" : ""?>>Zum Anker zurückportiert</option>
+                        <option value="contract_cancelled" <?=($number->disabled_reason == "contract_cancelled") ? "selected='selected'" : ""?>>Vertrag gekündigt</option>
                         <option value="reserved" <?=($number->disabled_reason == "reserved") ? "selected='selected'" : ""?>>Reserviert</option>
                         <option value="legacy" <?=($number->disabled_reason == "legacy") ? "selected='selected'" : ""?>>Legacy</option>
                         <option value="damaged" <?=($number->disabled_reason == "damaged") ? "selected='selected'" : ""?>>Kaputt</option>
diff --git a/Layout/default/Voicenumberblock/include/block-detail.php b/Layout/default/Voicenumberblock/include/block-detail.php
index 61594e0c9..d9fa9ff16 100644
--- a/Layout/default/Voicenumberblock/include/block-detail.php
+++ b/Layout/default/Voicenumberblock/include/block-detail.php
@@ -42,7 +42,7 @@
             Lokal
           <?php endif; ?>
         </td>
-        <td><?=$num->disabled_reason?></td>
+        <td><?=$num->disabled_reason?><?=($num->disabled > 1) ? " (<i>".date("d.m.Y H:i", $num->disabled)."</i>)" : ""?></td>
         <td><?=($num->id && $num->enable_on_date) ? date("d.m.Y", $num->enable_on_date) : ""?></td>
         <td>
           <a href="<?=self::getUrl("Voicenumber", "edit", ["block_id" => $block->id, "number" => $number])?>"><i class="fas fa-edit"></i></a>
diff --git a/application/Voicenumber/VoicenumberController.php b/application/Voicenumber/VoicenumberController.php
index 1e192288c..22ec7d427 100644
--- a/application/Voicenumber/VoicenumberController.php
+++ b/application/Voicenumber/VoicenumberController.php
@@ -114,8 +114,11 @@ class VoicenumberController extends mfBaseController {
       $number_data['port_out_date'] = self::dateToTimestamp($r->port_out_date);
     }
 
-    if($r->disabled === "1") {
-      $number_data['disabled'] = 1;
+    if($r->disabled == "1") {
+      if(!$number->disabled) {
+        $number_data['disabled'] = date('U');
+        $number_data['disabled_by'] = $this->me->id;
+      }
       switch($r->disabled_reason) {
         case "ported_out":
           $number_data['disabled_reason'] = "ported_out";
@@ -123,6 +126,9 @@ class VoicenumberController extends mfBaseController {
         case "ported_back":
           $number_data['disabled_reason'] = "ported_back";
           break;
+        case "contract_cancelled":
+          $number_data['disabled_reason'] = "contract_cancelled";
+          break;
         case "legacy":
           $number_data['disabled_reason'] = "legacy";
           break;
diff --git a/application/Voicenumber/VoicenumberModel.php b/application/Voicenumber/VoicenumberModel.php
index 28da70fb8..33fc4d1f0 100644
--- a/application/Voicenumber/VoicenumberModel.php
+++ b/application/Voicenumber/VoicenumberModel.php
@@ -17,6 +17,7 @@ class VoicenumberModel {
   public $ported_out;
   public $disabled;
   public $disabled_reason;
+  public $disabled_by;
   public $enable_on_date;
   public $comment;
   
diff --git a/db/migrations/20260115165426_voicenumber_add_disable_reason_canceled.php b/db/migrations/20260115165426_voicenumber_add_disable_reason_canceled.php
new file mode 100644
index 000000000..f6e7381d7
--- /dev/null
+++ b/db/migrations/20260115165426_voicenumber_add_disable_reason_canceled.php
@@ -0,0 +1,33 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class VoicenumberAddDisableReasonCanceled extends AbstractMigration
+{
+    public function up(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+            $table = $this->table("Voicenumber");
+            $table->changeColumn("disabled", "integer", ["null" => false, "default" => 0]);
+            $table->changeColumn("disabled_reason", "enum", ["values" => "ported_out,ported_back,reserved,legacy,damaged,contract_cancelled", "null" => true, "default" => null]);
+            $table->addColumn("disabled_by", "integer", ["null" => true, "default" => null, "after" => "disabled_reason"]);
+            $table->update();
+        }
+        
+        if($this->getEnvironment() == "addressdb") {
+          
+        }
+    }
+
+    public function down(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+
+        }
+        
+        if($this->getEnvironment() == "addressdb") {
+          
+        }
+    }
+}

From 48233944b5104b9667ed1161f128b2ec642cd5f1 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 15 Jan 2026 20:10:52 +0100
Subject: [PATCH 42/88] Address: Added manual_invoice_sepa_limit

---
 Layout/default/Address/Form.php               | 16 ++++++++--
 Layout/default/Address/View.php               |  4 +++
 application/Address/AddressController.php     |  2 ++
 ..._address_add_manual_invoice_sepa_limit.php | 31 +++++++++++++++++++
 4 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 db/migrations/20260115184942_address_add_manual_invoice_sepa_limit.php

diff --git a/Layout/default/Address/Form.php b/Layout/default/Address/Form.php
index bca16447d..168824961 100644
--- a/Layout/default/Address/Form.php
+++ b/Layout/default/Address/Form.php
@@ -232,12 +232,22 @@
                       <input type="text" class="form-control" name="bank_account_bic" id="bank_account_bic" value="<?=$address->bank_account_bic?>" />
                     </div>
                   </div>
-                  
+
+                  <?php if($me->can("Fibu")): ?>
                   <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="bank_account_bic"></label>
+                    <label class="col-lg-2 col-form-label" for="manual_invoice_sepa_limit">Manuelle Rechnungen abbuchen bis (&euro;)</label>
+                    <div class="col-lg-10">
+                        <input type="text" class="form-control" name="manual_invoice_sepa_limit" id="manual_invoice_sepa_limit" value="<?=round($address->manual_invoice_sepa_limit, 2)?>" />
+                        <small>Wenn Bankeinzug aktiviert ist</small>
+                    </div>
+                  </div>
+                  <?php endif; ?>
+
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for=""></label>
                     <div class="col-lg-10 alert alert-danger hidden" id="bank-error"></div>
                   </div>
-                  
+
                   <?php if($me->can("Fibu")): ?>
                     <div class="form-group row">
                       <label class="col-lg-2 col-form-label" for="sepa_date">Sepa Mandatsdatum</label>
diff --git a/Layout/default/Address/View.php b/Layout/default/Address/View.php
index 808d4f9dc..9d75c28d5 100644
--- a/Layout/default/Address/View.php
+++ b/Layout/default/Address/View.php
@@ -146,6 +146,10 @@
                     <td><?=$address->bank_account_bic?></td>
                   </tr>
                   <?php if($me->can("Fibu")): ?>
+                  <tr>
+                    <th>Manuelle Rechnungen abbuchen bis</th>
+                    <td><?=number_format($address->manual_invoice_sepa_limit, 2, ",", ".")?> &euro;</td>
+                  </tr>
                   <tr>
                     <th>Sepa Mandatsdatum</th>
                     <td><?=($address->sepa_date) ? date("d.m.Y", $address->sepa_date) : ""?></td>
diff --git a/application/Address/AddressController.php b/application/Address/AddressController.php
index d514a785d..129f420a5 100644
--- a/application/Address/AddressController.php
+++ b/application/Address/AddressController.php
@@ -333,6 +333,8 @@ class AddressController extends mfBaseController {
             $data['fibu_supplier_due'] = ($r->fibu_supplier_due) ? trim($r->fibu_supplier_due) : null;
             $data['fibu_supplier_skonto'] = ($r->fibu_supplier_skonto) ? trim($r->fibu_supplier_skonto) : null;
             $data['fibu_supplier_skonto_rate'] = ($r->fibu_supplier_skonto_rate) ? trim($r->fibu_supplier_skonto_rate) : null;
+
+            $data["manual_invoice_sepa_limit"] = ($r->manual_invoice_sepa_limit) ? str_replace(",", ".", trim($r->manual_invoice_sepa_limit)) : null;
         }
 
 
diff --git a/db/migrations/20260115184942_address_add_manual_invoice_sepa_limit.php b/db/migrations/20260115184942_address_add_manual_invoice_sepa_limit.php
new file mode 100644
index 000000000..6ef69f1ae
--- /dev/null
+++ b/db/migrations/20260115184942_address_add_manual_invoice_sepa_limit.php
@@ -0,0 +1,31 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class AddressAddManualInvoiceSepaLimit extends AbstractMigration
+{
+    public function up(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+            $table = $this->table('Address');
+            $table->addColumn("manual_invoice_sepa_limit", "decimal", ["null" => true, "default" => 500, "precision" => 9, "scale" => 2, "after" => "fibu_payment_skonto_rate"]);
+            $table->update();
+        }
+        
+        if($this->getEnvironment() == "addressdb") {
+          
+        }
+    }
+
+    public function down(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+            $this->table('Address')->removeColumn("manual_invoice_sepa_limit")->update();
+        }
+        
+        if($this->getEnvironment() == "addressdb") {
+          
+        }
+    }
+}

From ad9012f545da982415aa3f1b878c289b39ccd761 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 15 Jan 2026 20:16:35 +0100
Subject: [PATCH 43/88] Changed manual_invoice_sepa_limit text

---
 Layout/default/Address/View.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Layout/default/Address/View.php b/Layout/default/Address/View.php
index 9d75c28d5..29604f40f 100644
--- a/Layout/default/Address/View.php
+++ b/Layout/default/Address/View.php
@@ -147,7 +147,7 @@
                   </tr>
                   <?php if($me->can("Fibu")): ?>
                   <tr>
-                    <th>Manuelle Rechnungen abbuchen bis</th>
+                    <th>Manuelle Rechnungen abbuchen bis (erfordert Bankeinzug)</th>
                     <td><?=number_format($address->manual_invoice_sepa_limit, 2, ",", ".")?> &euro;</td>
                   </tr>
                   <tr>

From 8ec2262569a186a478d8728d0a43be50a7d67125 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 15 Jan 2026 20:17:37 +0100
Subject: [PATCH 44/88] changed permission for seeing manual_invoice_sepa_limit

---
 Layout/default/Address/View.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Layout/default/Address/View.php b/Layout/default/Address/View.php
index 29604f40f..69da6f0e2 100644
--- a/Layout/default/Address/View.php
+++ b/Layout/default/Address/View.php
@@ -144,12 +144,12 @@
                   </tr><tr>
                     <th>BIC</th>
                     <td><?=$address->bank_account_bic?></td>
-                  </tr>
-                  <?php if($me->can("Fibu")): ?>
-                  <tr>
+                  </tr><tr>
                     <th>Manuelle Rechnungen abbuchen bis (erfordert Bankeinzug)</th>
                     <td><?=number_format($address->manual_invoice_sepa_limit, 2, ",", ".")?> &euro;</td>
                   </tr>
+                  <?php if($me->can("Fibu")): ?>
+
                   <tr>
                     <th>Sepa Mandatsdatum</th>
                     <td><?=($address->sepa_date) ? date("d.m.Y", $address->sepa_date) : ""?></td>

From d3f35a4cd8568d5cb8b5171fee9f7e4dd626e177 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Fri, 16 Jan 2026 13:08:49 +0100
Subject: [PATCH 45/88] Fixed saving ext data in Openaccessid

---
 application/OpenAccessId/OpenAccessId.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/OpenAccessId/OpenAccessId.php b/application/OpenAccessId/OpenAccessId.php
index edaffa7ca..35ae7fff3 100644
--- a/application/OpenAccessId/OpenAccessId.php
+++ b/application/OpenAccessId/OpenAccessId.php
@@ -174,7 +174,8 @@ class OpenAccessId extends mfBaseModel {
         
         // update OAID export data
 
-        $exp_data_update = json_decode($this->export_data);
+        //$exp_data_update = json_decode($this->export_data);
+        $exp_data_update = $this->getExportData();
         if(!property_exists($exp_data_update, "rimo")) {
             $exp_data_update->rimo = new StdClass();
         }
@@ -310,11 +311,11 @@ class OpenAccessId extends mfBaseModel {
   
   public function getExportData($key = false) {
     if(!$this->export_data) {
-      return [];
+      return new StdClass();
     } else {
       $exdata = json_decode($this->export_data);
       if(!is_object($exdata)) {
-        return [];
+        return new StdClass();
       }
       
       if(!$key) {

From 1426d769d224507b36f517a59cb0d55ffe408070 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Sat, 17 Jan 2026 12:48:08 +0000
Subject: [PATCH 46/88] Xinon mobile/improve

---
 .gitignore                                    |    3 +-
 Layout/default/MobileApp/App.php              |   84 +-
 Layout/default/MobileApp/Base.php             |   67 +
 .../default/MobileApp/WarehouseStocktake.php  |   86 +-
 .../WarehouseShippingNote/PDF_HEADER.html     |    1 +
 .../WarehouseStocktakeHandler.php             |  473 ------
 application/MobileApp/MobileAppController.php |    3 -
 .../Lager/Inventur/InventurHandler.php        |   34 -
 .../Lager/Movement/MovementHandler.php        |  311 +++-
 .../ShippingNote/ShippingNoteHandler.php      |  761 +++++++++
 .../Workorder/Workorder/WorkorderHandler.php  |  929 +++++++++++
 .../WarehouseMovementController.php           |   21 +-
 .../WarehouseMovementModel.php                |   21 +-
 .../WarehouseOrderController.php              |  170 +-
 .../WarehouseOrder/WarehouseOrderModel.php    |    2 +
 .../WarehouseShippingNoteController.php       |    9 +-
 .../WarehouseShippingNoteModel.php            |   20 +
 ...0260117120000_add_shipping_note_number.php |   50 +
 ...60117150000_add_order_movement_linking.php |   43 +
 .../pages/WarehouseOrder/WarehouseOrder.css   |  408 +++++
 .../js/pages/WarehouseOrder/WarehouseOrder.js |  508 +++++-
 public/mobile/app.js                          |  199 +--
 public/mobile/components/LoginScreen.js       |   34 +-
 public/mobile/components/MainMenu.js          |   23 +-
 .../mobile/modules/lager/inventur/Scanner.js  |   79 +-
 .../modules/lager/inventur/StocktakeList.js   |   19 +-
 .../modules/lager/movement/MovementForm.js    |  366 ++++-
 .../modules/lager/shippingnote/DatePicker.js  |  282 ++++
 .../lager/shippingnote/EmployeeSelector.js    |  189 +++
 .../lager/shippingnote/ShippingNoteForm.js    | 1090 +++++++++++++
 .../lager/shippingnote/ShippingNoteList.js    |  227 +++
 .../lager/shippingnote/ShippingNoteModule.js  |  164 ++
 .../lager/shippingnote/SignaturePad.js        |  300 ++++
 .../modules/workorder/WorkorderModule.js      | 1373 +++++++++++++++++
 public/mobile/shared/api.js                   |   18 +
 public/mobile/shared/useNumericKeypad.js      |   43 +
 scripts/geocode-addresses.php                 |  134 ++
 37 files changed, 7502 insertions(+), 1042 deletions(-)
 create mode 100644 Layout/default/MobileApp/Base.php
 delete mode 100644 application/MobileApp/Apps/WarehouseStocktake/WarehouseStocktakeHandler.php
 create mode 100644 application/MobileApp/Modules/Lager/ShippingNote/ShippingNoteHandler.php
 create mode 100644 application/MobileApp/Modules/Workorder/Workorder/WorkorderHandler.php
 create mode 100644 db/migrations/20260117120000_add_shipping_note_number.php
 create mode 100644 db/migrations/20260117150000_add_order_movement_linking.php
 create mode 100644 public/mobile/modules/lager/shippingnote/DatePicker.js
 create mode 100644 public/mobile/modules/lager/shippingnote/EmployeeSelector.js
 create mode 100644 public/mobile/modules/lager/shippingnote/ShippingNoteForm.js
 create mode 100644 public/mobile/modules/lager/shippingnote/ShippingNoteList.js
 create mode 100644 public/mobile/modules/lager/shippingnote/ShippingNoteModule.js
 create mode 100644 public/mobile/modules/lager/shippingnote/SignaturePad.js
 create mode 100644 public/mobile/modules/workorder/WorkorderModule.js
 create mode 100644 public/mobile/shared/api.js
 create mode 100644 public/mobile/shared/useNumericKeypad.js
 create mode 100644 scripts/geocode-addresses.php

diff --git a/.gitignore b/.gitignore
index 81ebe75ee..d44056d1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@ composer.lock
 .project
 .settings
 .idea
-.claude/
 nbproject
 config/config.php
 scripts/addressdb/import
@@ -52,3 +51,5 @@ Thumbs.db
 
 /Layout/default/DeviceDetail/
 /Layout/default/DeviceDetail/
+mobile-presentation/
+nul
diff --git a/Layout/default/MobileApp/App.php b/Layout/default/MobileApp/App.php
index b60ddf599..a7f33fb95 100644
--- a/Layout/default/MobileApp/App.php
+++ b/Layout/default/MobileApp/App.php
@@ -1,77 +1,9 @@
 <?php
-/**
- * MobileApp PWA View Template
- *
- * Main shell for the unified Mobile App.
- * Vue handles internal navigation between modules.
- */
-?>
-<!DOCTYPE html>
-<html lang="de">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
-    <title>Xinon Mobile</title>
-    <link rel="shortcut icon" href="/assets/images/favicon.ico">
-
-    <!-- PWA Configuration -->
-    <link rel="manifest" href="/mobile/manifest.json">
-    <meta name="theme-color" content="#005384">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
-    <meta name="apple-mobile-web-app-title" content="Xinon">
-
-    <!-- External Libraries (CDN) -->
-    <script src="https://cdn.tailwindcss.com"></script>
-    <script src="https://cdn.jsdelivr.net/npm/vue@3.4.27/dist/vue.global.prod.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/axios@1.7.2/dist/axios.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/html5-qrcode@2.3.8/html5-qrcode.min.js"></script>
-
-    <!-- Shared Styles -->
-    <link rel="stylesheet" href="/mobile/shared/base.css">
-
-    <!-- App Configuration -->
-    <script>
-        window.TT_CONFIG = <?= json_encode($JSGlobals ?? []) ?>;
-
-        // Tailwind configuration
-        tailwind.config = {
-            darkMode: 'class',
-            theme: {
-                extend: {
-                    colors: {
-                        'primary': '#005384',
-                        'secondary': '#fac41b',
-                    },
-                }
-            }
-        };
-    </script>
-</head>
-<body class="transition-colors duration-300 overflow-hidden">
-    <div id="app" class="h-screen w-screen overflow-hidden antialiased">
-        <!-- Loading state while Vue initializes -->
-        <div class="flex items-center justify-center h-full bg-slate-100 dark:bg-slate-900">
-            <div class="text-center">
-                <img src="/assets/images/xinon-full-transparent.png" class="h-12 mx-auto mb-4 dark:hidden">
-                <img src="/assets/images/xinon-full-transparent-white.png" class="h-12 mx-auto mb-4 hidden dark:block">
-                <div class="animate-pulse text-slate-500 dark:text-slate-400">Lädt...</div>
-            </div>
-        </div>
-    </div>
-
-    <!-- Load Vue app as ES module -->
-    <script type="module" src="/mobile/app.js"></script>
-
-    <!-- Register Service Worker -->
-    <script>
-        if ('serviceWorker' in navigator) {
-            window.addEventListener('load', () => {
-                navigator.serviceWorker.register('/mobile/sw.js')
-                    .then(reg => console.log('SW registered:', reg.scope))
-                    .catch(err => console.log('SW registration failed:', err));
-            });
-        }
-    </script>
-</body>
-</html>
+$appConfig = [
+    'title' => 'Xinon Mobile',
+    'appName' => 'Xinon',
+    'manifestPath' => '/mobile/manifest.json',
+    'appJsPath' => '/mobile/app.js',
+    'swPath' => '/mobile/sw.js',
+];
+require __DIR__ . '/Base.php';
diff --git a/Layout/default/MobileApp/Base.php b/Layout/default/MobileApp/Base.php
new file mode 100644
index 000000000..91f8d1c7f
--- /dev/null
+++ b/Layout/default/MobileApp/Base.php
@@ -0,0 +1,67 @@
+<?php
+$config = array_merge([
+    'title' => 'Xinon Mobile',
+    'appName' => 'Xinon',
+    'manifestPath' => '/mobile/manifest.json',
+    'appJsPath' => '/mobile/app.js',
+    'swPath' => '/mobile/sw.js',
+    'additionalStylesheets' => [],
+], $appConfig ?? []);
+?>
+<!DOCTYPE html>
+<html lang="de">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
+    <title><?= htmlspecialchars($config['title']) ?></title>
+    <link rel="shortcut icon" href="/assets/images/favicon.ico">
+    <link rel="manifest" href="<?= htmlspecialchars($config['manifestPath']) ?>">
+    <meta name="theme-color" content="#005384">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+    <meta name="apple-mobile-web-app-title" content="<?= htmlspecialchars($config['appName']) ?>">
+    <script src="https://cdn.tailwindcss.com"></script>
+    <script src="https://cdn.jsdelivr.net/npm/vue@3.4.27/dist/vue.global.prod.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/axios@1.7.2/dist/axios.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/html5-qrcode@2.3.8/html5-qrcode.min.js"></script>
+    <link rel="stylesheet" href="/mobile/shared/base.css">
+<?php foreach ($config['additionalStylesheets'] as $sheet): ?>
+    <link rel="stylesheet" href="<?= htmlspecialchars($sheet) ?>">
+<?php endforeach; ?>
+    <script>
+        window.TT_CONFIG = <?= json_encode($JSGlobals ?? []) ?>;
+        tailwind.config = {
+            darkMode: 'class',
+            theme: {
+                extend: {
+                    colors: {
+                        'primary': '#005384',
+                        'secondary': '#fac41b',
+                    },
+                }
+            }
+        };
+    </script>
+</head>
+<body class="transition-colors duration-300 overflow-hidden">
+    <div id="app" class="h-screen w-screen overflow-hidden antialiased">
+        <div class="flex items-center justify-center h-full bg-slate-100 dark:bg-slate-900">
+            <div class="text-center">
+                <img src="/assets/images/xinon-full-transparent.png" class="h-12 mx-auto mb-4 dark:hidden">
+                <img src="/assets/images/xinon-full-transparent-white.png" class="h-12 mx-auto mb-4 hidden dark:block">
+                <div class="animate-pulse text-slate-500 dark:text-slate-400">Lädt...</div>
+            </div>
+        </div>
+    </div>
+    <script type="module" src="<?= htmlspecialchars($config['appJsPath']) ?>"></script>
+    <script>
+        if ('serviceWorker' in navigator) {
+            window.addEventListener('load', () => {
+                navigator.serviceWorker.register('<?= htmlspecialchars($config['swPath']) ?>')
+                    .then(reg => console.log('SW registered:', reg.scope))
+                    .catch(err => console.log('SW registration failed:', err));
+            });
+        }
+    </script>
+</body>
+</html>
diff --git a/Layout/default/MobileApp/WarehouseStocktake.php b/Layout/default/MobileApp/WarehouseStocktake.php
index 6ba94de1a..738bab8ed 100644
--- a/Layout/default/MobileApp/WarehouseStocktake.php
+++ b/Layout/default/MobileApp/WarehouseStocktake.php
@@ -1,78 +1,10 @@
 <?php
-/**
- * Warehouse Stocktake PWA View Template
- *
- * This is the HTML shell for the Warehouse Stocktake PWA.
- * The Vue application is loaded via ES modules.
- */
-?>
-<!DOCTYPE html>
-<html lang="de">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
-    <title>Lager Inventur</title>
-    <link rel="shortcut icon" href="/assets/images/favicon.ico">
-
-    <!-- PWA Configuration -->
-    <link rel="manifest" href="/mobile/warehouse-stocktake/manifest.json">
-    <meta name="theme-color" content="#005384">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
-    <meta name="apple-mobile-web-app-title" content="Inventur">
-
-    <!-- External Libraries (CDN) -->
-    <script src="https://cdn.tailwindcss.com"></script>
-    <script src="https://cdn.jsdelivr.net/npm/vue@3.4.27/dist/vue.global.prod.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/axios@1.7.2/dist/axios.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/html5-qrcode@2.3.8/html5-qrcode.min.js"></script>
-
-    <!-- Shared Styles -->
-    <link rel="stylesheet" href="/mobile/shared/base.css">
-    <link rel="stylesheet" href="/mobile/warehouse-stocktake/app.css">
-
-    <!-- App Configuration -->
-    <script>
-        window.TT_CONFIG = <?= json_encode($JSGlobals ?? []) ?>;
-
-        // Tailwind configuration
-        tailwind.config = {
-            darkMode: 'class',
-            theme: {
-                extend: {
-                    colors: {
-                        'primary': '#005384',
-                        'secondary': '#fac41b',
-                    },
-                }
-            }
-        };
-    </script>
-</head>
-<body class="transition-colors duration-300 overflow-hidden">
-    <div id="app" class="h-screen w-screen overflow-hidden antialiased">
-        <!-- Loading state while Vue initializes -->
-        <div class="flex items-center justify-center h-full bg-slate-100 dark:bg-slate-900">
-            <div class="text-center">
-                <img src="/assets/images/xinon-full-transparent.png" class="h-12 mx-auto mb-4 dark:hidden">
-                <img src="/assets/images/xinon-full-transparent-white.png" class="h-12 mx-auto mb-4 hidden dark:block">
-                <div class="animate-pulse text-slate-500 dark:text-slate-400">Lädt...</div>
-            </div>
-        </div>
-    </div>
-
-    <!-- Load Vue app as ES module -->
-    <script type="module" src="/mobile/warehouse-stocktake/app.js"></script>
-
-    <!-- Register Service Worker -->
-    <script>
-        if ('serviceWorker' in navigator) {
-            window.addEventListener('load', () => {
-                navigator.serviceWorker.register('/mobile/warehouse-stocktake/sw.js')
-                    .then(reg => console.log('SW registered:', reg.scope))
-                    .catch(err => console.log('SW registration failed:', err));
-            });
-        }
-    </script>
-</body>
-</html>
+$appConfig = [
+    'title' => 'Lager Inventur',
+    'appName' => 'Inventur',
+    'manifestPath' => '/mobile/warehouse-stocktake/manifest.json',
+    'appJsPath' => '/mobile/warehouse-stocktake/app.js',
+    'swPath' => '/mobile/warehouse-stocktake/sw.js',
+    'additionalStylesheets' => ['/mobile/warehouse-stocktake/app.css'],
+];
+require __DIR__ . '/Base.php';
diff --git a/Layout/default/WarehouseShippingNote/PDF_HEADER.html b/Layout/default/WarehouseShippingNote/PDF_HEADER.html
index 6c6bd5781..40c2a07ff 100644
--- a/Layout/default/WarehouseShippingNote/PDF_HEADER.html
+++ b/Layout/default/WarehouseShippingNote/PDF_HEADER.html
@@ -30,6 +30,7 @@
 
         .invoice-details td {
             text-align: left;
+            white-space: nowrap;
         }
 
         .invoice-details td:first-child {
diff --git a/application/MobileApp/Apps/WarehouseStocktake/WarehouseStocktakeHandler.php b/application/MobileApp/Apps/WarehouseStocktake/WarehouseStocktakeHandler.php
deleted file mode 100644
index a9773471c..000000000
--- a/application/MobileApp/Apps/WarehouseStocktake/WarehouseStocktakeHandler.php
+++ /dev/null
@@ -1,473 +0,0 @@
-<?php
-
-require_once APPDIR . 'MobileApp/Shared/MobileAppBaseHandler.php';
-
-/**
- * Warehouse Stocktake Handler
- *
- * Handles all endpoints for the Warehouse Stocktake PWA.
- * Migrated from WarehouseStocktakePWAController with new structure.
- */
-class WarehouseStocktakeHandler extends MobileAppBaseHandler {
-
-    protected $requiredPermission = 'WarehouseUser';
-    protected $appName = 'WarehouseStocktake';
-    protected $viewTemplate = 'MobileApp/WarehouseStocktake';
-
-    /**
-     * Get active stocktakes that user can participate in
-     * GET /MobileApp/WarehouseStocktake/getActiveStocktakes
-     */
-    public function getActiveStocktakesAction() {
-        $stocktakes = WarehouseStocktakeModel::getAll(['status' => 'in_progress']);
-
-        $result = [];
-        foreach ($stocktakes as $stocktake) {
-            $location = $stocktake->getLocation();
-            $result[] = [
-                'id' => $stocktake->id,
-                'stocktakeNumber' => $stocktake->stocktakeNumber,
-                'title' => $stocktake->title,
-                'locationName' => $location ? $location->title : 'Unbekannt',
-                'totalScannedItems' => $stocktake->totalScannedItems,
-                'startedAt' => $stocktake->startedAt ? date('d.m.Y H:i', $stocktake->startedAt) : null,
-            ];
-        }
-
-        self::returnJson(['success' => true, 'stocktakes' => $result]);
-    }
-
-    /**
-     * Get stocktake details
-     * GET /MobileApp/WarehouseStocktake/getStocktake?id=X
-     */
-    public function getStocktakeAction() {
-        $id = intval($this->request->id);
-        if (!$id) {
-            self::returnJson(['success' => false, 'message' => 'Keine Inventur-ID angegeben']);
-            return;
-        }
-
-        $stocktake = WarehouseStocktakeModel::get($id);
-        if (!$stocktake) {
-            self::returnJson(['success' => false, 'message' => 'Inventur nicht gefunden']);
-            return;
-        }
-
-        $location = $stocktake->getLocation();
-
-        self::returnJson([
-            'success' => true,
-            'stocktake' => [
-                'id' => $stocktake->id,
-                'stocktakeNumber' => $stocktake->stocktakeNumber,
-                'title' => $stocktake->title,
-                'status' => $stocktake->status,
-                'locationId' => $stocktake->warehouseLocationId,
-                'locationName' => $location ? $location->title : 'Unbekannt',
-                'totalScannedItems' => $stocktake->totalScannedItems,
-                'startedAt' => $stocktake->startedAt ? date('d.m.Y H:i', $stocktake->startedAt) : null,
-            ]
-        ]);
-    }
-
-    /**
-     * Get article by QR code or article number
-     * GET /MobileApp/WarehouseStocktake/getArticle?code=X
-     */
-    public function getArticleAction() {
-        $code = $this->request->code;
-
-        if (!$code) {
-            self::returnJson(['success' => false, 'message' => 'Kein Code angegeben']);
-            return;
-        }
-
-        $articleId = null;
-
-        // Try to parse QR code format: WA:articleId:articleNumber (Warehouse Article)
-        // Also accept WH: for backwards compatibility
-        if (preg_match('/^(?:WA|WH):(\d+):/', $code, $matches)) {
-            $articleId = intval($matches[1]);
-        } else {
-            // Try to find by article number
-            $article = WarehouseArticleModel::getFirst(['articleNumber' => $code]);
-            if ($article) {
-                $articleId = $article->id;
-            }
-        }
-
-        if (!$articleId) {
-            self::returnJson(['success' => false, 'message' => 'Artikel nicht gefunden']);
-            return;
-        }
-
-        $article = WarehouseArticleModel::get($articleId);
-        if (!$article) {
-            self::returnJson(['success' => false, 'message' => 'Artikel nicht gefunden']);
-            return;
-        }
-
-        // Get category name
-        $category = WarehouseCategory::get($article->category_id);
-
-        self::returnJson([
-            'success' => true,
-            'article' => [
-                'id' => $article->id,
-                'articleNumber' => $article->articleNumber,
-                'title' => $article->title,
-                'description' => $article->description ?? '',
-                'unit' => $article->unit ?? 'Stk.',
-                'categoryName' => $category ? $category->name : '',
-            ]
-        ]);
-    }
-
-    /**
-     * Search articles by text with optional category filter
-     * GET /MobileApp/WarehouseStocktake/searchArticles?query=X&categoryId=Y
-     */
-    public function searchArticlesAction() {
-        $query = $this->request->query ?? '';
-        $categoryId = intval($this->request->categoryId ?? 0);
-
-        $db = $this->db();
-        $conditions = ["(isEndOfLife IS NULL OR isEndOfLife = 0)"];
-
-        if ($query && strlen($query) >= 2) {
-            $escapedQuery = $db->escape($query);
-            $conditions[] = "(articleNumber LIKE '%{$escapedQuery}%' OR title LIKE '%{$escapedQuery}%' OR description LIKE '%{$escapedQuery}%')";
-        }
-
-        if ($categoryId > 0) {
-            $conditions[] = "category_id = {$categoryId}";
-        }
-
-        if (count($conditions) === 1 && !$categoryId) {
-            self::returnJson(['success' => true, 'articles' => []]);
-            return;
-        }
-
-        $whereClause = implode(' AND ', $conditions);
-        $result = $db->query("SELECT id, articleNumber, title, unit, category_id
-                              FROM WarehouseArticle
-                              WHERE {$whereClause}
-                              ORDER BY title ASC
-                              LIMIT 50");
-
-        $articles = [];
-        while ($row = $result->fetch_assoc()) {
-            $articles[] = [
-                'id' => intval($row['id']),
-                'articleNumber' => $row['articleNumber'],
-                'title' => $row['title'],
-                'unit' => $row['unit'] ?? 'Stk.',
-                'categoryId' => intval($row['category_id'] ?? 0),
-            ];
-        }
-
-        self::returnJson(['success' => true, 'articles' => $articles]);
-    }
-
-    /**
-     * Get all categories for browsing
-     * GET /MobileApp/WarehouseStocktake/getCategories
-     */
-    public function getCategoriesAction() {
-        $db = $this->db();
-        $res = $db->query("SELECT id, name FROM WarehouseCategory ORDER BY name ASC");
-
-        $categories = [];
-        while ($row = $res->fetch_assoc()) {
-            $categories[] = [
-                'id' => intval($row['id']),
-                'name' => $row['name'],
-            ];
-        }
-        self::returnJson(['success' => true, 'categories' => $categories]);
-    }
-
-    /**
-     * Check if article is already scanned in stocktake
-     * GET /MobileApp/WarehouseStocktake/checkAlreadyScanned?stocktakeId=X&articleId=Y
-     */
-    public function checkAlreadyScannedAction() {
-        $stocktakeId = intval($this->request->stocktakeId);
-        $articleId = intval($this->request->articleId);
-
-        if (!$stocktakeId || !$articleId) {
-            self::returnJson(['success' => false, 'message' => 'Fehlende Parameter']);
-            return;
-        }
-
-        $existing = WarehouseStocktakeItemModel::getFirst([
-            'stocktakeId' => $stocktakeId,
-            'articleId' => $articleId,
-            'overwrittenById' => null
-        ]);
-
-        if ($existing) {
-            $db = $this->db();
-            $scannedByResult = $db->query("SELECT name FROM Worker WHERE id = {$existing->scannedBy}");
-            $scannedByRow = $scannedByResult->fetch_assoc();
-
-            self::returnJson([
-                'success' => true,
-                'alreadyScanned' => true,
-                'existingItem' => [
-                    'id' => $existing->id,
-                    'countedQuantity' => $existing->countedQuantity,
-                    'scannedAt' => $existing->scannedAt ? date('d.m.Y H:i', $existing->scannedAt) : null,
-                    'scannedBy' => $scannedByRow ? $scannedByRow['name'] : 'Unbekannt',
-                ]
-            ]);
-        } else {
-            self::returnJson(['success' => true, 'alreadyScanned' => false]);
-        }
-    }
-
-    /**
-     * Submit a scanned item
-     * POST /MobileApp/WarehouseStocktake/submitScan
-     */
-    public function submitScanAction() {
-        $postData = $this->getPostData();
-
-        $stocktakeId = intval($postData['stocktakeId'] ?? 0);
-        $articleId = intval($postData['articleId'] ?? 0);
-        $quantity = floatval($postData['quantity'] ?? 0);
-        $rack = $postData['rack'] ?? null;
-        $shelf = $postData['shelf'] ?? null;
-        $note = $postData['note'] ?? null;
-        $overwrite = boolval($postData['overwrite'] ?? false);
-        $overwriteItemId = intval($postData['overwriteItemId'] ?? 0);
-
-        if (!$stocktakeId || !$articleId) {
-            self::returnJson(['success' => false, 'message' => 'Fehlende Parameter']);
-            return;
-        }
-
-        if ($quantity <= 0) {
-            self::returnJson(['success' => false, 'message' => 'Menge muss größer als 0 sein']);
-            return;
-        }
-
-        // Verify stocktake exists and is in progress
-        $stocktake = WarehouseStocktakeModel::get($stocktakeId);
-        if (!$stocktake) {
-            self::returnJson(['success' => false, 'message' => 'Inventur nicht gefunden']);
-            return;
-        }
-
-        if ($stocktake->status !== 'in_progress') {
-            self::returnJson(['success' => false, 'message' => 'Inventur ist nicht aktiv']);
-            return;
-        }
-
-        // Verify article exists
-        $article = WarehouseArticleModel::get($articleId);
-        if (!$article) {
-            self::returnJson(['success' => false, 'message' => 'Artikel nicht gefunden']);
-            return;
-        }
-
-        $db = $this->db();
-
-        // If overwrite mode is enabled, mark existing item as overwritten
-        if ($overwrite && $overwriteItemId) {
-            // Create new entry
-            $db->query("INSERT INTO WarehouseStocktakeItem
-                        (stocktakeId, articleId, countedQuantity, rack, shelf, note, scannedAt, scannedBy, createBy, `create`)
-                        VALUES ({$stocktakeId}, {$articleId}, {$quantity},
-                        " . ($rack ? "'{$db->escape($rack)}'" : "NULL") . ",
-                        " . ($shelf ? "'{$db->escape($shelf)}'" : "NULL") . ",
-                        " . ($note ? "'{$db->escape($note)}'" : "NULL") . ",
-                        " . time() . ", {$this->user->id}, {$this->user->id}, " . time() . ")");
-
-            $itemId = $db->insert_id;
-
-            // Mark old item as overwritten by new item
-            $db->query("UPDATE WarehouseStocktakeItem SET overwrittenById = {$itemId} WHERE id = {$overwriteItemId}");
-
-            $finalQuantity = $quantity;
-
-            // Log the overwrite
-            WarehouseStocktakeLogModel::log($stocktakeId, 'overwritten', $itemId, [
-                'articleId' => $articleId,
-                'articleNumber' => $article->articleNumber,
-                'articleTitle' => $article->title,
-                'quantity' => $quantity,
-                'overwrittenItemId' => $overwriteItemId,
-            ]);
-
-            // Update stocktake progress
-            $stocktake->updateProgress();
-
-            self::returnJson([
-                'success' => true,
-                'message' => "'{$article->title}' überschrieben ({$quantity} {$article->unit})",
-                'item' => [
-                    'id' => $itemId,
-                    'articleId' => $articleId,
-                    'articleNumber' => $article->articleNumber,
-                    'articleTitle' => $article->title,
-                    'countedQuantity' => $finalQuantity,
-                    'unit' => $article->unit ?? 'Stk.',
-                    'rack' => $rack,
-                    'shelf' => $shelf,
-                    'isOverwrite' => true,
-                ]
-            ]);
-            return;
-        }
-
-        // Check if this article was already scanned in this stocktake (non-overwritten)
-        $existing = WarehouseStocktakeItemModel::getFirst([
-            'stocktakeId' => $stocktakeId,
-            'articleId' => $articleId,
-            'overwrittenById' => null
-        ]);
-
-        if ($existing) {
-            // Update existing entry - add to quantity
-            $newQuantity = $existing->countedQuantity + $quantity;
-            $db->query("UPDATE WarehouseStocktakeItem SET
-                        countedQuantity = {$newQuantity},
-                        rack = " . ($rack ? "'{$db->escape($rack)}'" : "rack") . ",
-                        shelf = " . ($shelf ? "'{$db->escape($shelf)}'" : "shelf") . ",
-                        scannedAt = " . time() . ",
-                        scannedBy = {$this->user->id}
-                        WHERE id = {$existing->id}");
-
-            $itemId = $existing->id;
-            $finalQuantity = $newQuantity;
-            $isUpdate = true;
-        } else {
-            // Create new entry
-            $db->query("INSERT INTO WarehouseStocktakeItem
-                        (stocktakeId, articleId, countedQuantity, rack, shelf, note, scannedAt, scannedBy, createBy, `create`)
-                        VALUES ({$stocktakeId}, {$articleId}, {$quantity},
-                        " . ($rack ? "'{$db->escape($rack)}'" : "NULL") . ",
-                        " . ($shelf ? "'{$db->escape($shelf)}'" : "NULL") . ",
-                        " . ($note ? "'{$db->escape($note)}'" : "NULL") . ",
-                        " . time() . ", {$this->user->id}, {$this->user->id}, " . time() . ")");
-
-            $itemId = $db->insert_id;
-            $finalQuantity = $quantity;
-            $isUpdate = false;
-        }
-
-        // Update stocktake progress
-        $stocktake->updateProgress();
-
-        // Log the scan
-        WarehouseStocktakeLogModel::log($stocktakeId, 'scanned', $itemId, [
-            'articleId' => $articleId,
-            'articleNumber' => $article->articleNumber,
-            'articleTitle' => $article->title,
-            'quantity' => $quantity,
-            'totalQuantity' => $finalQuantity,
-            'rack' => $rack,
-            'shelf' => $shelf,
-            'isUpdate' => $isUpdate,
-        ]);
-
-        self::returnJson([
-            'success' => true,
-            'message' => $isUpdate
-                ? "Menge für '{$article->title}' erhöht auf {$finalQuantity}"
-                : "'{$article->title}' hinzugefügt ({$quantity} {$article->unit})",
-            'item' => [
-                'id' => $itemId,
-                'articleId' => $articleId,
-                'articleNumber' => $article->articleNumber,
-                'articleTitle' => $article->title,
-                'countedQuantity' => $finalQuantity,
-                'unit' => $article->unit ?? 'Stk.',
-                'rack' => $rack,
-                'shelf' => $shelf,
-                'isUpdate' => $isUpdate,
-            ]
-        ]);
-    }
-
-    /**
-     * Get recent scans for current user in a stocktake
-     * GET /MobileApp/WarehouseStocktake/getMyScans?stocktakeId=X
-     */
-    public function getMyScansAction() {
-        $stocktakeId = intval($this->request->stocktakeId);
-
-        if (!$stocktakeId) {
-            self::returnJson(['success' => false, 'message' => 'Keine Inventur-ID angegeben']);
-            return;
-        }
-
-        $db = $this->db();
-        $result = $db->query("SELECT si.*, wa.articleNumber, wa.title as articleTitle, wa.unit
-                              FROM WarehouseStocktakeItem si
-                              JOIN WarehouseArticle wa ON wa.id = si.articleId
-                              WHERE si.stocktakeId = {$stocktakeId}
-                              AND si.scannedBy = {$this->user->id}
-                              ORDER BY si.scannedAt DESC
-                              LIMIT 50");
-
-        $items = [];
-        while ($row = $result->fetch_assoc()) {
-            $items[] = [
-                'id' => intval($row['id']),
-                'articleId' => intval($row['articleId']),
-                'articleNumber' => $row['articleNumber'],
-                'articleTitle' => $row['articleTitle'],
-                'countedQuantity' => floatval($row['countedQuantity']),
-                'unit' => $row['unit'] ?? 'Stk.',
-                'rack' => $row['rack'],
-                'shelf' => $row['shelf'],
-                'scannedAt' => $row['scannedAt'] ? date('H:i', $row['scannedAt']) : null,
-            ];
-        }
-
-        self::returnJson(['success' => true, 'items' => $items]);
-    }
-
-    /**
-     * Get progress stats
-     * GET /MobileApp/WarehouseStocktake/getProgress?stocktakeId=X
-     */
-    public function getProgressAction() {
-        $stocktakeId = intval($this->request->stocktakeId);
-
-        if (!$stocktakeId) {
-            self::returnJson(['success' => false, 'message' => 'Keine Inventur-ID angegeben']);
-            return;
-        }
-
-        $stocktake = WarehouseStocktakeModel::get($stocktakeId);
-        if (!$stocktake) {
-            self::returnJson(['success' => false, 'message' => 'Inventur nicht gefunden']);
-            return;
-        }
-
-        $db = $this->db();
-
-        // Total scanned items
-        $totalResult = $db->query("SELECT COUNT(*) as count FROM WarehouseStocktakeItem WHERE stocktakeId = {$stocktakeId}");
-        $totalRow = $totalResult->fetch_assoc();
-        $totalScanned = intval($totalRow['count']);
-
-        // My scanned items
-        $myResult = $db->query("SELECT COUNT(*) as count FROM WarehouseStocktakeItem WHERE stocktakeId = {$stocktakeId} AND scannedBy = {$this->user->id}");
-        $myRow = $myResult->fetch_assoc();
-        $myScanned = intval($myRow['count']);
-
-        self::returnJson([
-            'success' => true,
-            'progress' => [
-                'totalScanned' => $totalScanned,
-                'myScanned' => $myScanned,
-                'status' => $stocktake->status,
-            ]
-        ]);
-    }
-}
diff --git a/application/MobileApp/MobileAppController.php b/application/MobileApp/MobileAppController.php
index 96f62b246..294972802 100644
--- a/application/MobileApp/MobileAppController.php
+++ b/application/MobileApp/MobileAppController.php
@@ -21,10 +21,7 @@ class MobileAppController extends mfBaseController {
     protected $user;
 
     protected function init() {
-        // We handle auth ourselves
         $this->needlogin = false;
-
-        // Try to load user if session exists
         $me = mfValuecache::singleton()->get("me");
         if (!$me) {
             if (mfLoginController::isLoggedIn()) {
diff --git a/application/MobileApp/Modules/Lager/Inventur/InventurHandler.php b/application/MobileApp/Modules/Lager/Inventur/InventurHandler.php
index 75c1b36f3..ddd02ca85 100644
--- a/application/MobileApp/Modules/Lager/Inventur/InventurHandler.php
+++ b/application/MobileApp/Modules/Lager/Inventur/InventurHandler.php
@@ -2,20 +2,10 @@
 
 require_once APPDIR . 'MobileApp/Shared/MobileAppBaseHandler.php';
 
-/**
- * Inventur (Stocktake) Handler
- *
- * Handles all endpoints for the Lager > Inventur module.
- * API Base: /MobileApp/Lager/Inventur/{action}
- */
 class InventurHandler extends MobileAppBaseHandler {
 
     protected $requiredPermission = 'WarehouseUser';
 
-    /**
-     * Get active stocktakes
-     * GET /MobileApp/Lager/Inventur/getActiveStocktakes
-     */
     public function getActiveStocktakesAction() {
         $stocktakes = WarehouseStocktakeModel::getAll(['status' => 'in_progress']);
 
@@ -35,9 +25,6 @@ class InventurHandler extends MobileAppBaseHandler {
         self::returnJson(['success' => true, 'stocktakes' => $result]);
     }
 
-    /**
-     * Get stocktake details
-     */
     public function getStocktakeAction() {
         $id = intval($this->request->id);
         if (!$id) {
@@ -68,9 +55,6 @@ class InventurHandler extends MobileAppBaseHandler {
         ]);
     }
 
-    /**
-     * Get article by QR code or article number
-     */
     public function getArticleAction() {
         $code = $this->request->code;
 
@@ -116,9 +100,6 @@ class InventurHandler extends MobileAppBaseHandler {
         ]);
     }
 
-    /**
-     * Search articles
-     */
     public function searchArticlesAction() {
         $query = $this->request->query ?? '';
         $categoryId = intval($this->request->categoryId ?? 0);
@@ -161,9 +142,6 @@ class InventurHandler extends MobileAppBaseHandler {
         self::returnJson(['success' => true, 'articles' => $articles]);
     }
 
-    /**
-     * Get categories
-     */
     public function getCategoriesAction() {
         $db = $this->db();
         $res = $db->query("SELECT id, name FROM WarehouseCategory ORDER BY name ASC");
@@ -178,9 +156,6 @@ class InventurHandler extends MobileAppBaseHandler {
         self::returnJson(['success' => true, 'categories' => $categories]);
     }
 
-    /**
-     * Check if already scanned
-     */
     public function checkAlreadyScannedAction() {
         $stocktakeId = intval($this->request->stocktakeId);
         $articleId = intval($this->request->articleId);
@@ -216,9 +191,6 @@ class InventurHandler extends MobileAppBaseHandler {
         }
     }
 
-    /**
-     * Submit scan
-     */
     public function submitScanAction() {
         $postData = $this->getPostData();
 
@@ -366,9 +338,6 @@ class InventurHandler extends MobileAppBaseHandler {
         ]);
     }
 
-    /**
-     * Get my scans
-     */
     public function getMyScansAction() {
         $stocktakeId = intval($this->request->stocktakeId);
 
@@ -404,9 +373,6 @@ class InventurHandler extends MobileAppBaseHandler {
         self::returnJson(['success' => true, 'items' => $items]);
     }
 
-    /**
-     * Get progress
-     */
     public function getProgressAction() {
         $stocktakeId = intval($this->request->stocktakeId);
 
diff --git a/application/MobileApp/Modules/Lager/Movement/MovementHandler.php b/application/MobileApp/Modules/Lager/Movement/MovementHandler.php
index 19451ad01..d3e499019 100644
--- a/application/MobileApp/Modules/Lager/Movement/MovementHandler.php
+++ b/application/MobileApp/Modules/Lager/Movement/MovementHandler.php
@@ -2,20 +2,10 @@
 
 require_once APPDIR . 'MobileApp/Shared/MobileAppBaseHandler.php';
 
-/**
- * Movement (Stock Movement) Handler
- *
- * Handles all endpoints for the Lager > Movement module.
- * API Base: /MobileApp/Lager/Movement/{action}
- */
 class MovementHandler extends MobileAppBaseHandler {
 
     protected $requiredPermission = 'WarehouseUser';
 
-    /**
-     * Get available locations (Office + Außenlager only)
-     * GET /MobileApp/Lager/Movement/getLocations
-     */
     public function getLocationsAction() {
         $allLocations = WarehouseLocationModel::getAll();
         $locations = [];
@@ -33,10 +23,6 @@ class MovementHandler extends MobileAppBaseHandler {
         self::returnJson(['success' => true, 'locations' => $locations]);
     }
 
-    /**
-     * Get article by QR code or article number
-     * GET /MobileApp/Lager/Movement/getArticle?code=X
-     */
     public function getArticleAction() {
         $code = $this->request->code;
 
@@ -84,10 +70,6 @@ class MovementHandler extends MobileAppBaseHandler {
         ]);
     }
 
-    /**
-     * Search articles
-     * GET /MobileApp/Lager/Movement/searchArticles?query=X
-     */
     public function searchArticlesAction() {
         $query = $this->request->query ?? '';
 
@@ -122,10 +104,6 @@ class MovementHandler extends MobileAppBaseHandler {
         self::returnJson(['success' => true, 'articles' => $articles]);
     }
 
-    /**
-     * Get reason categories for a movement type
-     * GET /MobileApp/Lager/Movement/getReasonCategories?type=IN|OUT|ADJUSTMENT
-     */
     public function getReasonCategoriesAction() {
         $type = $this->request->type ?? null;
 
@@ -142,10 +120,6 @@ class MovementHandler extends MobileAppBaseHandler {
         }
     }
 
-    /**
-     * Get current stock for an article at a location
-     * GET /MobileApp/Lager/Movement/getCurrentStock?articleId=X&locationId=X
-     */
     public function getCurrentStockAction() {
         $articleId = intval($this->request->articleId ?? 0);
         $locationId = intval($this->request->locationId ?? 0);
@@ -165,10 +139,6 @@ class MovementHandler extends MobileAppBaseHandler {
         self::returnJson(['success' => true, 'currentStock' => $currentStock]);
     }
 
-    /**
-     * Submit a stock movement
-     * POST /MobileApp/Lager/Movement/submitMovement
-     */
     public function submitMovementAction() {
         $postData = $this->getPostData();
 
@@ -284,10 +254,6 @@ class MovementHandler extends MobileAppBaseHandler {
         ]);
     }
 
-    /**
-     * Get recent movements by current user
-     * GET /MobileApp/Lager/Movement/getMyMovements
-     */
     public function getMyMovementsAction() {
         $locationId = intval($this->request->locationId ?? 0);
         $limit = intval($this->request->limit ?? 20);
@@ -330,10 +296,6 @@ class MovementHandler extends MobileAppBaseHandler {
         self::returnJson(['success' => true, 'movements' => $movements]);
     }
 
-    /**
-     * Get movement types with labels
-     * GET /MobileApp/Lager/Movement/getMovementTypes
-     */
     public function getMovementTypesAction() {
         $types = [
             ['value' => 'IN', 'text' => 'Einbuchung', 'icon' => 'plus-circle', 'color' => 'green'],
@@ -343,4 +305,277 @@ class MovementHandler extends MobileAppBaseHandler {
 
         self::returnJson(['success' => true, 'types' => $types]);
     }
+
+    public function getPendingOrdersAction() {
+        $db = $this->db();
+
+        $result = $db->query("SELECT wo.*, wd.name as distributorName
+                              FROM WarehouseOrder wo
+                              LEFT JOIN WarehouseDistributor wd ON wd.id = wo.distributorId
+                              WHERE wo.status IN ('sent', 'partiallyDelivered')
+                              ORDER BY wo.`create` DESC");
+
+        $orders = [];
+        while ($row = $result->fetch_assoc()) {
+            $positions = json_decode($row['positions'], true) ?: [];
+            $totalItems = array_sum(array_column($positions, 'amount'));
+
+            // Calculate days since sent
+            $daysSinceSent = 0;
+            if (!empty($row['create'])) {
+                $daysSinceSent = floor((time() - intval($row['create'])) / 86400);
+            }
+
+            $orders[] = [
+                'id' => intval($row['id']),
+                'orderNumber' => $row['orderNumber'],
+                'distributorName' => $row['distributorName'] ?? 'Unbekannt',
+                'status' => $row['status'],
+                'statusLabel' => $row['status'] === 'sent' ? 'Versendet' : 'Teilweise geliefert',
+                'totalItems' => $totalItems,
+                'positionCount' => count($positions),
+                'daysSinceSent' => $daysSinceSent,
+                'create' => date('d.m.Y', $row['create']),
+            ];
+        }
+
+        self::returnJson(['success' => true, 'orders' => $orders]);
+    }
+
+    public function getOrderForReceivingAction() {
+        $orderId = intval($this->request->orderId ?? 0);
+
+        if ($orderId <= 0) {
+            self::returnJson(['success' => false, 'message' => 'Keine Bestellung angegeben']);
+            return;
+        }
+
+        $order = WarehouseOrderModel::get($orderId);
+        if (!$order) {
+            self::returnJson(['success' => false, 'message' => 'Bestellung nicht gefunden']);
+            return;
+        }
+
+        if (!in_array($order->status, ['sent', 'partiallyDelivered'])) {
+            self::returnJson(['success' => false, 'message' => 'Bestellung ist nicht im Status Versendet oder Teilweise geliefert']);
+            return;
+        }
+
+        $distributor = WarehouseDistributorModel::get($order->distributorId);
+        $positions = json_decode($order->positions, true) ?: [];
+
+        // Get already delivered quantities from linked movements
+        $linkedMovementIds = $order->linkedMovementIds ? json_decode($order->linkedMovementIds, true) : [];
+        $deliveredByArticle = [];
+
+        foreach ($linkedMovementIds as $movementId) {
+            $movement = WarehouseMovementModel::get($movementId);
+            if ($movement && $movement->movementType === 'IN') {
+                if (!isset($deliveredByArticle[$movement->articleId])) {
+                    $deliveredByArticle[$movement->articleId] = 0;
+                }
+                $deliveredByArticle[$movement->articleId] += $movement->quantity;
+            }
+        }
+
+        // Enrich positions with article details and delivered quantities
+        $enrichedPositions = [];
+        foreach ($positions as $index => $pos) {
+            $articleId = intval($pos['article']);
+            $article = WarehouseArticleModel::get($articleId);
+
+            $orderedQty = floatval($pos['amount']);
+            $deliveredQty = $deliveredByArticle[$articleId] ?? 0;
+            $remainingQty = max(0, $orderedQty - $deliveredQty);
+
+            $enrichedPositions[] = [
+                'index' => $index,
+                'articleId' => $articleId,
+                'articleNumber' => $article ? $article->articleNumber : '',
+                'articleTitle' => $article ? $article->title : ($pos['article_text'] ?? 'Unbekannt'),
+                'unit' => $article ? ($article->unit ?? 'Stk.') : 'Stk.',
+                'orderedQty' => $orderedQty,
+                'deliveredQty' => $deliveredQty,
+                'remainingQty' => $remainingQty,
+                'receivingQty' => $remainingQty, // Default to remaining
+            ];
+        }
+
+        self::returnJson([
+            'success' => true,
+            'order' => [
+                'id' => $order->id,
+                'orderNumber' => $order->orderNumber,
+                'distributorName' => $distributor ? $distributor->name : 'Unbekannt',
+                'status' => $order->status,
+                'note' => $order->note,
+                'create' => date('d.m.Y H:i', $order->create),
+            ],
+            'positions' => $enrichedPositions
+        ]);
+    }
+
+    public function submitOrderReceivingAction() {
+        $postData = $this->getPostData();
+
+        $orderId = intval($postData['orderId'] ?? 0);
+        $locationId = intval($postData['locationId'] ?? 0);
+        $positions = $postData['positions'] ?? [];
+        $deliveryNoteFileId = $postData['deliveryNoteFileId'] ?? null;
+        $note = $postData['note'] ?? null;
+
+        // Validation
+        if ($orderId <= 0) {
+            self::returnJson(['success' => false, 'message' => 'Keine Bestellung angegeben']);
+            return;
+        }
+
+        if ($locationId <= 0) {
+            self::returnJson(['success' => false, 'message' => 'Kein Lagerort ausgewählt']);
+            return;
+        }
+
+        if (empty($positions)) {
+            self::returnJson(['success' => false, 'message' => 'Keine Positionen angegeben']);
+            return;
+        }
+
+        $order = WarehouseOrderModel::get($orderId);
+        if (!$order) {
+            self::returnJson(['success' => false, 'message' => 'Bestellung nicht gefunden']);
+            return;
+        }
+
+        if (!in_array($order->status, ['sent', 'partiallyDelivered'])) {
+            self::returnJson(['success' => false, 'message' => 'Bestellung ist nicht im Status Versendet oder Teilweise geliefert']);
+            return;
+        }
+
+        $db = $this->db();
+        $createdMovementIds = [];
+        $totalReceived = 0;
+
+        // Create movements for each position with quantity > 0
+        foreach ($positions as $pos) {
+            $articleId = intval($pos['articleId'] ?? 0);
+            $quantity = floatval($pos['quantity'] ?? 0);
+
+            if ($articleId <= 0 || $quantity <= 0) {
+                continue;
+            }
+
+            // Find or create WarehouseItem
+            $existingItems = WarehouseItemModel::getAll([
+                'articleId' => $articleId,
+                'warehouseLocationId' => $locationId
+            ]);
+
+            $warehouseItem = count($existingItems) > 0 ? $existingItems[0] : null;
+            $currentQty = $warehouseItem ? floatval($warehouseItem->quantity) : 0;
+            $newQty = $currentQty + $quantity;
+
+            // Update or create WarehouseItem
+            if ($warehouseItem) {
+                $db->query("UPDATE WarehouseItem SET quantity = {$newQty} WHERE id = {$warehouseItem->id}");
+                $warehouseItemId = $warehouseItem->id;
+            } else {
+                $db->query("INSERT INTO WarehouseItem (articleId, warehouseLocationId, quantity, createBy, `create`)
+                            VALUES ({$articleId}, {$locationId}, {$newQty}, {$this->user->id}, " . time() . ")");
+                $warehouseItemId = $db->insert_id;
+            }
+
+            // Create movement record
+            $movementNote = "Lagereingang aus Bestellung {$order->orderNumber}";
+            if ($note) {
+                $movementNote .= " - " . $note;
+            }
+            $noteEscaped = "'" . $db->escape($movementNote) . "'";
+
+            $db->query("INSERT INTO WarehouseMovement
+                        (movementType, articleId, warehouseLocationId, warehouseItemId, quantity, quantityBefore, quantityAfter, reasonCategory, linkedOrderId, note, userId, createBy, `create`)
+                        VALUES ('IN', {$articleId}, {$locationId}, {$warehouseItemId}, {$quantity}, {$currentQty}, {$newQty}, 'Warenlieferung', {$orderId}, {$noteEscaped}, {$this->user->id}, {$this->user->id}, " . time() . ")");
+
+            $movementId = $db->insert_id;
+
+            // Generate movement number
+            $movementNumber = WarehouseMovementModel::generateMovementNumber();
+            $db->query("UPDATE WarehouseMovement SET movementNumber = '{$movementNumber}' WHERE id = {$movementId}");
+
+            $createdMovementIds[] = $movementId;
+            $totalReceived += $quantity;
+        }
+
+        if (empty($createdMovementIds)) {
+            self::returnJson(['success' => false, 'message' => 'Keine Mengen eingegeben']);
+            return;
+        }
+
+        // Update order with linked movement IDs
+        $existingMovementIds = $order->linkedMovementIds ? json_decode($order->linkedMovementIds, true) : [];
+        $allMovementIds = array_merge($existingMovementIds, $createdMovementIds);
+
+        // Update delivery note file IDs if provided
+        $existingFileIds = $order->deliveryNoteFileIds ? json_decode($order->deliveryNoteFileIds, true) : [];
+        if ($deliveryNoteFileId) {
+            $existingFileIds[] = $deliveryNoteFileId;
+        }
+
+        // Determine new status - check if all items are now fully delivered
+        $orderPositions = json_decode($order->positions, true) ?: [];
+        $allFullyDelivered = true;
+
+        // Get all delivered quantities including new ones
+        $deliveredByArticle = [];
+        foreach ($allMovementIds as $movementId) {
+            $movement = WarehouseMovementModel::get($movementId);
+            if ($movement && $movement->movementType === 'IN') {
+                if (!isset($deliveredByArticle[$movement->articleId])) {
+                    $deliveredByArticle[$movement->articleId] = 0;
+                }
+                $deliveredByArticle[$movement->articleId] += $movement->quantity;
+            }
+        }
+
+        foreach ($orderPositions as $pos) {
+            $articleId = intval($pos['article']);
+            $orderedQty = floatval($pos['amount']);
+            $deliveredQty = $deliveredByArticle[$articleId] ?? 0;
+
+            if ($deliveredQty < $orderedQty) {
+                $allFullyDelivered = false;
+                break;
+            }
+        }
+
+        $newStatus = $allFullyDelivered ? 'fullyDelivered' : 'partiallyDelivered';
+
+        // Update order
+        $orderAsArray = (array)$order;
+        $orderAsArray['linkedMovementIds'] = json_encode($allMovementIds);
+        $orderAsArray['deliveryNoteFileIds'] = json_encode($existingFileIds);
+        $orderAsArray['status'] = $newStatus;
+        WarehouseOrderModel::update($orderAsArray);
+
+        // Create log entry
+        $logMessage = count($createdMovementIds) . " Lagerbewegung(en) erstellt via Mobile App.";
+        if ($note) {
+            $logMessage .= "\n" . $note;
+        }
+
+        WarehouseLogModel::create([
+            'table' => 'WarehouseOrder',
+            'rowId' => $orderId,
+            'type' => 'statusChange',
+            'message' => "Status geändert auf " . ($newStatus === 'fullyDelivered' ? 'Geliefert' : 'Teilweise geliefert') . ".\n" . $logMessage,
+            'createBy' => $this->user->id,
+            'create' => time()
+        ]);
+
+        self::returnJson([
+            'success' => true,
+            'message' => "{$totalReceived} Artikel empfangen. " . count($createdMovementIds) . " Lagerbewegung(en) erstellt.",
+            'newStatus' => $newStatus,
+            'createdMovementIds' => $createdMovementIds
+        ]);
+    }
 }
diff --git a/application/MobileApp/Modules/Lager/ShippingNote/ShippingNoteHandler.php b/application/MobileApp/Modules/Lager/ShippingNote/ShippingNoteHandler.php
new file mode 100644
index 000000000..2e7d004e6
--- /dev/null
+++ b/application/MobileApp/Modules/Lager/ShippingNote/ShippingNoteHandler.php
@@ -0,0 +1,761 @@
+<?php
+
+require_once APPDIR . 'MobileApp/Shared/MobileAppBaseHandler.php';
+
+/**
+ * ShippingNote (Lieferschein) Handler
+ *
+ * Handles all endpoints for the Lager > ShippingNote module.
+ * API Base: /MobileApp/Lager/ShippingNote/{action}
+ */
+class ShippingNoteHandler extends MobileAppBaseHandler {
+
+    protected $requiredPermission = 'WarehouseUser';
+
+    // Office coordinates for distance calculation
+    const OFFICE_LAT = 46.99552810791587;
+    const OFFICE_LNG = 15.7751923956463;
+
+    /**
+     * Get customer by GPS location (nearest within radius)
+     * GET /MobileApp/Lager/ShippingNote/getCustomerByLocation?lat=X&lng=Y
+     */
+    public function getCustomerByLocationAction() {
+        $lat = floatval($this->request->lat ?? 0);
+        $lng = floatval($this->request->lng ?? 0);
+        $radius = intval($this->request->radius ?? 200); // default 200 meters
+
+        if (!$lat || !$lng) {
+            self::returnJson(['success' => false, 'message' => 'Koordinaten fehlen']);
+            return;
+        }
+
+        $db = $this->db();
+
+        // Haversine formula for distance in meters
+        $sql = "SELECT id, customer_number, company, firstname, lastname, street, zip, city, email, phone, gps_lat, gps_long,
+                (6371000 * acos(
+                    cos(radians({$lat})) * cos(radians(gps_lat)) *
+                    cos(radians(gps_long) - radians({$lng})) +
+                    sin(radians({$lat})) * sin(radians(gps_lat))
+                )) AS distance
+                FROM Address
+                WHERE gps_lat IS NOT NULL
+                  AND gps_long IS NOT NULL
+                  AND customer_number > 0
+                HAVING distance < {$radius}
+                ORDER BY distance ASC
+                LIMIT 1";
+
+        $result = $db->query($sql);
+
+        if ($result && $row = $result->fetch_assoc()) {
+            // Build display name
+            $displayName = $row['company'] ?: trim($row['firstname'] . ' ' . $row['lastname']);
+
+            self::returnJson([
+                'success' => true,
+                'found' => true,
+                'customer' => [
+                    'id' => intval($row['id']),
+                    'customerNumber' => $row['customer_number'],
+                    'displayName' => $displayName,
+                    'company' => $row['company'],
+                    'firstname' => $row['firstname'],
+                    'lastname' => $row['lastname'],
+                    'street' => $row['street'],
+                    'zip' => $row['zip'],
+                    'city' => $row['city'],
+                    'email' => $row['email'],
+                    'phone' => $row['phone'],
+                    'distance' => round(floatval($row['distance'])),
+                ]
+            ]);
+        } else {
+            self::returnJson([
+                'success' => true,
+                'found' => false,
+                'message' => 'Kein Kunde in der Nähe gefunden'
+            ]);
+        }
+    }
+
+    /**
+     * Reverse geocode coordinates to address
+     * GET /MobileApp/Lager/ShippingNote/reverseGeocode?lat=X&lng=Y
+     */
+    public function reverseGeocodeAction() {
+        $lat = floatval($this->request->lat ?? 0);
+        $lng = floatval($this->request->lng ?? 0);
+
+        if (!$lat || !$lng) {
+            self::returnJson(['success' => false, 'message' => 'Koordinaten fehlen']);
+            return;
+        }
+
+        // Use Google Maps Geocoding API
+        $apiKey = defined('TT_GEOCODING_API_SECRET') ? TT_GEOCODING_API_SECRET : '';
+        if (!$apiKey) {
+            self::returnJson(['success' => false, 'message' => 'Google Maps API nicht konfiguriert']);
+            return;
+        }
+
+        $url = "https://maps.googleapis.com/maps/api/geocode/json?latlng={$lat},{$lng}&key={$apiKey}&language=de";
+
+        $response = @file_get_contents($url);
+        if (!$response) {
+            self::returnJson(['success' => false, 'message' => 'Geocoding fehlgeschlagen']);
+            return;
+        }
+
+        $data = json_decode($response, true);
+        if ($data['status'] !== 'OK' || empty($data['results'])) {
+            self::returnJson(['success' => false, 'message' => 'Keine Adresse gefunden']);
+            return;
+        }
+
+        // Parse address components
+        $result = $data['results'][0];
+        $components = $result['address_components'];
+
+        $street = '';
+        $streetNumber = '';
+        $zip = '';
+        $city = '';
+
+        foreach ($components as $comp) {
+            if (in_array('route', $comp['types'])) {
+                $street = $comp['long_name'];
+            }
+            if (in_array('street_number', $comp['types'])) {
+                $streetNumber = $comp['long_name'];
+            }
+            if (in_array('postal_code', $comp['types'])) {
+                $zip = $comp['long_name'];
+            }
+            if (in_array('locality', $comp['types'])) {
+                $city = $comp['long_name'];
+            }
+        }
+
+        $fullStreet = trim($street . ' ' . $streetNumber);
+
+        self::returnJson([
+            'success' => true,
+            'address' => [
+                'street' => $fullStreet,
+                'zip' => $zip,
+                'city' => $city,
+                'formatted' => $result['formatted_address'] ?? '',
+            ]
+        ]);
+    }
+
+    /**
+     * Search customers by name/company
+     * GET /MobileApp/Lager/ShippingNote/searchCustomers?query=X
+     */
+    public function searchCustomersAction() {
+        $query = trim($this->request->query ?? '');
+
+        if (strlen($query) < 1) {
+            self::returnJson(['success' => true, 'customers' => []]);
+            return;
+        }
+
+        $db = $this->db();
+
+        // Split query into words for lazy search (e.g., "fab her" matches "Fabian Herbst")
+        $words = preg_split('/\s+/', trim($query));
+        $wordConditions = [];
+
+        foreach ($words as $word) {
+            if (strlen($word) < 1) continue;
+            $escapedWord = $db->escape($word);
+            $wordConditions[] = "(company LIKE '%{$escapedWord}%'
+                       OR firstname LIKE '%{$escapedWord}%'
+                       OR lastname LIKE '%{$escapedWord}%'
+                       OR customer_number LIKE '%{$escapedWord}%')";
+        }
+
+        if (empty($wordConditions)) {
+            self::returnJson(['success' => true, 'customers' => []]);
+            return;
+        }
+
+        $whereClause = implode(' AND ', $wordConditions);
+
+        $sql = "SELECT id, customer_number, company, firstname, lastname, street, zip, city, email, phone, gps_lat, gps_long
+                FROM Address
+                WHERE customer_number > 0
+                  AND ({$whereClause})
+                ORDER BY company, lastname, firstname
+                LIMIT 20";
+
+        $result = $db->query($sql);
+        $customers = [];
+
+        while ($row = $result->fetch_assoc()) {
+            $displayName = $row['company'] ?: trim($row['firstname'] . ' ' . $row['lastname']);
+            $customers[] = [
+                'id' => intval($row['id']),
+                'customerNumber' => $row['customer_number'],
+                'displayName' => $displayName,
+                'company' => $row['company'],
+                'firstname' => $row['firstname'],
+                'lastname' => $row['lastname'],
+                'street' => $row['street'],
+                'zip' => $row['zip'],
+                'city' => $row['city'],
+                'email' => $row['email'],
+                'phone' => $row['phone'],
+                'gpsLat' => $row['gps_lat'] ? floatval($row['gps_lat']) : null,
+                'gpsLong' => $row['gps_long'] ? floatval($row['gps_long']) : null,
+            ];
+        }
+
+        self::returnJson(['success' => true, 'customers' => $customers]);
+    }
+
+    /**
+     * Search articles
+     * GET /MobileApp/Lager/ShippingNote/searchArticles?query=X
+     */
+    public function searchArticlesAction() {
+        $query = trim($this->request->query ?? '');
+
+        if (strlen($query) < 1) {
+            self::returnJson(['success' => true, 'articles' => []]);
+            return;
+        }
+
+        $db = $this->db();
+        $escapedQuery = $db->escape($query);
+
+        $sql = "SELECT id, articleNumber, title, unit
+                FROM WarehouseArticle
+                WHERE (isEndOfLife IS NULL OR isEndOfLife = 0)
+                  AND (articleNumber LIKE '%{$escapedQuery}%'
+                       OR title LIKE '%{$escapedQuery}%')
+                ORDER BY title ASC
+                LIMIT 30";
+
+        $result = $db->query($sql);
+        $articles = [];
+
+        while ($row = $result->fetch_assoc()) {
+            $articles[] = [
+                'id' => intval($row['id']),
+                'articleNumber' => $row['articleNumber'],
+                'title' => $row['title'],
+                'unit' => $row['unit'] ?? 'Stk.',
+            ];
+        }
+
+        self::returnJson(['success' => true, 'articles' => $articles]);
+    }
+
+    /**
+     * Get article by QR code or article number
+     * GET /MobileApp/Lager/ShippingNote/getArticle?code=X
+     */
+    public function getArticleAction() {
+        $code = $this->request->code ?? '';
+
+        if (!$code) {
+            self::returnJson(['success' => false, 'message' => 'Kein Code angegeben']);
+            return;
+        }
+
+        $articleId = null;
+
+        // Check for QR code format WA:ID: or WH:ID:
+        if (preg_match('/^(?:WA|WH):(\d+):/', $code, $matches)) {
+            $articleId = intval($matches[1]);
+        } else {
+            // Try to find by article number
+            $article = WarehouseArticleModel::getFirst(['articleNumber' => $code]);
+            if ($article) {
+                $articleId = $article->id;
+            }
+        }
+
+        if (!$articleId) {
+            self::returnJson(['success' => false, 'message' => 'Artikel nicht gefunden']);
+            return;
+        }
+
+        $article = WarehouseArticleModel::get($articleId);
+        if (!$article) {
+            self::returnJson(['success' => false, 'message' => 'Artikel nicht gefunden']);
+            return;
+        }
+
+        self::returnJson([
+            'success' => true,
+            'article' => [
+                'id' => $article->id,
+                'articleNumber' => $article->articleNumber,
+                'title' => $article->title,
+                'unit' => $article->unit ?? 'Stk.',
+            ]
+        ]);
+    }
+
+    /**
+     * Get user's assigned car
+     * GET /MobileApp/Lager/ShippingNote/getUserCar?userId=X
+     */
+    public function getUserCarAction() {
+        $userId = intval($this->request->userId ?? $this->user->id);
+
+        $db = $this->db();
+
+        // Get user's assigned car from TimerecordingCar (user_id is on TimerecordingCar)
+        $sql = "SELECT id, number_plate, brand, model
+                FROM TimerecordingCar
+                WHERE user_id = {$userId}
+                  AND (retired IS NULL OR retired = 0)
+                LIMIT 1";
+
+        $result = $db->query($sql);
+
+        if ($result && $row = $result->fetch_assoc()) {
+            $carName = trim(($row['brand'] ?? '') . ' ' . ($row['model'] ?? ''));
+            if (!$carName) $carName = $row['number_plate'];
+
+            self::returnJson([
+                'success' => true,
+                'car' => [
+                    'id' => intval($row['id']),
+                    'name' => $carName,
+                    'plate' => $row['number_plate'],
+                ]
+            ]);
+        } else {
+            self::returnJson([
+                'success' => true,
+                'car' => null
+            ]);
+        }
+    }
+
+    /**
+     * Get all available cars for selection
+     * GET /MobileApp/Lager/ShippingNote/getAllCars
+     */
+    public function getAllCarsAction() {
+        $db = $this->db();
+
+        $sql = "SELECT id, number_plate, brand, model
+                FROM TimerecordingCar
+                WHERE (retired IS NULL OR retired = 0)
+                ORDER BY brand, model ASC";
+
+        $result = $db->query($sql);
+        $cars = [];
+
+        while ($row = $result->fetch_assoc()) {
+            $carName = trim(($row['brand'] ?? '') . ' ' . ($row['model'] ?? ''));
+            if (!$carName) $carName = $row['number_plate'];
+
+            $cars[] = [
+                'id' => intval($row['id']),
+                'name' => $carName,
+                'plate' => $row['number_plate'],
+            ];
+        }
+
+        self::returnJson(['success' => true, 'cars' => $cars]);
+    }
+
+    /**
+     * Get hour types for selection
+     * GET /MobileApp/Lager/ShippingNote/getHourTypes
+     */
+    public function getHourTypesAction() {
+        // Hour types matching desktop modal
+        $hourTypes = [
+            ['id' => '', 'name' => 'Normal'],
+            ['id' => '50', 'name' => '+50%'],
+            ['id' => '100', 'name' => '+100%'],
+            ['id' => 'regie', 'name' => 'Regie'],
+        ];
+
+        self::returnJson(['success' => true, 'hourTypes' => $hourTypes]);
+    }
+
+    /**
+     * Calculate round-trip distance from office to coordinates
+     * GET /MobileApp/Lager/ShippingNote/calculateDistance?lat=X&lng=Y
+     */
+    public function calculateDistanceAction() {
+        $lat = floatval($this->request->lat ?? 0);
+        $lng = floatval($this->request->lng ?? 0);
+
+        if (!$lat || !$lng) {
+            self::returnJson(['success' => false, 'message' => 'Koordinaten fehlen']);
+            return;
+        }
+
+        // Use estimation on localhost for development
+        $isLocalhost = in_array($_SERVER['HTTP_HOST'] ?? '', ['localhost', '127.0.0.1']);
+
+        // Use Google Distance Matrix API for accurate driving distance
+        $apiKey = defined('TT_GEOCODING_API_SECRET') ? TT_GEOCODING_API_SECRET : '';
+        if (!$apiKey || $isLocalhost) {
+            // Fallback to straight-line distance * 1.3 (rough road factor)
+            $distance = $this->haversineDistance(self::OFFICE_LAT, self::OFFICE_LNG, $lat, $lng);
+            $kmOneWay = round($distance / 1000 * 1.3, 1);
+            $kmRoundTrip = $kmOneWay * 2;
+
+            self::returnJson([
+                'success' => true,
+                'distanceOneWay' => $kmOneWay,
+                'distanceRoundTrip' => $kmRoundTrip,
+                'estimated' => true
+            ]);
+            return;
+        }
+
+        $origin = self::OFFICE_LAT . ',' . self::OFFICE_LNG;
+        $destination = "{$lat},{$lng}";
+        $url = "https://maps.googleapis.com/maps/api/distancematrix/json?origins={$origin}&destinations={$destination}&mode=driving&key={$apiKey}";
+
+        $response = @file_get_contents($url);
+        if (!$response) {
+            self::returnJson(['success' => false, 'message' => 'Distanzberechnung fehlgeschlagen']);
+            return;
+        }
+
+        $data = json_decode($response, true);
+        if ($data['status'] !== 'OK' || empty($data['rows'][0]['elements'][0]['distance'])) {
+            self::returnJson(['success' => false, 'message' => 'Keine Route gefunden']);
+            return;
+        }
+
+        $distanceMeters = $data['rows'][0]['elements'][0]['distance']['value'];
+        $kmOneWay = round($distanceMeters / 1000, 1);
+        $kmRoundTrip = $kmOneWay * 2;
+
+        self::returnJson([
+            'success' => true,
+            'distanceOneWay' => $kmOneWay,
+            'distanceRoundTrip' => $kmRoundTrip,
+            'estimated' => false
+        ]);
+    }
+
+    /**
+     * Create new shipping note
+     * POST /MobileApp/Lager/ShippingNote/create
+     */
+    public function createAction() {
+        $postData = $this->getPostData();
+
+        // Validate required fields
+        $requiredFields = ['deliveryAddressName', 'deliveryAddressLine', 'deliveryAddressPLZ', 'deliveryAddressCity', 'note'];
+        foreach ($requiredFields as $field) {
+            if (empty($postData[$field])) {
+                self::returnJson(['success' => false, 'message' => "Feld '{$field}' ist erforderlich"]);
+                return;
+            }
+        }
+
+        // Must have at least positions OR hoursEntries
+        $positions = $postData['positions'] ?? [];
+        $hoursEntries = $postData['hoursEntries'] ?? [];
+
+        if (empty($positions) && empty($hoursEntries)) {
+            self::returnJson(['success' => false, 'message' => 'Mindestens eine Position oder Stundenbuchung erforderlich']);
+            return;
+        }
+
+        $db = $this->db();
+
+        // Prepare data
+        $data = [
+            'status' => 'new',
+            'type' => null,
+            'billingAddressId' => null,
+            'deliveryAddressName' => $db->escape($postData['deliveryAddressName']),
+            'deliveryAddressLine' => $db->escape($postData['deliveryAddressLine']),
+            'deliveryAddressPLZ' => $db->escape($postData['deliveryAddressPLZ']),
+            'deliveryAddressCity' => $db->escape($postData['deliveryAddressCity']),
+            'deliveryAddressEMail' => $db->escape($postData['deliveryAddressEMail'] ?? ''),
+            'note' => $db->escape($postData['note']),
+            'positions' => json_encode($positions),
+            'hoursEntries' => json_encode($hoursEntries),
+            'textElements' => json_encode($postData['textElements'] ?? []),
+            'metadata' => json_encode($postData['metadata'] ?? []),
+            'create' => time(),
+            'createBy' => $this->user->id,
+        ];
+
+        // Generate shipping note number
+        $shippingNoteNumber = WarehouseShippingNoteModel::generateShippingNoteNumber();
+        $data['shippingNoteNumber'] = $shippingNoteNumber;
+
+        // Build INSERT query
+        $columns = implode(', ', array_map(function($k) { return "`{$k}`"; }, array_keys($data)));
+        $values = implode(', ', array_map(function($v) {
+            return $v === null ? 'NULL' : "'{$v}'";
+        }, array_values($data)));
+
+        $db->query("INSERT INTO WarehouseShippingNote ({$columns}) VALUES ({$values})");
+        $id = $db->insert_id;
+
+        if (!$id) {
+            self::returnJson(['success' => false, 'message' => 'Fehler beim Speichern']);
+            return;
+        }
+
+        self::returnJson([
+            'success' => true,
+            'message' => 'Lieferschein erstellt',
+            'shippingNote' => [
+                'id' => $id,
+                'shippingNoteNumber' => $shippingNoteNumber,
+            ]
+        ]);
+    }
+
+    /**
+     * Sign a shipping note
+     * POST /MobileApp/Lager/ShippingNote/sign?id=X
+     */
+    public function signAction() {
+        $id = intval($this->request->id ?? 0);
+        $postData = $this->getPostData();
+
+        if (!$id) {
+            self::returnJson(['success' => false, 'message' => 'Lieferschein-ID fehlt']);
+            return;
+        }
+
+        $shippingNote = WarehouseShippingNoteModel::get($id);
+        if (!$shippingNote) {
+            self::returnJson(['success' => false, 'message' => 'Lieferschein nicht gefunden']);
+            return;
+        }
+
+        // Check if already signed
+        if (!empty($shippingNote->signature) || !empty($shippingNote->signatureName)) {
+            self::returnJson(['success' => false, 'message' => 'Bereits unterschrieben']);
+            return;
+        }
+
+        // Validate signature data
+        $signature = $postData['signature'] ?? '';
+        $signatureName = $postData['signatureName'] ?? '';
+
+        if (empty($signature) || empty($signatureName)) {
+            self::returnJson(['success' => false, 'message' => 'Unterschrift und Name erforderlich']);
+            return;
+        }
+
+        $db = $this->db();
+        $signatureEscaped = $db->escape($signature);
+        $signatureNameEscaped = $db->escape($signatureName);
+        $signatureDate = date('Y-m-d');
+
+        $db->query("UPDATE WarehouseShippingNote
+                    SET signature = '{$signatureEscaped}',
+                        signatureName = '{$signatureNameEscaped}',
+                        signatureDate = '{$signatureDate}'
+                    WHERE id = {$id}");
+
+        self::returnJson([
+            'success' => true,
+            'message' => 'Unterschrift gespeichert'
+        ]);
+    }
+
+    /**
+     * Get my unsigned shipping notes
+     * GET /MobileApp/Lager/ShippingNote/getMyShippingNotes
+     */
+    public function getMyShippingNotesAction() {
+        $onlyUnsigned = ($this->request->unsigned ?? '1') === '1';
+        $limit = intval($this->request->limit ?? 20);
+
+        $db = $this->db();
+
+        $whereClause = "createBy = {$this->user->id}";
+        if ($onlyUnsigned) {
+            $whereClause .= " AND (signature IS NULL OR signature = '')";
+        }
+
+        $sql = "SELECT id, shippingNoteNumber, status, type, deliveryAddressName, deliveryAddressLine,
+                       deliveryAddressPLZ, deliveryAddressCity, note,
+                       signature, signatureName, signatureDate, `create`
+                FROM WarehouseShippingNote
+                WHERE {$whereClause}
+                ORDER BY `create` DESC
+                LIMIT {$limit}";
+
+        $result = $db->query($sql);
+        $shippingNotes = [];
+
+        while ($row = $result->fetch_assoc()) {
+            $shippingNotes[] = [
+                'id' => intval($row['id']),
+                'shippingNoteNumber' => $row['shippingNoteNumber'],
+                'status' => $row['status'],
+                'type' => $row['type'],
+                'deliveryAddressName' => $row['deliveryAddressName'],
+                'deliveryAddressLine' => $row['deliveryAddressLine'],
+                'deliveryAddressPLZ' => $row['deliveryAddressPLZ'],
+                'deliveryAddressCity' => $row['deliveryAddressCity'],
+                'note' => $row['note'],
+                'isSigned' => !empty($row['signature']),
+                'signatureName' => $row['signatureName'],
+                'signatureDate' => $row['signatureDate'],
+                'create' => date('d.m.Y H:i', $row['create']),
+            ];
+        }
+
+        self::returnJson(['success' => true, 'shippingNotes' => $shippingNotes]);
+    }
+
+    /**
+     * Get a single shipping note by ID
+     * GET /MobileApp/Lager/ShippingNote/getShippingNote?id=X
+     */
+    public function getShippingNoteAction() {
+        $id = intval($this->request->id ?? 0);
+
+        if (!$id) {
+            self::returnJson(['success' => false, 'message' => 'ID fehlt']);
+            return;
+        }
+
+        $shippingNote = WarehouseShippingNoteModel::get($id);
+        if (!$shippingNote) {
+            self::returnJson(['success' => false, 'message' => 'Lieferschein nicht gefunden']);
+            return;
+        }
+
+        self::returnJson([
+            'success' => true,
+            'shippingNote' => [
+                'id' => intval($shippingNote->id),
+                'shippingNoteNumber' => $shippingNote->shippingNoteNumber,
+                'status' => $shippingNote->status,
+                'type' => $shippingNote->type,
+                'billingAddressId' => $shippingNote->billingAddressId,
+                'deliveryAddressName' => $shippingNote->deliveryAddressName,
+                'deliveryAddressLine' => $shippingNote->deliveryAddressLine,
+                'deliveryAddressPLZ' => $shippingNote->deliveryAddressPLZ,
+                'deliveryAddressCity' => $shippingNote->deliveryAddressCity,
+                'deliveryAddressEMail' => $shippingNote->deliveryAddressEMail,
+                'note' => $shippingNote->note,
+                'positions' => json_decode($shippingNote->positions, true) ?? [],
+                'hoursEntries' => json_decode($shippingNote->hoursEntries, true) ?? [],
+                'isSigned' => !empty($shippingNote->signature),
+                'signatureName' => $shippingNote->signatureName,
+                'signatureDate' => $shippingNote->signatureDate,
+                'create' => date('d.m.Y H:i', $shippingNote->create),
+            ]
+        ]);
+    }
+
+    /**
+     * Get shipping note types
+     * GET /MobileApp/Lager/ShippingNote/getTypes
+     */
+    public function getTypesAction() {
+        $types = [
+            ['value' => 'V', 'text' => 'Verrechnen'],
+            ['value' => 'XI', 'text' => 'Xinon Intern'],
+            ['value' => 'XH', 'text' => 'Xinon Hersteller'],
+            ['value' => 'SNOPP', 'text' => 'SNOPP'],
+            ['value' => 'ESTMK', 'text' => 'Energie Steiermark'],
+            ['value' => 'SBIDI', 'text' => 'SBIDI'],
+        ];
+
+        self::returnJson(['success' => true, 'types' => $types]);
+    }
+
+    /**
+     * Get current user info (for pre-filling forms)
+     * GET /MobileApp/Lager/ShippingNote/getCurrentUser
+     */
+    public function getCurrentUserAction() {
+        self::returnJson([
+            'success' => true,
+            'user' => [
+                'id' => $this->user->id,
+                'name' => $this->user->name,
+                'firstname' => $this->user->firstname ?? '',
+                'lastname' => $this->user->lastname ?? '',
+            ]
+        ]);
+    }
+
+    /**
+     * Search employees for multi-employee selection
+     * GET /MobileApp/Lager/ShippingNote/searchEmployees?query=X
+     */
+    public function searchEmployeesAction() {
+        $query = trim($this->request->query ?? '');
+
+        $db = $this->db();
+
+        // Base query: active workers who have TimerecordingEmployee entry (= employees)
+        $sql = "SELECT w.id, w.name, w.email
+                FROM Worker w
+                INNER JOIN TimerecordingEmployee te ON te.user_id = w.id
+                WHERE w.active = 1";
+
+        // Add search filter if query provided
+        if (strlen($query) >= 1) {
+            // Split query into words for lazy search (e.g., "fab her" matches "Fabian Herbst")
+            $words = preg_split('/\s+/', trim($query));
+            $wordConditions = [];
+
+            foreach ($words as $word) {
+                if (strlen($word) < 1) continue;
+                $escapedWord = $db->escape($word);
+                $wordConditions[] = "(w.name LIKE '%{$escapedWord}%' OR w.email LIKE '%{$escapedWord}%')";
+            }
+
+            if (!empty($wordConditions)) {
+                $sql .= " AND " . implode(' AND ', $wordConditions);
+            }
+        }
+
+        $sql .= " ORDER BY w.name ASC LIMIT 20";
+
+        $result = $db->query($sql);
+        $employees = [];
+
+        while ($row = $result->fetch_assoc()) {
+            $employees[] = [
+                'id' => intval($row['id']),
+                'name' => $row['name'],
+                'email' => $row['email'],
+            ];
+        }
+
+        self::returnJson(['success' => true, 'employees' => $employees]);
+    }
+
+    /**
+     * Helper: Calculate Haversine distance in meters
+     */
+    private function haversineDistance($lat1, $lng1, $lat2, $lng2) {
+        $earthRadius = 6371000; // meters
+
+        $dLat = deg2rad($lat2 - $lat1);
+        $dLng = deg2rad($lng2 - $lng1);
+
+        $a = sin($dLat / 2) * sin($dLat / 2) +
+             cos(deg2rad($lat1)) * cos(deg2rad($lat2)) *
+             sin($dLng / 2) * sin($dLng / 2);
+
+        $c = 2 * atan2(sqrt($a), sqrt(1 - $a));
+
+        return $earthRadius * $c;
+    }
+}
diff --git a/application/MobileApp/Modules/Workorder/Workorder/WorkorderHandler.php b/application/MobileApp/Modules/Workorder/Workorder/WorkorderHandler.php
new file mode 100644
index 000000000..06826b287
--- /dev/null
+++ b/application/MobileApp/Modules/Workorder/Workorder/WorkorderHandler.php
@@ -0,0 +1,929 @@
+<?php
+
+require_once APPDIR . 'MobileApp/Shared/MobileAppBaseHandler.php';
+
+/**
+ * Workorder (Aufträge) Handler
+ *
+ * Handles all endpoints for the Workorder module in MobileApp.
+ * API Base: /MobileApp/Workorder/Workorder/{action}
+ *
+ * Ports functionality from WorkorderCompanyController and WorkorderBaseController.
+ */
+class WorkorderHandler extends MobileAppBaseHandler {
+
+    protected $requiredPermission = 'RMLCompany';
+
+    /** @var array Status definitions for workorders */
+    protected $statusOptions = [
+        'new' => ['text' => 'Neu', 'color' => 'primary'],
+        'assigned' => ['text' => 'Zugewiesen', 'color' => 'info'],
+        'scheduled' => ['text' => 'Geplant', 'color' => 'warning'],
+        'in_progress' => ['text' => 'In Bearbeitung', 'color' => 'warning'],
+        'correction_requested' => ['text' => 'Korrektur angefordert', 'color' => 'danger'],
+        'intervention_required' => ['text' => 'Eingriff erforderlich', 'color' => 'danger'],
+        'civil_engineering_required' => ['text' => 'Tiefbau benötigt', 'color' => 'orange'],
+        'civil_engineering_completed' => ['text' => 'Tiefbau abgeschlossen', 'color' => 'success'],
+        'problem_solved' => ['text' => 'Problem gelöst', 'color' => 'success'],
+        'documented' => ['text' => 'Dokumentiert', 'color' => 'success'],
+        'completed' => ['text' => 'Abgeschlossen', 'color' => 'secondary'],
+        'charged' => ['text' => 'Verrechnet', 'color' => 'purple'],
+        'cancelled' => ['text' => 'Abgebrochen', 'color' => 'danger'],
+        'archived' => ['text' => 'Archiviert', 'color' => 'muted'],
+    ];
+
+    /**
+     * Get workorders list for the company
+     * POST /MobileApp/Workorder/Workorder/get
+     */
+    public function getAction() {
+        $postData = $this->getPostData();
+
+        $pagination = $postData['pagination'] ?? ['page' => 1, 'per_page' => 20];
+        $filters = $postData['filters'] ?? [];
+        $order = $postData['order'] ?? [];
+        $search = trim($postData['search'] ?? '');
+
+        // Get company for current user
+        $company = WorkorderCompanyModel::getFirst(['addressId' => $this->user->address_id]);
+        if (!$company) {
+            self::returnJson([
+                'success' => true,
+                'workorders' => [],
+                'pagination' => ['page' => 1, 'per_page' => $pagination['per_page'], 'total' => 0]
+            ]);
+            return;
+        }
+
+        // Build workorders query
+        $workorders = WorkorderModel::getCompanyWorkorders(
+            $filters,
+            $pagination['per_page'],
+            ($pagination['page'] - 1) * $pagination['per_page'],
+            $order,
+            $company->id,
+            $search
+        );
+
+        $totalCount = WorkorderModel::countCompanyWorkorders($filters, $company->id, $search);
+
+        // Transform for mobile app
+        $result = [];
+        foreach ($workorders as $wo) {
+            $result[] = $this->transformWorkorder($wo);
+        }
+
+        self::returnJson([
+            'success' => true,
+            'workorders' => $result,
+            'pagination' => [
+                'page' => intval($pagination['page']),
+                'per_page' => intval($pagination['per_page']),
+                'total' => $totalCount,
+                'totalPages' => ceil($totalCount / $pagination['per_page'])
+            ]
+        ]);
+    }
+
+    /**
+     * Get single workorder details
+     * GET /MobileApp/Workorder/Workorder/getWorkorder?id=X
+     */
+    public function getWorkorderAction() {
+        $id = intval($this->request->id ?? 0);
+
+        if (!$id) {
+            self::returnJson(['success' => false, 'message' => 'ID fehlt']);
+            return;
+        }
+
+        // Verify user has access
+        $company = WorkorderCompanyModel::getFirst(['addressId' => $this->user->address_id]);
+        if (!$company) {
+            self::returnJson(['success' => false, 'message' => 'Keine Berechtigung']);
+            return;
+        }
+
+        // Get workorder with full joined data
+        $workorder = $this->getWorkorderWithDetails($id, $company->id);
+        if (!$workorder) {
+            self::returnJson(['success' => false, 'message' => 'Arbeitsauftrag nicht gefunden']);
+            return;
+        }
+
+        self::returnJson([
+            'success' => true,
+            'workorder' => $this->transformWorkorder($workorder, true)
+        ]);
+    }
+
+    /**
+     * Get complete workorder detail (combined endpoint)
+     * Returns workorder, documentation, tenant config, and checklist in one request
+     * GET /MobileApp/Workorder/Workorder/getWorkorderDetail?id=X
+     */
+    public function getWorkorderDetailAction() {
+        $id = intval($this->request->id ?? 0);
+
+        if (!$id) {
+            self::returnJson(['success' => false, 'message' => 'ID fehlt']);
+            return;
+        }
+
+        // Verify user has access
+        $company = WorkorderCompanyModel::getFirst(['addressId' => $this->user->address_id]);
+        if (!$company) {
+            self::returnJson(['success' => false, 'message' => 'Keine Berechtigung']);
+            return;
+        }
+
+        // Get workorder with full joined data
+        $workorderData = $this->getWorkorderWithDetails($id, $company->id);
+        if (!$workorderData) {
+            self::returnJson(['success' => false, 'message' => 'Arbeitsauftrag nicht gefunden']);
+            return;
+        }
+
+        $workorder = $this->transformWorkorder($workorderData, true);
+
+        // Get tenant config
+        $tenantConfig = $this->getTenantConfigFromWorkorder($id);
+        $tenantConfigData = null;
+        $translationMap = [];
+
+        if ($tenantConfig) {
+            $customTypes = json_decode($tenantConfig->documentationTypes, true) ?? [];
+            $translationMap = array_merge(
+                ['civil_engineering_photo' => 'Tiefbau_Foto'],
+                array_column($customTypes, 'text', 'value')
+            );
+
+            $tenantConfigData = [
+                'documentationTypes' => $customTypes,
+                'civilEngineeringDocsRequired' => (bool)$tenantConfig->civilEngineeringDocsRequired,
+                'interventionTypes' => json_decode($tenantConfig->interventionTypes, true) ?? [],
+                'requireCableLength' => (bool)$tenantConfig->requireCableLength,
+                'requireCableType' => (bool)$tenantConfig->requireCableType,
+            ];
+        }
+
+        // Get documentation
+        $docs = WorkorderDocumentationModel::getAll(
+            ['workorderId' => $id],
+            null, 0,
+            ['key' => 'create', 'order' => 'ASC']
+        );
+
+        $typeCounts = [];
+        $responseDocs = [];
+
+        foreach ($docs as $doc) {
+            $file = new File($doc->fileId);
+            $documentTypeKey = $doc->documentType;
+            $typeCounts[$documentTypeKey] = ($typeCounts[$documentTypeKey] ?? 0) + 1;
+            $originalFilename = $file->orig_filename ?? $file->filename;
+            $extension = pathinfo($originalFilename, PATHINFO_EXTENSION);
+            $translatedType = $translationMap[$documentTypeKey] ?? $documentTypeKey;
+            $newFilename = "{$translatedType}_{$typeCounts[$documentTypeKey]}." . strtolower($extension);
+
+            $responseDocs[] = [
+                'id' => $doc->id,
+                'fileId' => $doc->fileId,
+                'fileName' => $newFilename,
+                'description' => $doc->description,
+                'documentType' => $documentTypeKey,
+                'documentTypeText' => $translationMap[$documentTypeKey] ?? $documentTypeKey,
+                'userName' => UserModel::getOne($doc->createBy)->name ?? 'Unbekannt',
+                'mimetype' => $file->mimetype ?? 'application/octet-stream',
+                'create' => $doc->create,
+                'createFormatted' => date('d.m.Y H:i', $doc->create),
+                'previewUrl' => "/File/Download/{$doc->fileId}",
+            ];
+        }
+
+        // Get journals
+        $journals = WorkorderJournalModel::getAll(
+            ['workorderId' => $id],
+            null, 0,
+            ['key' => 'create', 'order' => 'DESC']
+        );
+
+        $responseJournals = [];
+        foreach ($journals as $journal) {
+            $responseJournals[] = [
+                'id' => $journal->id,
+                'text' => $journal->text,
+                'statusChange' => $journal->statusChange ?? null,
+                'createByName' => UserModel::getOne($journal->createBy)->name ?? 'Unbekannt',
+                'create' => $journal->create,
+                'createFormatted' => date('d.m.Y H:i', $journal->create),
+            ];
+        }
+
+        // Build checklist
+        $docTypes = $tenantConfigData['documentationTypes'] ?? [];
+        $uploadedTypes = array_column((array)$docs, 'documentType');
+        $uploadedTypeCounts = array_count_values($uploadedTypes);
+
+        $checklist = [];
+        $completedCount = 0;
+
+        foreach ($docTypes as $type) {
+            $isCompleted = isset($uploadedTypeCounts[$type['value']]) && $uploadedTypeCounts[$type['value']] > 0;
+            if ($isCompleted) $completedCount++;
+
+            $checklist[] = [
+                'type' => $type['value'],
+                'text' => $type['text'],
+                'required' => $type['required'] ?? false,
+                'completed' => $isCompleted,
+                'count' => $uploadedTypeCounts[$type['value']] ?? 0,
+            ];
+        }
+
+        self::returnJson([
+            'success' => true,
+            'workorder' => $workorder,
+            'tenantConfig' => $tenantConfigData,
+            'docs' => $responseDocs,
+            'journals' => $responseJournals,
+            'checklist' => $checklist,
+            'checklistProgress' => [
+                'completed' => $completedCount,
+                'total' => count($docTypes),
+                'allRequired' => $this->allRequiredCompleted($checklist)
+            ]
+        ]);
+    }
+
+    /**
+     * Get documentation and journals for a workorder
+     * GET /MobileApp/Workorder/Workorder/getDocumentation?workorderId=X
+     */
+    public function getDocumentationAction() {
+        $workorderId = intval($this->request->workorderId ?? 0);
+
+        if (!$workorderId) {
+            self::returnJson(['success' => false, 'message' => 'Arbeitsauftrags-ID fehlt']);
+            return;
+        }
+
+        // Get documentation
+        $docs = WorkorderDocumentationModel::getAll(
+            ['workorderId' => $workorderId],
+            null, 0,
+            ['key' => 'create', 'order' => 'ASC']
+        );
+
+        // Get journals
+        $journals = WorkorderJournalModel::getAll(
+            ['workorderId' => $workorderId],
+            null, 0,
+            ['key' => 'create', 'order' => 'DESC']
+        );
+
+        // Get tenant config for type translations
+        $tenantConfig = $this->getTenantConfigFromWorkorder($workorderId);
+        $translationMap = [];
+        if ($tenantConfig && !empty($tenantConfig->documentationTypes)) {
+            $customTypes = json_decode($tenantConfig->documentationTypes, true);
+            $customMap = array_column($customTypes, 'text', 'value');
+            $translationMap = array_merge(['civil_engineering_photo' => 'Tiefbau_Foto'], $customMap);
+        }
+
+        // Transform docs
+        $responseDocs = [];
+        $typeCounts = [];
+
+        foreach ($docs as $doc) {
+            $file = new File($doc->fileId);
+            $documentTypeKey = $doc->documentType;
+            $typeCounts[$documentTypeKey] = ($typeCounts[$documentTypeKey] ?? 0) + 1;
+            $originalFilename = $file->orig_filename ?? $file->filename;
+            $extension = pathinfo($originalFilename, PATHINFO_EXTENSION);
+            $translatedType = $translationMap[$documentTypeKey] ?? $documentTypeKey;
+            $newFilename = "{$translatedType}_{$typeCounts[$documentTypeKey]}." . strtolower($extension);
+
+            $responseDocs[] = [
+                'id' => $doc->id,
+                'fileId' => $doc->fileId,
+                'fileName' => $newFilename,
+                'description' => $doc->description,
+                'documentType' => $documentTypeKey,
+                'documentTypeText' => $translationMap[$documentTypeKey] ?? $documentTypeKey,
+                'userName' => UserModel::getOne($doc->createBy)->name ?? 'Unbekannt',
+                'mimetype' => $file->mimetype ?? 'application/octet-stream',
+                'create' => $doc->create,
+                'createFormatted' => date('d.m.Y H:i', $doc->create),
+                'previewUrl' => "/File/Download/{$doc->fileId}",
+            ];
+        }
+
+        // Transform journals
+        $responseJournals = [];
+        foreach ($journals as $journal) {
+            $responseJournals[] = [
+                'id' => $journal->id,
+                'text' => $journal->text,
+                'statusChange' => $journal->statusChange ?? null,
+                'createByName' => UserModel::getOne($journal->createBy)->name ?? 'Unbekannt',
+                'create' => $journal->create,
+                'createFormatted' => date('d.m.Y H:i', $journal->create),
+            ];
+        }
+
+        self::returnJson([
+            'success' => true,
+            'docs' => $responseDocs,
+            'journals' => $responseJournals,
+            'docCount' => count($responseDocs),
+            'journalCount' => count($responseJournals)
+        ]);
+    }
+
+    /**
+     * Get tenant configuration
+     * GET /MobileApp/Workorder/Workorder/getTenantConfig?workorderId=X
+     */
+    public function getTenantConfigAction() {
+        $workorderId = intval($this->request->workorderId ?? 0);
+
+        $tenantConfig = $this->getTenantConfigFromWorkorder($workorderId);
+
+        if (!$tenantConfig) {
+            self::returnJson(['success' => false, 'message' => 'Keine Mandantenkonfiguration gefunden']);
+            return;
+        }
+
+        self::returnJson([
+            'success' => true,
+            'documentationTypes' => json_decode($tenantConfig->documentationTypes, true) ?? [],
+            'civilEngineeringDocsRequired' => (bool)$tenantConfig->civilEngineeringDocsRequired,
+            'interventionTypes' => json_decode($tenantConfig->interventionTypes, true) ?? [],
+            'requireCableLength' => (bool)$tenantConfig->requireCableLength,
+            'requireCableType' => (bool)$tenantConfig->requireCableType,
+        ]);
+    }
+
+    /**
+     * Upload documentation files
+     * POST /MobileApp/Workorder/Workorder/uploadDocumentation
+     */
+    public function uploadDocumentationAction() {
+        if (empty($_FILES['files']) && empty($_FILES['file'])) {
+            self::returnJson(['success' => false, 'message' => 'Keine Datei hochgeladen']);
+            return;
+        }
+
+        $workorderId = intval($_POST['workorderId'] ?? 0);
+        if (!$workorderId) {
+            self::returnJson(['success' => false, 'message' => 'Arbeitsauftrags-ID fehlt']);
+            return;
+        }
+
+        $documentType = $_POST['documentType'] ?? 'general';
+        $description = $_POST['description'] ?? '';
+
+        // Handle both single file and multiple files
+        if (!empty($_FILES['files'])) {
+            foreach ($_FILES['files']['name'] as $index => $name) {
+                if ($_FILES['files']['error'][$index] === UPLOAD_ERR_OK) {
+                    $_FILES['file'] = [
+                        'name' => $name,
+                        'type' => $_FILES['files']['type'][$index],
+                        'tmp_name' => $_FILES['files']['tmp_name'][$index],
+                        'error' => $_FILES['files']['error'][$index],
+                        'size' => $_FILES['files']['size'][$index]
+                    ];
+                    $this->saveDocumentation($workorderId, $documentType, $description);
+                }
+            }
+        } else if (!empty($_FILES['file'])) {
+            $this->saveDocumentation($workorderId, $documentType, $description);
+        }
+
+        // Update workorder status if needed
+        $workorder = WorkorderModel::get($workorderId);
+        $oldStatus = $workorder->status;
+        $newStatus = null;
+
+        if (in_array($oldStatus, ['assigned', 'scheduled'])) {
+            $newStatus = 'in_progress';
+        } else if (in_array($oldStatus, ['correction_requested', 'problem_solved', 'civil_engineering_completed'])) {
+            $newStatus = 'assigned';
+        }
+
+        if ($newStatus) {
+            $workorder->status = $newStatus;
+            WorkorderModel::update((array)$workorder);
+
+            WorkorderJournalModel::create([
+                'workorderId' => $workorder->id,
+                'text' => 'Status wurde nach Dokumenten-Upload automatisch geändert.',
+                'statusChange' => $this->getStatusText($oldStatus) . " -> " . $this->getStatusText($newStatus),
+                'create' => time(),
+                'createBy' => $this->user->id,
+            ]);
+        }
+
+        self::returnJson(['success' => true, 'message' => 'Datei(en) erfolgreich hochgeladen']);
+    }
+
+    /**
+     * Delete documentation
+     * POST /MobileApp/Workorder/Workorder/deleteDocumentation
+     */
+    public function deleteDocumentationAction() {
+        $postData = $this->getPostData();
+        $id = intval($postData['id'] ?? 0);
+
+        if (!$id) {
+            self::returnJson(['success' => false, 'message' => 'Dokumenten-ID fehlt']);
+            return;
+        }
+
+        WorkorderDocumentationModel::delete($id);
+        self::returnJson(['success' => true, 'message' => 'Dokument gelöscht']);
+    }
+
+    /**
+     * Add journal entry
+     * POST /MobileApp/Workorder/Workorder/addJournal
+     */
+    public function addJournalAction() {
+        $postData = $this->getPostData();
+        $workorderId = intval($postData['workorderId'] ?? 0);
+        $text = trim($postData['text'] ?? '');
+
+        if (!$workorderId || !$text) {
+            self::returnJson(['success' => false, 'message' => 'Arbeitsauftrags-ID und Text sind erforderlich']);
+            return;
+        }
+
+        WorkorderJournalModel::create([
+            'workorderId' => $workorderId,
+            'text' => $text,
+            'createBy' => $this->user->id,
+            'create' => time()
+        ]);
+
+        // Return updated journals
+        $journals = WorkorderJournalModel::getAll(
+            ['workorderId' => $workorderId],
+            null, 0,
+            ['key' => 'create', 'order' => 'DESC']
+        );
+
+        $responseJournals = [];
+        foreach ($journals as $journal) {
+            $responseJournals[] = [
+                'id' => $journal->id,
+                'text' => $journal->text,
+                'statusChange' => $journal->statusChange ?? null,
+                'createByName' => UserModel::getOne($journal->createBy)->name ?? 'Unbekannt',
+                'create' => $journal->create,
+                'createFormatted' => date('d.m.Y H:i', $journal->create),
+            ];
+        }
+
+        self::returnJson([
+            'success' => true,
+            'message' => 'Journaleintrag hinzugefügt',
+            'journals' => $responseJournals
+        ]);
+    }
+
+    /**
+     * Update additional info (notes)
+     * POST /MobileApp/Workorder/Workorder/updateAdditionalInfo
+     */
+    public function updateAdditionalInfoAction() {
+        $postData = $this->getPostData();
+        $workorderId = intval($postData['workorderId'] ?? 0);
+
+        if (!$workorderId) {
+            self::returnJson(['success' => false, 'message' => 'Arbeitsauftrags-ID fehlt']);
+            return;
+        }
+
+        $workorder = WorkorderModel::get($workorderId);
+        if (!$workorder) {
+            self::returnJson(['success' => false, 'message' => 'Arbeitsauftrag nicht gefunden']);
+            return;
+        }
+
+        $oldInfo = $workorder->additionalInfo;
+        $newInfo = $postData['additionalInfo'] ?? null;
+        $workorder->additionalInfo = $newInfo;
+        WorkorderModel::update((array)$workorder);
+
+        WorkorderJournalModel::create([
+            'workorderId' => $workorder->id,
+            'text' => "Zusatzinfo geändert.\nAlt: '{$oldInfo}'\nNeu: '{$newInfo}'",
+            'create' => time(),
+            'createBy' => $this->user->id,
+        ]);
+
+        self::returnJson([
+            'success' => true,
+            'message' => 'Zusatzinfo aktualisiert',
+            'newInfo' => $newInfo
+        ]);
+    }
+
+    /**
+     * Schedule appointment
+     * POST /MobileApp/Workorder/Workorder/scheduleAppointment
+     */
+    public function scheduleAppointmentAction() {
+        $postData = $this->getPostData();
+        $workorderId = intval($postData['workorderId'] ?? 0);
+        $appointmentDate = intval($postData['appointmentDate'] ?? 0);
+
+        if (!$workorderId || !$appointmentDate) {
+            self::returnJson(['success' => false, 'message' => 'Erforderliche Felder fehlen']);
+            return;
+        }
+
+        $workorder = WorkorderModel::get($workorderId);
+        if (!$workorder) {
+            self::returnJson(['success' => false, 'message' => 'Arbeitsauftrag nicht gefunden']);
+            return;
+        }
+
+        // Validate time is set
+        $hour = (int)date('H', $appointmentDate);
+        if ($hour >= 23 || $hour < 1) {
+            self::returnJson(['success' => false, 'message' => 'Bitte geben Sie eine Uhrzeit an']);
+            return;
+        }
+
+        $workorder->appointmentDate = $appointmentDate;
+        $workorder->status = 'scheduled';
+        WorkorderModel::update((array)$workorder);
+
+        WorkorderJournalModel::create([
+            'workorderId' => $workorder->id,
+            'text' => 'Termin festgelegt auf: ' . date('d.m.Y H:i', $appointmentDate),
+            'create' => time(),
+            'createBy' => $this->user->id,
+        ]);
+
+        self::returnJson(['success' => true, 'message' => 'Termin erfolgreich gespeichert']);
+    }
+
+    /**
+     * Request intervention (report problem)
+     * POST /MobileApp/Workorder/Workorder/requestIntervention
+     */
+    public function requestInterventionAction() {
+        $postData = $this->getPostData();
+        $workorderId = intval($postData['workorderId'] ?? 0);
+        $journalText = trim($postData['journalText'] ?? '');
+        $interventionType = $postData['interventionType'] ?? '';
+
+        if (!$workorderId || !$journalText) {
+            self::returnJson(['success' => false, 'message' => 'Erforderliche Felder fehlen']);
+            return;
+        }
+
+        $workorder = WorkorderModel::get($workorderId);
+        if (!$workorder) {
+            self::returnJson(['success' => false, 'message' => 'Arbeitsauftrag nicht gefunden']);
+            return;
+        }
+
+        $oldStatus = $workorder->status;
+        $workorder->status = 'intervention_required';
+        WorkorderModel::update((array)$workorder);
+
+        $fullText = $interventionType ? "{$interventionType}: {$journalText}" : "Eingriff erforderlich: {$journalText}";
+
+        WorkorderJournalModel::create([
+            'workorderId' => $workorder->id,
+            'text' => $fullText,
+            'statusChange' => $this->getStatusText($oldStatus) . " -> " . $this->getStatusText('intervention_required'),
+            'create' => time(),
+            'createBy' => $this->user->id,
+        ]);
+
+        self::returnJson(['success' => true, 'message' => 'Eingriff wurde angefordert']);
+    }
+
+    /**
+     * Complete workorder
+     * POST /MobileApp/Workorder/Workorder/completeWorkorder
+     */
+    public function completeWorkorderAction() {
+        $postData = $this->getPostData();
+        $workorderId = intval($postData['workorderId'] ?? 0);
+
+        if (!$workorderId) {
+            self::returnJson(['success' => false, 'message' => 'Arbeitsauftrags-ID fehlt']);
+            return;
+        }
+
+        $workorder = WorkorderModel::get($workorderId);
+        if (!$workorder) {
+            self::returnJson(['success' => false, 'message' => 'Arbeitsauftrag nicht gefunden']);
+            return;
+        }
+
+        // Validate cable data if required
+        $tenantConfig = $this->getTenantConfigFromWorkorder($workorderId);
+        if ($tenantConfig) {
+            if ($tenantConfig->requireCableLength && empty(trim($workorder->cableLength))) {
+                self::returnJson(['success' => false, 'message' => 'Bitte geben Sie die Kabellänge an']);
+                return;
+            }
+            if ($tenantConfig->requireCableType && empty(trim($workorder->cableType))) {
+                self::returnJson(['success' => false, 'message' => 'Bitte geben Sie den Kabeltyp an']);
+                return;
+            }
+        }
+
+        $oldStatus = $workorder->status;
+        $workorder->status = 'documented';
+        WorkorderModel::update((array)$workorder);
+
+        WorkorderJournalModel::create([
+            'workorderId' => $workorder->id,
+            'text' => 'Arbeitsauftrag zur Prüfung eingereicht.',
+            'statusChange' => $this->getStatusText($oldStatus) . " -> " . $this->getStatusText('documented'),
+            'create' => time(),
+            'createBy' => $this->user->id,
+        ]);
+
+        self::returnJson(['success' => true, 'message' => 'Arbeitsauftrag zur Prüfung eingereicht']);
+    }
+
+    /**
+     * Update workorder data (cable info)
+     * POST /MobileApp/Workorder/Workorder/updateWorkorderData
+     */
+    public function updateWorkorderDataAction() {
+        $postData = $this->getPostData();
+        $workorderId = intval($postData['workorderId'] ?? 0);
+
+        if (!$workorderId) {
+            self::returnJson(['success' => false, 'message' => 'Arbeitsauftrags-ID fehlt']);
+            return;
+        }
+
+        $workorder = WorkorderModel::get($workorderId);
+        if (!$workorder) {
+            self::returnJson(['success' => false, 'message' => 'Arbeitsauftrag nicht gefunden']);
+            return;
+        }
+
+        $journalText = "Zusatzdaten aktualisiert:\n";
+        $changed = false;
+
+        if (isset($postData['cableLength'])) {
+            if ($workorder->cableLength != $postData['cableLength']) {
+                $journalText .= "Kabellänge: '{$workorder->cableLength}' -> '{$postData['cableLength']}'\n";
+                $workorder->cableLength = $postData['cableLength'];
+                $changed = true;
+            }
+        }
+
+        if (isset($postData['cableType'])) {
+            if ($workorder->cableType != $postData['cableType']) {
+                $journalText .= "Kabeltyp: '{$workorder->cableType}' -> '{$postData['cableType']}'\n";
+                $workorder->cableType = $postData['cableType'];
+                $changed = true;
+            }
+        }
+
+        if (!$changed) {
+            self::returnJson(['success' => true, 'message' => 'Keine Änderungen vorgenommen']);
+            return;
+        }
+
+        WorkorderModel::update((array)$workorder);
+
+        WorkorderJournalModel::create([
+            'workorderId' => $workorder->id,
+            'text' => $journalText,
+            'create' => time(),
+            'createBy' => $this->user->id,
+        ]);
+
+        self::returnJson(['success' => true, 'message' => 'Daten gespeichert']);
+    }
+
+    /**
+     * Get checklist status for a workorder
+     * GET /MobileApp/Workorder/Workorder/getChecklist?workorderId=X
+     */
+    public function getChecklistAction() {
+        $workorderId = intval($this->request->workorderId ?? 0);
+
+        if (!$workorderId) {
+            self::returnJson(['success' => false, 'message' => 'Arbeitsauftrags-ID fehlt']);
+            return;
+        }
+
+        // Get tenant config for required doc types
+        $tenantConfig = $this->getTenantConfigFromWorkorder($workorderId);
+        $docTypes = $tenantConfig ? json_decode($tenantConfig->documentationTypes, true) : [];
+
+        // Get existing documentation
+        $docs = WorkorderDocumentationModel::getAll(['workorderId' => $workorderId]);
+        $uploadedTypes = array_column((array)$docs, 'documentType');
+        $uploadedTypeCounts = array_count_values($uploadedTypes);
+
+        // Build checklist
+        $checklist = [];
+        $completedCount = 0;
+
+        foreach ($docTypes as $type) {
+            $isCompleted = isset($uploadedTypeCounts[$type['value']]) && $uploadedTypeCounts[$type['value']] > 0;
+            if ($isCompleted) $completedCount++;
+
+            $checklist[] = [
+                'type' => $type['value'],
+                'text' => $type['text'],
+                'required' => $type['required'] ?? false,
+                'completed' => $isCompleted,
+                'count' => $uploadedTypeCounts[$type['value']] ?? 0,
+            ];
+        }
+
+        self::returnJson([
+            'success' => true,
+            'checklist' => $checklist,
+            'completed' => $completedCount,
+            'total' => count($docTypes),
+            'allRequired' => $this->allRequiredCompleted($checklist)
+        ]);
+    }
+
+    // =====================
+    // HELPER METHODS
+    // =====================
+
+    /**
+     * Transform workorder for API response
+     * @param array|object $wo Workorder data (can be array or object from getCompanyWorkorders)
+     * @param bool $detailed Include full customer details
+     */
+    private function transformWorkorder($wo, $detailed = false) {
+        // Handle both array and object formats
+        $isArray = is_array($wo);
+        $get = function($key, $default = null) use ($wo, $isArray) {
+            if ($isArray) {
+                return $wo[$key] ?? $default;
+            }
+            return $wo->$key ?? $default;
+        };
+
+        // Customer name: use company if available, else customerName (firstname lastname)
+        $customerCompany = $get('customerCompany', '');
+        $customerName = $customerCompany ?: $get('customerName', '');
+
+        // Build address from the joined data
+        $street = $get('street', '');
+        $hausnummer = $get('hausnummer', '');
+        $plz = $get('plz', '');
+        $city = $get('city', '');
+        $customerAddress = trim("{$street} {$hausnummer}, {$plz} {$city}", ', ');
+
+        $status = $get('status');
+        $appointmentDate = $get('appointmentDate');
+        $deadlineDate = $get('deadlineDate');
+        $cableType = $get('cableType', '');
+        $cableLength = $get('cableLength', '');
+
+        $result = [
+            'id' => intval($get('id', 0)),
+            'fcpName' => $get('rimo_fcp_name', ''),
+            'oaid' => $get('oaid', ''),
+            'status' => $status,
+            'statusText' => $this->statusOptions[$status]['text'] ?? $status,
+            'statusColor' => $this->statusOptions[$status]['color'] ?? 'secondary',
+            'customerName' => $customerName,
+            'customerAddress' => $customerAddress,
+            'additionalInfo' => $get('additionalInfo', ''),
+            'appointmentDate' => $appointmentDate ? intval($appointmentDate) : null,
+            'appointmentFormatted' => $appointmentDate ? date('d.m.Y H:i', $appointmentDate) : null,
+            'deadlineDate' => $deadlineDate ? intval($deadlineDate) : null,
+            'deadlineFormatted' => $deadlineDate ? date('d.m.Y', $deadlineDate) : null,
+            'cableType' => $cableType,
+            'cableLength' => $cableLength,
+            'hasCableFlag' => !empty($cableType) || !empty($cableLength),
+        ];
+
+        // For detailed view (single workorder), include customer contact info
+        if ($detailed) {
+            $result['customer'] = [
+                'id' => intval($get('id', 0)),
+                'name' => $customerName,
+                'street' => trim("{$street} {$hausnummer}"),
+                'zip' => $plz,
+                'city' => $city,
+                'phone' => $get('phone', ''),
+                'email' => $get('email', ''),
+                'gpsLat' => null, // Not available in this query
+                'gpsLng' => null,
+            ];
+
+            $result['campaign'] = $get('networkOwnerName', '');
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get status display text
+     */
+    private function getStatusText($statusKey) {
+        return $this->statusOptions[$statusKey]['text'] ?? ucfirst(str_replace('_', ' ', $statusKey));
+    }
+
+    /**
+     * Get tenant config from workorder
+     */
+    private function getTenantConfigFromWorkorder($workorderId) {
+        if (!$workorderId) return null;
+
+        $workorder = WorkorderModel::get($workorderId);
+        if (!$workorder) return null;
+
+        $preorder = new Preorder($workorder->preorderId);
+        if (!$preorder->id) return null;
+
+        $campaign = new Preordercampaign($preorder->preordercampaign_id);
+        if (!$campaign->id) return null;
+
+        $network = NetworkModel::getOne($campaign->network_id);
+        if (!$network) return null;
+
+        return WorkorderTenantConfigModel::getFirst(['addressId' => $network->owner_id]);
+    }
+
+    /**
+     * Save documentation file
+     */
+    private function saveDocumentation($workorderId, $documentType, $description) {
+        try {
+            $uploaded = mfUpload::handleFormUpload("file", false, "/Workorder");
+            WorkorderDocumentationModel::create([
+                'workorderId' => $workorderId,
+                'fileId' => $uploaded->id,
+                'description' => $description,
+                'documentType' => $documentType,
+                'create' => time(),
+                'createBy' => $this->user->id
+            ]);
+        } catch (Exception $e) {
+            // Log error if necessary
+        }
+    }
+
+    /**
+     * Check if all required checklist items are completed
+     */
+    private function allRequiredCompleted($checklist) {
+        foreach ($checklist as $item) {
+            if ($item['required'] && !$item['completed']) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Get single workorder with full joined data (same structure as getCompanyWorkorders)
+     */
+    private function getWorkorderWithDetails($workorderId, $companyId) {
+        $db = $this->db();
+        $fronkDbName = FRONKDB_DBNAME;
+        $addressDbName = defined('ADDRESSDB_DBNAME') ? ADDRESSDB_DBNAME : 'addressdb';
+
+        $sql = "
+            SELECT w.id, w.status, w.deadlineDate, w.appointmentDate, w.additionalInfo,
+                   w.cableType, w.cableLength, hn.rimo_fcp_name,
+                   owner_addr.company as networkOwnerName, p.preordercampaign_id,
+                   CONCAT_WS(' ', p.firstname, p.lastname) as customerName, p.company as customerCompany, p.oaid,
+                   p.phone, p.email, str.name as street, hn.hausnummer, hn.stiege, we.bezeichner as apartment,
+                   plz.plz, ort.name as city
+            FROM `{$fronkDbName}`.`Workorder` w
+            JOIN `{$fronkDbName}`.`Preorder` p ON w.preorderId = p.id
+            LEFT JOIN `{$fronkDbName}`.`Preordercampaign` pc ON p.preordercampaign_id = pc.id
+            LEFT JOIN `{$fronkDbName}`.`Network` n ON pc.network_id = n.id
+            LEFT JOIN `{$fronkDbName}`.`Address` owner_addr ON n.owner_id = owner_addr.id
+            LEFT JOIN `{$addressDbName}`.`Hausnummer` hn ON p.adb_hausnummer_id = hn.id
+            LEFT JOIN `{$addressDbName}`.`Strasse` str ON hn.strasse_id = str.id
+            LEFT JOIN `{$addressDbName}`.`Plz` plz ON hn.plz_id = plz.id
+            LEFT JOIN `{$addressDbName}`.`Ortschaft` ort ON hn.ortschaft_id = ort.id
+            LEFT JOIN `{$addressDbName}`.`Wohneinheit` we ON p.adb_wohneinheit_id = we.id
+            WHERE w.id = " . intval($workorderId) . "
+              AND w.companyId = " . intval($companyId) . "
+            LIMIT 1
+        ";
+
+        $result = $db->query($sql);
+        return $result ? $result->fetch_assoc() : null;
+    }
+}
diff --git a/application/WarehouseMovement/WarehouseMovementController.php b/application/WarehouseMovement/WarehouseMovementController.php
index df04de7a9..f8e6711f2 100644
--- a/application/WarehouseMovement/WarehouseMovementController.php
+++ b/application/WarehouseMovement/WarehouseMovementController.php
@@ -184,34 +184,21 @@ class WarehouseMovementController extends TTCrud {
     }
 
     protected function formatRow($row) {
-        // Format movement type with badge
-        $typeLabels = [
-            'IN' => '<span class="badge bg-success">Einbuchung</span>',
-            'OUT' => '<span class="badge bg-danger">Ausbuchung</span>',
-            'ADJUSTMENT' => '<span class="badge bg-warning">Korrektur</span>',
-        ];
-        $row['movementType'] = $typeLabels[$row['movementType']] ?? $row['movementType'];
+        $rawType = $row['movementType'];
 
-        // Format article
         if (!empty($row['articleId'])) {
-            $article = ArticleModel::get($row['articleId']);
+            $article = WarehouseArticleModel::get($row['articleId']);
             if ($article) {
                 $row['articleId'] = "<strong>{$article->articleNumber}</strong><br><small class='text-muted'>{$article->title}</small>";
             }
         }
 
-        // Format quantities
         $row['quantityBefore'] = $row['quantityBefore'] !== null ? number_format((float)$row['quantityBefore'], 2, ',', '.') : '-';
         $row['quantityAfter'] = $row['quantityAfter'] !== null ? number_format((float)$row['quantityAfter'], 2, ',', '.') : '-';
         $row['quantity'] = number_format((float)$row['quantity'], 2, ',', '.');
 
-        // Format reason category
-        $row['reasonCategory'] = WarehouseMovementModel::getReasonCategories()[$row['movementType']][$row['reasonCategory']] ?? $row['reasonCategory'];
-
-        // Format create date
-        if (!empty($row['create'])) {
-            $row['create'] = date('d.m.Y H:i', $row['create']);
-        }
+        $allCategories = WarehouseMovementModel::getReasonCategories();
+        $row['reasonCategory'] = $allCategories[$rawType][$row['reasonCategory']] ?? $row['reasonCategory'];
 
         return $row;
     }
diff --git a/application/WarehouseMovement/WarehouseMovementModel.php b/application/WarehouseMovement/WarehouseMovementModel.php
index 23cfd4407..fa069a20e 100644
--- a/application/WarehouseMovement/WarehouseMovementModel.php
+++ b/application/WarehouseMovement/WarehouseMovementModel.php
@@ -12,16 +12,14 @@ class WarehouseMovementModel extends TTCrudBaseModel {
     public ?float $quantityAfter = null;
     public string $reasonCategory;
     public ?string $note = null;
+    public ?int $linkedOrderId = null;
     public int $userId;
     public int $createBy;
     public int $create;
 
-    /**
-     * Generate next movement number (WM-YYYY-X000001)
-     */
     public static function generateMovementNumber(): string {
         $year = date('Y');
-        $prefix = "WM-{$year}-X";
+        $prefix = "LB{$year}-X";
 
         $db = FronkDB::singleton();
         $result = $db->query("SELECT movementNumber FROM WarehouseMovement
@@ -85,11 +83,8 @@ class WarehouseMovementModel extends TTCrudBaseModel {
         ];
     }
 
-    /**
-     * Get article object
-     */
-    public function getArticle(): ?ArticleModel {
-        return ArticleModel::get($this->articleId);
+    public function getArticle(): ?WarehouseArticleModel {
+        return WarehouseArticleModel::get($this->articleId);
     }
 
     /**
@@ -114,6 +109,14 @@ class WarehouseMovementModel extends TTCrudBaseModel {
         return WarehouseItemModel::get($this->warehouseItemId);
     }
 
+    /**
+     * Get linked order if this movement was created from an order delivery
+     */
+    public function getLinkedOrder(): ?WarehouseOrderModel {
+        if (!$this->linkedOrderId) return null;
+        return WarehouseOrderModel::get($this->linkedOrderId);
+    }
+
     /**
      * Get formatted movement type label
      */
diff --git a/application/WarehouseOrder/WarehouseOrderController.php b/application/WarehouseOrder/WarehouseOrderController.php
index 0e4d9d939..dc486fcfe 100644
--- a/application/WarehouseOrder/WarehouseOrderController.php
+++ b/application/WarehouseOrder/WarehouseOrderController.php
@@ -406,9 +406,72 @@ $appendToBody
         ];
 
         try {
+            $createdMovementIds = [];
+
+            // Create warehouse movements for delivery statuses
+            if (in_array($postData['status'], ['partiallyDelivered', 'fullyDelivered'])
+                && isset($postData['deliveryData']) && is_array($postData['deliveryData'])) {
+
+                // Get location ID from request or use default (K1 Fladnitz 150)
+                $locationId = intval($postData['locationId'] ?? 0);
+                if ($locationId <= 0) {
+                    // Default to K1 Fladnitz 150
+                    $allLocations = WarehouseLocationModel::getAll();
+                    $defaultLocation = null;
+                    foreach ($allLocations as $loc) {
+                        if ($loc->title === 'K1 Fladnitz 150') {
+                            $defaultLocation = $loc;
+                            break;
+                        }
+                    }
+                    $locationId = $defaultLocation ? $defaultLocation->id : 1;
+                }
+
+                // Prepare delivery data with articleId from order positions
+                $positions = json_decode($order->positions, true) ?: [];
+                $deliveryDataWithArticleIds = [];
+
+                foreach ($postData['deliveryData'] as $index => $delivery) {
+                    if (isset($positions[$index])) {
+                        $delivery['articleId'] = $positions[$index]['article'];
+                    }
+                    $deliveryDataWithArticleIds[] = $delivery;
+                }
+
+                $createdMovementIds = $this->createMovementsForDelivery(
+                    intval($postData['orderId']),
+                    $deliveryDataWithArticleIds,
+                    $locationId
+                );
+
+                if (!empty($createdMovementIds)) {
+                    // Update order with linked movement IDs
+                    $existingMovementIds = $order->linkedMovementIds
+                        ? json_decode($order->linkedMovementIds, true) : [];
+                    $allMovementIds = array_merge($existingMovementIds, $createdMovementIds);
+                    $orderAsArray['linkedMovementIds'] = json_encode($allMovementIds);
+
+                    // Add movement info to log message
+                    $fullLogMessage .= ($fullLogMessage ? "\n\n" : "") .
+                        count($createdMovementIds) . " Lagerbewegung(en) erstellt.";
+                    $log['message'] = trim($fullLogMessage);
+                }
+            }
+
+            // Store delivery note file IDs
+            if (!empty($postData['deliveryNoteFileIds'])) {
+                $existingFileIds = $order->deliveryNoteFileIds
+                    ? json_decode($order->deliveryNoteFileIds, true) : [];
+                $allFileIds = array_merge($existingFileIds, $postData['deliveryNoteFileIds']);
+                $orderAsArray['deliveryNoteFileIds'] = json_encode($allFileIds);
+            }
+
             if ($postData['status'] !== 'noChanges') {
                 $orderAsArray['status'] = $postData['status'];
                 WarehouseOrderModel::update($orderAsArray);
+            } elseif (!empty($orderAsArray['linkedMovementIds']) || !empty($orderAsArray['deliveryNoteFileIds'])) {
+                // Update even if status didn't change but we added linked data
+                WarehouseOrderModel::update($orderAsArray);
             }
 
             // Only create a log entry if there's actually something to log
@@ -416,7 +479,11 @@ $appendToBody
                 WarehouseLogModel::create($log);
             }
 
-            self::returnJson(['success' => true, 'message' => 'Log entry created']);
+            self::returnJson([
+                'success' => true,
+                'message' => 'Log entry created',
+                'createdMovementIds' => $createdMovementIds
+            ]);
         } catch (Exception $e) {
             self::returnJson(['error' => 'Error creating log entry: ' . $e->getMessage()]);
         }
@@ -485,6 +552,107 @@ $appendToBody
         }
     }
 
+    protected function createMovementsForDelivery(int $orderId, array $deliveryData, int $locationId): array {
+        $order = WarehouseOrderModel::get($orderId);
+        $createdMovementIds = [];
 
+        foreach ($deliveryData as $delivery) {
+            $deliveredAmount = floatval($delivery['amount']);
+            $articleId = intval($delivery['articleId']);
+
+            // Only create movements for items actually delivered
+            if ($deliveredAmount <= 0 || $articleId <= 0) {
+                continue;
+            }
+
+            // Find or create WarehouseItem for article + location
+            $existingItems = WarehouseItemModel::getAll([
+                'articleId' => $articleId,
+                'warehouseLocationId' => $locationId
+            ]);
+            $warehouseItem = count($existingItems) > 0 ? $existingItems[0] : null;
+
+            if (!$warehouseItem) {
+                // Create new warehouse item with zero quantity
+                $warehouseItemId = WarehouseItemModel::create([
+                    'articleId' => $articleId,
+                    'warehouseLocationId' => $locationId,
+                    'quantity' => 0
+                ]);
+                $warehouseItem = WarehouseItemModel::get($warehouseItemId);
+            }
+
+            $quantityBefore = $warehouseItem->quantity;
+            $quantityAfter = $quantityBefore + $deliveredAmount;
+
+            // Create warehouse movement
+            $movementData = [
+                'movementNumber' => WarehouseMovementModel::generateMovementNumber(),
+                'movementType' => 'IN',
+                'articleId' => $articleId,
+                'warehouseLocationId' => $locationId,
+                'warehouseItemId' => $warehouseItem->id,
+                'quantity' => $deliveredAmount,
+                'quantityBefore' => $quantityBefore,
+                'quantityAfter' => $quantityAfter,
+                'reasonCategory' => 'Warenlieferung',
+                'linkedOrderId' => $orderId,
+                'note' => "Lagereingang aus Bestellung {$order->orderNumber}",
+                'userId' => $this->user->id,
+                'createBy' => $this->user->id,
+                'create' => time()
+            ];
+
+            $movementId = WarehouseMovementModel::create($movementData);
+            $createdMovementIds[] = $movementId;
+
+            // Update warehouse item quantity
+            $warehouseItem->quantity = $quantityAfter;
+            WarehouseItemModel::update((array)$warehouseItem);
+        }
+
+        return $createdMovementIds;
+    }
+
+    protected function getLinkedMovementsAction() {
+        $orderId = $this->request->orderId;
+        if (empty($orderId)) {
+            self::returnJson(['error' => 'Order ID is required']);
+            return;
+        }
+
+        $order = WarehouseOrderModel::get($orderId);
+        $linkedMovementIds = $order->linkedMovementIds ? json_decode($order->linkedMovementIds, true) : [];
+
+        $movements = [];
+        foreach ($linkedMovementIds as $movementId) {
+            $movement = WarehouseMovementModel::get($movementId);
+            if ($movement) {
+                $article = $movement->getArticle();
+                $location = $movement->getLocation();
+                $movements[] = [
+                    'id' => $movement->id,
+                    'movementNumber' => $movement->movementNumber,
+                    'quantity' => $movement->quantity,
+                    'articleName' => $article ? $article->title : 'Unbekannt',
+                    'locationName' => $location ? $location->title : 'Unbekannt',
+                    'create' => $movement->create
+                ];
+            }
+        }
+
+        self::returnJson($movements);
+    }
+
+    protected function getLocationsAction() {
+        $locations = WarehouseLocationModel::getAll();
+        $result = array_map(function($loc) {
+            return [
+                'value' => $loc->id,
+                'text' => $loc->title
+            ];
+        }, $locations);
+        self::returnJson($result);
+    }
 
 }
\ No newline at end of file
diff --git a/application/WarehouseOrder/WarehouseOrderModel.php b/application/WarehouseOrder/WarehouseOrderModel.php
index 4e14082c7..237f55ca2 100644
--- a/application/WarehouseOrder/WarehouseOrderModel.php
+++ b/application/WarehouseOrder/WarehouseOrderModel.php
@@ -32,6 +32,8 @@ class WarehouseOrderModel extends TTCrudBaseModel {
     public string $delAddrPLZ;
     public int $editor;
     public ?string $note;
+    public ?string $linkedMovementIds = null;
+    public ?string $deliveryNoteFileIds = null;
     public string $positions;
     public ?int $sendShippingNote;
     public int $create;
diff --git a/application/WarehouseShippingNote/WarehouseShippingNoteController.php b/application/WarehouseShippingNote/WarehouseShippingNoteController.php
index 02b07ee85..448e6ab12 100644
--- a/application/WarehouseShippingNote/WarehouseShippingNoteController.php
+++ b/application/WarehouseShippingNote/WarehouseShippingNoteController.php
@@ -6,7 +6,7 @@ class WarehouseShippingNoteController extends TTCrud {
 
     //@formatter:off
     protected array $columns = [
-        ['key' => 'id', 'text' => 'LS-Nr.', 'required' => false, 'modal' => false, 'table' => ['class' => 'text-nowrap']],
+        ['key' => 'shippingNoteNumber', 'text' => 'LS-Nr.', 'required' => false, 'modal' => false, 'table' => ['class' => 'text-nowrap', 'filter' => 'search']],
         ['key' => 'note', 'text' => 'Art der Arbeit', 'required' => true],
         ['key' => 'billingAddressId', 'text' => 'Rechnungsadresse', 'type' => 'autocomplete', 'table' => false, 'modal' => ['apiUrl' => 'Address/api?do=findAddress', 'items' => '/Address/Api?do=findAddress', 'type' => 'autocomplete']],
         ['key' => 'status', 'text' => 'Status', 'required' => true, 'table' => ['filter' => 'iconSelect'], 'modal' => ['type' => 'iconSelect', 'items' => [
@@ -56,6 +56,7 @@ class WarehouseShippingNoteController extends TTCrud {
         ]);
         $this->postData['positions'] = json_encode($this->postData['positions']);
         if (isset($this->postData['metadata'])) $this->postData['metadata'] = json_encode($this->postData['metadata']);
+        $this->postData['shippingNoteNumber'] = WarehouseShippingNoteModel::generateShippingNoteNumber();
         return true;
     }
 
@@ -486,10 +487,6 @@ class WarehouseShippingNoteController extends TTCrud {
                      "bank_bank" => TT_INVOICE_BANK_BANK,
                      "bank_owner" => TT_INVOICE_BANK_OWNER];
 
-        // Replace placeholders in header
-        // create shipping note in this format LS2024-X0001
-        // pad number on the left side with zeros
-        $shippingNoteNumber = "LS" . date("Y", $shippingNote->create) . "-" . str_pad($shippingNote->id, 4, "0", STR_PAD_LEFT);
         $headerHtml = file_get_contents(BASEDIR . "/Layout/default/WarehouseShippingNote/PDF_HEADER.html");
         $headerHtml = str_replace("{{ basedir }}", BASEDIR, $headerHtml);
         $headerHtml = str_replace("{{ addressLine_1 }}", $shippingNote->deliveryAddressName, $headerHtml);
@@ -504,7 +501,7 @@ class WarehouseShippingNoteController extends TTCrud {
         $headerHtml = str_replace("{{ billingAddressLine_4 }}", "", $headerHtml);
         $headerHtml = str_replace("{{ billingAddressLine_5 }}", "", $headerHtml);
         $headerHtml = str_replace("{{ customerNumber }}", !isset($address) ? '' : $address->customer_number, $headerHtml);
-        $headerHtml = str_replace("{{ shippingNoteNumber }}", $shippingNoteNumber, $headerHtml);
+        $headerHtml = str_replace("{{ shippingNoteNumber }}", $shippingNote->shippingNoteNumber, $headerHtml);
         $headerHtml = str_replace("{{ shippingNoteDate }}", date("d.m.Y", $shippingNote->create), $headerHtml);
 
         $headerFile = BASEDIR . "/var/temp/shipping-note_header-" . date("U") . "-" . rand(1000, 9999) . ".html";
diff --git a/application/WarehouseShippingNote/WarehouseShippingNoteModel.php b/application/WarehouseShippingNote/WarehouseShippingNoteModel.php
index 8cc4e5721..5354951b0 100644
--- a/application/WarehouseShippingNote/WarehouseShippingNoteModel.php
+++ b/application/WarehouseShippingNote/WarehouseShippingNoteModel.php
@@ -2,6 +2,7 @@
 
 class WarehouseShippingNoteModel extends TTCrudBaseModel {
     public int $id;
+    public ?string $shippingNoteNumber = null;
     public ?int $billingAddressId;
     public ?string $type;
     public ?string $metadata;
@@ -21,4 +22,23 @@ class WarehouseShippingNoteModel extends TTCrudBaseModel {
     public ?int $eShopOrderId;
     public ?int $create;
     public ?int $createBy;
+
+    public static function generateShippingNoteNumber(): string {
+        $year = date('Y');
+        $prefix = "LS{$year}-X";
+
+        $db = FronkDB::singleton();
+        $result = $db->query("SELECT shippingNoteNumber FROM WarehouseShippingNote
+                              WHERE shippingNoteNumber LIKE '{$prefix}%'
+                              ORDER BY shippingNoteNumber DESC LIMIT 1");
+
+        if ($row = $result->fetch_assoc()) {
+            $lastNumber = intval(substr($row['shippingNoteNumber'], -4));
+            $nextNumber = $lastNumber + 1;
+        } else {
+            $nextNumber = 1;
+        }
+
+        return $prefix . str_pad((string)$nextNumber, 4, '0', STR_PAD_LEFT);
+    }
 }
\ No newline at end of file
diff --git a/db/migrations/20260117120000_add_shipping_note_number.php b/db/migrations/20260117120000_add_shipping_note_number.php
new file mode 100644
index 000000000..ba76c9224
--- /dev/null
+++ b/db/migrations/20260117120000_add_shipping_note_number.php
@@ -0,0 +1,50 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class AddShippingNoteNumber extends AbstractMigration
+{
+    public function up(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            $table = $this->table('WarehouseShippingNote');
+            $table
+                ->addColumn('shippingNoteNumber', 'string', ['limit' => 20, 'null' => true, 'after' => 'id'])
+                ->addIndex(['shippingNoteNumber'], ['unique' => true])
+                ->update();
+
+            // Get all shipping notes ordered by create timestamp to assign numbers in chronological order
+            $rows = $this->fetchAll(
+                "SELECT id, YEAR(FROM_UNIXTIME(`create`)) as year
+                 FROM WarehouseShippingNote
+                 ORDER BY `create` ASC, id ASC"
+            );
+
+            // Group by year and assign sequential numbers
+            $yearCounters = [];
+            foreach ($rows as $row) {
+                $year = $row['year'];
+                if (!isset($yearCounters[$year])) {
+                    $yearCounters[$year] = 0;
+                }
+                $yearCounters[$year]++;
+
+                $shippingNoteNumber = 'LS' . $year . '-X' . str_pad((string)$yearCounters[$year], 4, '0', STR_PAD_LEFT);
+
+                $this->execute(
+                    "UPDATE WarehouseShippingNote SET shippingNoteNumber = '{$shippingNoteNumber}' WHERE id = {$row['id']}"
+                );
+            }
+
+        }
+    }
+
+    public function down(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            $table = $this->table('WarehouseShippingNote');
+            $table->removeColumn('shippingNoteNumber')->update();
+        }
+    }
+}
diff --git a/db/migrations/20260117150000_add_order_movement_linking.php b/db/migrations/20260117150000_add_order_movement_linking.php
new file mode 100644
index 000000000..6a6d9a31b
--- /dev/null
+++ b/db/migrations/20260117150000_add_order_movement_linking.php
@@ -0,0 +1,43 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class AddOrderMovementLinking extends AbstractMigration
+{
+    public function up(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            // Add columns to WarehouseOrder for linking to movements and delivery note files
+            $orderTable = $this->table('WarehouseOrder');
+            $orderTable
+                ->addColumn('linkedMovementIds', 'text', ['null' => true, 'after' => 'note'])
+                ->addColumn('deliveryNoteFileIds', 'text', ['null' => true, 'after' => 'linkedMovementIds'])
+                ->update();
+
+            // Add column to WarehouseMovement for linking back to orders
+            $movementTable = $this->table('WarehouseMovement');
+            $movementTable
+                ->addColumn('linkedOrderId', 'integer', ['null' => true, 'signed' => false, 'after' => 'note'])
+                ->addIndex(['linkedOrderId'], ['name' => 'idx_linkedOrderId'])
+                ->update();
+        }
+    }
+
+    public function down(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            $orderTable = $this->table('WarehouseOrder');
+            $orderTable
+                ->removeColumn('linkedMovementIds')
+                ->removeColumn('deliveryNoteFileIds')
+                ->update();
+
+            $movementTable = $this->table('WarehouseMovement');
+            $movementTable
+                ->removeIndex(['linkedOrderId'])
+                ->removeColumn('linkedOrderId')
+                ->update();
+        }
+    }
+}
diff --git a/public/js/pages/WarehouseOrder/WarehouseOrder.css b/public/js/pages/WarehouseOrder/WarehouseOrder.css
index b58b3475d..0f0211ca6 100644
--- a/public/js/pages/WarehouseOrder/WarehouseOrder.css
+++ b/public/js/pages/WarehouseOrder/WarehouseOrder.css
@@ -180,3 +180,411 @@ input:checked + .ios-switch-slider:before {
 input:disabled + .ios-switch-slider {
     cursor: not-allowed;
 }
+
+/* ===== ORDER DETAIL REDESIGN ===== */
+
+.order-detail-container {
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+}
+
+.order-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 16px 20px;
+    background: linear-gradient(135deg, #f8f9fa 0%, #e9ecef 100%);
+    border-radius: 10px;
+    margin-bottom: 20px;
+    box-shadow: 0 2px 4px rgba(0,0,0,0.05);
+}
+
+.order-info {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+}
+
+.order-number {
+    font-size: 1.25rem;
+    font-weight: 700;
+    color: #1a1a2e;
+}
+
+.order-meta {
+    font-size: 0.875rem;
+    color: #6c757d;
+}
+
+.order-meta span {
+    margin-right: 12px;
+}
+
+.order-actions {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+}
+
+.status-badge {
+    padding: 6px 14px;
+    border-radius: 20px;
+    font-size: 0.75rem;
+    font-weight: 600;
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+}
+
+.status-new { background: #e3f2fd; color: #1565c0; }
+.status-accepted { background: #e8f5e9; color: #2e7d32; }
+.status-ordered { background: #fff3e0; color: #ef6c00; }
+.status-sent { background: #fce4ec; color: #c2185b; }
+.status-partiallyDelivered { background: #fff8e1; color: #f9a825; }
+.status-fullyDelivered { background: #e8f5e9; color: #2e7d32; }
+.status-cancelled { background: #ffebee; color: #c62828; }
+
+/* Status Form */
+.status-form-container {
+    background: #fff;
+    border: 2px solid #e3f2fd;
+    border-radius: 10px;
+    padding: 20px;
+    margin-bottom: 20px;
+    box-shadow: 0 4px 12px rgba(0,0,0,0.08);
+}
+
+.status-form-header {
+    display: flex;
+    gap: 16px;
+    margin-bottom: 16px;
+    flex-wrap: wrap;
+}
+
+.status-form-header > div {
+    flex: 1;
+    min-width: 200px;
+}
+
+.delivery-table {
+    width: 100%;
+    border-collapse: collapse;
+    margin: 16px 0;
+}
+
+.delivery-table th {
+    text-align: left;
+    padding: 10px 12px;
+    background: #f8f9fa;
+    font-weight: 600;
+    font-size: 0.8rem;
+    text-transform: uppercase;
+    color: #6c757d;
+    border-bottom: 2px solid #dee2e6;
+}
+
+.delivery-table td {
+    padding: 12px;
+    border-bottom: 1px solid #e9ecef;
+}
+
+.delivery-table input[type="number"] {
+    width: 80px;
+    padding: 6px 10px;
+    border: 1px solid #ced4da;
+    border-radius: 6px;
+    text-align: center;
+}
+
+.delivery-table input[type="text"] {
+    width: 100%;
+    padding: 6px 10px;
+    border: 1px solid #ced4da;
+    border-radius: 6px;
+}
+
+.status-form-actions {
+    display: flex;
+    gap: 12px;
+    justify-content: flex-end;
+    margin-top: 16px;
+    padding-top: 16px;
+    border-top: 1px solid #e9ecef;
+}
+
+.file-upload-row {
+    display: flex;
+    gap: 16px;
+    flex-wrap: wrap;
+    margin-top: 16px;
+}
+
+.file-upload-item {
+    flex: 1;
+    min-width: 200px;
+}
+
+/* Section Titles */
+.section-title {
+    font-size: 0.875rem;
+    font-weight: 600;
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+    color: #6c757d;
+    margin: 24px 0 12px 0;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+}
+
+.section-title i {
+    color: #1976d2;
+}
+
+/* Positions Table */
+.positions-container {
+    border-radius: 10px;
+    overflow: hidden;
+    box-shadow: 0 2px 8px rgba(0,0,0,0.08);
+    border: 1px solid #e0e0e0;
+    margin-bottom: 24px;
+    background: #fff;
+}
+
+.positions-table {
+    display: table !important;
+    width: 100%;
+    border-collapse: collapse;
+    background: #fff;
+}
+
+.positions-table thead {
+    display: table-header-group !important;
+}
+
+.positions-table tbody {
+    display: table-row-group !important;
+}
+
+.positions-table tfoot {
+    display: table-footer-group !important;
+}
+
+.positions-table tr {
+    display: table-row !important;
+}
+
+.positions-table th,
+.positions-table td {
+    display: table-cell !important;
+    vertical-align: middle;
+    position: static !important;
+}
+
+.positions-table th {
+    text-align: left;
+    padding: 14px 20px;
+    background: #f8f9fa;
+    font-weight: 600;
+    font-size: 0.8rem;
+    text-transform: uppercase;
+    letter-spacing: 0.3px;
+    color: #495057;
+    border-bottom: 2px solid #dee2e6;
+    position: static !important;
+}
+
+/* Right-align numeric columns (Menge, Einzelpreis, Summe) */
+.positions-table th:nth-child(2),
+.positions-table th:nth-child(3),
+.positions-table th:nth-child(4),
+.positions-table td:nth-child(2),
+.positions-table td:nth-child(3),
+.positions-table td:nth-child(4) {
+    text-align: right;
+}
+
+.positions-table td {
+    padding: 12px 20px;
+    border-bottom: 1px solid #e9ecef;
+    font-size: 0.95rem;
+    color: #333;
+}
+
+.positions-table tbody td:first-child {
+    font-weight: 500;
+    color: #1a1a2e;
+}
+
+.positions-table tbody tr:nth-child(even) {
+    background: #fafbfc;
+}
+
+.positions-table tbody tr:hover {
+    background: #f0f4f8;
+}
+
+/* Total row in tfoot */
+.positions-table tfoot .total-row {
+    background: #f0f0f0;
+}
+
+.positions-table tfoot .total-row td {
+    color: #333;
+    font-weight: 600;
+    font-size: 1rem;
+    padding: 14px 20px;
+    border-bottom: none;
+    border-top: 2px solid #dee2e6;
+}
+
+.positions-table tfoot .total-row td:first-child {
+    font-weight: 700;
+}
+
+/* Movements Table */
+.movements-table {
+    width: 100%;
+    border-collapse: collapse;
+    font-size: 0.9rem;
+}
+
+.movements-table th {
+    text-align: left;
+    padding: 8px 12px;
+    background: #f8f9fa;
+    font-weight: 600;
+    font-size: 0.75rem;
+    text-transform: uppercase;
+    color: #6c757d;
+}
+
+.movements-table td {
+    padding: 10px 12px;
+    border-bottom: 1px solid #e9ecef;
+}
+
+.movements-table a {
+    color: #1976d2;
+    text-decoration: none;
+    font-weight: 500;
+}
+
+.movements-table a:hover {
+    text-decoration: underline;
+}
+
+.movement-qty {
+    color: #2e7d32;
+    font-weight: 600;
+}
+
+/* Timeline */
+.timeline-container {
+    background: #fff;
+    border: 1px solid #e0e0e0;
+    border-radius: 10px;
+    padding: 20px;
+    margin-bottom: 20px;
+    box-shadow: 0 2px 8px rgba(0,0,0,0.05);
+}
+
+.timeline {
+    position: relative;
+    padding-left: 24px;
+    margin-left: 8px;
+}
+
+.timeline::before {
+    content: '';
+    position: absolute;
+    left: 3px;
+    top: 6px;
+    bottom: 6px;
+    width: 2px;
+    background: #dee2e6;
+    border-radius: 1px;
+}
+
+.timeline-item {
+    position: relative;
+    padding-bottom: 20px;
+}
+
+.timeline-item:last-child {
+    padding-bottom: 0;
+}
+
+.timeline-marker {
+    position: absolute;
+    left: -21px;
+    top: 4px;
+    width: 10px;
+    height: 10px;
+    border-radius: 50%;
+    background: #fff;
+    border: 2px solid #1976d2;
+    z-index: 1;
+}
+
+.timeline-item.is-first .timeline-marker {
+    background: #1976d2;
+    width: 12px;
+    height: 12px;
+    left: -22px;
+    top: 3px;
+}
+
+.timeline-header {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-bottom: 4px;
+}
+
+.timeline-date {
+    font-size: 0.8rem;
+    color: #6c757d;
+    font-weight: 500;
+}
+
+.timeline-author {
+    font-size: 0.8rem;
+    color: #1976d2;
+    font-weight: 600;
+}
+
+.timeline-body {
+    font-size: 0.9rem;
+    color: #333;
+    line-height: 1.5;
+    white-space: pre-line;
+}
+
+.timeline-files {
+    margin-top: 8px;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+}
+
+.timeline-files a {
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    padding: 4px 10px;
+    background: #e3f2fd;
+    color: #1565c0;
+    border-radius: 4px;
+    font-size: 0.8rem;
+    text-decoration: none;
+}
+
+.timeline-files a:hover {
+    background: #bbdefb;
+}
+
+.loading-spinner {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 40px;
+}
diff --git a/public/js/pages/WarehouseOrder/WarehouseOrder.js b/public/js/pages/WarehouseOrder/WarehouseOrder.js
index 501439c38..8c1e73ae8 100644
--- a/public/js/pages/WarehouseOrder/WarehouseOrder.js
+++ b/public/js/pages/WarehouseOrder/WarehouseOrder.js
@@ -11,20 +11,32 @@ Vue.component('change-status-modal', {
             note:               '',
             file:               null,
             uploadedFiles:      [],
+            deliveryNoteFiles:  [],
             sendEmail:          false,
             sendEmailViewedPDF: false,
             sendEmailMail:      '',
             submitLoading:      false,
-            deliveredPositions: {} // To track delivery details for each position
+            deliveredPositions: {}, // To track delivery details for each position
+            warehouseLocations: [],
+            selectedLocationId: null
         };
     },
     async mounted() {
-        const response = await axios.get(`${window.TT_CONFIG["BASE_PATH"]}/WarehouseOrder/getById`, {params: {id: this.orderId}});
-        if (response.data.status === 'cancelled') {
+        const [orderResponse, locationsResponse] = await Promise.all([
+            axios.get(`${window.TT_CONFIG["BASE_PATH"]}/WarehouseOrder/getById`, {params: {id: this.orderId}}),
+            axios.get(`${window.TT_CONFIG["BASE_PATH"]}/WarehouseOrder/getLocations`)
+        ]);
+
+        if (orderResponse.data.status === 'cancelled') {
             this.$emit('close');
             window.notify('error', 'Bestellung wurde storniert');
         }
-        this.order = response.data;
+        this.order = orderResponse.data;
+        this.warehouseLocations = locationsResponse.data;
+
+        // Set default location to "K1 Fladnitz 150" if available
+        const defaultLocation = this.warehouseLocations.find(loc => loc.text === 'K1 Fladnitz 150');
+        this.selectedLocationId = defaultLocation ? defaultLocation.value : (this.warehouseLocations[0]?.value || null);
 
         // Initialize deliveredPositions after fetching the order
         if (this.order && this.order.positions) {
@@ -40,6 +52,10 @@ Vue.component('change-status-modal', {
         }
     },
     computed: {
+        movementPreviewCount() {
+            if (!this.deliveredPositions) return 0;
+            return Object.values(this.deliveredPositions).filter(p => p.amount > 0).length;
+        },
         availableStatuses() {
             // This computed property remains unchanged
             switch (this.order.status) {
@@ -86,8 +102,7 @@ Vue.component('change-status-modal', {
         }
     },
     methods:  {
-        async handleFileUpload(event) {
-            // This method remains unchanged
+        async handleFileUpload(event, isDeliveryNote = false) {
             const files = event.target.files;
             if (!files.length) return;
 
@@ -104,16 +119,21 @@ Vue.component('change-status-modal', {
                     });
 
                     if (response.data.success) {
-                        this.uploadedFiles.push({
+                        const fileEntry = {
                             id:   response.data.fileId,
                             name: file.name
-                        });
-                        window.notify('success', `File "${file.name}" uploaded successfully`);
+                        };
+                        if (isDeliveryNote) {
+                            this.deliveryNoteFiles.push(fileEntry);
+                        } else {
+                            this.uploadedFiles.push(fileEntry);
+                        }
+                        window.notify('success', `Datei "${file.name}" erfolgreich hochgeladen`);
                     } else {
-                        window.notify('error', `File "${file.name}" upload failed: ${response.data.error || 'Unknown error'}`);
+                        window.notify('error', `Datei "${file.name}" Upload fehlgeschlagen: ${response.data.error || 'Unbekannter Fehler'}`);
                     }
                 } catch (error) {
-                    window.notify('error', `Error uploading file "${file.name}"`);
+                    window.notify('error', `Fehler beim Hochladen von "${file.name}"`);
                 }
             }
             event.target.value = '';
@@ -121,6 +141,9 @@ Vue.component('change-status-modal', {
         removeFile(index) {
             this.uploadedFiles.splice(index, 1)
         },
+        removeDeliveryNoteFile(index) {
+            this.deliveryNoteFiles.splice(index, 1)
+        },
         async submit() {
             this.submitLoading = true;
             if (this.newStatus === 'accepted' && this.sendEmail && !this.sendEmailMail) {
@@ -139,6 +162,7 @@ Vue.component('change-status-modal', {
             }
 
             const fileIds = this.uploadedFiles.map(file => file.id);
+            const deliveryNoteFileIds = this.deliveryNoteFiles.map(file => file.id);
 
             // Prepare delivery data if the status is related to delivery
             let deliveryData = null;
@@ -151,7 +175,9 @@ Vue.component('change-status-modal', {
                 status:  this.newStatus,
                 note:    this.note,
                 fileIds: JSON.stringify(fileIds),
-                deliveryData: deliveryData // Send the new delivery data to the backend
+                deliveryData: deliveryData, // Send the new delivery data to the backend
+                locationId: this.selectedLocationId,
+                deliveryNoteFileIds: deliveryNoteFileIds
             });
 
             if (response.data.success) {
@@ -230,6 +256,12 @@ Vue.component('change-status-modal', {
           <tt-textarea label="Bemerkung" v-model="note" sm/>
 
           <div v-if="newStatus === 'partiallyDelivered' || newStatus === 'fullyDelivered'">
+            <h4 class="mt-3">Lagerstandort</h4>
+            <tt-select label="Lagerstandort für Einbuchung"
+                       v-model="selectedLocationId"
+                       :options="warehouseLocations"
+                       sm row/>
+
             <h4 class="mt-3">Positionen Lieferung erfassen</h4>
             <div style="display: grid; grid-template-columns: 2fr 1fr 1fr 2fr 1fr; grid-gap: 10px; font-weight: bold; margin-bottom: 10px; padding-bottom: 5px; border-bottom: 1px solid #ccc;">
               <div>Artikel</div>
@@ -270,6 +302,32 @@ Vue.component('change-status-modal', {
                 </div>
               </div>
             </template>
+
+            <div class="alert alert-info mt-3" v-if="movementPreviewCount > 0">
+              <i class="fas fa-info-circle"></i>
+              Es werden <strong>{{ movementPreviewCount }}</strong> Lagerbewegung(en) erstellt.
+            </div>
+
+            <h4 class="mt-3">Lieferschein Foto</h4>
+            <div class="form-group">
+              <label>Lieferschein hochladen</label>
+              <input type="file" class="form-control" @change="handleFileUpload($event, true)" multiple accept="image/*,.pdf"/>
+            </div>
+            <div v-if="deliveryNoteFiles.length" class="upload-success-alert mb-3">
+              <div class="alert-header">
+                <i class="fa fa-check-circle" aria-hidden="true"></i>
+                <span>Lieferschein hochgeladen</span>
+              </div>
+              <ul class="file-list">
+                <li v-for="(file, index) in deliveryNoteFiles" :key="file.id" class="file-item">
+                  <i class="fa fa-file" aria-hidden="true"></i>
+                  <span class="file-name">{{ file.name }}</span>
+                  <button type="button" class="remove-btn" @click="removeDeliveryNoteFile(index)">
+                    <i class="fa fa-times" aria-hidden="true"></i>
+                  </button>
+                </li>
+              </ul>
+            </div>
           </div>
 
           <div v-if="newStatus === 'accepted'">
@@ -581,60 +639,399 @@ Vue.component('tt-file', {
 
 Vue.component('warehouse-order-detail', {
     template: `
-      <tt-card>
-        <template v-slot:header><h4>Bestellungsdetails für #{{ loading ? 'Laden...' : order.orderNumber }}</h4></template>
+      <div class="order-detail-container">
         <template v-if="loading">
-          <div class="d-flex justify-content-center align-items-center">
-            <div class="spinner-border spinner-border-sm text-primary" role="status"><span class="sr-only">Loading...</span></div>
+          <div class="loading-spinner">
+            <div class="spinner-border text-primary" role="status"><span class="sr-only">Laden...</span></div>
           </div>
         </template>
-        <template v-else>
-          <h3>Positionen</h3>
-          <div class="grid-container header">
-            <div v-for="header in ['Artikel', 'Menge', 'Preis', 'Lieferant', 'Verwendung', 'Summe']"><strong>{{ header }}</strong></div>
-          </div>
-          <div class="grid-container" v-for="p in order.positions">
-            <div>{{ p.articleName }}</div>
-            <div>{{ p.amount }}</div>
-            <div>{{ p.buyPrice }}</div>
-            <div>{{ p.distributorName }}</div>
-            <div>{{ p.verwendung }}</div>
-            <div>{{ p.amount * p.buyPrice }}</div>
-          </div>
-          <template v-if="orderLog?.length > 0">
-            <hr>
-            <h3>Log</h3>
-            <div v-for="log in orderLog">
-              {{ formatDate(log.create) }} ({{ getUserName(log.createBy) }}) | {{ log.message }}
-              <template v-if="log.fileIds">
-                <div v-for="file in JSON.parse(log.fileIds)">
-                  <tt-file :id="file"/>
-                </div>
-              </template>
 
+        <template v-else>
+          <!-- HEADER -->
+          <div class="order-header">
+            <div class="order-info">
+              <span class="order-number">#{{ order.orderNumber }}</span>
+              <div class="order-meta">
+                <span><i class="fas fa-truck"></i> {{ order.distributorName || 'Kein Lieferant' }}</span>
+                <span><i class="fas fa-box"></i> {{ order.positions?.length || 0 }} Positionen</span>
+                <span><i class="fas fa-euro-sign"></i> {{ formatCurrency(grandTotal) }}</span>
+              </div>
+            </div>
+            <div class="order-actions">
+              <span :class="['status-badge', 'status-' + order.status]">{{ statusLabel }}</span>
+              <button v-if="!showStatusForm && order.status !== 'cancelled' && order.status !== 'fullyDelivered'"
+                      @click="toggleStatusForm"
+                      class="btn btn-primary btn-sm">
+                <i class="fas fa-edit"></i> Status ändern
+              </button>
+            </div>
+          </div>
+
+          <!-- INLINE STATUS FORM -->
+          <div v-if="showStatusForm" class="status-form-container">
+            <div class="status-form-header">
+              <div>
+                <label class="form-label"><strong>Neuer Status</strong></label>
+                <select v-model="newStatus" class="form-control form-control-sm">
+                  <option v-for="s in availableStatuses" :value="s.value">{{ s.text }}</option>
+                </select>
+              </div>
+              <div v-if="isDeliveryStatus">
+                <label class="form-label"><strong>Lagerstandort</strong></label>
+                <select v-model="selectedLocationId" class="form-control form-control-sm">
+                  <option v-for="loc in warehouseLocations" :value="loc.value">{{ loc.text }}</option>
+                </select>
+              </div>
+            </div>
+
+            <template v-if="isDeliveryStatus">
+              <table class="delivery-table">
+                <thead>
+                  <tr>
+                    <th>Artikel</th>
+                    <th style="width: 80px;">Bestellt</th>
+                    <th style="width: 100px;">Geliefert</th>
+                    <th>Grund für Abweichung</th>
+                    <th style="width: 80px; text-align: center;">Rest stornieren</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr v-for="(pos, index) in order.positions" :key="index">
+                    <td>{{ pos.articleName }}</td>
+                    <td class="text-center">{{ pos.amount }}</td>
+                    <td>
+                      <input type="number" v-model.number="deliveredPositions[index].amount" :max="pos.amount" min="0"/>
+                    </td>
+                    <td>
+                      <input type="text"
+                             v-if="deliveredPositions[index].amount < pos.amount"
+                             v-model="deliveredPositions[index].reason"
+                             placeholder="z.B. Lieferschaden"/>
+                    </td>
+                    <td class="text-center">
+                      <input type="checkbox"
+                             v-if="deliveredPositions[index].amount < pos.amount"
+                             v-model="deliveredPositions[index].cancelRest"/>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+
+              <div v-if="movementPreviewCount > 0" class="alert alert-info" style="margin: 12px 0;">
+                <i class="fas fa-info-circle"></i>
+                Es werden <strong>{{ movementPreviewCount }}</strong> Lagerbewegung(en) erstellt.
+              </div>
+            </template>
+
+            <div class="file-upload-row">
+              <div class="file-upload-item">
+                <label class="form-label"><i class="fas fa-file"></i> Datei anhängen</label>
+                <input type="file" class="form-control form-control-sm" @change="handleFileUpload($event, false)" multiple/>
+                <div v-if="uploadedFiles.length" class="mt-2">
+                  <span v-for="(f, i) in uploadedFiles" :key="f.id" class="badge bg-success me-1">
+                    {{ f.name }} <i class="fas fa-times" style="cursor:pointer" @click="uploadedFiles.splice(i, 1)"></i>
+                  </span>
+                </div>
+              </div>
+              <div v-if="isDeliveryStatus" class="file-upload-item">
+                <label class="form-label"><i class="fas fa-camera"></i> Lieferschein Foto</label>
+                <input type="file" class="form-control form-control-sm" @change="handleFileUpload($event, true)" accept="image/*,.pdf"/>
+                <div v-if="deliveryNoteFiles.length" class="mt-2">
+                  <span v-for="(f, i) in deliveryNoteFiles" :key="f.id" class="badge bg-primary me-1">
+                    {{ f.name }} <i class="fas fa-times" style="cursor:pointer" @click="deliveryNoteFiles.splice(i, 1)"></i>
+                  </span>
+                </div>
+              </div>
+            </div>
+
+            <div style="margin-top: 12px;">
+              <label class="form-label"><i class="fas fa-comment"></i> Bemerkung</label>
+              <textarea v-model="note" class="form-control form-control-sm" rows="2" placeholder="Optionale Bemerkung..."></textarea>
+            </div>
+
+            <div class="status-form-actions">
+              <button @click="cancelStatusChange" class="btn btn-outline-secondary btn-sm">Abbrechen</button>
+              <button @click="submitStatusChange" :disabled="isSubmitting" class="btn btn-success btn-sm">
+                <i class="fas fa-check"></i> {{ isSubmitting ? 'Wird gespeichert...' : 'Speichern' }}
+              </button>
+            </div>
+          </div>
+
+          <!-- POSITIONEN -->
+          <div class="section-title"><i class="fas fa-list"></i> Positionen</div>
+          <div class="positions-container">
+            <table class="positions-table">
+              <thead>
+                <tr>
+                  <th>Artikel</th>
+                  <th>Menge</th>
+                  <th>Einzelpreis</th>
+                  <th>Summe</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr v-for="p in order.positions" :key="p.article">
+                  <td>{{ p.articleName }}</td>
+                  <td>{{ p.amount }} Stk</td>
+                  <td>{{ formatCurrency(p.buyPrice) }}</td>
+                  <td>{{ formatCurrency(p.amount * p.buyPrice) }}</td>
+                </tr>
+              </tbody>
+              <tfoot>
+                <tr class="total-row">
+                  <td>Gesamtsumme</td>
+                  <td></td>
+                  <td></td>
+                  <td>{{ formatCurrency(grandTotal) }}</td>
+                </tr>
+              </tfoot>
+            </table>
+          </div>
+
+          <!-- LAGERBEWEGUNGEN -->
+          <template v-if="linkedMovements?.length > 0">
+            <div class="section-title"><i class="fas fa-warehouse"></i> Lagerbewegungen</div>
+            <table class="movements-table">
+              <thead>
+                <tr>
+                  <th>Nummer</th>
+                  <th>Artikel</th>
+                  <th>Menge</th>
+                  <th>Lagerort</th>
+                  <th>Datum</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr v-for="m in linkedMovements" :key="m.id">
+                  <td><a :href="window.TT_CONFIG.BASE_PATH + '/WarehouseMovement?showId=' + m.id" target="_blank">{{ m.movementNumber }}</a></td>
+                  <td>{{ m.articleName }}</td>
+                  <td class="movement-qty">+{{ m.quantity }}</td>
+                  <td>{{ m.locationName }}</td>
+                  <td>{{ formatDate(m.create) }}</td>
+                </tr>
+              </tbody>
+            </table>
+          </template>
+
+          <!-- AKTIVITÄT / TIMELINE -->
+          <template v-if="sortedLog?.length > 0">
+            <div class="section-title"><i class="fas fa-history"></i> Aktivität</div>
+            <div class="timeline-container">
+              <div class="timeline">
+                <div v-for="(log, index) in sortedLog" :key="log.id || index" class="timeline-item" :class="{ 'is-first': index === 0 }">
+                  <div class="timeline-marker"></div>
+                  <div class="timeline-content">
+                    <div class="timeline-header">
+                      <span class="timeline-date">{{ formatDate(log.create) }}</span>
+                      <span class="timeline-author">{{ getUserName(log.createBy) }}</span>
+                    </div>
+                    <div class="timeline-body">{{ log.message }}</div>
+                    <div v-if="log.fileIds && JSON.parse(log.fileIds).length > 0" class="timeline-files">
+                      <a v-for="fileId in JSON.parse(log.fileIds)" :key="fileId" :href="'/File/download?id=' + fileId" target="_blank">
+                        <i class="fas fa-paperclip"></i> Anhang
+                      </a>
+                    </div>
+                  </div>
+                </div>
+              </div>
             </div>
           </template>
-          <hr>
-          <h3>Lieferadresse</h3>
-          <div v-for="field in ['delAddrName', 'delAddrEMail', 'delAddrLine']">{{ order[field] }}</div>
-          <div>{{ order.delAddrPLZ }} {{ order.delAddrCity }}</div>
         </template>
-      </tt-card>
+      </div>
     `,
-    props:    ['id'],
-    data:     () => ({order: {}, orderLog: null, loading: true}),
+    props: ['id'],
+    data() {
+        return {
+            order: {},
+            orderLog: null,
+            linkedMovements: [],
+            loading: true,
+            window: window,
+            // Status form state
+            showStatusForm: false,
+            newStatus: 'noChanges',
+            selectedLocationId: null,
+            warehouseLocations: [],
+            deliveredPositions: {},
+            uploadedFiles: [],
+            deliveryNoteFiles: [],
+            note: '',
+            isSubmitting: false
+        };
+    },
+    computed: {
+        grandTotal() {
+            return this.order.positions?.reduce((sum, p) => sum + (p.amount * p.buyPrice), 0) || 0;
+        },
+        statusLabel() {
+            const labels = {
+                new: 'Neu',
+                accepted: 'Akzeptiert',
+                ordered: 'Bestellt',
+                sent: 'Versendet',
+                partiallyDelivered: 'Teilweise geliefert',
+                fullyDelivered: 'Geliefert',
+                cancelled: 'Storniert'
+            };
+            return labels[this.order.status] || this.order.status;
+        },
+        availableStatuses() {
+            const statusMap = {
+                new: [
+                    {value: 'noChanges', text: 'Keine Änderungen'},
+                    {value: 'accepted', text: 'Akzeptiert'},
+                    {value: 'ordered', text: 'Bestellt'},
+                    {value: 'cancelled', text: 'Storniert'}
+                ],
+                accepted: [
+                    {value: 'noChanges', text: 'Keine Änderungen'},
+                    {value: 'ordered', text: 'Bestellt'},
+                    {value: 'cancelled', text: 'Storniert'}
+                ],
+                ordered: [
+                    {value: 'noChanges', text: 'Keine Änderungen'},
+                    {value: 'sent', text: 'Versendet'},
+                    {value: 'fullyDelivered', text: 'Geliefert'},
+                    {value: 'partiallyDelivered', text: 'Teilweise geliefert'},
+                    {value: 'cancelled', text: 'Storniert'}
+                ],
+                sent: [
+                    {value: 'noChanges', text: 'Keine Änderungen'},
+                    {value: 'partiallyDelivered', text: 'Teilweise geliefert'},
+                    {value: 'fullyDelivered', text: 'Geliefert'},
+                    {value: 'cancelled', text: 'Storniert'}
+                ],
+                partiallyDelivered: [
+                    {value: 'noChanges', text: 'Keine Änderungen'},
+                    {value: 'fullyDelivered', text: 'Geliefert'},
+                    {value: 'cancelled', text: 'Storniert'}
+                ]
+            };
+            return statusMap[this.order.status] || [{value: 'noChanges', text: 'Keine Änderungen'}];
+        },
+        isDeliveryStatus() {
+            return this.newStatus === 'partiallyDelivered' || this.newStatus === 'fullyDelivered';
+        },
+        movementPreviewCount() {
+            if (!this.deliveredPositions) return 0;
+            return Object.values(this.deliveredPositions).filter(p => p.amount > 0).length;
+        },
+        sortedLog() {
+            if (!this.orderLog) return [];
+            return [...this.orderLog].sort((a, b) => b.create - a.create);
+        }
+    },
     async mounted() {
-        const [orderResponse, logResponse] = await Promise.all([
+        const [orderResponse, logResponse, movementsResponse, locationsResponse] = await Promise.all([
             axios.get(`${window.TT_CONFIG.BASE_PATH}/WarehouseOrder/getById`, {params: {id: this.id}}),
-            axios.get(`${window.TT_CONFIG.BASE_PATH}/WarehouseOrder/getLogById`, {params: {id: this.id}})
+            axios.get(`${window.TT_CONFIG.BASE_PATH}/WarehouseOrder/getLogById`, {params: {id: this.id}}),
+            axios.get(`${window.TT_CONFIG.BASE_PATH}/WarehouseOrder/getLinkedMovements`, {params: {orderId: this.id}}),
+            axios.get(`${window.TT_CONFIG.BASE_PATH}/WarehouseOrder/getLocations`)
         ]);
         this.order = orderResponse.data;
         this.orderLog = logResponse.data;
+        this.linkedMovements = movementsResponse.data || [];
+        this.warehouseLocations = locationsResponse.data || [];
+
+        // Set default location
+        const defaultLoc = this.warehouseLocations.find(l => l.text === 'K1 Fladnitz 150');
+        this.selectedLocationId = defaultLoc ? defaultLoc.value : (this.warehouseLocations[0]?.value || null);
+
         this.loading = false;
     },
     methods: {
-        formatDate:  date => window.moment(date * 1000).format('DD.MM.YYYY HH:mm'),
-        getUserName: id => window.TT_CONFIG.CRUD_CONFIG.columns.find(col => col.key === 'createBy')?.modal.items.find(u => u.value === id)?.text
+        formatDate: date => window.moment(date * 1000).format('DD.MM.YYYY HH:mm'),
+        formatCurrency(value) {
+            return new Intl.NumberFormat('de-AT', { style: 'currency', currency: 'EUR' }).format(value);
+        },
+        getUserName: id => window.TT_CONFIG.CRUD_CONFIG.columns.find(col => col.key === 'createBy')?.modal.items.find(u => u.value === id)?.text || 'Unbekannt',
+        toggleStatusForm() {
+            this.showStatusForm = !this.showStatusForm;
+            if (this.showStatusForm) {
+                this.initDeliveredPositions();
+            }
+        },
+        initDeliveredPositions() {
+            this.deliveredPositions = {};
+            if (this.order && this.order.positions) {
+                this.order.positions.forEach((pos, index) => {
+                    this.$set(this.deliveredPositions, index, {
+                        amount: pos.amount,
+                        reason: '',
+                        cancelRest: false,
+                        articleName: pos.articleName,
+                        orderedAmount: pos.amount
+                    });
+                });
+            }
+        },
+        async handleFileUpload(event, isDeliveryNote) {
+            const files = event.target.files;
+            if (!files.length) return;
+
+            for (const file of files) {
+                const formData = new FormData();
+                formData.append('file', file);
+                try {
+                    const response = await axios.post(`${window.TT_CONFIG.BASE_PATH}/WarehouseOrder/uploadFile`, formData, {
+                        headers: { 'Content-Type': 'multipart/form-data' }
+                    });
+                    if (response.data.success) {
+                        const entry = { id: response.data.fileId, name: file.name };
+                        if (isDeliveryNote) {
+                            this.deliveryNoteFiles.push(entry);
+                        } else {
+                            this.uploadedFiles.push(entry);
+                        }
+                    }
+                } catch (e) {
+                    window.notify('error', 'Fehler beim Hochladen');
+                }
+            }
+            event.target.value = '';
+        },
+        cancelStatusChange() {
+            this.showStatusForm = false;
+            this.newStatus = 'noChanges';
+            this.note = '';
+            this.uploadedFiles = [];
+            this.deliveryNoteFiles = [];
+        },
+        async submitStatusChange() {
+            this.isSubmitting = true;
+            try {
+                const response = await axios.post(`${window.TT_CONFIG.BASE_PATH}/WarehouseOrder/createNewLogAction`, {
+                    orderId: this.order.id,
+                    status: this.newStatus,
+                    note: this.note,
+                    fileIds: JSON.stringify(this.uploadedFiles.map(f => f.id)),
+                    deliveryData: this.isDeliveryStatus ? this.deliveredPositions : null,
+                    locationId: this.selectedLocationId,
+                    deliveryNoteFileIds: this.deliveryNoteFiles.map(f => f.id)
+                });
+
+                if (response.data.success) {
+                    window.notify('success', 'Status erfolgreich geändert');
+                    this.cancelStatusChange();
+                    // Reload data
+                    const [orderRes, logRes, movRes] = await Promise.all([
+                        axios.get(`${window.TT_CONFIG.BASE_PATH}/WarehouseOrder/getById`, {params: {id: this.id}}),
+                        axios.get(`${window.TT_CONFIG.BASE_PATH}/WarehouseOrder/getLogById`, {params: {id: this.id}}),
+                        axios.get(`${window.TT_CONFIG.BASE_PATH}/WarehouseOrder/getLinkedMovements`, {params: {orderId: this.id}})
+                    ]);
+                    this.order = orderRes.data;
+                    this.orderLog = logRes.data;
+                    this.linkedMovements = movRes.data || [];
+                    // Emit event to refresh table
+                    this.$emit('status-changed');
+                } else {
+                    window.notify('error', response.data.error || 'Fehler beim Speichern');
+                }
+            } catch (e) {
+                window.notify('error', 'Netzwerkfehler');
+            }
+            this.isSubmitting = false;
+        }
     }
 });
 
@@ -642,22 +1039,19 @@ Vue.component('warehouse-order', {
     template: `
                 <tt-card>
                   <warehouse-order-modal v-if="orderModalId" :id="orderModalId" @close="closeModal"/>
-                  <change-status-modal v-if="changeStatusModalId" :orderId="changeStatusModalId" @close="closeModal"/>
                   <tt-button text="Bestellung erstellen" @click="orderModalId = 'create'" additional-class="btn-primary"/>
                   <tt-table-crud emit-edit
                                  @openpdf="openPDF"
-                                 @changeStatus="changeStatusModalId = $event.id"
                                  @edit="orderModalId = $event.id; $refs.table.$refs.table.refreshTable()" ref="table">
                     <template v-slot:expandedRow="{ row }">
-                      <warehouse-order-detail :id="row.id"/>
+                      <warehouse-order-detail :id="row.id" @status-changed="refreshTable"/>
                     </template>
                     <template v-slot:sum="{ row }">{{ calculateSum(JSON.parse(row["positions"])).toFixed(2) }} €</template>
                   </tt-table-crud>
                 </tt-card>
               `,
     data:     () => ({
-        orderModalId:        null,
-        changeStatusModalId: null
+        orderModalId: null
     }),
     mounted() {
         if (JSON.parse(localStorage.getItem('WarehouseOrder_create'))) this.orderModalId = 'create';
@@ -665,10 +1059,12 @@ Vue.component('warehouse-order', {
     methods: {
         async closeModal() {
             this.orderModalId = null;
-            this.changeStatusModalId = null;
             await new Promise(resolve => setTimeout(resolve, 250));
             this.$refs.table.$refs.table.refreshTable();
         },
+        refreshTable() {
+            this.$refs.table.$refs.table.refreshTable();
+        },
         calculateSum: positions => positions.reduce((sum, {amount, buyPrice}) => sum + amount * buyPrice, 0),
         openPDF:      order => window.open(`${window.TT_CONFIG["BASE_PATH"]}/WarehouseOrder/createPDF?id=${order.id}`)
     }
diff --git a/public/mobile/app.js b/public/mobile/app.js
index 537c82703..b45188bbe 100644
--- a/public/mobile/app.js
+++ b/public/mobile/app.js
@@ -1,36 +1,23 @@
-/**
- * MobileApp PWA - Main Vue Application
- *
- * Unified mobile app with module navigation.
- * Routes: /MobileApp -> Home, /MobileApp/Lager -> Module, /MobileApp/Lager/Inventur -> Submodule
- */
-
 import { authState, checkAuth, login, logout } from '/mobile/shared/auth.js';
 import LoginScreen from '/mobile/components/LoginScreen.js';
 import MainMenu from '/mobile/components/MainMenu.js';
 import LagerModule from '/mobile/modules/lager/LagerModule.js';
+import ShippingNoteModule from '/mobile/modules/lager/shippingnote/ShippingNoteModule.js';
+import WorkorderModule from '/mobile/modules/workorder/WorkorderModule.js';
 
 const { createApp, ref, computed, onMounted, onUnmounted, watch } = Vue;
 
-// Check if running as installed PWA
 const isPWAInstalled = () => {
-    // Check display-mode standalone (Android Chrome, desktop)
     if (window.matchMedia('(display-mode: standalone)').matches) return true;
-    // Check iOS Safari standalone mode
     if (window.navigator.standalone === true) return true;
-    // Check if launched from TWA (Trusted Web Activity)
     if (document.referrer.includes('android-app://')) return true;
     return false;
 };
 
-// Check if we should require PWA installation
 const shouldRequirePWA = () => {
-    const hostname = window.location.hostname;
-    // Only require PWA on production domain
-    return hostname === 'thetool.xinon.at';
+    return window.location.hostname === 'thetool.xinon.at';
 };
 
-// Parse initial path from config
 const parseInitialRoute = () => {
     const initialPath = window.TT_CONFIG?.INITIAL_PATH || '/MobileApp';
     const parts = initialPath.replace('/MobileApp', '').split('/').filter(Boolean);
@@ -44,34 +31,28 @@ const App = {
     components: {
         LoginScreen,
         MainMenu,
-        LagerModule
+        LagerModule,
+        ShippingNoteModule,
+        WorkorderModule
     },
 
     setup() {
-        // ==================== STATE ====================
         const currentView = ref('loading');
         const user = ref(null);
         const toast = ref({ show: false, message: '', type: 'success' });
         const theme = ref('system');
         const showSettings = ref(false);
-
-        // Module-specific settings
         const lagerSimpleMode = ref(false);
-
-        // Navigation state
         const currentModule = ref(null);
         const currentSubmodule = ref(null);
-
-        // PWA Install state
+        const lastWorkflow = ref(null);
+        const showContinuePrompt = ref(false);
         const showInstallPrompt = ref(false);
         const deferredInstallPrompt = ref(null);
         const isIOS = ref(/iPad|iPhone|iPod/.test(navigator.userAgent));
         const isAndroid = ref(/Android/.test(navigator.userAgent));
-
-        // Can go back?
         const canGoBack = computed(() => currentModule.value !== null);
 
-        // ==================== THEME ====================
         const applyTheme = () => {
             const isDark = localStorage.theme === 'dark' ||
                 (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches);
@@ -93,33 +74,22 @@ const App = {
             applyTheme();
         };
 
-        // ==================== PWA INSTALL ====================
         const handleInstallPrompt = (e) => {
-            // Prevent Chrome's default install prompt
             e.preventDefault();
-            // Store the event for later use
             deferredInstallPrompt.value = e;
         };
 
         const triggerInstall = async () => {
             if (!deferredInstallPrompt.value) return;
-
-            // Show the install prompt
             deferredInstallPrompt.value.prompt();
-
-            // Wait for user response
             const { outcome } = await deferredInstallPrompt.value.userChoice;
-
             if (outcome === 'accepted') {
                 showInstallPrompt.value = false;
-                // Reload to get standalone mode
                 window.location.reload();
             }
-
             deferredInstallPrompt.value = null;
         };
 
-        // ==================== LAGER SETTINGS ====================
         const loadLagerSettings = () => {
             try {
                 const saved = localStorage.getItem('movement_settings');
@@ -140,18 +110,48 @@ const App = {
             } catch (e) {}
         };
 
-        // ==================== NAVIGATION ====================
+        const saveLastWorkflow = (module, submodule) => {
+            if (module) {
+                const workflow = { module, submodule: submodule || null, timestamp: Date.now() };
+                localStorage.setItem('lastWorkflow', JSON.stringify(workflow));
+                lastWorkflow.value = workflow;
+            }
+        };
+
+        const loadLastWorkflow = () => {
+            try {
+                const saved = localStorage.getItem('lastWorkflow');
+                if (saved) {
+                    const workflow = JSON.parse(saved);
+                    if (Date.now() - workflow.timestamp < 24 * 60 * 60 * 1000) {
+                        return workflow;
+                    }
+                }
+            } catch (e) {}
+            return null;
+        };
+
         const navigate = (module, submodule = null) => {
             currentModule.value = module;
             currentSubmodule.value = submodule;
-
-            // Update browser URL
+            showContinuePrompt.value = false;
+            saveLastWorkflow(module, submodule);
             let path = '/MobileApp';
             if (module) path += '/' + module;
             if (submodule) path += '/' + submodule;
             history.pushState({ module, submodule }, '', path);
         };
 
+        const continueLastWorkflow = () => {
+            if (lastWorkflow.value) {
+                navigate(lastWorkflow.value.module, lastWorkflow.value.submodule);
+            }
+        };
+
+        const dismissContinuePrompt = () => {
+            showContinuePrompt.value = false;
+        };
+
         const goHome = () => {
             navigate(null, null);
         };
@@ -164,8 +164,7 @@ const App = {
             }
         };
 
-        // Handle browser back button
-        window.addEventListener('popstate', (event) => {
+        const handlePopstate = (event) => {
             if (event.state) {
                 currentModule.value = event.state.module;
                 currentSubmodule.value = event.state.submodule;
@@ -173,11 +172,9 @@ const App = {
                 currentModule.value = null;
                 currentSubmodule.value = null;
             }
-        });
+        };
 
-        // ==================== AUTH ====================
         const handleLogin = async (credentials) => {
-            // Handle 2FA success (already verified in LoginScreen)
             if (credentials._2faSuccess) {
                 user.value = credentials.user;
                 currentView.value = 'app';
@@ -203,19 +200,17 @@ const App = {
             showToast('Abgemeldet', 'success');
         };
 
-        // ==================== TOAST ====================
         const showToast = (message, type = 'success') => {
             toast.value = { show: true, message, type };
-            setTimeout(() => {
-                toast.value.show = false;
-            }, 3000);
+            setTimeout(() => { toast.value.show = false; }, 3000);
         };
 
-        // ==================== COMPUTED ====================
         const currentComponent = computed(() => {
             if (currentView.value !== 'app') return null;
             if (!currentModule.value) return 'MainMenu';
+            if (currentModule.value.toLowerCase() === 'lieferschein') return 'ShippingNoteModule';
             if (currentModule.value.toLowerCase() === 'lager') return 'LagerModule';
+            if (currentModule.value.toLowerCase() === 'workorder') return 'WorkorderModule';
             return 'MainMenu';
         });
 
@@ -230,51 +225,53 @@ const App = {
             return crumbs;
         });
 
-        // ==================== LIFECYCLE ====================
-        onMounted(async () => {
-            // Initialize theme
-            const savedTheme = localStorage.getItem('theme');
-            if (savedTheme) {
-                theme.value = savedTheme;
-            }
-            applyTheme();
-            window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', applyTheme);
+        const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
 
-            // Load module settings
+        onMounted(async () => {
+            const savedTheme = localStorage.getItem('theme');
+            if (savedTheme) theme.value = savedTheme;
+            applyTheme();
+            mediaQuery.addEventListener('change', applyTheme);
+            window.addEventListener('popstate', handlePopstate);
+            window.addEventListener('beforeinstallprompt', handleInstallPrompt);
             loadLagerSettings();
 
-            // Listen for beforeinstallprompt (Android)
-            window.addEventListener('beforeinstallprompt', handleInstallPrompt);
-
-            // Check if PWA is required but not installed
             if (shouldRequirePWA() && !isPWAInstalled()) {
                 showInstallPrompt.value = true;
                 currentView.value = 'install';
                 return;
             }
 
-            // Check authentication
             const result = await checkAuth();
             if (result.authenticated) {
                 user.value = result.user;
                 currentView.value = 'app';
-
-                // Parse initial route
                 const initialRoute = parseInitialRoute();
                 currentModule.value = initialRoute.module;
                 currentSubmodule.value = initialRoute.submodule;
-
-                // Set initial history state
                 history.replaceState(
                     { module: initialRoute.module, submodule: initialRoute.submodule },
                     '',
                     window.location.pathname
                 );
+                if (!initialRoute.module && !initialRoute.submodule) {
+                    const saved = loadLastWorkflow();
+                    if (saved) {
+                        lastWorkflow.value = saved;
+                        showContinuePrompt.value = true;
+                    }
+                }
             } else {
                 currentView.value = 'login';
             }
         });
 
+        onUnmounted(() => {
+            mediaQuery.removeEventListener('change', applyTheme);
+            window.removeEventListener('popstate', handlePopstate);
+            window.removeEventListener('beforeinstallprompt', handleInstallPrompt);
+        });
+
         return {
             currentView,
             user,
@@ -295,18 +292,20 @@ const App = {
             setTheme,
             lagerSimpleMode,
             setLagerSimpleMode,
-            // PWA Install
             showInstallPrompt,
             deferredInstallPrompt,
             isIOS,
             isAndroid,
             triggerInstall,
+            lastWorkflow,
+            showContinuePrompt,
+            continueLastWorkflow,
+            dismissContinuePrompt,
         };
     },
 
     template: `
         <div class="relative h-full w-full bg-slate-50 dark:bg-slate-900 transition-colors duration-300">
-            <!-- Loading State -->
             <div v-if="currentView === 'loading'" class="flex items-center justify-center h-full">
                 <div class="text-center">
                     <img src="/assets/images/xinon-full-transparent.png" class="h-12 mx-auto mb-4 dark:hidden">
@@ -315,9 +314,7 @@ const App = {
                 </div>
             </div>
 
-            <!-- PWA Install Prompt -->
             <div v-else-if="currentView === 'install'" class="min-h-screen flex items-center justify-center p-4 relative overflow-hidden">
-                <!-- Network Background (same as login) -->
                 <div class="absolute inset-0 bg-gradient-to-br from-slate-900 via-slate-800 to-slate-900">
                     <div class="absolute inset-0 opacity-40" style="background-image: linear-gradient(to right, rgba(0, 83, 132, 0.15) 1px, transparent 1px), linear-gradient(to bottom, rgba(0, 83, 132, 0.15) 1px, transparent 1px); background-size: 50px 50px;"></div>
                     <div class="absolute w-3 h-3 bg-cyan-400 rounded-full network-node" style="top: 12%; left: 18%; box-shadow: 0 0 25px 8px rgba(34, 211, 238, 0.6);"></div>
@@ -326,7 +323,6 @@ const App = {
                     <div class="absolute w-2.5 h-2.5 bg-blue-300 rounded-full network-node" style="top: 82%; left: 85%; animation-delay: 0.3s; box-shadow: 0 0 20px 6px rgba(147, 197, 253, 0.6);"></div>
                 </div>
 
-                <!-- Install Card -->
                 <div class="relative bg-white/95 dark:bg-slate-800/95 backdrop-blur-sm rounded-2xl shadow-2xl p-6 w-full max-w-sm border border-white/20 dark:border-slate-700/50">
                     <div class="mb-6">
                         <img src="/assets/images/xinon-full-transparent.png" class="h-14 mx-auto dark:hidden" alt="Logo">
@@ -345,7 +341,6 @@ const App = {
                         </p>
                     </div>
 
-                    <!-- Android Install Button -->
                     <div v-if="isAndroid && deferredInstallPrompt">
                         <button
                             @click="triggerInstall"
@@ -358,7 +353,6 @@ const App = {
                         </button>
                     </div>
 
-                    <!-- iOS Instructions -->
                     <div v-else-if="isIOS" class="space-y-4">
                         <div class="bg-slate-50 dark:bg-slate-700/50 rounded-xl p-4">
                             <p class="text-sm font-medium text-slate-700 dark:text-slate-300 mb-3">So installierst du die App:</p>
@@ -383,7 +377,6 @@ const App = {
                         </div>
                     </div>
 
-                    <!-- Android Manual Instructions (fallback) -->
                     <div v-else-if="isAndroid" class="space-y-4">
                         <div class="bg-slate-50 dark:bg-slate-700/50 rounded-xl p-4">
                             <p class="text-sm font-medium text-slate-700 dark:text-slate-300 mb-3">So installierst du die App:</p>
@@ -404,7 +397,6 @@ const App = {
                         </div>
                     </div>
 
-                    <!-- Desktop / Unknown -->
                     <div v-else class="space-y-4">
                         <div class="bg-amber-50 dark:bg-amber-900/20 border border-amber-200 dark:border-amber-800 rounded-xl p-4">
                             <p class="text-sm text-amber-700 dark:text-amber-400">
@@ -421,7 +413,6 @@ const App = {
                 </div>
             </div>
 
-            <!-- Login Screen -->
             <LoginScreen
                 v-else-if="currentView === 'login'"
                 @login="handleLogin"
@@ -429,12 +420,9 @@ const App = {
                 @set-theme="setTheme"
             />
 
-            <!-- Main App -->
             <template v-else-if="currentView === 'app'">
                 <div class="h-full flex flex-col">
-                    <!-- Persistent Header -->
                     <header class="bg-white dark:bg-slate-800 border-b border-slate-200 dark:border-slate-700 px-2 py-2 flex items-center safe-area-top flex-shrink-0 z-10">
-                        <!-- Left: Back Button -->
                         <button
                             @click="goBack"
                             :class="[
@@ -449,13 +437,11 @@ const App = {
                             </svg>
                         </button>
 
-                        <!-- Center: Logo -->
                         <div class="flex-1 flex justify-center">
                             <img src="/assets/images/xinon-full-transparent.png" class="h-7 dark:hidden" alt="Logo">
                             <img src="/assets/images/xinon-full-transparent-white.png" class="h-7 hidden dark:block" alt="Logo">
                         </div>
 
-                        <!-- Right: Settings -->
                         <button
                             @click="showSettings = true"
                             class="w-10 h-10 flex items-center justify-center rounded-full text-slate-500 dark:text-slate-400 hover:bg-slate-100 dark:hover:bg-slate-700 transition"
@@ -467,8 +453,30 @@ const App = {
                         </button>
                     </header>
 
-                    <!-- Content Area -->
                     <main class="flex-1 overflow-y-auto">
+                        <div v-if="showContinuePrompt && !currentModule" class="p-3 pb-0">
+                            <div class="bg-primary/10 dark:bg-primary/20 border border-primary/30 rounded-xl p-4">
+                                <div class="flex items-center justify-between">
+                                    <div class="flex-1 min-w-0">
+                                        <p class="text-xs text-primary/70 dark:text-primary/80 font-medium uppercase tracking-wide">Fortsetzen</p>
+                                        <p class="font-semibold text-slate-800 dark:text-white truncate">
+                                            {{ lastWorkflow?.module }}<template v-if="lastWorkflow?.submodule"> › {{ lastWorkflow.submodule }}</template>
+                                        </p>
+                                    </div>
+                                    <div class="flex gap-2 ml-3">
+                                        <button @click="dismissContinuePrompt" class="p-2 text-slate-400 hover:text-slate-600 dark:hover:text-slate-300">
+                                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+                                            </svg>
+                                        </button>
+                                        <button @click="continueLastWorkflow" class="px-4 py-2 bg-primary text-white font-bold rounded-lg hover:bg-primary/90 transition">
+                                            Weiter
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
                         <MainMenu
                             v-if="!currentModule"
                             :user="user"
@@ -483,10 +491,22 @@ const App = {
                             @navigate="navigate"
                             @toast="showToast"
                         />
+
+                        <ShippingNoteModule
+                            v-else-if="currentModule?.toLowerCase() === 'lieferschein'"
+                            :user="user"
+                            @toast="showToast"
+                        />
+
+                        <WorkorderModule
+                            v-else-if="currentModule?.toLowerCase() === 'workorder'"
+                            :user="user"
+                            @navigate="navigate"
+                            @toast="showToast"
+                        />
                     </main>
                 </div>
 
-                <!-- Settings Panel -->
                 <transition name="slide-right">
                     <div v-if="showSettings" class="fixed inset-0 z-50">
                         <div class="absolute inset-0 bg-black/40" @click="showSettings = false"></div>
@@ -500,13 +520,11 @@ const App = {
                                 </button>
                             </div>
                             <div class="flex-1 overflow-y-auto">
-                                <!-- User Info -->
                                 <div class="px-4 py-3 border-b border-slate-100 dark:border-slate-700">
                                     <p class="font-medium text-slate-800 dark:text-white">{{ user?.name }}</p>
                                     <p class="text-sm text-slate-500 dark:text-slate-400">{{ user?.username }}</p>
                                 </div>
 
-                                <!-- Theme Selection -->
                                 <div class="px-4 py-3">
                                     <p class="text-xs font-medium text-slate-500 dark:text-slate-400 uppercase tracking-wide mb-2">Farbschema</p>
                                     <div class="flex space-x-2">
@@ -525,7 +543,6 @@ const App = {
                                     </div>
                                 </div>
 
-                                <!-- Lager Settings -->
                                 <div class="px-4 py-3 border-t border-slate-100 dark:border-slate-700">
                                     <p class="text-xs font-medium text-slate-500 dark:text-slate-400 uppercase tracking-wide mb-3">Lager</p>
                                     <div class="flex items-center justify-between">
@@ -549,7 +566,6 @@ const App = {
                                 </div>
                             </div>
 
-                            <!-- Logout at bottom -->
                             <div class="p-3 border-t border-slate-100 dark:border-slate-700">
                                 <button
                                     @click="showSettings = false; handleLogout()"
@@ -566,7 +582,6 @@ const App = {
                 </transition>
             </template>
 
-            <!-- Toast Notifications -->
             <transition name="slide-up">
                 <div v-if="toast.show" class="toast-container">
                     <div :class="['toast', 'toast-' + toast.type]">
diff --git a/public/mobile/components/LoginScreen.js b/public/mobile/components/LoginScreen.js
index 47acf087f..8e1fd7075 100644
--- a/public/mobile/components/LoginScreen.js
+++ b/public/mobile/components/LoginScreen.js
@@ -1,13 +1,3 @@
-/**
- * LoginScreen Component
- *
- * Displays the login form for the PWA with 2FA support.
- * Features:
- * - Username/password authentication
- * - 2FA verification with OTP auto-detection (Web OTP API for Android, autocomplete for iOS)
- * - Remember me option
- */
-
 import { login, verify2FA, resend2FA } from '/mobile/shared/auth.js';
 
 export default {
@@ -23,32 +13,24 @@ export default {
     setup(props, { emit }) {
         const { ref, onMounted, onUnmounted, nextTick } = Vue;
 
-        // Login form state
         const username = ref('');
         const password = ref('');
         const rememberMe = ref(true);
         const showPassword = ref(false);
-
-        // 2FA state
         const show2FA = ref(false);
         const otpCode = ref('');
         const otpDigits = ref(['', '', '', '', '']);
         const deliveryMethod = ref('');
         const maskedTarget = ref('');
         const resendCooldown = ref(0);
-
-        // General state
         const error = ref('');
         const success = ref('');
         const loading = ref(false);
-        const showThemePicker = ref(!localStorage.getItem('theme'));
-
-        // OTP input refs
+        const showThemePicker = ref(false);
         let otpInputRefs = [];
         let otpAbortController = null;
         let resendTimer = null;
 
-        // Handle login form submission
         const handleSubmit = async () => {
             if (!username.value || !password.value) {
                 error.value = 'Bitte Benutzername und Passwort eingeben';
@@ -59,7 +41,6 @@ export default {
             error.value = '';
 
             try {
-                // Call login API directly
                 const result = await login({
                     username: username.value,
                     password: password.value,
@@ -168,20 +149,20 @@ export default {
             }
         };
 
-        // Go back to login form
         const backToLogin = () => {
             show2FA.value = false;
             otpDigits.value = ['', '', '', '', ''];
+            otpInputRefs = [];
             error.value = '';
             success.value = '';
             abortWebOTP();
         };
 
-        // Reset after session expired
         const resetTo2FA = () => {
             show2FA.value = false;
             password.value = '';
             otpDigits.value = ['', '', '', '', ''];
+            otpInputRefs = [];
             error.value = 'Sitzung abgelaufen. Bitte erneut anmelden.';
         };
 
@@ -197,11 +178,12 @@ export default {
             }, 1000);
         };
 
-        // OTP input handlers
         const focusOtpInput = (index) => {
-            const inputs = document.querySelectorAll('.otp-input');
-            if (inputs[index]) {
-                inputs[index].focus();
+            if (otpInputRefs.length === 0) {
+                otpInputRefs = Array.from(document.querySelectorAll('.otp-input'));
+            }
+            if (otpInputRefs[index]) {
+                otpInputRefs[index].focus();
             }
         };
 
diff --git a/public/mobile/components/MainMenu.js b/public/mobile/components/MainMenu.js
index 6efe3d0d8..823e5b83a 100644
--- a/public/mobile/components/MainMenu.js
+++ b/public/mobile/components/MainMenu.js
@@ -15,6 +15,20 @@ export default {
     setup(props, { emit }) {
         // Available modules
         const modules = [
+            {
+                id: 'Workorder',
+                name: 'Aufträge',
+                icon: 'clipboard-check',
+                color: 'bg-sky-500',
+                iconColor: 'text-sky-500'
+            },
+            {
+                id: 'Lieferschein',
+                name: 'Lieferschein',
+                icon: 'document',
+                color: 'bg-purple-500',
+                iconColor: 'text-purple-500'
+            },
             {
                 id: 'Lager',
                 name: 'Lager',
@@ -22,7 +36,6 @@ export default {
                 color: 'bg-blue-500',
                 iconColor: 'text-blue-500'
             }
-            // Future modules can be added here
         ];
 
         const openModule = (moduleId) => {
@@ -49,7 +62,13 @@ export default {
                     ]"
                 >
                     <div :class="[module.color, 'w-10 h-10 rounded-lg flex items-center justify-center flex-shrink-0']">
-                        <svg v-if="module.icon === 'warehouse'" xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-white" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <svg v-if="module.icon === 'clipboard-check'" xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-white" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4" />
+                        </svg>
+                        <svg v-else-if="module.icon === 'document'" xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-white" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z" />
+                        </svg>
+                        <svg v-else-if="module.icon === 'warehouse'" xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-white" fill="none" viewBox="0 0 24 24" stroke="currentColor">
                             <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 14v3m4-3v3m4-3v3M3 21h18M3 10h18M3 7l9-4 9 4M4 10h16v11H4V10z" />
                         </svg>
                     </div>
diff --git a/public/mobile/modules/lager/inventur/Scanner.js b/public/mobile/modules/lager/inventur/Scanner.js
index 0697fbc67..0ef5909e7 100644
--- a/public/mobile/modules/lager/inventur/Scanner.js
+++ b/public/mobile/modules/lager/inventur/Scanner.js
@@ -1,19 +1,6 @@
-/**
- * Scanner Component (Inventur)
- *
- * The main scanning interface for stocktakes.
- * Uses the new API path: /MobileApp/Lager/Inventur/{action}
- */
+import { createModuleApi, debounce } from '/mobile/shared/api.js';
 
-// Inventur-specific API
-const inventurApi = {
-    get: (endpoint) => fetch(`/MobileApp/Lager/Inventur/${endpoint}`).then(r => r.json()),
-    post: (endpoint, data) => fetch(`/MobileApp/Lager/Inventur/${endpoint}`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(data)
-    }).then(r => r.json())
-};
+const inventurApi = createModuleApi('Lager/Inventur');
 
 export default {
     name: 'Scanner',
@@ -26,44 +13,29 @@ export default {
     setup(props, { emit }) {
         const { ref, onMounted, onUnmounted, nextTick, computed } = Vue;
 
-        // State
         const currentTab = ref('scan');
         const isLoading = ref(false);
-
-        // Scanner
         const scanner = ref(null);
         const isScannerActive = ref(false);
         const scannerError = ref('');
-
-        // Article
         const scannedArticle = ref(null);
         const quantity = ref('1');
         const rack = ref('');
         const shelf = ref('');
-
-        // Search
         const searchQuery = ref('');
         const searchResults = ref([]);
         const categories = ref([]);
         const selectedCategory = ref(0);
         const isSearching = ref(false);
-
-        // History
         const recentScans = ref([]);
         const isLoadingHistory = ref(false);
-
-        // Warning
         const alreadyScannedWarning = ref(null);
-
-        // Keypad
         const showKeypad = ref(false);
 
-        // Computed
         const canSubmit = computed(() => {
             return scannedArticle.value && parseFloat(quantity.value) > 0 && !isLoading.value;
         });
 
-        // Scanner functions
         const startScanner = async () => {
             scannerError.value = '';
             try {
@@ -92,7 +64,6 @@ export default {
             await lookupArticle(decodedText);
         };
 
-        // Article lookup
         const lookupArticle = async (code) => {
             isLoading.value = true;
             alreadyScannedWarning.value = null;
@@ -121,7 +92,6 @@ export default {
             }
         };
 
-        // Submit
         const submitScan = async (overwrite = false) => {
             if (!canSubmit.value) return;
             isLoading.value = true;
@@ -140,6 +110,7 @@ export default {
                 const result = await inventurApi.post('submitScan', payload);
 
                 if (result.success) {
+                    navigator.vibrate?.([100]);
                     emit('toast', result.message, 'success');
                     scannedArticle.value = null;
                     quantity.value = '1';
@@ -157,13 +128,12 @@ export default {
             }
         };
 
-        // Search
         const loadCategories = async () => {
             const result = await inventurApi.get('getCategories');
             if (result.success) categories.value = result.categories;
         };
 
-        const searchArticles = async () => {
+        const doSearch = async () => {
             if (searchQuery.value.length < 2 && !selectedCategory.value) {
                 searchResults.value = [];
                 return;
@@ -180,6 +150,8 @@ export default {
             }
         };
 
+        const searchArticles = debounce(doSearch, 300);
+
         const selectSearchResult = async (article) => {
             await stopScanner();
             scannedArticle.value = article;
@@ -194,7 +166,6 @@ export default {
             }
         };
 
-        // History
         const loadHistory = async () => {
             isLoadingHistory.value = true;
             try {
@@ -205,7 +176,6 @@ export default {
             }
         };
 
-        // Keypad
         const appendDigit = (digit) => {
             if (digit === '.' && quantity.value.includes('.')) return;
             if (quantity.value === '0' && digit !== '.') {
@@ -221,7 +191,6 @@ export default {
 
         const clearQuantity = () => { quantity.value = '0'; };
 
-        // Navigation
         const handleClose = async () => {
             await stopScanner();
             emit('close');
@@ -265,7 +234,6 @@ export default {
 
     template: `
         <div class="flex flex-col h-full">
-            <!-- Title bar with close -->
             <div class="flex items-center justify-between px-3 py-2 bg-white dark:bg-slate-800 border-b border-slate-200 dark:border-slate-700">
                 <span class="text-sm font-medium text-slate-600 dark:text-slate-300 truncate flex-1">{{ stocktake.title || 'Inventur #' + stocktake.stocktakeNumber }}</span>
                 <button @click="handleClose" class="ml-2 p-1.5 rounded-full text-slate-500 hover:bg-slate-100 dark:hover:bg-slate-700 transition">
@@ -275,18 +243,14 @@ export default {
                 </button>
             </div>
 
-            <!-- Tabs -->
             <div class="flex bg-slate-100 dark:bg-slate-900 border-b border-slate-200 dark:border-slate-700 px-3 py-2">
                 <button @click="switchTab('scan')" :class="[currentTab === 'scan' ? 'bg-white dark:bg-slate-800 shadow-sm' : 'text-slate-500 dark:text-slate-400']" class="flex-1 py-2 text-sm font-medium rounded-lg transition">Scannen</button>
                 <button @click="switchTab('search')" :class="[currentTab === 'search' ? 'bg-white dark:bg-slate-800 shadow-sm' : 'text-slate-500 dark:text-slate-400']" class="flex-1 py-2 text-sm font-medium rounded-lg transition mx-1">Suche</button>
                 <button @click="switchTab('history')" :class="[currentTab === 'history' ? 'bg-white dark:bg-slate-800 shadow-sm' : 'text-slate-500 dark:text-slate-400']" class="flex-1 py-2 text-sm font-medium rounded-lg transition">Verlauf</button>
             </div>
 
-            <!-- Content -->
             <main class="flex-grow overflow-y-auto bg-slate-50 dark:bg-slate-900">
-                <!-- SCAN TAB -->
                 <div v-if="currentTab === 'scan'" class="p-4 space-y-4">
-                    <!-- Scanner -->
                     <div v-if="!scannedArticle" class="space-y-4">
                         <div id="qr-reader" class="w-full rounded-lg overflow-hidden bg-black"></div>
                         <div v-if="scannerError" class="p-4 bg-red-50 dark:bg-red-900/30 rounded-lg">
@@ -296,9 +260,7 @@ export default {
                         <p class="text-center text-sm text-slate-500 dark:text-slate-400">QR-Code scannen oder Artikel suchen</p>
                     </div>
 
-                    <!-- Scanned Article -->
                     <div v-else class="space-y-4">
-                        <!-- Warning -->
                         <div v-if="alreadyScannedWarning" class="p-4 bg-amber-50 dark:bg-amber-900/30 border border-amber-200 dark:border-amber-800 rounded-lg">
                             <div class="flex items-start">
                                 <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-amber-500 mr-2 flex-shrink-0 mt-0.5" viewBox="0 0 20 20" fill="currentColor">
@@ -315,24 +277,31 @@ export default {
                             </div>
                         </div>
 
-                        <!-- Article Info -->
                         <div class="bg-white dark:bg-slate-800 p-4 rounded-lg shadow-sm">
                             <h3 class="font-bold text-lg text-slate-800 dark:text-white">{{ scannedArticle.title }}</h3>
                             <p class="text-sm text-slate-500 dark:text-slate-400 mt-1">Art.-Nr.: {{ scannedArticle.articleNumber }}</p>
                             <p v-if="scannedArticle.categoryName" class="text-sm text-slate-500 dark:text-slate-400">Kategorie: {{ scannedArticle.categoryName }}</p>
                         </div>
 
-                        <!-- Quantity -->
                         <div class="bg-white dark:bg-slate-800 p-4 rounded-lg shadow-sm">
                             <label class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
                                 Menge ({{ scannedArticle.unit || 'Stk.' }})
                             </label>
-                            <div @click="showKeypad = true" class="w-full p-4 text-3xl font-bold text-center border-2 border-slate-300 dark:border-slate-600 rounded-lg cursor-pointer hover:border-primary transition text-slate-800 dark:text-white">
-                                {{ quantity }}
+                            <div class="flex gap-2 mb-3">
+                                <button @click="quantity = '1'" :class="['flex-1 py-2 rounded-lg font-bold transition', quantity === '1' ? 'bg-primary text-white' : 'bg-slate-100 dark:bg-slate-700 text-slate-700 dark:text-slate-300']">1</button>
+                                <button @click="quantity = '5'" :class="['flex-1 py-2 rounded-lg font-bold transition', quantity === '5' ? 'bg-primary text-white' : 'bg-slate-100 dark:bg-slate-700 text-slate-700 dark:text-slate-300']">5</button>
+                                <button @click="quantity = '10'" :class="['flex-1 py-2 rounded-lg font-bold transition', quantity === '10' ? 'bg-primary text-white' : 'bg-slate-100 dark:bg-slate-700 text-slate-700 dark:text-slate-300']">10</button>
+                                <button @click="quantity = '20'" :class="['flex-1 py-2 rounded-lg font-bold transition', quantity === '20' ? 'bg-primary text-white' : 'bg-slate-100 dark:bg-slate-700 text-slate-700 dark:text-slate-300']">20</button>
+                            </div>
+                            <div class="flex items-center gap-2">
+                                <button @click="quantity = String(Math.max(1, parseFloat(quantity) - 1))" class="w-14 h-14 bg-slate-100 dark:bg-slate-700 rounded-lg text-2xl font-bold text-slate-700 dark:text-slate-300 active:bg-slate-200 dark:active:bg-slate-600">-</button>
+                                <div @click="showKeypad = true" class="flex-1 p-3 text-3xl font-bold text-center border-2 border-slate-300 dark:border-slate-600 rounded-lg cursor-pointer hover:border-primary transition text-slate-800 dark:text-white">
+                                    {{ quantity }}
+                                </div>
+                                <button @click="quantity = String(parseFloat(quantity) + 1)" class="w-14 h-14 bg-slate-100 dark:bg-slate-700 rounded-lg text-2xl font-bold text-slate-700 dark:text-slate-300 active:bg-slate-200 dark:active:bg-slate-600">+</button>
                             </div>
                         </div>
 
-                        <!-- Rack/Shelf -->
                         <div class="grid grid-cols-2 gap-3">
                             <div>
                                 <label class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-1">Regal</label>
@@ -344,19 +313,17 @@ export default {
                             </div>
                         </div>
 
-                        <!-- Buttons -->
                         <div class="space-y-2">
-                            <button v-if="alreadyScannedWarning" @click="submitScan(false)" :disabled="!canSubmit" class="w-full py-4 bg-green-600 text-white font-bold rounded-lg disabled:opacity-50">Zur Menge addieren</button>
-                            <button v-if="alreadyScannedWarning" @click="submitScan(true)" :disabled="!canSubmit" class="w-full py-4 bg-amber-600 text-white font-bold rounded-lg disabled:opacity-50">Überschreiben</button>
-                            <button v-if="!alreadyScannedWarning" @click="submitScan(false)" :disabled="!canSubmit" class="w-full py-4 bg-green-600 text-white font-bold rounded-lg disabled:opacity-50">
+                            <button v-if="alreadyScannedWarning" @click="submitScan(false)" :disabled="!canSubmit" class="w-full py-5 bg-green-600 text-white text-lg font-bold rounded-xl disabled:opacity-50 active:scale-[0.98] transition">Zur Menge addieren</button>
+                            <button v-if="alreadyScannedWarning" @click="submitScan(true)" :disabled="!canSubmit" class="w-full py-4 bg-amber-600 text-white font-bold rounded-xl disabled:opacity-50 active:scale-[0.98] transition">Überschreiben</button>
+                            <button v-if="!alreadyScannedWarning" @click="submitScan(false)" :disabled="!canSubmit" class="w-full py-5 bg-green-600 text-white text-lg font-bold rounded-xl disabled:opacity-50 active:scale-[0.98] transition">
                                 {{ isLoading ? 'Speichert...' : 'Speichern' }}
                             </button>
-                            <button @click="cancelScan" class="w-full py-3 text-slate-600 dark:text-slate-400 font-medium">Abbrechen</button>
+                            <button @click="cancelScan" class="w-full py-2 text-sm text-slate-500 dark:text-slate-400 hover:text-slate-700 dark:hover:text-slate-300">Abbrechen</button>
                         </div>
                     </div>
                 </div>
 
-                <!-- SEARCH TAB -->
                 <div v-else-if="currentTab === 'search'" class="p-4 space-y-4">
                     <div class="sticky top-0 bg-slate-100 dark:bg-slate-900 pb-2 space-y-3">
                         <input v-model="searchQuery" @input="searchArticles" type="search" placeholder="Artikel suchen..." class="w-full p-3 border border-slate-300 dark:border-slate-600 rounded-lg dark:bg-slate-800 dark:text-white">
@@ -382,7 +349,6 @@ export default {
                     </div>
                 </div>
 
-                <!-- HISTORY TAB -->
                 <div v-else-if="currentTab === 'history'" class="p-4">
                     <div v-if="isLoadingHistory" class="space-y-3">
                         <div v-for="i in 5" :key="i" class="bg-white dark:bg-slate-800 p-3 rounded-lg shadow-sm animate-pulse">
@@ -412,7 +378,6 @@ export default {
                 </div>
             </main>
 
-            <!-- Keypad -->
             <transition name="slide-up">
                 <div v-if="showKeypad" class="fixed inset-0 bg-black bg-opacity-50 z-50 flex items-end">
                     <div class="bg-white dark:bg-slate-800 w-full rounded-t-2xl p-4 safe-area-bottom">
diff --git a/public/mobile/modules/lager/inventur/StocktakeList.js b/public/mobile/modules/lager/inventur/StocktakeList.js
index 4fd749571..31f0de4c2 100644
--- a/public/mobile/modules/lager/inventur/StocktakeList.js
+++ b/public/mobile/modules/lager/inventur/StocktakeList.js
@@ -1,21 +1,6 @@
-/**
- * StocktakeList Component (Inventur)
- *
- * Displays a list of active stocktakes.
- * Uses the new API path: /MobileApp/Lager/Inventur/{action}
- */
+import { createModuleApi } from '/mobile/shared/api.js';
 
-import { api } from '/mobile/shared/auth.js';
-
-// Override API base for Inventur
-const inventurApi = {
-    get: (endpoint) => fetch(`/MobileApp/Lager/Inventur/${endpoint}`).then(r => r.json()),
-    post: (endpoint, data) => fetch(`/MobileApp/Lager/Inventur/${endpoint}`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(data)
-    }).then(r => r.json())
-};
+const inventurApi = createModuleApi('Lager/Inventur');
 
 export default {
     name: 'StocktakeList',
diff --git a/public/mobile/modules/lager/movement/MovementForm.js b/public/mobile/modules/lager/movement/MovementForm.js
index d10b8fe1e..383df6415 100644
--- a/public/mobile/modules/lager/movement/MovementForm.js
+++ b/public/mobile/modules/lager/movement/MovementForm.js
@@ -1,20 +1,8 @@
-/**
- * MovementForm Component (WarehouseMovement)
- *
- * The main interface for stock movements (IN/OUT/ADJUSTMENT).
- * API: /MobileApp/Lager/Movement/{action}
- */
+import { createModuleApi, debounce } from '/mobile/shared/api.js';
+
+const movementApi = createModuleApi('Lager/Movement');
 
-const movementApi = {
-    get: (endpoint) => fetch(`/MobileApp/Lager/Movement/${endpoint}`).then(r => r.json()),
-    post: (endpoint, data) => fetch(`/MobileApp/Lager/Movement/${endpoint}`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(data)
-    }).then(r => r.json())
-};
 
-// Custom BottomSheet Select Component
 const BottomSheetSelect = {
     name: 'BottomSheetSelect',
     emits: ['update:modelValue'],
@@ -212,6 +200,14 @@ export default {
         const recentMovements = ref([]);
         const isLoadingHistory = ref(false);
 
+        // ==================== ORDER RECEIVING ====================
+        const pendingOrders = ref([]);
+        const isLoadingOrders = ref(false);
+        const selectedOrder = ref(null);
+        const orderPositions = ref([]);
+        const deliveryNotePhoto = ref(null);
+        const isSubmittingOrder = ref(false);
+
         // ==================== KEYPAD ====================
         const showKeypad = ref(false);
         const showNote = ref(false);
@@ -569,6 +565,9 @@ export default {
                 const result = await movementApi.post('submitMovement', payload);
 
                 if (result.success) {
+                    // Haptic feedback on success
+                    navigator.vibrate?.([100]);
+
                     // Store for undo
                     lastMovement.value = result.movement;
                     showUndo.value = true;
@@ -667,6 +666,8 @@ export default {
             isLoading.value = false;
 
             if (errorCount === 0) {
+                // Haptic feedback on success
+                navigator.vibrate?.([100, 50, 100]);
                 emit('toast', `${successCount} Bewegungen erfolgreich`, 'success');
                 clearCart();
             } else {
@@ -709,6 +710,8 @@ export default {
                 const result = await movementApi.post('submitMovement', payload);
 
                 if (result.success) {
+                    // Haptic feedback on success
+                    navigator.vibrate?.([100]);
                     emit('toast', result.message, 'success');
                     // Reset form
                     scannedArticle.value = null;
@@ -727,8 +730,7 @@ export default {
             }
         };
 
-        // Search
-        const searchArticles = async () => {
+        const doSearch = async () => {
             if (searchQuery.value.length < 2) {
                 searchResults.value = [];
                 return;
@@ -742,6 +744,8 @@ export default {
             }
         };
 
+        const searchArticles = debounce(doSearch, 300);
+
         const selectSearchResult = async (article) => {
             await stopScanner();
             scannedArticle.value = article;
@@ -767,6 +771,97 @@ export default {
             }
         };
 
+        // ==================== ORDER RECEIVING FUNCTIONS ====================
+        const loadPendingOrders = async () => {
+            isLoadingOrders.value = true;
+            try {
+                const result = await movementApi.get('getPendingOrders');
+                if (result.success) {
+                    pendingOrders.value = result.orders;
+                }
+            } catch (e) {
+                emit('toast', 'Fehler beim Laden der Bestellungen', 'error');
+            } finally {
+                isLoadingOrders.value = false;
+            }
+        };
+
+        const selectOrderForReceiving = async (order) => {
+            isLoadingOrders.value = true;
+            try {
+                const result = await movementApi.get(`getOrderForReceiving?orderId=${order.id}`);
+                if (result.success) {
+                    selectedOrder.value = result.order;
+                    orderPositions.value = result.positions;
+                    deliveryNotePhoto.value = null;
+                }
+            } catch (e) {
+                emit('toast', 'Fehler beim Laden der Bestellung', 'error');
+            } finally {
+                isLoadingOrders.value = false;
+            }
+        };
+
+        const cancelOrderReceiving = () => {
+            selectedOrder.value = null;
+            orderPositions.value = [];
+            deliveryNotePhoto.value = null;
+        };
+
+        const submitOrderReceiving = async () => {
+            if (!selectedOrder.value || !selectedLocation.value) return;
+
+            // Collect positions with quantity > 0
+            const positionsToSubmit = orderPositions.value
+                .filter(p => p.receivingQty > 0)
+                .map(p => ({
+                    articleId: p.articleId,
+                    quantity: p.receivingQty
+                }));
+
+            if (positionsToSubmit.length === 0) {
+                emit('toast', 'Bitte mindestens eine Menge eingeben', 'error');
+                return;
+            }
+
+            isSubmittingOrder.value = true;
+            try {
+                const result = await movementApi.post('submitOrderReceiving', {
+                    orderId: selectedOrder.value.id,
+                    locationId: selectedLocation.value,
+                    positions: positionsToSubmit,
+                    deliveryNoteFileId: deliveryNotePhoto.value,
+                    note: null
+                });
+
+                if (result.success) {
+                    navigator.vibrate?.([100, 50, 100]);
+                    emit('toast', result.message, 'success');
+                    // Reset and reload orders
+                    cancelOrderReceiving();
+                    await loadPendingOrders();
+                } else {
+                    emit('toast', result.message || 'Fehler beim Speichern', 'error');
+                }
+            } catch (e) {
+                emit('toast', 'Netzwerkfehler', 'error');
+            } finally {
+                isSubmittingOrder.value = false;
+            }
+        };
+
+        const setAllReceivingQty = () => {
+            orderPositions.value.forEach(p => {
+                p.receivingQty = p.remainingQty;
+            });
+        };
+
+        const clearAllReceivingQty = () => {
+            orderPositions.value.forEach(p => {
+                p.receivingQty = 0;
+            });
+        };
+
         // Keypad
         const appendDigit = (digit) => {
             if (digit === '.' && quantity.value.includes('.')) return;
@@ -794,6 +889,9 @@ export default {
             } else if (tab === 'history') {
                 await stopScanner();
                 await loadHistory();
+            } else if (tab === 'orders') {
+                await stopScanner();
+                await loadPendingOrders();
             }
         };
 
@@ -849,6 +947,11 @@ export default {
             searchQuery, searchResults, isSearching,
             // History
             recentMovements, isLoadingHistory,
+            // Order Receiving
+            pendingOrders, isLoadingOrders, selectedOrder, orderPositions,
+            deliveryNotePhoto, isSubmittingOrder,
+            loadPendingOrders, selectOrderForReceiving, cancelOrderReceiving,
+            submitOrderReceiving, setAllReceivingQty, clearAllReceivingQty,
             // UI
             showKeypad, showNote, canSubmit, typeColor,
             // Functions
@@ -923,29 +1026,30 @@ export default {
                     </button>
                 </div>
 
-                <!-- Mode Toggles & Quick Actions Bar (hidden in simple mode) -->
+                <!-- Mode Toggles (hidden in simple mode) -->
                 <div v-if="!simpleMode" class="flex items-center gap-2">
-                    <!-- Turbo Mode Toggle -->
+                    <!-- Turbo Mode Toggle - More Prominent -->
                     <button
                         @click="turboMode = !turboMode"
                         :class="[
-                            'flex items-center gap-1.5 px-3 py-2 rounded-lg text-xs font-medium transition-all',
+                            'flex items-center gap-2 px-4 py-2.5 rounded-xl font-medium transition-all flex-1',
                             turboMode
-                                ? 'bg-orange-500 text-white'
-                                : 'bg-white dark:bg-slate-800 text-slate-500 dark:text-slate-400 border border-slate-200 dark:border-slate-700'
+                                ? 'bg-gradient-to-r from-orange-500 to-orange-600 text-white shadow-lg shadow-orange-500/30'
+                                : 'bg-white dark:bg-slate-800 text-slate-600 dark:text-slate-400 border-2 border-dashed border-orange-300 dark:border-orange-800 hover:border-orange-400'
                         ]"
                     >
-                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
                             <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 10V3L4 14h7v7l9-11h-7z" />
                         </svg>
-                        Turbo
+                        <span class="text-sm">Turbo-Modus</span>
+                        <span v-if="!turboMode" class="text-xs opacity-60">(1-Klick)</span>
                     </button>
 
                     <!-- Batch Mode Toggle -->
                     <button
                         @click="batchMode = !batchMode"
                         :class="[
-                            'flex items-center gap-1.5 px-3 py-2 rounded-lg text-xs font-medium transition-all',
+                            'flex items-center gap-1.5 px-3 py-2.5 rounded-xl text-sm font-medium transition-all',
                             batchMode
                                 ? 'bg-purple-500 text-white'
                                 : 'bg-white dark:bg-slate-800 text-slate-500 dark:text-slate-400 border border-slate-200 dark:border-slate-700'
@@ -957,18 +1061,6 @@ export default {
                         Sammel
                         <span v-if="cartTotal > 0" class="bg-white/30 px-1.5 rounded-full">{{ cartTotal }}</span>
                     </button>
-
-                    <!-- Quick Actions -->
-                    <div class="flex-1"></div>
-                    <button
-                        @click="quickAction('OUT', 'Verbrauch')"
-                        class="flex items-center gap-1 px-3 py-2 rounded-lg text-xs font-medium bg-red-100 dark:bg-red-900/30 text-red-600 dark:text-red-400 hover:bg-red-200 dark:hover:bg-red-900/50 transition"
-                    >
-                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20 12H4" />
-                        </svg>
-                        Schnell
-                    </button>
                 </div>
             </div>
 
@@ -976,6 +1068,10 @@ export default {
             <div class="flex bg-slate-100 dark:bg-slate-900 border-b border-slate-200 dark:border-slate-700 px-3 py-2">
                 <button @click="switchTab('scan')" :class="[currentTab === 'scan' ? 'bg-white dark:bg-slate-800 shadow-sm' : 'text-slate-500 dark:text-slate-400']" class="flex-1 py-2 text-sm font-medium rounded-lg transition">Scannen</button>
                 <button @click="switchTab('search')" :class="[currentTab === 'search' ? 'bg-white dark:bg-slate-800 shadow-sm' : 'text-slate-500 dark:text-slate-400']" class="flex-1 py-2 text-sm font-medium rounded-lg transition mx-1">Suche</button>
+                <button v-if="!simpleMode" @click="switchTab('orders')" :class="[currentTab === 'orders' ? 'bg-white dark:bg-slate-800 shadow-sm' : 'text-slate-500 dark:text-slate-400', pendingOrders.length > 0 ? 'relative' : '']" class="flex-1 py-2 text-sm font-medium rounded-lg transition mx-1">
+                    Bestellung
+                    <span v-if="pendingOrders.length > 0 && currentTab !== 'orders'" class="absolute -top-1 -right-1 bg-blue-500 text-white text-xs w-5 h-5 rounded-full flex items-center justify-center">{{ pendingOrders.length }}</span>
+                </button>
                 <button v-if="!simpleMode" @click="switchTab('history')" :class="[currentTab === 'history' ? 'bg-white dark:bg-slate-800 shadow-sm' : 'text-slate-500 dark:text-slate-400']" class="flex-1 py-2 text-sm font-medium rounded-lg transition">Verlauf</button>
             </div>
 
@@ -1016,17 +1112,30 @@ export default {
                             </div>
                         </div>
 
-                        <!-- Quantity (Compact) -->
-                        <div @click="showKeypad = true" :class="[
-                            'flex items-center justify-between p-3 rounded-xl cursor-pointer transition active:scale-[0.98]',
-                            selectedType === 'IN' ? 'bg-green-500 text-white' : '',
-                            selectedType === 'OUT' ? 'bg-red-500 text-white' : '',
-                            selectedType === 'ADJUSTMENT' ? 'bg-yellow-500 text-white' : ''
-                        ]">
-                            <span class="font-medium">Menge</span>
-                            <span class="text-2xl font-bold">
-                                {{ selectedType === 'OUT' ? '-' : selectedType === 'IN' ? '+' : '' }}{{ quantity }}
-                            </span>
+                        <!-- Quantity with Quick Buttons -->
+                        <div class="bg-white dark:bg-slate-800 p-3 rounded-xl shadow-sm">
+                            <!-- Quick preset buttons -->
+                            <div class="flex gap-2 mb-2">
+                                <button @click="quantity = '1'" :class="['flex-1 py-2 rounded-lg font-bold text-sm transition', quantity === '1' ? 'bg-primary text-white' : 'bg-slate-100 dark:bg-slate-700 text-slate-700 dark:text-slate-300']">1</button>
+                                <button @click="quantity = '5'" :class="['flex-1 py-2 rounded-lg font-bold text-sm transition', quantity === '5' ? 'bg-primary text-white' : 'bg-slate-100 dark:bg-slate-700 text-slate-700 dark:text-slate-300']">5</button>
+                                <button @click="quantity = '10'" :class="['flex-1 py-2 rounded-lg font-bold text-sm transition', quantity === '10' ? 'bg-primary text-white' : 'bg-slate-100 dark:bg-slate-700 text-slate-700 dark:text-slate-300']">10</button>
+                                <button @click="quantity = '20'" :class="['flex-1 py-2 rounded-lg font-bold text-sm transition', quantity === '20' ? 'bg-primary text-white' : 'bg-slate-100 dark:bg-slate-700 text-slate-700 dark:text-slate-300']">20</button>
+                            </div>
+                            <!-- Quantity with +/- and colored display -->
+                            <div class="flex items-center gap-2">
+                                <button @click="quantity = String(Math.max(1, parseFloat(quantity) - 1))" class="w-12 h-12 bg-slate-100 dark:bg-slate-700 rounded-lg text-xl font-bold text-slate-700 dark:text-slate-300 active:bg-slate-200 dark:active:bg-slate-600">-</button>
+                                <div @click="showKeypad = true" :class="[
+                                    'flex-1 py-3 rounded-xl cursor-pointer transition active:scale-[0.98] text-center',
+                                    selectedType === 'IN' ? 'bg-green-500 text-white' : '',
+                                    selectedType === 'OUT' ? 'bg-red-500 text-white' : '',
+                                    selectedType === 'ADJUSTMENT' ? 'bg-yellow-500 text-white' : ''
+                                ]">
+                                    <span class="text-2xl font-bold">
+                                        {{ selectedType === 'OUT' ? '-' : selectedType === 'IN' ? '+' : '' }}{{ quantity }}
+                                    </span>
+                                </div>
+                                <button @click="quantity = String(parseFloat(quantity) + 1)" class="w-12 h-12 bg-slate-100 dark:bg-slate-700 rounded-lg text-xl font-bold text-slate-700 dark:text-slate-300 active:bg-slate-200 dark:active:bg-slate-600">+</button>
+                            </div>
                         </div>
 
                         <!-- Reason + Note Button (Combined Row) -->
@@ -1065,19 +1174,13 @@ export default {
                             ></textarea>
                         </div>
 
-                        <!-- Buttons Row -->
-                        <div class="flex gap-2">
-                            <button
-                                @click="cancelScan"
-                                class="flex-1 py-3 font-medium rounded-xl bg-slate-200 dark:bg-slate-700 text-slate-600 dark:text-slate-300 transition active:scale-[0.98]"
-                            >
-                                Abbrechen
-                            </button>
+                        <!-- Buttons -->
+                        <div class="space-y-2">
                             <button
                                 @click="submitMovement"
                                 :disabled="!canSubmit"
                                 :class="[
-                                    'flex-[2] py-3 font-bold rounded-xl text-white transition active:scale-[0.98] disabled:opacity-50 disabled:active:scale-100',
+                                    'w-full py-5 text-lg font-bold rounded-xl text-white transition active:scale-[0.98] disabled:opacity-50 disabled:active:scale-100',
                                     selectedType === 'IN' ? 'bg-green-600' : '',
                                     selectedType === 'OUT' ? 'bg-red-600' : '',
                                     selectedType === 'ADJUSTMENT' ? 'bg-yellow-600' : ''
@@ -1085,6 +1188,12 @@ export default {
                             >
                                 {{ isLoading ? 'Speichert...' : (selectedType === 'IN' ? 'Einbuchen' : selectedType === 'OUT' ? 'Ausbuchen' : 'Korrigieren') }}
                             </button>
+                            <button
+                                @click="cancelScan"
+                                class="w-full py-2 text-sm text-slate-500 dark:text-slate-400 hover:text-slate-700 dark:hover:text-slate-300"
+                            >
+                                Abbrechen
+                            </button>
                         </div>
                     </div>
                 </div>
@@ -1163,6 +1272,149 @@ export default {
                         </div>
                     </div>
                 </div>
+
+                <!-- ORDERS TAB -->
+                <div v-else-if="currentTab === 'orders'" class="p-4">
+                    <!-- Loading -->
+                    <div v-if="isLoadingOrders" class="space-y-3">
+                        <div v-for="i in 3" :key="i" class="bg-white dark:bg-slate-800 p-4 rounded-xl shadow-sm animate-pulse">
+                            <div class="h-5 bg-slate-200 dark:bg-slate-700 rounded w-1/2 mb-3"></div>
+                            <div class="h-4 bg-slate-200 dark:bg-slate-700 rounded w-3/4"></div>
+                        </div>
+                    </div>
+
+                    <!-- Order List (when no order selected) -->
+                    <template v-else-if="!selectedOrder">
+                        <div v-if="pendingOrders.length === 0" class="text-center py-12">
+                            <svg xmlns="http://www.w3.org/2000/svg" class="h-16 w-16 mx-auto text-slate-300 dark:text-slate-600 mb-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4" />
+                            </svg>
+                            <p class="text-slate-500 dark:text-slate-400 text-lg font-medium">Keine offenen Bestellungen</p>
+                            <p class="text-slate-400 dark:text-slate-500 text-sm mt-1">Alle Lieferungen wurden empfangen</p>
+                        </div>
+
+                        <div v-else class="space-y-3">
+                            <p class="text-sm text-slate-500 dark:text-slate-400 mb-2">{{ pendingOrders.length }} Bestellung(en) warten auf Wareneingang:</p>
+                            <div
+                                v-for="order in pendingOrders"
+                                :key="order.id"
+                                @click="selectOrderForReceiving(order)"
+                                class="bg-white dark:bg-slate-800 p-4 rounded-xl shadow-sm cursor-pointer hover:shadow-md active:scale-[0.98] transition"
+                            >
+                                <div class="flex items-start justify-between">
+                                    <div class="flex-1">
+                                        <div class="flex items-center gap-2 mb-1">
+                                            <span class="font-bold text-slate-800 dark:text-white">{{ order.orderNumber }}</span>
+                                            <span :class="[
+                                                'px-2 py-0.5 text-xs font-medium rounded',
+                                                order.status === 'sent' ? 'bg-blue-100 text-blue-700 dark:bg-blue-900/30 dark:text-blue-400' : 'bg-yellow-100 text-yellow-700 dark:bg-yellow-900/30 dark:text-yellow-400'
+                                            ]">
+                                                {{ order.statusLabel }}
+                                            </span>
+                                        </div>
+                                        <p class="text-slate-600 dark:text-slate-300">{{ order.distributorName }}</p>
+                                        <p class="text-sm text-slate-500 dark:text-slate-400 mt-1">
+                                            {{ order.positionCount }} Position(en) · {{ order.totalItems }} Artikel gesamt
+                                        </p>
+                                    </div>
+                                    <div class="text-right">
+                                        <p class="text-xs text-slate-400">{{ order.create }}</p>
+                                        <p v-if="order.daysSinceSent > 0" :class="['text-xs mt-1', order.daysSinceSent > 7 ? 'text-red-500 font-medium' : 'text-slate-400']">
+                                            {{ order.daysSinceSent }} Tag(e)
+                                        </p>
+                                    </div>
+                                </div>
+                                <div class="mt-3 flex items-center gap-2 text-primary">
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4" />
+                                    </svg>
+                                    <span class="text-sm font-medium">Wareneingang erfassen</span>
+                                </div>
+                            </div>
+                        </div>
+                    </template>
+
+                    <!-- Order Receiving Form (when order selected) -->
+                    <template v-else>
+                        <!-- Header -->
+                        <div class="bg-white dark:bg-slate-800 p-4 rounded-xl shadow-sm mb-4">
+                            <div class="flex items-start justify-between mb-2">
+                                <div>
+                                    <h3 class="font-bold text-lg text-slate-800 dark:text-white">{{ selectedOrder.orderNumber }}</h3>
+                                    <p class="text-slate-600 dark:text-slate-300">{{ selectedOrder.distributorName }}</p>
+                                </div>
+                                <button @click="cancelOrderReceiving" class="p-2 hover:bg-slate-100 dark:hover:bg-slate-700 rounded-lg transition">
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-slate-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+                                    </svg>
+                                </button>
+                            </div>
+                            <p class="text-sm text-slate-500 dark:text-slate-400">Bestellt: {{ selectedOrder.create }}</p>
+                        </div>
+
+                        <!-- Quick Actions -->
+                        <div class="flex gap-2 mb-4">
+                            <button @click="setAllReceivingQty" class="flex-1 py-2 px-3 bg-green-100 dark:bg-green-900/30 text-green-700 dark:text-green-400 rounded-lg text-sm font-medium transition active:scale-[0.98]">
+                                Alle übernehmen
+                            </button>
+                            <button @click="clearAllReceivingQty" class="flex-1 py-2 px-3 bg-slate-100 dark:bg-slate-700 text-slate-600 dark:text-slate-300 rounded-lg text-sm font-medium transition active:scale-[0.98]">
+                                Alle löschen
+                            </button>
+                        </div>
+
+                        <!-- Positions -->
+                        <div class="space-y-3 mb-4">
+                            <div
+                                v-for="(pos, index) in orderPositions"
+                                :key="pos.articleId"
+                                class="bg-white dark:bg-slate-800 p-4 rounded-xl shadow-sm"
+                            >
+                                <div class="flex items-start justify-between mb-3">
+                                    <div class="flex-1 min-w-0">
+                                        <p class="font-medium text-slate-800 dark:text-white truncate">{{ pos.articleTitle }}</p>
+                                        <p class="text-xs text-slate-500 dark:text-slate-400">{{ pos.articleNumber }}</p>
+                                    </div>
+                                    <div class="text-right text-sm text-slate-500 dark:text-slate-400 ml-2">
+                                        <p>Bestellt: {{ pos.orderedQty }}</p>
+                                        <p v-if="pos.deliveredQty > 0" class="text-green-600 dark:text-green-400">Erhalten: {{ pos.deliveredQty }}</p>
+                                    </div>
+                                </div>
+                                <div class="flex items-center gap-3">
+                                    <span class="text-sm text-slate-500 dark:text-slate-400 w-20">Empfangen:</span>
+                                    <div class="flex items-center gap-2 flex-1">
+                                        <button
+                                            @click="orderPositions[index].receivingQty = Math.max(0, pos.receivingQty - 1)"
+                                            class="w-10 h-10 bg-slate-100 dark:bg-slate-700 rounded-lg text-lg font-bold text-slate-600 dark:text-slate-300 active:bg-slate-200 dark:active:bg-slate-600"
+                                        >-</button>
+                                        <input
+                                            type="number"
+                                            v-model.number="orderPositions[index].receivingQty"
+                                            min="0"
+                                            :max="pos.remainingQty"
+                                            class="flex-1 text-center py-2 px-3 bg-slate-50 dark:bg-slate-700 border border-slate-200 dark:border-slate-600 rounded-lg text-lg font-bold text-slate-800 dark:text-white"
+                                        />
+                                        <button
+                                            @click="orderPositions[index].receivingQty = Math.min(pos.remainingQty, pos.receivingQty + 1)"
+                                            class="w-10 h-10 bg-slate-100 dark:bg-slate-700 rounded-lg text-lg font-bold text-slate-600 dark:text-slate-300 active:bg-slate-200 dark:active:bg-slate-600"
+                                        >+</button>
+                                    </div>
+                                    <span class="text-xs text-slate-400 w-16 text-right">/ {{ pos.remainingQty }} {{ pos.unit }}</span>
+                                </div>
+                            </div>
+                        </div>
+
+                        <!-- Submit -->
+                        <div class="sticky bottom-0 bg-slate-50 dark:bg-slate-900 -mx-4 -mb-4 p-4 border-t border-slate-200 dark:border-slate-700">
+                            <button
+                                @click="submitOrderReceiving"
+                                :disabled="isSubmittingOrder"
+                                class="w-full py-4 bg-green-600 text-white text-lg font-bold rounded-xl transition active:scale-[0.98] disabled:opacity-50 disabled:active:scale-100"
+                            >
+                                {{ isSubmittingOrder ? 'Wird gespeichert...' : 'Wareneingang buchen' }}
+                            </button>
+                        </div>
+                    </template>
+                </div>
             </main>
 
             <!-- Keypad -->
diff --git a/public/mobile/modules/lager/shippingnote/DatePicker.js b/public/mobile/modules/lager/shippingnote/DatePicker.js
new file mode 100644
index 000000000..325f50704
--- /dev/null
+++ b/public/mobile/modules/lager/shippingnote/DatePicker.js
@@ -0,0 +1,282 @@
+/**
+ * DatePicker Component
+ *
+ * Beautiful mobile date picker with bottom sheet modal.
+ * Features quick buttons (Heute, Gestern) and calendar grid.
+ */
+
+export default {
+    name: 'DatePicker',
+    emits: ['update:modelValue', 'close'],
+    props: {
+        modelValue: {
+            type: String,
+            default: null
+        },
+        show: {
+            type: Boolean,
+            default: false
+        }
+    },
+
+    setup(props, { emit }) {
+        const { ref, computed, watch } = Vue;
+
+        // Current calendar view month/year
+        const viewDate = ref(new Date());
+
+        // Initialize view date when opened
+        watch(() => props.show, (newVal) => {
+            if (newVal && props.modelValue) {
+                viewDate.value = new Date(props.modelValue);
+            } else if (newVal) {
+                viewDate.value = new Date();
+            }
+        });
+
+        // German weekday names (short)
+        const weekDays = ['Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa', 'So'];
+
+        // German month names
+        const monthNames = [
+            'Januar', 'Februar', 'März', 'April', 'Mai', 'Juni',
+            'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'
+        ];
+
+        const shortMonthNames = [
+            'Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun',
+            'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'
+        ];
+
+        const weekDayNames = ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'];
+
+        // Format date for display
+        const formatDisplayDate = (dateStr) => {
+            if (!dateStr) return 'Datum wählen';
+            const date = new Date(dateStr);
+            const dayName = weekDayNames[date.getDay()];
+            const day = date.getDate();
+            const month = shortMonthNames[date.getMonth()];
+            const year = date.getFullYear();
+            return `${dayName}, ${day}. ${month} ${year}`;
+        };
+
+        // Current month/year display
+        const currentMonthYear = computed(() => {
+            const month = monthNames[viewDate.value.getMonth()];
+            const year = viewDate.value.getFullYear();
+            return `${month} ${year}`;
+        });
+
+        // Get calendar days for current view
+        const calendarDays = computed(() => {
+            const year = viewDate.value.getFullYear();
+            const month = viewDate.value.getMonth();
+
+            // First day of month
+            const firstDay = new Date(year, month, 1);
+            // Last day of month
+            const lastDay = new Date(year, month + 1, 0);
+
+            // Day of week for first day (0=Sun, convert to 0=Mon)
+            let startDay = firstDay.getDay() - 1;
+            if (startDay < 0) startDay = 6;
+
+            const days = [];
+
+            // Add empty slots for days before first of month
+            for (let i = 0; i < startDay; i++) {
+                days.push({ day: null, date: null });
+            }
+
+            // Add days of month
+            for (let d = 1; d <= lastDay.getDate(); d++) {
+                const date = new Date(year, month, d);
+                const dateStr = formatDateISO(date);
+                days.push({
+                    day: d,
+                    date: dateStr,
+                    isToday: isToday(date),
+                    isSelected: dateStr === props.modelValue
+                });
+            }
+
+            return days;
+        });
+
+        // Check if date is today
+        const isToday = (date) => {
+            const today = new Date();
+            return date.toDateString() === today.toDateString();
+        };
+
+        // Format date as ISO string (YYYY-MM-DD)
+        const formatDateISO = (date) => {
+            const year = date.getFullYear();
+            const month = String(date.getMonth() + 1).padStart(2, '0');
+            const day = String(date.getDate()).padStart(2, '0');
+            return `${year}-${month}-${day}`;
+        };
+
+        // Quick date helpers
+        const getToday = () => formatDateISO(new Date());
+        const getYesterday = () => {
+            const d = new Date();
+            d.setDate(d.getDate() - 1);
+            return formatDateISO(d);
+        };
+
+        // Navigation
+        const prevMonth = () => {
+            viewDate.value = new Date(viewDate.value.getFullYear(), viewDate.value.getMonth() - 1, 1);
+        };
+
+        const nextMonth = () => {
+            viewDate.value = new Date(viewDate.value.getFullYear(), viewDate.value.getMonth() + 1, 1);
+        };
+
+        // Selection
+        const selectDate = (dateStr) => {
+            if (!dateStr) return;
+            emit('update:modelValue', dateStr);
+            emit('close');
+        };
+
+        const selectToday = () => selectDate(getToday());
+        const selectYesterday = () => selectDate(getYesterday());
+
+        const close = () => {
+            emit('close');
+        };
+
+        return {
+            viewDate,
+            weekDays,
+            currentMonthYear,
+            calendarDays,
+            formatDisplayDate,
+            prevMonth,
+            nextMonth,
+            selectDate,
+            selectToday,
+            selectYesterday,
+            close,
+            getToday,
+            getYesterday
+        };
+    },
+
+    template: `
+        <!-- Bottom Sheet Modal -->
+        <teleport to="body">
+            <transition name="fade">
+                <div v-if="show" class="fixed inset-0 z-50">
+                    <!-- Backdrop -->
+                    <div class="absolute inset-0 bg-black/50" @click="close"></div>
+
+                    <!-- Sheet -->
+                    <transition name="slide-up-sheet">
+                        <div v-if="show" class="absolute bottom-0 left-0 right-0 bg-white dark:bg-slate-800 rounded-t-2xl shadow-xl max-h-[80vh] overflow-hidden">
+                            <!-- Handle -->
+                            <div class="flex justify-center pt-2 pb-1">
+                                <div class="w-10 h-1 bg-slate-300 dark:bg-slate-600 rounded-full"></div>
+                            </div>
+
+                            <!-- Header -->
+                            <div class="px-4 pb-3 border-b border-slate-100 dark:border-slate-700">
+                                <h3 class="text-lg font-semibold text-slate-800 dark:text-white text-center">
+                                    Datum wählen
+                                </h3>
+                            </div>
+
+                            <!-- Quick Buttons -->
+                            <div class="px-4 py-3 flex gap-2">
+                                <button
+                                    @click="selectToday"
+                                    :class="[
+                                        'flex-1 py-2.5 rounded-xl font-medium transition',
+                                        modelValue === getToday()
+                                            ? 'bg-primary text-white'
+                                            : 'bg-slate-100 dark:bg-slate-700 text-slate-700 dark:text-slate-300'
+                                    ]"
+                                >
+                                    Heute
+                                </button>
+                                <button
+                                    @click="selectYesterday"
+                                    :class="[
+                                        'flex-1 py-2.5 rounded-xl font-medium transition',
+                                        modelValue === getYesterday()
+                                            ? 'bg-primary text-white'
+                                            : 'bg-slate-100 dark:bg-slate-700 text-slate-700 dark:text-slate-300'
+                                    ]"
+                                >
+                                    Gestern
+                                </button>
+                            </div>
+
+                            <!-- Month Navigation -->
+                            <div class="px-4 py-2 flex items-center justify-between">
+                                <button
+                                    @click="prevMonth"
+                                    class="w-10 h-10 flex items-center justify-center rounded-full hover:bg-slate-100 dark:hover:bg-slate-700 text-slate-600 dark:text-slate-400"
+                                >
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7" />
+                                    </svg>
+                                </button>
+                                <span class="text-base font-semibold text-slate-800 dark:text-white">
+                                    {{ currentMonthYear }}
+                                </span>
+                                <button
+                                    @click="nextMonth"
+                                    class="w-10 h-10 flex items-center justify-center rounded-full hover:bg-slate-100 dark:hover:bg-slate-700 text-slate-600 dark:text-slate-400"
+                                >
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
+                                    </svg>
+                                </button>
+                            </div>
+
+                            <!-- Calendar Grid -->
+                            <div class="px-4 pb-6">
+                                <!-- Weekday Headers -->
+                                <div class="grid grid-cols-7 gap-1 mb-2">
+                                    <div
+                                        v-for="day in weekDays"
+                                        :key="day"
+                                        class="h-8 flex items-center justify-center text-xs font-medium text-slate-500 dark:text-slate-400"
+                                    >
+                                        {{ day }}
+                                    </div>
+                                </div>
+
+                                <!-- Days Grid -->
+                                <div class="grid grid-cols-7 gap-1">
+                                    <button
+                                        v-for="(item, idx) in calendarDays"
+                                        :key="idx"
+                                        @click="selectDate(item.date)"
+                                        :disabled="!item.day"
+                                        :class="[
+                                            'h-10 flex items-center justify-center rounded-full text-sm font-medium transition',
+                                            !item.day ? 'invisible' : '',
+                                            item.isSelected ? 'bg-primary text-white' : '',
+                                            item.isToday && !item.isSelected ? 'ring-2 ring-primary text-primary' : '',
+                                            !item.isSelected && !item.isToday && item.day ? 'text-slate-700 dark:text-slate-300 hover:bg-slate-100 dark:hover:bg-slate-700' : ''
+                                        ]"
+                                    >
+                                        {{ item.day }}
+                                    </button>
+                                </div>
+                            </div>
+
+                            <!-- Safe area padding for iOS -->
+                            <div class="h-6"></div>
+                        </div>
+                    </transition>
+                </div>
+            </transition>
+        </teleport>
+    `
+};
diff --git a/public/mobile/modules/lager/shippingnote/EmployeeSelector.js b/public/mobile/modules/lager/shippingnote/EmployeeSelector.js
new file mode 100644
index 000000000..df440c853
--- /dev/null
+++ b/public/mobile/modules/lager/shippingnote/EmployeeSelector.js
@@ -0,0 +1,189 @@
+/**
+ * EmployeeSelector Component
+ *
+ * Bottom sheet modal for searching and selecting employees.
+ * Supports lazy word search (e.g., "fab her" matches "Fabian Herbst").
+ */
+
+export default {
+    name: 'EmployeeSelector',
+    emits: ['select', 'close'],
+    props: {
+        show: {
+            type: Boolean,
+            default: false
+        },
+        excludeIds: {
+            type: Array,
+            default: () => []
+        }
+    },
+
+    setup(props, { emit }) {
+        const { ref, computed, watch } = Vue;
+
+        const searchQuery = ref('');
+        const employees = ref([]);
+        const isLoading = ref(false);
+        const searchTimeout = ref(null);
+
+        // Filter out already selected employees
+        const filteredEmployees = computed(() => {
+            return employees.value.filter(emp => !props.excludeIds.includes(emp.id));
+        });
+
+        // Search employees when query changes
+        watch(searchQuery, (newVal) => {
+            if (searchTimeout.value) {
+                clearTimeout(searchTimeout.value);
+            }
+
+            // Debounce search
+            searchTimeout.value = setTimeout(() => {
+                searchEmployees(newVal);
+            }, 300);
+        });
+
+        // Load employees when modal opens
+        watch(() => props.show, (newVal) => {
+            if (newVal) {
+                searchQuery.value = '';
+                searchEmployees('');
+            }
+        });
+
+        const searchEmployees = async (query) => {
+            isLoading.value = true;
+            try {
+                const params = new URLSearchParams();
+                if (query) params.append('query', query);
+
+                const response = await fetch(`/MobileApp/Lager/ShippingNote/searchEmployees?${params}`, {
+                    credentials: 'include'
+                });
+                const data = await response.json();
+
+                if (data.success) {
+                    employees.value = data.employees;
+                }
+            } catch (error) {
+                console.error('Error searching employees:', error);
+            } finally {
+                isLoading.value = false;
+            }
+        };
+
+        const selectEmployee = (employee) => {
+            emit('select', employee);
+            emit('close');
+        };
+
+        const close = () => {
+            emit('close');
+        };
+
+        return {
+            searchQuery,
+            filteredEmployees,
+            isLoading,
+            selectEmployee,
+            close
+        };
+    },
+
+    template: `
+        <!-- Bottom Sheet Modal -->
+        <teleport to="body">
+            <transition name="fade">
+                <div v-if="show" class="fixed inset-0 z-50">
+                    <!-- Backdrop -->
+                    <div class="absolute inset-0 bg-black/50" @click="close"></div>
+
+                    <!-- Sheet -->
+                    <transition name="slide-up-sheet">
+                        <div v-if="show" class="absolute bottom-0 left-0 right-0 bg-white dark:bg-slate-800 rounded-t-2xl shadow-xl max-h-[85vh] flex flex-col">
+                            <!-- Handle -->
+                            <div class="flex justify-center pt-2 pb-1 flex-shrink-0">
+                                <div class="w-10 h-1 bg-slate-300 dark:bg-slate-600 rounded-full"></div>
+                            </div>
+
+                            <!-- Header -->
+                            <div class="px-4 pb-3 border-b border-slate-100 dark:border-slate-700 flex-shrink-0">
+                                <h3 class="text-lg font-semibold text-slate-800 dark:text-white text-center">
+                                    Mitarbeiter auswählen
+                                </h3>
+                            </div>
+
+                            <!-- Search Input -->
+                            <div class="px-4 py-3 flex-shrink-0">
+                                <div class="relative">
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="absolute left-3 top-1/2 -translate-y-1/2 h-5 w-5 text-slate-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
+                                    </svg>
+                                    <input
+                                        v-model="searchQuery"
+                                        type="text"
+                                        placeholder="Name suchen..."
+                                        class="w-full pl-10 pr-4 py-3 bg-slate-100 dark:bg-slate-700 rounded-xl text-slate-800 dark:text-white placeholder-slate-400 focus:outline-none focus:ring-2 focus:ring-primary"
+                                        autofocus
+                                    >
+                                </div>
+                            </div>
+
+                            <!-- Results List -->
+                            <div class="flex-1 overflow-y-auto px-4 pb-6">
+                                <!-- Loading -->
+                                <div v-if="isLoading" class="py-8 text-center">
+                                    <div class="animate-spin w-8 h-8 border-3 border-primary border-t-transparent rounded-full mx-auto"></div>
+                                </div>
+
+                                <!-- Empty State -->
+                                <div v-else-if="filteredEmployees.length === 0" class="py-8 text-center text-slate-500 dark:text-slate-400">
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-12 w-12 mx-auto mb-3 text-slate-300 dark:text-slate-600" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z" />
+                                    </svg>
+                                    <p>Keine Mitarbeiter gefunden</p>
+                                </div>
+
+                                <!-- Employee List -->
+                                <div v-else class="space-y-2">
+                                    <button
+                                        v-for="emp in filteredEmployees"
+                                        :key="emp.id"
+                                        @click="selectEmployee(emp)"
+                                        class="w-full flex items-center p-3 bg-slate-50 dark:bg-slate-700/50 rounded-xl hover:bg-slate-100 dark:hover:bg-slate-700 transition text-left"
+                                    >
+                                        <!-- Avatar -->
+                                        <div class="w-10 h-10 bg-primary/10 rounded-full flex items-center justify-center flex-shrink-0">
+                                            <span class="text-primary font-semibold text-sm">
+                                                {{ emp.name.charAt(0).toUpperCase() }}
+                                            </span>
+                                        </div>
+
+                                        <!-- Info -->
+                                        <div class="ml-3 flex-1 min-w-0">
+                                            <p class="font-medium text-slate-800 dark:text-white truncate">
+                                                {{ emp.name }}
+                                            </p>
+                                            <p v-if="emp.email" class="text-sm text-slate-500 dark:text-slate-400 truncate">
+                                                {{ emp.email }}
+                                            </p>
+                                        </div>
+
+                                        <!-- Select Icon -->
+                                        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-slate-400 flex-shrink-0" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4" />
+                                        </svg>
+                                    </button>
+                                </div>
+                            </div>
+
+                            <!-- Safe area padding for iOS -->
+                            <div class="h-6 flex-shrink-0"></div>
+                        </div>
+                    </transition>
+                </div>
+            </transition>
+        </teleport>
+    `
+};
diff --git a/public/mobile/modules/lager/shippingnote/ShippingNoteForm.js b/public/mobile/modules/lager/shippingnote/ShippingNoteForm.js
new file mode 100644
index 000000000..de39a3b91
--- /dev/null
+++ b/public/mobile/modules/lager/shippingnote/ShippingNoteForm.js
@@ -0,0 +1,1090 @@
+/**
+ * ShippingNote Form Component - Redesigned
+ *
+ * Features:
+ * - GPS-based customer auto-detection with smart collapsed card
+ * - Multi-employee support with individual hours
+ * - Custom date picker
+ * - Reorganized field layout by importance
+ */
+
+import { shippingNoteApi } from '/mobile/modules/lager/shippingnote/ShippingNoteModule.js';
+import DatePicker from '/mobile/modules/lager/shippingnote/DatePicker.js';
+import EmployeeSelector from '/mobile/modules/lager/shippingnote/EmployeeSelector.js';
+
+export default {
+    name: 'ShippingNoteForm',
+    emits: ['created', 'createAndSign', 'toast'],
+    props: {
+        user: Object
+    },
+    components: {
+        DatePicker,
+        EmployeeSelector
+    },
+
+    setup(props, { emit }) {
+        const { ref, reactive, computed, onMounted, watch } = Vue;
+
+        // GPS detection state
+        const gpsState = ref('detecting'); // detecting | customer_found | no_customer | manual | error
+        const gpsPosition = ref(null);
+        const detectedCustomer = ref(null);
+        const gpsAddress = ref(null);
+        const gpsDistance = ref(null);
+
+        // Customer card state - collapsed when customer found
+        const customerCardExpanded = ref(false);
+
+        // Form data
+        const form = reactive({
+            customerId: null,
+            customerName: '',
+            billingAddressId: null,
+            deliveryAddressName: '',
+            deliveryAddressLine: '',
+            deliveryAddressPLZ: '',
+            deliveryAddressCity: '',
+            deliveryAddressEMail: '',
+            note: '',
+            type: 'V'
+        });
+
+        // Hours entries - supports multiple employees
+        const hoursEntries = ref([createNewHoursEntry()]);
+
+        // Active entry index for date picker
+        const activeEntryIndex = ref(0);
+        const showDatePicker = ref(false);
+        const showEmployeeSelector = ref(false);
+
+        // Positions
+        const positions = ref([]);
+
+        // UI state
+        const loading = ref(false);
+        const showCustomerSearch = ref(false);
+        const customerSearchQuery = ref('');
+        const customerSearchResults = ref([]);
+        const customerSearchLoading = ref(false);
+
+        const showArticleSearch = ref(false);
+        const articleSearchQuery = ref('');
+        const articleSearchResults = ref([]);
+        const articleSearchLoading = ref(false);
+
+        const showCarSelect = ref(false);
+        const carSelectEntryIndex = ref(0);
+        const allCars = ref([]);
+
+        const showHourTypeSelect = ref(false);
+        const hourTypeSelectEntryIndex = ref(0);
+        const hourTypes = ref([]);
+
+        const showPositionsSection = ref(false);
+
+        // User's car
+        const userCar = ref(null);
+
+        // Quick work type chips
+        const quickWorkTypes = ['Spleißen', 'Jetten', 'Inbetriebnahme'];
+        const selectedWorkType = ref(null);
+
+        // Select quick work type
+        const selectWorkType = (type) => {
+            if (selectedWorkType.value === type) {
+                // Deselect if already selected
+                selectedWorkType.value = null;
+                form.note = '';
+            } else {
+                selectedWorkType.value = type;
+                form.note = type;
+            }
+            navigator.vibrate?.([20]);
+        };
+
+        // Watch for manual note changes to clear chip selection
+        watch(() => form.note, (newVal) => {
+            if (newVal && !quickWorkTypes.includes(newVal)) {
+                selectedWorkType.value = null;
+            }
+        });
+
+        // Create new hours entry - default to 1h (most common)
+        function createNewHoursEntry(userId = null, userName = '') {
+            return {
+                id: Date.now() + Math.random(),
+                userId: userId || props.user?.id || null,
+                userName: userName || props.user?.name || '',
+                date: new Date().toISOString().split('T')[0],
+                hourCount: 1,
+                hourType: '',
+                hourTypeName: 'Normal',
+                carId: null,
+                carName: '',
+                kilometerCount: 0,
+                comment: '',
+                expanded: true
+            };
+        }
+
+        // Validation
+        const isValid = computed(() => {
+            return form.customerName.trim() !== '' &&
+                form.deliveryAddressLine.trim() !== '' &&
+                form.deliveryAddressCity.trim() !== '' &&
+                form.note.trim() !== '';
+        });
+
+        // Format distance for display
+        const formatDistance = (distance) => {
+            if (distance === null || distance === undefined || isNaN(distance)) {
+                return '';
+            }
+            return Math.round(distance) + 'm';
+        };
+
+        // Format date for display - German style
+        const formatDateDisplay = (dateStr) => {
+            if (!dateStr) return 'Datum wählen';
+            const date = new Date(dateStr);
+            const weekDays = ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'];
+            const months = ['Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'];
+            const dayName = weekDays[date.getDay()];
+            const day = date.getDate();
+            const month = months[date.getMonth()];
+            const year = date.getFullYear();
+            return `${dayName}, ${day}. ${month} ${year}`;
+        };
+
+        // Format hours display as "1h 15m"
+        const formatHoursValue = (hours) => {
+            const h = Math.floor(hours);
+            const m = Math.round((hours - h) * 60);
+            return { h, m };
+        };
+
+        // Get selected employee IDs (to exclude from selector)
+        const selectedEmployeeIds = computed(() => {
+            return hoursEntries.value.map(e => e.userId).filter(id => id !== null);
+        });
+
+        // Initialize
+        onMounted(async () => {
+            await Promise.all([
+                loadUserCar(),
+                loadAllCars(),
+                loadHourTypes()
+            ]);
+            detectGPS();
+        });
+
+        // Load user's assigned car
+        const loadUserCar = async () => {
+            try {
+                const data = await shippingNoteApi.get(`getUserCar?userId=${props.user?.id}`);
+                if (data.success && data.car) {
+                    userCar.value = data.car;
+                    if (hoursEntries.value[0]) {
+                        hoursEntries.value[0].carId = data.car.id;
+                        hoursEntries.value[0].carName = data.car.name;
+                    }
+                }
+            } catch (e) {
+                console.error('Failed to load user car:', e);
+            }
+        };
+
+        // Load all available cars
+        const loadAllCars = async () => {
+            try {
+                const data = await shippingNoteApi.get('getAllCars');
+                if (data.success) {
+                    allCars.value = data.cars || [];
+                }
+            } catch (e) {
+                console.error('Failed to load cars:', e);
+            }
+        };
+
+        // Load hour types
+        const loadHourTypes = async () => {
+            try {
+                const data = await shippingNoteApi.get('getHourTypes');
+                if (data.success) {
+                    hourTypes.value = data.hourTypes || [];
+                }
+            } catch (e) {
+                console.error('Failed to load hour types:', e);
+            }
+        };
+
+        // GPS Detection
+        const detectGPS = () => {
+            gpsState.value = 'detecting';
+
+            if (!navigator.geolocation) {
+                gpsState.value = 'error';
+                return;
+            }
+
+            navigator.geolocation.getCurrentPosition(
+                async (position) => {
+                    gpsPosition.value = {
+                        lat: position.coords.latitude,
+                        lng: position.coords.longitude
+                    };
+                    await findNearbyCustomer();
+                    await calculateDistance();
+                },
+                (error) => {
+                    console.error('GPS error:', error);
+                    gpsState.value = 'error';
+                },
+                { enableHighAccuracy: true, timeout: 15000, maximumAge: 0 }
+            );
+        };
+
+        // Find nearby customer
+        const findNearbyCustomer = async () => {
+            if (!gpsPosition.value) return;
+
+            try {
+                const data = await shippingNoteApi.get(
+                    `getCustomerByLocation?lat=${gpsPosition.value.lat}&lng=${gpsPosition.value.lng}`
+                );
+
+                if (data.success && data.customer) {
+                    detectedCustomer.value = data.customer;
+                    gpsDistance.value = data.customer.distance;
+                    gpsState.value = 'customer_found';
+                    fillFromCustomer(data.customer);
+                    customerCardExpanded.value = false; // Collapse card when customer found
+                    navigator.vibrate?.([100, 50, 100]);
+                } else {
+                    gpsState.value = 'no_customer';
+                    customerCardExpanded.value = true; // Expand card when no customer
+                    await reverseGeocode();
+                }
+            } catch (e) {
+                console.error('Customer detection failed:', e);
+                gpsState.value = 'no_customer';
+                customerCardExpanded.value = true;
+                await reverseGeocode();
+            }
+        };
+
+        // Reverse geocode GPS position
+        const reverseGeocode = async () => {
+            if (!gpsPosition.value) return;
+
+            try {
+                const data = await shippingNoteApi.get(
+                    `reverseGeocode?lat=${gpsPosition.value.lat}&lng=${gpsPosition.value.lng}`
+                );
+
+                if (data.success && data.address) {
+                    gpsAddress.value = data.address;
+                    form.deliveryAddressLine = data.address.street || '';
+                    form.deliveryAddressPLZ = data.address.zip || '';
+                    form.deliveryAddressCity = data.address.city || '';
+                }
+            } catch (e) {
+                console.error('Reverse geocode failed:', e);
+            }
+        };
+
+        // Calculate distance from office
+        const calculateDistance = async () => {
+            if (!gpsPosition.value) return;
+
+            try {
+                const data = await shippingNoteApi.get(
+                    `calculateDistance?lat=${gpsPosition.value.lat}&lng=${gpsPosition.value.lng}`
+                );
+
+                if (data.success && data.distanceRoundTrip) {
+                    if (hoursEntries.value[0]) {
+                        hoursEntries.value[0].kilometerCount = Math.round(data.distanceRoundTrip);
+                    }
+                }
+            } catch (e) {
+                console.error('Distance calculation failed:', e);
+            }
+        };
+
+        // Fill form from customer
+        const fillFromCustomer = (customer) => {
+            form.customerId = customer.id;
+            form.customerName = customer.displayName || customer.company || customer.name || '';
+            form.billingAddressId = customer.id;
+            form.deliveryAddressName = customer.displayName || customer.company || customer.name || '';
+            form.deliveryAddressLine = customer.street || '';
+            form.deliveryAddressPLZ = customer.zip || '';
+            form.deliveryAddressCity = customer.city || '';
+            form.deliveryAddressEMail = customer.email || '';
+        };
+
+        // Customer search
+        const searchCustomers = async () => {
+            if (customerSearchQuery.value.length < 1) {
+                customerSearchResults.value = [];
+                return;
+            }
+
+            customerSearchLoading.value = true;
+            try {
+                const data = await shippingNoteApi.get(
+                    `searchCustomers?query=${encodeURIComponent(customerSearchQuery.value)}`
+                );
+                customerSearchResults.value = data.customers || [];
+            } catch (e) {
+                console.error('Customer search failed:', e);
+            } finally {
+                customerSearchLoading.value = false;
+            }
+        };
+
+        // Select customer from search
+        const selectCustomer = async (customer) => {
+            fillFromCustomer(customer);
+            gpsState.value = 'manual';
+            customerCardExpanded.value = false;
+            showCustomerSearch.value = false;
+            customerSearchQuery.value = '';
+            customerSearchResults.value = [];
+
+            // Calculate distance if customer has GPS coordinates
+            if (customer.gpsLat && customer.gpsLong) {
+                try {
+                    const data = await shippingNoteApi.get(
+                        `calculateDistance?lat=${customer.gpsLat}&lng=${customer.gpsLong}`
+                    );
+                    if (data.success && data.distanceRoundTrip) {
+                        if (hoursEntries.value[0]) {
+                            hoursEntries.value[0].kilometerCount = Math.round(data.distanceRoundTrip);
+                        }
+                    }
+                } catch (e) {
+                    console.error('Distance calculation failed:', e);
+                }
+            }
+        };
+
+        // Article search
+        const searchArticles = async () => {
+            if (articleSearchQuery.value.length < 1) {
+                articleSearchResults.value = [];
+                return;
+            }
+
+            articleSearchLoading.value = true;
+            try {
+                const data = await shippingNoteApi.get(
+                    `searchArticles?query=${encodeURIComponent(articleSearchQuery.value)}`
+                );
+                articleSearchResults.value = data.articles || [];
+            } catch (e) {
+                console.error('Article search failed:', e);
+            } finally {
+                articleSearchLoading.value = false;
+            }
+        };
+
+        // Add article to positions
+        const addArticle = (article) => {
+            const existing = positions.value.find(p => p.articleId === article.id);
+            if (existing) {
+                existing.amount++;
+            } else {
+                positions.value.push({
+                    articleId: article.id,
+                    articleNumber: article.articleNumber,
+                    articleName: article.title,
+                    amount: 1,
+                    isEnergieMaterial: false
+                });
+            }
+            showArticleSearch.value = false;
+            articleSearchQuery.value = '';
+            articleSearchResults.value = [];
+            navigator.vibrate?.([50]);
+        };
+
+        // Remove position
+        const removePosition = (index) => {
+            positions.value.splice(index, 1);
+        };
+
+        // Toggle Beigestelltes Material
+        const toggleEnergieMaterial = (pos) => {
+            pos.isEnergieMaterial = !pos.isEnergieMaterial;
+            navigator.vibrate?.([20]);
+        };
+
+        // Hours functions for specific entry
+        const setHours = (entryIndex, hours) => {
+            if (hoursEntries.value[entryIndex]) {
+                hoursEntries.value[entryIndex].hourCount = hours;
+                navigator.vibrate?.([30]);
+            }
+        };
+
+        const adjustHours = (entryIndex, delta) => {
+            if (hoursEntries.value[entryIndex]) {
+                const newVal = Math.max(0, hoursEntries.value[entryIndex].hourCount + delta);
+                hoursEntries.value[entryIndex].hourCount = Math.round(newVal * 4) / 4;
+                navigator.vibrate?.([20]);
+            }
+        };
+
+        // Date picker
+        const openDatePicker = (entryIndex) => {
+            activeEntryIndex.value = entryIndex;
+            showDatePicker.value = true;
+        };
+
+        const updateEntryDate = (dateStr) => {
+            if (hoursEntries.value[activeEntryIndex.value]) {
+                hoursEntries.value[activeEntryIndex.value].date = dateStr;
+            }
+        };
+
+        // Employee selector
+        const openEmployeeSelector = () => {
+            showEmployeeSelector.value = true;
+        };
+
+        const addEmployee = (employee) => {
+            const newEntry = createNewHoursEntry(employee.id, employee.name);
+            // Copy date and km from first entry
+            if (hoursEntries.value[0]) {
+                newEntry.date = hoursEntries.value[0].date;
+                newEntry.kilometerCount = hoursEntries.value[0].kilometerCount;
+            }
+            hoursEntries.value.push(newEntry);
+            navigator.vibrate?.([50]);
+        };
+
+        const removeHoursEntry = (entryIndex) => {
+            if (hoursEntries.value.length > 1) {
+                hoursEntries.value.splice(entryIndex, 1);
+                navigator.vibrate?.([30]);
+            }
+        };
+
+        // Select car for specific entry
+        const openCarSelect = (entryIndex) => {
+            carSelectEntryIndex.value = entryIndex;
+            showCarSelect.value = true;
+        };
+
+        const selectCar = (car) => {
+            if (hoursEntries.value[carSelectEntryIndex.value]) {
+                hoursEntries.value[carSelectEntryIndex.value].carId = car.id;
+                hoursEntries.value[carSelectEntryIndex.value].carName = car.name;
+            }
+            showCarSelect.value = false;
+            navigator.vibrate?.([30]);
+        };
+
+        // Select hour type for specific entry
+        const openHourTypeSelect = (entryIndex) => {
+            hourTypeSelectEntryIndex.value = entryIndex;
+            showHourTypeSelect.value = true;
+        };
+
+        const selectHourType = (hourType) => {
+            if (hoursEntries.value[hourTypeSelectEntryIndex.value]) {
+                hoursEntries.value[hourTypeSelectEntryIndex.value].hourType = hourType.id;
+                hoursEntries.value[hourTypeSelectEntryIndex.value].hourTypeName = hourType.name;
+            }
+            showHourTypeSelect.value = false;
+            navigator.vibrate?.([30]);
+        };
+
+        // Customer card expand/collapse
+        const toggleCustomerCard = () => {
+            customerCardExpanded.value = !customerCardExpanded.value;
+        };
+
+        // Switch to manual mode
+        const switchToManual = () => {
+            gpsState.value = 'manual';
+            showCustomerSearch.value = true;
+        };
+
+        // Refresh GPS
+        const refreshGPS = () => {
+            detectGPS();
+        };
+
+        // Mock customer found (for screenshots/demo)
+        const mockCustomerFound = () => {
+            detectedCustomer.value = {
+                id: 999,
+                displayName: 'Frau im Zentrum GmbH',
+                company: 'Frau im Zentrum GmbH',
+                street: 'Schmiedgasse 14',
+                zip: '8010',
+                city: 'Graz',
+                email: 'office@frauzentrum.at'
+            };
+            gpsDistance.value = 42;
+            gpsState.value = 'customer_found';
+            fillFromCustomer(detectedCustomer.value);
+            customerCardExpanded.value = false;
+            if (hoursEntries.value[0]) {
+                hoursEntries.value[0].kilometerCount = 84;
+            }
+            navigator.vibrate?.([100, 50, 100]);
+        };
+
+        // Submit form
+        const submit = async (andSign = false) => {
+            if (!isValid.value) {
+                emit('toast', 'Bitte alle Pflichtfelder ausfüllen', 'error');
+                return;
+            }
+
+            loading.value = true;
+
+            try {
+                const payload = {
+                    billingAddressId: form.billingAddressId,
+                    deliveryAddressName: form.deliveryAddressName,
+                    deliveryAddressLine: form.deliveryAddressLine,
+                    deliveryAddressPLZ: form.deliveryAddressPLZ,
+                    deliveryAddressCity: form.deliveryAddressCity,
+                    deliveryAddressEMail: form.deliveryAddressEMail,
+                    note: form.note,
+                    type: form.type,
+                    positions: positions.value.map(p => ({
+                        article: p.articleId,
+                        amount: p.amount,
+                        isEnergieMaterial: p.isEnergieMaterial
+                    })),
+                    hoursEntries: hoursEntries.value.filter(h => h.hourCount > 0).map(h => ({
+                        userId: h.userId,
+                        date: h.date,
+                        hourCount: h.hourCount,
+                        hourType: h.hourType,
+                        carId: h.carId,
+                        kilometerCount: h.kilometerCount,
+                        comment: h.comment
+                    }))
+                };
+
+                const data = await shippingNoteApi.post('create', payload);
+
+                if (data.success) {
+                    if (andSign) {
+                        emit('createAndSign', data.shippingNote);
+                    } else {
+                        emit('created', data.shippingNote);
+                    }
+                    resetForm();
+                } else {
+                    emit('toast', data.error || 'Fehler beim Erstellen', 'error');
+                }
+            } catch (e) {
+                console.error('Submit failed:', e);
+                emit('toast', 'Netzwerkfehler', 'error');
+            } finally {
+                loading.value = false;
+            }
+        };
+
+        // Reset form
+        const resetForm = () => {
+            form.customerId = null;
+            form.customerName = '';
+            form.billingAddressId = null;
+            form.deliveryAddressName = '';
+            form.deliveryAddressLine = '';
+            form.deliveryAddressPLZ = '';
+            form.deliveryAddressCity = '';
+            form.deliveryAddressEMail = '';
+            form.note = '';
+            positions.value = [];
+            hoursEntries.value = [createNewHoursEntry()];
+            if (userCar.value) {
+                hoursEntries.value[0].carId = userCar.value.id;
+                hoursEntries.value[0].carName = userCar.value.name;
+            }
+            detectGPS();
+        };
+
+        // Debounced search watchers
+        let customerSearchTimeout = null;
+        watch(customerSearchQuery, () => {
+            clearTimeout(customerSearchTimeout);
+            customerSearchTimeout = setTimeout(searchCustomers, 300);
+        });
+
+        let articleSearchTimeout = null;
+        watch(articleSearchQuery, () => {
+            clearTimeout(articleSearchTimeout);
+            articleSearchTimeout = setTimeout(searchArticles, 300);
+        });
+
+        return {
+            gpsState, gpsPosition, detectedCustomer, gpsAddress, gpsDistance,
+            customerCardExpanded, form, hoursEntries, positions, loading,
+            showCustomerSearch, customerSearchQuery, customerSearchResults, customerSearchLoading,
+            showArticleSearch, articleSearchQuery, articleSearchResults, articleSearchLoading,
+            showCarSelect, carSelectEntryIndex, allCars,
+            showHourTypeSelect, hourTypeSelectEntryIndex, hourTypes,
+            showPositionsSection, showDatePicker, activeEntryIndex,
+            showEmployeeSelector, selectedEmployeeIds,
+            userCar, isValid,
+            quickWorkTypes, selectedWorkType, selectWorkType,
+            formatDistance, formatDateDisplay, formatHoursValue,
+            detectGPS, refreshGPS, mockCustomerFound, switchToManual, selectCustomer,
+            toggleCustomerCard, addArticle, removePosition, toggleEnergieMaterial,
+            setHours, adjustHours, openDatePicker, updateEntryDate,
+            openEmployeeSelector, addEmployee, removeHoursEntry,
+            openCarSelect, selectCar, openHourTypeSelect, selectHourType,
+            submit, resetForm
+        };
+    },
+
+    template: `
+        <div class="p-3 space-y-3">
+            <!-- Smart Customer Card -->
+            <div class="bg-white dark:bg-slate-800 rounded-xl shadow-sm overflow-hidden">
+                <!-- Collapsed State (when customer found) -->
+                <div v-if="gpsState === 'customer_found' && !customerCardExpanded" class="p-4">
+                    <div class="flex items-center justify-between">
+                        <div class="flex items-center gap-3 flex-1 min-w-0">
+                            <div class="w-10 h-10 bg-green-100 dark:bg-green-900/50 rounded-full flex items-center justify-center flex-shrink-0">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-green-600 dark:text-green-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" />
+                                </svg>
+                            </div>
+                            <div class="flex-1 min-w-0">
+                                <div class="flex items-center gap-2">
+                                    <span class="text-xs font-medium text-green-600 dark:text-green-400">Kunde erkannt</span>
+                                    <span v-if="formatDistance(gpsDistance)" class="text-xs text-slate-400">{{ formatDistance(gpsDistance) }}</span>
+                                </div>
+                                <p class="font-medium text-slate-800 dark:text-white truncate">{{ form.customerName }}</p>
+                                <p class="text-sm text-slate-500 dark:text-slate-400 truncate">{{ form.deliveryAddressLine }}, {{ form.deliveryAddressPLZ }} {{ form.deliveryAddressCity }}</p>
+                            </div>
+                        </div>
+                        <button @click="toggleCustomerCard" class="px-3 py-1.5 text-sm font-medium text-primary hover:bg-primary/5 rounded-lg transition flex-shrink-0">
+                            Ändern
+                        </button>
+                    </div>
+                </div>
+
+                <!-- Expanded State / Manual / No Customer -->
+                <div v-else class="p-4 space-y-3">
+                    <!-- GPS Status Row -->
+                    <div class="flex items-center justify-between">
+                        <div class="flex items-center gap-2">
+                            <!-- Mock Button (for screenshots) -->
+                            <button @click="mockCustomerFound" class="px-2 py-1 bg-purple-100 dark:bg-purple-900/50 text-purple-600 dark:text-purple-400 rounded text-xs font-medium">
+                                Demo
+                            </button>
+                            <!-- Detecting -->
+                            <template v-if="gpsState === 'detecting'">
+                                <div class="animate-pulse w-2 h-2 rounded-full bg-blue-500"></div>
+                                <span class="text-sm text-blue-600 dark:text-blue-400">Standort wird ermittelt...</span>
+                            </template>
+                            <!-- Customer Found (expanded) -->
+                            <template v-else-if="gpsState === 'customer_found'">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-green-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" />
+                                </svg>
+                                <span class="text-sm text-green-600 dark:text-green-400">GPS Kunde erkannt</span>
+                            </template>
+                            <!-- No Customer -->
+                            <template v-else-if="gpsState === 'no_customer'">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-amber-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
+                                </svg>
+                                <span class="text-sm text-amber-600 dark:text-amber-400">Kein Kunde in der Nähe</span>
+                            </template>
+                            <!-- Manual -->
+                            <template v-else-if="gpsState === 'manual'">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-slate-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15.232 5.232l3.536 3.536m-2.036-5.036a2.5 2.5 0 113.536 3.536L6.5 21.036H3v-3.572L16.732 3.732z" />
+                                </svg>
+                                <span class="text-sm text-slate-500 dark:text-slate-400">Manuell</span>
+                            </template>
+                            <!-- Error -->
+                            <template v-else-if="gpsState === 'error'">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-red-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" />
+                                </svg>
+                                <span class="text-sm text-red-600 dark:text-red-400">GPS nicht verfügbar</span>
+                            </template>
+                        </div>
+                        <div class="flex items-center gap-2">
+                            <button v-if="gpsState === 'customer_found'" @click="toggleCustomerCard" class="p-1 text-slate-400">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 15l7-7 7 7" />
+                                </svg>
+                            </button>
+                            <button @click="refreshGPS" class="p-1 text-slate-400 hover:text-primary" :disabled="gpsState === 'detecting'">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" :class="{'animate-spin': gpsState === 'detecting'}" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15" />
+                                </svg>
+                            </button>
+                        </div>
+                    </div>
+
+                    <!-- Customer Input -->
+                    <div>
+                        <label class="block text-xs text-slate-500 dark:text-slate-400 mb-1">Kunde *</label>
+                        <button
+                            @click="showCustomerSearch = true"
+                            class="w-full px-3 py-2.5 bg-slate-50 dark:bg-slate-700 border border-slate-200 dark:border-slate-600 rounded-lg text-sm text-left flex items-center justify-between"
+                        >
+                            <span :class="form.customerName ? 'text-slate-800 dark:text-white' : 'text-slate-400'">
+                                {{ form.customerName || 'Kunde wählen...' }}
+                            </span>
+                            <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-slate-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
+                            </svg>
+                        </button>
+                    </div>
+
+                    <!-- Address Fields -->
+                    <div>
+                        <label class="block text-xs text-slate-500 dark:text-slate-400 mb-1">Straße *</label>
+                        <input type="text" v-model="form.deliveryAddressLine" class="w-full px-3 py-2.5 bg-slate-50 dark:bg-slate-700 border border-slate-200 dark:border-slate-600 rounded-lg text-sm" />
+                    </div>
+
+                    <div class="grid grid-cols-3 gap-2">
+                        <div>
+                            <label class="block text-xs text-slate-500 dark:text-slate-400 mb-1">PLZ</label>
+                            <input type="text" v-model="form.deliveryAddressPLZ" class="w-full px-3 py-2.5 bg-slate-50 dark:bg-slate-700 border border-slate-200 dark:border-slate-600 rounded-lg text-sm" />
+                        </div>
+                        <div class="col-span-2">
+                            <label class="block text-xs text-slate-500 dark:text-slate-400 mb-1">Ort *</label>
+                            <input type="text" v-model="form.deliveryAddressCity" class="w-full px-3 py-2.5 bg-slate-50 dark:bg-slate-700 border border-slate-200 dark:border-slate-600 rounded-lg text-sm" />
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Work Description Card -->
+            <div class="bg-white dark:bg-slate-800 rounded-xl p-4 shadow-sm">
+                <h3 class="text-sm font-semibold text-slate-700 dark:text-slate-200 mb-2">Art der Arbeit *</h3>
+
+                <!-- Quick Work Type Chips -->
+                <div class="flex gap-2 mb-3">
+                    <button
+                        v-for="type in quickWorkTypes"
+                        :key="type"
+                        @click="selectWorkType(type)"
+                        :class="[
+                            'px-4 py-2 rounded-lg text-sm font-medium transition',
+                            selectedWorkType === type
+                                ? 'bg-primary text-white'
+                                : 'bg-slate-100 dark:bg-slate-700 text-slate-600 dark:text-slate-300'
+                        ]"
+                    >
+                        {{ type }}
+                    </button>
+                </div>
+
+                <textarea
+                    v-model="form.note"
+                    rows="2"
+                    class="w-full px-3 py-2.5 bg-slate-50 dark:bg-slate-700 border border-slate-200 dark:border-slate-600 rounded-lg text-sm resize-none"
+                    placeholder="Oder eigene Beschreibung..."
+                ></textarea>
+            </div>
+
+            <!-- Arbeitszeit Section - Multi-Employee -->
+            <div class="bg-white dark:bg-slate-800 rounded-xl shadow-sm overflow-hidden">
+                <div class="px-4 py-3 border-b border-slate-100 dark:border-slate-700 flex items-center justify-between">
+                    <h3 class="text-sm font-semibold text-slate-700 dark:text-slate-200">Arbeitszeit</h3>
+                    <button @click="openEmployeeSelector" class="flex items-center gap-1 px-2.5 py-1.5 bg-primary/10 text-primary rounded-lg text-xs font-medium hover:bg-primary/20 transition">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4" />
+                        </svg>
+                        MA
+                    </button>
+                </div>
+
+                <!-- Hours Entries -->
+                <div class="divide-y divide-slate-100 dark:divide-slate-700">
+                    <div v-for="(entry, idx) in hoursEntries" :key="entry.id" class="p-4 space-y-3">
+                        <!-- Employee Header -->
+                        <div class="flex items-center justify-between">
+                            <div class="flex items-center gap-2">
+                                <div class="w-8 h-8 bg-primary/10 rounded-full flex items-center justify-center">
+                                    <span class="text-primary font-semibold text-xs">{{ entry.userName.charAt(0).toUpperCase() }}</span>
+                                </div>
+                                <span class="font-medium text-slate-800 dark:text-white text-sm">{{ entry.userName }}</span>
+                            </div>
+                            <button v-if="hoursEntries.length > 1" @click="removeHoursEntry(idx)" class="p-1 text-red-400 hover:text-red-600">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+                                </svg>
+                            </button>
+                        </div>
+
+                        <!-- Date Picker Button -->
+                        <button @click="openDatePicker(idx)" class="w-full px-3 py-2.5 bg-slate-50 dark:bg-slate-700 border border-slate-200 dark:border-slate-600 rounded-lg text-sm flex items-center justify-between">
+                            <div class="flex items-center gap-2">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-slate-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z" />
+                                </svg>
+                                <span class="text-slate-800 dark:text-white">{{ formatDateDisplay(entry.date) }}</span>
+                            </div>
+                            <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-slate-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+                            </svg>
+                        </button>
+
+                        <!-- Hours Stepper -->
+                        <div>
+                            <div class="flex items-center gap-2">
+                                <button @click="adjustHours(idx, -0.25)" class="w-12 h-12 flex items-center justify-center bg-slate-100 dark:bg-slate-700 rounded-xl text-lg font-bold text-slate-600 dark:text-slate-300 active:bg-slate-200 dark:active:bg-slate-600">-</button>
+                                <div class="flex-1 text-center py-2.5 bg-slate-50 dark:bg-slate-700 border border-slate-200 dark:border-slate-600 rounded-xl">
+                                    <span class="text-2xl font-bold text-slate-800 dark:text-white">{{ formatHoursValue(entry.hourCount).h }}</span>
+                                    <span class="text-sm text-slate-500 dark:text-slate-400">h</span>
+                                    <span class="text-2xl font-bold text-slate-800 dark:text-white ml-1">{{ formatHoursValue(entry.hourCount).m }}</span>
+                                    <span class="text-sm text-slate-500 dark:text-slate-400">m</span>
+                                </div>
+                                <button @click="adjustHours(idx, 0.25)" class="w-12 h-12 flex items-center justify-center bg-slate-100 dark:bg-slate-700 rounded-xl text-lg font-bold text-slate-600 dark:text-slate-300 active:bg-slate-200 dark:active:bg-slate-600">+</button>
+                            </div>
+                            <div class="flex gap-2 mt-2">
+                                <button v-for="h in [0.5, 1, 2, 4]" :key="h" @click="setHours(idx, h)"
+                                    :class="['flex-1 py-2 rounded-lg text-sm font-medium transition', entry.hourCount === h ? 'bg-primary text-white' : 'bg-slate-100 dark:bg-slate-700 text-slate-600 dark:text-slate-300']"
+                                >{{ h === 0.5 ? '½h' : h + 'h' }}</button>
+                            </div>
+                        </div>
+
+                        <!-- Car & KM Row -->
+                        <div class="grid grid-cols-2 gap-2">
+                            <button @click="openCarSelect(idx)" class="px-3 py-2.5 bg-slate-50 dark:bg-slate-700 border border-slate-200 dark:border-slate-600 rounded-lg text-sm text-left flex items-center justify-between">
+                                <div class="flex items-center gap-2 min-w-0 flex-1">
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-slate-400 flex-shrink-0" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7h8m-8 4h8m-6 4h4M3 21h18M3 17V7c0-1.1.9-2 2-2h14a2 2 0 012 2v10" />
+                                    </svg>
+                                    <span :class="entry.carName ? 'text-slate-800 dark:text-white truncate' : 'text-slate-400'" class="truncate">
+                                        {{ entry.carName || 'Fahrzeug' }}
+                                    </span>
+                                </div>
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-slate-400 flex-shrink-0" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+                                </svg>
+                            </button>
+                            <div class="relative">
+                                <input type="number" v-model.number="entry.kilometerCount" class="w-full px-3 py-2.5 pr-8 bg-slate-50 dark:bg-slate-700 border border-slate-200 dark:border-slate-600 rounded-lg text-sm" min="0" placeholder="km" />
+                                <span class="absolute right-3 top-1/2 -translate-y-1/2 text-xs text-slate-400">km</span>
+                            </div>
+                        </div>
+
+                        <!-- Hour Type - Compact -->
+                        <button @click="openHourTypeSelect(idx)" class="inline-flex items-center gap-1 px-2.5 py-1.5 bg-slate-100 dark:bg-slate-700 rounded-lg text-xs text-slate-600 dark:text-slate-300">
+                            <span>Stundenart:</span>
+                            <span class="font-medium">{{ entry.hourTypeName || 'Normal' }}</span>
+                            <svg xmlns="http://www.w3.org/2000/svg" class="h-3 w-3" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+                            </svg>
+                        </button>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Positions Section -->
+            <div class="bg-white dark:bg-slate-800 rounded-xl shadow-sm overflow-hidden">
+                <button @click="showPositionsSection = !showPositionsSection" class="w-full flex items-center justify-between px-4 py-3 text-left">
+                    <div class="flex items-center gap-2">
+                        <h3 class="text-sm font-semibold text-slate-700 dark:text-slate-200">Artikel</h3>
+                        <span v-if="positions.length" class="text-xs bg-primary text-white px-2 py-0.5 rounded-full">{{ positions.length }}</span>
+                    </div>
+                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-slate-400 transition-transform" :class="{'rotate-180': showPositionsSection}" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+                    </svg>
+                </button>
+
+                <div v-show="showPositionsSection" class="px-4 pb-4 space-y-3">
+                    <div v-for="(pos, idx) in positions" :key="idx" class="p-3 bg-slate-50 dark:bg-slate-700 rounded-lg space-y-2">
+                        <div class="flex items-start justify-between gap-2">
+                            <div class="flex-1 min-w-0">
+                                <div class="text-sm font-medium text-slate-700 dark:text-slate-200 truncate">{{ pos.articleName }}</div>
+                                <div class="text-xs text-slate-500 dark:text-slate-400">{{ pos.articleNumber }}</div>
+                            </div>
+                            <button @click="removePosition(idx)" class="p-1 text-red-500 flex-shrink-0">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
+                                </svg>
+                            </button>
+                        </div>
+                        <div class="flex items-center justify-between">
+                            <div class="flex items-center gap-1">
+                                <button @click="pos.amount = Math.max(1, pos.amount - 1)" class="w-8 h-8 flex items-center justify-center bg-white dark:bg-slate-600 rounded text-slate-600 dark:text-slate-300">-</button>
+                                <span class="w-10 text-center font-medium text-slate-700 dark:text-white">{{ pos.amount }}</span>
+                                <button @click="pos.amount++" class="w-8 h-8 flex items-center justify-center bg-white dark:bg-slate-600 rounded text-slate-600 dark:text-slate-300">+</button>
+                            </div>
+                            <button @click="toggleEnergieMaterial(pos)"
+                                :class="['px-3 py-1.5 rounded-lg text-xs font-medium transition', pos.isEnergieMaterial ? 'bg-amber-100 dark:bg-amber-900/50 text-amber-700 dark:text-amber-300' : 'bg-slate-200 dark:bg-slate-600 text-slate-500 dark:text-slate-400']"
+                            >
+                                Beigestellt
+                            </button>
+                        </div>
+                    </div>
+
+                    <button @click="showArticleSearch = true" class="w-full py-3 border-2 border-dashed border-slate-300 dark:border-slate-600 rounded-lg text-sm text-slate-500 dark:text-slate-400 flex items-center justify-center gap-2">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4" />
+                        </svg>
+                        Artikel hinzufügen
+                    </button>
+                </div>
+            </div>
+
+            <!-- Submit Buttons -->
+            <div class="space-y-2 pb-6">
+                <button @click="submit(true)" :disabled="!isValid || loading"
+                    :class="['w-full py-5 rounded-xl text-base font-semibold transition flex items-center justify-center gap-2', isValid && !loading ? 'bg-gradient-to-r from-primary to-indigo-600 text-white shadow-lg active:scale-[0.98]' : 'bg-slate-200 dark:bg-slate-700 text-slate-400 dark:text-slate-500']"
+                >
+                    <svg v-if="loading" class="animate-spin h-5 w-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+                        <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+                        <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+                    </svg>
+                    <svg v-else xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15.232 5.232l3.536 3.536m-2.036-5.036a2.5 2.5 0 113.536 3.536L6.5 21.036H3v-3.572L16.732 3.732z" />
+                    </svg>
+                    {{ loading ? 'Wird erstellt...' : 'Speichern & Unterschreiben' }}
+                </button>
+                <button @click="submit(false)" :disabled="!isValid || loading" class="w-full py-3 text-primary text-sm font-medium">
+                    Nur speichern (ohne Unterschrift)
+                </button>
+            </div>
+
+            <!-- Date Picker Component -->
+            <DatePicker
+                :show="showDatePicker"
+                :model-value="hoursEntries[activeEntryIndex]?.date"
+                @update:model-value="updateEntryDate"
+                @close="showDatePicker = false"
+            />
+
+            <!-- Employee Selector Component -->
+            <EmployeeSelector
+                :show="showEmployeeSelector"
+                :exclude-ids="selectedEmployeeIds"
+                @select="addEmployee"
+                @close="showEmployeeSelector = false"
+            />
+
+            <!-- Customer Search Modal -->
+            <teleport to="body">
+                <transition name="slide-up">
+                    <div v-if="showCustomerSearch" class="fixed inset-0 z-50 flex flex-col bg-white dark:bg-slate-900">
+                        <div class="flex items-center px-4 py-3 border-b border-slate-200 dark:border-slate-700">
+                            <button @click="showCustomerSearch = false" class="p-2 -ml-2">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 text-slate-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+                                </svg>
+                            </button>
+                            <h2 class="ml-2 text-lg font-semibold text-slate-800 dark:text-white">Kunde suchen</h2>
+                        </div>
+                        <div class="p-4">
+                            <input type="text" v-model="customerSearchQuery" autofocus class="w-full px-4 py-3 bg-slate-100 dark:bg-slate-800 rounded-xl text-base" placeholder="Name, Firma, Kundennummer..." />
+                        </div>
+                        <div class="flex-1 overflow-y-auto px-4">
+                            <div v-if="customerSearchLoading" class="text-center py-8 text-slate-500">Suche...</div>
+                            <div v-else-if="customerSearchResults.length === 0 && customerSearchQuery.length >= 1" class="text-center py-8 text-slate-500">Keine Kunden gefunden</div>
+                            <div v-else class="space-y-2">
+                                <button v-for="customer in customerSearchResults" :key="customer.id" @click="selectCustomer(customer)" class="w-full text-left p-3 bg-slate-50 dark:bg-slate-800 rounded-xl active:bg-slate-100 dark:active:bg-slate-700">
+                                    <div class="font-medium text-slate-800 dark:text-white">{{ customer.displayName }}</div>
+                                    <div v-if="customer.company && customer.company !== customer.displayName" class="text-sm text-primary">{{ customer.company }}</div>
+                                    <div class="text-sm text-slate-500 dark:text-slate-400">{{ customer.street }}, {{ customer.zip }} {{ customer.city }}</div>
+                                    <div v-if="customer.customerNumber" class="text-xs text-slate-400 dark:text-slate-500 mt-1">KNr: {{ customer.customerNumber }}</div>
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </transition>
+            </teleport>
+
+            <!-- Article Search Modal -->
+            <teleport to="body">
+                <transition name="slide-up">
+                    <div v-if="showArticleSearch" class="fixed inset-0 z-50 flex flex-col bg-white dark:bg-slate-900">
+                        <div class="flex items-center px-4 py-3 border-b border-slate-200 dark:border-slate-700">
+                            <button @click="showArticleSearch = false" class="p-2 -ml-2">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 text-slate-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+                                </svg>
+                            </button>
+                            <h2 class="ml-2 text-lg font-semibold text-slate-800 dark:text-white">Artikel suchen</h2>
+                        </div>
+                        <div class="p-4">
+                            <input type="text" v-model="articleSearchQuery" autofocus class="w-full px-4 py-3 bg-slate-100 dark:bg-slate-800 rounded-xl text-base" placeholder="Artikelnummer oder Name..." />
+                        </div>
+                        <div class="flex-1 overflow-y-auto px-4">
+                            <div v-if="articleSearchLoading" class="text-center py-8 text-slate-500">Suche...</div>
+                            <div v-else-if="articleSearchResults.length === 0 && articleSearchQuery.length >= 1" class="text-center py-8 text-slate-500">Keine Artikel gefunden</div>
+                            <div v-else class="space-y-2">
+                                <button v-for="article in articleSearchResults" :key="article.id" @click="addArticle(article)" class="w-full text-left p-3 bg-slate-50 dark:bg-slate-800 rounded-xl active:bg-slate-100 dark:active:bg-slate-700">
+                                    <div class="font-medium text-slate-800 dark:text-white">{{ article.title }}</div>
+                                    <div class="text-sm text-slate-500 dark:text-slate-400">{{ article.articleNumber }}</div>
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </transition>
+            </teleport>
+
+            <!-- Car Select Modal -->
+            <teleport to="body">
+                <transition name="slide-up">
+                    <div v-if="showCarSelect" class="fixed inset-0 z-50 flex flex-col bg-white dark:bg-slate-900">
+                        <div class="flex items-center px-4 py-3 border-b border-slate-200 dark:border-slate-700">
+                            <button @click="showCarSelect = false" class="p-2 -ml-2">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 text-slate-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+                                </svg>
+                            </button>
+                            <h2 class="ml-2 text-lg font-semibold text-slate-800 dark:text-white">Fahrzeug wählen</h2>
+                        </div>
+                        <div class="flex-1 overflow-y-auto p-4 space-y-2">
+                            <button v-for="car in allCars" :key="car.id" @click="selectCar(car)"
+                                :class="['w-full text-left p-3 rounded-xl', hoursEntries[carSelectEntryIndex]?.carId === car.id ? 'bg-primary/10 border-2 border-primary' : 'bg-slate-50 dark:bg-slate-800']"
+                            >
+                                <div class="font-medium text-slate-800 dark:text-white">{{ car.name }}</div>
+                                <div v-if="car.plate" class="text-sm text-slate-500 dark:text-slate-400">{{ car.plate }}</div>
+                            </button>
+                            <button @click="selectCar({id: null, name: ''})" class="w-full text-left p-3 bg-slate-50 dark:bg-slate-800 rounded-xl text-slate-500">
+                                Kein Fahrzeug
+                            </button>
+                        </div>
+                    </div>
+                </transition>
+            </teleport>
+
+            <!-- Hour Type Select Modal -->
+            <teleport to="body">
+                <transition name="slide-up">
+                    <div v-if="showHourTypeSelect" class="fixed inset-0 z-50 flex flex-col bg-white dark:bg-slate-900">
+                        <div class="flex items-center px-4 py-3 border-b border-slate-200 dark:border-slate-700">
+                            <button @click="showHourTypeSelect = false" class="p-2 -ml-2">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 text-slate-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+                                </svg>
+                            </button>
+                            <h2 class="ml-2 text-lg font-semibold text-slate-800 dark:text-white">Stundenart wählen</h2>
+                        </div>
+                        <div class="flex-1 overflow-y-auto p-4 space-y-2">
+                            <button v-for="ht in hourTypes" :key="ht.id" @click="selectHourType(ht)"
+                                :class="['w-full text-left p-4 rounded-xl', hoursEntries[hourTypeSelectEntryIndex]?.hourType === ht.id ? 'bg-primary/10 border-2 border-primary' : 'bg-slate-50 dark:bg-slate-800']"
+                            >
+                                <div class="font-medium text-slate-800 dark:text-white">{{ ht.name }}</div>
+                            </button>
+                        </div>
+                    </div>
+                </transition>
+            </teleport>
+        </div>
+    `
+};
diff --git a/public/mobile/modules/lager/shippingnote/ShippingNoteList.js b/public/mobile/modules/lager/shippingnote/ShippingNoteList.js
new file mode 100644
index 000000000..284e7ada8
--- /dev/null
+++ b/public/mobile/modules/lager/shippingnote/ShippingNoteList.js
@@ -0,0 +1,227 @@
+/**
+ * ShippingNoteList Component
+ *
+ * Lists unsigned shipping notes for the current user.
+ * Features:
+ * - Pull to refresh
+ * - Tap to open signature modal
+ * - Shows customer, date, note preview
+ */
+
+import { shippingNoteApi } from '/mobile/modules/lager/shippingnote/ShippingNoteModule.js';
+
+export default {
+    name: 'ShippingNoteList',
+    emits: ['sign', 'toast'],
+    props: {
+        user: Object
+    },
+
+    setup(props, { emit }) {
+        const { ref, onMounted } = Vue;
+
+        // Data
+        const shippingNotes = ref([]);
+        const loading = ref(true);
+        const refreshing = ref(false);
+        const error = ref(null);
+
+        // Load shipping notes
+        const loadShippingNotes = async (isRefresh = false) => {
+            if (isRefresh) {
+                refreshing.value = true;
+            } else {
+                loading.value = true;
+            }
+            error.value = null;
+
+            try {
+                const data = await shippingNoteApi.get('getMyShippingNotes');
+
+                if (data.success) {
+                    shippingNotes.value = data.shippingNotes || [];
+                } else {
+                    error.value = data.error || 'Fehler beim Laden';
+                }
+            } catch (e) {
+                console.error('Failed to load shipping notes:', e);
+                error.value = 'Netzwerkfehler';
+            } finally {
+                loading.value = false;
+                refreshing.value = false;
+            }
+        };
+
+        // Pull to refresh
+        let touchStartY = 0;
+        let isPulling = false;
+
+        const handleTouchStart = (e) => {
+            const scrollTop = e.currentTarget.scrollTop;
+            if (scrollTop === 0) {
+                touchStartY = e.touches[0].clientY;
+                isPulling = true;
+            }
+        };
+
+        const handleTouchMove = (e) => {
+            if (!isPulling) return;
+            const deltaY = e.touches[0].clientY - touchStartY;
+            if (deltaY > 80 && !refreshing.value) {
+                loadShippingNotes(true);
+                isPulling = false;
+            }
+        };
+
+        const handleTouchEnd = () => {
+            isPulling = false;
+        };
+
+        // Open signature for a shipping note
+        const openSignature = (shippingNote) => {
+            emit('sign', shippingNote);
+            navigator.vibrate?.([50]);
+        };
+
+        // Format date
+        const formatDate = (dateStr) => {
+            if (!dateStr) return '';
+            const date = new Date(dateStr);
+            return date.toLocaleDateString('de-AT', {
+                day: '2-digit',
+                month: '2-digit',
+                year: 'numeric'
+            });
+        };
+
+        // Initialize
+        onMounted(() => {
+            loadShippingNotes();
+        });
+
+        return {
+            shippingNotes,
+            loading,
+            refreshing,
+            error,
+            loadShippingNotes,
+            handleTouchStart,
+            handleTouchMove,
+            handleTouchEnd,
+            openSignature,
+            formatDate
+        };
+    },
+
+    template: `
+        <div
+            class="h-full overflow-y-auto"
+            @touchstart="handleTouchStart"
+            @touchmove="handleTouchMove"
+            @touchend="handleTouchEnd"
+        >
+            <!-- Pull to refresh indicator -->
+            <div v-if="refreshing" class="flex items-center justify-center py-4">
+                <svg class="animate-spin h-6 w-6 text-primary" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+                    <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+                    <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+                </svg>
+            </div>
+
+            <!-- Loading state -->
+            <div v-if="loading && !refreshing" class="flex flex-col items-center justify-center py-16">
+                <svg class="animate-spin h-8 w-8 text-primary mb-3" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+                    <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+                    <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+                </svg>
+                <p class="text-sm text-slate-500 dark:text-slate-400">Lade Lieferscheine...</p>
+            </div>
+
+            <!-- Error state -->
+            <div v-else-if="error" class="flex flex-col items-center justify-center py-16 px-4">
+                <div class="w-16 h-16 rounded-full bg-red-100 dark:bg-red-900/30 flex items-center justify-center mb-4">
+                    <svg xmlns="http://www.w3.org/2000/svg" class="h-8 w-8 text-red-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
+                    </svg>
+                </div>
+                <p class="text-sm text-slate-500 dark:text-slate-400 mb-4">{{ error }}</p>
+                <button
+                    @click="loadShippingNotes()"
+                    class="px-4 py-2 bg-primary text-white rounded-lg text-sm font-medium"
+                >
+                    Erneut versuchen
+                </button>
+            </div>
+
+            <!-- Empty state -->
+            <div v-else-if="shippingNotes.length === 0" class="flex flex-col items-center justify-center py-16 px-4">
+                <div class="w-16 h-16 rounded-full bg-green-100 dark:bg-green-900/30 flex items-center justify-center mb-4">
+                    <svg xmlns="http://www.w3.org/2000/svg" class="h-8 w-8 text-green-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" />
+                    </svg>
+                </div>
+                <p class="text-lg font-medium text-slate-800 dark:text-white mb-1">Alles unterschrieben!</p>
+                <p class="text-sm text-slate-500 dark:text-slate-400 text-center">
+                    Keine offenen Lieferscheine zum Unterschreiben.
+                </p>
+            </div>
+
+            <!-- Shipping note list -->
+            <div v-else class="p-3 space-y-2">
+                <div class="text-xs text-slate-500 dark:text-slate-400 mb-2 px-1">
+                    {{ shippingNotes.length }} {{ shippingNotes.length === 1 ? 'Lieferschein' : 'Lieferscheine' }} zum Unterschreiben
+                </div>
+
+                <button
+                    v-for="note in shippingNotes"
+                    :key="note.id"
+                    @click="openSignature(note)"
+                    class="w-full text-left bg-white dark:bg-slate-800 rounded-xl p-4 shadow-sm active:bg-slate-50 dark:active:bg-slate-700 transition"
+                >
+                    <div class="flex items-start justify-between">
+                        <div class="flex-1 min-w-0">
+                            <!-- Number and Date -->
+                            <div class="flex items-center gap-2 mb-1">
+                                <span class="text-sm font-semibold text-primary">
+                                    #{{ note.number || note.id }}
+                                </span>
+                                <span class="text-xs text-slate-400 dark:text-slate-500">
+                                    {{ formatDate(note.date) }}
+                                </span>
+                            </div>
+
+                            <!-- Customer Name -->
+                            <div class="font-medium text-slate-800 dark:text-white truncate">
+                                {{ note.customerName || note.deliveryAddressName || 'Unbekannter Kunde' }}
+                            </div>
+
+                            <!-- Address -->
+                            <div class="text-sm text-slate-500 dark:text-slate-400 truncate mt-0.5">
+                                {{ note.deliveryAddressLine }}, {{ note.deliveryAddressPLZ }} {{ note.deliveryAddressCity }}
+                            </div>
+
+                            <!-- Note preview -->
+                            <div v-if="note.note" class="text-xs text-slate-400 dark:text-slate-500 mt-2 truncate">
+                                {{ note.note }}
+                            </div>
+                        </div>
+
+                        <!-- Sign indicator -->
+                        <div class="flex-shrink-0 ml-3">
+                            <div class="w-10 h-10 rounded-full bg-amber-100 dark:bg-amber-900/30 flex items-center justify-center">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-amber-600 dark:text-amber-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15.232 5.232l3.536 3.536m-2.036-5.036a2.5 2.5 0 113.536 3.536L6.5 21.036H3v-3.572L16.732 3.732z" />
+                                </svg>
+                            </div>
+                        </div>
+                    </div>
+                </button>
+            </div>
+
+            <!-- Refresh hint -->
+            <div class="text-center py-4 text-xs text-slate-400 dark:text-slate-500">
+                Ziehen zum Aktualisieren
+            </div>
+        </div>
+    `
+};
diff --git a/public/mobile/modules/lager/shippingnote/ShippingNoteModule.js b/public/mobile/modules/lager/shippingnote/ShippingNoteModule.js
new file mode 100644
index 000000000..b5667a8ce
--- /dev/null
+++ b/public/mobile/modules/lager/shippingnote/ShippingNoteModule.js
@@ -0,0 +1,164 @@
+import { createModuleApi } from '/mobile/shared/api.js';
+import ShippingNoteForm from '/mobile/modules/lager/shippingnote/ShippingNoteForm.js';
+import ShippingNoteList from '/mobile/modules/lager/shippingnote/ShippingNoteList.js';
+import SignaturePad from '/mobile/modules/lager/shippingnote/SignaturePad.js';
+
+const shippingNoteApi = createModuleApi('Lager/ShippingNote');
+
+export { shippingNoteApi };
+
+export default {
+    name: 'ShippingNoteModule',
+    emits: ['navigate', 'toast'],
+    props: {
+        user: Object,
+        submodule: String
+    },
+    components: {
+        ShippingNoteForm,
+        ShippingNoteList,
+        SignaturePad
+    },
+
+    setup(props, { emit }) {
+        const { ref, computed, watch, onMounted } = Vue;
+
+        // Current view: 'create' | 'list' | 'sign'
+        const currentTab = ref('create');
+
+        // Signature modal state
+        const showSignatureModal = ref(false);
+        const signatureShippingNoteId = ref(null);
+        const signatureShippingNote = ref(null);
+
+        // Last created shipping note (for immediate signing)
+        const lastCreatedId = ref(null);
+
+        // Open signature modal for a shipping note
+        const openSignature = (shippingNote) => {
+            signatureShippingNoteId.value = shippingNote.id;
+            signatureShippingNote.value = shippingNote;
+            showSignatureModal.value = true;
+        };
+
+        // Close signature modal
+        const closeSignature = () => {
+            showSignatureModal.value = false;
+            signatureShippingNoteId.value = null;
+            signatureShippingNote.value = null;
+        };
+
+        // Handle successful signature
+        const handleSignatureComplete = () => {
+            closeSignature();
+            emit('toast', 'Unterschrift gespeichert', 'success');
+            // Haptic feedback
+            navigator.vibrate?.([100, 50, 100]);
+        };
+
+        // Handle shipping note created
+        const handleCreated = (shippingNote) => {
+            lastCreatedId.value = shippingNote.id;
+            emit('toast', 'Lieferschein erstellt', 'success');
+            // Haptic feedback
+            navigator.vibrate?.([100]);
+        };
+
+        // Handle immediate sign after create
+        const handleCreateAndSign = (shippingNote) => {
+            handleCreated(shippingNote);
+            // Open signature modal immediately
+            openSignature(shippingNote);
+        };
+
+        // Show toast
+        const showToast = (message, type) => {
+            emit('toast', message, type);
+        };
+
+        // Switch tab
+        const switchTab = (tab) => {
+            currentTab.value = tab;
+        };
+
+        return {
+            currentTab,
+            showSignatureModal,
+            signatureShippingNoteId,
+            signatureShippingNote,
+            lastCreatedId,
+            openSignature,
+            closeSignature,
+            handleSignatureComplete,
+            handleCreated,
+            handleCreateAndSign,
+            showToast,
+            switchTab
+        };
+    },
+
+    template: `
+        <div class="flex flex-col h-full">
+            <!-- Tabs -->
+            <div class="flex bg-slate-100 dark:bg-slate-900 border-b border-slate-200 dark:border-slate-700 px-3 py-2">
+                <button
+                    @click="switchTab('create')"
+                    :class="[
+                        'flex-1 py-2.5 text-sm font-medium rounded-lg transition flex items-center justify-center gap-2',
+                        currentTab === 'create' ? 'bg-white dark:bg-slate-800 shadow-sm text-primary' : 'text-slate-500 dark:text-slate-400'
+                    ]"
+                >
+                    <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4" />
+                    </svg>
+                    Neu erstellen
+                </button>
+                <button
+                    @click="switchTab('list')"
+                    :class="[
+                        'flex-1 py-2.5 text-sm font-medium rounded-lg transition flex items-center justify-center gap-2 ml-1',
+                        currentTab === 'list' ? 'bg-white dark:bg-slate-800 shadow-sm text-primary' : 'text-slate-500 dark:text-slate-400'
+                    ]"
+                >
+                    <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z" />
+                    </svg>
+                    Unterschreiben
+                </button>
+            </div>
+
+            <!-- Content -->
+            <main class="flex-1 overflow-y-auto bg-slate-50 dark:bg-slate-900">
+                <!-- Create Form -->
+                <ShippingNoteForm
+                    v-if="currentTab === 'create'"
+                    :user="user"
+                    @created="handleCreated"
+                    @createAndSign="handleCreateAndSign"
+                    @toast="showToast"
+                />
+
+                <!-- List of unsigned notes -->
+                <ShippingNoteList
+                    v-else-if="currentTab === 'list'"
+                    :user="user"
+                    @sign="openSignature"
+                    @toast="showToast"
+                />
+            </main>
+
+            <!-- Signature Modal -->
+            <transition name="slide-up">
+                <div v-if="showSignatureModal" class="fixed inset-0 z-50 flex flex-col bg-white dark:bg-slate-900">
+                    <SignaturePad
+                        :shipping-note-id="signatureShippingNoteId"
+                        :shipping-note="signatureShippingNote"
+                        @close="closeSignature"
+                        @signed="handleSignatureComplete"
+                        @toast="showToast"
+                    />
+                </div>
+            </transition>
+        </div>
+    `
+};
diff --git a/public/mobile/modules/lager/shippingnote/SignaturePad.js b/public/mobile/modules/lager/shippingnote/SignaturePad.js
new file mode 100644
index 000000000..e1b5310df
--- /dev/null
+++ b/public/mobile/modules/lager/shippingnote/SignaturePad.js
@@ -0,0 +1,300 @@
+/**
+ * SignaturePad Component
+ *
+ * Full-screen signature capture for shipping notes.
+ * Features:
+ * - Canvas-based signature drawing
+ * - Customer name input
+ * - Clear/retry functionality
+ * - Base64 PNG export
+ */
+
+import { shippingNoteApi } from '/mobile/modules/lager/shippingnote/ShippingNoteModule.js';
+
+export default {
+    name: 'SignaturePad',
+    emits: ['close', 'signed', 'toast'],
+    props: {
+        shippingNoteId: [Number, String],
+        shippingNote: Object
+    },
+
+    setup(props, { emit }) {
+        const { ref, onMounted, onUnmounted, nextTick } = Vue;
+
+        // Refs
+        const canvasRef = ref(null);
+        const signatureName = ref('');
+        const loading = ref(false);
+        const hasSignature = ref(false);
+
+        // Canvas context
+        let ctx = null;
+        let isDrawing = false;
+        let lastX = 0;
+        let lastY = 0;
+
+        // Initialize canvas
+        onMounted(async () => {
+            await nextTick();
+            initCanvas();
+            window.addEventListener('resize', handleResize);
+        });
+
+        onUnmounted(() => {
+            window.removeEventListener('resize', handleResize);
+        });
+
+        const initCanvas = () => {
+            const canvas = canvasRef.value;
+            if (!canvas) return;
+
+            // Set canvas size to container
+            const container = canvas.parentElement;
+            canvas.width = container.clientWidth;
+            canvas.height = container.clientHeight;
+
+            ctx = canvas.getContext('2d');
+            ctx.strokeStyle = '#000000';
+            ctx.lineWidth = 3;
+            ctx.lineCap = 'round';
+            ctx.lineJoin = 'round';
+
+            // Fill with white background
+            ctx.fillStyle = '#ffffff';
+            ctx.fillRect(0, 0, canvas.width, canvas.height);
+        };
+
+        const handleResize = () => {
+            // Save current signature
+            const canvas = canvasRef.value;
+            if (!canvas) return;
+
+            const imageData = canvas.toDataURL();
+
+            // Resize canvas
+            initCanvas();
+
+            // Restore signature
+            if (hasSignature.value) {
+                const img = new Image();
+                img.onload = () => {
+                    ctx.drawImage(img, 0, 0);
+                };
+                img.src = imageData;
+            }
+        };
+
+        // Get position from touch/mouse event
+        const getPosition = (e) => {
+            const canvas = canvasRef.value;
+            const rect = canvas.getBoundingClientRect();
+
+            if (e.touches && e.touches.length > 0) {
+                return {
+                    x: e.touches[0].clientX - rect.left,
+                    y: e.touches[0].clientY - rect.top
+                };
+            }
+            return {
+                x: e.clientX - rect.left,
+                y: e.clientY - rect.top
+            };
+        };
+
+        // Start drawing
+        const startDrawing = (e) => {
+            e.preventDefault();
+            isDrawing = true;
+            const pos = getPosition(e);
+            lastX = pos.x;
+            lastY = pos.y;
+        };
+
+        // Draw
+        const draw = (e) => {
+            if (!isDrawing) return;
+            e.preventDefault();
+
+            const pos = getPosition(e);
+
+            ctx.beginPath();
+            ctx.moveTo(lastX, lastY);
+            ctx.lineTo(pos.x, pos.y);
+            ctx.stroke();
+
+            lastX = pos.x;
+            lastY = pos.y;
+            hasSignature.value = true;
+        };
+
+        // Stop drawing
+        const stopDrawing = () => {
+            isDrawing = false;
+        };
+
+        // Clear canvas
+        const clearCanvas = () => {
+            const canvas = canvasRef.value;
+            if (!canvas || !ctx) return;
+
+            ctx.fillStyle = '#ffffff';
+            ctx.fillRect(0, 0, canvas.width, canvas.height);
+            hasSignature.value = false;
+            navigator.vibrate?.([30]);
+        };
+
+        // Submit signature
+        const submitSignature = async () => {
+            if (!hasSignature.value) {
+                emit('toast', 'Bitte unterschreiben', 'error');
+                return;
+            }
+
+            if (!signatureName.value.trim()) {
+                emit('toast', 'Bitte Namen eingeben', 'error');
+                return;
+            }
+
+            loading.value = true;
+
+            try {
+                const canvas = canvasRef.value;
+                const signatureData = canvas.toDataURL('image/png');
+
+                const data = await shippingNoteApi.post(`sign?id=${props.shippingNoteId}`, {
+                    signature: signatureData,
+                    signatureName: signatureName.value.trim()
+                });
+
+                if (data.success) {
+                    emit('signed', data);
+                } else {
+                    emit('toast', data.error || 'Fehler beim Speichern', 'error');
+                }
+            } catch (e) {
+                console.error('Signature submit failed:', e);
+                emit('toast', 'Netzwerkfehler', 'error');
+            } finally {
+                loading.value = false;
+            }
+        };
+
+        // Close handler
+        const handleClose = () => {
+            emit('close');
+        };
+
+        return {
+            canvasRef,
+            signatureName,
+            loading,
+            hasSignature,
+            startDrawing,
+            draw,
+            stopDrawing,
+            clearCanvas,
+            submitSignature,
+            handleClose
+        };
+    },
+
+    template: `
+        <div class="flex flex-col h-full bg-white dark:bg-slate-900">
+            <!-- Header -->
+            <div class="flex items-center justify-between px-4 py-3 border-b border-slate-200 dark:border-slate-700 bg-slate-50 dark:bg-slate-800">
+                <button
+                    @click="handleClose"
+                    class="p-2 -ml-2 text-slate-500"
+                >
+                    <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+                    </svg>
+                </button>
+                <h2 class="text-lg font-semibold text-slate-800 dark:text-white">Unterschrift</h2>
+                <button
+                    @click="clearCanvas"
+                    class="p-2 -mr-2 text-red-500"
+                >
+                    <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
+                    </svg>
+                </button>
+            </div>
+
+            <!-- Shipping Note Info -->
+            <div v-if="shippingNote" class="px-4 py-3 bg-slate-100 dark:bg-slate-800 border-b border-slate-200 dark:border-slate-700">
+                <div class="text-sm text-slate-500 dark:text-slate-400">Lieferschein Nr.</div>
+                <div class="font-medium text-slate-800 dark:text-white">{{ shippingNote.number || shippingNote.id }}</div>
+                <div v-if="shippingNote.customerName" class="text-sm text-slate-600 dark:text-slate-300 mt-1">
+                    {{ shippingNote.customerName }}
+                </div>
+            </div>
+
+            <!-- Signature Canvas -->
+            <div class="flex-1 relative bg-white overflow-hidden">
+                <canvas
+                    ref="canvasRef"
+                    class="absolute inset-0 touch-none"
+                    @mousedown="startDrawing"
+                    @mousemove="draw"
+                    @mouseup="stopDrawing"
+                    @mouseleave="stopDrawing"
+                    @touchstart="startDrawing"
+                    @touchmove="draw"
+                    @touchend="stopDrawing"
+                    @touchcancel="stopDrawing"
+                ></canvas>
+
+                <!-- Signature line hint -->
+                <div class="absolute bottom-16 left-8 right-8 border-b-2 border-dashed border-slate-300 pointer-events-none"></div>
+                <div class="absolute bottom-12 left-8 text-xs text-slate-400 pointer-events-none">Hier unterschreiben</div>
+
+                <!-- Empty state hint -->
+                <div v-if="!hasSignature" class="absolute inset-0 flex items-center justify-center pointer-events-none">
+                    <div class="text-center text-slate-400">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-12 w-12 mx-auto mb-2 opacity-50" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M15.232 5.232l3.536 3.536m-2.036-5.036a2.5 2.5 0 113.536 3.536L6.5 21.036H3v-3.572L16.732 3.732z" />
+                        </svg>
+                        <p class="text-sm">Mit Finger unterschreiben</p>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Footer -->
+            <div class="p-4 bg-slate-50 dark:bg-slate-800 border-t border-slate-200 dark:border-slate-700 space-y-3">
+                <!-- Name input -->
+                <div>
+                    <label class="block text-xs text-slate-500 dark:text-slate-400 mb-1">Name des Unterzeichners *</label>
+                    <input
+                        type="text"
+                        v-model="signatureName"
+                        class="w-full px-4 py-3 bg-white dark:bg-slate-700 border border-slate-200 dark:border-slate-600 rounded-xl text-base"
+                        placeholder="Max Mustermann"
+                    />
+                </div>
+
+                <!-- Submit button -->
+                <button
+                    @click="submitSignature"
+                    :disabled="!hasSignature || loading"
+                    :class="[
+                        'w-full py-5 rounded-xl text-base font-semibold transition flex items-center justify-center gap-2',
+                        hasSignature && !loading
+                            ? 'bg-gradient-to-r from-green-500 to-emerald-600 text-white shadow-lg active:scale-[0.98]'
+                            : 'bg-slate-200 dark:bg-slate-700 text-slate-400 dark:text-slate-500'
+                    ]"
+                >
+                    <svg v-if="loading" class="animate-spin h-5 w-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+                        <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+                        <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+                    </svg>
+                    <svg v-else xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7" />
+                    </svg>
+                    {{ loading ? 'Wird gespeichert...' : 'Unterschrift speichern' }}
+                </button>
+            </div>
+        </div>
+    `
+};
diff --git a/public/mobile/modules/workorder/WorkorderModule.js b/public/mobile/modules/workorder/WorkorderModule.js
new file mode 100644
index 000000000..cdd16a81b
--- /dev/null
+++ b/public/mobile/modules/workorder/WorkorderModule.js
@@ -0,0 +1,1373 @@
+/**
+ * Workorder Module (Aufträge)
+ *
+ * Main module for workorder management in MobileApp.
+ * Provides list view and full-screen detail view with collapsible cards.
+ */
+
+export default {
+    name: 'WorkorderModule',
+    emits: ['navigate', 'toast'],
+    props: {
+        user: Object,
+        submodule: String
+    },
+
+    setup(props, { emit }) {
+        const { ref, computed, watch, onMounted, nextTick } = Vue;
+
+        // =====================
+        // STATE
+        // =====================
+        const isLoading = ref(true);
+        const workorders = ref([]);
+        const searchTerm = ref('');
+        const selectedFcp = ref('all');
+        const showFcpFilter = ref(false);
+
+        // Detail view state
+        const selectedWorkorder = ref(null);
+        const isDetailLoading = ref(false);
+        const documentation = ref({ docs: [], journals: [] });
+        const tenantConfig = ref(null);
+        const checklist = ref([]);
+
+        // Expanded cards state
+        const expandedCards = ref({
+            customer: true,
+            checklist: true,
+            documentation: false,
+            notes: false,
+            journal: false,
+            cableData: false
+        });
+
+        // Edit states
+        const isEditingNotes = ref(false);
+        const tempNotes = ref('');
+        const newJournalText = ref('');
+        const cableDataForm = ref({ cableLength: '', cableType: '' });
+
+        // Bottom sheets
+        const showDocUploadSheet = ref(false);
+        const showProblemSheet = ref(false);
+        const showCompleteSheet = ref(false);
+
+        // Upload state
+        const uploadDocType = ref('');
+        const isUploading = ref(false);
+        const fileInputRef = ref(null);
+        const pendingChecklistUpload = ref(null); // For auto-advance camera
+
+        // Problem form
+        const problemType = ref('');
+        const problemComment = ref('');
+
+        // Swipe state for list cards
+        const swipeStartX = ref(0);
+        const swipeCardId = ref(null);
+        const swipeOffset = ref({});  // { [workorderId]: offsetX }
+
+        // =====================
+        // COMPUTED
+        // =====================
+        const fcpOptions = computed(() => {
+            if (!workorders.value.length) return [{ value: 'all', text: 'Alle FCPs' }];
+            const fcps = [...new Set(workorders.value.map(wo => wo.fcpName).filter(Boolean))].sort();
+            return [{ value: 'all', text: 'Alle FCPs' }, ...fcps.map(fcp => ({ value: fcp, text: fcp }))];
+        });
+
+        const filteredWorkorders = computed(() => {
+            let filtered = workorders.value;
+
+            // FCP filter
+            if (selectedFcp.value !== 'all') {
+                filtered = filtered.filter(wo => wo.fcpName === selectedFcp.value);
+            }
+
+            // Search filter
+            if (searchTerm.value.length > 2) {
+                const term = searchTerm.value.toLowerCase();
+                filtered = filtered.filter(wo =>
+                    wo.id.toString().includes(term) ||
+                    (wo.oaid && wo.oaid.toLowerCase().includes(term)) ||
+                    (wo.fcpName && wo.fcpName.toLowerCase().includes(term)) ||
+                    (wo.customerName && wo.customerName.toLowerCase().includes(term)) ||
+                    (wo.customerAddress && wo.customerAddress.toLowerCase().includes(term))
+                );
+            }
+
+            // Sort by status priority
+            const getStatusRank = (status) => {
+                switch (status) {
+                    case 'scheduled':
+                    case 'civil_engineering_completed': return 0;
+                    case 'assigned':
+                    case 'new':
+                    case 'problem_solved': return 1;
+                    case 'in_progress': return 2;
+                    case 'intervention_required':
+                    case 'correction_requested': return 3;
+                    case 'documented':
+                    case 'completed': return 4;
+                    default: return 99;
+                }
+            };
+
+            return filtered.sort((a, b) => {
+                const rankA = getStatusRank(a.status);
+                const rankB = getStatusRank(b.status);
+                if (rankA !== rankB) return rankA - rankB;
+                return (a.appointmentDate || Infinity) - (b.appointmentDate || Infinity);
+            });
+        });
+
+        const checklistProgress = computed(() => {
+            if (!checklist.value.length) return { completed: 0, total: 0, text: '0/0' };
+            const completed = checklist.value.filter(c => c.completed).length;
+            const total = checklist.value.length;
+            return { completed, total, text: `${completed}/${total}` };
+        });
+
+        const isChecklistComplete = computed(() => {
+            // Check required items are completed (if any are marked as required)
+            const requiredItems = checklist.value.filter(c => c.required);
+            if (requiredItems.length > 0) {
+                const allRequiredComplete = requiredItems.every(c => c.completed);
+                if (!allRequiredComplete) return false;
+            } else if (checklist.value.length > 0) {
+                // If no items are marked as required, check if at least some items are completed
+                const hasAnyCompleted = checklist.value.some(c => c.completed);
+                if (!hasAnyCompleted) return false;
+            }
+
+            // Check cable data if required
+            if (tenantConfig.value?.requireCableLength && !cableDataForm.value.cableLength?.trim()) {
+                return false;
+            }
+            if (tenantConfig.value?.requireCableType && !cableDataForm.value.cableType?.trim()) {
+                return false;
+            }
+
+            return true;
+        });
+
+        const incompleteItems = computed(() => {
+            const items = [];
+            checklist.value.filter(c => !c.completed).forEach(c => {
+                items.push(c.text);
+            });
+            if (tenantConfig.value?.requireCableLength && !cableDataForm.value.cableLength?.trim()) {
+                items.push('Kabellänge');
+            }
+            if (tenantConfig.value?.requireCableType && !cableDataForm.value.cableType?.trim()) {
+                items.push('Kabeltyp');
+            }
+            return items;
+        });
+
+        const googleMapsLink = computed(() => {
+            if (!selectedWorkorder.value?.customer) return '#';
+            const c = selectedWorkorder.value.customer;
+            const address = encodeURIComponent(`${c.street}, ${c.zip} ${c.city}`);
+            return `https://maps.google.com/maps?q=${address}`;
+        });
+
+        // =====================
+        // METHODS
+        // =====================
+        const fetchWorkorders = async () => {
+            isLoading.value = true;
+            try {
+                const response = await fetch('/MobileApp/Workorder/Workorder/get', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    credentials: 'include',
+                    body: JSON.stringify({ pagination: { page: 1, per_page: 500 } })
+                });
+                const data = await response.json();
+                if (data.success) {
+                    workorders.value = data.workorders;
+                }
+            } catch (error) {
+                console.error('Error fetching workorders:', error);
+                emit('toast', 'Fehler beim Laden der Aufträge', 'error');
+            } finally {
+                isLoading.value = false;
+            }
+        };
+
+        const openDetail = async (workorder) => {
+            selectedWorkorder.value = workorder;
+            isDetailLoading.value = true;
+            expandedCards.value = { customer: true, checklist: true, documentation: false, notes: false, journal: false, cableData: false };
+
+            try {
+                // Fetch all workorder details in a single request
+                const response = await fetch(`/MobileApp/Workorder/Workorder/getWorkorderDetail?id=${workorder.id}`, { credentials: 'include' });
+                const data = await response.json();
+
+                if (data.success) {
+                    selectedWorkorder.value = data.workorder;
+                    cableDataForm.value = {
+                        cableLength: data.workorder.cableLength || '',
+                        cableType: data.workorder.cableType || ''
+                    };
+                    documentation.value = { docs: data.docs, journals: data.journals };
+                    tenantConfig.value = data.tenantConfig;
+                    checklist.value = data.checklist;
+                } else {
+                    emit('toast', data.message || 'Fehler beim Laden', 'error');
+                }
+            } catch (error) {
+                console.error('Error loading detail:', error);
+                emit('toast', 'Fehler beim Laden der Details', 'error');
+            } finally {
+                isDetailLoading.value = false;
+            }
+        };
+
+        const closeDetail = () => {
+            selectedWorkorder.value = null;
+            documentation.value = { docs: [], journals: [] };
+            tenantConfig.value = null;
+            checklist.value = [];
+            isEditingNotes.value = false;
+        };
+
+        const toggleCard = (cardId) => {
+            expandedCards.value[cardId] = !expandedCards.value[cardId];
+        };
+
+        // Notes editing
+        const startEditNotes = () => {
+            tempNotes.value = selectedWorkorder.value.additionalInfo || '';
+            isEditingNotes.value = true;
+        };
+
+        const cancelEditNotes = () => {
+            isEditingNotes.value = false;
+            tempNotes.value = '';
+        };
+
+        const saveNotes = async () => {
+            try {
+                const response = await fetch('/MobileApp/Workorder/Workorder/updateAdditionalInfo', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    credentials: 'include',
+                    body: JSON.stringify({
+                        workorderId: selectedWorkorder.value.id,
+                        additionalInfo: tempNotes.value
+                    })
+                });
+                const data = await response.json();
+                if (data.success) {
+                    selectedWorkorder.value.additionalInfo = data.newInfo;
+                    isEditingNotes.value = false;
+                    emit('toast', 'Notiz gespeichert', 'success');
+                    // Refresh journals
+                    const docRes = await fetch(`/MobileApp/Workorder/Workorder/getDocumentation?workorderId=${selectedWorkorder.value.id}`, { credentials: 'include' });
+                    const docData = await docRes.json();
+                    if (docData.success) documentation.value.journals = docData.journals;
+                }
+            } catch (error) {
+                emit('toast', 'Fehler beim Speichern', 'error');
+            }
+        };
+
+        // Journal
+        const addJournalEntry = async () => {
+            if (!newJournalText.value.trim()) return;
+            try {
+                const response = await fetch('/MobileApp/Workorder/Workorder/addJournal', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    credentials: 'include',
+                    body: JSON.stringify({
+                        workorderId: selectedWorkorder.value.id,
+                        text: newJournalText.value
+                    })
+                });
+                const data = await response.json();
+                if (data.success) {
+                    documentation.value.journals = data.journals;
+                    newJournalText.value = '';
+                    emit('toast', 'Eintrag hinzugefügt', 'success');
+                }
+            } catch (error) {
+                emit('toast', 'Fehler beim Hinzufügen', 'error');
+            }
+        };
+
+        // Cable data
+        const saveCableData = async () => {
+            try {
+                const response = await fetch('/MobileApp/Workorder/Workorder/updateWorkorderData', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    credentials: 'include',
+                    body: JSON.stringify({
+                        workorderId: selectedWorkorder.value.id,
+                        cableLength: cableDataForm.value.cableLength,
+                        cableType: cableDataForm.value.cableType
+                    })
+                });
+                const data = await response.json();
+                if (data.success) {
+                    emit('toast', 'Daten gespeichert', 'success');
+                }
+            } catch (error) {
+                emit('toast', 'Fehler beim Speichern', 'error');
+            }
+        };
+
+        // Documentation upload
+        const openDocUpload = () => {
+            if (tenantConfig.value?.documentationTypes?.length) {
+                uploadDocType.value = tenantConfig.value.documentationTypes[0].value;
+            }
+            showDocUploadSheet.value = true;
+        };
+
+        const triggerFileInput = () => {
+            if (fileInputRef.value) {
+                fileInputRef.value.click();
+            }
+        };
+
+        const handleFileSelect = async (event) => {
+            const files = event.target.files;
+            if (!files || !files.length) return;
+
+            isUploading.value = true;
+            const wasFromChecklist = pendingChecklistUpload.value !== null;
+            const formData = new FormData();
+            formData.append('workorderId', selectedWorkorder.value.id);
+            formData.append('documentType', uploadDocType.value);
+
+            for (let i = 0; i < files.length; i++) {
+                formData.append('files[]', files[i]);
+            }
+
+            try {
+                const response = await fetch('/MobileApp/Workorder/Workorder/uploadDocumentation', {
+                    method: 'POST',
+                    credentials: 'include',
+                    body: formData
+                });
+                const data = await response.json();
+                if (data.success) {
+                    triggerHaptic('light');
+                    emit('toast', 'Dokument hochgeladen', 'success');
+                    showDocUploadSheet.value = false;
+
+                    // Refresh documentation and checklist
+                    const [docRes, checkRes] = await Promise.all([
+                        fetch(`/MobileApp/Workorder/Workorder/getDocumentation?workorderId=${selectedWorkorder.value.id}`, { credentials: 'include' }),
+                        fetch(`/MobileApp/Workorder/Workorder/getChecklist?workorderId=${selectedWorkorder.value.id}`, { credentials: 'include' })
+                    ]);
+                    const docData = await docRes.json();
+                    const checkData = await checkRes.json();
+                    if (docData.success) documentation.value = { docs: docData.docs, journals: docData.journals };
+                    if (checkData.success) checklist.value = checkData.checklist;
+
+                    // Auto-advance: If upload was from checklist, open camera for next item
+                    if (wasFromChecklist) {
+                        pendingChecklistUpload.value = null;
+                        await nextTick();
+                        const nextItem = getNextUncompletedItem();
+                        if (nextItem) {
+                            // Short delay so user sees the check mark
+                            setTimeout(() => {
+                                quickUploadForItem(nextItem);
+                            }, 500);
+                        }
+                    }
+                }
+            } catch (error) {
+                emit('toast', 'Upload fehlgeschlagen', 'error');
+            } finally {
+                isUploading.value = false;
+                if (fileInputRef.value) fileInputRef.value.value = '';
+            }
+        };
+
+        // Problem reporting
+        const openProblemSheet = () => {
+            problemType.value = tenantConfig.value?.interventionTypes?.[0]?.value || '';
+            problemComment.value = '';
+            showProblemSheet.value = true;
+        };
+
+        const submitProblem = async () => {
+            if (!problemType.value && !problemComment.value) {
+                emit('toast', 'Bitte Grund angeben', 'error');
+                return;
+            }
+
+            const typeText = tenantConfig.value?.interventionTypes?.find(t => t.value === problemType.value)?.text || problemType.value;
+
+            try {
+                const response = await fetch('/MobileApp/Workorder/Workorder/requestIntervention', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    credentials: 'include',
+                    body: JSON.stringify({
+                        workorderId: selectedWorkorder.value.id,
+                        interventionType: typeText,
+                        journalText: problemComment.value || typeText
+                    })
+                });
+                const data = await response.json();
+                if (data.success) {
+                    emit('toast', 'Problem gemeldet', 'success');
+                    showProblemSheet.value = false;
+                    closeDetail();
+                    fetchWorkorders();
+                } else {
+                    emit('toast', data.message || 'Fehler', 'error');
+                }
+            } catch (error) {
+                emit('toast', 'Fehler beim Melden', 'error');
+            }
+        };
+
+        // Complete workorder
+        const openCompleteSheet = () => {
+            showCompleteSheet.value = true;
+        };
+
+        const submitComplete = async () => {
+            try {
+                const response = await fetch('/MobileApp/Workorder/Workorder/completeWorkorder', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    credentials: 'include',
+                    body: JSON.stringify({
+                        workorderId: selectedWorkorder.value.id
+                    })
+                });
+                const data = await response.json();
+                if (data.success) {
+                    triggerHaptic('success');
+                    emit('toast', 'Auftrag abgeschlossen', 'success');
+                    showCompleteSheet.value = false;
+                    closeDetail();
+                    fetchWorkorders();
+                } else {
+                    emit('toast', data.message || 'Fehler', 'error');
+                }
+            } catch (error) {
+                emit('toast', 'Fehler beim Abschließen', 'error');
+            }
+        };
+
+        const formatDate = (timestamp, format = 'date') => {
+            if (!timestamp) return '–';
+            const date = new Date(timestamp * 1000);
+            if (format === 'datetime') {
+                return date.toLocaleDateString('de-DE') + ' ' + date.toLocaleTimeString('de-DE', { hour: '2-digit', minute: '2-digit' });
+            }
+            return date.toLocaleDateString('de-DE');
+        };
+
+        const getStatusColor = (color) => {
+            const colors = {
+                primary: 'bg-blue-500',
+                info: 'bg-sky-500',
+                warning: 'bg-amber-500',
+                danger: 'bg-red-500',
+                success: 'bg-green-500',
+                secondary: 'bg-slate-500',
+                orange: 'bg-orange-500',
+                purple: 'bg-purple-500',
+                muted: 'bg-gray-400'
+            };
+            return colors[color] || 'bg-gray-500';
+        };
+
+        // Get left border color for status indicator on cards
+        const getStatusBorderColor = (status) => {
+            const borderColors = {
+                'new': 'border-l-blue-500',
+                'assigned': 'border-l-sky-500',
+                'scheduled': 'border-l-amber-500',
+                'in_progress': 'border-l-amber-500',
+                'correction_requested': 'border-l-red-500',
+                'intervention_required': 'border-l-red-500',
+                'civil_engineering_required': 'border-l-orange-500',
+                'civil_engineering_completed': 'border-l-green-500',
+                'problem_solved': 'border-l-green-500',
+                'documented': 'border-l-green-500',
+                'completed': 'border-l-slate-500',
+                'charged': 'border-l-purple-500',
+                'cancelled': 'border-l-red-500',
+                'archived': 'border-l-gray-400'
+            };
+            return borderColors[status] || 'border-l-gray-400';
+        };
+
+        // Quick camera upload for checklist item
+        const quickUploadForItem = (item) => {
+            uploadDocType.value = item.type;
+            pendingChecklistUpload.value = item.type;
+            nextTick(() => {
+                if (fileInputRef.value) {
+                    fileInputRef.value.click();
+                }
+            });
+        };
+
+        // Get next uncompleted checklist item
+        const getNextUncompletedItem = () => {
+            return checklist.value.find(item => !item.completed);
+        };
+
+        // Haptic feedback
+        const triggerHaptic = (type = 'success') => {
+            if ('vibrate' in navigator) {
+                if (type === 'success') {
+                    navigator.vibrate([50, 50, 100]);
+                } else {
+                    navigator.vibrate(50);
+                }
+            }
+        };
+
+        // Swipe handlers for list cards
+        const handleTouchStart = (e, wo) => {
+            swipeStartX.value = e.touches[0].clientX;
+            swipeCardId.value = wo.id;
+        };
+
+        const handleTouchMove = (e, wo) => {
+            if (swipeCardId.value !== wo.id) return;
+            const currentX = e.touches[0].clientX;
+            const diff = swipeStartX.value - currentX;
+
+            // Only allow left swipe, max 100px
+            if (diff > 0) {
+                swipeOffset.value = { ...swipeOffset.value, [wo.id]: Math.min(diff, 100) };
+            } else {
+                swipeOffset.value = { ...swipeOffset.value, [wo.id]: 0 };
+            }
+        };
+
+        const handleTouchEnd = (e, wo) => {
+            if (swipeCardId.value !== wo.id) return;
+            const offset = swipeOffset.value[wo.id] || 0;
+
+            // If swiped more than 60px, trigger navigation
+            if (offset > 60 && wo.customerAddress) {
+                triggerHaptic('light');
+                const address = encodeURIComponent(wo.customerAddress);
+                window.open(`https://maps.google.com/maps?q=${address}`, '_blank');
+            }
+
+            // Reset with animation
+            swipeOffset.value = { ...swipeOffset.value, [wo.id]: 0 };
+            swipeCardId.value = null;
+        };
+
+        const getSwipeStyle = (woId) => {
+            const offset = swipeOffset.value[woId] || 0;
+            return {
+                transform: `translateX(-${offset}px)`,
+                transition: swipeCardId.value === woId ? 'none' : 'transform 0.3s ease-out'
+            };
+        };
+
+        // Open navigation directly
+        const openNavigation = () => {
+            if (selectedWorkorder.value?.customer) {
+                const c = selectedWorkorder.value.customer;
+                const address = encodeURIComponent(`${c.street}, ${c.zip} ${c.city}`);
+                window.open(`https://maps.google.com/maps?q=${address}`, '_blank');
+            }
+        };
+
+        // Call customer directly
+        const callCustomer = () => {
+            if (selectedWorkorder.value?.customer?.phone) {
+                window.location.href = `tel:${selectedWorkorder.value.customer.phone}`;
+            }
+        };
+
+        // Smart complete - show confirmation sheet
+        const handleComplete = () => {
+            if (isChecklistComplete.value) {
+                showCompleteSheet.value = true;
+            }
+            // Button is disabled when not complete, so this won't be called
+        };
+
+        // Initialize
+        onMounted(() => {
+            fetchWorkorders();
+        });
+
+        return {
+            // State
+            isLoading,
+            workorders,
+            searchTerm,
+            selectedFcp,
+            showFcpFilter,
+            fcpOptions,
+            filteredWorkorders,
+            selectedWorkorder,
+            isDetailLoading,
+            documentation,
+            tenantConfig,
+            checklist,
+            expandedCards,
+            isEditingNotes,
+            tempNotes,
+            newJournalText,
+            cableDataForm,
+            showDocUploadSheet,
+            showProblemSheet,
+            showCompleteSheet,
+            uploadDocType,
+            isUploading,
+            fileInputRef,
+            problemType,
+            problemComment,
+            checklistProgress,
+            isChecklistComplete,
+            incompleteItems,
+            googleMapsLink,
+
+            // Methods
+            fetchWorkorders,
+            openDetail,
+            closeDetail,
+            toggleCard,
+            startEditNotes,
+            cancelEditNotes,
+            saveNotes,
+            addJournalEntry,
+            saveCableData,
+            openDocUpload,
+            triggerFileInput,
+            handleFileSelect,
+            openProblemSheet,
+            submitProblem,
+            openCompleteSheet,
+            submitComplete,
+            formatDate,
+            getStatusColor,
+            getStatusBorderColor,
+            quickUploadForItem,
+            openNavigation,
+            callCustomer,
+            handleComplete,
+            handleTouchStart,
+            handleTouchMove,
+            handleTouchEnd,
+            getSwipeStyle,
+            swipeOffset
+        };
+    },
+
+    template: `
+        <div class="h-full flex flex-col">
+            <!-- LIST VIEW -->
+            <template v-if="!selectedWorkorder">
+                <!-- Search & Filter Bar -->
+                <div class="p-3 space-y-2 flex-shrink-0">
+                    <div class="flex gap-2">
+                        <!-- Search Input -->
+                        <div class="flex-1 relative">
+                            <svg xmlns="http://www.w3.org/2000/svg" class="absolute left-3 top-1/2 -translate-y-1/2 h-5 w-5 text-slate-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
+                            </svg>
+                            <input
+                                v-model="searchTerm"
+                                type="text"
+                                placeholder="Suchen..."
+                                class="w-full pl-10 pr-4 py-2.5 bg-white dark:bg-slate-800 rounded-xl text-slate-800 dark:text-white placeholder-slate-400 border border-slate-200 dark:border-slate-700 focus:outline-none focus:ring-2 focus:ring-primary"
+                            >
+                        </div>
+                        <!-- FCP Filter Button -->
+                        <button
+                            @click="showFcpFilter = !showFcpFilter"
+                            class="px-4 py-2.5 bg-white dark:bg-slate-800 rounded-xl border border-slate-200 dark:border-slate-700 text-slate-700 dark:text-slate-300 flex items-center"
+                        >
+                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-1" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 4a1 1 0 011-1h16a1 1 0 011 1v2.586a1 1 0 01-.293.707l-6.414 6.414a1 1 0 00-.293.707V17l-4 4v-6.586a1 1 0 00-.293-.707L3.293 7.293A1 1 0 013 6.586V4z" />
+                            </svg>
+                            <span class="hidden sm:inline">FCP</span>
+                        </button>
+                    </div>
+
+                    <!-- FCP Dropdown -->
+                    <div v-if="showFcpFilter" class="bg-white dark:bg-slate-800 rounded-xl border border-slate-200 dark:border-slate-700 p-2 max-h-48 overflow-y-auto">
+                        <button
+                            v-for="opt in fcpOptions"
+                            :key="opt.value"
+                            @click="selectedFcp = opt.value; showFcpFilter = false"
+                            :class="[
+                                'w-full text-left px-3 py-2 rounded-lg transition',
+                                selectedFcp === opt.value
+                                    ? 'bg-primary/10 text-primary font-medium'
+                                    : 'text-slate-700 dark:text-slate-300 hover:bg-slate-100 dark:hover:bg-slate-700'
+                            ]"
+                        >
+                            {{ opt.text }}
+                        </button>
+                    </div>
+                </div>
+
+                <!-- Workorder List -->
+                <div class="flex-1 overflow-y-auto px-3 pb-3">
+                    <!-- Loading -->
+                    <div v-if="isLoading" class="space-y-3">
+                        <div v-for="i in 4" :key="i" class="bg-white dark:bg-slate-800 p-4 rounded-xl animate-pulse">
+                            <div class="flex justify-between">
+                                <div class="flex-1">
+                                    <div class="h-5 bg-slate-200 dark:bg-slate-700 rounded w-3/4 mb-2"></div>
+                                    <div class="h-4 bg-slate-200 dark:bg-slate-700 rounded w-full mb-2"></div>
+                                    <div class="h-3 bg-slate-200 dark:bg-slate-700 rounded w-1/2"></div>
+                                </div>
+                                <div class="ml-3 text-right">
+                                    <div class="h-5 w-20 bg-slate-200 dark:bg-slate-700 rounded-full mb-2"></div>
+                                    <div class="h-4 w-16 bg-slate-200 dark:bg-slate-700 rounded"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <!-- Empty State -->
+                    <div v-else-if="filteredWorkorders.length === 0" class="text-center py-12">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-16 w-16 mx-auto text-slate-300 dark:text-slate-600 mb-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-3 7h3m-3 4h3m-6-4h.01M9 16h.01" />
+                        </svg>
+                        <p class="text-slate-500 dark:text-slate-400">Keine Aufträge gefunden</p>
+                    </div>
+
+                    <!-- Workorder Cards -->
+                    <div v-else class="space-y-3">
+                        <div
+                            v-for="wo in filteredWorkorders"
+                            :key="wo.id"
+                            class="relative overflow-hidden rounded-xl"
+                        >
+                            <!-- Background action (revealed on swipe) -->
+                            <div class="absolute inset-y-0 right-0 w-24 bg-primary flex items-center justify-center rounded-r-xl">
+                                <div class="text-white text-center">
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 mx-auto" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17.657 16.657L13.414 20.9a1.998 1.998 0 01-2.827 0l-4.244-4.243a8 8 0 1111.314 0z" />
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 11a3 3 0 11-6 0 3 3 0 016 0z" />
+                                    </svg>
+                                    <span class="text-xs font-medium mt-1">Navigation</span>
+                                </div>
+                            </div>
+
+                            <!-- Card content (slides on swipe) -->
+                            <div
+                                @click="openDetail(wo)"
+                                @touchstart="handleTouchStart($event, wo)"
+                                @touchmove="handleTouchMove($event, wo)"
+                                @touchend="handleTouchEnd($event, wo)"
+                                :style="getSwipeStyle(wo.id)"
+                                :class="[
+                                    'relative w-full bg-white dark:bg-slate-800 p-4 rounded-xl shadow-sm text-left cursor-pointer',
+                                    'border-l-4',
+                                    getStatusBorderColor(wo.status)
+                                ]"
+                            >
+                                <div class="flex justify-between items-start">
+                                    <div class="flex-1 min-w-0 pr-3">
+                                        <div class="flex items-center gap-2 mb-1">
+                                            <span v-if="wo.oaid" class="font-bold text-primary dark:text-sky-400">{{ wo.oaid }}</span>
+                                            <span v-else class="font-bold text-primary dark:text-sky-400">#{{ wo.id }}</span>
+                                            <span v-if="wo.fcpName" class="text-xs bg-slate-100 dark:bg-slate-700 px-1.5 py-0.5 rounded text-slate-600 dark:text-slate-400">{{ wo.fcpName }}</span>
+                                        </div>
+                                        <p class="font-medium text-slate-800 dark:text-white truncate">{{ wo.customerName || 'Unbekannt' }}</p>
+                                        <p class="text-sm text-slate-500 dark:text-slate-400 truncate">{{ wo.customerAddress }}</p>
+                                    </div>
+                                    <div class="text-right flex-shrink-0">
+                                        <span :class="[getStatusColor(wo.statusColor), 'inline-block px-2 py-0.5 rounded-full text-xs font-medium text-white']">
+                                            {{ wo.statusText }}
+                                        </span>
+                                        <p v-if="wo.appointmentFormatted" class="text-sm font-medium text-slate-600 dark:text-slate-300 mt-1">
+                                            {{ wo.appointmentFormatted }}
+                                        </p>
+                                        <p v-if="wo.deadlineFormatted" class="text-xs text-red-500 mt-0.5">
+                                            Frist: {{ wo.deadlineFormatted }}
+                                        </p>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </template>
+
+            <!-- DETAIL VIEW -->
+            <template v-else>
+                <!-- Header -->
+                <div class="flex items-center justify-between px-4 py-3 bg-white dark:bg-slate-800 border-b border-slate-100 dark:border-slate-700 flex-shrink-0">
+                    <button @click="closeDetail" class="flex items-center text-slate-600 dark:text-slate-300">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-1" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7" />
+                        </svg>
+                        Zurück
+                    </button>
+                    <div class="flex items-center gap-2">
+                        <span v-if="selectedWorkorder.oaid" class="font-bold text-primary dark:text-sky-400">{{ selectedWorkorder.oaid }}</span>
+                        <span v-else class="font-bold text-primary dark:text-sky-400">#{{ selectedWorkorder.id }}</span>
+                        <span v-if="selectedWorkorder.fcpName" class="text-xs bg-slate-100 dark:bg-slate-700 px-1.5 py-0.5 rounded text-slate-600 dark:text-slate-400">{{ selectedWorkorder.fcpName }}</span>
+                    </div>
+                    <span :class="[getStatusColor(selectedWorkorder.statusColor), 'px-2 py-0.5 rounded-full text-xs font-medium text-white']">
+                        {{ selectedWorkorder.statusText }}
+                    </span>
+                </div>
+
+                <!-- Detail Content -->
+                <div class="flex-1 overflow-y-auto p-3 pb-24 space-y-3">
+                    <!-- Loading -->
+                    <div v-if="isDetailLoading" class="space-y-3 animate-pulse">
+                        <div class="bg-white dark:bg-slate-800 p-4 rounded-xl">
+                            <div class="h-5 bg-slate-200 dark:bg-slate-700 rounded w-1/2 mb-3"></div>
+                            <div class="h-4 bg-slate-200 dark:bg-slate-700 rounded w-full mb-2"></div>
+                            <div class="h-4 bg-slate-200 dark:bg-slate-700 rounded w-3/4"></div>
+                        </div>
+                    </div>
+
+                    <template v-else>
+                        <!-- Customer Card (Expanded by default) -->
+                        <div class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden">
+                            <button
+                                @click="toggleCard('customer')"
+                                class="w-full flex items-center justify-between p-4 text-left"
+                            >
+                                <div class="flex items-center">
+                                    <div class="w-8 h-8 bg-primary/10 rounded-lg flex items-center justify-center mr-3">
+                                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-primary" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z" />
+                                        </svg>
+                                    </div>
+                                    <span class="font-semibold text-slate-800 dark:text-white">Kunde</span>
+                                </div>
+                                <svg xmlns="http://www.w3.org/2000/svg" :class="['h-5 w-5 text-slate-400 transition-transform', expandedCards.customer ? 'rotate-180' : '']" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+                                </svg>
+                            </button>
+                            <div v-if="expandedCards.customer && selectedWorkorder.customer" class="px-4 pb-4 space-y-3">
+                                <p class="font-medium text-slate-800 dark:text-white text-lg">{{ selectedWorkorder.customer.name }}</p>
+                                <p class="text-slate-600 dark:text-slate-400">
+                                    {{ selectedWorkorder.customer.street }}, {{ selectedWorkorder.customer.zip }} {{ selectedWorkorder.customer.city }}
+                                </p>
+
+                                <!-- Prominent Action Buttons -->
+                                <div class="flex gap-3 pt-2">
+                                    <button
+                                        @click="openNavigation"
+                                        class="flex-1 py-3 bg-primary text-white rounded-xl font-medium flex items-center justify-center gap-2 active:scale-95 transition"
+                                    >
+                                        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17.657 16.657L13.414 20.9a1.998 1.998 0 01-2.827 0l-4.244-4.243a8 8 0 1111.314 0z" />
+                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 11a3 3 0 11-6 0 3 3 0 016 0z" />
+                                        </svg>
+                                        Navigation
+                                    </button>
+                                    <button
+                                        v-if="selectedWorkorder.customer.phone"
+                                        @click="callCustomer"
+                                        class="flex-1 py-3 bg-green-500 text-white rounded-xl font-medium flex items-center justify-center gap-2 active:scale-95 transition"
+                                    >
+                                        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 5a2 2 0 012-2h3.28a1 1 0 01.948.684l1.498 4.493a1 1 0 01-.502 1.21l-2.257 1.13a11.042 11.042 0 005.516 5.516l1.13-2.257a1 1 0 011.21-.502l4.493 1.498a1 1 0 01.684.949V19a2 2 0 01-2 2h-1C9.716 21 3 14.284 3 6V5z" />
+                                        </svg>
+                                        Anrufen
+                                    </button>
+                                </div>
+
+                                <!-- Email (smaller, secondary) -->
+                                <div v-if="selectedWorkorder.customer.email" class="flex items-center pt-1">
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 mr-2 text-slate-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" />
+                                    </svg>
+                                    <a :href="'mailto:' + selectedWorkorder.customer.email" class="text-sm text-primary dark:text-sky-400 truncate">{{ selectedWorkorder.customer.email }}</a>
+                                </div>
+                            </div>
+                        </div>
+
+                        <!-- Checklist Card -->
+                        <div class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden">
+                            <button
+                                @click="toggleCard('checklist')"
+                                class="w-full flex items-center justify-between p-4 text-left"
+                            >
+                                <div class="flex items-center">
+                                    <div class="w-8 h-8 bg-amber-500/10 rounded-lg flex items-center justify-center mr-3">
+                                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-amber-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4" />
+                                        </svg>
+                                    </div>
+                                    <span class="font-semibold text-slate-800 dark:text-white">Checkliste</span>
+                                    <span :class="[
+                                        'ml-2 px-2 py-0.5 rounded-full text-xs',
+                                        checklistProgress.completed === checklistProgress.total && checklistProgress.total > 0
+                                            ? 'bg-green-100 dark:bg-green-900/30 text-green-600 dark:text-green-400'
+                                            : 'bg-slate-100 dark:bg-slate-700 text-slate-600 dark:text-slate-300'
+                                    ]">
+                                        {{ checklistProgress.text }}
+                                    </span>
+                                </div>
+                                <svg xmlns="http://www.w3.org/2000/svg" :class="['h-5 w-5 text-slate-400 transition-transform', expandedCards.checklist ? 'rotate-180' : '']" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+                                </svg>
+                            </button>
+                            <div v-if="expandedCards.checklist" class="px-4 pb-4">
+                                <div v-if="checklist.length === 0" class="text-center py-4 text-slate-500 dark:text-slate-400">
+                                    Keine Checkliste vorhanden
+                                </div>
+                                <ul v-else class="space-y-2">
+                                    <li v-for="item in checklist" :key="item.type" class="flex items-center justify-between">
+                                        <div class="flex items-center flex-1 min-w-0">
+                                            <svg v-if="item.completed" xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-green-500 mr-2 flex-shrink-0" viewBox="0 0 20 20" fill="currentColor">
+                                                <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd" />
+                                            </svg>
+                                            <svg v-else xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-slate-400 mr-2 flex-shrink-0" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                                <circle cx="12" cy="12" r="10" stroke-width="2" />
+                                            </svg>
+                                            <span :class="[item.completed ? 'text-slate-500 dark:text-slate-400 line-through' : 'text-slate-800 dark:text-white', 'truncate']">
+                                                {{ item.text }}
+                                            </span>
+                                        </div>
+                                        <!-- Quick Camera Button for uncompleted items -->
+                                        <button
+                                            v-if="!item.completed"
+                                            @click="quickUploadForItem(item)"
+                                            class="ml-2 p-2 bg-primary/10 hover:bg-primary/20 rounded-lg text-primary active:scale-95 transition flex-shrink-0"
+                                            :disabled="isUploading"
+                                        >
+                                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 9a2 2 0 012-2h.93a2 2 0 001.664-.89l.812-1.22A2 2 0 0110.07 4h3.86a2 2 0 011.664.89l.812 1.22A2 2 0 0018.07 7H19a2 2 0 012 2v9a2 2 0 01-2 2H5a2 2 0 01-2-2V9z" />
+                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 13a3 3 0 11-6 0 3 3 0 016 0z" />
+                                            </svg>
+                                        </button>
+                                        <!-- Check mark for completed items -->
+                                        <div v-else class="ml-2 p-2 text-green-500 flex-shrink-0">
+                                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
+                                                <path fill-rule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd" />
+                                            </svg>
+                                        </div>
+                                    </li>
+                                </ul>
+                            </div>
+                        </div>
+
+                        <!-- Documentation Card -->
+                        <div class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden">
+                            <button
+                                @click="toggleCard('documentation')"
+                                class="w-full flex items-center justify-between p-4 text-left"
+                            >
+                                <div class="flex items-center">
+                                    <div class="w-8 h-8 bg-green-500/10 rounded-lg flex items-center justify-center mr-3">
+                                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-green-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 16l4.586-4.586a2 2 0 012.828 0L16 16m-2-2l1.586-1.586a2 2 0 012.828 0L20 14m-6-6h.01M6 20h12a2 2 0 002-2V6a2 2 0 00-2-2H6a2 2 0 00-2 2v12a2 2 0 002 2z" />
+                                        </svg>
+                                    </div>
+                                    <span class="font-semibold text-slate-800 dark:text-white">Dokumentation</span>
+                                    <span class="ml-2 px-2 py-0.5 bg-slate-100 dark:bg-slate-700 rounded-full text-xs text-slate-600 dark:text-slate-300">
+                                        {{ documentation.docs.length }}
+                                    </span>
+                                </div>
+                                <div class="flex items-center">
+                                    <button
+                                        @click.stop="openDocUpload"
+                                        class="mr-2 p-1.5 bg-primary/10 rounded-lg text-primary"
+                                    >
+                                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4" />
+                                        </svg>
+                                    </button>
+                                    <svg xmlns="http://www.w3.org/2000/svg" :class="['h-5 w-5 text-slate-400 transition-transform', expandedCards.documentation ? 'rotate-180' : '']" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+                                    </svg>
+                                </div>
+                            </button>
+                            <div v-if="expandedCards.documentation" class="px-4 pb-4">
+                                <div v-if="documentation.docs.length === 0" class="text-center py-4 text-slate-500 dark:text-slate-400">
+                                    Keine Dokumente vorhanden
+                                </div>
+                                <div v-else class="space-y-2">
+                                    <a
+                                        v-for="doc in documentation.docs"
+                                        :key="doc.id"
+                                        :href="doc.previewUrl"
+                                        target="_blank"
+                                        class="flex items-center p-2 bg-slate-50 dark:bg-slate-700/50 rounded-lg"
+                                    >
+                                        <div class="w-10 h-10 bg-slate-200 dark:bg-slate-600 rounded-lg flex items-center justify-center mr-3">
+                                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-slate-500 dark:text-slate-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 21h10a2 2 0 002-2V9.414a1 1 0 00-.293-.707l-5.414-5.414A1 1 0 0012.586 3H7a2 2 0 00-2 2v14a2 2 0 002 2z" />
+                                            </svg>
+                                        </div>
+                                        <div class="flex-1 min-w-0">
+                                            <p class="text-sm font-medium text-slate-800 dark:text-white truncate">{{ doc.fileName }}</p>
+                                            <p class="text-xs text-slate-500 dark:text-slate-400">{{ doc.createFormatted }} - {{ doc.userName }}</p>
+                                        </div>
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+
+                        <!-- Notes Card -->
+                        <div class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden">
+                            <button
+                                @click="toggleCard('notes')"
+                                class="w-full flex items-center justify-between p-4 text-left"
+                            >
+                                <div class="flex items-center">
+                                    <div class="w-8 h-8 bg-purple-500/10 rounded-lg flex items-center justify-center mr-3">
+                                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-purple-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" />
+                                        </svg>
+                                    </div>
+                                    <span class="font-semibold text-slate-800 dark:text-white">Notizen</span>
+                                </div>
+                                <svg xmlns="http://www.w3.org/2000/svg" :class="['h-5 w-5 text-slate-400 transition-transform', expandedCards.notes ? 'rotate-180' : '']" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+                                </svg>
+                            </button>
+                            <div v-if="expandedCards.notes" class="px-4 pb-4">
+                                <div v-if="isEditingNotes">
+                                    <textarea
+                                        v-model="tempNotes"
+                                        rows="4"
+                                        class="w-full p-3 bg-slate-50 dark:bg-slate-700 rounded-lg text-slate-800 dark:text-white border-0 focus:ring-2 focus:ring-primary"
+                                        placeholder="Notiz eingeben..."
+                                    ></textarea>
+                                    <div class="flex justify-end gap-2 mt-2">
+                                        <button @click="cancelEditNotes" class="px-4 py-2 text-sm text-slate-600 dark:text-slate-300">
+                                            Abbrechen
+                                        </button>
+                                        <button @click="saveNotes" class="px-4 py-2 bg-primary text-white text-sm rounded-lg">
+                                            Speichern
+                                        </button>
+                                    </div>
+                                </div>
+                                <div v-else>
+                                    <p class="text-slate-700 dark:text-slate-300 whitespace-pre-wrap">{{ selectedWorkorder.additionalInfo || 'Keine Notiz vorhanden.' }}</p>
+                                    <button @click="startEditNotes" class="mt-3 text-sm text-primary dark:text-sky-400 flex items-center">
+                                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 mr-1" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15.232 5.232l3.536 3.536m-2.036-5.036a2.5 2.5 0 113.536 3.536L6.5 21.036H3v-3.572L16.732 3.732z" />
+                                        </svg>
+                                        Bearbeiten
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+
+                        <!-- Journal Card -->
+                        <div class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden">
+                            <button
+                                @click="toggleCard('journal')"
+                                class="w-full flex items-center justify-between p-4 text-left"
+                            >
+                                <div class="flex items-center">
+                                    <div class="w-8 h-8 bg-sky-500/10 rounded-lg flex items-center justify-center mr-3">
+                                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-sky-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" />
+                                        </svg>
+                                    </div>
+                                    <span class="font-semibold text-slate-800 dark:text-white">Journal</span>
+                                    <span class="ml-2 px-2 py-0.5 bg-slate-100 dark:bg-slate-700 rounded-full text-xs text-slate-600 dark:text-slate-300">
+                                        {{ documentation.journals.length }}
+                                    </span>
+                                </div>
+                                <svg xmlns="http://www.w3.org/2000/svg" :class="['h-5 w-5 text-slate-400 transition-transform', expandedCards.journal ? 'rotate-180' : '']" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+                                </svg>
+                            </button>
+                            <div v-if="expandedCards.journal" class="px-4 pb-4 space-y-3">
+                                <!-- Add Entry -->
+                                <div class="flex gap-2">
+                                    <input
+                                        v-model="newJournalText"
+                                        type="text"
+                                        placeholder="Neuer Eintrag..."
+                                        class="flex-1 px-3 py-2 bg-slate-50 dark:bg-slate-700 rounded-lg text-slate-800 dark:text-white border-0"
+                                        @keyup.enter="addJournalEntry"
+                                    >
+                                    <button @click="addJournalEntry" class="px-4 py-2 bg-primary text-white rounded-lg">
+                                        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4" />
+                                        </svg>
+                                    </button>
+                                </div>
+                                <!-- Entries -->
+                                <div v-if="documentation.journals.length === 0" class="text-center py-2 text-slate-500 dark:text-slate-400 text-sm">
+                                    Keine Einträge
+                                </div>
+                                <div v-else class="space-y-2 max-h-48 overflow-y-auto">
+                                    <div v-for="entry in documentation.journals" :key="entry.id" class="p-2 bg-slate-50 dark:bg-slate-700/50 rounded-lg">
+                                        <p class="text-sm text-slate-800 dark:text-white whitespace-pre-wrap">{{ entry.text }}</p>
+                                        <p class="text-xs text-slate-500 dark:text-slate-400 mt-1">{{ entry.createFormatted }} - {{ entry.createByName }}</p>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <!-- Cable Data Card (only if required) -->
+                        <div v-if="tenantConfig && (tenantConfig.requireCableLength || tenantConfig.requireCableType)" class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden">
+                            <button
+                                @click="toggleCard('cableData')"
+                                class="w-full flex items-center justify-between p-4 text-left"
+                            >
+                                <div class="flex items-center">
+                                    <div class="w-8 h-8 bg-orange-500/10 rounded-lg flex items-center justify-center mr-3">
+                                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-orange-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 3v2m6-2v2M9 19v2m6-2v2M5 9H3m2 6H3m18-6h-2m2 6h-2M7 19h10a2 2 0 002-2V7a2 2 0 00-2-2H7a2 2 0 00-2 2v10a2 2 0 002 2zM9 9h6v6H9V9z" />
+                                        </svg>
+                                    </div>
+                                    <span class="font-semibold text-slate-800 dark:text-white">Kabeldaten</span>
+                                </div>
+                                <svg xmlns="http://www.w3.org/2000/svg" :class="['h-5 w-5 text-slate-400 transition-transform', expandedCards.cableData ? 'rotate-180' : '']" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+                                </svg>
+                            </button>
+                            <div v-if="expandedCards.cableData" class="px-4 pb-4 space-y-3">
+                                <div v-if="tenantConfig.requireCableLength">
+                                    <label class="text-sm text-slate-600 dark:text-slate-400 mb-1 block">Kabellänge (m)</label>
+                                    <input
+                                        v-model="cableDataForm.cableLength"
+                                        type="text"
+                                        placeholder="z.B. 20"
+                                        class="w-full px-3 py-2 bg-slate-50 dark:bg-slate-700 rounded-lg text-slate-800 dark:text-white border-0"
+                                    >
+                                </div>
+                                <div v-if="tenantConfig.requireCableType">
+                                    <label class="text-sm text-slate-600 dark:text-slate-400 mb-1 block">Kabeltyp</label>
+                                    <input
+                                        v-model="cableDataForm.cableType"
+                                        type="text"
+                                        placeholder="z.B. LWL 4F"
+                                        class="w-full px-3 py-2 bg-slate-50 dark:bg-slate-700 rounded-lg text-slate-800 dark:text-white border-0"
+                                    >
+                                </div>
+                                <button @click="saveCableData" class="w-full py-2 bg-primary text-white rounded-lg text-sm font-medium">
+                                    Speichern
+                                </button>
+                            </div>
+                        </div>
+                    </template>
+                </div>
+
+                <!-- Bottom Action Bar -->
+                <div class="absolute bottom-0 left-0 right-0 p-3 bg-white dark:bg-slate-800 border-t border-slate-100 dark:border-slate-700 flex gap-3">
+                    <button
+                        @click="openProblemSheet"
+                        class="flex-1 py-3 bg-amber-500 text-white rounded-xl font-medium flex items-center justify-center active:scale-95 transition"
+                    >
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-2" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
+                        </svg>
+                        Problem
+                    </button>
+                    <button
+                        @click="handleComplete"
+                        :disabled="!isChecklistComplete"
+                        :class="[
+                            'flex-1 py-3 rounded-xl font-medium flex items-center justify-center active:scale-95 transition',
+                            isChecklistComplete
+                                ? 'bg-green-500 text-white'
+                                : 'bg-slate-300 dark:bg-slate-600 text-slate-500 dark:text-slate-400 cursor-not-allowed'
+                        ]"
+                    >
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-2" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7" />
+                        </svg>
+                        <span v-if="checklist.length > 0">
+                            Abschließen ({{ checklistProgress.text }})
+                        </span>
+                        <span v-else>Abschließen</span>
+                    </button>
+                </div>
+            </template>
+
+            <!-- BOTTOM SHEETS -->
+
+            <!-- Doc Upload Sheet -->
+            <teleport to="body">
+                <transition name="fade">
+                    <div v-if="showDocUploadSheet" class="fixed inset-0 z-50">
+                        <div class="absolute inset-0 bg-black/50" @click="showDocUploadSheet = false"></div>
+                        <transition name="slide-up-sheet">
+                            <div v-if="showDocUploadSheet" class="absolute bottom-0 left-0 right-0 bg-white dark:bg-slate-800 rounded-t-2xl shadow-xl max-h-[70vh] overflow-hidden">
+                                <div class="flex justify-center pt-2 pb-1">
+                                    <div class="w-10 h-1 bg-slate-300 dark:bg-slate-600 rounded-full"></div>
+                                </div>
+                                <div class="px-4 pb-3 border-b border-slate-100 dark:border-slate-700">
+                                    <h3 class="text-lg font-semibold text-slate-800 dark:text-white text-center">Dokumentation hochladen</h3>
+                                </div>
+                                <div class="p-4 space-y-4">
+                                    <!-- Doc Type Selection -->
+                                    <div v-if="tenantConfig?.documentationTypes?.length">
+                                        <label class="text-sm text-slate-600 dark:text-slate-400 mb-2 block">Dokumenttyp</label>
+                                        <div class="space-y-2">
+                                            <button
+                                                v-for="type in tenantConfig.documentationTypes"
+                                                :key="type.value"
+                                                @click="uploadDocType = type.value"
+                                                :class="[
+                                                    'w-full p-3 rounded-lg text-left transition',
+                                                    uploadDocType === type.value
+                                                        ? 'bg-primary/10 border-2 border-primary text-primary'
+                                                        : 'bg-slate-50 dark:bg-slate-700 text-slate-700 dark:text-slate-300'
+                                                ]"
+                                            >
+                                                {{ type.text }}
+                                            </button>
+                                        </div>
+                                    </div>
+                                    <!-- Upload Buttons -->
+                                    <div class="space-y-2">
+                                        <input
+                                            ref="fileInputRef"
+                                            type="file"
+                                            accept="image/*,application/pdf"
+                                            multiple
+                                            class="hidden"
+                                            @change="handleFileSelect"
+                                            capture="environment"
+                                        >
+                                        <button
+                                            @click="triggerFileInput"
+                                            :disabled="isUploading"
+                                            class="w-full py-3 bg-primary text-white rounded-xl font-medium flex items-center justify-center disabled:opacity-50"
+                                        >
+                                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-2" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 9a2 2 0 012-2h.93a2 2 0 001.664-.89l.812-1.22A2 2 0 0110.07 4h3.86a2 2 0 011.664.89l.812 1.22A2 2 0 0018.07 7H19a2 2 0 012 2v9a2 2 0 01-2 2H5a2 2 0 01-2-2V9z" />
+                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 13a3 3 0 11-6 0 3 3 0 016 0z" />
+                                            </svg>
+                                            {{ isUploading ? 'Wird hochgeladen...' : 'Foto aufnehmen / auswählen' }}
+                                        </button>
+                                    </div>
+                                </div>
+                                <div class="h-6"></div>
+                            </div>
+                        </transition>
+                    </div>
+                </transition>
+            </teleport>
+
+            <!-- Problem Sheet -->
+            <teleport to="body">
+                <transition name="fade">
+                    <div v-if="showProblemSheet" class="fixed inset-0 z-50">
+                        <div class="absolute inset-0 bg-black/50" @click="showProblemSheet = false"></div>
+                        <transition name="slide-up-sheet">
+                            <div v-if="showProblemSheet" class="absolute bottom-0 left-0 right-0 bg-white dark:bg-slate-800 rounded-t-2xl shadow-xl max-h-[80vh] overflow-hidden flex flex-col">
+                                <div class="flex justify-center pt-2 pb-1 flex-shrink-0">
+                                    <div class="w-10 h-1 bg-slate-300 dark:bg-slate-600 rounded-full"></div>
+                                </div>
+                                <div class="px-4 pb-3 border-b border-slate-100 dark:border-slate-700 flex-shrink-0">
+                                    <h3 class="text-lg font-semibold text-slate-800 dark:text-white text-center">Problem melden</h3>
+                                </div>
+                                <div class="p-4 space-y-4 overflow-y-auto flex-1">
+                                    <!-- Problem Type Selection -->
+                                    <div v-if="tenantConfig?.interventionTypes?.length">
+                                        <label class="text-sm text-slate-600 dark:text-slate-400 mb-2 block">Grund</label>
+                                        <div class="space-y-2">
+                                            <button
+                                                v-for="type in tenantConfig.interventionTypes"
+                                                :key="type.value"
+                                                @click="problemType = type.value"
+                                                :class="[
+                                                    'w-full p-3 rounded-lg text-left transition',
+                                                    problemType === type.value
+                                                        ? 'bg-amber-500/10 border-2 border-amber-500 text-amber-600 dark:text-amber-400'
+                                                        : 'bg-slate-50 dark:bg-slate-700 text-slate-700 dark:text-slate-300'
+                                                ]"
+                                            >
+                                                {{ type.text }}
+                                            </button>
+                                        </div>
+                                    </div>
+                                    <!-- Comment -->
+                                    <div>
+                                        <label class="text-sm text-slate-600 dark:text-slate-400 mb-2 block">Kommentar (optional)</label>
+                                        <textarea
+                                            v-model="problemComment"
+                                            rows="3"
+                                            placeholder="Weitere Details..."
+                                            class="w-full px-3 py-2 bg-slate-50 dark:bg-slate-700 rounded-lg text-slate-800 dark:text-white border-0"
+                                        ></textarea>
+                                    </div>
+                                    <!-- Submit -->
+                                    <button
+                                        @click="submitProblem"
+                                        class="w-full py-3 bg-amber-500 text-white rounded-xl font-medium"
+                                    >
+                                        Problem melden
+                                    </button>
+                                </div>
+                                <div class="h-6 flex-shrink-0"></div>
+                            </div>
+                        </transition>
+                    </div>
+                </transition>
+            </teleport>
+
+            <!-- Complete Sheet (only shown when complete - for confirmation) -->
+            <teleport to="body">
+                <transition name="fade">
+                    <div v-if="showCompleteSheet" class="fixed inset-0 z-50">
+                        <div class="absolute inset-0 bg-black/50" @click="showCompleteSheet = false"></div>
+                        <transition name="slide-up-sheet">
+                            <div v-if="showCompleteSheet" class="absolute bottom-0 left-0 right-0 bg-white dark:bg-slate-800 rounded-t-2xl shadow-xl max-h-[70vh] overflow-hidden">
+                                <div class="flex justify-center pt-2 pb-1">
+                                    <div class="w-10 h-1 bg-slate-300 dark:bg-slate-600 rounded-full"></div>
+                                </div>
+                                <div class="px-4 pb-3 border-b border-slate-100 dark:border-slate-700">
+                                    <h3 class="text-lg font-semibold text-slate-800 dark:text-white text-center">Auftrag abschließen</h3>
+                                </div>
+                                <div class="p-4 space-y-4">
+                                    <!-- Success message -->
+                                    <div class="p-4 bg-green-50 dark:bg-green-900/20 rounded-xl">
+                                        <div class="flex items-center justify-center mb-3">
+                                            <div class="w-12 h-12 bg-green-100 dark:bg-green-900/50 rounded-full flex items-center justify-center">
+                                                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 text-green-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7" />
+                                                </svg>
+                                            </div>
+                                        </div>
+                                        <p class="text-center text-green-700 dark:text-green-400 font-medium">Alle Anforderungen erfüllt!</p>
+                                        <p class="text-center text-green-600 dark:text-green-500 text-sm mt-1">Der Auftrag kann abgeschlossen werden.</p>
+                                    </div>
+                                    <!-- Buttons -->
+                                    <div class="flex gap-3">
+                                        <button
+                                            @click="showCompleteSheet = false"
+                                            class="flex-1 py-3 bg-slate-100 dark:bg-slate-700 text-slate-700 dark:text-slate-300 rounded-xl font-medium"
+                                        >
+                                            Abbrechen
+                                        </button>
+                                        <button
+                                            @click="submitComplete"
+                                            class="flex-1 py-3 bg-green-500 text-white rounded-xl font-medium flex items-center justify-center gap-2"
+                                        >
+                                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7" />
+                                            </svg>
+                                            Abschließen
+                                        </button>
+                                    </div>
+                                </div>
+                                <div class="h-6"></div>
+                            </div>
+                        </transition>
+                    </div>
+                </transition>
+            </teleport>
+        </div>
+    `
+};
diff --git a/public/mobile/shared/api.js b/public/mobile/shared/api.js
new file mode 100644
index 000000000..b3481f9ff
--- /dev/null
+++ b/public/mobile/shared/api.js
@@ -0,0 +1,18 @@
+export function createModuleApi(modulePath) {
+    return {
+        get: (endpoint) => fetch(`/MobileApp/${modulePath}/${endpoint}`).then(r => r.json()),
+        post: (endpoint, data) => fetch(`/MobileApp/${modulePath}/${endpoint}`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(data)
+        }).then(r => r.json())
+    };
+}
+
+export const debounce = (fn, delay) => {
+    let timeout;
+    return (...args) => {
+        clearTimeout(timeout);
+        timeout = setTimeout(() => fn(...args), delay);
+    };
+};
diff --git a/public/mobile/shared/useNumericKeypad.js b/public/mobile/shared/useNumericKeypad.js
new file mode 100644
index 000000000..1c46ed74a
--- /dev/null
+++ b/public/mobile/shared/useNumericKeypad.js
@@ -0,0 +1,43 @@
+export function useNumericKeypad(initialValue = '1') {
+    const { ref } = Vue;
+    const quantity = ref(initialValue);
+
+    const appendDigit = (digit) => {
+        if (digit === '.' && quantity.value.includes('.')) return;
+        if (quantity.value === '0' && digit !== '.') {
+            quantity.value = digit;
+        } else {
+            quantity.value += digit;
+        }
+    };
+
+    const deleteDigit = () => {
+        quantity.value = quantity.value.length > 1 ? quantity.value.slice(0, -1) : '0';
+    };
+
+    const clearQuantity = () => {
+        quantity.value = '0';
+    };
+
+    const setQuantity = (value) => {
+        quantity.value = String(value);
+    };
+
+    const increment = (amount = 1) => {
+        quantity.value = String(Math.max(1, parseFloat(quantity.value) + amount));
+    };
+
+    const decrement = (amount = 1) => {
+        quantity.value = String(Math.max(1, parseFloat(quantity.value) - amount));
+    };
+
+    return {
+        quantity,
+        appendDigit,
+        deleteDigit,
+        clearQuantity,
+        setQuantity,
+        increment,
+        decrement
+    };
+}
diff --git a/scripts/geocode-addresses.php b/scripts/geocode-addresses.php
new file mode 100644
index 000000000..274959ed6
--- /dev/null
+++ b/scripts/geocode-addresses.php
@@ -0,0 +1,134 @@
+#!/usr/bin/php
+<?php
+/**
+ * Geocode Addresses Script
+ *
+ * Populates gps_lat and gps_long for addresses missing coordinates.
+ * Uses Google Geocoding API.
+ *
+ * Usage: php scripts/geocode-addresses.php [--limit=100] [--dry-run] [--verbose]
+ */
+
+require("../config/config.php");
+
+define('FRONKDB_SQLDEBUG', false);
+error_reporting(E_ALL & ~(E_NOTICE | E_STRICT | E_DEPRECATED));
+
+require_once(LIBDIR . "/mvcfronk/mfRouter/mfRouter.php");
+require_once(LIBDIR . "/mvcfronk/mfBase/mfBaseModel.php");
+require_once(LIBDIR . "/mvcfronk/mfBase/mfBaseController.php");
+
+// Parse command line arguments
+$options = getopt('', ['limit::', 'dry-run', 'verbose']);
+$limit = isset($options['limit']) ? intval($options['limit']) : 100;
+$dryRun = isset($options['dry-run']);
+$verbose = isset($options['verbose']);
+
+// Check API key
+if (!defined('TT_GEOCODING_API_SECRET') || empty(TT_GEOCODING_API_SECRET)) {
+    die("ERROR: TT_GEOCODING_API_SECRET is not defined in config.\n");
+}
+
+$apiKey = TT_GEOCODING_API_SECRET;
+
+// Get database connection
+$db = FronkDB::singleton();
+
+// Find addresses missing coordinates
+$sql = "SELECT id, street, zip, city, country_id
+        FROM Address
+        WHERE (gps_lat IS NULL OR gps_lat = 0)
+          AND street != ''
+          AND street IS NOT NULL
+          AND city != ''
+          AND city IS NOT NULL
+        ORDER BY id DESC
+        LIMIT {$limit}";
+
+$result = $db->query($sql);
+
+if (!$result) {
+    die("ERROR: Database query failed.\n");
+}
+
+$total = $db->num_rows($result);
+echo "Found {$total} addresses to geocode" . ($dryRun ? " (DRY RUN)" : "") . "\n";
+
+if ($total === 0) {
+    echo "Nothing to do.\n";
+    exit(0);
+}
+
+$success = 0;
+$failed = 0;
+$skipped = 0;
+
+while ($row = $result->fetch_assoc()) {
+    $id = $row['id'];
+    $street = $row['street'];
+    $zip = $row['zip'];
+    $city = $row['city'];
+
+    // Build address string
+    $addressParts = [];
+    if ($street) $addressParts[] = $street;
+    if ($zip) $addressParts[] = $zip;
+    if ($city) $addressParts[] = $city;
+    $addressParts[] = 'Austria'; // Default country
+
+    $addressString = implode(', ', $addressParts);
+
+    if ($verbose) {
+        echo "Processing ID {$id}: {$addressString}... ";
+    }
+
+    if ($dryRun) {
+        if ($verbose) echo "SKIPPED (dry run)\n";
+        $skipped++;
+        continue;
+    }
+
+    // Call Google Geocoding API
+    $encodedAddress = urlencode($addressString);
+    $url = "https://maps.googleapis.com/maps/api/geocode/json?address={$encodedAddress}&key={$apiKey}&region=at";
+
+    $response = @file_get_contents($url);
+    if (!$response) {
+        if ($verbose) echo "FAILED (API error)\n";
+        $failed++;
+        continue;
+    }
+
+    $data = json_decode($response, true);
+
+    if ($data['status'] !== 'OK' || empty($data['results'])) {
+        if ($verbose) {
+            echo "FAILED (no results, status: {$data['status']})\n";
+        }
+        $failed++;
+        continue;
+    }
+
+    $location = $data['results'][0]['geometry']['location'];
+    $lat = $location['lat'];
+    $lng = $location['lng'];
+
+    // Update database
+    $db->query("UPDATE Address SET gps_lat = {$lat}, gps_long = {$lng} WHERE id = {$id}");
+
+    if ($verbose) {
+        echo "OK ({$lat}, {$lng})\n";
+    }
+
+    $success++;
+
+    // Rate limiting - 100ms between requests
+    usleep(100000);
+}
+
+echo "\n";
+echo "Completed:\n";
+echo "  Success: {$success}\n";
+echo "  Failed:  {$failed}\n";
+echo "  Skipped: {$skipped}\n";
+echo "  Total:   {$total}\n";

From 46304cf32b03a6ff1ef9b70a34aa2d02dacd86bc Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Sun, 18 Jan 2026 08:07:29 +0000
Subject: [PATCH 47/88] Xinon mobile/add top margin

---
 public/mobile/app.js                          |  2 +-
 .../modules/lager/movement/MovementForm.js    | 28 +++++++++++++++----
 public/mobile/shared/base.css                 | 20 +++++++++++--
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/public/mobile/app.js b/public/mobile/app.js
index b45188bbe..a71b22eac 100644
--- a/public/mobile/app.js
+++ b/public/mobile/app.js
@@ -422,7 +422,7 @@ const App = {
 
             <template v-else-if="currentView === 'app'">
                 <div class="h-full flex flex-col">
-                    <header class="bg-white dark:bg-slate-800 border-b border-slate-200 dark:border-slate-700 px-2 py-2 flex items-center safe-area-top flex-shrink-0 z-10">
+                    <header class="bg-white dark:bg-slate-800 border-b border-slate-200 dark:border-slate-700 px-2 flex items-center app-header flex-shrink-0 z-10">
                         <button
                             @click="goBack"
                             :class="[
diff --git a/public/mobile/modules/lager/movement/MovementForm.js b/public/mobile/modules/lager/movement/MovementForm.js
index 383df6415..949afe1bc 100644
--- a/public/mobile/modules/lager/movement/MovementForm.js
+++ b/public/mobile/modules/lager/movement/MovementForm.js
@@ -479,9 +479,27 @@ export default {
         }, { deep: true });
 
         // ==================== SCANNER FUNCTIONS ====================
-        const startScanner = async () => {
+        let scannerRestarting = false;
+
+        const startScanner = async (delay = 0) => {
+            if (scannerRestarting) return;
             scannerError.value = '';
+
+            // Add delay for turbo mode restarts to let camera fully release
+            if (delay > 0) {
+                scannerRestarting = true;
+                await new Promise(resolve => setTimeout(resolve, delay));
+                scannerRestarting = false;
+            }
+
             try {
+                // Ensure previous instance is cleared
+                if (scanner.value) {
+                    try { await scanner.value.stop(); } catch (e) {}
+                    scanner.value = null;
+                }
+                await nextTick();
+
                 scanner.value = new Html5Qrcode('qr-reader-movement');
                 await scanner.value.start(
                     { facingMode: 'environment' },
@@ -578,10 +596,10 @@ export default {
                     const typeLabel = selectedType.value === 'IN' ? '+' : selectedType.value === 'OUT' ? '-' : '±';
                     emit('toast', `${typeLabel}1 ${article.title}`, 'success');
 
-                    // Reset and restart scanner
+                    // Reset and restart scanner with delay for camera to release
                     scannedArticle.value = null;
                     currentStock.value = 0;
-                    await startScanner();
+                    await startScanner(300);
                 } else {
                     emit('toast', result.message || 'Fehler', 'error');
                     // Fall back to normal mode
@@ -609,10 +627,10 @@ export default {
                 emit('toast', `+ ${article.title}`, 'success');
             }
 
-            // Reset and restart scanner
+            // Reset and restart scanner with small delay
             scannedArticle.value = null;
             currentStock.value = 0;
-            startScanner();
+            startScanner(200);
         };
 
         const updateCartQuantity = (index, qty) => {
diff --git a/public/mobile/shared/base.css b/public/mobile/shared/base.css
index f201ee9ae..c6060bc34 100644
--- a/public/mobile/shared/base.css
+++ b/public/mobile/shared/base.css
@@ -45,13 +45,27 @@ input, textarea, [contenteditable] {
     user-select: text;
 }
 
-/* Safe area insets for notched devices */
+/* Safe area insets for notched devices (iPhone Dynamic Island, etc.) */
 .safe-area-top {
-    padding-top: env(safe-area-inset-top);
+    padding-top: env(safe-area-inset-top, 0px);
 }
 
 .safe-area-bottom {
-    padding-bottom: env(safe-area-inset-bottom);
+    padding-bottom: env(safe-area-inset-bottom, 0px);
+}
+
+/* App header with safe area - extends background into notch area */
+.app-header {
+    padding-top: calc(env(safe-area-inset-top, 0px) + 0.5rem);
+    padding-bottom: 0.5rem;
+}
+
+/* Full safe area container that accounts for both top and bottom */
+.safe-area-container {
+    padding-top: env(safe-area-inset-top, 0px);
+    padding-bottom: env(safe-area-inset-bottom, 0px);
+    padding-left: env(safe-area-inset-left, 0px);
+    padding-right: env(safe-area-inset-right, 0px);
 }
 
 

From e99b0d4658ea04370a4c56162aeeb1bd4a559c63 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Sun, 18 Jan 2026 13:25:14 +0100
Subject: [PATCH 48/88] improved some bugs

---
 .../ShippingNote/ShippingNoteHandler.php      | 60 +++++++++++++
 public/mobile/app.js                          | 26 +++++-
 .../lager/shippingnote/ShippingNoteForm.js    | 50 +++--------
 .../modules/workorder/WorkorderModule.js      | 90 +++++++++++--------
 public/mobile/shared/base.css                 |  9 ++
 5 files changed, 158 insertions(+), 77 deletions(-)

diff --git a/application/MobileApp/Modules/Lager/ShippingNote/ShippingNoteHandler.php b/application/MobileApp/Modules/Lager/ShippingNote/ShippingNoteHandler.php
index 2e7d004e6..4464462e9 100644
--- a/application/MobileApp/Modules/Lager/ShippingNote/ShippingNoteHandler.php
+++ b/application/MobileApp/Modules/Lager/ShippingNote/ShippingNoteHandler.php
@@ -16,6 +16,66 @@ class ShippingNoteHandler extends MobileAppBaseHandler {
     const OFFICE_LAT = 46.99552810791587;
     const OFFICE_LNG = 15.7751923956463;
 
+    public function initializeAction() {
+        $db = $this->db();
+        $userId = $this->user->id;
+
+        $userCar = null;
+        $sql = "SELECT id, number_plate, brand, model
+                FROM TimerecordingCar
+                WHERE user_id = {$userId}
+                  AND (retired IS NULL OR retired = 0)
+                LIMIT 1";
+        $result = $db->query($sql);
+        if ($result && $row = $result->fetch_assoc()) {
+            $carName = trim(($row['brand'] ?? '') . ' ' . ($row['model'] ?? ''));
+            if (!$carName) $carName = $row['number_plate'];
+            $userCar = [
+                'id' => intval($row['id']),
+                'name' => $carName,
+                'plate' => $row['number_plate'],
+            ];
+        }
+
+        $allCars = [];
+        $sql = "SELECT id, number_plate, brand, model
+                FROM TimerecordingCar
+                WHERE (retired IS NULL OR retired = 0)
+                ORDER BY brand, model ASC";
+        $result = $db->query($sql);
+        while ($row = $result->fetch_assoc()) {
+            $carName = trim(($row['brand'] ?? '') . ' ' . ($row['model'] ?? ''));
+            if (!$carName) $carName = $row['number_plate'];
+            $allCars[] = [
+                'id' => intval($row['id']),
+                'name' => $carName,
+                'plate' => $row['number_plate'],
+            ];
+        }
+
+        $hourTypes = [
+            ['id' => '', 'name' => 'Normal'],
+            ['id' => '50', 'name' => '+50%'],
+            ['id' => '100', 'name' => '+100%'],
+            ['id' => 'regie', 'name' => 'Regie'],
+        ];
+
+        $currentUser = [
+            'id' => $this->user->id,
+            'name' => $this->user->name,
+            'firstname' => $this->user->firstname ?? '',
+            'lastname' => $this->user->lastname ?? '',
+        ];
+
+        self::returnJson([
+            'success' => true,
+            'userCar' => $userCar,
+            'allCars' => $allCars,
+            'hourTypes' => $hourTypes,
+            'currentUser' => $currentUser,
+        ]);
+    }
+
     /**
      * Get customer by GPS location (nearest within radius)
      * GET /MobileApp/Lager/ShippingNote/getCustomerByLocation?lat=X&lng=Y
diff --git a/public/mobile/app.js b/public/mobile/app.js
index a71b22eac..1373cc5d6 100644
--- a/public/mobile/app.js
+++ b/public/mobile/app.js
@@ -51,7 +51,9 @@ const App = {
         const deferredInstallPrompt = ref(null);
         const isIOS = ref(/iPad|iPhone|iPod/.test(navigator.userAgent));
         const isAndroid = ref(/Android/.test(navigator.userAgent));
-        const canGoBack = computed(() => currentModule.value !== null);
+        const canGoBack = computed(() => currentModule.value !== null || workorderDetailOpen.value);
+        const workorderDetailOpen = ref(false);
+        const workorderRef = ref(null);
 
         const applyTheme = () => {
             const isDark = localStorage.theme === 'dark' ||
@@ -157,6 +159,10 @@ const App = {
         };
 
         const goBack = () => {
+            if (workorderDetailOpen.value && workorderRef.value?.closeDetail) {
+                workorderRef.value.closeDetail();
+                return;
+            }
             if (currentSubmodule.value) {
                 navigate(currentModule.value, null);
             } else if (currentModule.value) {
@@ -164,7 +170,19 @@ const App = {
             }
         };
 
+        const handleWorkorderDetailOpen = (workorderId) => {
+            workorderDetailOpen.value = true;
+        };
+
+        const handleWorkorderDetailClose = () => {
+            workorderDetailOpen.value = false;
+        };
+
         const handlePopstate = (event) => {
+            if (workorderDetailOpen.value && workorderRef.value?.closeDetail) {
+                workorderRef.value.closeDetail();
+                return;
+            }
             if (event.state) {
                 currentModule.value = event.state.module;
                 currentSubmodule.value = event.state.submodule;
@@ -301,6 +319,9 @@ const App = {
             showContinuePrompt,
             continueLastWorkflow,
             dismissContinuePrompt,
+            workorderRef,
+            handleWorkorderDetailOpen,
+            handleWorkorderDetailClose,
         };
     },
 
@@ -500,9 +521,12 @@ const App = {
 
                         <WorkorderModule
                             v-else-if="currentModule?.toLowerCase() === 'workorder'"
+                            ref="workorderRef"
                             :user="user"
                             @navigate="navigate"
                             @toast="showToast"
+                            @detail-open="handleWorkorderDetailOpen"
+                            @detail-close="handleWorkorderDetailClose"
                         />
                     </main>
                 </div>
diff --git a/public/mobile/modules/lager/shippingnote/ShippingNoteForm.js b/public/mobile/modules/lager/shippingnote/ShippingNoteForm.js
index de39a3b91..ad884ca5f 100644
--- a/public/mobile/modules/lager/shippingnote/ShippingNoteForm.js
+++ b/public/mobile/modules/lager/shippingnote/ShippingNoteForm.js
@@ -169,53 +169,27 @@ export default {
             return hoursEntries.value.map(e => e.userId).filter(id => id !== null);
         });
 
-        // Initialize
         onMounted(async () => {
-            await Promise.all([
-                loadUserCar(),
-                loadAllCars(),
-                loadHourTypes()
-            ]);
+            await loadInitializationData();
             detectGPS();
         });
 
-        // Load user's assigned car
-        const loadUserCar = async () => {
+        const loadInitializationData = async () => {
             try {
-                const data = await shippingNoteApi.get(`getUserCar?userId=${props.user?.id}`);
-                if (data.success && data.car) {
-                    userCar.value = data.car;
-                    if (hoursEntries.value[0]) {
-                        hoursEntries.value[0].carId = data.car.id;
-                        hoursEntries.value[0].carName = data.car.name;
+                const data = await shippingNoteApi.get('initialize');
+                if (data.success) {
+                    if (data.userCar) {
+                        userCar.value = data.userCar;
+                        if (hoursEntries.value[0]) {
+                            hoursEntries.value[0].carId = data.userCar.id;
+                            hoursEntries.value[0].carName = data.userCar.name;
+                        }
                     }
-                }
-            } catch (e) {
-                console.error('Failed to load user car:', e);
-            }
-        };
-
-        // Load all available cars
-        const loadAllCars = async () => {
-            try {
-                const data = await shippingNoteApi.get('getAllCars');
-                if (data.success) {
-                    allCars.value = data.cars || [];
-                }
-            } catch (e) {
-                console.error('Failed to load cars:', e);
-            }
-        };
-
-        // Load hour types
-        const loadHourTypes = async () => {
-            try {
-                const data = await shippingNoteApi.get('getHourTypes');
-                if (data.success) {
+                    allCars.value = data.allCars || [];
                     hourTypes.value = data.hourTypes || [];
                 }
             } catch (e) {
-                console.error('Failed to load hour types:', e);
+                console.error('Failed to load initialization data:', e);
             }
         };
 
diff --git a/public/mobile/modules/workorder/WorkorderModule.js b/public/mobile/modules/workorder/WorkorderModule.js
index cdd16a81b..1324c1da9 100644
--- a/public/mobile/modules/workorder/WorkorderModule.js
+++ b/public/mobile/modules/workorder/WorkorderModule.js
@@ -7,7 +7,7 @@
 
 export default {
     name: 'WorkorderModule',
-    emits: ['navigate', 'toast'],
+    emits: ['navigate', 'toast', 'detail-open', 'detail-close'],
     props: {
         user: Object,
         submodule: String
@@ -63,10 +63,10 @@ export default {
         const problemType = ref('');
         const problemComment = ref('');
 
-        // Swipe state for list cards
         const swipeStartX = ref(0);
         const swipeCardId = ref(null);
-        const swipeOffset = ref({});  // { [workorderId]: offsetX }
+        const swipeOffset = ref({});
+        const swipeTriggered = ref(false);
 
         // =====================
         // COMPUTED
@@ -136,12 +136,10 @@ export default {
                 const allRequiredComplete = requiredItems.every(c => c.completed);
                 if (!allRequiredComplete) return false;
             } else if (checklist.value.length > 0) {
-                // If no items are marked as required, check if at least some items are completed
-                const hasAnyCompleted = checklist.value.some(c => c.completed);
-                if (!hasAnyCompleted) return false;
+                const allCompleted = checklist.value.every(c => c.completed);
+                if (!allCompleted) return false;
             }
 
-            // Check cable data if required
             if (tenantConfig.value?.requireCableLength && !cableDataForm.value.cableLength?.trim()) {
                 return false;
             }
@@ -201,6 +199,7 @@ export default {
             selectedWorkorder.value = workorder;
             isDetailLoading.value = true;
             expandedCards.value = { customer: true, checklist: true, documentation: false, notes: false, journal: false, cableData: false };
+            emit('detail-open', workorder.id);
 
             try {
                 // Fetch all workorder details in a single request
@@ -233,6 +232,7 @@ export default {
             tenantConfig.value = null;
             checklist.value = [];
             isEditingNotes.value = false;
+            emit('detail-close');
         };
 
         const toggleCard = (cardId) => {
@@ -535,10 +535,16 @@ export default {
             }
         };
 
-        // Swipe handlers for list cards
+        const scrollIntoViewOnFocus = (e) => {
+            setTimeout(() => {
+                e.target.scrollIntoView({ behavior: 'smooth', block: 'center' });
+            }, 300);
+        };
+
         const handleTouchStart = (e, wo) => {
             swipeStartX.value = e.touches[0].clientX;
             swipeCardId.value = wo.id;
+            swipeTriggered.value = false;
         };
 
         const handleTouchMove = (e, wo) => {
@@ -546,9 +552,11 @@ export default {
             const currentX = e.touches[0].clientX;
             const diff = swipeStartX.value - currentX;
 
-            // Only allow left swipe, max 100px
             if (diff > 0) {
                 swipeOffset.value = { ...swipeOffset.value, [wo.id]: Math.min(diff, 100) };
+                if (diff > 10) {
+                    swipeTriggered.value = true;
+                }
             } else {
                 swipeOffset.value = { ...swipeOffset.value, [wo.id]: 0 };
             }
@@ -558,18 +566,25 @@ export default {
             if (swipeCardId.value !== wo.id) return;
             const offset = swipeOffset.value[wo.id] || 0;
 
-            // If swiped more than 60px, trigger navigation
             if (offset > 60 && wo.customerAddress) {
+                swipeTriggered.value = true;
                 triggerHaptic('light');
                 const address = encodeURIComponent(wo.customerAddress);
                 window.open(`https://maps.google.com/maps?q=${address}`, '_blank');
             }
 
-            // Reset with animation
             swipeOffset.value = { ...swipeOffset.value, [wo.id]: 0 };
             swipeCardId.value = null;
         };
 
+        const handleCardClick = (wo) => {
+            if (swipeTriggered.value) {
+                swipeTriggered.value = false;
+                return;
+            }
+            openDetail(wo);
+        };
+
         const getSwipeStyle = (woId) => {
             const offset = swipeOffset.value[woId] || 0;
             return {
@@ -666,8 +681,10 @@ export default {
             handleTouchStart,
             handleTouchMove,
             handleTouchEnd,
+            handleCardClick,
             getSwipeStyle,
-            swipeOffset
+            swipeOffset,
+            scrollIntoViewOnFocus
         };
     },
 
@@ -767,13 +784,13 @@ export default {
 
                             <!-- Card content (slides on swipe) -->
                             <div
-                                @click="openDetail(wo)"
+                                @click="handleCardClick(wo)"
                                 @touchstart="handleTouchStart($event, wo)"
                                 @touchmove="handleTouchMove($event, wo)"
                                 @touchend="handleTouchEnd($event, wo)"
-                                :style="getSwipeStyle(wo.id)"
+                                :style="{ ...getSwipeStyle(wo.id), touchAction: 'pan-y' }"
                                 :class="[
-                                    'relative w-full bg-white dark:bg-slate-800 p-4 rounded-xl shadow-sm text-left cursor-pointer',
+                                    'relative w-full bg-white dark:bg-slate-800 p-4 rounded-xl shadow-sm text-left cursor-pointer card-contrast',
                                     'border-l-4',
                                     getStatusBorderColor(wo.status)
                                 ]"
@@ -808,14 +825,7 @@ export default {
 
             <!-- DETAIL VIEW -->
             <template v-else>
-                <!-- Header -->
                 <div class="flex items-center justify-between px-4 py-3 bg-white dark:bg-slate-800 border-b border-slate-100 dark:border-slate-700 flex-shrink-0">
-                    <button @click="closeDetail" class="flex items-center text-slate-600 dark:text-slate-300">
-                        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-1" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7" />
-                        </svg>
-                        Zurück
-                    </button>
                     <div class="flex items-center gap-2">
                         <span v-if="selectedWorkorder.oaid" class="font-bold text-primary dark:text-sky-400">{{ selectedWorkorder.oaid }}</span>
                         <span v-else class="font-bold text-primary dark:text-sky-400">#{{ selectedWorkorder.id }}</span>
@@ -839,7 +849,7 @@ export default {
 
                     <template v-else>
                         <!-- Customer Card (Expanded by default) -->
-                        <div class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden">
+                        <div class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden card-contrast">
                             <button
                                 @click="toggleCard('customer')"
                                 class="w-full flex items-center justify-between p-4 text-left"
@@ -897,7 +907,7 @@ export default {
                         </div>
 
                         <!-- Checklist Card -->
-                        <div class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden">
+                        <div class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden card-contrast">
                             <button
                                 @click="toggleCard('checklist')"
                                 class="w-full flex items-center justify-between p-4 text-left"
@@ -963,7 +973,7 @@ export default {
                         </div>
 
                         <!-- Documentation Card -->
-                        <div class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden">
+                        <div class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden card-contrast">
                             <button
                                 @click="toggleCard('documentation')"
                                 class="w-full flex items-center justify-between p-4 text-left"
@@ -1020,7 +1030,7 @@ export default {
                         </div>
 
                         <!-- Notes Card -->
-                        <div class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden">
+                        <div class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden card-contrast">
                             <button
                                 @click="toggleCard('notes')"
                                 class="w-full flex items-center justify-between p-4 text-left"
@@ -1044,6 +1054,7 @@ export default {
                                         rows="4"
                                         class="w-full p-3 bg-slate-50 dark:bg-slate-700 rounded-lg text-slate-800 dark:text-white border-0 focus:ring-2 focus:ring-primary"
                                         placeholder="Notiz eingeben..."
+                                        @focus="scrollIntoViewOnFocus"
                                     ></textarea>
                                     <div class="flex justify-end gap-2 mt-2">
                                         <button @click="cancelEditNotes" class="px-4 py-2 text-sm text-slate-600 dark:text-slate-300">
@@ -1067,7 +1078,7 @@ export default {
                         </div>
 
                         <!-- Journal Card -->
-                        <div class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden">
+                        <div class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden card-contrast">
                             <button
                                 @click="toggleCard('journal')"
                                 class="w-full flex items-center justify-between p-4 text-left"
@@ -1096,6 +1107,7 @@ export default {
                                         placeholder="Neuer Eintrag..."
                                         class="flex-1 px-3 py-2 bg-slate-50 dark:bg-slate-700 rounded-lg text-slate-800 dark:text-white border-0"
                                         @keyup.enter="addJournalEntry"
+                                        @focus="scrollIntoViewOnFocus"
                                     >
                                     <button @click="addJournalEntry" class="px-4 py-2 bg-primary text-white rounded-lg">
                                         <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
@@ -1117,7 +1129,7 @@ export default {
                         </div>
 
                         <!-- Cable Data Card (only if required) -->
-                        <div v-if="tenantConfig && (tenantConfig.requireCableLength || tenantConfig.requireCableType)" class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden">
+                        <div v-if="tenantConfig && (tenantConfig.requireCableLength || tenantConfig.requireCableType)" class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden card-contrast">
                             <button
                                 @click="toggleCard('cableData')"
                                 class="w-full flex items-center justify-between p-4 text-left"
@@ -1162,7 +1174,7 @@ export default {
                 </div>
 
                 <!-- Bottom Action Bar -->
-                <div class="absolute bottom-0 left-0 right-0 p-3 bg-white dark:bg-slate-800 border-t border-slate-100 dark:border-slate-700 flex gap-3">
+                <div class="absolute bottom-0 left-0 right-0 p-3 bg-white dark:bg-slate-800 border-t border-slate-100 dark:border-slate-700 flex gap-3" style="padding-bottom: calc(0.75rem + env(safe-area-inset-bottom, 0px));">
                     <button
                         @click="openProblemSheet"
                         class="flex-1 py-3 bg-amber-500 text-white rounded-xl font-medium flex items-center justify-center active:scale-95 transition"
@@ -1230,15 +1242,6 @@ export default {
                                     </div>
                                     <!-- Upload Buttons -->
                                     <div class="space-y-2">
-                                        <input
-                                            ref="fileInputRef"
-                                            type="file"
-                                            accept="image/*,application/pdf"
-                                            multiple
-                                            class="hidden"
-                                            @change="handleFileSelect"
-                                            capture="environment"
-                                        >
                                         <button
                                             @click="triggerFileInput"
                                             :disabled="isUploading"
@@ -1300,6 +1303,7 @@ export default {
                                             rows="3"
                                             placeholder="Weitere Details..."
                                             class="w-full px-3 py-2 bg-slate-50 dark:bg-slate-700 rounded-lg text-slate-800 dark:text-white border-0"
+                                            @focus="scrollIntoViewOnFocus"
                                         ></textarea>
                                     </div>
                                     <!-- Submit -->
@@ -1368,6 +1372,16 @@ export default {
                     </div>
                 </transition>
             </teleport>
+
+            <input
+                ref="fileInputRef"
+                type="file"
+                accept="image/*,application/pdf"
+                multiple
+                class="hidden"
+                @change="handleFileSelect"
+                capture="environment"
+            >
         </div>
     `
 };
diff --git a/public/mobile/shared/base.css b/public/mobile/shared/base.css
index c6060bc34..8cf8ae59a 100644
--- a/public/mobile/shared/base.css
+++ b/public/mobile/shared/base.css
@@ -336,3 +336,12 @@ textarea:focus-visible {
     font-variant-numeric: tabular-nums;
     letter-spacing: 0.05em;
 }
+
+
+.card-contrast {
+    border: 1px solid rgba(148, 163, 184, 0.2);
+}
+
+.dark .card-contrast {
+    border-color: transparent;
+}

From 6ab41a9169815afebb30c08b385730645652aec5 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Sun, 18 Jan 2026 17:42:11 +0000
Subject: [PATCH 49/88] added technical data to xinon workorder and
 workordermph now has a unassign button

---
 .../ManualInvoice/ManualInvoiceController.php |  65 ++++++++++
 .../Workorder/Workorder/WorkorderHandler.php  |  54 ++++++++-
 .../RimoWorkorder/RimoWorkorderController.php |   8 +-
 .../WorkorderBase/WorkorderBaseController.php |  45 +++++++
 .../WorkorderCompanyController.php            |  14 ++-
 .../WorkorderMphAdminController.php           |  34 ++++++
 .../WorkorderTenantConfigModel.php            |   1 +
 ...d_show_technical_data_to_tenant_config.php |  26 ++++
 .../js/pages/ManualInvoice/ManualInvoice.js   |  94 +++++++++++++--
 .../js/pages/WorkorderBase/WorkorderBase.js   |  44 ++++++-
 .../WorkorderMphAdmin/WorkorderMphAdmin.js    |  29 ++++-
 .../WorkorderTenantConfig.js                  |   4 +
 .../modules/workorder/WorkorderModule.js      | 114 +++++++++++++++++-
 13 files changed, 508 insertions(+), 24 deletions(-)
 create mode 100644 db/migrations/20260118120000_add_show_technical_data_to_tenant_config.php

diff --git a/application/ManualInvoice/ManualInvoiceController.php b/application/ManualInvoice/ManualInvoiceController.php
index f2225af5e..497057215 100644
--- a/application/ManualInvoice/ManualInvoiceController.php
+++ b/application/ManualInvoice/ManualInvoiceController.php
@@ -826,4 +826,69 @@ class ManualInvoiceController extends TTCrud
             'vatrate' => $vatrate->rate
         ]);
     }
+
+    protected function getCustomerBillingInfoAction() {
+        $addressId = $_GET['address_id'] ?? null;
+        $vatgroupId = $_GET['vatgroup_id'] ?? 2;
+
+        if (!$addressId) {
+            self::returnJson(['success' => false, 'message' => 'Address ID required']);
+            return;
+        }
+
+        $address = new Address($addressId);
+        if (!$address->id) {
+            self::returnJson(['success' => false, 'message' => 'Address not found']);
+            return;
+        }
+
+        $vatarea = 'domestic';
+        if ($address->country_id) {
+            $country = new Country($address->country_id);
+            if ($country->id && $country->isocode != TT_HOMECOUNTRY_ISOCODE) {
+                $vatarea = $country->is_eu ? 'eu' : 'other';
+            }
+        }
+
+        if ($address->uid && substr(strtolower(preg_replace('/[^a-z0-9]/i', '', $address->uid)), 0, 3) == 'atu') {
+            $vatarea = 'domestic';
+        }
+
+        $vatrate = VatrateModel::getFirst(['vatgroup_id' => $vatgroupId, 'area' => $vatarea]);
+        $taxText = $vatrate ? $vatrate->invoice_text : '';
+
+        $db = $this->db();
+        $sepaLimit = null;
+        $res = $db->query("SELECT manual_invoice_sepa_limit FROM Address WHERE id = " . intval($addressId));
+        if ($res && $row = $res->fetch_assoc()) {
+            $sepaLimit = $row['manual_invoice_sepa_limit'] ? floatval($row['manual_invoice_sepa_limit']) : null;
+        }
+
+        self::returnJson([
+            'success' => true,
+            'billing_type' => $address->billing_type ?: 'invoice',
+            'manual_invoice_sepa_limit' => $sepaLimit,
+            'vatarea' => $vatarea,
+            'tax_text' => $taxText,
+            'bank_account_bank' => $address->bank_account_bank,
+            'bank_account_owner' => $address->bank_account_owner,
+            'bank_account_iban' => $address->bank_account_iban,
+            'bank_account_bic' => $address->bank_account_bic,
+            'sepa_date' => $address->sepa_date,
+            'sepa_id' => $address->sepa_id
+        ]);
+    }
+
+    protected function getTaxTextAction() {
+        $vatgroupId = $_GET['vatgroup_id'] ?? 2;
+        $vatarea = $_GET['vatarea'] ?? 'domestic';
+
+        $vatrate = VatrateModel::getFirst(['vatgroup_id' => $vatgroupId, 'area' => $vatarea]);
+
+        self::returnJson([
+            'success' => true,
+            'tax_text' => $vatrate ? $vatrate->invoice_text : '',
+            'vatrate' => $vatrate ? $vatrate->rate : 20
+        ]);
+    }
 }
\ No newline at end of file
diff --git a/application/MobileApp/Modules/Workorder/Workorder/WorkorderHandler.php b/application/MobileApp/Modules/Workorder/Workorder/WorkorderHandler.php
index 06826b287..4a556bf79 100644
--- a/application/MobileApp/Modules/Workorder/Workorder/WorkorderHandler.php
+++ b/application/MobileApp/Modules/Workorder/Workorder/WorkorderHandler.php
@@ -164,6 +164,7 @@ class WorkorderHandler extends MobileAppBaseHandler {
                 'interventionTypes' => json_decode($tenantConfig->interventionTypes, true) ?? [],
                 'requireCableLength' => (bool)$tenantConfig->requireCableLength,
                 'requireCableType' => (bool)$tenantConfig->requireCableType,
+                'showTechnicalData' => (bool)$tenantConfig->showTechnicalData,
             ];
         }
 
@@ -241,6 +242,11 @@ class WorkorderHandler extends MobileAppBaseHandler {
             ];
         }
 
+        $technicalData = null;
+        if ($tenantConfigData && !empty($tenantConfigData['showTechnicalData'])) {
+            $technicalData = $this->getTechnicalData($id);
+        }
+
         self::returnJson([
             'success' => true,
             'workorder' => $workorder,
@@ -252,7 +258,8 @@ class WorkorderHandler extends MobileAppBaseHandler {
                 'completed' => $completedCount,
                 'total' => count($docTypes),
                 'allRequired' => $this->allRequiredCompleted($checklist)
-            ]
+            ],
+            'technicalData' => $technicalData,
         ]);
     }
 
@@ -893,6 +900,51 @@ class WorkorderHandler extends MobileAppBaseHandler {
         return true;
     }
 
+    /**
+     * Get technical data (patchposition and AHA Blatt) for a workorder
+     */
+    private function getTechnicalData($workorderId) {
+        $workorder = WorkorderModel::get($workorderId);
+        if (!$workorder || !$workorder->preorderId) return null;
+
+        $preorder = new Preorder($workorder->preorderId);
+        if (!$preorder->id || !$preorder->adb_wohneinheit_id) return null;
+
+        $wohneinheit = $preorder->adb_wohneinheit;
+        if (!$wohneinheit) return null;
+
+        $defaultCluster = '';
+        if ($preorder->adb_hausnummer && $preorder->adb_hausnummer->netzgebiet) {
+            $defaultCluster = $preorder->adb_hausnummer->netzgebiet->extref ?? '';
+        }
+
+        $patchposition = [
+            'equipmentName' => $wohneinheit->getPatchEqString(),
+            'equipmentPort' => $wohneinheit->patch_port,
+            'cluster' => $wohneinheit->patch_cluster ?: $defaultCluster,
+            'shelf' => $wohneinheit->patch_shelf,
+            'module' => $wohneinheit->patch_module,
+        ];
+
+        $rimoWorkorders = [];
+        if (is_array($wohneinheit->rimo_workorders) && count($wohneinheit->rimo_workorders)) {
+            foreach ($wohneinheit->rimo_workorders as $wo) {
+                $rimoWorkorders[] = [
+                    'id' => $wo->id,
+                    'rimoName' => $wo->rimo_name,
+                    'rimoId' => $wo->rimo_id,
+                    'rimoStatus' => $wo->rimo_status,
+                    'downloadUrl' => "/RimoWorkorder/downloadAha?id=" . $wo->id,
+                ];
+            }
+        }
+
+        return [
+            'patchposition' => $patchposition,
+            'rimoWorkorders' => $rimoWorkorders,
+        ];
+    }
+
     /**
      * Get single workorder with full joined data (same structure as getCompanyWorkorders)
      */
diff --git a/application/RimoWorkorder/RimoWorkorderController.php b/application/RimoWorkorder/RimoWorkorderController.php
index 1038575c0..7f330599e 100644
--- a/application/RimoWorkorder/RimoWorkorderController.php
+++ b/application/RimoWorkorder/RimoWorkorderController.php
@@ -13,6 +13,7 @@ class RimoWorkorderController extends mfBaseController {
 
     protected function downloadAhaAction() {
         $workorder_id = $this->request->id;
+        $inline = !empty($this->request->inline);
 
         if(!$workorder_id || $workorder_id < 1) {
             header("HTTP/1.1 400 Bad Request");
@@ -34,8 +35,11 @@ class RimoWorkorderController extends mfBaseController {
             exit;
         }
 
-        header("Content-type: text/pdf");
-        header('Content-disposition: attachment; filename="'.$workorder->rimo_name.'_AHA.pdf"');
+        $filename = $workorder->rimo_name.'_AHA.pdf';
+        $disposition = $inline ? 'inline' : 'attachment';
+
+        header("Content-type: application/pdf");
+        header('Content-disposition: '.$disposition.'; filename="'.$filename.'"');
         echo $return;
         exit;
     }
diff --git a/application/WorkorderBase/WorkorderBaseController.php b/application/WorkorderBase/WorkorderBaseController.php
index fcfce3a08..f8a9c759e 100644
--- a/application/WorkorderBase/WorkorderBaseController.php
+++ b/application/WorkorderBase/WorkorderBaseController.php
@@ -141,6 +141,51 @@ class WorkorderBaseController extends TTCrud
         return WorkorderTenantConfigModel::getFirst(['addressId' => $network->owner_id]) ?? null;
     }
 
+    /**
+     * Retrieves technical data (patchposition and AHA Blatt info) for a workorder.
+     */
+    protected function getTechnicalData(int $workorderId): ?array {
+        $workorder = WorkorderModel::get($workorderId);
+        if (!$workorder || !$workorder->preorderId) return null;
+
+        $preorder = new Preorder($workorder->preorderId);
+        if (!$preorder->id || !$preorder->adb_wohneinheit_id) return null;
+
+        $wohneinheit = $preorder->adb_wohneinheit;
+        if (!$wohneinheit) return null;
+
+        $defaultCluster = '';
+        if ($preorder->adb_hausnummer && $preorder->adb_hausnummer->netzgebiet) {
+            $defaultCluster = $preorder->adb_hausnummer->netzgebiet->extref ?? '';
+        }
+
+        $patchposition = [
+            'equipmentName' => $wohneinheit->getPatchEqString(),
+            'equipmentPort' => $wohneinheit->patch_port,
+            'cluster' => $wohneinheit->patch_cluster ?: $defaultCluster,
+            'shelf' => $wohneinheit->patch_shelf,
+            'module' => $wohneinheit->patch_module,
+        ];
+
+        $rimoWorkorders = [];
+        if (is_array($wohneinheit->rimo_workorders) && count($wohneinheit->rimo_workorders)) {
+            foreach ($wohneinheit->rimo_workorders as $wo) {
+                $rimoWorkorders[] = [
+                    'id' => $wo->id,
+                    'rimoName' => $wo->rimo_name,
+                    'rimoId' => $wo->rimo_id,
+                    'rimoStatus' => $wo->rimo_status,
+                    'downloadUrl' => "/RimoWorkorder/downloadAha?id=" . $wo->id,
+                ];
+            }
+        }
+
+        return [
+            'patchposition' => $patchposition,
+            'rimoWorkorders' => $rimoWorkorders,
+        ];
+    }
+
     //region BACKGROUND TASKS
     /**
      * Creates new workorders from preorders based on tenant configurations.
diff --git a/application/WorkorderCompany/WorkorderCompanyController.php b/application/WorkorderCompany/WorkorderCompanyController.php
index 6125b6e81..78e825809 100644
--- a/application/WorkorderCompany/WorkorderCompanyController.php
+++ b/application/WorkorderCompany/WorkorderCompanyController.php
@@ -167,14 +167,22 @@ class WorkorderCompanyController extends WorkorderBaseController {
             self::returnJson(['success' => false, 'message' => 'Keine Mandantenkonfiguration gefunden.']);
             return;
         }
-        self::returnJson([
+
+        $response = [
             'success' => true,
             'documentationTypes' => json_decode($tenantConfig->documentationTypes, true),
             'civilEngineeringDocsRequired' => $tenantConfig->civilEngineeringDocsRequired,
             'interventionTypes' => json_decode($tenantConfig->interventionTypes, true),
             'requireCableLength' => $tenantConfig->requireCableLength,
-            'requireCableType' => $tenantConfig->requireCableType
-        ]);
+            'requireCableType' => $tenantConfig->requireCableType,
+            'showTechnicalData' => (bool)$tenantConfig->showTechnicalData,
+        ];
+
+        if ($tenantConfig->showTechnicalData) {
+            $response['technicalData'] = $this->getTechnicalData((int)$this->request->workorderId);
+        }
+
+        self::returnJson($response);
     }
 
     protected function uploadDocumentationAction() {
diff --git a/application/WorkorderMphAdmin/WorkorderMphAdminController.php b/application/WorkorderMphAdmin/WorkorderMphAdminController.php
index 416d01d6d..efe5aec14 100644
--- a/application/WorkorderMphAdmin/WorkorderMphAdminController.php
+++ b/application/WorkorderMphAdmin/WorkorderMphAdminController.php
@@ -375,4 +375,38 @@ class WorkorderMphAdminController extends WorkorderMphBaseController
 
         self::returnJson(['success' => true, 'message' => 'Arbeitsauftrag wurde storniert.']);
     }
+
+    protected function unassignWorkorderAction()
+    {
+        if (empty($this->postData['workorderId'])) self::sendError("Arbeitsauftrags-ID fehlt.");
+
+        $workorder = WorkorderMphModel::get($this->postData['workorderId']);
+        if (!$workorder) self::sendError("Arbeitsauftrag nicht gefunden.");
+
+        if ($workorder->status === 'new') self::sendError("Arbeitsauftrag ist nicht zugewiesen.");
+        if (in_array($workorder->status, ['completed', 'cancelled'])) self::sendError("Arbeitsauftrag kann nicht mehr geändert werden.");
+
+        $oldStatus = $workorder->status;
+        $oldCompany = $workorder->companyId ? WorkorderCompanyModel::get($workorder->companyId) : null;
+        $oldCompanyName = $oldCompany ? $oldCompany->name : 'Unbekannt';
+
+        $workorder->status = 'new';
+        $workorder->companyId = null;
+        $workorder->assignmentDate = null;
+        $workorder->deadlineDate = null;
+        $workorder->appointmentDate = null;
+        WorkorderMphModel::update((array)$workorder);
+
+        $reason = !empty($this->postData['reason']) ? " Grund: " . $this->postData['reason'] : '';
+
+        WorkorderMphJournalModel::create([
+            'workorderMphId' => $workorder->id,
+            'text' => "Zuweisung aufgehoben (vorher: $oldCompanyName).$reason",
+            'statusChange' => $this->getStatusText($oldStatus) . " -> " . $this->getStatusText('new'),
+            'create' => time(),
+            'createBy' => $this->user->id,
+        ]);
+
+        self::returnJson(['success' => true, 'message' => 'Zuweisung wurde aufgehoben.']);
+    }
 }
diff --git a/application/WorkorderTenantConfig/WorkorderTenantConfigModel.php b/application/WorkorderTenantConfig/WorkorderTenantConfigModel.php
index bc917678b..ec380a89a 100644
--- a/application/WorkorderTenantConfig/WorkorderTenantConfigModel.php
+++ b/application/WorkorderTenantConfig/WorkorderTenantConfigModel.php
@@ -12,6 +12,7 @@ class WorkorderTenantConfigModel extends TTCrudBaseModel {
     public int $civilEngineeringDocsRequired;
     public int $requireCableLength;
     public int $requireCableType;
+    public int $showTechnicalData = 0;
     public int $enableWorkorder;
     public int $enableWorkorderMph;
     public int $create;
diff --git a/db/migrations/20260118120000_add_show_technical_data_to_tenant_config.php b/db/migrations/20260118120000_add_show_technical_data_to_tenant_config.php
new file mode 100644
index 000000000..4bd3e16c9
--- /dev/null
+++ b/db/migrations/20260118120000_add_show_technical_data_to_tenant_config.php
@@ -0,0 +1,26 @@
+<?php
+
+use Phinx\Migration\AbstractMigration;
+
+class AddShowTechnicalDataToTenantConfig extends AbstractMigration {
+    public function up() {
+        if ($this->getEnvironment() !== "thetool") return;
+
+        $table = $this->table('WorkorderTenantConfig');
+        if (!$table->hasColumn('showTechnicalData')) {
+            $table->addColumn('showTechnicalData', 'boolean', [
+                'default' => false,
+                'after' => 'requireCableType'
+            ])->update();
+        }
+    }
+
+    public function down() {
+        if ($this->getEnvironment() !== "thetool") return;
+
+        $table = $this->table('WorkorderTenantConfig');
+        if ($table->hasColumn('showTechnicalData')) {
+            $table->removeColumn('showTechnicalData')->update();
+        }
+    }
+}
diff --git a/public/js/pages/ManualInvoice/ManualInvoice.js b/public/js/pages/ManualInvoice/ManualInvoice.js
index a8699e002..0348b6e85 100644
--- a/public/js/pages/ManualInvoice/ManualInvoice.js
+++ b/public/js/pages/ManualInvoice/ManualInvoice.js
@@ -161,9 +161,18 @@ Vue.component('manual-invoice-modal', {
               <tt-autocomplete label="Kunde suchen" :api-url="customerApiUrl" v-model="invoiceData.billingaddress_id" sm row />
             </tt-card>
             <tt-card><template v-slot:header><h5><i class="fas fa-file-invoice mr-2"></i>Rechnungsdetails</h5></template>
-              <div class="form-grid">
-                <tt-input label="Rechnungsdatum" type="date" v-model="invoiceData.invoice_date" sm/>
-                <tt-select label="Zahlungsart" v-model="invoiceData.billing_type" :options="billingTypeOptions" sm/>
+              <div class="form-row mb-2">
+                <div class="col-md-6">
+                  <label class="small text-muted">Zahlungsart</label>
+                  <div class="d-flex align-items-center">
+                    <span :class="['badge', effectiveBillingType === 'sepa' ? 'badge-info' : 'badge-secondary']">
+                      {{ effectiveBillingType === 'sepa' ? 'SEPA' : 'Rechnung' }}
+                    </span>
+                    <small v-if="customerBillingInfo.billing_type === 'sepa' && effectiveBillingType === 'invoice'" class="text-warning ml-2">
+                      <i class="fas fa-exclamation-triangle"></i> Brutto überschreitet SEPA-Limit ({{ formatPrice(customerBillingInfo.manual_invoice_sepa_limit) }})
+                    </small>
+                  </div>
+                </div>
               </div>
               <tt-input label="Leistungszeitraum" v-model="invoiceData.leistungszeitraum" sm row placeholder="z.B. 01.01.2025 - 31.01.2025"/>
               <tt-input label="Externe Referenz" v-model="invoiceData.externe_referenz" sm row placeholder="z.B. Auftragsnummer, Bestellnummer"/>
@@ -172,9 +181,8 @@ Vue.component('manual-invoice-modal', {
             <tt-card><template v-slot:header><h5><i class="fas fa-list-ol mr-2"></i>Positionen</h5></template>
               <tt-positions-manager group-mode ref="positionsManager" v-model="invoiceData.positions" :config="positionsConfig" @updateField-article_id="onArticleSelected" />
             </tt-card>
-            <tt-card><template v-slot:header><h5><i class="fas fa-paragraph mr-2"></i>Texte & Rabatt</h5></template>
+            <tt-card><template v-slot:header><h5><i class="fas fa-paragraph mr-2"></i>Rabatt</h5></template>
               <tt-input label="Gesamtrabatt (%)" v-model.number="invoiceData.gesamtrabatt" sm row type="number" placeholder="0"/>
-              <tt-textarea label="Steuerhinweis" v-model="invoiceData.tax_text" rows="2"/>
             </tt-card>
           </div>
         </div>
@@ -197,6 +205,12 @@ Vue.component('manual-invoice-modal', {
             pdfLoading: false,
             pdfPreviewUrl: '',
             previewDebounceTimer: null,
+            customerBillingInfo: {
+                billing_type: 'invoice',
+                manual_invoice_sepa_limit: null,
+                vatarea: 'domestic',
+                tax_text: ''
+            },
             invoiceData: {
                 id: null, invoice_number: null, invoice_date: moment().format('YYYY-MM-DD'),
                 billingaddress_id: null, owner_id: null, customer_number: 0, fibu_account_number: 0,
@@ -205,7 +219,6 @@ Vue.component('manual-invoice-modal', {
                 leistungszeitraum: '', einleitender_text: '', externe_referenz: '', gesamtrabatt: 0,
                 positions: [], total: 0, total_gross: 0
             },
-            billingTypeOptions: [{value: 'invoice', text: 'Rechnung'}, {value: 'sepa', text: 'SEPA'}],
             positionsConfig: {
                 fields: {
                     article_id: {
@@ -270,16 +283,31 @@ Vue.component('manual-invoice-modal', {
             });
 
             return { subtotal, net, vat, gross };
+        },
+        effectiveBillingType() {
+            if (this.customerBillingInfo.billing_type !== 'sepa') return 'invoice';
+            if (this.customerBillingInfo.manual_invoice_sepa_limit === null) return 'sepa';
+            return this.totals.gross <= this.customerBillingInfo.manual_invoice_sepa_limit ? 'sepa' : 'invoice';
         }
     },
     watch: {
         'invoiceData': { handler() { this.debouncedPreviewUpdate(); }, deep: true },
+        effectiveBillingType: {
+            handler(newType) {
+                this.invoiceData.billing_type = newType;
+            },
+            immediate: true
+        },
         'invoiceData.billingaddress_id': {
             async handler(newId) {
-                if (!newId) return Object.assign(this.invoiceData, {
-                    company: '', firstname: '', lastname: '', street: '', zip: '', city: '',
-                    country: 'Österreich', uid: '', email: '', customer_number: 0, fibu_account_number: 0, owner_id: 0
-                });
+                if (!newId) {
+                    Object.assign(this.invoiceData, {
+                        company: '', firstname: '', lastname: '', street: '', zip: '', city: '',
+                        country: 'Österreich', uid: '', email: '', customer_number: 0, fibu_account_number: 0, owner_id: 0
+                    });
+                    this.customerBillingInfo = { billing_type: 'invoice', manual_invoice_sepa_limit: null, vatarea: 'domestic', tax_text: '' };
+                    return;
+                }
 
                 const { data } = await axios.get(`${window.TT_CONFIG.BASE_PATH}/Address/api?do=getAddress&id=${newId}`);
                 if (data.status === 'OK' && data.result.address) {
@@ -291,6 +319,8 @@ Vue.component('manual-invoice-modal', {
                         fibu_account_number: a.fibu_account_number || 0, owner_id: newId
                     });
                 }
+
+                await this.fetchCustomerBillingInfo(newId);
             }
         }
     },
@@ -327,10 +357,35 @@ Vue.component('manual-invoice-modal', {
     methods: {
         close() { this.$emit('close'); },
         saveInvoice() {
+            this.invoiceData.invoice_date = moment().format('YYYY-MM-DD');
+            this.invoiceData.billing_type = this.effectiveBillingType;
+            this.invoiceData.tax_text = this.customerBillingInfo.tax_text;
             if (!this.invoiceData.billingaddress_id) return window.notify('error', 'Bitte wählen Sie einen Kunden aus.');
             if (!this.invoiceData.positions?.length) return window.notify('error', 'Bitte fügen Sie mindestens eine Position hinzu.');
             this.$emit('save', this.invoiceData);
         },
+        formatPrice(value) {
+            if (value === null || value === undefined) return '-';
+            return new Intl.NumberFormat('de-AT', { style: 'currency', currency: 'EUR' }).format(value);
+        },
+        async fetchCustomerBillingInfo(addressId) {
+            if (!addressId) return;
+            try {
+                const vatgroupId = this.invoiceData.vatgroup_id || 2;
+                const { data } = await axios.get(`${window.TT_CONFIG.BASE_PATH}/ManualInvoice/getCustomerBillingInfo?address_id=${addressId}&vatgroup_id=${vatgroupId}`);
+                if (data.success) {
+                    this.customerBillingInfo = {
+                        billing_type: data.billing_type || 'invoice',
+                        manual_invoice_sepa_limit: data.manual_invoice_sepa_limit,
+                        vatarea: data.vatarea || 'domestic',
+                        tax_text: data.tax_text || ''
+                    };
+                    this.invoiceData.tax_text = data.tax_text || '';
+                }
+            } catch (e) {
+                console.error('Error fetching customer billing info:', e);
+            }
+        },
         handleResize() { this.isLargeScreen = window.innerWidth >= 1920; },
         handleGlobalKeydown(e) {
             if (e.ctrlKey && e.key === 'q') { e.preventDefault(); this.togglePreviewVisibility(); }
@@ -339,9 +394,9 @@ Vue.component('manual-invoice-modal', {
         async onArticleSelected(articleId) {
             if (!articleId) return;
             try {
-                const { data } = await axios.get(`${window.TT_CONFIG.BASE_PATH}/ManualInvoice/getArticleVatInfo?article_id=${articleId}`);
+                const vatarea = this.customerBillingInfo.vatarea || 'domestic';
+                const { data } = await axios.get(`${window.TT_CONFIG.BASE_PATH}/ManualInvoice/getArticleVatInfo?article_id=${articleId}&vatarea=${vatarea}`);
                 if (data.success && this.$refs.positionsManager) {
-                    // Update the formData in the positions manager
                     const pm = this.$refs.positionsManager;
                     if (data.article) {
                         pm.$set(pm.formData, 'product_name', data.article.title);
@@ -351,13 +406,26 @@ Vue.component('manual-invoice-modal', {
                     pm.$set(pm.formData, 'fibu_cost_account', data.fibu_cost_account);
                     pm.$set(pm.formData, 'fibu_cost_account_legacy', data.fibu_cost_account_legacy);
                     pm.$set(pm.formData, 'fibu_taxcode', data.fibu_taxcode);
-                    // Store vatgroup_id on invoice level if needed
                     this.invoiceData.vatgroup_id = data.vatgroup_id;
+                    await this.updateTaxText(data.vatgroup_id);
                 }
             } catch (e) {
                 console.error('Error fetching article VAT info:', e);
             }
         },
+        async updateTaxText(vatgroupId) {
+            if (!vatgroupId) return;
+            try {
+                const vatarea = this.customerBillingInfo.vatarea || 'domestic';
+                const { data } = await axios.get(`${window.TT_CONFIG.BASE_PATH}/ManualInvoice/getTaxText?vatgroup_id=${vatgroupId}&vatarea=${vatarea}`);
+                if (data.success) {
+                    this.customerBillingInfo.tax_text = data.tax_text || '';
+                    this.invoiceData.tax_text = data.tax_text || '';
+                }
+            } catch (e) {
+                console.error('Error fetching tax text:', e);
+            }
+        },
         debouncedPreviewUpdate() {
             clearTimeout(this.previewDebounceTimer);
             this.previewDebounceTimer = setTimeout(() => this.updatePdfPreview(), 2000);
diff --git a/public/js/pages/WorkorderBase/WorkorderBase.js b/public/js/pages/WorkorderBase/WorkorderBase.js
index 3972717c4..0b7d2c244 100644
--- a/public/js/pages/WorkorderBase/WorkorderBase.js
+++ b/public/js/pages/WorkorderBase/WorkorderBase.js
@@ -273,7 +273,44 @@ Vue.component('workorder-details-manager', {
                 />
               </div>
             </div>
-            
+
+            <div v-if="showTechnicalData && technicalData && (technicalData.patchposition?.equipmentName || technicalData.rimoWorkorders?.length)" class="card mb-3">
+              <div class="card-header bg-purple text-white">
+                <h5 class="mb-0"><i class="fas fa-microchip mr-2"></i>Technische Daten</h5>
+              </div>
+              <div class="card-body">
+                <div class="row">
+                  <div class="col-md-6" v-if="technicalData.patchposition?.equipmentName">
+                    <h6>Patchposition</h6>
+                    <table class="table table-sm table-striped mb-0">
+                      <tr>
+                        <th class="border-top-0">Equipment Name:</th>
+                        <td class="border-top-0 text-monospace">{{ technicalData.patchposition.equipmentName }}</td>
+                      </tr>
+                      <tr v-if="technicalData.patchposition.equipmentPort">
+                        <th>Equipment Port:</th>
+                        <td class="text-monospace">{{ technicalData.patchposition.equipmentPort }}</td>
+                      </tr>
+                    </table>
+                  </div>
+                  <div class="col-md-6" v-if="technicalData.rimoWorkorders?.length">
+                    <h6>AHA Blätter</h6>
+                    <div v-for="wo in technicalData.rimoWorkorders" :key="wo.id" class="mb-2">
+                      <div class="d-flex align-items-center justify-content-between border rounded p-2">
+                        <div>
+                          <strong>{{ wo.rimoName }}</strong>
+                          <small class="text-muted ml-2">{{ wo.rimoStatus }}</small>
+                        </div>
+                        <a :href="wo.downloadUrl" target="_blank" class="btn btn-sm btn-outline-primary">
+                          <i class="fas fa-file-pdf mr-1"></i> AHA Blatt
+                        </a>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+
             <div class="card mb-3" v-if="isAdmin && selectedDocs.length > 0">
               <div class="card-header bg-warning"><h5><i class="fas fa-exclamation-triangle mr-2"></i>Korrektur anfordern</h5></div>
               <div class="card-body">
@@ -328,6 +365,9 @@ Vue.component('workorder-details-manager', {
         requireCableLength: false,
         requireCableType: false,
         savingData: false,
+        // Technical data
+        showTechnicalData: false,
+        technicalData: null,
         // Admin state
         selectedDocs: [], correctionText: '', correctionLoading: false, showAcceptModal: false, showRevertModal: false,
     }),
@@ -394,6 +434,8 @@ Vue.component('workorder-details-manager', {
                     this.interventionTypes = data.interventionTypes;
                     this.requireCableLength = data.requireCableLength || false;
                     this.requireCableType = data.requireCableType || false;
+                    this.showTechnicalData = data.showTechnicalData || false;
+                    this.technicalData = data.technicalData || null;
                 }
             } catch (e) { console.error("Mandantenkonfiguration nicht geladen", e); }
             finally { this.loadingConfig = false; }
diff --git a/public/js/pages/WorkorderMphAdmin/WorkorderMphAdmin.js b/public/js/pages/WorkorderMphAdmin/WorkorderMphAdmin.js
index 72191b6e8..be5226746 100644
--- a/public/js/pages/WorkorderMphAdmin/WorkorderMphAdmin.js
+++ b/public/js/pages/WorkorderMphAdmin/WorkorderMphAdmin.js
@@ -30,10 +30,13 @@ Vue.component('workorder-mph-admin', {
                 </div>
                 <div v-else><span>{{ row.companyName || 'N/A' }}</span></div>
               </div>
-              <div style="display: grid; grid-template-columns: repeat(2, auto); gap: 0px; padding-left: 8px;">
-                <tt-button v-if="!['completed', 'new'].includes(row.status)" icon="fas fa-edit"
+              <div style="display: grid; grid-template-columns: repeat(3, auto); gap: 0px; padding-left: 8px;">
+                <tt-button v-if="!['completed', 'new', 'cancelled'].includes(row.status)" icon="fas fa-edit"
                            @click="startCompanyEdit(row)" additional-class="btn-link workorder-mph-button"
                            title="Zuweisung ändern"/>
+                <tt-button v-if="!['completed', 'new', 'cancelled'].includes(row.status)" icon="fas fa-user-slash text-warning"
+                           @click="unassignWorkorderModalData = row" additional-class="btn-link workorder-mph-button"
+                           title="Zuweisung aufheben"/>
                 <tt-button v-if="!['completed', 'cancelled'].includes(row.status)" icon="fas fa-ban text-danger"
                            @click="cancelWorkorderModalData = row" additional-class="btn-link workorder-mph-button"
                            title="Auftrag stornieren"/>
@@ -101,6 +104,13 @@ Vue.component('workorder-mph-admin', {
           <p>Soll der Auftrag <strong>#{{ cancelWorkorderModalData.id }}</strong> wirklich storniert werden?</p>
           <tt-textarea label="Grund (optional)" v-model="cancelWorkorderModalData.reason" sm row/>
         </tt-modal>
+
+        <tt-modal v-if="unassignWorkorderModalData" :show.sync="unassignWorkorderModalData"
+                  title="Zuweisung aufheben" @submit="unassignWorkorder">
+          <p>Soll die Zuweisung für Auftrag <strong>#{{ unassignWorkorderModalData.id }}</strong> aufgehoben werden?</p>
+          <p class="text-muted small">Aktuell zugewiesen an: <strong>{{ unassignWorkorderModalData.companyName }}</strong></p>
+          <tt-textarea label="Grund (optional)" v-model="unassignWorkorderModalData.reason" sm row/>
+        </tt-modal>
       </tt-card>
     `,
     data() {
@@ -113,6 +123,7 @@ Vue.component('workorder-mph-admin', {
             companies: [],
             companiesLoading: false,
             cancelWorkorderModalData: null,
+            unassignWorkorderModalData: null,
             crudConfig: {
                 ...window.TT_CONFIG.CRUD_CONFIG,
                 selectable: false,
@@ -237,6 +248,20 @@ Vue.component('workorder-mph-admin', {
             } else {
                 window.notify('error', data.message || 'Stornierung fehlgeschlagen.');
             }
+        },
+        async unassignWorkorder() {
+            const { id, reason } = this.unassignWorkorderModalData;
+            const { data } = await axios.post(`${window.TT_CONFIG.BASE_PATH}/WorkorderMphAdmin/unassignWorkorder`, {
+                workorderId: id,
+                reason: reason
+            });
+            if (data.success) {
+                window.notify('success', data.message);
+                this.$refs.table.$refs.table.refreshTable();
+                this.unassignWorkorderModalData = null;
+            } else {
+                window.notify('error', data.message || 'Aufheben der Zuweisung fehlgeschlagen.');
+            }
         }
     }
 });
\ No newline at end of file
diff --git a/public/js/pages/WorkorderTenantConfig/WorkorderTenantConfig.js b/public/js/pages/WorkorderTenantConfig/WorkorderTenantConfig.js
index 681f3bca6..d2a1b36a4 100644
--- a/public/js/pages/WorkorderTenantConfig/WorkorderTenantConfig.js
+++ b/public/js/pages/WorkorderTenantConfig/WorkorderTenantConfig.js
@@ -89,6 +89,8 @@ Vue.component('workorder-tenant-config', {
                                  v-model="editableItem.requireCableLength" sm/>
                     <tt-checkbox label="Kabeltyp erforderlich"
                                  v-model="editableItem.requireCableType" sm/>
+                    <tt-checkbox label="Technische Daten anzeigen (Patchposition, AHA Blatt)"
+                                 v-model="editableItem.showTechnicalData" sm/>
                   </div>
                   <div v-else>
                     <p>Workorder: <strong>{{ config.enableWorkorder ? 'Aktiviert' : 'Deaktiviert' }}</strong></p>
@@ -97,6 +99,7 @@ Vue.component('workorder-tenant-config', {
                     <p>Tiefbau-Doku: <strong>{{ config.civilEngineeringDocsRequired ? 'Ja' : 'Nein' }}</strong></p>
                     <p>Kabellänge-Doku: <strong>{{ config.requireCableLength ? 'Ja' : 'Nein' }}</strong></p>
                     <p>Kabeltyp-Doku: <strong>{{ config.requireCableType ? 'Ja' : 'Nein' }}</strong></p>
+                    <p>Technische Daten: <strong>{{ config.showTechnicalData ? 'Ja' : 'Nein' }}</strong></p>
                   </div>
                 </div>
                 <div class="col-md-6">
@@ -333,6 +336,7 @@ Vue.component('workorder-tenant-config', {
                     civilEngineeringDocsRequired: 0,
                     requireCableLength: 0,
                     requireCableType: 0,
+                    showTechnicalData: 0,
                     enableWorkorder: 1,
                     enableWorkorderMph: 1
                 }
diff --git a/public/mobile/modules/workorder/WorkorderModule.js b/public/mobile/modules/workorder/WorkorderModule.js
index 1324c1da9..c760aca46 100644
--- a/public/mobile/modules/workorder/WorkorderModule.js
+++ b/public/mobile/modules/workorder/WorkorderModule.js
@@ -31,6 +31,7 @@ export default {
         const documentation = ref({ docs: [], journals: [] });
         const tenantConfig = ref(null);
         const checklist = ref([]);
+        const technicalData = ref(null);
 
         // Expanded cards state
         const expandedCards = ref({
@@ -39,7 +40,8 @@ export default {
             documentation: false,
             notes: false,
             journal: false,
-            cableData: false
+            cableData: false,
+            technical: true
         });
 
         // Edit states
@@ -52,6 +54,9 @@ export default {
         const showDocUploadSheet = ref(false);
         const showProblemSheet = ref(false);
         const showCompleteSheet = ref(false);
+        const showPdfViewer = ref(false);
+        const pdfViewerUrl = ref('');
+        const pdfViewerTitle = ref('');
 
         // Upload state
         const uploadDocType = ref('');
@@ -198,7 +203,7 @@ export default {
         const openDetail = async (workorder) => {
             selectedWorkorder.value = workorder;
             isDetailLoading.value = true;
-            expandedCards.value = { customer: true, checklist: true, documentation: false, notes: false, journal: false, cableData: false };
+            expandedCards.value = { customer: true, checklist: true, documentation: false, notes: false, journal: false, cableData: false, technical: true };
             emit('detail-open', workorder.id);
 
             try {
@@ -215,6 +220,7 @@ export default {
                     documentation.value = { docs: data.docs, journals: data.journals };
                     tenantConfig.value = data.tenantConfig;
                     checklist.value = data.checklist;
+                    technicalData.value = data.technicalData || null;
                 } else {
                     emit('toast', data.message || 'Fehler beim Laden', 'error');
                 }
@@ -231,6 +237,7 @@ export default {
             documentation.value = { docs: [], journals: [] };
             tenantConfig.value = null;
             checklist.value = [];
+            technicalData.value = null;
             isEditingNotes.value = false;
             emit('detail-close');
         };
@@ -617,6 +624,13 @@ export default {
             // Button is disabled when not complete, so this won't be called
         };
 
+        // Open PDF in viewer
+        const openPdfViewer = (url, title) => {
+            pdfViewerUrl.value = url;
+            pdfViewerTitle.value = title || 'PDF';
+            showPdfViewer.value = true;
+        };
+
         // Initialize
         onMounted(() => {
             fetchWorkorders();
@@ -636,6 +650,7 @@ export default {
             documentation,
             tenantConfig,
             checklist,
+            technicalData,
             expandedCards,
             isEditingNotes,
             tempNotes,
@@ -644,6 +659,9 @@ export default {
             showDocUploadSheet,
             showProblemSheet,
             showCompleteSheet,
+            showPdfViewer,
+            pdfViewerUrl,
+            pdfViewerTitle,
             uploadDocType,
             isUploading,
             fileInputRef,
@@ -678,6 +696,7 @@ export default {
             openNavigation,
             callCustomer,
             handleComplete,
+            openPdfViewer,
             handleTouchStart,
             handleTouchMove,
             handleTouchEnd,
@@ -906,6 +925,63 @@ export default {
                             </div>
                         </div>
 
+                        <!-- Technical Data Card -->
+                        <div v-if="technicalData && (technicalData.patchposition?.equipmentName || technicalData.rimoWorkorders?.length)"
+                             class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden card-contrast">
+                            <button
+                                @click="toggleCard('technical')"
+                                class="w-full flex items-center justify-between p-4 text-left"
+                            >
+                                <div class="flex items-center">
+                                    <div class="w-8 h-8 bg-purple-500/10 rounded-lg flex items-center justify-center mr-3">
+                                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-purple-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 3v2m6-2v2M9 19v2m6-2v2M5 9H3m2 6H3m18-6h-2m2 6h-2M7 19h10a2 2 0 002-2V7a2 2 0 00-2-2H7a2 2 0 00-2 2v10a2 2 0 002 2zM9 9h6v6H9V9z"/>
+                                        </svg>
+                                    </div>
+                                    <span class="font-semibold text-slate-800 dark:text-white">Technische Daten</span>
+                                </div>
+                                <svg xmlns="http://www.w3.org/2000/svg" :class="['h-5 w-5 text-slate-400 transition-transform', expandedCards.technical ? 'rotate-180' : '']" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"/>
+                                </svg>
+                            </button>
+                            <div v-if="expandedCards.technical" class="px-4 pb-4 space-y-3">
+                                <!-- Patchposition -->
+                                <div v-if="technicalData.patchposition?.equipmentName" class="space-y-2">
+                                    <div class="text-sm font-medium text-slate-500 dark:text-slate-400">Patchposition</div>
+                                    <div class="bg-slate-50 dark:bg-slate-700/50 rounded-lg p-3 space-y-1">
+                                        <div class="flex justify-between">
+                                            <span class="text-slate-500 dark:text-slate-400 text-sm">Equipment Name:</span>
+                                            <span class="font-mono text-slate-900 dark:text-white">{{ technicalData.patchposition.equipmentName }}</span>
+                                        </div>
+                                        <div v-if="technicalData.patchposition.equipmentPort" class="flex justify-between">
+                                            <span class="text-slate-500 dark:text-slate-400 text-sm">Equipment Port:</span>
+                                            <span class="font-mono text-slate-900 dark:text-white">{{ technicalData.patchposition.equipmentPort }}</span>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <!-- AHA Blätter -->
+                                <div v-if="technicalData.rimoWorkorders?.length" class="space-y-2">
+                                    <div class="text-sm font-medium text-slate-500 dark:text-slate-400">AHA Blätter</div>
+                                    <div v-for="wo in technicalData.rimoWorkorders" :key="wo.id"
+                                         class="bg-slate-50 dark:bg-slate-700/50 rounded-lg p-3 flex items-center justify-between">
+                                        <div>
+                                            <div class="font-medium text-slate-900 dark:text-white">{{ wo.rimoName }}</div>
+                                            <div class="text-xs text-slate-500 dark:text-slate-400">Status: {{ wo.rimoStatus }}</div>
+                                        </div>
+                                        <button @click="openPdfViewer(wo.downloadUrl, wo.rimoName)"
+                                           class="flex items-center gap-2 px-3 py-2 bg-primary text-white rounded-lg text-sm font-medium active:scale-95 transition">
+                                            <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"/>
+                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z"/>
+                                            </svg>
+                                            AHA
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
                         <!-- Checklist Card -->
                         <div class="bg-white dark:bg-slate-800 rounded-xl overflow-hidden card-contrast">
                             <button
@@ -1373,6 +1449,40 @@ export default {
                 </transition>
             </teleport>
 
+            <!-- PDF Viewer Modal -->
+            <teleport to="body">
+                <transition name="fade">
+                    <div v-if="showPdfViewer" class="fixed inset-0 z-50 flex flex-col bg-white dark:bg-slate-900">
+                        <!-- Header -->
+                        <div class="flex items-center justify-between px-4 py-3 bg-white dark:bg-slate-800 border-b border-slate-200 dark:border-slate-700 flex-shrink-0" style="padding-top: calc(0.75rem + env(safe-area-inset-top, 0px));">
+                            <h3 class="text-lg font-semibold text-slate-800 dark:text-white truncate flex-1 mr-4">{{ pdfViewerTitle }}</h3>
+                            <button @click="showPdfViewer = false" class="p-2 -mr-2 text-slate-500 dark:text-slate-400 hover:text-slate-700 dark:hover:text-slate-200">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+                                </svg>
+                            </button>
+                        </div>
+                        <!-- PDF Content -->
+                        <div class="flex-1 overflow-hidden bg-slate-100 dark:bg-slate-800">
+                            <iframe
+                                :src="pdfViewerUrl + (pdfViewerUrl.includes('?') ? '&' : '?') + 'inline=1'"
+                                class="w-full h-full border-0"
+                                style="min-height: 100%;"
+                            ></iframe>
+                        </div>
+                        <!-- Footer with download option -->
+                        <div class="flex-shrink-0 px-4 py-3 bg-white dark:bg-slate-800 border-t border-slate-200 dark:border-slate-700" style="padding-bottom: calc(0.75rem + env(safe-area-inset-bottom, 0px));">
+                            <a :href="pdfViewerUrl" download class="w-full py-3 bg-primary text-white rounded-xl font-medium flex items-center justify-center gap-2">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4" />
+                                </svg>
+                                Download
+                            </a>
+                        </div>
+                    </div>
+                </transition>
+            </teleport>
+
             <input
                 ref="fileInputRef"
                 type="file"

From 3b7069f8ec7494151a545d2437310d7319b7c1b5 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Sun, 18 Jan 2026 18:31:23 +0000
Subject: [PATCH 50/88] added general search modal to generalize app

---
 .../lager/shippingnote/SearchSelectModal.js   | 254 ++++++++++++++++++
 .../lager/shippingnote/ShippingNoteForm.js    | 213 ++++++++-------
 2 files changed, 366 insertions(+), 101 deletions(-)
 create mode 100644 public/mobile/modules/lager/shippingnote/SearchSelectModal.js

diff --git a/public/mobile/modules/lager/shippingnote/SearchSelectModal.js b/public/mobile/modules/lager/shippingnote/SearchSelectModal.js
new file mode 100644
index 000000000..ecb8c9a17
--- /dev/null
+++ b/public/mobile/modules/lager/shippingnote/SearchSelectModal.js
@@ -0,0 +1,254 @@
+/**
+ * SearchSelectModal Component
+ *
+ * Reusable bottom sheet modal for searching and selecting items.
+ * Works correctly with iPhone Dynamic Island by using bottom sheet pattern.
+ *
+ * Usage:
+ * <SearchSelectModal
+ *     :show="showModal"
+ *     title="Select Item"
+ *     :searchable="true"
+ *     :items="items"
+ *     :loading="loading"
+ *     v-model="searchQuery"
+ *     @select="handleSelect"
+ *     @close="showModal = false"
+ * >
+ *     <template #item="{ item }">
+ *         <div>{{ item.name }}</div>
+ *     </template>
+ * </SearchSelectModal>
+ */
+
+export default {
+    name: 'SearchSelectModal',
+    emits: ['select', 'close', 'update:modelValue'],
+    props: {
+        show: {
+            type: Boolean,
+            default: false
+        },
+        title: {
+            type: String,
+            default: 'Auswählen'
+        },
+        searchable: {
+            type: Boolean,
+            default: false
+        },
+        searchPlaceholder: {
+            type: String,
+            default: 'Suchen...'
+        },
+        modelValue: {
+            type: String,
+            default: ''
+        },
+        items: {
+            type: Array,
+            default: () => []
+        },
+        loading: {
+            type: Boolean,
+            default: false
+        },
+        emptyText: {
+            type: String,
+            default: 'Keine Ergebnisse gefunden'
+        },
+        emptyIcon: {
+            type: String,
+            default: 'search' // search, users, box, list
+        },
+        selectedId: {
+            type: [String, Number],
+            default: null
+        },
+        itemKey: {
+            type: String,
+            default: 'id'
+        },
+        showNoneOption: {
+            type: Boolean,
+            default: false
+        },
+        noneOptionText: {
+            type: String,
+            default: 'Keine Auswahl'
+        }
+    },
+
+    setup(props, { emit, slots }) {
+        const { ref, computed, watch } = Vue;
+
+        const searchInput = ref(null);
+
+        // Focus search input when modal opens
+        watch(() => props.show, (newVal) => {
+            if (newVal && props.searchable) {
+                setTimeout(() => {
+                    searchInput.value?.focus();
+                }, 100);
+            }
+        });
+
+        const updateSearch = (event) => {
+            emit('update:modelValue', event.target.value);
+        };
+
+        const selectItem = (item) => {
+            emit('select', item);
+        };
+
+        const selectNone = () => {
+            emit('select', null);
+        };
+
+        const close = () => {
+            emit('close');
+        };
+
+        const isSelected = (item) => {
+            if (props.selectedId === null || props.selectedId === undefined) return false;
+            return item[props.itemKey] === props.selectedId;
+        };
+
+        // Icons for empty states
+        const emptyIcons = {
+            search: `<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />`,
+            users: `<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z" />`,
+            box: `<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4" />`,
+            list: `<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 10h16M4 14h16M4 18h16" />`
+        };
+
+        const getEmptyIcon = computed(() => {
+            return emptyIcons[props.emptyIcon] || emptyIcons.search;
+        });
+
+        return {
+            searchInput,
+            updateSearch,
+            selectItem,
+            selectNone,
+            close,
+            isSelected,
+            getEmptyIcon
+        };
+    },
+
+    template: `
+        <teleport to="body">
+            <transition name="fade">
+                <div v-if="show" class="fixed inset-0 z-50">
+                    <!-- Backdrop -->
+                    <div class="absolute inset-0 bg-black/50" @click="close"></div>
+
+                    <!-- Sheet -->
+                    <transition name="slide-up-sheet">
+                        <div v-if="show" class="absolute bottom-0 left-0 right-0 bg-white dark:bg-slate-800 rounded-t-2xl shadow-xl max-h-[85vh] flex flex-col">
+                            <!-- Handle -->
+                            <div class="flex justify-center pt-2 pb-1 flex-shrink-0">
+                                <div class="w-10 h-1 bg-slate-300 dark:bg-slate-600 rounded-full"></div>
+                            </div>
+
+                            <!-- Header -->
+                            <div class="px-4 pb-3 border-b border-slate-100 dark:border-slate-700 flex-shrink-0">
+                                <h3 class="text-lg font-semibold text-slate-800 dark:text-white text-center">
+                                    {{ title }}
+                                </h3>
+                            </div>
+
+                            <!-- Search Input (optional) -->
+                            <div v-if="searchable" class="px-4 py-3 flex-shrink-0">
+                                <div class="relative">
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="absolute left-3 top-1/2 -translate-y-1/2 h-5 w-5 text-slate-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
+                                    </svg>
+                                    <input
+                                        ref="searchInput"
+                                        type="text"
+                                        :value="modelValue"
+                                        @input="updateSearch"
+                                        :placeholder="searchPlaceholder"
+                                        class="w-full pl-10 pr-4 py-3 bg-slate-100 dark:bg-slate-700 rounded-xl text-slate-800 dark:text-white placeholder-slate-400 focus:outline-none focus:ring-2 focus:ring-primary"
+                                    >
+                                </div>
+                            </div>
+
+                            <!-- Results List -->
+                            <div class="flex-1 overflow-y-auto px-4 pb-6">
+                                <!-- Loading -->
+                                <div v-if="loading" class="py-8 text-center">
+                                    <div class="animate-spin w-8 h-8 border-3 border-primary border-t-transparent rounded-full mx-auto"></div>
+                                </div>
+
+                                <!-- Empty State -->
+                                <div v-else-if="items.length === 0" class="py-8 text-center text-slate-500 dark:text-slate-400">
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-12 w-12 mx-auto mb-3 text-slate-300 dark:text-slate-600" fill="none" viewBox="0 0 24 24" stroke="currentColor" v-html="getEmptyIcon"></svg>
+                                    <p>{{ emptyText }}</p>
+                                </div>
+
+                                <!-- Items List -->
+                                <div v-else class="space-y-2">
+                                    <!-- None Option -->
+                                    <button
+                                        v-if="showNoneOption"
+                                        @click="selectNone"
+                                        class="w-full flex items-center p-3 bg-slate-50 dark:bg-slate-700/50 rounded-xl hover:bg-slate-100 dark:hover:bg-slate-700 transition text-left"
+                                    >
+                                        <div class="w-10 h-10 bg-slate-200 dark:bg-slate-600 rounded-full flex items-center justify-center flex-shrink-0">
+                                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-slate-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+                                            </svg>
+                                        </div>
+                                        <div class="ml-3 flex-1">
+                                            <p class="font-medium text-slate-500 dark:text-slate-400">{{ noneOptionText }}</p>
+                                        </div>
+                                    </button>
+
+                                    <!-- Regular Items -->
+                                    <button
+                                        v-for="item in items"
+                                        :key="item[itemKey]"
+                                        @click="selectItem(item)"
+                                        :class="[
+                                            'w-full flex items-center p-3 rounded-xl transition text-left',
+                                            isSelected(item)
+                                                ? 'bg-primary/10 border-2 border-primary'
+                                                : 'bg-slate-50 dark:bg-slate-700/50 hover:bg-slate-100 dark:hover:bg-slate-700'
+                                        ]"
+                                    >
+                                        <!-- Custom slot for item content -->
+                                        <slot name="item" :item="item" :selected="isSelected(item)">
+                                            <!-- Default item rendering -->
+                                            <div class="w-10 h-10 bg-primary/10 rounded-full flex items-center justify-center flex-shrink-0">
+                                                <span class="text-primary font-semibold text-sm">
+                                                    {{ (item.name || item.title || '?').charAt(0).toUpperCase() }}
+                                                </span>
+                                            </div>
+                                            <div class="ml-3 flex-1 min-w-0">
+                                                <p class="font-medium text-slate-800 dark:text-white truncate">
+                                                    {{ item.name || item.title }}
+                                                </p>
+                                                <p v-if="item.subtitle" class="text-sm text-slate-500 dark:text-slate-400 truncate">
+                                                    {{ item.subtitle }}
+                                                </p>
+                                            </div>
+                                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-slate-400 flex-shrink-0" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
+                                            </svg>
+                                        </slot>
+                                    </button>
+                                </div>
+                            </div>
+
+                            <!-- Safe area padding for iOS -->
+                            <div class="h-6 flex-shrink-0"></div>
+                        </div>
+                    </transition>
+                </div>
+            </transition>
+        </teleport>
+    `
+};
diff --git a/public/mobile/modules/lager/shippingnote/ShippingNoteForm.js b/public/mobile/modules/lager/shippingnote/ShippingNoteForm.js
index ad884ca5f..c0735ea9a 100644
--- a/public/mobile/modules/lager/shippingnote/ShippingNoteForm.js
+++ b/public/mobile/modules/lager/shippingnote/ShippingNoteForm.js
@@ -11,6 +11,7 @@
 import { shippingNoteApi } from '/mobile/modules/lager/shippingnote/ShippingNoteModule.js';
 import DatePicker from '/mobile/modules/lager/shippingnote/DatePicker.js';
 import EmployeeSelector from '/mobile/modules/lager/shippingnote/EmployeeSelector.js';
+import SearchSelectModal from '/mobile/modules/lager/shippingnote/SearchSelectModal.js';
 
 export default {
     name: 'ShippingNoteForm',
@@ -20,7 +21,8 @@ export default {
     },
     components: {
         DatePicker,
-        EmployeeSelector
+        EmployeeSelector,
+        SearchSelectModal
     },
 
     setup(props, { emit }) {
@@ -455,8 +457,8 @@ export default {
 
         const selectCar = (car) => {
             if (hoursEntries.value[carSelectEntryIndex.value]) {
-                hoursEntries.value[carSelectEntryIndex.value].carId = car.id;
-                hoursEntries.value[carSelectEntryIndex.value].carName = car.name;
+                hoursEntries.value[carSelectEntryIndex.value].carId = car?.id || null;
+                hoursEntries.value[carSelectEntryIndex.value].carName = car?.name || '';
             }
             showCarSelect.value = false;
             navigator.vibrate?.([30]);
@@ -951,114 +953,123 @@ export default {
             />
 
             <!-- Customer Search Modal -->
-            <teleport to="body">
-                <transition name="slide-up">
-                    <div v-if="showCustomerSearch" class="fixed inset-0 z-50 flex flex-col bg-white dark:bg-slate-900">
-                        <div class="flex items-center px-4 py-3 border-b border-slate-200 dark:border-slate-700">
-                            <button @click="showCustomerSearch = false" class="p-2 -ml-2">
-                                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 text-slate-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
-                                </svg>
-                            </button>
-                            <h2 class="ml-2 text-lg font-semibold text-slate-800 dark:text-white">Kunde suchen</h2>
-                        </div>
-                        <div class="p-4">
-                            <input type="text" v-model="customerSearchQuery" autofocus class="w-full px-4 py-3 bg-slate-100 dark:bg-slate-800 rounded-xl text-base" placeholder="Name, Firma, Kundennummer..." />
-                        </div>
-                        <div class="flex-1 overflow-y-auto px-4">
-                            <div v-if="customerSearchLoading" class="text-center py-8 text-slate-500">Suche...</div>
-                            <div v-else-if="customerSearchResults.length === 0 && customerSearchQuery.length >= 1" class="text-center py-8 text-slate-500">Keine Kunden gefunden</div>
-                            <div v-else class="space-y-2">
-                                <button v-for="customer in customerSearchResults" :key="customer.id" @click="selectCustomer(customer)" class="w-full text-left p-3 bg-slate-50 dark:bg-slate-800 rounded-xl active:bg-slate-100 dark:active:bg-slate-700">
-                                    <div class="font-medium text-slate-800 dark:text-white">{{ customer.displayName }}</div>
-                                    <div v-if="customer.company && customer.company !== customer.displayName" class="text-sm text-primary">{{ customer.company }}</div>
-                                    <div class="text-sm text-slate-500 dark:text-slate-400">{{ customer.street }}, {{ customer.zip }} {{ customer.city }}</div>
-                                    <div v-if="customer.customerNumber" class="text-xs text-slate-400 dark:text-slate-500 mt-1">KNr: {{ customer.customerNumber }}</div>
-                                </button>
-                            </div>
-                        </div>
+            <SearchSelectModal
+                :show="showCustomerSearch"
+                title="Kunde suchen"
+                :searchable="true"
+                search-placeholder="Name, Firma, Kundennummer..."
+                v-model="customerSearchQuery"
+                :items="customerSearchResults"
+                :loading="customerSearchLoading"
+                empty-text="Keine Kunden gefunden"
+                empty-icon="users"
+                @select="selectCustomer"
+                @close="showCustomerSearch = false"
+            >
+                <template #item="{ item: customer }">
+                    <div class="w-10 h-10 bg-primary/10 rounded-full flex items-center justify-center flex-shrink-0">
+                        <span class="text-primary font-semibold text-sm">
+                            {{ (customer.displayName || customer.company || '?').charAt(0).toUpperCase() }}
+                        </span>
                     </div>
-                </transition>
-            </teleport>
+                    <div class="ml-3 flex-1 min-w-0">
+                        <p class="font-medium text-slate-800 dark:text-white truncate">{{ customer.displayName }}</p>
+                        <p v-if="customer.company && customer.company !== customer.displayName" class="text-sm text-primary truncate">{{ customer.company }}</p>
+                        <p class="text-sm text-slate-500 dark:text-slate-400 truncate">{{ customer.street }}, {{ customer.zip }} {{ customer.city }}</p>
+                        <p v-if="customer.customerNumber" class="text-xs text-slate-400 dark:text-slate-500">KNr: {{ customer.customerNumber }}</p>
+                    </div>
+                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-slate-400 flex-shrink-0" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
+                    </svg>
+                </template>
+            </SearchSelectModal>
 
             <!-- Article Search Modal -->
-            <teleport to="body">
-                <transition name="slide-up">
-                    <div v-if="showArticleSearch" class="fixed inset-0 z-50 flex flex-col bg-white dark:bg-slate-900">
-                        <div class="flex items-center px-4 py-3 border-b border-slate-200 dark:border-slate-700">
-                            <button @click="showArticleSearch = false" class="p-2 -ml-2">
-                                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 text-slate-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
-                                </svg>
-                            </button>
-                            <h2 class="ml-2 text-lg font-semibold text-slate-800 dark:text-white">Artikel suchen</h2>
-                        </div>
-                        <div class="p-4">
-                            <input type="text" v-model="articleSearchQuery" autofocus class="w-full px-4 py-3 bg-slate-100 dark:bg-slate-800 rounded-xl text-base" placeholder="Artikelnummer oder Name..." />
-                        </div>
-                        <div class="flex-1 overflow-y-auto px-4">
-                            <div v-if="articleSearchLoading" class="text-center py-8 text-slate-500">Suche...</div>
-                            <div v-else-if="articleSearchResults.length === 0 && articleSearchQuery.length >= 1" class="text-center py-8 text-slate-500">Keine Artikel gefunden</div>
-                            <div v-else class="space-y-2">
-                                <button v-for="article in articleSearchResults" :key="article.id" @click="addArticle(article)" class="w-full text-left p-3 bg-slate-50 dark:bg-slate-800 rounded-xl active:bg-slate-100 dark:active:bg-slate-700">
-                                    <div class="font-medium text-slate-800 dark:text-white">{{ article.title }}</div>
-                                    <div class="text-sm text-slate-500 dark:text-slate-400">{{ article.articleNumber }}</div>
-                                </button>
-                            </div>
-                        </div>
+            <SearchSelectModal
+                :show="showArticleSearch"
+                title="Artikel suchen"
+                :searchable="true"
+                search-placeholder="Artikelnummer oder Name..."
+                v-model="articleSearchQuery"
+                :items="articleSearchResults"
+                :loading="articleSearchLoading"
+                empty-text="Keine Artikel gefunden"
+                empty-icon="box"
+                @select="addArticle"
+                @close="showArticleSearch = false"
+            >
+                <template #item="{ item: article }">
+                    <div class="w-10 h-10 bg-amber-500/10 rounded-full flex items-center justify-center flex-shrink-0">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-amber-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4" />
+                        </svg>
                     </div>
-                </transition>
-            </teleport>
+                    <div class="ml-3 flex-1 min-w-0">
+                        <p class="font-medium text-slate-800 dark:text-white truncate">{{ article.title }}</p>
+                        <p class="text-sm text-slate-500 dark:text-slate-400">{{ article.articleNumber }}</p>
+                    </div>
+                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-green-500 flex-shrink-0" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4" />
+                    </svg>
+                </template>
+            </SearchSelectModal>
 
             <!-- Car Select Modal -->
-            <teleport to="body">
-                <transition name="slide-up">
-                    <div v-if="showCarSelect" class="fixed inset-0 z-50 flex flex-col bg-white dark:bg-slate-900">
-                        <div class="flex items-center px-4 py-3 border-b border-slate-200 dark:border-slate-700">
-                            <button @click="showCarSelect = false" class="p-2 -ml-2">
-                                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 text-slate-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
-                                </svg>
-                            </button>
-                            <h2 class="ml-2 text-lg font-semibold text-slate-800 dark:text-white">Fahrzeug wählen</h2>
-                        </div>
-                        <div class="flex-1 overflow-y-auto p-4 space-y-2">
-                            <button v-for="car in allCars" :key="car.id" @click="selectCar(car)"
-                                :class="['w-full text-left p-3 rounded-xl', hoursEntries[carSelectEntryIndex]?.carId === car.id ? 'bg-primary/10 border-2 border-primary' : 'bg-slate-50 dark:bg-slate-800']"
-                            >
-                                <div class="font-medium text-slate-800 dark:text-white">{{ car.name }}</div>
-                                <div v-if="car.plate" class="text-sm text-slate-500 dark:text-slate-400">{{ car.plate }}</div>
-                            </button>
-                            <button @click="selectCar({id: null, name: ''})" class="w-full text-left p-3 bg-slate-50 dark:bg-slate-800 rounded-xl text-slate-500">
-                                Kein Fahrzeug
-                            </button>
-                        </div>
+            <SearchSelectModal
+                :show="showCarSelect"
+                title="Fahrzeug wählen"
+                :searchable="false"
+                :items="allCars"
+                empty-text="Keine Fahrzeuge verfügbar"
+                empty-icon="list"
+                :selected-id="hoursEntries[carSelectEntryIndex]?.carId"
+                :show-none-option="true"
+                none-option-text="Kein Fahrzeug"
+                @select="selectCar"
+                @close="showCarSelect = false"
+            >
+                <template #item="{ item: car, selected }">
+                    <div class="w-10 h-10 bg-blue-500/10 rounded-full flex items-center justify-center flex-shrink-0">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-blue-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7h8m-8 4h8m-6 4h4M3 21h18M3 17V7c0-1.1.9-2 2-2h14a2 2 0 012 2v10" />
+                        </svg>
                     </div>
-                </transition>
-            </teleport>
+                    <div class="ml-3 flex-1 min-w-0">
+                        <p class="font-medium text-slate-800 dark:text-white truncate">{{ car.name }}</p>
+                        <p v-if="car.plate" class="text-sm text-slate-500 dark:text-slate-400">{{ car.plate }}</p>
+                    </div>
+                    <svg v-if="selected" xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-primary flex-shrink-0" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7" />
+                    </svg>
+                </template>
+            </SearchSelectModal>
 
             <!-- Hour Type Select Modal -->
-            <teleport to="body">
-                <transition name="slide-up">
-                    <div v-if="showHourTypeSelect" class="fixed inset-0 z-50 flex flex-col bg-white dark:bg-slate-900">
-                        <div class="flex items-center px-4 py-3 border-b border-slate-200 dark:border-slate-700">
-                            <button @click="showHourTypeSelect = false" class="p-2 -ml-2">
-                                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 text-slate-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
-                                </svg>
-                            </button>
-                            <h2 class="ml-2 text-lg font-semibold text-slate-800 dark:text-white">Stundenart wählen</h2>
-                        </div>
-                        <div class="flex-1 overflow-y-auto p-4 space-y-2">
-                            <button v-for="ht in hourTypes" :key="ht.id" @click="selectHourType(ht)"
-                                :class="['w-full text-left p-4 rounded-xl', hoursEntries[hourTypeSelectEntryIndex]?.hourType === ht.id ? 'bg-primary/10 border-2 border-primary' : 'bg-slate-50 dark:bg-slate-800']"
-                            >
-                                <div class="font-medium text-slate-800 dark:text-white">{{ ht.name }}</div>
-                            </button>
-                        </div>
+            <SearchSelectModal
+                :show="showHourTypeSelect"
+                title="Stundenart wählen"
+                :searchable="false"
+                :items="hourTypes"
+                empty-text="Keine Stundenarten verfügbar"
+                empty-icon="list"
+                :selected-id="hoursEntries[hourTypeSelectEntryIndex]?.hourType"
+                @select="selectHourType"
+                @close="showHourTypeSelect = false"
+            >
+                <template #item="{ item: ht, selected }">
+                    <div class="w-10 h-10 bg-green-500/10 rounded-full flex items-center justify-center flex-shrink-0">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-green-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" />
+                        </svg>
                     </div>
-                </transition>
-            </teleport>
+                    <div class="ml-3 flex-1 min-w-0">
+                        <p class="font-medium text-slate-800 dark:text-white truncate">{{ ht.name }}</p>
+                    </div>
+                    <svg v-if="selected" xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-primary flex-shrink-0" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7" />
+                    </svg>
+                </template>
+            </SearchSelectModal>
         </div>
     `
 };

From 6c63ffbea0b594f4f07056071ce3dc3aea0a59bc Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Sun, 18 Jan 2026 20:36:16 +0100
Subject: [PATCH 51/88] fixed pwa installing issue

---
 Layout/default/MobileApp/Base.php |  4 ++++
 public/mobile/manifest.json       | 20 ++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/Layout/default/MobileApp/Base.php b/Layout/default/MobileApp/Base.php
index 91f8d1c7f..63f7f6500 100644
--- a/Layout/default/MobileApp/Base.php
+++ b/Layout/default/MobileApp/Base.php
@@ -15,8 +15,12 @@ $config = array_merge([
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
     <title><?= htmlspecialchars($config['title']) ?></title>
     <link rel="shortcut icon" href="/assets/images/favicon.ico">
+    <link rel="apple-touch-icon" href="/assets/images/xinon-sm-192.png">
+    <link rel="apple-touch-icon" sizes="192x192" href="/assets/images/xinon-sm-192.png">
+    <link rel="apple-touch-icon" sizes="512x512" href="/assets/images/xinon-sm-512.png">
     <link rel="manifest" href="<?= htmlspecialchars($config['manifestPath']) ?>">
     <meta name="theme-color" content="#005384">
+    <meta name="mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
     <meta name="apple-mobile-web-app-title" content="<?= htmlspecialchars($config['appName']) ?>">
diff --git a/public/mobile/manifest.json b/public/mobile/manifest.json
index eeb099605..bb27a9f6e 100644
--- a/public/mobile/manifest.json
+++ b/public/mobile/manifest.json
@@ -10,16 +10,28 @@
     "theme_color": "#005384",
     "icons": [
         {
-            "src": "/assets/images/xinon-sm.png",
+            "src": "/assets/images/xinon-sm-192.png",
             "sizes": "192x192",
             "type": "image/png",
-            "purpose": "any maskable"
+            "purpose": "any"
         },
         {
-            "src": "/assets/images/xinon-sm.png",
+            "src": "/assets/images/xinon-sm-192.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "purpose": "maskable"
+        },
+        {
+            "src": "/assets/images/xinon-sm-512.png",
             "sizes": "512x512",
             "type": "image/png",
-            "purpose": "any maskable"
+            "purpose": "any"
+        },
+        {
+            "src": "/assets/images/xinon-sm-512.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "maskable"
         }
     ],
     "categories": ["business", "productivity"]

From dc779cd270fee41623724222c7387cfe2d1bfc04 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Sun, 18 Jan 2026 21:02:01 +0100
Subject: [PATCH 52/88] fixed submodule routing

---
 application/MobileApp/MobileAppController.php | 36 ++++++++++++++++---
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/application/MobileApp/MobileAppController.php b/application/MobileApp/MobileAppController.php
index 294972802..3a356ceb3 100644
--- a/application/MobileApp/MobileAppController.php
+++ b/application/MobileApp/MobileAppController.php
@@ -398,21 +398,31 @@ class MobileAppController extends mfBaseController {
      * /MobileApp/{module}/{submodule}/{endpoint}
      */
     protected function handleApiCall($module, $submodule, $endpoint) {
-        // Normalize names
-        $moduleName = ucfirst(strtolower($module));
-        $submoduleName = ucfirst(strtolower($submodule));
-
         // Check authentication for API calls
         if (!$this->user || !$this->user->id) {
             self::returnJson(['success' => false, 'error' => 'Not authenticated'], 401);
             return;
         }
 
+        // Find module directory (case-insensitive)
+        $moduleName = $this->findModuleDirectory(APPDIR . "MobileApp/Modules", $module);
+        if (!$moduleName) {
+            self::returnJson(['success' => false, 'error' => "Module not found: {$module}"], 404);
+            return;
+        }
+
+        // Find submodule directory (case-insensitive)
+        $submoduleName = $this->findModuleDirectory(APPDIR . "MobileApp/Modules/{$moduleName}", $submodule);
+        if (!$submoduleName) {
+            self::returnJson(['success' => false, 'error' => "Submodule not found: {$module}/{$submodule}"], 404);
+            return;
+        }
+
         // Build handler path
         $handlerFile = APPDIR . "MobileApp/Modules/{$moduleName}/{$submoduleName}/{$submoduleName}Handler.php";
 
         if (!file_exists($handlerFile)) {
-            self::returnJson(['success' => false, 'error' => "Module not found: {$moduleName}/{$submoduleName}"], 404);
+            self::returnJson(['success' => false, 'error' => "Handler not found: {$moduleName}/{$submoduleName}"], 404);
             return;
         }
 
@@ -445,4 +455,20 @@ class MobileAppController extends mfBaseController {
 
         self::returnJson(['success' => false, 'error' => "Endpoint not found: {$endpoint}"], 404);
     }
+
+    /**
+     * Find directory with case-insensitive matching
+     * Required for Linux compatibility where filesystem is case-sensitive
+     */
+    protected function findModuleDirectory($basePath, $name) {
+        if (!is_dir($basePath)) return null;
+        $dirs = scandir($basePath);
+        foreach ($dirs as $dir) {
+            if ($dir === '.' || $dir === '..') continue;
+            if (strtolower($dir) === strtolower($name) && is_dir($basePath . '/' . $dir)) {
+                return $dir;
+            }
+        }
+        return null;
+    }
 }

From bd0a332aa19e11cefd8d7869feb04005449d99b2 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Mon, 19 Jan 2026 06:51:56 +0100
Subject: [PATCH 53/88] added categories to assetmanagement

---
 .../AssetManagementController.php             | 22 +++++++++++++
 .../AssetManagement/AssetManagementModel.php  | 30 ++++++++++++++---
 ...19140000_asset_management_add_category.php | 33 +++++++++++++++++++
 .../pages/AssetManagement/AssetManagement.js  | 10 ++++++
 4 files changed, 91 insertions(+), 4 deletions(-)
 create mode 100644 db/migrations/20260119140000_asset_management_add_category.php

diff --git a/application/AssetManagement/AssetManagementController.php b/application/AssetManagement/AssetManagementController.php
index af710d615..ff7d00cc6 100644
--- a/application/AssetManagement/AssetManagementController.php
+++ b/application/AssetManagement/AssetManagementController.php
@@ -8,6 +8,7 @@ class AssetManagementController extends TTCrud
     // Simplified columns for better layout, details are in the 'assetDetails' slot
     protected array $columns = [
         ['key' => 'assetDetails', 'text' => 'Gerät', 'modal' => false, 'table' => ['filter' => 'search', 'sortable' => true]],
+        ['key' => 'category', 'text' => 'Kategorie', 'modal' => false, 'table' => ['filter' => 'select', 'filterOptions' => []]],
         ['key' => 'currentUser', 'text' => 'Status', 'modal' => false, 'table' => ['sortable' => false, 'filter' => false]],
         ['key' => 'location', 'text' => 'Lagerort', 'required' => true, 'modal' => ['type' => 'text'], 'table' => ['filter' => 'search']],
         ['key' => 'serviceDueDate', 'text' => 'Service fällig', 'required' => false, 'modal' => ['type' => 'date'], 'table' => ['filter' => 'date']],
@@ -22,6 +23,15 @@ class AssetManagementController extends TTCrud
             $this->additionalJSVariables['ASSET_ADMIN'] = '0';
             $this->columns = array_filter($this->columns, fn($col) => $col['key'] !== 'actions');
         }
+
+        $categories = AssetManagementModel::getDistinctCategories();
+        $categoryOptions = array_map(fn($cat) => ['value' => $cat, 'text' => $cat], $categories);
+        foreach ($this->columns as &$column) {
+            if ($column['key'] === 'category') {
+                $column['table']['filterOptions'] = $categoryOptions;
+                break;
+            }
+        }
     }
 
     /**
@@ -282,6 +292,18 @@ class AssetManagementController extends TTCrud
         self::returnJson(['success' => true, 'message' => 'Reservierung gelöscht.']);
     }
 
+    protected function getCategoriesAction()
+    {
+        $searchTerm = $this->request->q ?? '';
+        $categories = AssetManagementModel::getDistinctCategories($searchTerm);
+
+        $result = array_map(function($category) {
+            return ['value' => $category, 'text' => $category];
+        }, $categories);
+
+        self::returnJson($result);
+    }
+
     protected function printLabelAction() {
         if (!$this->user->can('AssetAdmin')) {
             self::sendError("Permission denied", 403);
diff --git a/application/AssetManagement/AssetManagementModel.php b/application/AssetManagement/AssetManagementModel.php
index 9cef32f94..793e54f10 100644
--- a/application/AssetManagement/AssetManagementModel.php
+++ b/application/AssetManagement/AssetManagementModel.php
@@ -4,6 +4,7 @@ class AssetManagementModel extends TTCrudBaseModel {
     public int $id;
     public string $name;
     public ?string $description;
+    public ?string $category;
     public ?int $mainImageId; // Renamed from imageId
     public ?string $imageIds; // Changed to JSON (will be a string in PHP)
     public string $assetNumber;
@@ -35,8 +36,7 @@ class AssetManagementModel extends TTCrudBaseModel {
             foreach ($searchTerms as $term) {
                 if (empty(trim($term))) continue;
                 $escapedTerm = $db->real_escape_string($term);
-                // For each term, search in name, assetNumber, and description.
-                $searchConditions[] = "(`name` LIKE '%$escapedTerm%' OR `assetNumber` LIKE '%$escapedTerm%' OR `description` LIKE '%$escapedTerm%')";
+                $searchConditions[] = "(`name` LIKE '%$escapedTerm%' OR `assetNumber` LIKE '%$escapedTerm%' OR `description` LIKE '%$escapedTerm%' OR `category` LIKE '%$escapedTerm%')";
             }
 
             if (!empty($searchConditions)) {
@@ -99,8 +99,8 @@ class AssetManagementModel extends TTCrudBaseModel {
             foreach ($searchTerms as $term) {
                 if (empty(trim($term))) continue;
                 $escapedTerm = $db->real_escape_string($term);
-                // For each term, search in name, assetNumber, and description.
-                $searchConditions[] = "(`name` LIKE '%$escapedTerm%' OR `assetNumber` LIKE '%$escapedTerm%' OR `description` LIKE '%$escapedTerm%')";
+                // For each term, search in name, assetNumber, description, and category.
+                $searchConditions[] = "(`name` LIKE '%$escapedTerm%' OR `assetNumber` LIKE '%$escapedTerm%' OR `description` LIKE '%$escapedTerm%' OR `category` LIKE '%$escapedTerm%')";
             }
 
             if (!empty($searchConditions)) {
@@ -128,4 +128,26 @@ class AssetManagementModel extends TTCrudBaseModel {
 
         return $result->fetch_assoc()['count'];
     }
+
+    public static function getDistinctCategories(string $searchTerm = ''): array {
+        $db = self::getDB();
+        $table = self::getFullyQualifiedTable();
+
+        $sql = "SELECT DISTINCT `category` FROM $table WHERE `category` IS NOT NULL AND `category` != ''";
+
+        if (!empty($searchTerm)) {
+            $escapedTerm = $db->real_escape_string($searchTerm);
+            $sql .= " AND `category` LIKE '%$escapedTerm%'";
+        }
+
+        $sql .= " ORDER BY `category` ASC LIMIT 20";
+
+        $result = $db->query($sql);
+        $categories = [];
+        while ($row = $result->fetch_assoc()) {
+            $categories[] = $row['category'];
+        }
+
+        return $categories;
+    }
 }
\ No newline at end of file
diff --git a/db/migrations/20260119140000_asset_management_add_category.php b/db/migrations/20260119140000_asset_management_add_category.php
new file mode 100644
index 000000000..47dac3c34
--- /dev/null
+++ b/db/migrations/20260119140000_asset_management_add_category.php
@@ -0,0 +1,33 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class AssetManagementAddCategory extends AbstractMigration
+{
+    public function up(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            $table = $this->table("AssetManagement");
+            $table->addColumn('category', 'string', [
+                'limit' => 255,
+                'null' => true,
+                'default' => null,
+                'after' => 'description',
+                'comment' => 'Free text category for the asset with autocomplete support',
+            ]);
+            $table->addIndex(['category'], ['name' => 'idx_category']);
+            $table->update();
+        }
+    }
+
+    public function down(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            $table = $this->table("AssetManagement");
+            $table->removeIndex(['category']);
+            $table->removeColumn('category');
+            $table->update();
+        }
+    }
+}
diff --git a/public/js/pages/AssetManagement/AssetManagement.js b/public/js/pages/AssetManagement/AssetManagement.js
index a26bd81d1..64ab588d0 100644
--- a/public/js/pages/AssetManagement/AssetManagement.js
+++ b/public/js/pages/AssetManagement/AssetManagement.js
@@ -454,6 +454,14 @@ Vue.component('asset-management-modal', {
             <tt-input label="Gerätename" v-model="asset.name" sm required/>
             <tt-input label="Kennzeichen / Nr." v-model="asset.assetNumber" sm required/>
             <tt-input label="Lagerort" v-model="asset.location" sm required/>
+            <tt-autocomplete
+                label="Kategorie"
+                :api-url="categoryAutoCompleteUrl"
+                v-model="asset.category"
+                :return-text="true"
+                placeholder="Kategorie eingeben..."
+                sm
+            />
           </div>
         </div>
 
@@ -488,9 +496,11 @@ Vue.component('asset-management-modal', {
     `,
     data(){
         return {
+            categoryAutoCompleteUrl: window.TT_CONFIG.BASE_PATH + '/AssetManagement/getCategories',
             asset: {
                 name: '',
                 description: '',
+                category: '',
                 assetNumber: '',
                 location: 'Liftkammer',
                 serviceDueDate: null,

From 8252f812813c3c3af1b0b71360147a21ef9945b3 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Mon, 19 Jan 2026 14:16:57 +0000
Subject: [PATCH 54/88] Update WarehouseCategory.php

---
 application/WarehouseCategory/WarehouseCategory.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/WarehouseCategory/WarehouseCategory.php b/application/WarehouseCategory/WarehouseCategory.php
index 129b19f18..46aeec39a 100644
--- a/application/WarehouseCategory/WarehouseCategory.php
+++ b/application/WarehouseCategory/WarehouseCategory.php
@@ -5,7 +5,7 @@ class WarehouseCategory extends TTCrudBaseModel {
     public string $description;
     public ?string $articleNumberPrefix;
     public int $create;
-    public int $create_by;
+    public ?int $create_by;
     public ?int $edit;
     public ?int $edit_by;
-}
\ No newline at end of file
+}

From 4e4c5a9c18e22c2be1de5d481b69095e68a6b8c0 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Mon, 19 Jan 2026 16:29:22 +0100
Subject: [PATCH 55/88] Button to create Order from Preorder

---
 Layout/default/Order/Form.php                 |  15 +-
 Layout/default/Order/Index.php                |   1 +
 .../Preorder/include/preorder-detail.php      |  16 +-
 application/Order/OrderController.php         |  14 +-
 application/OrderProduct/OrderProduct.php     |   8 +-
 .../OrderProduct/OrderProductModel.php        |   9 ++
 application/Preorder/Preorder.php             |   8 +
 application/Preorder/PreorderController.php   | 151 ++++++++++++++++++
 application/Product/ProductModel.php          |  16 +-
 ...152525_order_product_add_preorder_data.php |  33 ++++
 10 files changed, 254 insertions(+), 17 deletions(-)
 create mode 100644 db/migrations/20260116152525_order_product_add_preorder_data.php

diff --git a/Layout/default/Order/Form.php b/Layout/default/Order/Form.php
index f09c3a82c..356b9747c 100644
--- a/Layout/default/Order/Form.php
+++ b/Layout/default/Order/Form.php
@@ -437,7 +437,7 @@
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="order_date">Bestelldatum</label>
                     <div class="col-lg-4">
-                      <input type="text" class="form-control" name="order_date" id="order_date" value="<?=($order->order_date) ? date("d.m.Y", $order->order_date) : ""?>" />
+                      <input type="text" class="form-control" name="order_date" id="order_date" value="<?=(is_numeric($order->order_date)) ? date("d.m.Y", $order->order_date) : $order->order_date ?>" />
                     </div>
                   </div>
                   <div class="form-group row">
@@ -553,7 +553,6 @@
                 </div>
               </div>
               
-              
               <div class="card">
                 <div class="card-body" id="products-form">
                   <h4>Produkte</h4>
@@ -585,6 +584,12 @@
                   <div class="row product-container" id="position-<?=$i?>">
                     <input type="hidden" name="products[<?=$i?>][delete]" id="products-<?=$i?>-delete" value="0" />
                     <input type="hidden" name="products[<?=$i?>][orderproduct_id]" value="<?=$product->id?>" />
+                    <?php if($product->preorder_id): ?>
+                      <input type="hidden" name="products[<?=$i?>][preorder_id]" value="<?=$product->preorder_id?>" />
+                    <?php endif; ?>
+                    <?php if($product->oaid): ?>
+                      <input type="hidden" name="products[<?=$i?>][oaid]" value="<?=$product->oaid?>" />
+                    <?php endif; ?>
                     <div class="col-md-1 product-<?=$i?>">
                       <div class="row">
                         <div class="col-md-12">
@@ -596,9 +601,11 @@
                         </div>
                       </div>
                       <div class="row">
-                        <div class="col-md-12 delete-button-container">
+                        <?php if(!$product->preorder_id): ?>
+                          <div class="col-md-12 delete-button-container">
                             <a href="#" class="btn btn-xl btn-outline-danger" onclick="toggleDeletePos(<?=$i?>); return false;"><i class="fas fa-fw fa-trash-can fa-xl pointer"></i></a>
-                        </div>
+                          </div>
+                        <?php endif; ?>
                         
                       </div>
                     </div>
diff --git a/Layout/default/Order/Index.php b/Layout/default/Order/Index.php
index 35974b831..07afc242f 100644
--- a/Layout/default/Order/Index.php
+++ b/Layout/default/Order/Index.php
@@ -290,6 +290,7 @@
                 <td onclick="toggleOrder(<?=$order->id?>)" class="text-monospace"><?=date("d.m.Y", $order->edit)?></td>
                 <td onclick="toggleOrder(<?=$order->id?>)" class="text-monospace"><?=$order->editor->name?></td>
                 <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
+                  <!--a href="<?=self::getUrl("Order", "createSnoppOrder", ["id" => $order->id, "filter" => $filter, "noTermProducts" => 1])?>" class="mr-2"><img src="<?=self::getResourcePath()?>img/snop-logo.png" /></a-->
                   <?php if($order->waiting == 1): ?>
                     <a href="<?=self::getUrl("Order", "setwaiting", ["id" => $order->id, "unset" => "1", "filter" => $filter, "s" => $pagination['start']])?>"><i class="fas fa-eye-slash" title="Einblenden"></i></a>
                   <?php else: ?>
diff --git a/Layout/default/Preorder/include/preorder-detail.php b/Layout/default/Preorder/include/preorder-detail.php
index 6329d86f8..f3edfdfd8 100644
--- a/Layout/default/Preorder/include/preorder-detail.php
+++ b/Layout/default/Preorder/include/preorder-detail.php
@@ -36,7 +36,9 @@
             <div class="card">
               <div class="card-body">
                 <div class="card-header bg-info text-white pl-2 pr-2 pt-1 pb-1">Details</div>
-                
+
+
+
                 <div class="row">
                   <div class="col-8">
                     <div class="loader-big hidden" ><img src="<?=self::getResourcePath()?>assets/images/loader-big.gif" /></div>
@@ -170,6 +172,18 @@
                       </tr>
 
                     </table>
+
+                      <div class="row mb-2">
+                          <div class="col-8">
+                            <?php if($preorder->orderproduct): ?>
+                                <a href="<?=self::getUrl("Order", "index", ["id" => $preorder->orderproduct->order_id])?>" target="_blank"><i class="far fa-fw fa-angle-double-right"></i> Internetbestellung anzeigen</a>
+                            <?php else: ?>
+                              <a href="<?=self::getUrl("Preorder","createOrderFromPreorder", ["preorder_id" => $preorder->id])?>" target="_blank" class="btn btn-outline-primary"><i class="far fa-fw fa-angle-double-right"></i> Internetbestellung anlegen</a>
+                            <?php endif; ?>
+                          </div>
+
+                      </div>
+
                   </div>
                   <div class="col-4">
                     
diff --git a/application/Order/OrderController.php b/application/Order/OrderController.php
index c8da669e9..993cb2274 100644
--- a/application/Order/OrderController.php
+++ b/application/Order/OrderController.php
@@ -359,7 +359,7 @@ class OrderController extends mfBaseController {
     return $new_filter;
   }
   
-  protected function addAction() {
+  public function addAction() {
     //var_dump($this->request->filter);exit;
     
     
@@ -393,9 +393,9 @@ class OrderController extends mfBaseController {
           $products[$pn->product_id] = $pn->product;
         }
       }
-      
+
     }
-    
+
     $order = $this->layout()->get("order");
     if($order) {
       foreach($order->products as $op) {
@@ -404,7 +404,7 @@ class OrderController extends mfBaseController {
         }
       }
     }
-    
+
     $this->layout()->set("products", $products);
     
     $countries = CountryModel::getAll();
@@ -969,6 +969,12 @@ class OrderController extends mfBaseController {
         }
         
         $product_data = [];
+        if(array_key_exists("preorder_id", $p) && $p["preorder_id"]) {
+            $product_data["preorder_id"] = $p["preorder_id"];
+        }
+        if(array_key_exists("oaid", $p) && $p["oaid"]) {
+          $product_data["oaid"] = $p["oaid"];
+        }
         $product_data["order_id"] = $new_id;
         $product_data["product_id"] = $p["product_id"];
         $product_data['amount'] = (!empty($p['amount'])) ? $p['amount'] : 1;
diff --git a/application/OrderProduct/OrderProduct.php b/application/OrderProduct/OrderProduct.php
index ea1cc5ec1..b8ad6a22b 100644
--- a/application/OrderProduct/OrderProduct.php
+++ b/application/OrderProduct/OrderProduct.php
@@ -48,11 +48,7 @@ class OrderProduct extends mfBaseModel {
   
   public function getProperty($name) {
     if($this->$name == null) {
-      
-      if(!$this->id) {
-        return null;
-      }
-      
+
       if($name == "cpeprovisioning") {
         $this->cpeprovisioning = CpeprovisioningModel::getFirst(["orderproduct_id" => $this->id]);
         return $this->cpeprovisioning;
@@ -128,7 +124,7 @@ class OrderProduct extends mfBaseModel {
         }
         return $this->editor;
       }
-      
+
       $classname = ucfirst($name);
       $idfield = $name."_id";
       $this->$name = mfValuecache::singleton()->get("mfObjectmodel-$name-".$this->$idfield);
diff --git a/application/OrderProduct/OrderProductModel.php b/application/OrderProduct/OrderProductModel.php
index e9ab464d6..5b417b684 100644
--- a/application/OrderProduct/OrderProductModel.php
+++ b/application/OrderProduct/OrderProductModel.php
@@ -5,6 +5,8 @@ class OrderProductModel
     public $order_id;
     public $product_id;
     public $termination_id;
+    public $oaid;
+    public $preorder_id;
     public $voicenumber;
     public $voiceplan_id;
     public $domain;
@@ -212,6 +214,13 @@ class OrderProductModel
             }
         }
 
+        if (array_key_exists("preorder_id", $filter)) {
+            $preorder_id = $filter['preorder_id'];
+            if (is_numeric($preorder_id)) {
+                $where .= " AND preorder_id=$preorder_id";
+            }
+        }
+
         if (array_key_exists("voicenumber", $filter)) {
             $voicenumber = FronkDB::singleton()->escape($filter['voicenumber']);
             if ($voicenumber) {
diff --git a/application/Preorder/Preorder.php b/application/Preorder/Preorder.php
index af01ffe27..b4d18c772 100644
--- a/application/Preorder/Preorder.php
+++ b/application/Preorder/Preorder.php
@@ -26,6 +26,7 @@ class Preorder extends mfBaseModel {
     private $statusjournals;
     private $cancel_request_status;
     private $cancel_request_creator;
+    private $orderproduct;
 
     protected function beforeUpdate($data) {
         if(!array_key_exists("edit_by", $data)) {
@@ -1690,6 +1691,13 @@ class Preorder extends mfBaseModel {
                 return $this->editor;
             }
 
+            if($name == "orderproduct") {
+                $op = OrderProductModel::getFirst(["preorder_id" => $this->id]);
+                if(!$op) return null;
+                $this->orderproduct = $op;
+                return $this->orderproduct;
+            }
+
             if($name == "creator") {
                 $user = mfValuecache::singleton()->get("Worker-id-" . $this->create_by);
                 if($user) {
diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index 2cd55e6ec..822ad3617 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -1048,6 +1048,157 @@ class PreorderController extends mfBaseController {
         $this->layout()->set("no_filename", false);
     }
 
+    protected function createOrderFromPreorderAction() {
+        $preorder_id = $this->request->preorder_id;
+
+        if(!is_numeric($preorder_id) || $preorder_id < 1) {
+            $this->layout()->setFlash("Vorbestellung nicht gefunden!", "error");
+            $this->redirect("Preorder", "Index");
+        }
+
+        $preorder = new Preorder($preorder_id);
+        if(!$preorder->id) {
+            $this->layout()->setFlash("Vorbestellung nicht gefunden!", "error");
+            $this->redirect("Preorder", "Index");
+        }
+
+        $order_data = [];
+        $order_data["preorder_id"] = $preorder->id;
+
+        $owner_data = [];
+        foreach(["company","uid","firstname","lastname","street","zip","city","phone","email"] as $field) {
+            if(!trim($preorder->$field)) {
+                $owner_data[$field] = "";
+            }
+            $owner_data[$field] = trim($preorder->$field);
+        }
+
+        // search owner in Address and add owner_id ...
+        $owner = false;
+        $owners = AddressModel::search($owner_data);
+        foreach($owners as $o) {
+            if(!$this->me->is("employee")) {
+                // external salespartners must not use addresses with customer_number
+                if($o->customer_number) continue;
+                // otherwise use with address
+                $owner = $o;
+            } else {
+                // every address can be used as fallback
+                $owner = $o;
+
+                // if we are employees, customers with customer_number and fibu_primary_account have precedence
+                // but still use addresses with only customer_number as fallback
+                if($o->customer_number) {
+                    $owner = $o;
+                    if($o->fibu_primary_account) {
+                        break;
+                    }
+                }
+            }
+        }
+
+        if($owner && $owner->id) {
+            $order_data["owner_id"] = $owner->id;
+            $order_data["owner"] = $owner;
+        } else {
+            // ... otherwise add owner data to order
+            foreach($owner_data as $field => $value) {
+                if(!$preorder->$field) continue;
+                $order_data["owner_".$field] = $value;
+            }
+            $order_data["new_owner"] = 1;
+        }
+
+        if($preorder->order_date) {
+            $order_data["order_date"] = $preorder->order_date;
+        } else {
+            $order_data["order_date"] = $preorder->create;
+        }
+
+        $operator = false;
+        $campaign = $preorder->campaign;
+        if(is_array($campaign->active_operators) && count($campaign->active_operators)) {
+            $campaign_operator = reset($campaign->active_operators);
+            $operator = $campaign_operator->operator;
+        }
+
+        if(!$operator) {
+            $this->layout()->setFlash("Kampagne hat keinen Netzbetreiber!", "error");
+            $this->redirect("Preorder", "Index", ["filter" => ["preordercampaign_id" => $campaign->id]], "preorder=$preorder_id");
+        }
+
+        // try product with correct network id
+        $product = ProductModel::getFirst(["external_id" => $operator->id, "network_id" => $campaign->network_id]);
+        if(!$product) {
+            // else use any product from operator
+            $product = ProductModel::getFirst(["external_id" => $operator->id, "productgroup_id" => TT_PRODUCTGROUP_ID_INTERNET_ACCESS_RESI, "active" => true]);
+        }
+        if($operator->id == 1) {
+            if(!$product) {
+                $product = ProductModel::getFirst([
+                    "external" => 0,
+                    "productgroup_id" => TT_PRODUCTGROUP_ID_INTERNET_ACCESS_RESI,
+                    "network_id" => $campaign->network_id,
+                    "attributename" => "termination_required",
+                    "attributevalue" => 0,
+                    "active" => true
+                ]);
+            }
+            if(!$product) {
+                $product = ProductModel::getFirst([
+                    "external" => 0,
+                    "productgroup_id" => TT_PRODUCTGROUP_ID_INTERNET_ACCESS_RESI,
+                    "name" => "%OAN%",
+                    "attributename" => "termination_required",
+                    "attributevalue" => 0,
+                    "active" => true
+                ]);
+            }
+        }
+        //var_dump($product);exit;
+        if(!$product) {
+            $this->layout()->setFlash("Keine Produkte für Netzbetreiber gefunden!", "error");
+            $this->redirect("Preorder", "Index", ["filter" => ["preordercampaign_id" => $campaign->id]], "preorder=$preorder_id");
+        }
+
+        $product_data = [];
+        $product_data["preorder_id"] = $preorder->id;
+        $product_data["oaid"] = $preorder->oaid;
+        $product_data["product_id"] = $product->id;
+        $product_data['amount'] = 1;
+        $product_data["pos"] = 1;
+        $product_data["description"] = "";
+        $product_data["price"] = trim($product->price) ? Layout::commaToDot(trim($product->price)) : 0;
+        $product_data["price_setup"] = trim($product->price_setup) ? Layout::commaToDot(trim($product->price_setup)) : 0;
+
+        $product_data["billing_delay"] = ($product->billing_delay) ? $product->billing_delay : 0;
+        if($product_data["billing_delay"] > 6) {
+            $product_data["billing_delay"] = 6;
+        }
+        $product_data["billing_period"] = $product->billing_period;
+        $product_data["contract_term"] = $product->contract_term;
+
+        if($this->me->is("Admin")) {
+            $product_data["price_nne"] = $product->price_nne;
+            $product_data["price_nbe"] = $product->price_nbe;
+        }
+
+        $order_data["products"] = [1 => OrderProductModel::create($product_data)];
+
+        //var_dump($order_data["products"]);exit;
+        $order = new Order();
+        $order->update($order_data);
+
+        //var_dump($owner_data);exit;
+
+        $oc = new OrderController();
+
+        $this->layout()->set("order", $order);
+        return $oc->addAction();
+
+
+    }
+
     protected function apiAction() {
         $do = $this->request->do;
         $data = [];
diff --git a/application/Product/ProductModel.php b/application/Product/ProductModel.php
index eafe20bd4..5cd22046c 100644
--- a/application/Product/ProductModel.php
+++ b/application/Product/ProductModel.php
@@ -105,6 +105,7 @@ class ProductModel {
       LEFT JOIN ProductAttribute ON (ProductAttribute.product_id = Product.id)
       LEFT JOIN Producttech ON (Product.producttech_id = Producttech.id)
       LEFT JOIN ProducttechAttribute ON (ProducttechAttribute.producttech_id = Producttech.id)
+      LEFT JOIN ProductNetwork ON (ProductNetwork.product_id = Product.id)
       WHERE $where
       GROUP BY Product.id
       ORDER BY Productgroup.name,Producttech.name,Product.name LIMIT 1
@@ -135,6 +136,7 @@ class ProductModel {
               LEFT JOIN ProductAttribute ON (ProductAttribute.product_id = Product.id)
               LEFT JOIN Producttech ON (Product.producttech_id = Producttech.id)
               LEFT JOIN ProducttechAttribute ON (ProducttechAttribute.producttech_id = Producttech.id)
+              LEFT JOIN ProductNetwork ON (ProductNetwork.product_id = Product.id)
               WHERE $where
               GROUP BY Product.id
             ) as p
@@ -160,6 +162,7 @@ class ProductModel {
       LEFT JOIN ProductAttribute ON (ProductAttribute.product_id = Product.id)
       LEFT JOIN Producttech ON (Product.producttech_id = Producttech.id)
       LEFT JOIN ProducttechAttribute ON (ProducttechAttribute.producttech_id = Producttech.id)
+      LEFT JOIN ProductNetwork ON (ProductNetwork.product_id = Product.id)
       WHERE $where
       GROUP BY Product.id
       ORDER BY Productgroup.name,Producttech.name,Product.name
@@ -169,7 +172,7 @@ class ProductModel {
     if(is_array($limit) && count($limit)) {
       if(is_numeric($limit['start']) && is_numeric($limit['count'])) {
         $sql .= " LIMIT ".$limit['start'].", ".$limit['count'];
-      } elseif(is_numeric($count)) {
+      } elseif(is_numeric($limit['count'])) {
         $sql .= " LIMIT ".$limit['count'];
       }
     }
@@ -232,6 +235,15 @@ class ProductModel {
         $where .= " AND Product.sla_id IN (". implode(",", $sla_id).")";
       }
     }
+
+    if(array_key_exists("network_id", $filter)) {
+      $network_id = $filter['network_id'];
+      if(is_numeric($network_id)) {
+        $where .= " AND ProductNetwork.network_id=$network_id";
+      } elseif(is_array($network_id) && count($network_id)) {
+        $where .= " AND ProductNetwork.network_id IN (". implode(",", $network_id).")";
+      }
+    }
     
     if(array_key_exists("name", $filter)) {
       $name = $db->escape($filter['name']);
@@ -284,7 +296,7 @@ class ProductModel {
     
     if(array_key_exists("attributevalue", $filter)) {
       $attributevalue = $db->escape($filter['attributevalue']);
-      if($attributevalue) {
+      if(strlen($attributevalue)) {
         $where .= " AND ProductAttribute.value = '$attributevalue'";
       }
     }
diff --git a/db/migrations/20260116152525_order_product_add_preorder_data.php b/db/migrations/20260116152525_order_product_add_preorder_data.php
new file mode 100644
index 000000000..60a97d35b
--- /dev/null
+++ b/db/migrations/20260116152525_order_product_add_preorder_data.php
@@ -0,0 +1,33 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class OrderProductAddPreorderData extends AbstractMigration
+{
+    public function up(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+		    $table = $this->table("OrderProduct");
+            $table->addColumn("oaid", "string", ["null" => true, "default" => null, "limit" => 255, "after" => "termination_id"]);
+            $table->addColumn("preorder_id", "integer", ["null" => true, "default" => null, "after" => "preorder_id"]);
+            $table->addColumn("snopp_order_id", "integer", ["null" => true, "default" => null, "after" => "oaid"]);
+            $table->update();
+        }
+        
+        if($this->getEnvironment() == "addressdb") {
+          
+        }
+    }
+
+    public function down(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+          
+        }
+        
+        if($this->getEnvironment() == "addressdb") {
+          
+        }
+    }
+}

From 6817563c5915614521e6e7b7b50d0242818949d1 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Mon, 19 Jan 2026 16:31:17 +0100
Subject: [PATCH 56/88] Fixed OrderProduct migration

---
 .../20260116152525_order_product_add_preorder_data.php        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/migrations/20260116152525_order_product_add_preorder_data.php b/db/migrations/20260116152525_order_product_add_preorder_data.php
index 60a97d35b..6afa39742 100644
--- a/db/migrations/20260116152525_order_product_add_preorder_data.php
+++ b/db/migrations/20260116152525_order_product_add_preorder_data.php
@@ -10,8 +10,8 @@ final class OrderProductAddPreorderData extends AbstractMigration
         if($this->getEnvironment() == "thetool") {
 		    $table = $this->table("OrderProduct");
             $table->addColumn("oaid", "string", ["null" => true, "default" => null, "limit" => 255, "after" => "termination_id"]);
-            $table->addColumn("preorder_id", "integer", ["null" => true, "default" => null, "after" => "preorder_id"]);
-            $table->addColumn("snopp_order_id", "integer", ["null" => true, "default" => null, "after" => "oaid"]);
+            $table->addColumn("preorder_id", "integer", ["null" => true, "default" => null, "after" => "oaid"]);
+            $table->addColumn("snopp_order_id", "integer", ["null" => true, "default" => null, "after" => "preorder_id"]);
             $table->update();
         }
         

From d6d213a8d3b9d67df4ab1bc8d103156af5432844 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Tue, 20 Jan 2026 13:27:35 +0100
Subject: [PATCH 57/88] add aha blatt parsing

---
 .../Workorder/Workorder/WorkorderHandler.php  |  48 +-----
 application/RimoWorkorder/RimoWorkorder.php   |  94 +++++++++++
 .../RimoWorkorder/RimoWorkorderController.php |  20 +++
 application/Workorder/WorkorderModel.php      |  59 +++++++
 .../WorkorderBase/WorkorderBaseController.php |  44 +----
 composer.json                                 |   3 +-
 ...260119170000_add_metadata_to_workorder.php |  30 ++++
 .../js/pages/WorkorderBase/WorkorderBase.js   |  98 +++++++----
 .../modules/workorder/WorkorderModule.js      | 156 +++++++++++++++---
 9 files changed, 412 insertions(+), 140 deletions(-)
 create mode 100644 db/migrations/20260119170000_add_metadata_to_workorder.php

diff --git a/application/MobileApp/Modules/Workorder/Workorder/WorkorderHandler.php b/application/MobileApp/Modules/Workorder/Workorder/WorkorderHandler.php
index 4a556bf79..574b2d060 100644
--- a/application/MobileApp/Modules/Workorder/Workorder/WorkorderHandler.php
+++ b/application/MobileApp/Modules/Workorder/Workorder/WorkorderHandler.php
@@ -244,7 +244,8 @@ class WorkorderHandler extends MobileAppBaseHandler {
 
         $technicalData = null;
         if ($tenantConfigData && !empty($tenantConfigData['showTechnicalData'])) {
-            $technicalData = $this->getTechnicalData($id);
+            RimoWorkorder::autoParseForWorkorder($id);
+            $technicalData = WorkorderModel::getTechnicalData($id);
         }
 
         self::returnJson([
@@ -900,51 +901,6 @@ class WorkorderHandler extends MobileAppBaseHandler {
         return true;
     }
 
-    /**
-     * Get technical data (patchposition and AHA Blatt) for a workorder
-     */
-    private function getTechnicalData($workorderId) {
-        $workorder = WorkorderModel::get($workorderId);
-        if (!$workorder || !$workorder->preorderId) return null;
-
-        $preorder = new Preorder($workorder->preorderId);
-        if (!$preorder->id || !$preorder->adb_wohneinheit_id) return null;
-
-        $wohneinheit = $preorder->adb_wohneinheit;
-        if (!$wohneinheit) return null;
-
-        $defaultCluster = '';
-        if ($preorder->adb_hausnummer && $preorder->adb_hausnummer->netzgebiet) {
-            $defaultCluster = $preorder->adb_hausnummer->netzgebiet->extref ?? '';
-        }
-
-        $patchposition = [
-            'equipmentName' => $wohneinheit->getPatchEqString(),
-            'equipmentPort' => $wohneinheit->patch_port,
-            'cluster' => $wohneinheit->patch_cluster ?: $defaultCluster,
-            'shelf' => $wohneinheit->patch_shelf,
-            'module' => $wohneinheit->patch_module,
-        ];
-
-        $rimoWorkorders = [];
-        if (is_array($wohneinheit->rimo_workorders) && count($wohneinheit->rimo_workorders)) {
-            foreach ($wohneinheit->rimo_workorders as $wo) {
-                $rimoWorkorders[] = [
-                    'id' => $wo->id,
-                    'rimoName' => $wo->rimo_name,
-                    'rimoId' => $wo->rimo_id,
-                    'rimoStatus' => $wo->rimo_status,
-                    'downloadUrl' => "/RimoWorkorder/downloadAha?id=" . $wo->id,
-                ];
-            }
-        }
-
-        return [
-            'patchposition' => $patchposition,
-            'rimoWorkorders' => $rimoWorkorders,
-        ];
-    }
-
     /**
      * Get single workorder with full joined data (same structure as getCompanyWorkorders)
      */
diff --git a/application/RimoWorkorder/RimoWorkorder.php b/application/RimoWorkorder/RimoWorkorder.php
index 31dcb8994..5c9eb0767 100644
--- a/application/RimoWorkorder/RimoWorkorder.php
+++ b/application/RimoWorkorder/RimoWorkorder.php
@@ -1,5 +1,7 @@
 <?php
 
+use Smalot\PdfParser\Parser;
+
 class RimoWorkorder extends mfBaseModel {
   private $adb_wohneinheit;
   private $termination;
@@ -56,6 +58,98 @@ class RimoWorkorder extends mfBaseModel {
 
         return $ah;
     }
+
+    public function parseAha(): array {
+        if (!$this->id || !$this->adb_wohneinheit_id) return ['success' => false, 'message' => 'Missing ID'];
+        $preorder = PreorderModel::getFirstActive(["adb_wohneinheit_id" => $this->adb_wohneinheit_id]);
+        if (!$preorder?->id) return ['success' => false, 'message' => 'No active Preorder'];
+        $workorder = WorkorderModel::getFirst(['preorderId' => $preorder->id]);
+        if (!$workorder || !($pdf = $this->getAha())) return ['success' => false, 'message' => 'No Workorder or PDF'];
+
+        try {
+            $dropkabel = $this->parseDropkabelFromPdf($pdf);
+            $map = $this->extractMapFromPdf($pdf);
+            $meta = json_decode($workorder->metadata ?: '{}', true) ?: [];
+            $mapFileId = null;
+
+            if ($map) {
+                if ($oldId = ($meta['dropcable']['map_file_id'] ?? null)) {
+                    $old = new File($oldId); if ($old->id) try { $old->delete(); } catch (Exception $e) {}
+                }
+                $fn = 'aha_lageplan_' . $this->id . '_' . time() . '.png';
+                $file = FileModel::create(['name' => 'AHA Lageplan ' . $this->rimo_name, 'filename' => $fn,
+                    'store_filename' => $fn, 'orig_filename' => 'AHA_Lageplan_' . $this->rimo_name . '.png',
+                    'mimetype' => 'image/png', 'subfolder' => 'aha_maps']);
+                if ($file->save()) {
+                    $dir = MFUPLOAD_FILE_SAVE_PATH . '/aha_maps';
+                    if (!is_dir($dir)) mkdir($dir, 0755, true);
+                    if (file_put_contents("$dir/$fn", $map)) $mapFileId = $file->id;
+                }
+            }
+            $meta['dropcable'] = ['rimo_workorder_id' => $this->id, 'rimo_name' => $this->rimo_name,
+                'parsed_at' => time(), 'entries' => $dropkabel, 'map_file_id' => $mapFileId];
+            $workorder->metadata = json_encode($meta);
+            WorkorderModel::update((array)$workorder);
+            return ['success' => true, 'dropkabel_count' => count($dropkabel), 'has_map' => (bool)$mapFileId];
+        } catch (Exception $e) {
+            $this->log->error(__METHOD__ . ": " . $e->getMessage());
+            return ['success' => false, 'message' => $e->getMessage()];
+        }
+    }
+
+    public static function autoParseForWorkorder(int $workorderId): void {
+        $wo = WorkorderModel::get($workorderId);
+        if (!$wo) return;
+        $meta = json_decode($wo->metadata ?? '{}', true);
+        if (empty($meta['dropcable']['parsed_at']) && $wo->preorderId) {
+            $pre = new Preorder($wo->preorderId);
+            $rimos = $pre->adb_wohneinheit_id ? RimoWorkorderModel::search(['adb_wohneinheit_id' => $pre->adb_wohneinheit_id]) : [];
+            if (!empty($rimos[0])) (new self($rimos[0]->id))->parseAha();
+        }
+    }
+
+    private function parseDropkabelFromPdf(string $pdf): array {
+        $result = [];
+        $text = (new Parser())->parseContent($pdf)->getPages()[0]?->getText() ?? '';
+        if (!preg_match('/Dropkabel:\s*\n(.+?)(?:Lage:|$)/s', $text, $m)) return $result;
+        $started = false;
+        foreach (explode("\n", $m[1]) as $line) {
+            $line = trim($line);
+            if (!$line) continue;
+            if (stripos($line, 'ID') !== false && stripos($line, 'Type') !== false) { $started = true; continue; }
+            if ($started && preg_match('/^(F-[A-Z0-9\(\)-]+K\d+)\s+(.+)$/i', $line, $p)) {
+                $rest = $p[2]; $status = '';
+                foreach (['Planfreigabe', 'Plan released', 'Grobplanung', 'Executed', 'Ausgeführt'] as $s)
+                    if (preg_match('/\b' . preg_quote($s, '/') . '\s*$/i', $rest)) {
+                        $status = $s; $rest = trim(preg_replace('/\b' . preg_quote($s, '/') . '\s*$/i', '', $rest)); break;
+                    }
+                $lp = $li = '';
+                if (preg_match_all('/(\d+)\s*m\b/', $rest, $lens, PREG_SET_ORDER)) {
+                    $lp = ($lens[0][1] ?? '') . ' m'; $li = ($lens[1][1] ?? '') . ' m';
+                    $rest = preg_replace('/\d+\s*m\b/', '', $rest);
+                }
+                $result[] = ['cable_id' => trim($p[1]), 'type' => trim(preg_replace('/\s+/', ' ', $rest)),
+                    'laenge_plan' => $lp, 'laenge_ist' => $li, 'status' => $status];
+            }
+        }
+        return $result;
+    }
+
+    private function extractMapFromPdf(string $pdf): ?string {
+        $tmp = tempnam(sys_get_temp_dir(), 'aha_'); file_put_contents($tmp, $pdf);
+        $out = tempnam(sys_get_temp_dir(), 'aha_img_'); unlink($out);
+        exec(sprintf('pdftoppm -png -f 1 -l 1 -r 150 %s %s 2>&1', escapeshellarg($tmp), escapeshellarg($out)), $_, $ret);
+        @unlink($tmp);
+        $outFile = file_exists("$out-1.png") ? "$out-1.png" : "$out.png";
+        if ($ret !== 0 || !file_exists($outFile)) return null;
+        $img = @imagecreatefromstring(file_get_contents($outFile)); @unlink($outFile);
+        if (!$img) return null;
+        $h = imagesy($img); $cropY = (int)($h * 0.42); $cropH = (int)($h * 0.84) - $cropY;
+        $cropped = imagecrop($img, ['x' => 60, 'y' => $cropY, 'width' => imagesx($img) - 90, 'height' => $cropH]);
+        imagedestroy($img); if (!$cropped) return null;
+        ob_start(); imagepng($cropped, null, 6); $content = ob_get_clean(); imagedestroy($cropped);
+        return $content;
+    }
   
   public function getProperty($name) {
     if($this->$name == null) {
diff --git a/application/RimoWorkorder/RimoWorkorderController.php b/application/RimoWorkorder/RimoWorkorderController.php
index 7f330599e..5fd097a28 100644
--- a/application/RimoWorkorder/RimoWorkorderController.php
+++ b/application/RimoWorkorder/RimoWorkorderController.php
@@ -44,4 +44,24 @@ class RimoWorkorderController extends mfBaseController {
         exit;
     }
 
+    protected function parseAhaAction() {
+        header('Content-Type: application/json');
+        $post = json_decode(file_get_contents('php://input'), true);
+        $id = $post['id'] ?? $this->request->id ?? null;
+
+        if (!$id || $id < 1) {
+            echo json_encode(['success' => false, 'message' => 'Invalid workorder id.']);
+            exit;
+        }
+
+        $wo = new RimoWorkorder($id);
+        if (!$wo->id) {
+            echo json_encode(['success' => false, 'message' => 'RimoWorkorder nicht gefunden.']);
+            exit;
+        }
+
+        echo json_encode($wo->parseAha());
+        exit;
+    }
+
 }
\ No newline at end of file
diff --git a/application/Workorder/WorkorderModel.php b/application/Workorder/WorkorderModel.php
index b5762a147..680e51244 100644
--- a/application/Workorder/WorkorderModel.php
+++ b/application/Workorder/WorkorderModel.php
@@ -16,6 +16,7 @@ class WorkorderModel extends TTCrudBaseModel
     public ?string $additionalInfo;
     public ?string $cableLength;
     public ?string $cableType;
+    public ?string $metadata;
     public int $create;
     public int $createBy;
 
@@ -199,4 +200,62 @@ class WorkorderModel extends TTCrudBaseModel
         $result = $db->query($sql);
         return $result ? $result->fetch_assoc()['count'] : 0;
     }
+
+    public static function getTechnicalData(int $workorderId): ?array {
+        $workorder = self::get($workorderId);
+        if (!$workorder || !$workorder->preorderId) return null;
+
+        $preorder = new Preorder($workorder->preorderId);
+        if (!$preorder->id || !$preorder->adb_wohneinheit_id) return null;
+
+        $wohneinheit = $preorder->adb_wohneinheit;
+        if (!$wohneinheit) return null;
+
+        $defaultCluster = '';
+        if ($preorder->adb_hausnummer && $preorder->adb_hausnummer->netzgebiet) {
+            $defaultCluster = $preorder->adb_hausnummer->netzgebiet->extref ?? '';
+        }
+
+        $patchposition = [
+            'equipmentName' => $wohneinheit->getPatchEqString(),
+            'equipmentPort' => $wohneinheit->patch_port,
+            'cluster' => $wohneinheit->patch_cluster ?: $defaultCluster,
+            'shelf' => $wohneinheit->patch_shelf,
+            'module' => $wohneinheit->patch_module,
+        ];
+
+        // Get dropcable data from metadata
+        $dropkabelData = [];
+        $ahaParsed = null;
+        $mapFile = null;
+        if (!empty($workorder->metadata)) {
+            $metadata = json_decode($workorder->metadata, true);
+            if (!empty($metadata['dropcable'])) {
+                $ahaParsed = $metadata['dropcable']['parsed_at'] ?? null;
+                $dropkabelData = $metadata['dropcable']['entries'] ?? [];
+                if ($mapFileId = $metadata['dropcable']['map_file_id'] ?? null) {
+                    $file = new File($mapFileId);
+                    if ($file->id) {
+                        $mapFile = ['id' => $file->id, 'name' => $file->name, 'download_url' => '/File/show?id=' . $file->id];
+                    }
+                }
+            }
+        }
+
+        $rimoWorkorders = [];
+        if (is_array($wohneinheit->rimo_workorders) && count($wohneinheit->rimo_workorders)) {
+            foreach ($wohneinheit->rimo_workorders as $wo) {
+                $rimoWorkorders[] = [
+                    'id' => $wo->id, 'rimoName' => $wo->rimo_name, 'rimoId' => $wo->rimo_id,
+                    'rimoStatus' => $wo->rimo_status, 'downloadUrl' => "/RimoWorkorder/downloadAha?id=" . $wo->id,
+                ];
+            }
+        }
+
+        return [
+            'patchposition' => $patchposition,
+            'rimoWorkorders' => $rimoWorkorders,
+            'dropcable' => ['parsed_at' => $ahaParsed, 'entries' => $dropkabelData, 'map_file' => $mapFile],
+        ];
+    }
 }
\ No newline at end of file
diff --git a/application/WorkorderBase/WorkorderBaseController.php b/application/WorkorderBase/WorkorderBaseController.php
index f8a9c759e..68e2066d0 100644
--- a/application/WorkorderBase/WorkorderBaseController.php
+++ b/application/WorkorderBase/WorkorderBaseController.php
@@ -60,6 +60,10 @@ class WorkorderBaseController extends TTCrud
             $translationMap = array_merge(['civil_engineering_photo' => 'Tiefbau_Foto'], $customMap);
         }
 
+        // Auto-parse AHA if enabled and not yet parsed
+        if ($tenantConfig?->showTechnicalData) {
+            RimoWorkorder::autoParseForWorkorder((int)$this->request->workorderId);
+        }
 
         $responseDocs = [];
         $typeCounts = [];
@@ -145,45 +149,7 @@ class WorkorderBaseController extends TTCrud
      * Retrieves technical data (patchposition and AHA Blatt info) for a workorder.
      */
     protected function getTechnicalData(int $workorderId): ?array {
-        $workorder = WorkorderModel::get($workorderId);
-        if (!$workorder || !$workorder->preorderId) return null;
-
-        $preorder = new Preorder($workorder->preorderId);
-        if (!$preorder->id || !$preorder->adb_wohneinheit_id) return null;
-
-        $wohneinheit = $preorder->adb_wohneinheit;
-        if (!$wohneinheit) return null;
-
-        $defaultCluster = '';
-        if ($preorder->adb_hausnummer && $preorder->adb_hausnummer->netzgebiet) {
-            $defaultCluster = $preorder->adb_hausnummer->netzgebiet->extref ?? '';
-        }
-
-        $patchposition = [
-            'equipmentName' => $wohneinheit->getPatchEqString(),
-            'equipmentPort' => $wohneinheit->patch_port,
-            'cluster' => $wohneinheit->patch_cluster ?: $defaultCluster,
-            'shelf' => $wohneinheit->patch_shelf,
-            'module' => $wohneinheit->patch_module,
-        ];
-
-        $rimoWorkorders = [];
-        if (is_array($wohneinheit->rimo_workorders) && count($wohneinheit->rimo_workorders)) {
-            foreach ($wohneinheit->rimo_workorders as $wo) {
-                $rimoWorkorders[] = [
-                    'id' => $wo->id,
-                    'rimoName' => $wo->rimo_name,
-                    'rimoId' => $wo->rimo_id,
-                    'rimoStatus' => $wo->rimo_status,
-                    'downloadUrl' => "/RimoWorkorder/downloadAha?id=" . $wo->id,
-                ];
-            }
-        }
-
-        return [
-            'patchposition' => $patchposition,
-            'rimoWorkorders' => $rimoWorkorders,
-        ];
+        return WorkorderModel::getTechnicalData($workorderId);
     }
 
     //region BACKGROUND TASKS
diff --git a/composer.json b/composer.json
index 151670a4a..f4603b66e 100644
--- a/composer.json
+++ b/composer.json
@@ -10,6 +10,7 @@
         "stomp-php/stomp-php": "^5",
         "phpmailer/phpmailer": "^6.9",
         "pear2/net_routeros": "dev-develop@dev",
-        "matthiasmullie/minify": "^1.3"
+        "matthiasmullie/minify": "^1.3",
+        "smalot/pdfparser": "^2.0"
     }
 }
diff --git a/db/migrations/20260119170000_add_metadata_to_workorder.php b/db/migrations/20260119170000_add_metadata_to_workorder.php
new file mode 100644
index 000000000..a24126bef
--- /dev/null
+++ b/db/migrations/20260119170000_add_metadata_to_workorder.php
@@ -0,0 +1,30 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class AddMetadataToWorkorder extends AbstractMigration
+{
+    public function up(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            $table = $this->table("Workorder");
+            $table
+                ->addColumn("metadata", "json", [
+                    'null' => true,
+                    'default' => null,
+                    'after' => 'cableType'
+                ])
+                ->update();
+        }
+    }
+
+    public function down(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            $this->table("Workorder")
+                ->removeColumn("metadata")
+                ->save();
+        }
+    }
+}
diff --git a/public/js/pages/WorkorderBase/WorkorderBase.js b/public/js/pages/WorkorderBase/WorkorderBase.js
index 0b7d2c244..9a4f914c5 100644
--- a/public/js/pages/WorkorderBase/WorkorderBase.js
+++ b/public/js/pages/WorkorderBase/WorkorderBase.js
@@ -275,38 +275,59 @@ Vue.component('workorder-details-manager', {
             </div>
 
             <div v-if="showTechnicalData && technicalData && (technicalData.patchposition?.equipmentName || technicalData.rimoWorkorders?.length)" class="card mb-3">
-              <div class="card-header bg-purple text-white">
-                <h5 class="mb-0"><i class="fas fa-microchip mr-2"></i>Technische Daten</h5>
+              <div class="card-header bg-purple text-white d-flex justify-content-between align-items-center py-2">
+                <span><i class="fas fa-microchip mr-2"></i>Technische Daten</span>
+                <small v-if="technicalData.dropcable?.parsed_at" class="opacity-75">
+                  <i class="fas fa-check mr-1"></i>{{ formatDate(technicalData.dropcable.parsed_at) }}
+                </small>
               </div>
-              <div class="card-body">
-                <div class="row">
-                  <div class="col-md-6" v-if="technicalData.patchposition?.equipmentName">
-                    <h6>Patchposition</h6>
-                    <table class="table table-sm table-striped mb-0">
-                      <tr>
-                        <th class="border-top-0">Equipment Name:</th>
-                        <td class="border-top-0 text-monospace">{{ technicalData.patchposition.equipmentName }}</td>
-                      </tr>
-                      <tr v-if="technicalData.patchposition.equipmentPort">
-                        <th>Equipment Port:</th>
-                        <td class="text-monospace">{{ technicalData.patchposition.equipmentPort }}</td>
-                      </tr>
-                    </table>
-                  </div>
-                  <div class="col-md-6" v-if="technicalData.rimoWorkorders?.length">
-                    <h6>AHA Blätter</h6>
-                    <div v-for="wo in technicalData.rimoWorkorders" :key="wo.id" class="mb-2">
-                      <div class="d-flex align-items-center justify-content-between border rounded p-2">
-                        <div>
-                          <strong>{{ wo.rimoName }}</strong>
-                          <small class="text-muted ml-2">{{ wo.rimoStatus }}</small>
-                        </div>
-                        <a :href="wo.downloadUrl" target="_blank" class="btn btn-sm btn-outline-primary">
-                          <i class="fas fa-file-pdf mr-1"></i> AHA Blatt
-                        </a>
+              <div class="card-body py-2">
+                <div class="row small">
+                  <div class="col-md-6 mb-2" v-if="technicalData.patchposition?.equipmentName">
+                    <div class="d-flex">
+                      <span class="text-muted mr-2"><i class="fas fa-ethernet"></i></span>
+                      <div>
+                        <span class="text-monospace font-weight-bold">{{ technicalData.patchposition.equipmentName }}</span>
+                        <span v-if="technicalData.patchposition.equipmentPort" class="text-muted ml-1">Port {{ technicalData.patchposition.equipmentPort }}</span>
                       </div>
                     </div>
                   </div>
+                  <div class="col-md-6 mb-2" v-if="technicalData.rimoWorkorders?.length">
+                    <div v-for="wo in technicalData.rimoWorkorders" :key="wo.id" class="d-flex align-items-center justify-content-between">
+                      <div class="d-flex align-items-center">
+                        <span class="text-muted mr-2"><i class="fas fa-file-alt"></i></span>
+                        <span class="font-weight-bold">{{ wo.rimoName }}</span>
+                        <span class="badge badge-light ml-2">{{ wo.rimoStatus }}</span>
+                      </div>
+                      <div class="btn-group btn-group-sm">
+                        <a :href="wo.downloadUrl" target="_blank" class="btn btn-outline-secondary" title="AHA PDF"><i class="fas fa-file-pdf"></i></a>
+                        <button @click="parseAha(wo)" class="btn btn-outline-secondary" :disabled="parsingAhaId === wo.id" :title="technicalData.dropcable?.parsed_at ? 'Aktualisieren' : 'Daten laden'">
+                          <i :class="parsingAhaId === wo.id ? 'fas fa-spinner fa-spin' : 'fas fa-sync-alt'"></i>
+                        </button>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div v-if="technicalData.dropcable?.entries?.length" class="mt-2">
+                  <table class="table table-sm table-bordered mb-0 small">
+                    <thead class="thead-light">
+                      <tr><th>Kabel-ID</th><th>Typ</th><th class="text-center">PLAN</th><th class="text-center">IST</th><th>Status</th></tr>
+                    </thead>
+                    <tbody>
+                      <tr v-for="(dk, idx) in technicalData.dropcable.entries" :key="idx">
+                        <td class="text-monospace">{{ dk.cable_id }}</td>
+                        <td class="text-truncate" style="max-width:200px" :title="dk.type">{{ dk.type }}</td>
+                        <td class="text-center">{{ dk.laenge_plan || '-' }}</td>
+                        <td class="text-center">{{ dk.laenge_ist || '-' }}</td>
+                        <td><span class="badge" :class="dk.status === 'Planfreigabe' ? 'badge-success' : 'badge-secondary'">{{ dk.status || '-' }}</span></td>
+                      </tr>
+                    </tbody>
+                  </table>
+                </div>
+                <div v-if="technicalData.dropcable?.map_file" class="mt-2 text-center">
+                  <a :href="technicalData.dropcable.map_file.download_url" target="_blank" class="d-block">
+                    <img :src="technicalData.dropcable.map_file.download_url" class="img-fluid border rounded shadow-sm" style="max-height:300px;cursor:zoom-in" :alt="'Lageplan'" @error="$event.target.parentElement.style.display='none'">
+                  </a>
                 </div>
               </div>
             </div>
@@ -368,6 +389,7 @@ Vue.component('workorder-details-manager', {
         // Technical data
         showTechnicalData: false,
         technicalData: null,
+        parsingAhaId: null,
         // Admin state
         selectedDocs: [], correctionText: '', correctionLoading: false, showAcceptModal: false, showRevertModal: false,
     }),
@@ -417,6 +439,8 @@ Vue.component('workorder-details-manager', {
                 // FIX: Ensure docs and journals are always arrays
                 this.docs = docsJournalsRes.data.docs || [];
                 this.journals = docsJournalsRes.data.journals || [];
+                // Reload tenant config to get updated technical data (AHA may have been auto-parsed)
+                if (this.showTechnicalData) this.loadTenantConfig();
             } catch (e) {
                 window.notify('error', 'Details konnten nicht geladen werden.');
                 this.docs = []; // Ensure it's an array on error
@@ -576,6 +600,24 @@ Vue.component('workorder-details-manager', {
             this.showAcceptModal = false;
         },
         getInterventionLabel(type) { return this.interventionTypes.find(t => t.value === type)?.text || type; },
+        async parseAha(wo) {
+            this.parsingAhaId = wo.id;
+            try {
+                const { data } = await axios.post(`${window.TT_CONFIG.BASE_PATH}/RimoWorkorder/parseAha`, { id: wo.id });
+                if (data.success) {
+                    window.notify('success', `AHA-Daten geladen: ${data.dropkabel_count} Dropkabel${data.has_map ? ', Lageplan vorhanden' : ''}`);
+                    // Reload technical data to show the parsed data
+                    await this.loadTenantConfig();
+                } else {
+                    window.notify('error', data.message || 'Fehler beim Laden der AHA-Daten');
+                }
+            } catch (e) {
+                window.notify('error', 'Netzwerkfehler beim Laden der AHA-Daten');
+                console.error(e);
+            } finally {
+                this.parsingAhaId = null;
+            }
+        },
         async revertDocumentedStatus() {
             // Optional: Add loading state if needed
             try {
diff --git a/public/mobile/modules/workorder/WorkorderModule.js b/public/mobile/modules/workorder/WorkorderModule.js
index c760aca46..32c0cf0f5 100644
--- a/public/mobile/modules/workorder/WorkorderModule.js
+++ b/public/mobile/modules/workorder/WorkorderModule.js
@@ -57,6 +57,8 @@ export default {
         const showPdfViewer = ref(false);
         const pdfViewerUrl = ref('');
         const pdfViewerTitle = ref('');
+        const showImageViewer = ref(false);
+        const imageViewerUrl = ref('');
 
         // Upload state
         const uploadDocType = ref('');
@@ -631,6 +633,16 @@ export default {
             showPdfViewer.value = true;
         };
 
+        // Open image in fullscreen viewer with zoom
+        const openImageViewer = (url) => {
+            imageViewerUrl.value = url;
+            showImageViewer.value = true;
+        };
+        const closeImageViewer = () => {
+            showImageViewer.value = false;
+            imageViewerUrl.value = '';
+        };
+
         // Initialize
         onMounted(() => {
             fetchWorkorders();
@@ -697,6 +709,10 @@ export default {
             callCustomer,
             handleComplete,
             openPdfViewer,
+            openImageViewer,
+            closeImageViewer,
+            showImageViewer,
+            imageViewerUrl,
             handleTouchStart,
             handleTouchMove,
             handleTouchEnd,
@@ -945,38 +961,95 @@ export default {
                                 </svg>
                             </button>
                             <div v-if="expandedCards.technical" class="px-4 pb-4 space-y-3">
-                                <!-- Patchposition -->
-                                <div v-if="technicalData.patchposition?.equipmentName" class="space-y-2">
-                                    <div class="text-sm font-medium text-slate-500 dark:text-slate-400">Patchposition</div>
-                                    <div class="bg-slate-50 dark:bg-slate-700/50 rounded-lg p-3 space-y-1">
-                                        <div class="flex justify-between">
-                                            <span class="text-slate-500 dark:text-slate-400 text-sm">Equipment Name:</span>
-                                            <span class="font-mono text-slate-900 dark:text-white">{{ technicalData.patchposition.equipmentName }}</span>
-                                        </div>
-                                        <div v-if="technicalData.patchposition.equipmentPort" class="flex justify-between">
-                                            <span class="text-slate-500 dark:text-slate-400 text-sm">Equipment Port:</span>
-                                            <span class="font-mono text-slate-900 dark:text-white">{{ technicalData.patchposition.equipmentPort }}</span>
+                                <!-- 1. Patchposition -->
+                                <div v-if="technicalData.patchposition?.equipmentName" class="bg-slate-50 dark:bg-slate-700/50 rounded-xl p-3">
+                                    <div class="flex items-center gap-2 mb-2">
+                                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-purple-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 10V3L4 14h7v7l9-11h-7z"/>
+                                        </svg>
+                                        <span class="text-xs font-semibold text-purple-600 dark:text-purple-400 uppercase tracking-wide">Patchposition</span>
+                                    </div>
+                                    <div class="flex flex-wrap gap-x-4 gap-y-1">
+                                        <div class="text-xs"><span class="text-slate-400">Equipment:</span> <span class="font-mono font-semibold text-slate-800 dark:text-white">{{ technicalData.patchposition.equipmentName }}</span></div>
+                                        <div v-if="technicalData.patchposition.equipmentPort" class="text-xs"><span class="text-slate-400">Port:</span> <span class="font-mono font-semibold text-slate-800 dark:text-white">{{ technicalData.patchposition.equipmentPort }}</span></div>
+                                    </div>
+                                    <div v-if="technicalData.patchposition.cluster || technicalData.patchposition.shelf || technicalData.patchposition.module" class="flex flex-wrap gap-x-4 gap-y-1 mt-2 pt-2 border-t border-slate-200 dark:border-slate-600">
+                                        <div v-if="technicalData.patchposition.cluster" class="text-xs"><span class="text-slate-400">Cluster:</span> <span class="font-medium text-slate-700 dark:text-slate-300">{{ technicalData.patchposition.cluster }}</span></div>
+                                        <div v-if="technicalData.patchposition.shelf" class="text-xs"><span class="text-slate-400">Shelf:</span> <span class="font-medium text-slate-700 dark:text-slate-300">{{ technicalData.patchposition.shelf }}</span></div>
+                                        <div v-if="technicalData.patchposition.module" class="text-xs"><span class="text-slate-400">Module:</span> <span class="font-medium text-slate-700 dark:text-slate-300">{{ technicalData.patchposition.module }}</span></div>
+                                    </div>
+                                </div>
+
+                                <!-- 2. Dropkabel -->
+                                <div v-if="technicalData.dropcable?.entries?.length" class="bg-slate-50 dark:bg-slate-700/50 rounded-xl p-3">
+                                    <div class="flex items-center gap-2 mb-2">
+                                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-sky-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 10V3L4 14h7v7l9-11h-7z"/>
+                                        </svg>
+                                        <span class="text-xs font-semibold text-sky-600 dark:text-sky-400 uppercase tracking-wide">Dropkabel</span>
+                                        <span class="ml-auto text-[10px] bg-sky-100 dark:bg-sky-900/40 text-sky-600 dark:text-sky-400 px-1.5 py-0.5 rounded-full font-medium">{{ technicalData.dropcable.entries.length }}</span>
+                                    </div>
+                                    <div class="divide-y divide-slate-200 dark:divide-slate-600">
+                                        <div v-for="(dk, idx) in technicalData.dropcable.entries" :key="idx" class="py-2 first:pt-0 last:pb-0">
+                                            <div class="flex items-center justify-between gap-2 mb-1">
+                                                <span class="font-mono text-xs font-semibold text-slate-800 dark:text-white">{{ dk.cable_id }}</span>
+                                                <span class="px-1.5 py-0.5 rounded text-[10px] font-medium"
+                                                      :class="dk.status === 'Planfreigabe' || dk.status === 'Plan released' ? 'bg-green-100 text-green-700 dark:bg-green-900/40 dark:text-green-400' : dk.status === 'Executed' || dk.status === 'Ausgeführt' ? 'bg-blue-100 text-blue-700 dark:bg-blue-900/40 dark:text-blue-400' : 'bg-slate-200 text-slate-600 dark:bg-slate-600 dark:text-slate-300'">{{ dk.status || '-' }}</span>
+                                            </div>
+                                            <div class="flex flex-wrap gap-x-4 gap-y-1 text-xs">
+                                                <div v-if="dk.type" class="text-slate-500 dark:text-slate-400 truncate max-w-[200px]" :title="dk.type">{{ dk.type }}</div>
+                                                <div class="ml-auto flex gap-3">
+                                                    <span><span class="text-slate-400">Plan:</span> <span class="font-medium text-slate-700 dark:text-slate-300">{{ dk.laenge_plan || '-' }}</span></span>
+                                                    <span><span class="text-slate-400">Ist:</span> <span class="font-medium text-slate-700 dark:text-slate-300">{{ dk.laenge_ist || '-' }}</span></span>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
 
-                                <!-- AHA Blätter -->
-                                <div v-if="technicalData.rimoWorkorders?.length" class="space-y-2">
-                                    <div class="text-sm font-medium text-slate-500 dark:text-slate-400">AHA Blätter</div>
-                                    <div v-for="wo in technicalData.rimoWorkorders" :key="wo.id"
-                                         class="bg-slate-50 dark:bg-slate-700/50 rounded-lg p-3 flex items-center justify-between">
-                                        <div>
-                                            <div class="font-medium text-slate-900 dark:text-white">{{ wo.rimoName }}</div>
-                                            <div class="text-xs text-slate-500 dark:text-slate-400">Status: {{ wo.rimoStatus }}</div>
+                                <!-- 3. Lageplan -->
+                                <div v-if="technicalData.dropcable?.map_file" class="bg-slate-50 dark:bg-slate-700/50 rounded-xl p-3">
+                                    <div class="flex items-center gap-2 mb-2">
+                                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-emerald-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 20l-5.447-2.724A1 1 0 013 16.382V5.618a1 1 0 011.447-.894L9 7m0 13l6-3m-6 3V7m6 10l4.553 2.276A1 1 0 0021 18.382V7.618a1 1 0 00-.553-.894L15 4m0 13V4m0 0L9 7"/>
+                                        </svg>
+                                        <span class="text-xs font-semibold text-emerald-600 dark:text-emerald-400 uppercase tracking-wide">Lageplan</span>
+                                    </div>
+                                    <button @click="openImageViewer(technicalData.dropcable.map_file.download_url)" class="w-full active:scale-[0.99] transition">
+                                        <div class="bg-white dark:bg-slate-800 rounded-lg p-1 border border-slate-200 dark:border-slate-600">
+                                            <img :src="technicalData.dropcable.map_file.download_url" class="w-full h-44 object-contain rounded" alt="Lageplan" @error="$event.target.closest('.bg-slate-50').style.display='none'">
                                         </div>
-                                        <button @click="openPdfViewer(wo.downloadUrl, wo.rimoName)"
-                                           class="flex items-center gap-2 px-3 py-2 bg-primary text-white rounded-lg text-sm font-medium active:scale-95 transition">
-                                            <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"/>
-                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z"/>
+                                        <div class="flex items-center justify-center gap-1 mt-2 text-[11px] text-slate-400 dark:text-slate-500">
+                                            <svg xmlns="http://www.w3.org/2000/svg" class="h-3.5 w-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0zM10 7v3m0 0v3m0-3h3m-3 0H7"/>
                                             </svg>
-                                            AHA
-                                        </button>
+                                            Antippen zum Vergrößern
+                                        </div>
+                                    </button>
+                                </div>
+
+                                <!-- 4. AHA Blatt -->
+                                <div v-if="technicalData.rimoWorkorders?.length" class="bg-slate-50 dark:bg-slate-700/50 rounded-xl p-3">
+                                    <div class="flex items-center gap-2 mb-2">
+                                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-amber-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"/>
+                                        </svg>
+                                        <span class="text-xs font-semibold text-amber-600 dark:text-amber-400 uppercase tracking-wide">AHA Blatt</span>
+                                    </div>
+                                    <div class="divide-y divide-slate-200 dark:divide-slate-600">
+                                        <div v-for="wo in technicalData.rimoWorkorders" :key="wo.id" class="flex items-center justify-between gap-3 py-2 first:pt-0 last:pb-0">
+                                            <div class="min-w-0 flex-1">
+                                                <div class="text-xs font-medium text-slate-800 dark:text-white truncate">{{ wo.rimoName }}</div>
+                                                <div class="text-[11px] text-slate-500 dark:text-slate-400">{{ wo.rimoStatus }}</div>
+                                            </div>
+                                            <button @click="openPdfViewer(wo.downloadUrl, wo.rimoName)"
+                                               class="flex-shrink-0 flex items-center gap-1 px-2.5 py-1.5 bg-amber-500 hover:bg-amber-600 text-white rounded-lg text-[11px] font-semibold active:scale-95 transition">
+                                                <svg xmlns="http://www.w3.org/2000/svg" class="h-3.5 w-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 10v6m0 0l-3-3m3 3l3-3m2 8H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"/>
+                                                </svg>
+                                                PDF
+                                            </button>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -1483,6 +1556,37 @@ export default {
                 </transition>
             </teleport>
 
+            <!-- Image Viewer Modal with Zoom -->
+            <teleport to="body">
+                <transition name="fade">
+                    <div v-if="showImageViewer" class="fixed inset-0 z-50 flex flex-col bg-black/95" @click.self="closeImageViewer">
+                        <!-- Header -->
+                        <div class="flex items-center justify-between px-4 py-3 flex-shrink-0" style="padding-top: calc(0.75rem + env(safe-area-inset-top, 0px));">
+                            <h3 class="text-lg font-semibold text-white">Lageplan</h3>
+                            <button @click="closeImageViewer" class="p-2 -mr-2 text-white/70 hover:text-white">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+                                </svg>
+                            </button>
+                        </div>
+                        <!-- Image Content with pinch zoom -->
+                        <div class="flex-1 overflow-auto flex items-center justify-center p-4">
+                            <img
+                                :src="imageViewerUrl"
+                                class="max-w-none select-none"
+                                style="touch-action: pinch-zoom; max-height: calc(100vh - 150px); width: auto;"
+                                alt="Lageplan"
+                                @dblclick="$event.target.style.transform = $event.target.style.transform === 'scale(2)' ? 'scale(1)' : 'scale(2)'"
+                            >
+                        </div>
+                        <!-- Footer hint -->
+                        <div class="flex-shrink-0 px-4 py-3 text-center" style="padding-bottom: calc(0.75rem + env(safe-area-inset-bottom, 0px));">
+                            <p class="text-white/50 text-xs">Pinch zum Zoomen • Doppeltippen für 2x</p>
+                        </div>
+                    </div>
+                </transition>
+            </teleport>
+
             <input
                 ref="fileInputRef"
                 type="file"

From 7974371d3f7e82198ff930d705d774560533811a Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Tue, 20 Jan 2026 15:57:50 +0100
Subject: [PATCH 58/88] =?UTF-8?q?Rechnungen=20-=20Artikelsuche=20-=20optio?=
 =?UTF-8?q?nal=20weg=20-=20Einheit=20weg=20-=20Einzelpreis=20wird=20nicht?=
 =?UTF-8?q?=20geholt=20-=20einzelpreis=20andere=20preistypen=20irgendwie?=
 =?UTF-8?q?=20anzeigen=20-=20ust=20weg=20-=20-1=20menge=20erlauben=20-=20k?=
 =?UTF-8?q?leiner=20Speicher=20bug=20-=20mit=20Rechnungsadresse=20LS=20geh?=
 =?UTF-8?q?t=20nicht=20=C3=BCbernehmen=20-=20pdf=20herunterladen=20Status?=
 =?UTF-8?q?=20=C3=A4ndern=20-=20per=20Mail=20verschicken=20ohne=20eingetra?=
 =?UTF-8?q?gene=20Mail=20geht=20ned?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Layout/default/ManualInvoice/PDF_HEADER.html  |  4 +-
 .../ManualInvoice/ManualInvoiceController.php | 37 ++++++++--
 .../WarehouseShippingNoteController.php       |  5 +-
 .../js/pages/ManualInvoice/ManualInvoice.js   | 72 ++++++++++++-------
 4 files changed, 83 insertions(+), 35 deletions(-)

diff --git a/Layout/default/ManualInvoice/PDF_HEADER.html b/Layout/default/ManualInvoice/PDF_HEADER.html
index 075f2c9bc..49e6196c0 100644
--- a/Layout/default/ManualInvoice/PDF_HEADER.html
+++ b/Layout/default/ManualInvoice/PDF_HEADER.html
@@ -68,9 +68,7 @@
         <td style="vertical-align: top; text-align: right;">
             <table style="display: inline-table; vertical-align: top;">
                 <tr>
-                    <td style="vertical-align: top; padding-right: 10px;">
-                        <img alt="QR-Code" src="{{ qrCodeSrc }}" style="display: block; height: 100%; max-height: 3.5cm; width: auto;">
-                    </td>
+                    {{ qrCodeHtml }}
                     <td>
                         <table class="invoice-details">
                             <tr>
diff --git a/application/ManualInvoice/ManualInvoiceController.php b/application/ManualInvoice/ManualInvoiceController.php
index 497057215..e55a94a8c 100644
--- a/application/ManualInvoice/ManualInvoiceController.php
+++ b/application/ManualInvoice/ManualInvoiceController.php
@@ -108,7 +108,9 @@ class ManualInvoiceController extends TTCrud
             "{{ leistungszeitraumHtml }}" => ($invoice->leistungszeitraum ?? '') ? "<tr><td>Leistungszeitraum:</td><td>" . htmlspecialchars($invoice->leistungszeitraum) . "</td></tr>" : "",
             "{{ externeReferenzHtml }}" => ($invoice->externe_referenz ?? '') ? "<tr><td>Externe Referenz:</td><td>" . htmlspecialchars($invoice->externe_referenz) . "</td></tr>" : "",
             "{{ vatHtml }}" => ($invoice->uid ?? '') ? "<tr><td>Ihre UID:</td><td>" . $invoice->uid . "</td></tr>" : "",
-            "{{ qrCodeSrc }}" => $this->generateSepaQRCode($invoice->invoice_number ?? "VORSCHAU", round($invoice->total_gross ?? 0, 2))
+            "{{ qrCodeHtml }}" => ($invoice->total_gross ?? 0) >= 0
+                ? '<td style="vertical-align: top; padding-right: 10px;"><img alt="QR-Code" src="' . $this->generateSepaQRCode($invoice->invoice_number ?? "VORSCHAU", round($invoice->total_gross ?? 0, 2)) . '" style="display: block; height: 100%; max-height: 3.5cm; width: auto;"></td>'
+                : ''
         ];
 
         $headerHtml = str_replace(array_keys($replacements), array_values($replacements), file_get_contents(BASEDIR . "/Layout/default/ManualInvoice/PDF_HEADER.html"));
@@ -349,10 +351,17 @@ class ManualInvoiceController extends TTCrud
         $me = new User();
         $me->loadMe();
 
-        // Log download in journal
+        // Update status to 'gesendet' (same as email)
+        if ($invoice->status === 'erstellt') {
+            $invoice->status = 'gesendet';
+            $invoice->save();
+        }
+
+        // Log download in journal with status change
         ManualInvoiceJournalModel::create([
             'manualinvoiceId' => $id,
             'text' => 'Rechnung heruntergeladen',
+            'statusChange' => 'gesendet',
             'createBy' => $me->id,
             'create' => time()
         ]);
@@ -467,13 +476,20 @@ class ManualInvoiceController extends TTCrud
         $me = new User();
         $me->loadMe();
 
+        // Fields that exist in ManualInvoicepositionModel
+        $allowedFields = ['billing_id', 'contract_id', 'matchcode', 'product_id', 'product_name', 'product_info',
+            'amount', 'unit', 'price', 'discount', 'price_total', 'price_gross', 'vatrate',
+            'fibu_cost_account', 'fibu_cost_account_legacy', 'fibu_taxcode', 'options'];
+
         foreach ($this->tempPositions as $position) {
             // Skip empty positions
             if (empty($position['product_name']) || ($position['amount'] ?? 0) == 0) continue;
 
             // Map _group to position_group
             $groupName = $position['_group'] ?? null;
-            unset($position['_group']);
+
+            // Filter to only allowed fields
+            $filteredPosition = array_intersect_key($position, array_flip($allowedFields));
 
             ManualInvoicepositionModel::create(array_merge([
                 'manualinvoice_id' => $invoiceId,
@@ -484,7 +500,7 @@ class ManualInvoiceController extends TTCrud
                 'edit_by' => $me->id,
                 'create' => time(),
                 'edit' => time()
-            ], $position));
+            ], $filteredPosition));
         }
         $this->tempPositions = [];
     }
@@ -810,6 +826,15 @@ class ManualInvoiceController extends TTCrud
             return;
         }
 
+        // Parse prices from cheapestSellPrice JSON
+        $prices = [];
+        if (!empty($article->cheapestSellPrice)) {
+            $pricesData = json_decode($article->cheapestSellPrice, true);
+            if (is_array($pricesData)) {
+                $prices = $pricesData;
+            }
+        }
+
         self::returnJson([
             'success' => true,
             'article' => [
@@ -817,8 +842,10 @@ class ManualInvoiceController extends TTCrud
                 'title' => $article->title,
                 'articleNumber' => $article->articleNumber,
                 'description' => $article->description,
-                'revenueAccount' => $article->revenueAccount
+                'revenueAccount' => $article->revenueAccount,
+                'unit' => $article->unit
             ],
+            'prices' => $prices,
             'vatgroup_id' => $vatgroupId,
             'fibu_cost_account' => $vatrate->account,
             'fibu_cost_account_legacy' => $vatrate->legacy_account,
diff --git a/application/WarehouseShippingNote/WarehouseShippingNoteController.php b/application/WarehouseShippingNote/WarehouseShippingNoteController.php
index 448e6ab12..fbf175801 100644
--- a/application/WarehouseShippingNote/WarehouseShippingNoteController.php
+++ b/application/WarehouseShippingNote/WarehouseShippingNoteController.php
@@ -131,7 +131,10 @@ class WarehouseShippingNoteController extends TTCrud {
         // Get billing address info
         $billingAddress = null;
         if ($shippingNote->billingAddressId) {
-            $billingAddress = Address::getOne($shippingNote->billingAddressId);
+            $billingAddress = new Address($shippingNote->billingAddressId);
+            if (!$billingAddress->id) {
+                $billingAddress = null;
+            }
         }
 
         // Determine price type ONCE (not in loop for performance)
diff --git a/public/js/pages/ManualInvoice/ManualInvoice.js b/public/js/pages/ManualInvoice/ManualInvoice.js
index 0348b6e85..ec1b87315 100644
--- a/public/js/pages/ManualInvoice/ManualInvoice.js
+++ b/public/js/pages/ManualInvoice/ManualInvoice.js
@@ -179,7 +179,7 @@ Vue.component('manual-invoice-modal', {
               <tt-textarea label="Einleitender Text" v-model="invoiceData.einleitender_text" rows="3" sm row/>
             </tt-card>
             <tt-card><template v-slot:header><h5><i class="fas fa-list-ol mr-2"></i>Positionen</h5></template>
-              <tt-positions-manager group-mode ref="positionsManager" v-model="invoiceData.positions" :config="positionsConfig" @updateField-article_id="onArticleSelected" />
+              <tt-positions-manager group-mode ref="positionsManager" v-model="invoiceData.positions" :config="positionsConfig" @updateField-article_id="onArticleSelected" @updateField-price_type="onPriceTypeChanged" />
             </tt-card>
             <tt-card><template v-slot:header><h5><i class="fas fa-paragraph mr-2"></i>Rabatt</h5></template>
               <tt-input label="Gesamtrabatt (%)" v-model.number="invoiceData.gesamtrabatt" sm row type="number" placeholder="0"/>
@@ -222,35 +222,31 @@ Vue.component('manual-invoice-modal', {
             positionsConfig: {
                 fields: {
                     article_id: {
-                        type: 'autocomplete',
-                        label: 'Artikel (optional)',
+                        type: 'input-article',
+                        label: 'Artikel',
                         apiUrl: '/WarehouseArticle/autocomplete',
-                        customFieldReference: 'WarehouseArticle'
+                        customFieldReference: 'WarehouseArticle',
+                        emitDisplayValue: true
                     },
                     product_name: { type: 'input', label: 'Bezeichnung' },
                     product_info: { type: 'input', label: 'Zusatzinfo' },
                     amount: { type: 'input', label: 'Menge', inputType: 'number' },
-                    unit: {
+                    price_type: {
                         type: 'select',
-                        label: 'Einheit',
-                        options: [
-                            { value: 'Pau.', text: 'Pau.' },
-                            { value: 'Stk.', text: 'Stk.' },
-                            { value: 'h', text: 'h' },
-                            { value: 'm', text: 'm' }
-                        ]
+                        label: 'Preistyp',
+                        options: []
                     },
                     price: { type: 'input', label: 'Einzelpreis (€)', inputType: 'number' },
                     discount: { type: 'input', label: 'Rabatt (%)', inputType: 'number' },
-                    vatrate: { type: 'input', label: 'USt. (%)', inputType: 'number' },
                 },
                 validateForm: (d) => {
                     if (!d.product_name) { window.notify('error', 'Bezeichnung ist erforderlich.'); return false; }
-                    if (!d.amount) { window.notify('error', 'Menge ist erforderlich.'); return false; }
+                    if (d.amount == null || d.amount === '') { window.notify('error', 'Menge ist erforderlich.'); return false; }
                     if (d.price == null) { window.notify('error', 'Preis ist erforderlich.'); return false; }
                     return true;
                 }
-            }
+            },
+            articlePrices: []
         };
     },
     computed: {
@@ -392,15 +388,21 @@ Vue.component('manual-invoice-modal', {
         },
         togglePreviewVisibility() { if (!this.isLargeScreen) this.showPreviewOnSmallScreen = !this.showPreviewOnSmallScreen; },
         async onArticleSelected(articleId) {
-            if (!articleId) return;
+            if (!articleId) {
+                // Reset price type options when no article selected
+                this.articlePrices = [];
+                this.positionsConfig.fields.price_type.options = [];
+                return;
+            }
             try {
                 const vatarea = this.customerBillingInfo.vatarea || 'domestic';
                 const { data } = await axios.get(`${window.TT_CONFIG.BASE_PATH}/ManualInvoice/getArticleVatInfo?article_id=${articleId}&vatarea=${vatarea}`);
                 if (data.success && this.$refs.positionsManager) {
                     const pm = this.$refs.positionsManager;
                     if (data.article) {
-                        pm.$set(pm.formData, 'product_name', data.article.title);
+                        pm.$set(pm.formData, 'product_name', data.article.articleNumber + ' | ' + data.article.title);
                         pm.$set(pm.formData, 'product_info', data.article.description || '');
+                        pm.$set(pm.formData, 'unit', data.article.unit || 'Stk.');
                     }
                     pm.$set(pm.formData, 'vatrate', parseFloat(data.vatrate) || 20);
                     pm.$set(pm.formData, 'fibu_cost_account', data.fibu_cost_account);
@@ -408,11 +410,30 @@ Vue.component('manual-invoice-modal', {
                     pm.$set(pm.formData, 'fibu_taxcode', data.fibu_taxcode);
                     this.invoiceData.vatgroup_id = data.vatgroup_id;
                     await this.updateTaxText(data.vatgroup_id);
+
+                    // Handle prices and price type selection
+                    this.articlePrices = data.prices || [];
+                    if (this.articlePrices.length > 0) {
+                        const priceOptions = this.articlePrices.map(p => ({ value: p.title, text: `${p.title} (${this.formatPrice(p.price)})` }));
+                        this.positionsConfig.fields.price_type.options = priceOptions;
+                        // Set first price as default
+                        pm.$set(pm.formData, 'price_type', this.articlePrices[0].title);
+                        pm.$set(pm.formData, 'price', this.articlePrices[0].price);
+                    } else {
+                        this.positionsConfig.fields.price_type.options = [];
+                    }
                 }
             } catch (e) {
                 console.error('Error fetching article VAT info:', e);
             }
         },
+        onPriceTypeChanged(priceType) {
+            if (!priceType || !this.articlePrices.length) return;
+            const selectedPrice = this.articlePrices.find(p => p.title === priceType);
+            if (selectedPrice && this.$refs.positionsManager) {
+                this.$refs.positionsManager.$set(this.$refs.positionsManager.formData, 'price', selectedPrice.price);
+            }
+        },
         async updateTaxText(vatgroupId) {
             if (!vatgroupId) return;
             try {
@@ -434,7 +455,7 @@ Vue.component('manual-invoice-modal', {
             this.pdfLoading = true;
             try {
                 const positions = this.invoiceData.positions
-                    .filter(p => p.product_name && (parseFloat(p.amount) || 0) > 0) // Filter out empty positions
+                    .filter(p => p.product_name && (parseFloat(p.amount) || 0) !== 0) // Filter out empty positions (allow negative for Gutschrift)
                     .map(p => {
                         const amount = parseFloat(p.amount) || 0;
                         const price = parseFloat(p.price) || 0;
@@ -546,7 +567,7 @@ Vue.component('manual-invoice-modal', {
 Vue.component('gutschrift-modal', {
     props: ['invoiceId'],
     template: `
-      <tt-modal :show="true" @close="close" size="lg" title="Gutschrift erstellen">
+      <tt-modal :show="true" @update:show="close" size="lg" title="Gutschrift erstellen">
         <div v-if="loading" class="text-center py-5"><i class="fas fa-spinner fa-spin fa-3x"></i><p class="mt-3">Lade Rechnungsdaten...</p></div>
         <div v-else-if="invoice">
           <div class="alert alert-info"><strong>Originalrechnung:</strong> {{ invoice.invoice_number }} - {{ invoice.customer_name }}</div>
@@ -623,7 +644,7 @@ Vue.component('gutschrift-modal', {
 Vue.component('send-invoice-modal', {
     props: ['invoiceId'],
     template: `
-      <tt-modal :show="true" @close="close" @submit="handleAction" :submit-text="actionButtonText" :is-loading="loading" size="md">
+      <tt-modal :show="true" @update:show="close" @submit="handleAction" :submit-text="actionButtonText" :is-loading="loading" size="md">
         <template v-slot:header>
           <h5><i class="fas fa-paper-plane mr-2"></i>Rechnung aussenden</h5>
         </template>
@@ -639,11 +660,11 @@ Vue.component('send-invoice-modal', {
           <div class="form-group">
             <label>Aktion auswählen:</label>
             <div class="form-check">
-              <input class="form-check-input" type="radio" id="action-email" value="email" v-model="selectedAction" :disabled="!invoice.email">
+              <input class="form-check-input" type="radio" id="action-email" value="email" v-model="selectedAction">
               <label class="form-check-label" for="action-email">
                 <i class="fas fa-envelope mr-2"></i>Per E-Mail versenden
-                <span v-if="invoice.email" class="text-muted d-block ml-4">an {{ invoice.email }}</span>
-                <span v-else class="text-danger d-block ml-4">Keine E-Mail-Adresse vorhanden</span>
+                <span v-if="invoice.email" class="text-muted d-block ml-4">Kunden-E-Mail: {{ invoice.email }}</span>
+                <span v-else class="text-warning d-block ml-4"><i class="fas fa-exclamation-triangle"></i> Keine Kunden-E-Mail - bitte manuell eingeben</span>
               </label>
             </div>
             <div class="form-check mt-2">
@@ -653,8 +674,8 @@ Vue.component('send-invoice-modal', {
               </label>
             </div>
           </div>
-          <div v-if="selectedAction === 'email' && invoice.email" class="mt-3">
-            <tt-input label="E-Mail-Adresse" v-model="emailAddress" sm/>
+          <div v-if="selectedAction === 'email'" class="mt-3">
+            <tt-input label="E-Mail-Adresse" v-model="emailAddress" sm :placeholder="invoice.email ? 'Standard: ' + invoice.email : 'E-Mail-Adresse eingeben'"/>
           </div>
         </div>
       </tt-modal>
@@ -678,7 +699,6 @@ Vue.component('send-invoice-modal', {
             if (data.success) {
                 this.invoice = data.invoice;
                 this.emailAddress = data.invoice.email || '';
-                this.selectedAction = data.invoice.email ? 'email' : 'download';
             } else {
                 window.notify('error', data.message || 'Fehler beim Laden der Rechnung');
                 this.close();

From 7997d19fc1d9b6bec2f1b320739586c62ee85737 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 20 Jan 2026 21:18:23 +0100
Subject: [PATCH 59/88] WIP ManualInvoice BMD Export

---
 Layout/default/Invoice/Index.php          |  52 +++++-
 application/Invoice/InvoiceController.php | 201 ++++++++++++++++++++++
 2 files changed, 250 insertions(+), 3 deletions(-)

diff --git a/Layout/default/Invoice/Index.php b/Layout/default/Invoice/Index.php
index f80df6423..2f5f74e12 100644
--- a/Layout/default/Invoice/Index.php
+++ b/Layout/default/Invoice/Index.php
@@ -25,22 +25,52 @@ $pagination_entity_name = "Rechnungen";
     <div class="row">
         <div class="col-lg-12">
 
+
+
+
             <div class="card">
                 <div class="card-body">
                     <div class="row">
-                        <div class="col">
-                            <a href="https://thetool.xinon.at/xfarm/" class="btn btn-primary" target="_blank"><i class="far fa-arrows-to-circle fa-fw"></i> Fakt-Rechnungen Import</a>
+                        <div class="col-3">
+                            <h4 class="header-title mb-3">Manuelle Rechnungen</h4>
+                            <div class="row">
+                                <div class="col">
+                                    <a href="https://thetool.xinon.at/xfarm/" class="btn btn-primary mt-4" target="_blank"><i class="far fa-arrows-to-circle fa-fw"></i> Fakt-Rechnungen Import</a>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-9">
+                            <form method="post" action="<?=self::getUrl("Invoice", "manualExportBmd")?>">
+                                <div class="row">
+                                    <div class="col-2">
+                                        <label class="form-label" for="manual_invoice_date_from">Rechnungsdatum von</label>
+                                        <input type="text" class="form-control" name="manual_invoice_date_from" id="manual_invoice_date_from" value="" />
+                                    </div>
+                                    <div class="col-2">
+                                        <label class="form-label" for="manual_invoice_date_to">Rechnungsdatum bis</label>
+                                        <input type="text" class="form-control" name="manual_invoice_date_to" id="manual_invoice_date_to" value="" />
+                                    </div>
+                                </div>
+                                <div class="row mt-2">
+                                    <div class="col-12">
+                                        <button type="submit" class="btn btn-outline-primary ml-1"><i class="far fa-fw fa-file-export"></i> Rechnungsexport für BMD</button>
+                                    </div>
+                                </div>
+                            </form>
+
                         </div>
                     </div>
+
                 </div>
             </div>
 
+
             <div class="row">
                 <div class="col-8">
 
                     <div class="card">
                         <div class="card-body mb-3">
-                            <h4 class="header-title mb-3">Filter</h4>
+                            <h4 class="header-title mb-3">Contract Rechnungen</h4>
 
                             <form method="get" action="<?=self::getUrl("Invoice")?>">
                                 <div class="row">
@@ -399,6 +429,22 @@ $pagination_entity_name = "Rechnungen";
         todayBtn: 'linked',
         autoclose: true
     });
+    $('#manual_invoice_date_from').datepicker({
+        orientation: "bottom",
+        language: 'de',
+        format: "dd.mm.yyyy",
+        showWeekDays: true,
+        todayBtn: 'linked',
+        autoclose: true
+    });
+    $('#manual_invoice_date_to').datepicker({
+        orientation: "bottom",
+        language: 'de',
+        format: "dd.mm.yyyy",
+        showWeekDays: true,
+        todayBtn: 'linked',
+        autoclose: true
+    });
     $('.datepicker').datepicker({
         orientation: "bottom",
         language: 'de',
diff --git a/application/Invoice/InvoiceController.php b/application/Invoice/InvoiceController.php
index f96dd6615..3cbc18800 100644
--- a/application/Invoice/InvoiceController.php
+++ b/application/Invoice/InvoiceController.php
@@ -780,6 +780,207 @@ class InvoiceController extends mfBaseController {
 
     }
 
+    protected function manualExportBmd() {
+        if(!$this->me->can("Billing")) {
+            $this->redirect("Dashboard");
+        }
+        //var_dump($this->request->get());
+
+        $csv_header = "\u{FEFF}satzart;konto;gkonto;belegnr;belegdatum;zziel;skontopz;skontotage;buchsymbol;buchcode;prozent;steuercode;betrag;steuer;text;";
+        $csv_header .= "bank-iban-nr;bank-swiftcode;bank-mandatsid;bank-mandatsdatum;bank-mandatskz;bank-letztereinzug;zvsperre;bankeinzug;";
+        $csv_header .= "kost;kobetrag";
+
+        $csv_out = "";
+
+        //var_dump($filter);exit;
+        $filter = [
+            "lock" => 1,
+            "exported" => 0,
+        ];
+
+        if($this->request->manual_invoice_date_from) {
+            $date_from = Layout::dateToInt($this->request->manual_invoice_date_from);
+            if($date_from) {
+                $filter["invoice_date"] = ["from" => $date_from];
+            }
+        }
+        if($this->request->manual_invoice_date_to) {
+            $date_to = Layout::dateToInt($this->request->manual_invoice_date_to);
+            if($date_to) {
+                $filter["invoice_date"] = ["to" => $date_to];
+            }
+        }
+
+        //var_dump($filter);exit;
+
+        if(!ManualInvoiceModel::count($filter)) {
+            $this->layout()->setFlash("Keine Rechnungen zum Exportieren gefunden.");
+            $this->redirect("Invoice");
+        }
+        foreach(ManualInvoiceModel::getAll($filter) as $invoice) {
+            if($invoice->exported) {
+                die("wtf");
+            }
+
+            $billingaddress = new Address($invoice->billingaddress_id);
+            if(!$billingaddress->id) {
+                die("Billingaddresse für Rechnung {$invoice->invoice_number} not found");
+            }
+
+            $kostentraeger = [];
+            //var_dump($invoice->getProperty("positions"));
+            //$vat_total_gross = 0;
+            foreach($invoice->getProperty("positions") as $position) {
+                if(!array_key_exists($position->position_group, $kostentraeger)) {
+                    $kostentraeger[$position->position_group] = 0;
+                }
+                //$kostentraeger[$position->position_group] += $position->price_gross;
+                //$vat_total_gross += $position->price_gross - $position->price_total;
+
+                $price = $position->price_total;
+                /*if($position->discount) {
+                    $price -= ($price / 100) * $position->discount;
+                }*/
+                if($invoice->gesamtrabatt) {
+                    $price -= ($price / 100) * $invoice->gesamtrabatt;
+                }
+
+                $kostentraeger[$position->position_group] += $price;
+            }
+
+            $total_gross = $invoice->total_gross;
+            /*if($invoice->gesamtrabatt) {
+                $total_gross -= round(($total_gross / 100) * $invoice->gesamtrabatt, 4);
+            }*/
+
+            $total = $invoice->total;
+            /*if($invoice->gesamtrabatt) {
+                $total -= round(($total / 100) * $invoice->gesamtrabatt, 4);
+            }*/
+
+            if($invoice->total_gross) {
+                $vatrate = 20;
+            }
+            if($invoice->total == $invoice->total_gross && $invoice->fibu_cost_area != "domestic") {
+                $vatrate = "0";
+            } else {
+                $vatrate = "20";
+            }
+            $vat = $total_gross - $total;
+            $vat *= -1;
+            //$vat_total_gross *= -1;
+
+            if($invoice->total < 0) {
+                $buchsymbol = "GU";
+            } else {
+                $buchsymbol = "AR";
+            }
+
+            $fibu_account = $invoice->fibu_account_number;
+
+            $buchungstext = "[".$invoice->customer_number."]";
+            if($invoice->company) {
+                $buchungstext .= " ".$invoice->company;
+            } elseif($invoice->firstname || $invoice->lastname) {
+                $buchungstext .= " ".$invoice->firstname." ".$invoice->lastname;
+            }
+
+            $buchungstext = str_replace(["\n","\r", ";"], "", $buchungstext);
+            $buchcode = "1";
+            $is_sepa = ($invoice->billing_type == "sepa");
+
+            $iban = "";
+            $bic = "";
+            $sepa_id = "";
+            $sepa_date = false;
+            $last_invoice_date = false;
+            $mandatskz = "";
+
+            if($is_sepa) {
+                $iban = $invoice->bank_account_iban;
+                $bic = $invoice->bank_account_bic;
+                $sepa_id = "R".$fibu_account;
+                if($billingaddress->sepa_date) {
+                    $sepa_date = new DateTime("@".$billingaddress->sepa_date);
+                    $sepa_date->setTimezone(new DateTimeZone("Europe/Vienna"));
+
+                    if($billingaddress->last_invoice_date) {
+                        $sepa_last_date = new DateTime("@".$billingaddress->last_invoice_date);
+
+                        $data["sepa_last_date"] = $sepa_last_date->format("Y-m-d");
+
+                        $last_invoice_date = new DateTime("@".$billingaddress->last_invoice_date);
+                        $last_invoice_date->setTimezone(new DateTimeZone("Europe/Vienna"));
+                        if($last_invoice_date->format("Y-m-d") < $sepa_date->format("Y-m-d")) {
+                            $last_invoice_date = false;
+                        }
+                    }
+                }
+
+                $mandatskz = ($last_invoice_date ? "1" : "0");
+
+                $three_years_ago = new DateTime("now");
+                $three_years_ago->modify("-3 years");
+
+                if($mandatskz == "0") {
+                    while($sepa_date->format("Y-m-d") < $three_years_ago->format("Y-m-d")) {
+                        $sepa_date->modify("+1 year");
+                    }
+                }
+
+            }
+
+            $kost = $invoice->fibu_cost_account;
+
+            $csv_out .= "0;";
+            $csv_out .= $fibu_account.";";
+            $csv_out .= $invoice->fibu_cost_account.";";
+            $csv_out .= $invoice->invoice_number.";";
+            $csv_out .= date("d.m.Y", $invoice->invoice_date).";";
+            $csv_out .= ($invoice->fibu_payment_due === null) ? ";" : $invoice->fibu_payment_due.";";
+            $csv_out .= ($invoice->fibu_payment_skonto) ? $invoice->fibu_payment_skonto.";" : ";";
+            $csv_out .= ($invoice->fibu_payment_skonto_rate) ? $invoice->fibu_payment_skonto_rate.";" : ";";
+            $csv_out .= $buchsymbol.";";
+            $csv_out .= $buchcode.";";
+            $csv_out .= $vatrate.";";
+            $csv_out .= $invoice->fibu_taxcode.";";
+            $csv_out .= number_format($total_gross, 2, ",", "").";";
+            $csv_out .= number_format($vat, 2, ",", "").";";
+            $csv_out .= $buchungstext.";";
+
+            $csv_out .= $iban.";";
+            $csv_out .= $bic.";";
+            $csv_out .= $sepa_id.";";
+            $csv_out .= ($sepa_date ? $sepa_date->format("d.m.Y") : "").";";
+            $csv_out .= $mandatskz.";";
+            $csv_out .= ($last_invoice_date ? $last_invoice_date->format("d.m.Y") : "").";";
+            $csv_out .= ($is_sepa ? 0 : 10).";";
+            $csv_out .= ($is_sepa ? 1 : 0);
+
+
+            if(count($kostentraeger) >= 2) {
+                foreach($kostentraeger as $kostelle => $kobetrag) {
+                    $kobetrag_text = number_format($kobetrag, 2, ",", "");
+                    $csv_out .= "\n1;;;;;;;;;;;;;;;;;;;;;;;$kostelle;$kobetrag_text;";
+                }
+            }
+
+            ///var_dump($kostentraeger);
+            $csv_out .= "\n";
+
+
+        }
+        //exit;
+        /*$this->layout()->setFlash("Export erfolgreich abgeschlossen", "success");
+        $this->redirect("Invoice");*/
+
+        header("Content-type: text/csv; charset=utf-8");
+        header('Content-disposition: attachment; filename="tt-mrech-export-bmd-'.date('Y-m-d_H-i-s').'.csv"');
+
+        echo $csv_header."\n".$csv_out;
+        exit;
+    }
+
     protected function exportBmdAction() {
         if(!$this->me->can("Billing")) {
             $this->redirect("Dashboard");

From cd158dae5fa01a25d9d85e1689d137980aecaa87 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 20 Jan 2026 21:20:36 +0100
Subject: [PATCH 60/88] Added manual invoice locking cron script

---
 scripts/ManualInvoice/lock-invoices.php | 41 +++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 scripts/ManualInvoice/lock-invoices.php

diff --git a/scripts/ManualInvoice/lock-invoices.php b/scripts/ManualInvoice/lock-invoices.php
new file mode 100644
index 000000000..45c195b97
--- /dev/null
+++ b/scripts/ManualInvoice/lock-invoices.php
@@ -0,0 +1,41 @@
+#!/usr/bin/php
+<?php
+require("../../config/config.php");
+
+define('FRONKDB_SQLDEBUG', false);
+error_reporting(E_ALL & ~(E_NOTICE | E_STRICT | E_DEPRECATED));
+
+require_once(LIBDIR."/mvcfronk/mfRouter/mfRouter.php");
+require_once(LIBDIR."/mvcfronk/mfBase/mfBaseModel.php");
+require_once(LIBDIR."/mvcfronk/mfBase/mfBaseController.php");
+
+$layout = \Layout::singleton();
+
+$me = new User(1);
+define("INTERNAL_USER_ID", $me->id);
+define("INTERNAL_USER_USERNAME", $me->username);
+
+// 05:30 11:30 17:30
+
+$invoice_lock_days = TT_MANUALINVOICE_LOCK_DAYS;
+$lock_treshold = date('U') - (86400*$invoice_lock_days);
+
+$invoices = ManualInvoiceModel::getAll(["lock" => 0, "create" => ["to" => $lock_treshold]]);
+foreach($invoices as $invoice) {
+    /*echo "{$invoice->id}\t{$invoice->invoice_number}:\t";
+    echo date("Y-m-d", $invoice->create);
+    echo "\n";*/
+
+    // unnessecary redundant date check
+    if($invoice->create > $lock_treshold) {
+        die(__FILE__.": Invoice {$invoice->invoice_number} ({$invoice->id}) has create date (".date("Y-m-d", $invoice->create).") after $invoice_lock_days days threshold.\n");
+    }
+
+    $invoice->lock = 1;
+    if(!$invoice->save()) {
+        die(__FILE__.": Error saving invoice.\n");
+    }
+
+}
+
+echo "total ".count($invoices)." invoices locked with threshold date ".date("Y-m-d", $lock_treshold)."\n";

From 225e14c74d9f2097e60ab04c532f22f79f048cdd Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Wed, 21 Jan 2026 14:42:54 +0100
Subject: [PATCH 61/88] added nuance to product search in
 createOrderFromPreorderAction()

---
 application/Preorder/PreorderController.php | 28 +++++++++++++++------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index 822ad3617..52623f44a 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -1101,7 +1101,6 @@ class PreorderController extends mfBaseController {
             $order_data["owner_id"] = $owner->id;
             $order_data["owner"] = $owner;
         } else {
-            // ... otherwise add owner data to order
             foreach($owner_data as $field => $value) {
                 if(!$preorder->$field) continue;
                 $order_data["owner_".$field] = $value;
@@ -1128,10 +1127,29 @@ class PreorderController extends mfBaseController {
         }
 
         // try product with correct network id
-        $product = ProductModel::getFirst(["external_id" => $operator->id, "network_id" => $campaign->network_id]);
+        $product = ProductModel::getFirst([
+            "external_id" => $operator->id,
+            "network_id" => $campaign->network_id,
+            "productgroup_id" => TT_PRODUCTGROUP_ID_INTERNET_ACCESS_RESI,
+            "name" => "%OAN%",
+            "active" => true
+        ]);
         if(!$product) {
             // else use any product from operator
-            $product = ProductModel::getFirst(["external_id" => $operator->id, "productgroup_id" => TT_PRODUCTGROUP_ID_INTERNET_ACCESS_RESI, "active" => true]);
+            $product = ProductModel::getFirst([
+                "external_id" => $operator->id,
+                "productgroup_id" => TT_PRODUCTGROUP_ID_INTERNET_ACCESS_RESI,
+                "name" => "%OAN%",
+                "active" => true
+            ]);
+        }
+        if(!$product) {
+            // else use any product from operator
+            $product = ProductModel::getFirst([
+                "external_id" => $operator->id,
+                "productgroup_id" => TT_PRODUCTGROUP_ID_INTERNET_ACCESS_RESI,
+                "active" => true
+            ]);
         }
         if($operator->id == 1) {
             if(!$product) {
@@ -1139,8 +1157,6 @@ class PreorderController extends mfBaseController {
                     "external" => 0,
                     "productgroup_id" => TT_PRODUCTGROUP_ID_INTERNET_ACCESS_RESI,
                     "network_id" => $campaign->network_id,
-                    "attributename" => "termination_required",
-                    "attributevalue" => 0,
                     "active" => true
                 ]);
             }
@@ -1149,8 +1165,6 @@ class PreorderController extends mfBaseController {
                     "external" => 0,
                     "productgroup_id" => TT_PRODUCTGROUP_ID_INTERNET_ACCESS_RESI,
                     "name" => "%OAN%",
-                    "attributename" => "termination_required",
-                    "attributevalue" => 0,
                     "active" => true
                 ]);
             }

From 91c501950399564bd92ea07d4cabf598e89b25c9 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Thu, 22 Jan 2026 07:20:10 +0100
Subject: [PATCH 62/88] added new filter template

---
 Layout/default/Preorder/Index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index 8e3e833d4..159f49077 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -890,6 +890,7 @@ $pagination_entity_name = "Vorbestellungen";
                                     <ul class="dropdown-menu" aria-labelledby="dropdownMenuButton">
                                         <li><a class="dropdown-item" href="<?=self::getUrl("Preorder", "Index", ["filter" => ["status" => [21,22,23,24,25,930,931,932,933,934], "rimo_workorder" => 1, "rimo_workorder_status" => ["Clarify","Accepted","Plan released","Assigned","Executed","Documented","Review"]]])?>">Gelöschte Bestellungen mit Workorder</a></li>
                                         <li><a class="dropdown-item" href="<?=self::getUrl("Preorder", "Index", ["filter" => ["preorder_status_flags" => [4], "connection_type" => ["apartment", "apartment-building"], "borderpoint" => "all"]])?>">Wohnung - Verkabelung erledigt</a></li>
+                                        <li><a class="dropdown-item" href="<?=self::getUrl("Preorder", "Index", ["filter" => ["status" => [1,2,3,4,5,6,7,8,9,10,11,12,13,15,16,17,18,28,34]]])?>">Offene Bestellungen Status 10-299</a></li>
                                         <li><a class="dropdown-item" href="<?=self::getUrl("Preorder", "Index", ["filter" => ["status" => [21,22,23,24,25]]])?>">Storniert</a></li>
                                         <?php if ($me->isAdmin() || $me->address->id == 209): ?>
                                         <li><a class="dropdown-item" href="<?=self::getUrl("Preorder", "Index", ["filter" => ["onlyShowCustomMailSent" => 1]])?>">Bestellungen mit gesendeter Custom-300 Benachrichtigung</a></li>

From b569faf9467d925323c1e30686eb84d4a8c25e67 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Thu, 22 Jan 2026 07:24:33 +0100
Subject: [PATCH 63/88] added possibility to remove appointment

---
 .../WorkorderCompanyController.php              | 17 +++++++++++++++++
 .../pages/WorkorderCompany/WorkorderCompany.js  | 13 +++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/application/WorkorderCompany/WorkorderCompanyController.php b/application/WorkorderCompany/WorkorderCompanyController.php
index 78e825809..553465c3a 100644
--- a/application/WorkorderCompany/WorkorderCompanyController.php
+++ b/application/WorkorderCompany/WorkorderCompanyController.php
@@ -121,6 +121,23 @@ class WorkorderCompanyController extends WorkorderBaseController {
         self::returnJson(['success' => true, 'message' => 'Termin erfolgreich verschoben.']);
     }
 
+    protected function clearAppointmentAction() {
+        if (empty($this->postData['workorderId'])) self::sendError("Arbeitsauftrags-ID fehlt.");
+        $workorder = WorkorderModel::get($this->postData['workorderId']);
+        if (!$workorder) self::sendError("Arbeitsauftrag nicht gefunden.");
+
+        $oldDateFormatted = $workorder->appointmentDate ? date('d.m.Y H:i', $workorder->appointmentDate) : 'N/A';
+        $workorder->appointmentDate = null;
+        $workorder->status = 'assigned';
+        WorkorderModel::update((array)$workorder);
+
+        WorkorderJournalModel::create([
+            'workorderId' => $workorder->id, 'text' => "Termin gelöscht (war: {$oldDateFormatted}).",
+            'create' => time(), 'createBy' => $this->user->id,
+        ]);
+        self::returnJson(['success' => true, 'message' => 'Termin erfolgreich gelöscht.']);
+    }
+
     protected function requestInterventionAction() {
         if (empty($this->postData['workorderId']) || empty($this->postData['journalText'])) self::sendError("Erforderliche Felder fehlen.");
         $workorder = WorkorderModel::get($this->postData['workorderId']);
diff --git a/public/js/pages/WorkorderCompany/WorkorderCompany.js b/public/js/pages/WorkorderCompany/WorkorderCompany.js
index ed6e0ec46..a974eb9bc 100644
--- a/public/js/pages/WorkorderCompany/WorkorderCompany.js
+++ b/public/js/pages/WorkorderCompany/WorkorderCompany.js
@@ -65,6 +65,9 @@ Vue.component('workorder-company', {
                 <tt-button v-if="!['completed', 'cancelled', 'documented'].includes(row.status)"
                            icon="fas fa-edit" @click="openRescheduleModal(row)"
                            additional-class="btn-link btn-sm p-0 ml-2" title="Termin ändern"/>
+                <tt-button v-if="!['completed', 'cancelled', 'documented'].includes(row.status)"
+                           icon="fas fa-times" @click="clearAppointment(row)"
+                           additional-class="btn-link btn-sm p-0 ml-1 text-danger" title="Termin löschen"/>
               </div>
               <span v-else>–</span>
             </template>
@@ -157,6 +160,16 @@ Vue.component('workorder-company', {
                 this.rescheduleModalData = null;
             } else window.notify('error', data.message || 'Ein Fehler ist aufgetreten.');
         },
+        async clearAppointment(workorder) {
+            if (!confirm('Möchten Sie den Termin wirklich löschen?')) return;
+            const {data} = await axios.post(`${window.TT_CONFIG.BASE_PATH}/WorkorderCompany/clearAppointment`, {
+                workorderId: workorder.id
+            });
+            if (data.success) {
+                window.notify('success', data.message);
+                this.$refs.table.$refs.table.refreshTable();
+            } else window.notify('error', data.message || 'Ein Fehler ist aufgetreten.');
+        },
         startAdditionalInfoEdit(row) {
             this.editingAdditionalInfoId = row.id;
             this.tempAdditionalInfo = row.additionalInfo || '';

From 976844d62317676991bb67fa8b781d4c0898145e Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 22 Jan 2026 17:07:51 +0100
Subject: [PATCH 64/88] WIP Snopp Order

---
 Layout/default/Order/Form.php         |  42 ++++++--
 Layout/default/Order/Index.php        |  10 +-
 application/Order/Order.php           |  21 ++++
 application/Order/OrderController.php | 139 +++++++++++++++++++++++++-
 application/Product/Product.php       |  22 ++++
 lib/SNOPP/SNOPP.php                   |  36 -------
 lib/Snoppapi/Snoppapi.php             | 111 ++++++++++++++++++++
 7 files changed, 334 insertions(+), 47 deletions(-)
 delete mode 100644 lib/SNOPP/SNOPP.php
 create mode 100644 lib/Snoppapi/Snoppapi.php

diff --git a/Layout/default/Order/Form.php b/Layout/default/Order/Form.php
index 356b9747c..5ff2e19c1 100644
--- a/Layout/default/Order/Form.php
+++ b/Layout/default/Order/Form.php
@@ -587,9 +587,6 @@
                     <?php if($product->preorder_id): ?>
                       <input type="hidden" name="products[<?=$i?>][preorder_id]" value="<?=$product->preorder_id?>" />
                     <?php endif; ?>
-                    <?php if($product->oaid): ?>
-                      <input type="hidden" name="products[<?=$i?>][oaid]" value="<?=$product->oaid?>" />
-                    <?php endif; ?>
                     <div class="col-md-1 product-<?=$i?>">
                       <div class="row">
                         <div class="col-md-12">
@@ -648,7 +645,17 @@
                         
                         
                       </div>
-                      
+
+                        <?php if($product->product->getAttributeValue("oaid_enabled")): ?>
+                            <div class="row mt-1 mb-2" id="oaid-<?=$i?>-line">
+                        <?php else: ?>
+                            <div class="row mt-1 mb-2 hidden" id="oaid-<?=$i?>-line">
+                        <?php endif; ?>
+                            <div class="col-4">
+                                <label class="form-label" for="oaid-<?=$i?>">OAID</label>
+                                <input type="text" name="products[<?=$i?>][oaid]" id="oaid-<?=$i?>" class="form-control" value="<?=$product->oaid?>" placeholder="optional">
+                            </div>
+                        </div>
                       <?php if(
                               (is_array($product->product->attributes) && count($product->product->attributes))
                               && (array_key_exists(TT_ATTRIB_TERMINATION_REQUIRED_NAME, $product->product->attributes)
@@ -876,7 +883,14 @@
                           <input type="text" class="form-control" name="products[<?=$i?>][price_setup]" id="price_setup-<?=$i?>" value="" placeholder="Preis Setup" />
                         </div>
                       </div>
-                      
+
+                    <div class="row mt-1 mb-2 hidden" id="oaid-<?=$i?>-line">
+                        <div class="col-4">
+                            <label class="form-label" for="oaid-<?=$i?>">OAID</label>
+                            <input type="text" name="products[<?=$i?>][oaid]" id="oaid-<?=$i?>" class="form-control" value="<?=$product->oaid?>" placeholder="optional">
+                        </div>
+                    </div>
+
                       <div class="row mt-1 mb-2 hidden" id="termination_id-<?=$i?>-line">
                         <!-- line to choose termination -->
                         <div class="col-12">
@@ -1390,8 +1404,15 @@
         });
       } else {
         $('#termination_id-' + id + '-line').hide();
-        //$('#termination_id-' + id + '-line').hide();
       }
+
+        if(typeof p.attributes === 'object' && "oaid_enabled" in p.attributes && p.attributes.oaid_enabled == 1) {
+            console.log("oaid_enabled");
+            $('#oaid-' + id + '-line').show();
+            console.log($('#oaid-' + id).val());
+        } else {
+            $('#oaid-' + id + '-line').hide();
+        }
       
       if(typeof p.attributes === 'object' && "needs_number" in p.attributes && p.attributes.needs_number == 1) {
         console.log("needs_number");  
@@ -1980,7 +2001,14 @@
               <input type="text" class="form-control" name="products[' + i +'][price_setup]" id="price_setup-' + i +'" value="" placeholder="Preis Setup" /> \
             </div> \
           </div> \
-   \
+\
+          <div class="row mt-1 mb-2 hidden" id="oaid-<?=$i?>-line"> \
+            <div class="col-4"> \
+              <label class="form-label" for="oaid-<?=$i?>">OAID</label> \
+              <input type="text" name="products[<?=$i?>][oaid]" id="oaid-<?=$i?>" class="form-control" value="" placeholder="optional"> \
+            </div> \
+          </div> \
+\
           <div class="row mt-1 mb-2 hidden" id="termination_id-' + i +'-line"> \
             <!-- line to choose termination --> \
             <div class="col-12"> \
diff --git a/Layout/default/Order/Index.php b/Layout/default/Order/Index.php
index 07afc242f..8e44ad0e2 100644
--- a/Layout/default/Order/Index.php
+++ b/Layout/default/Order/Index.php
@@ -290,7 +290,6 @@
                 <td onclick="toggleOrder(<?=$order->id?>)" class="text-monospace"><?=date("d.m.Y", $order->edit)?></td>
                 <td onclick="toggleOrder(<?=$order->id?>)" class="text-monospace"><?=$order->editor->name?></td>
                 <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
-                  <!--a href="<?=self::getUrl("Order", "createSnoppOrder", ["id" => $order->id, "filter" => $filter, "noTermProducts" => 1])?>" class="mr-2"><img src="<?=self::getResourcePath()?>img/snop-logo.png" /></a-->
                   <?php if($order->waiting == 1): ?>
                     <a href="<?=self::getUrl("Order", "setwaiting", ["id" => $order->id, "unset" => "1", "filter" => $filter, "s" => $pagination['start']])?>"><i class="fas fa-eye-slash" title="Einblenden"></i></a>
                   <?php else: ?>
@@ -300,6 +299,10 @@
                   <a href="<?=self::getUrl("Order", "sendServicePin", ["id" => $order->id])?>" onclick="if(!confirm('Soll der Service-PIN an den Vertragsinhaber gesendet werden?')) return false;"><i class="fas fa-paper-plane"  title="Service PIN als PDF per Email an Vertragsinhaber"></i></a>
                   <a href="<?=self::getUrl("Order", "edit", ["id" => $order->id, "filter" => $filter, "noTermProducts" => 1])?>"><i class="far fa-edit"  title="Bearbeiten"></i></a>
                   <a href="<?=self::getUrl("Order", "delete", ["id" => $order->id])?>" onclick="if(!confirm('Bestellung wirklich löschen?')) return false;" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
+
+                    <?php if(!$order->getSnoppProduct() && ($order->getPreorderProduct() || $order->getOaidProduct())): ?>
+                        <a href="<?=self::getUrl("Order", "createSnoppOrder", ["id" => $order->id, "filter" => $filter, "noTermProducts" => 1])?>" class="ml-2"><img src="<?=self::getResourcePath()?>img/snop-logo.png" style="width:24px;height:auto;" /></a>
+                    <?php endif; ?>
                 </td>
               </tr>
               <tr class="building-list-tr <?=($order_count % 2 == 0) ? "table-bg-even" : ""?>" id="order-dates-<?=$order->id?>">
@@ -544,7 +547,10 @@
                                         <td class="text-right"><?=$product->pos?></td>
                                         <td class="text-right"><?=$product->formatAmount()?></td>
                                         <td>
-                                          <?=$product->product->name?>
+                                            <?php if($product->snopp_order_id): ?>
+                                                <img src="<?=self::getResourcePath()?>/img/snop-logo.png" style="width:24px;height:auto;" title="Bestellung in Snopp">
+                                            <?php endif; ?>
+                                          <?=$product->product->name?> <?=$product->oaid ? "<span class='text-pink font-italic'>{$product->oaid}</span>" : ""?>
                                           <?php
                                           if(
                                             (is_array($product->product->attributes) && count($product->product->attributes))
diff --git a/application/Order/Order.php b/application/Order/Order.php
index 1774f35fb..00960d6a5 100644
--- a/application/Order/Order.php
+++ b/application/Order/Order.php
@@ -67,6 +67,27 @@ class Order extends mfBaseModel {
     //var_dump($this->terminations);exit;
     return $terminations;
   }
+
+  public function getSnoppProduct() {
+      foreach($this->getProperty("products") as $product) {
+          if($product->snopp_order_id) return $product;
+      }
+      return null;
+  }
+
+  public function getOaidProduct() {
+      foreach($this->getProperty("products") as $product) {
+          if($product->oaid) return $product;
+      }
+      return null;
+  }
+
+    public function getPreorderProduct() {
+        foreach($this->getProperty("products") as $product) {
+            if($product->preorder_id) return $product;
+        }
+        return null;
+    }
   
   public function getShippingdate() {
     if(!$this->id) {
diff --git a/application/Order/OrderController.php b/application/Order/OrderController.php
index 993cb2274..5d93c5f9f 100644
--- a/application/Order/OrderController.php
+++ b/application/Order/OrderController.php
@@ -1344,7 +1344,7 @@ class OrderController extends mfBaseController {
       $this->layout()->setFlash("Keine Berechtigung", "error");
       $this->redirect("Order");
     }
-    
+
     $r = $this->request;
     
     $order_id = $r->id;
@@ -1372,7 +1372,142 @@ class OrderController extends mfBaseController {
     
     $this->returnJson(["status" => "OK", "order" => ['id' => $order_id]]);
   }
-  
+
+  protected function createSnoppOrderAction() {
+      $order_id = $this->request->id;
+
+      if(!$order_id || $order_id < 1) {
+          $this->layout()->setFlash("Bestellung nicht gefunden.", "error");
+          $this->redirect("Order");
+      }
+      $order = new Order($order_id);
+      if(!$order->id) {
+          $this->layout()->setFlash("Bestellung nicht gefunden.", "error");
+          $this->redirect("Order");
+      }
+
+      $order_product = false;
+
+      $product_snopp_id = false;
+      $products_noterm = false;
+
+      // find product
+      foreach($order->products as $op) {
+          // check for valid internet access product
+          if(!in_array($op->product->producttech_id, TT_PRODUCTTECH_IDS_INTERNET_ACCESSS)) {
+              continue;
+          }
+
+          if($op->oaid) {
+              $order_product = $op;
+              break;
+          }
+          if($op->preorder_id) {
+              $order_product = $op;
+              break;
+          }
+          // if product has a snopp product_id, then this must be it
+          if($op->product->getAttributeValue("oan_pid_snopp")) {
+              $order_product = $op;
+              break;
+          }
+      }
+
+      if(!$order_product) {
+          $this->layout()->setFlash("Kein für SNOPP-Bestellungen geeignetes Produkt in dieser Bestellung gefunden.", "error");
+          $this->redirect("Order", "Index", ["id" => $order->id]);
+      }
+
+      // order in snopp
+      $snopp_prod_id = $op->product->getAttributeValue("oan_pid_snopp");
+      if(!$snopp_prod_id) {
+          $this->layout()->setFlash("SNOPP Product ID fehlt im Produkt (".$order_product->product->name.").", "error");
+          $this->redirect("Order", "Index", ["id" => $order->id]);
+      }
+
+      // find snopp api credentials
+      $api_creds = $order_product->product->getOwnerSnoppApiCredentials();
+      $this->log->debug(__METHOD__.": Snopp Api Creds: ".print_r($api_creds, true));
+      if(!$api_creds) {
+          $this->layout()->setFlash("Produktbesitzer hat keinen SNOPP Api Key", "error");
+          $this->redirect("Order");
+      }
+      $baseurl = $api_creds["prod"]["url"];
+      $apikey = $api_creds["prod"]["key"];
+      $snopp = new Snoppapi($baseurl, $apikey);
+
+      $ext_id = false;
+
+      if($order_product->oaid) {
+          $ext_id = $order_product->oaid;
+      } elseif($order_product->preorder_id) {
+          $preorder = new Preorder($order_product->preorder_id);
+          if($preorder->id && $preorder->campaign->fulfillment == "citycom_oan") {
+              $ext_id = "SDIHome_xtc{$preorder->adb_wohneinheit_id}_1700000000";
+          } elseif($preorder->id) {
+              if($preorder->adb_wohneinheit->oaid) {
+                  $ext_id = $preorder->adb_wohneinheit->oaid;
+              } elseif($preorder->adb_wohneinheit->extref) {
+                  $ext_id = $preorder->adb_wohneinheit->extref;
+              }
+          }
+      } else {
+          // search for address in snopp
+          $search_data = [
+              "street" => $order->owner->street,
+              "zip" => $order->owner->zip,
+              "city" => $order->owner->city,
+          ];
+          $homes = $snopp->searchAddress($search_data);
+          if(!$homes) {
+              $this->layout()->setFlash("Home in Snopp nicht gefunden", "error");
+              $this->redirect("Order", "Index", ["id" => $order->id]);
+          }
+
+          $home = reset($homes);
+          $ext_id = $home->oan_id;
+      }
+
+      if(!$ext_id) {
+          $this->layout()->setFlash("Konnte keine OAID oder External ID zur Adresse finden.", "error");
+          $this->redirect("Order", "Index", ["id" => $order->id]);
+      }
+
+      $data = [
+          "oan_id" => ($order_product->oaid) ?: $ext_id,
+          "product_id" => $snopp_prod_id,
+          "extref" => ($op->order->partner_number) ?: $op->order->owner->customer_number,
+          "execution_date" => (new DateTime("now"))->setTimezone(new DateTimeZone("Europe/Vienna"))->format("c"),
+          "name" => $order->owner->getCompanyOrName(),
+          "street" => $order->owner->street,
+          "zip" => $order->owner->zip,
+          "city" => $order->owner->city,
+          "phone" => $order->owner->phone,
+          "mobile" => $order->owner->mobile,
+          "email" => $order->owner->email,
+      ];
+
+
+      $resp = $snopp->submitOrder($data);
+
+      if(!$resp) {
+          $this->layout()->setFlash("Fehler beim Bestellen im Snopp.", "error");
+          $this->redirect("Order", "Index", ["id" => $order->id]);
+      }
+
+      if($resp->status != "Created") {
+          $this->layout()->setFlash("Konnte nicht bestellt werden: '{$resp->result->message}'", "error");
+          $this->redirect("Order", "Index", ["id" => $order->id]);
+      }
+
+      $order_product->snopp_order_id = 1;
+      $order_product->save();
+
+      $this->layout()->setFlash("Bestellung erfolgreich in SNOPP erstellt.", "success");
+      $this->redirect("Order", "Index", ["id" => $order->id]);
+
+  }
+
   protected function deleteAction() {
     if(!$this->me->is(["Admin","salespartner"])) {
       $this->layout()->setFlash("Keine Berechtigung", "error");
diff --git a/application/Product/Product.php b/application/Product/Product.php
index 9bbcd6d9d..eff806c3a 100644
--- a/application/Product/Product.php
+++ b/application/Product/Product.php
@@ -54,6 +54,28 @@ class Product extends mfBaseModel {
     
   }
 
+  public function getAttributeValue($name) {
+        $attributes = $this->getProperty("attributes");
+        if(!array_key_exists($name, $attributes) || !$attributes[$name]->value) {
+            return null;
+        }
+        return $attributes[$name]->value;
+  }
+
+  public function getOwnerSnoppApiCredentials() {
+      $owner = $this->getProperty("owner");
+      if(!$owner) return false;
+
+      foreach(TT_SNOPP_API_CREDS as $api_creds) {
+          if($api_creds["address_id"] == $owner->id) {
+              return $api_creds;
+          }
+      }
+
+      return null;
+  }
+
+
   public function getProperty($name) {
     if($this->$name == null) {
       
diff --git a/lib/SNOPP/SNOPP.php b/lib/SNOPP/SNOPP.php
deleted file mode 100644
index d995ea3e5..000000000
--- a/lib/SNOPP/SNOPP.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Represents the SNOPP API.
- */
-class SNOPP {
-    /**
-     * SNOPP constructor.
-     */
-    public function __construct() {}
-
-
-    /**
-     * Search for support tickets using the SNOPP API.
-     * @return array - The search results.
-     */
-    function getSNOPPTickets(): array {
-        $SNOPP_API_URL = SNOPP_API_URL;
-        $SNOPP_API_KEY = SNOPP_API_KEY;
-
-        $ctx_opts = [
-            'http' => [
-                'method' => 'GET',
-                'header' => "X-Api-Key: $SNOPP_API_KEY\r\n",
-            ]
-        ];
-
-        $snopp_output = file_get_contents("$SNOPP_API_URL/ticket/find?provider_id=all&status=open", false, stream_context_create($ctx_opts));
-        $ticket_obj = json_decode($snopp_output);
-        $tickets = $ticket_obj->result->tickets;
-
-        return $tickets;
-    }
-
-}
-?>
diff --git a/lib/Snoppapi/Snoppapi.php b/lib/Snoppapi/Snoppapi.php
new file mode 100644
index 000000000..2b7aedaca
--- /dev/null
+++ b/lib/Snoppapi/Snoppapi.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * Represents the SNOPP API.
+ */
+class Snoppapi {
+    private $log;
+    private $baseurl;
+    private $apikey;
+
+    public function __construct($baseurl, $apikey) {
+        $this->baseurl = $baseurl;
+        $this->apikey = $apikey;
+
+        $this->log = mfLoghandler::singleton();
+    }
+
+
+    public function searchAddress(Array $address_data) {
+        $street = trim($address_data['street']);
+        $zip = trim($address_data['zip']);
+        $city = trim($address_data['city']);
+
+        $ctx_opts = [
+            'http' => [
+                'method' => 'GET',
+                'ignore_errors' => true,
+                'header' => [
+                    "Accept: application/json",
+                    "X-Api-Key: {$this->apikey}",
+                ]
+            ]
+        ];
+
+        $getHomesEp = $this->baseurl.SNOPP_API_EP_GET_HOMES;
+        //$url = $getHomesEp."?".$qs;
+        $url = $getHomesEp;
+
+        $ctx = stream_context_create($ctx_opts);
+        $this->log->debug(__METHOD__.": Getting SNOPP homes: $url");
+        $response = file_get_contents($url, false, $ctx);
+        //var_dump($response);exit;
+        if($response === false) {
+            $this->log->error("Fehler beim Homes abfragen in SNOPP");
+            return false;
+        }
+
+        $resp_data = json_decode($response);
+        $homes = $resp_data->result->homes;
+
+        $results = [];
+
+        foreach($homes as $home) {
+            if(trim($home->street) == $street
+                && trim($home->zip) == $zip
+                && trim($home->city) == $city
+            ) {
+                $results[] = $home;
+            }
+        }
+
+        return $results;
+    }
+
+    public function submitOrder(Array $order_data) {
+        $data = [];
+        foreach(["oan_id", "execution_date", "product_id", "name", "street", "zip", "city"] as $field) {
+            if(!array_key_exists($field, $order_data) || !$order_data[$field]) {
+                $this->log->error(__METHOD__.": Mandatory field '$field' missing");
+                return false;
+            }
+            $data[$field] = $order_data[$field];
+        }
+
+        foreach(["phone", "mobile", "email"] as $field) {
+            if(array_key_exists($field, $order_data) && $order_data[$field]) {
+                $data[$field] = $order_data[$field];
+            }
+        }
+
+        $ctx_opts = [
+            'http' => [
+                'method' => 'POST',
+                'content' => json_encode($data),
+                'ignore_errors' => true,
+                'header' => [
+                    "Accept: application/json",
+                    "Content-type: application/json",
+                    "X-Api-Key: {$this->apikey}",
+                ]
+            ]
+        ];
+
+        $url = $this->baseurl.SNOPP_API_EP_SUBMIT_ORDER;
+
+        $ctx = stream_context_create($ctx_opts);
+        $this->log->debug(__METHOD__.": Ordering Snopp product: $url\n".print_r($data, true));
+        $response = file_get_contents($url, false, $ctx);
+
+        $this->log->debug(__METHOD__.": ".print_r($response, true));
+
+        if($response === false) {
+            $this->log->error("Fehler beim Bestellen in SNOPP ".print_r($response, true));
+            return false;
+        }
+
+        $resp_data = json_decode($response);
+        return $resp_data;
+    }
+
+}

From 5ca7fa29c697383497cf4cd0df75e86c15df1658 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Mon, 26 Jan 2026 12:20:52 +0100
Subject: [PATCH 65/88] device matching via mac instead of ip address

---
 application/Radius/RadiusController.php       | 63 +++++++++++++++++++
 lib/GenieACS/GenieACS.php                     | 18 ++++++
 public/js/pages/Radius/Radius.css             |  4 +-
 public/js/pages/Radius/RadiusRouterManager.js | 41 ++++++++----
 4 files changed, 113 insertions(+), 13 deletions(-)

diff --git a/application/Radius/RadiusController.php b/application/Radius/RadiusController.php
index 5af86bb65..54822e554 100644
--- a/application/Radius/RadiusController.php
+++ b/application/Radius/RadiusController.php
@@ -218,6 +218,69 @@ class RadiusController extends mfBaseController {
         }
     }
 
+    protected function genieacsGetDeviceByMacAction() {
+        try {
+            $mac = $_GET['mac'] ?? null;
+            $this->log->debug("genieacsGetDeviceByMacAction", ['mac' => $mac]);
+            if (!$mac) self::sendError("MAC address is required");
+
+            $acs = $this->getGenieACS();
+            $matchedDevice = $acs->getDeviceByMac($mac);
+
+            if (!$matchedDevice) {
+                self::returnJson(['success' => false, 'message' => 'No device found with this MAC address']);
+                return;
+            }
+
+            self::returnJson([
+                'success' => true,
+                'deviceId' => GenieACS::getDeviceId($matchedDevice),
+                'deviceInfo' => GenieACS::getDeviceInfo($matchedDevice),
+                'mac' => $mac,
+                'externalIp' => GenieACS::getExternalIP($matchedDevice),
+                'managementIp' => GenieACS::getManagementIP($matchedDevice)
+            ]);
+        } catch (Exception $e) {
+            $this->log->debug("GetDeviceByMac Error", ['error' => $e->getMessage()]);
+            self::sendError("Error fetching device: " . $e->getMessage());
+        }
+    }
+
+    protected function genieacsRefreshDeviceAction() {
+        try {
+            $input = json_decode(file_get_contents('php://input'), true);
+            $deviceId = $input['deviceId'] ?? null;
+            $this->log->debug("genieacsRefreshDeviceAction", ['deviceId' => $deviceId]);
+
+            if (!$deviceId) self::sendError("Device ID is required");
+
+            $acs = $this->getGenieACS();
+            $acs->getParameterValues($deviceId, [
+                'InternetGatewayDevice.DeviceInfo.HardwareVersion',
+                'InternetGatewayDevice.DeviceInfo.SoftwareVersion',
+                'InternetGatewayDevice.WANDevice.*.WANConnectionDevice.*.WANIPConnection.*.MACAddress',
+                'InternetGatewayDevice.WANDevice.*.WANConnectionDevice.*.WANIPConnection.*.ExternalIPAddress',
+                'InternetGatewayDevice.LANDevice.*.WLANConfiguration.*.SSID',
+                'InternetGatewayDevice.LANDevice.*.WLANConfiguration.*.KeyPassphrase',
+                'InternetGatewayDevice.LANDevice.*.Hosts.Host.*.HostName',
+                'InternetGatewayDevice.LANDevice.*.Hosts.Host.*.IPAddress',
+                'InternetGatewayDevice.LANDevice.*.Hosts.Host.*.MACAddress'
+            ]);
+
+            $device = $acs->getDevice($deviceId);
+
+            self::returnJson([
+                'success' => true,
+                'deviceInfo' => GenieACS::getDeviceInfo($device),
+                'externalIp' => GenieACS::getExternalIP($device),
+                'managementIp' => GenieACS::getManagementIP($device)
+            ]);
+        } catch (Exception $e) {
+            $this->log->debug("RefreshDevice Error", ['error' => $e->getMessage()]);
+            self::sendError("Error refreshing device: " . $e->getMessage());
+        }
+    }
+
     protected function genieacsRebootDeviceAction() {
         try {
             $input = json_decode(file_get_contents('php://input'), true);
diff --git a/lib/GenieACS/GenieACS.php b/lib/GenieACS/GenieACS.php
index 540026e90..6905065b9 100644
--- a/lib/GenieACS/GenieACS.php
+++ b/lib/GenieACS/GenieACS.php
@@ -106,6 +106,24 @@ class GenieACS {
         return $this->_request('GET', '/api/devices');
     }
 
+    public function getDeviceByMac($mac) {
+        $mac = strtolower(preg_replace('/[^A-Fa-f0-9]/', '', $mac));
+        $mac = implode(':', str_split($mac, 2));
+
+        $paths = [
+            'InternetGatewayDevice.WANDevice.1.WANConnectionDevice.1.WANIPConnection.1.MACAddress',
+            'InternetGatewayDevice.WANDevice.1.WANConnectionDevice.1.WANIPConnection.2.MACAddress',
+        ];
+
+        foreach ($paths as $path) {
+            $filter = urlencode($path . ' = "' . $mac . '"');
+            $result = $this->_request('GET', '/api/devices/?filter=' . $filter . '&limit=1');
+            if ($result && is_array($result) && count($result) > 0) return $result[0];
+        }
+
+        return null;
+    }
+
     public function getDevice($deviceId) {
         return $this->_request('GET', '/api/devices/' . rawurlencode($deviceId));
     }
diff --git a/public/js/pages/Radius/Radius.css b/public/js/pages/Radius/Radius.css
index d5f837d92..aaae5f43c 100644
--- a/public/js/pages/Radius/Radius.css
+++ b/public/js/pages/Radius/Radius.css
@@ -228,8 +228,10 @@
 
 /* Router Management Modal */
 .tt-scope .router-info-header { display: flex; align-items: center; gap: 12px; padding: 20px 24px; margin: -14px -24px 12px -16px; background: linear-gradient(135deg, #e3f0f8 0%, #cce4f5 100%); border-bottom: 2px solid #b8d9f0; }
-.tt-scope .router-info-header i { font-size: 28px; color: var(--accent); flex-shrink: 0; }
+.tt-scope .router-info-header > i { font-size: 28px; color: var(--accent); flex-shrink: 0; }
 .tt-scope .router-header-text { flex-grow: 1; min-height: 39px; }
+.tt-scope .refresh-btn { padding: 8px; border-radius: 6px; flex-shrink: 0; }
+.tt-scope .refresh-btn i { font-size: 16px; margin: 0; }
 .tt-scope .router-title { font-size: 16px; font-weight: 800; color: var(--text); letter-spacing: 0.3px; line-height: 1.375; }
 .tt-scope .router-subtitle { font-size: 12px; color: var(--muted); font-family: var(--mono); margin-top: 2px; line-height: 1.25; }
 .tt-scope .router-info-grid { display: grid; grid-template-columns: repeat(2, 1fr); gap: 10px; margin-bottom: 16px; margin-right: -8px; }
diff --git a/public/js/pages/Radius/RadiusRouterManager.js b/public/js/pages/Radius/RadiusRouterManager.js
index 47289255a..95c92c04d 100644
--- a/public/js/pages/Radius/RadiusRouterManager.js
+++ b/public/js/pages/Radius/RadiusRouterManager.js
@@ -32,6 +32,9 @@ const RadiusRouterManager = {
                     <span v-else>{{ routerDevice.username || userItem.username }}</span>
                   </div>
                 </div>
+                <button class="ghost-btn refresh-btn" @click="refreshDevice" :disabled="routerLoading || refreshLoading" title="Daten aktualisieren">
+                  <i class="fa-duotone fa-arrows-rotate" :class="{ 'fa-spin': refreshLoading }"></i>
+                </button>
               </div>
 
               <!-- Router Information Grid -->
@@ -40,7 +43,7 @@ const RadiusRouterManager = {
                 <tt-info-card icon="fa-code-branch" label="Software Version" :value="routerDevice?.deviceInfo?.softwareVersion" :loading="routerLoading" />
                 <tt-info-card icon="fa-barcode" label="CWMP Account" :value="routerDevice?.deviceInfo?.serialNumber" :loading="routerLoading" />
                 <tt-info-card icon="fa-fingerprint" label="ACS ID" :value="routerDevice?.deviceId" :loading="routerLoading" />
-                <tt-info-card icon="fa-globe" label="Externe IP" :value="routerDevice?.ip" :loading="routerLoading" />
+                <tt-info-card icon="fa-globe" label="Externe IP" :value="routerDevice?.externalIp" :loading="routerLoading" />
                 <tt-info-card icon="fa-network-wired" label="Management IP" :value="routerDevice?.managementIp" :loading="routerLoading" />
               </div>
 
@@ -239,7 +242,8 @@ const RadiusRouterManager = {
 
         showEventLogModal: false,
         eventLogLoading: false,
-        eventLogData: null
+        eventLogData: null,
+        refreshLoading: false
     }),
     watch: {
         show: {
@@ -265,18 +269,12 @@ const RadiusRouterManager = {
             this.speedtestLoading = false;
 
             try {
-                const { data: radacct } = await axios.get(`${window.TT_CONFIG.BASE_PATH}/Radius/proxyUnsecureHTTPRequestToRadius`, {
-                    params: { action2: 'fetchRadacct', username: this.userItem.username }
+                const { data: deviceData } = await axios.get(`${window.TT_CONFIG.BASE_PATH}/Radius/genieacsGetDeviceByMac`, {
+                    params: { mac: this.userItem.username }
                 });
 
-                if (radacct?.ip) {
-                    const { data: deviceData } = await axios.get(`${window.TT_CONFIG.BASE_PATH}/Radius/genieacsGetDeviceByIp`, {
-                        params: { ip: radacct.ip }
-                    });
-
-                    if (deviceData?.success) {
-                        this.routerDevice = deviceData;
-                    }
+                if (deviceData?.success) {
+                    this.routerDevice = deviceData;
                 }
             } catch (error) {
                 console.error('Error fetching router:', error);
@@ -284,6 +282,25 @@ const RadiusRouterManager = {
             }
             this.routerLoading = false;
         },
+        async refreshDevice() {
+            if (!this.routerDevice?.deviceId) return;
+            this.refreshLoading = true;
+            try {
+                const { data } = await axios.post(`${window.TT_CONFIG.BASE_PATH}/Radius/genieacsRefreshDevice`, {
+                    deviceId: this.routerDevice.deviceId
+                });
+                if (data?.success) {
+                    this.routerDevice.deviceInfo = data.deviceInfo;
+                    this.routerDevice.externalIp = data.externalIp;
+                    this.routerDevice.managementIp = data.managementIp;
+                    window.notify('success', 'Daten aktualisiert');
+                }
+            } catch (error) {
+                console.error('Error refreshing device:', error);
+                window.notify('error', 'Fehler beim Aktualisieren');
+            }
+            this.refreshLoading = false;
+        },
         async rebootRouter() {
             if (!this.routerDevice || !this.routerDevice.deviceId) return;
             if (!confirm('Möchten Sie den Router wirklich neu starten?')) return;

From 038e6e1734e130caca30d6f55966449b33862872 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Mon, 26 Jan 2026 13:57:38 +0100
Subject: [PATCH 66/88] creating Snopp Order from Order (OrderProduct with oaid
 or preroder_id)

---
 application/Order/OrderController.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/application/Order/OrderController.php b/application/Order/OrderController.php
index 5d93c5f9f..09c88cd3c 100644
--- a/application/Order/OrderController.php
+++ b/application/Order/OrderController.php
@@ -1500,7 +1500,11 @@ class OrderController extends mfBaseController {
           $this->redirect("Order", "Index", ["id" => $order->id]);
       }
 
-      $order_product->snopp_order_id = 1;
+      if($resp->result->order_id) {
+          $order_product->snopp_order_id = $resp->result->order_id;
+      } else {
+          $order_product->snopp_order_id = 1;
+      }
       $order_product->save();
 
       $this->layout()->setFlash("Bestellung erfolgreich in SNOPP erstellt.", "success");

From e8002d184f1dd65c334316bf3eeb73af303d6a64 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Mon, 26 Jan 2026 15:44:35 +0100
Subject: [PATCH 67/88] fxied vat calculation

---
 Layout/default/ManualInvoice/PDF_MAIN.php     |  16 +--
 .../ManualInvoice/ManualInvoiceController.php | 123 ++++++++++--------
 .../ManualInvoice/ManualInvoiceModel.php      |   9 +-
 .../ManualInvoicepositionModel.php            |   6 +-
 .../WarehouseArticleController.php            |   2 +-
 .../WarehouseArticleModel.php                 |   2 +-
 ...le_rename_revenueaccount_to_vatgroupid.php |  33 +++++
 ...126130000_manualinvoice_column_cleanup.php |  58 +++++++++
 .../js/pages/ManualInvoice/ManualInvoice.js   |  83 ++++++------
 .../WarehouseArticle/WarehouseArticle.js      |  16 +--
 10 files changed, 224 insertions(+), 124 deletions(-)
 create mode 100644 db/migrations/20260126120000_warehousearticle_rename_revenueaccount_to_vatgroupid.php
 create mode 100644 db/migrations/20260126130000_manualinvoice_column_cleanup.php

diff --git a/Layout/default/ManualInvoice/PDF_MAIN.php b/Layout/default/ManualInvoice/PDF_MAIN.php
index 49ef1d468..3e6523035 100644
--- a/Layout/default/ManualInvoice/PDF_MAIN.php
+++ b/Layout/default/ManualInvoice/PDF_MAIN.php
@@ -17,7 +17,7 @@ foreach($invoice->positions as $p) {
     }
 }
 
-$gesamtrabatt = $invoice->gesamtrabatt ?? 0;
+$total_discount = $invoice->total_discount ?? 0;
 $subtotal = 0;
 foreach($invoice->positions as $p) {
     $subtotal += $p->price_total ?? 0;
@@ -127,8 +127,8 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]);
 
     <h2 style="text-align: center;color: #005384">Ihre Xinon <?=($is_credit) ? "Gutschrift" : "Rechnung"?> vom <?=date("d.m.Y",$invoice->invoice_date)?></h2>
 
-    <?php if($invoice->einleitender_text ?? ''): ?>
-        <p style="margin-top: 10pt; margin-bottom: 20pt; text-align: center; font-weight: bold;"><?=nl2br(htmlspecialchars($invoice->einleitender_text))?></p>
+    <?php if($invoice->introductory_text ?? ''): ?>
+        <p style="margin-top: 10pt; margin-bottom: 20pt; text-align: center; font-weight: bold;"><?=nl2br(htmlspecialchars($invoice->introductory_text))?></p>
     <?php endif; ?>
 
     <table style="border-collapse: collapse; width: 100%;" id="invoiceTable">
@@ -166,7 +166,7 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]);
 
         <tr class="position <?=($i%2 == 0) ? "even" : "uneven" ?>">
             <td style="padding-left: 4pt; vertical-align: top;">
-                <?=htmlspecialchars($p->product_name ?? '')?>
+                <?=htmlspecialchars($p->warehousearticle_name ?? '')?>
                 <?php if(isset($p->product_info) && $p->product_info): ?>
                 <div style="padding-left: 12pt; font-size: 10px; color: #666;"><?=htmlspecialchars($p->product_info)?></div>
                 <?php endif; ?>
@@ -186,17 +186,17 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]);
         endforeach;
         endforeach;
         ?>
-        <?php if($gesamtrabatt > 0): ?>
+        <?php if($total_discount > 0): ?>
         <tr style="background-color: #ebebeb; border-top: 2px solid black;">
             <td colspan="<?=$hasDiscount ? '5' : '4'?>" style="padding: 4px 0;">Zwischensumme:</td>
             <td colspan="2" style="text-align: right; padding-right: 4pt;"><?=number_format($subtotal, 2, ",","."). " €"?></td>
         </tr>
         <tr style="background-color: #ebebeb; border-bottom: 1px solid #ccc;">
-            <td colspan="<?=$hasDiscount ? '5' : '4'?>" style="padding: 4px 0;">Gesamtrabatt <?=number_format($gesamtrabatt, 2, ",", ".")?>%:</td>
-            <td colspan="2" style="text-align: right; padding-right: 4pt; color: #d32f2f;">-<?=number_format($subtotal * ($gesamtrabatt / 100), 2, ",","."). " €"?></td>
+            <td colspan="<?=$hasDiscount ? '5' : '4'?>" style="padding: 4px 0;">Gesamtrabatt <?=number_format($total_discount, 2, ",", ".")?>%:</td>
+            <td colspan="2" style="text-align: right; padding-right: 4pt; color: #d32f2f;">-<?=number_format($subtotal * ($total_discount / 100), 2, ",","."). " €"?></td>
         </tr>
         <?php endif; ?>
-        <tr style="font-weight: bold; background-color: #ebebeb; border-bottom: 1px solid black;<?=($gesamtrabatt > 0) ? '' : 'border-top: 2px solid black;'?>">
+        <tr style="font-weight: bold; background-color: #ebebeb; border-bottom: 1px solid black;<?=($total_discount > 0) ? '' : 'border-top: 2px solid black;'?>">
             <td colspan="<?=$hasDiscount ? '5' : '4'?>" style="padding: 4px 0;">Gesamt Netto:</td>
             <td colspan="2" style="text-align: right; padding-right: 4pt;"><?=number_format($net_total, 2, ",","."). " €"?></td>
         </tr>
diff --git a/application/ManualInvoice/ManualInvoiceController.php b/application/ManualInvoice/ManualInvoiceController.php
index e55a94a8c..b29cca986 100644
--- a/application/ManualInvoice/ManualInvoiceController.php
+++ b/application/ManualInvoice/ManualInvoiceController.php
@@ -105,8 +105,8 @@ class ManualInvoiceController extends TTCrud
             "{{ billingAccount }}" => $invoice->fibu_account_number ?? '',
             "{{ invoiceNumber }}" => $invoice->invoice_number ?? "VORSCHAU",
             "{{ invoiceDate }}" => date("d.m.Y", $invoice->invoice_date ?? time()),
-            "{{ leistungszeitraumHtml }}" => ($invoice->leistungszeitraum ?? '') ? "<tr><td>Leistungszeitraum:</td><td>" . htmlspecialchars($invoice->leistungszeitraum) . "</td></tr>" : "",
-            "{{ externeReferenzHtml }}" => ($invoice->externe_referenz ?? '') ? "<tr><td>Externe Referenz:</td><td>" . htmlspecialchars($invoice->externe_referenz) . "</td></tr>" : "",
+            "{{ leistungszeitraumHtml }}" => ($invoice->performance_period ?? '') ? "<tr><td>Leistungszeitraum:</td><td>" . htmlspecialchars($invoice->performance_period) . "</td></tr>" : "",
+            "{{ externeReferenzHtml }}" => ($invoice->external_reference ?? '') ? "<tr><td>Externe Referenz:</td><td>" . htmlspecialchars($invoice->external_reference) . "</td></tr>" : "",
             "{{ vatHtml }}" => ($invoice->uid ?? '') ? "<tr><td>Ihre UID:</td><td>" . $invoice->uid . "</td></tr>" : "",
             "{{ qrCodeHtml }}" => ($invoice->total_gross ?? 0) >= 0
                 ? '<td style="vertical-align: top; padding-right: 10px;"><img alt="QR-Code" src="' . $this->generateSepaQRCode($invoice->invoice_number ?? "VORSCHAU", round($invoice->total_gross ?? 0, 2)) . '" style="display: block; height: 100%; max-height: 3.5cm; width: auto;"></td>'
@@ -393,11 +393,32 @@ class ManualInvoiceController extends TTCrud
         $data['status'] = 'erstellt';
         $data['fibu_payment_skonto'] = $data['fibu_payment_skonto'] ?? 0;
         $data['fibu_payment_skonto_rate'] = $data['fibu_payment_skonto_rate'] ?? 0;
-        $data['gesamtrabatt'] = $data['gesamtrabatt'] ?? 0;
+
+        $data['total_discount'] = $data['total_discount'] ?? $data['gesamtrabatt'] ?? 0;
+        $data['performance_period'] = $data['performance_period'] ?? $data['leistungszeitraum'] ?? null;
+        $data['introductory_text'] = $data['introductory_text'] ?? $data['einleitender_text'] ?? null;
+        $data['external_reference'] = $data['external_reference'] ?? $data['externe_referenz'] ?? null;
+        unset($data['gesamtrabatt'], $data['leistungszeitraum'], $data['einleitender_text'], $data['externe_referenz'], $data['billing_delivery']);
+
         $data['total'] = $data['total'] ?? 0;
         $data['total_gross'] = $data['total_gross'] ?? 0;
         $data['lock'] = 0;
         $data['exported'] = 0;
+
+        if (($data['billing_type'] ?? '') === 'sepa' && ($data['billingaddress_id'] ?? null)) {
+            $address = new Address($data['billingaddress_id']);
+            if ($address->id) {
+                $data['bank_account_bank'] = $address->bank_account_bank;
+                $data['bank_account_owner'] = $address->bank_account_owner;
+                $data['bank_account_iban'] = str_replace(' ', '', $address->bank_account_iban ?? '');
+                $data['bank_account_bic'] = str_replace(' ', '', $address->bank_account_bic ?? '');
+                if ($address->sepa_date) {
+                    $data['sepa_date'] = date('Y-m-d', $address->sepa_date);
+                }
+                $data['sepa_id'] = 'R' . ($data['fibu_account_number'] ?? '');
+            }
+        }
+
         $data['create_by'] = $me->id;
         $data['edit_by'] = $me->id;
         $data['create'] = time();
@@ -476,31 +497,40 @@ class ManualInvoiceController extends TTCrud
         $me = new User();
         $me->loadMe();
 
-        // Fields that exist in ManualInvoicepositionModel
-        $allowedFields = ['billing_id', 'contract_id', 'matchcode', 'product_id', 'product_name', 'product_info',
-            'amount', 'unit', 'price', 'discount', 'price_total', 'price_gross', 'vatrate',
-            'fibu_cost_account', 'fibu_cost_account_legacy', 'fibu_taxcode', 'options'];
-
         foreach ($this->tempPositions as $position) {
-            // Skip empty positions
-            if (empty($position['product_name']) || ($position['amount'] ?? 0) == 0) continue;
+            $articleName = $position['warehousearticle_name'] ?? $position['product_name'] ?? '';
+            if (empty($articleName) || ($position['amount'] ?? 0) == 0) continue;
 
-            // Map _group to position_group
-            $groupName = $position['_group'] ?? null;
+            $amount = floatval($position['amount']);
+            $price = floatval($position['price']);
+            $discount = floatval($position['discount'] ?? 0);
+            $vatrate = floatval($position['vatrate'] ?? 0);
+            $priceAfterDiscount = $amount * $price * (1 - $discount / 100);
+            $priceGross = $priceAfterDiscount * (1 + $vatrate / 100);
 
-            // Filter to only allowed fields
-            $filteredPosition = array_intersect_key($position, array_flip($allowedFields));
-
-            ManualInvoicepositionModel::create(array_merge([
+            ManualInvoicepositionModel::create([
                 'manualinvoice_id' => $invoiceId,
-                'position_group' => $groupName,
-                'unit' => 'Stk.',
-                'discount' => 0,
+                'position_group' => $position['_group'] ?? null,
+                'matchcode' => $position['matchcode'] ?? null,
+                'warehousearticle_id' => $position['warehousearticle_id'] ?? $position['product_id'] ?? 0,
+                'warehousearticle_name' => $articleName,
+                'product_info' => $position['product_info'] ?? '',
+                'amount' => $amount,
+                'unit' => $position['unit'] ?? 'Stk.',
+                'price' => $price,
+                'discount' => $discount,
+                'price_total' => $priceAfterDiscount,
+                'price_gross' => $priceGross,
+                'vatrate' => $vatrate,
+                'fibu_cost_account' => $position['fibu_cost_account'] ?? null,
+                'fibu_cost_account_legacy' => $position['fibu_cost_account_legacy'] ?? null,
+                'fibu_taxcode' => $position['fibu_taxcode'] ?? null,
+                'options' => $position['options'] ?? null,
                 'create_by' => $me->id,
                 'edit_by' => $me->id,
                 'create' => time(),
                 'edit' => time()
-            ], $filteredPosition));
+            ]);
         }
         $this->tempPositions = [];
     }
@@ -510,17 +540,13 @@ class ManualInvoiceController extends TTCrud
 
         $positions = ManualInvoicepositionModel::search(['manualinvoice_id' => $invoiceId]);
         $subtotal = array_sum(array_column($positions, 'price_total'));
+        $totalDiscount = $invoice->total_discount ?? 0;
+        $netTotal = $subtotal * (1 - $totalDiscount / 100);
 
-        // Apply gesamtrabatt (total discount) if exists
-        $gesamtrabatt = $invoice->gesamtrabatt ?? 0;
-        $discountAmount = $subtotal * ($gesamtrabatt / 100);
-        $netTotal = $subtotal - $discountAmount;
-
-        // Calculate gross total with VAT applied after discount
         $grossTotal = 0;
         foreach ($positions as $pos) {
             $positionNet = $pos->price_total;
-            $positionAfterDiscount = $positionNet * (1 - $gesamtrabatt / 100);
+            $positionAfterDiscount = $positionNet * (1 - $totalDiscount / 100);
             $grossTotal += $positionAfterDiscount * (1 + $pos->vatrate / 100);
         }
 
@@ -582,11 +608,11 @@ class ManualInvoiceController extends TTCrud
             'id' => $pos->id,
             'manualinvoice_id' => $pos->manualinvoice_id,
             '_group' => $pos->position_group ?? '',
-            'billing_id' => $pos->billing_id,
-            'contract_id' => $pos->contract_id,
             'matchcode' => $pos->matchcode,
-            'product_id' => $pos->product_id,
-            'product_name' => $pos->product_name,
+            'warehousearticle_id' => $pos->warehousearticle_id,
+            'warehousearticle_name' => $pos->warehousearticle_name,
+            'product_id' => $pos->warehousearticle_id,
+            'product_name' => $pos->warehousearticle_name,
             'product_info' => $pos->product_info,
             'amount' => $pos->amount,
             'unit' => $pos->unit ?? 'Stk.',
@@ -632,19 +658,20 @@ class ManualInvoiceController extends TTCrud
 
         foreach ($existingCredits as $credit) {
             foreach ($credit->getProperty('positions') as $creditPos) {
-                $key = $creditPos->product_id . '_' . $creditPos->matchcode;
+                $key = $creditPos->warehousearticle_id . '_' . $creditPos->matchcode;
                 $creditedAmounts[$key] = ($creditedAmounts[$key] ?? 0) + abs($creditPos->amount);
             }
         }
 
         $availablePositions = [];
         foreach ($positions as $pos) {
-            $key = $pos->product_id . '_' . $pos->matchcode;
+            $key = $pos->warehousearticle_id . '_' . $pos->matchcode;
             $availableAmount = $pos->amount - ($creditedAmounts[$key] ?? 0);
             if ($availableAmount > 0) {
                 $availablePositions[] = [
                     'id' => $pos->id,
-                    'product_name' => $pos->product_name,
+                    'warehousearticle_name' => $pos->warehousearticle_name,
+                    'product_name' => $pos->warehousearticle_name,
                     'product_info' => $pos->product_info,
                     'original_amount' => $pos->amount,
                     'credited_amount' => $creditedAmounts[$key] ?? 0,
@@ -652,7 +679,8 @@ class ManualInvoiceController extends TTCrud
                     'unit' => $pos->unit ?? 'Stk.',
                     'price' => $pos->price,
                     'vatrate' => $pos->vatrate,
-                    'product_id' => $pos->product_id,
+                    'warehousearticle_id' => $pos->warehousearticle_id,
+                    'product_id' => $pos->warehousearticle_id,
                     'matchcode' => $pos->matchcode,
                     'fibu_cost_account' => $pos->fibu_cost_account,
                     'fibu_taxcode' => $pos->fibu_taxcode
@@ -692,10 +720,10 @@ class ManualInvoiceController extends TTCrud
         $invoiceData = [
             'invoice_number' => ManualInvoiceModel::getNextInvoiceNumber(),
             'invoice_date' => time(),
-            'leistungszeitraum' => $originalInvoice->leistungszeitraum ?? null,
-            'einleitender_text' => 'Gutschrift zur Rechnung ' . $originalInvoice->invoice_number,
-            'externe_referenz' => $originalInvoice->externe_referenz ?? null,
-            'gesamtrabatt' => 0,
+            'performance_period' => $originalInvoice->performance_period ?? null,
+            'introductory_text' => 'Gutschrift zur Rechnung ' . $originalInvoice->invoice_number,
+            'external_reference' => $originalInvoice->external_reference ?? null,
+            'total_discount' => 0,
             'owner_id' => $originalInvoice->owner_id,
             'billingaddress_id' => $originalInvoice->billingaddress_id,
             'customer_number' => $originalInvoice->customer_number,
@@ -721,7 +749,6 @@ class ManualInvoiceController extends TTCrud
             'email' => $originalInvoice->email,
             'uid' => $originalInvoice->uid,
             'billing_type' => $originalInvoice->billing_type,
-            'billing_delivery' => $originalInvoice->billing_delivery,
             'bank_account_bank' => $originalInvoice->bank_account_bank,
             'bank_account_owner' => $originalInvoice->bank_account_owner,
             'bank_account_iban' => $originalInvoice->bank_account_iban,
@@ -749,8 +776,8 @@ class ManualInvoiceController extends TTCrud
             ManualInvoicepositionModel::create([
                 'manualinvoice_id' => $creditInvoiceId,
                 'position_group' => null,
-                'product_id' => $pos['product_id'],
-                'product_name' => $pos['product_name'],
+                'warehousearticle_id' => $pos['warehousearticle_id'] ?? $pos['product_id'] ?? 0,
+                'warehousearticle_name' => $pos['warehousearticle_name'] ?? $pos['product_name'] ?? '',
                 'product_info' => $pos['product_info'] ?? '',
                 'amount' => -abs($pos['amount']),
                 'unit' => $pos['unit'] ?? 'Stk.',
@@ -762,8 +789,6 @@ class ManualInvoiceController extends TTCrud
                 'matchcode' => $pos['matchcode'] ?? null,
                 'fibu_cost_account' => $pos['fibu_cost_account'] ?? null,
                 'fibu_taxcode' => $pos['fibu_taxcode'] ?? null,
-                'contract_id' => 0,
-                'billing_id' => null,
                 'create_by' => $me->id,
                 'edit_by' => $me->id,
                 'create' => time(),
@@ -813,12 +838,7 @@ class ManualInvoiceController extends TTCrud
             return;
         }
 
-        // Map revenueAccount to vatgroup_id
-        // revenueAccount 0 = Dienstleistungen = vatgroup_id 2
-        // revenueAccount 1 = Handelswaren = vatgroup_id 3
-        $vatgroupId = $article->revenueAccount == 0 ? 2 : 3;
-
-        // Get vatrate for this vatgroup and area
+        $vatgroupId = $article->vatgroup_id;
         $vatrate = VatrateModel::getFirst(['vatgroup_id' => $vatgroupId, 'area' => $vatarea]);
 
         if (!$vatrate) {
@@ -826,7 +846,6 @@ class ManualInvoiceController extends TTCrud
             return;
         }
 
-        // Parse prices from cheapestSellPrice JSON
         $prices = [];
         if (!empty($article->cheapestSellPrice)) {
             $pricesData = json_decode($article->cheapestSellPrice, true);
@@ -842,7 +861,7 @@ class ManualInvoiceController extends TTCrud
                 'title' => $article->title,
                 'articleNumber' => $article->articleNumber,
                 'description' => $article->description,
-                'revenueAccount' => $article->revenueAccount,
+                'vatgroup_id' => $article->vatgroup_id,
                 'unit' => $article->unit
             ],
             'prices' => $prices,
diff --git a/application/ManualInvoice/ManualInvoiceModel.php b/application/ManualInvoice/ManualInvoiceModel.php
index 7c6d82560..e92102a85 100644
--- a/application/ManualInvoice/ManualInvoiceModel.php
+++ b/application/ManualInvoice/ManualInvoiceModel.php
@@ -4,10 +4,10 @@ class ManualInvoiceModel extends TTCrudBaseModel {
     public int $id;
     public ?string $invoice_number;
     public int $invoice_date;
-    public ?string $leistungszeitraum;
-    public ?string $einleitender_text;
-    public ?string $externe_referenz;
-    public float $gesamtrabatt;
+    public ?string $performance_period;
+    public ?string $introductory_text;
+    public ?string $external_reference;
+    public float $total_discount;
     public int $owner_id;
     public int $billingaddress_id;
     public int $customer_number;
@@ -33,7 +33,6 @@ class ManualInvoiceModel extends TTCrudBaseModel {
     public ?string $email;
     public ?string $uid;
     public string $billing_type;
-    public string $billing_delivery;
     public ?string $bank_account_bank;
     public ?string $bank_account_owner;
     public ?string $bank_account_iban;
diff --git a/application/ManualInvoiceposition/ManualInvoicepositionModel.php b/application/ManualInvoiceposition/ManualInvoicepositionModel.php
index ddaca0479..1a3d71227 100644
--- a/application/ManualInvoiceposition/ManualInvoicepositionModel.php
+++ b/application/ManualInvoiceposition/ManualInvoicepositionModel.php
@@ -4,11 +4,9 @@ class ManualInvoicepositionModel extends TTCrudBaseModel {
     public int $id;
     public ?int $manualinvoice_id;
     public ?string $position_group;
-    public ?int $billing_id;
-    public int $contract_id;
     public ?string $matchcode;
-    public int $product_id;
-    public string $product_name;
+    public int $warehousearticle_id;
+    public string $warehousearticle_name;
     public ?string $product_info;
     public float $amount;
     public string $unit;
diff --git a/application/WarehouseArticle/WarehouseArticleController.php b/application/WarehouseArticle/WarehouseArticleController.php
index aa09bdc00..d7edbaded 100644
--- a/application/WarehouseArticle/WarehouseArticleController.php
+++ b/application/WarehouseArticle/WarehouseArticleController.php
@@ -13,7 +13,7 @@ class WarehouseArticleController extends TTCrud {
         ['key' => 'description', 'text' => 'Beschreibung', 'required' => true,'modal' => ['type' => 'textarea'], 'table' => ['sortable' => false]],
         ['key' => 'category_id', 'text' => 'Kategorie', 'required' => true, 'modal' => ['type' => 'select', 'items' => []], 'table' => ['filter' => 'select']],
         ['key' => 'unit', 'text' => 'Einheit', 'required' => true,'modal' => ['type' => 'select', 'items' => [['value' => 'Stk.', 'text' => 'Stk.'], ['value' => 'Pau.', 'text' => 'Pau.'], ['value' => 'm.', 'text' => 'm.'], ['value' => 'Std.', 'text' => 'Std.'], ['value' => 'km', 'text' => 'km']]], 'table' => ['filter' => 'select', 'filterOptions' => [['value' => 'Stk.', 'text' => 'Stk.'], ['value' => 'Pau.', 'text' => 'Pau.'], ['value' => 'm.', 'text' => 'm.'], ['value' => 'Std.', 'text' => 'Std.'], ['value' => 'km', 'text' => 'km']]]],
-        ['key' => 'revenueAccount', 'text' => 'Erlöskonto', 'required' => true,'modal' => ['type' => 'select', 'items' => [['value' => 0, 'text' => 'Dienstleistungen'], ['value' => 1, 'text' => 'Handelswaren']]], 'table' => false],
+        ['key' => 'vatgroup_id', 'text' => 'Erlöskonto', 'required' => true,'modal' => ['type' => 'select', 'items' => [['value' => 2, 'text' => 'Dienstleistungen'], ['value' => 3, 'text' => 'Handelswaren']]], 'table' => false],
         ['key' => 'cheapestPurchasePrice', 'text' => 'Einkauf', 'modal' => false, 'table' => ['class' => 'text-center', 'suffix' => ' €']],
         ['key' => 'cheapestSellPrice', 'text' => 'Verkauf', 'modal' => false, 'table' => ['class' => 'text-center', 'suffix' => ' €']],
         ['key' => 'warningAmount', 'text' => 'Warnmenge', 'required' => true,'modal' => ['type' => 'number'], 'table' => false],
diff --git a/application/WarehouseArticle/WarehouseArticleModel.php b/application/WarehouseArticle/WarehouseArticleModel.php
index 245e3bb64..a142c81fd 100644
--- a/application/WarehouseArticle/WarehouseArticleModel.php
+++ b/application/WarehouseArticle/WarehouseArticleModel.php
@@ -17,7 +17,7 @@ class WarehouseArticleModel extends TTCrudBaseModel {
     public ?int $isEndOfLife;
     public string $unit;
     public ?int $isSerialDocumentation;
-    public int $revenueAccount;
+    public int $vatgroup_id;
     public int $create;
     public int $createBy;
 }
\ No newline at end of file
diff --git a/db/migrations/20260126120000_warehousearticle_rename_revenueaccount_to_vatgroupid.php b/db/migrations/20260126120000_warehousearticle_rename_revenueaccount_to_vatgroupid.php
new file mode 100644
index 000000000..0ab388300
--- /dev/null
+++ b/db/migrations/20260126120000_warehousearticle_rename_revenueaccount_to_vatgroupid.php
@@ -0,0 +1,33 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class WarehousearticleRenameRevenueaccountToVatgroupid extends AbstractMigration
+{
+    public function up(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+            $this->execute("ALTER TABLE warehousearticle CHANGE revenueAccount vatgroup_id INT(11) NOT NULL DEFAULT 2");
+
+            $this->execute("UPDATE warehousearticle SET vatgroup_id = CASE
+                WHEN vatgroup_id = 0 THEN 2
+                WHEN vatgroup_id = 1 THEN 3
+                ELSE vatgroup_id
+            END");
+        }
+    }
+
+    public function down(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+            $this->execute("UPDATE warehousearticle SET vatgroup_id = CASE
+                WHEN vatgroup_id = 2 THEN 0
+                WHEN vatgroup_id = 3 THEN 1
+                ELSE vatgroup_id
+            END");
+
+            $this->execute("ALTER TABLE warehousearticle CHANGE vatgroup_id revenueAccount INT(11) NOT NULL DEFAULT 0");
+        }
+    }
+}
diff --git a/db/migrations/20260126130000_manualinvoice_column_cleanup.php b/db/migrations/20260126130000_manualinvoice_column_cleanup.php
new file mode 100644
index 000000000..967850e86
--- /dev/null
+++ b/db/migrations/20260126130000_manualinvoice_column_cleanup.php
@@ -0,0 +1,58 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class ManualinvoiceColumnCleanup extends AbstractMigration
+{
+    public function up(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+            $position = $this->table("ManualInvoiceposition");
+            if ($position->hasColumn("billing_id")) {
+                $position->removeColumn("billing_id")->save();
+            }
+            if ($position->hasColumn("contract_id")) {
+                $position->removeColumn("contract_id")->save();
+            }
+            // ManualInvoiceposition: Rename columns
+            $this->execute("ALTER TABLE manualinvoiceposition CHANGE product_id warehousearticle_id INT(11) NOT NULL");
+            $this->execute("ALTER TABLE manualinvoiceposition CHANGE product_name warehousearticle_name VARCHAR(255) NOT NULL");
+
+            $invoice = $this->table("ManualInvoice");
+            if ($invoice->hasColumn("billing_delivery")) {
+                $invoice->removeColumn("billing_delivery")->save();
+            }
+
+            $this->execute("ALTER TABLE manualinvoice CHANGE leistungszeitraum performance_period VARCHAR(255) NULL");
+            $this->execute("ALTER TABLE manualinvoice CHANGE einleitender_text introductory_text TEXT NULL");
+            $this->execute("ALTER TABLE manualinvoice CHANGE externe_referenz external_reference VARCHAR(255) NULL");
+            $this->execute("ALTER TABLE manualinvoice CHANGE gesamtrabatt total_discount DECIMAL(6,2) NOT NULL DEFAULT 0.00");
+        }
+    }
+
+    public function down(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+            $this->execute("ALTER TABLE manualinvoice CHANGE performance_period leistungszeitraum VARCHAR(255) NULL");
+            $this->execute("ALTER TABLE manualinvoice CHANGE introductory_text einleitender_text TEXT NULL");
+            $this->execute("ALTER TABLE manualinvoice CHANGE external_reference externe_referenz VARCHAR(255) NULL");
+            $this->execute("ALTER TABLE manualinvoice CHANGE total_discount gesamtrabatt DECIMAL(6,2) NOT NULL DEFAULT 0.00");
+
+            $invoice = $this->table("ManualInvoice");
+            $invoice->addColumn("billing_delivery", "enum", [
+                "null" => false,
+                "values" => ["email", "paper"],
+                "after" => "billing_type"
+            ])->save();
+
+            $this->execute("ALTER TABLE manualinvoiceposition CHANGE warehousearticle_id product_id INT(11) NOT NULL");
+            $this->execute("ALTER TABLE manualinvoiceposition CHANGE warehousearticle_name product_name VARCHAR(255) NOT NULL");
+
+            $position = $this->table("ManualInvoiceposition");
+            $position->addColumn("billing_id", "integer", ["null" => true, "after" => "position_group"]);
+            $position->addColumn("contract_id", "integer", ["null" => false, "after" => "billing_id"]);
+            $position->save();
+        }
+    }
+}
diff --git a/public/js/pages/ManualInvoice/ManualInvoice.js b/public/js/pages/ManualInvoice/ManualInvoice.js
index ec1b87315..2967d5712 100644
--- a/public/js/pages/ManualInvoice/ManualInvoice.js
+++ b/public/js/pages/ManualInvoice/ManualInvoice.js
@@ -52,27 +52,21 @@ Vue.component('manual-invoice', {
         },
         async handleSave(invoiceData) {
             try {
-                const positions = invoiceData.positions.map(p => {
-                    const amount = parseFloat(p.amount) || 0;
-                    const price = parseFloat(p.price) || 0;
-                    const discount = parseFloat(p.discount) || 0;
-                    const vatrate = parseFloat(p.vatrate) || 0;
-                    const priceAfterDiscount = amount * price * (1 - discount / 100);
-                    return {
-                        ...p, amount, price, discount, vatrate,
-                        unit: p.unit || 'Stk.',
-                        price_total: priceAfterDiscount,
-                        price_gross: priceAfterDiscount * (1 + vatrate / 100),
-                        product_id: p.product_id || 0,
-                        contract_id: p.contract_id || 0,
-                        billing_id: p.billing_id || null,
-                        matchcode: p.matchcode || null,
-                        fibu_cost_account: p.fibu_cost_account || null,
-                        fibu_cost_account_legacy: p.fibu_cost_account_legacy || null,
-                        fibu_taxcode: p.fibu_taxcode || null,
-                        options: p.options || null
-                    };
-                });
+                const positions = invoiceData.positions.map(p => ({
+                    ...p,
+                    amount: parseFloat(p.amount) || 0,
+                    price: parseFloat(p.price) || 0,
+                    discount: parseFloat(p.discount) || 0,
+                    vatrate: parseFloat(p.vatrate) || 0,
+                    unit: p.unit || 'Stk.',
+                    warehousearticle_id: p.warehousearticle_id || p.product_id || 0,
+                    warehousearticle_name: p.warehousearticle_name || p.product_name || '',
+                    matchcode: p.matchcode || null,
+                    fibu_cost_account: p.fibu_cost_account || null,
+                    fibu_cost_account_legacy: p.fibu_cost_account_legacy || null,
+                    fibu_taxcode: p.fibu_taxcode || null,
+                    options: p.options || null
+                }));
 
                 const payload = {
                     ...invoiceData,
@@ -82,11 +76,13 @@ Vue.component('manual-invoice', {
                     customer_number: invoiceData.customer_number || 0,
                     country: invoiceData.country || 'Österreich',
                     billing_type: invoiceData.billing_type || 'invoice',
-                    billing_delivery: 'email',
                     fibu_payment_due: 14,
                     fibu_account_number: invoiceData.fibu_account_number || 0,
-                    vatgroup_id: 1,
-                    gesamtrabatt: parseFloat(invoiceData.gesamtrabatt) || 0
+                    vatgroup_id: invoiceData.vatgroup_id || 1,
+                    performance_period: invoiceData.performance_period || invoiceData.leistungszeitraum || '',
+                    introductory_text: invoiceData.introductory_text || invoiceData.einleitender_text || '',
+                    external_reference: invoiceData.external_reference || invoiceData.externe_referenz || '',
+                    total_discount: parseFloat(invoiceData.total_discount || invoiceData.gesamtrabatt) || 0
                 };
 
                 const url = invoiceData.id ? window.TT_CONFIG.UPDATE_URL : window.TT_CONFIG.CREATE_URL;
@@ -174,15 +170,15 @@ Vue.component('manual-invoice-modal', {
                   </div>
                 </div>
               </div>
-              <tt-input label="Leistungszeitraum" v-model="invoiceData.leistungszeitraum" sm row placeholder="z.B. 01.01.2025 - 31.01.2025"/>
-              <tt-input label="Externe Referenz" v-model="invoiceData.externe_referenz" sm row placeholder="z.B. Auftragsnummer, Bestellnummer"/>
-              <tt-textarea label="Einleitender Text" v-model="invoiceData.einleitender_text" rows="3" sm row/>
+              <tt-input label="Leistungszeitraum" v-model="invoiceData.performance_period" sm row placeholder="z.B. 01.01.2025 - 31.01.2025"/>
+              <tt-input label="Externe Referenz" v-model="invoiceData.external_reference" sm row placeholder="z.B. Auftragsnummer, Bestellnummer"/>
+              <tt-textarea label="Einleitender Text" v-model="invoiceData.introductory_text" rows="3" sm row/>
             </tt-card>
             <tt-card><template v-slot:header><h5><i class="fas fa-list-ol mr-2"></i>Positionen</h5></template>
               <tt-positions-manager group-mode ref="positionsManager" v-model="invoiceData.positions" :config="positionsConfig" @updateField-article_id="onArticleSelected" @updateField-price_type="onPriceTypeChanged" />
             </tt-card>
             <tt-card><template v-slot:header><h5><i class="fas fa-paragraph mr-2"></i>Rabatt</h5></template>
-              <tt-input label="Gesamtrabatt (%)" v-model.number="invoiceData.gesamtrabatt" sm row type="number" placeholder="0"/>
+              <tt-input label="Gesamtrabatt (%)" v-model.number="invoiceData.total_discount" sm row type="number" placeholder="0"/>
             </tt-card>
           </div>
         </div>
@@ -215,8 +211,8 @@ Vue.component('manual-invoice-modal', {
                 id: null, invoice_number: null, invoice_date: moment().format('YYYY-MM-DD'),
                 billingaddress_id: null, owner_id: null, customer_number: 0, fibu_account_number: 0,
                 company: '', firstname: '', lastname: '', street: '', zip: '', city: '', country: 'Österreich',
-                uid: '', email: '', billing_type: 'invoice', tax_text: '',
-                leistungszeitraum: '', einleitender_text: '', externe_referenz: '', gesamtrabatt: 0,
+                uid: '', email: '', billing_type: 'invoice', tax_text: '', vatgroup_id: 1,
+                performance_period: '', introductory_text: '', external_reference: '', total_discount: 0,
                 positions: [], total: 0, total_gross: 0
             },
             positionsConfig: {
@@ -228,7 +224,7 @@ Vue.component('manual-invoice-modal', {
                         customFieldReference: 'WarehouseArticle',
                         emitDisplayValue: true
                     },
-                    product_name: { type: 'input', label: 'Bezeichnung' },
+                    warehousearticle_name: { type: 'input', label: 'Bezeichnung' },
                     product_info: { type: 'input', label: 'Zusatzinfo' },
                     amount: { type: 'input', label: 'Menge', inputType: 'number' },
                     price_type: {
@@ -240,7 +236,7 @@ Vue.component('manual-invoice-modal', {
                     discount: { type: 'input', label: 'Rabatt (%)', inputType: 'number' },
                 },
                 validateForm: (d) => {
-                    if (!d.product_name) { window.notify('error', 'Bezeichnung ist erforderlich.'); return false; }
+                    if (!d.warehousearticle_name) { window.notify('error', 'Bezeichnung ist erforderlich.'); return false; }
                     if (d.amount == null || d.amount === '') { window.notify('error', 'Menge ist erforderlich.'); return false; }
                     if (d.price == null) { window.notify('error', 'Preis ist erforderlich.'); return false; }
                     return true;
@@ -261,18 +257,15 @@ Vue.component('manual-invoice-modal', {
                 subtotal += lineTotal;
             });
 
-            // Apply gesamtrabatt
-            const gesamtrabatt = parseFloat(this.invoiceData.gesamtrabatt) || 0;
-            const net = subtotal * (1 - gesamtrabatt / 100);
-
-            // Calculate VAT
+            const totalDiscount = parseFloat(this.invoiceData.total_discount) || 0;
+            const net = subtotal * (1 - totalDiscount / 100);
             let vat = {}, gross = 0;
             (this.invoiceData.positions || []).forEach(p => {
                 const amount = parseFloat(p.amount) || 0;
                 const price = parseFloat(p.price) || 0;
                 const discount = parseFloat(p.discount) || 0;
                 const r = parseInt(p.vatrate) || 0;
-                const lineNet = amount * price * (1 - discount / 100) * (1 - gesamtrabatt / 100);
+                const lineNet = amount * price * (1 - discount / 100) * (1 - totalDiscount / 100);
                 const lineVat = lineNet * (r / 100);
                 vat[r] = (vat[r] || 0) + lineVat;
                 gross += lineNet + lineVat;
@@ -400,7 +393,7 @@ Vue.component('manual-invoice-modal', {
                 if (data.success && this.$refs.positionsManager) {
                     const pm = this.$refs.positionsManager;
                     if (data.article) {
-                        pm.$set(pm.formData, 'product_name', data.article.articleNumber + ' | ' + data.article.title);
+                        pm.$set(pm.formData, 'warehousearticle_name', data.article.articleNumber + ' | ' + data.article.title);
                         pm.$set(pm.formData, 'product_info', data.article.description || '');
                         pm.$set(pm.formData, 'unit', data.article.unit || 'Stk.');
                     }
@@ -455,7 +448,7 @@ Vue.component('manual-invoice-modal', {
             this.pdfLoading = true;
             try {
                 const positions = this.invoiceData.positions
-                    .filter(p => p.product_name && (parseFloat(p.amount) || 0) !== 0) // Filter out empty positions (allow negative for Gutschrift)
+                    .filter(p => p.warehousearticle_name && (parseFloat(p.amount) || 0) !== 0)
                     .map(p => {
                         const amount = parseFloat(p.amount) || 0;
                         const price = parseFloat(p.price) || 0;
@@ -524,17 +517,17 @@ Vue.component('manual-invoice-modal', {
                     }
 
                     // Pre-fill external reference with shipping note reference
-                    this.invoiceData.externe_referenz = `Lieferschein #${shippingNoteData.shippingNoteId}`;
+                    this.invoiceData.external_reference = `Lieferschein #${shippingNoteData.shippingNoteId}`;
 
                     // Add introductory text if shipping note has notes
                     if (shippingNoteData.note) {
-                        this.invoiceData.einleitender_text = shippingNoteData.note;
+                        this.invoiceData.introductory_text = shippingNoteData.note;
                     }
 
                     // Add all positions (batch operation to avoid triggering watcher for each item)
                     if (shippingNoteData.positions && Array.isArray(shippingNoteData.positions)) {
                         const newPositions = shippingNoteData.positions.map(position => ({
-                            product_name: position.product_name || '',
+                            warehousearticle_name: position.warehousearticle_name || position.product_name || '',
                             product_info: position.product_info || '',
                             amount: parseFloat(position.amount) || 0,
                             unit: position.unit || 'Stk.',
@@ -583,7 +576,7 @@ Vue.component('gutschrift-modal', {
               <tbody>
                 <tr v-for="(pos, index) in invoice.positions" :key="index">
                   <td class="text-center"><input type="checkbox" v-model="selectedPositions[index]"></td>
-                  <td><strong>{{ pos.product_name }}</strong><div v-if="pos.product_info" class="text-muted small">{{ pos.product_info }}</div></td>
+                  <td><strong>{{ pos.warehousearticle_name }}</strong><div v-if="pos.product_info" class="text-muted small">{{ pos.product_info }}</div></td>
                   <td class="text-right">{{ pos.original_amount }}</td><td class="text-right">{{ pos.credited_amount }}</td>
                   <td class="text-right">{{ pos.available_amount }}</td>
                   <td><input type="number" class="form-control form-control-sm" v-model.number="creditAmounts[index]" :max="pos.available_amount" :disabled="!selectedPositions[index]" step="0.001" min="0.001"></td>
@@ -624,7 +617,7 @@ Vue.component('gutschrift-modal', {
                 .map((p, i) => ({ p, i })).filter(({ i }) => this.selectedPositions[i])
                 .map(({ p, i }) => {
                     const amt = this.creditAmounts[i];
-                    if (amt > p.available_amount) throw new Error(`Menge zu hoch: ${p.product_name}`);
+                    if (amt > p.available_amount) throw new Error(`Menge zu hoch: ${p.warehousearticle_name}`);
                     return amt > 0 ? { ...p, amount: amt } : null;
                 }).filter(Boolean);
 
diff --git a/public/js/pages/WarehouseArticle/WarehouseArticle.js b/public/js/pages/WarehouseArticle/WarehouseArticle.js
index b8ad34990..046c6ef87 100644
--- a/public/js/pages/WarehouseArticle/WarehouseArticle.js
+++ b/public/js/pages/WarehouseArticle/WarehouseArticle.js
@@ -437,8 +437,8 @@ Vue.component('warehouse-article-modal', {
                     <div class="col-md-2" :class="{ 'wa-field-disabled': !isEditMode && !formData.category_id }">
                       <tt-select
                         label="Erlöskonto"
-                        v-model="formData.revenueAccount"
-                        :options="revenueAccountOptions"
+                        v-model="formData.vatgroup_id"
+                        :options="vatgroupOptions"
                         required
                         sm/>
                     </div>
@@ -538,7 +538,7 @@ Vue.component('warehouse-article-modal', {
             category_id: null,
             articleNumber: '',
             unit: 'Stk.',
-            revenueAccount: 0,
+            vatgroup_id: 2,
             warningAmount: 0,
             criticalAmount: 0,
             isSerialDocumentation: false,
@@ -566,10 +566,10 @@ Vue.component('warehouse-article-modal', {
                 { value: 'km', text: 'km' }
             ];
         },
-        revenueAccountOptions() {
+        vatgroupOptions() {
             return [
-                { value: 0, text: 'Dienstleistungen' },
-                { value: 1, text: 'Handelswaren' }
+                { value: 2, text: 'Dienstleistungen' },
+                { value: 3, text: 'Handelswaren' }
             ];
         },
         isValid() {
@@ -607,7 +607,7 @@ Vue.component('warehouse-article-modal', {
                         category_id: data.category_id,
                         articleNumber: data.articleNumber || '',
                         unit: data.unit || 'Stk.',
-                        revenueAccount: data.revenueAccount || 0,
+                        vatgroup_id: data.vatgroup_id || 2,
                         warningAmount: data.warningAmount || 0,
                         criticalAmount: data.criticalAmount || 0,
                         isSerialDocumentation: !!data.isSerialDocumentation,
@@ -637,7 +637,7 @@ Vue.component('warehouse-article-modal', {
                 category_id: null,
                 articleNumber: '',
                 unit: 'Stk.',
-                revenueAccount: 0,
+                vatgroup_id: 2,
                 warningAmount: 0,
                 criticalAmount: 0,
                 isSerialDocumentation: false,

From d9386892ab55f2c90084a17f1b6ea794d91a9c89 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Tue, 27 Jan 2026 10:35:15 +0100
Subject: [PATCH 68/88] added offline mode for xinon app

---
 .../Workorder/Workorder/WorkorderHandler.php  | 846 +++++++++++++++++-
 public/mobile/app.js                          | 234 ++++-
 public/mobile/components/OfflineIndicator.js  | 211 +++++
 public/mobile/components/SyncStatus.js        | 225 +++++
 .../modules/workorder/WorkorderModule.js      | 206 +++--
 public/mobile/shared/db.js                    | 188 ++++
 public/mobile/shared/offlineSettings.js       | 250 ++++++
 public/mobile/shared/photoQueue.js            | 437 +++++++++
 public/mobile/shared/syncManager.js           | 414 +++++++++
 public/mobile/shared/syncQueue.js             | 349 ++++++++
 .../mobile/shared/workorderOfflineService.js  | 710 +++++++++++++++
 public/mobile/sw.js                           | 291 +++++-
 12 files changed, 4224 insertions(+), 137 deletions(-)
 create mode 100644 public/mobile/components/OfflineIndicator.js
 create mode 100644 public/mobile/components/SyncStatus.js
 create mode 100644 public/mobile/shared/db.js
 create mode 100644 public/mobile/shared/offlineSettings.js
 create mode 100644 public/mobile/shared/photoQueue.js
 create mode 100644 public/mobile/shared/syncManager.js
 create mode 100644 public/mobile/shared/syncQueue.js
 create mode 100644 public/mobile/shared/workorderOfflineService.js

diff --git a/application/MobileApp/Modules/Workorder/Workorder/WorkorderHandler.php b/application/MobileApp/Modules/Workorder/Workorder/WorkorderHandler.php
index 574b2d060..62d6a58a7 100644
--- a/application/MobileApp/Modules/Workorder/Workorder/WorkorderHandler.php
+++ b/application/MobileApp/Modules/Workorder/Workorder/WorkorderHandler.php
@@ -14,6 +14,12 @@ class WorkorderHandler extends MobileAppBaseHandler {
 
     protected $requiredPermission = 'RMLCompany';
 
+    /** @var string Cache key prefix for idempotency */
+    const IDEMPOTENCY_CACHE_PREFIX = 'workorder_idempotency_';
+
+    /** @var int Idempotency cache TTL in seconds (24 hours) */
+    const IDEMPOTENCY_TTL = 86400;
+
     /** @var array Status definitions for workorders */
     protected $statusOptions = [
         'new' => ['text' => 'Neu', 'color' => 'primary'],
@@ -378,6 +384,16 @@ class WorkorderHandler extends MobileAppBaseHandler {
      * POST /MobileApp/Workorder/Workorder/uploadDocumentation
      */
     public function uploadDocumentationAction() {
+        // Check idempotency
+        $idempotencyKey = $_SERVER['HTTP_X_IDEMPOTENCY_KEY'] ?? null;
+        if ($idempotencyKey) {
+            $cached = $this->getIdempotencyCache($idempotencyKey);
+            if ($cached !== null) {
+                self::returnJson($cached);
+                return;
+            }
+        }
+
         if (empty($_FILES['files']) && empty($_FILES['file'])) {
             self::returnJson(['success' => false, 'message' => 'Keine Datei hochgeladen']);
             return;
@@ -391,6 +407,7 @@ class WorkorderHandler extends MobileAppBaseHandler {
 
         $documentType = $_POST['documentType'] ?? 'general';
         $description = $_POST['description'] ?? '';
+        $clientTimestamp = intval($_POST['clientTimestamp'] ?? 0);
 
         // Handle both single file and multiple files
         if (!empty($_FILES['files'])) {
@@ -429,12 +446,18 @@ class WorkorderHandler extends MobileAppBaseHandler {
                 'workorderId' => $workorder->id,
                 'text' => 'Status wurde nach Dokumenten-Upload automatisch geändert.',
                 'statusChange' => $this->getStatusText($oldStatus) . " -> " . $this->getStatusText($newStatus),
-                'create' => time(),
+                'create' => $clientTimestamp ?: time(),
                 'createBy' => $this->user->id,
             ]);
         }
 
-        self::returnJson(['success' => true, 'message' => 'Datei(en) erfolgreich hochgeladen']);
+        $response = ['success' => true, 'message' => 'Datei(en) erfolgreich hochgeladen'];
+
+        if ($idempotencyKey) {
+            $this->setIdempotencyCache($idempotencyKey, $response);
+        }
+
+        self::returnJson($response);
     }
 
     /**
@@ -459,6 +482,16 @@ class WorkorderHandler extends MobileAppBaseHandler {
      * POST /MobileApp/Workorder/Workorder/addJournal
      */
     public function addJournalAction() {
+        // Check idempotency
+        $idempotencyKey = $_SERVER['HTTP_X_IDEMPOTENCY_KEY'] ?? null;
+        if ($idempotencyKey) {
+            $cached = $this->getIdempotencyCache($idempotencyKey);
+            if ($cached !== null) {
+                self::returnJson($cached);
+                return;
+            }
+        }
+
         $postData = $this->getPostData();
         $workorderId = intval($postData['workorderId'] ?? 0);
         $text = trim($postData['text'] ?? '');
@@ -468,11 +501,14 @@ class WorkorderHandler extends MobileAppBaseHandler {
             return;
         }
 
+        // Use client timestamp if provided
+        $clientTimestamp = intval($postData['clientTimestamp'] ?? 0);
+
         WorkorderJournalModel::create([
             'workorderId' => $workorderId,
             'text' => $text,
             'createBy' => $this->user->id,
-            'create' => time()
+            'create' => $clientTimestamp ?: time()
         ]);
 
         // Return updated journals
@@ -494,11 +530,18 @@ class WorkorderHandler extends MobileAppBaseHandler {
             ];
         }
 
-        self::returnJson([
+        $response = [
             'success' => true,
             'message' => 'Journaleintrag hinzugefügt',
             'journals' => $responseJournals
-        ]);
+        ];
+
+        // Cache for idempotency
+        if ($idempotencyKey) {
+            $this->setIdempotencyCache($idempotencyKey, $response);
+        }
+
+        self::returnJson($response);
     }
 
     /**
@@ -506,8 +549,19 @@ class WorkorderHandler extends MobileAppBaseHandler {
      * POST /MobileApp/Workorder/Workorder/updateAdditionalInfo
      */
     public function updateAdditionalInfoAction() {
+        // Check idempotency
+        $idempotencyKey = $_SERVER['HTTP_X_IDEMPOTENCY_KEY'] ?? null;
+        if ($idempotencyKey) {
+            $cached = $this->getIdempotencyCache($idempotencyKey);
+            if ($cached !== null) {
+                self::returnJson($cached);
+                return;
+            }
+        }
+
         $postData = $this->getPostData();
         $workorderId = intval($postData['workorderId'] ?? 0);
+        $clientTimestamp = intval($postData['clientTimestamp'] ?? 0);
 
         if (!$workorderId) {
             self::returnJson(['success' => false, 'message' => 'Arbeitsauftrags-ID fehlt']);
@@ -528,15 +582,21 @@ class WorkorderHandler extends MobileAppBaseHandler {
         WorkorderJournalModel::create([
             'workorderId' => $workorder->id,
             'text' => "Zusatzinfo geändert.\nAlt: '{$oldInfo}'\nNeu: '{$newInfo}'",
-            'create' => time(),
+            'create' => $clientTimestamp ?: time(),
             'createBy' => $this->user->id,
         ]);
 
-        self::returnJson([
+        $response = [
             'success' => true,
             'message' => 'Zusatzinfo aktualisiert',
             'newInfo' => $newInfo
-        ]);
+        ];
+
+        if ($idempotencyKey) {
+            $this->setIdempotencyCache($idempotencyKey, $response);
+        }
+
+        self::returnJson($response);
     }
 
     /**
@@ -544,9 +604,20 @@ class WorkorderHandler extends MobileAppBaseHandler {
      * POST /MobileApp/Workorder/Workorder/scheduleAppointment
      */
     public function scheduleAppointmentAction() {
+        // Check idempotency
+        $idempotencyKey = $_SERVER['HTTP_X_IDEMPOTENCY_KEY'] ?? null;
+        if ($idempotencyKey) {
+            $cached = $this->getIdempotencyCache($idempotencyKey);
+            if ($cached !== null) {
+                self::returnJson($cached);
+                return;
+            }
+        }
+
         $postData = $this->getPostData();
         $workorderId = intval($postData['workorderId'] ?? 0);
         $appointmentDate = intval($postData['appointmentDate'] ?? 0);
+        $clientTimestamp = intval($postData['clientTimestamp'] ?? 0);
 
         if (!$workorderId || !$appointmentDate) {
             self::returnJson(['success' => false, 'message' => 'Erforderliche Felder fehlen']);
@@ -573,11 +644,17 @@ class WorkorderHandler extends MobileAppBaseHandler {
         WorkorderJournalModel::create([
             'workorderId' => $workorder->id,
             'text' => 'Termin festgelegt auf: ' . date('d.m.Y H:i', $appointmentDate),
-            'create' => time(),
+            'create' => $clientTimestamp ?: time(),
             'createBy' => $this->user->id,
         ]);
 
-        self::returnJson(['success' => true, 'message' => 'Termin erfolgreich gespeichert']);
+        $response = ['success' => true, 'message' => 'Termin erfolgreich gespeichert'];
+
+        if ($idempotencyKey) {
+            $this->setIdempotencyCache($idempotencyKey, $response);
+        }
+
+        self::returnJson($response);
     }
 
     /**
@@ -585,10 +662,21 @@ class WorkorderHandler extends MobileAppBaseHandler {
      * POST /MobileApp/Workorder/Workorder/requestIntervention
      */
     public function requestInterventionAction() {
+        // Check idempotency
+        $idempotencyKey = $_SERVER['HTTP_X_IDEMPOTENCY_KEY'] ?? null;
+        if ($idempotencyKey) {
+            $cached = $this->getIdempotencyCache($idempotencyKey);
+            if ($cached !== null) {
+                self::returnJson($cached);
+                return;
+            }
+        }
+
         $postData = $this->getPostData();
         $workorderId = intval($postData['workorderId'] ?? 0);
         $journalText = trim($postData['journalText'] ?? '');
         $interventionType = $postData['interventionType'] ?? '';
+        $clientTimestamp = intval($postData['clientTimestamp'] ?? 0);
 
         if (!$workorderId || !$journalText) {
             self::returnJson(['success' => false, 'message' => 'Erforderliche Felder fehlen']);
@@ -611,11 +699,17 @@ class WorkorderHandler extends MobileAppBaseHandler {
             'workorderId' => $workorder->id,
             'text' => $fullText,
             'statusChange' => $this->getStatusText($oldStatus) . " -> " . $this->getStatusText('intervention_required'),
-            'create' => time(),
+            'create' => $clientTimestamp ?: time(),
             'createBy' => $this->user->id,
         ]);
 
-        self::returnJson(['success' => true, 'message' => 'Eingriff wurde angefordert']);
+        $response = ['success' => true, 'message' => 'Eingriff wurde angefordert'];
+
+        if ($idempotencyKey) {
+            $this->setIdempotencyCache($idempotencyKey, $response);
+        }
+
+        self::returnJson($response);
     }
 
     /**
@@ -623,8 +717,19 @@ class WorkorderHandler extends MobileAppBaseHandler {
      * POST /MobileApp/Workorder/Workorder/completeWorkorder
      */
     public function completeWorkorderAction() {
+        // Check idempotency
+        $idempotencyKey = $_SERVER['HTTP_X_IDEMPOTENCY_KEY'] ?? null;
+        if ($idempotencyKey) {
+            $cached = $this->getIdempotencyCache($idempotencyKey);
+            if ($cached !== null) {
+                self::returnJson($cached);
+                return;
+            }
+        }
+
         $postData = $this->getPostData();
         $workorderId = intval($postData['workorderId'] ?? 0);
+        $clientTimestamp = intval($postData['clientTimestamp'] ?? 0);
 
         if (!$workorderId) {
             self::returnJson(['success' => false, 'message' => 'Arbeitsauftrags-ID fehlt']);
@@ -650,6 +755,23 @@ class WorkorderHandler extends MobileAppBaseHandler {
             }
         }
 
+        // Validate checklist
+        $docTypes = $tenantConfig ? json_decode($tenantConfig->documentationTypes, true) : [];
+        $docs = WorkorderDocumentationModel::getAll(['workorderId' => $workorderId]);
+        $uploadedTypes = array_column((array)$docs, 'documentType');
+        $uploadedTypeCounts = array_count_values($uploadedTypes);
+
+        foreach ($docTypes as $type) {
+            if (($type['required'] ?? false) && empty($uploadedTypeCounts[$type['value']])) {
+                self::returnJson([
+                    'success' => false,
+                    'message' => 'Pflichtdokumentation fehlt: ' . $type['text'],
+                    'checklistIncomplete' => true
+                ]);
+                return;
+            }
+        }
+
         $oldStatus = $workorder->status;
         $workorder->status = 'documented';
         WorkorderModel::update((array)$workorder);
@@ -658,11 +780,17 @@ class WorkorderHandler extends MobileAppBaseHandler {
             'workorderId' => $workorder->id,
             'text' => 'Arbeitsauftrag zur Prüfung eingereicht.',
             'statusChange' => $this->getStatusText($oldStatus) . " -> " . $this->getStatusText('documented'),
-            'create' => time(),
+            'create' => $clientTimestamp ?: time(),
             'createBy' => $this->user->id,
         ]);
 
-        self::returnJson(['success' => true, 'message' => 'Arbeitsauftrag zur Prüfung eingereicht']);
+        $response = ['success' => true, 'message' => 'Arbeitsauftrag zur Prüfung eingereicht'];
+
+        if ($idempotencyKey) {
+            $this->setIdempotencyCache($idempotencyKey, $response);
+        }
+
+        self::returnJson($response);
     }
 
     /**
@@ -670,8 +798,19 @@ class WorkorderHandler extends MobileAppBaseHandler {
      * POST /MobileApp/Workorder/Workorder/updateWorkorderData
      */
     public function updateWorkorderDataAction() {
+        // Check idempotency
+        $idempotencyKey = $_SERVER['HTTP_X_IDEMPOTENCY_KEY'] ?? null;
+        if ($idempotencyKey) {
+            $cached = $this->getIdempotencyCache($idempotencyKey);
+            if ($cached !== null) {
+                self::returnJson($cached);
+                return;
+            }
+        }
+
         $postData = $this->getPostData();
         $workorderId = intval($postData['workorderId'] ?? 0);
+        $clientTimestamp = intval($postData['clientTimestamp'] ?? 0);
 
         if (!$workorderId) {
             self::returnJson(['success' => false, 'message' => 'Arbeitsauftrags-ID fehlt']);
@@ -704,7 +843,11 @@ class WorkorderHandler extends MobileAppBaseHandler {
         }
 
         if (!$changed) {
-            self::returnJson(['success' => true, 'message' => 'Keine Änderungen vorgenommen']);
+            $response = ['success' => true, 'message' => 'Keine Änderungen vorgenommen'];
+            if ($idempotencyKey) {
+                $this->setIdempotencyCache($idempotencyKey, $response);
+            }
+            self::returnJson($response);
             return;
         }
 
@@ -713,11 +856,17 @@ class WorkorderHandler extends MobileAppBaseHandler {
         WorkorderJournalModel::create([
             'workorderId' => $workorder->id,
             'text' => $journalText,
-            'create' => time(),
+            'create' => $clientTimestamp ?: time(),
             'createBy' => $this->user->id,
         ]);
 
-        self::returnJson(['success' => true, 'message' => 'Daten gespeichert']);
+        $response = ['success' => true, 'message' => 'Daten gespeichert'];
+
+        if ($idempotencyKey) {
+            $this->setIdempotencyCache($idempotencyKey, $response);
+        }
+
+        self::returnJson($response);
     }
 
     /**
@@ -767,6 +916,669 @@ class WorkorderHandler extends MobileAppBaseHandler {
         ]);
     }
 
+    // =====================
+    // OFFLINE SYNC ENDPOINTS
+    // =====================
+
+    /**
+     * Get all workorders for offline mode initial sync
+     * Returns full workorder data with details for caching
+     * POST /MobileApp/Workorder/Workorder/getAllForOffline
+     */
+    public function getAllForOfflineAction() {
+        $postData = $this->getPostData();
+        $lastSyncTimestamp = intval($postData['lastSyncTimestamp'] ?? 0);
+
+        // Get company for current user
+        $company = WorkorderCompanyModel::getFirst(['addressId' => $this->user->address_id]);
+        if (!$company) {
+            self::returnJson([
+                'success' => true,
+                'workorders' => [],
+                'workorderDetails' => [],
+                'tenantConfigs' => [],
+                'serverTimestamp' => time(),
+                'isFullSync' => true
+            ]);
+            return;
+        }
+
+        // Get all workorders for this company (active statuses only)
+        $activeStatuses = ['new', 'assigned', 'scheduled', 'in_progress', 'correction_requested',
+                          'intervention_required', 'civil_engineering_required', 'civil_engineering_completed',
+                          'problem_solved', 'documented'];
+
+        $workorders = WorkorderModel::getCompanyWorkorders(
+            ['status' => $activeStatuses],
+            9999, // Large limit for offline sync
+            0,
+            ['key' => 'deadlineDate', 'order' => 'ASC'],
+            $company->id
+        );
+
+        $result = [];
+        $workorderDetails = [];
+        $tenantConfigCache = [];
+
+        foreach ($workorders as $wo) {
+            $woId = $wo['id'];
+            $result[] = $this->transformWorkorder($wo);
+
+            // Get detailed data for each workorder
+            $detailData = $this->getWorkorderWithDetails($woId, $company->id);
+            if ($detailData) {
+                $detail = [
+                    'workorderId' => $woId,
+                    'workorder' => $this->transformWorkorder($detailData, true),
+                    'lastFetched' => time()
+                ];
+
+                // Get tenant config (cached by addressId)
+                $tenantConfig = $this->getTenantConfigFromWorkorder($woId);
+                if ($tenantConfig) {
+                    $configAddressId = $tenantConfig->addressId;
+                    if (!isset($tenantConfigCache[$configAddressId])) {
+                        $tenantConfigCache[$configAddressId] = [
+                            'addressId' => $configAddressId,
+                            'documentationTypes' => json_decode($tenantConfig->documentationTypes, true) ?? [],
+                            'civilEngineeringDocsRequired' => (bool)$tenantConfig->civilEngineeringDocsRequired,
+                            'interventionTypes' => json_decode($tenantConfig->interventionTypes, true) ?? [],
+                            'requireCableLength' => (bool)$tenantConfig->requireCableLength,
+                            'requireCableType' => (bool)$tenantConfig->requireCableType,
+                            'showTechnicalData' => (bool)$tenantConfig->showTechnicalData,
+                            'lastFetched' => time()
+                        ];
+                    }
+                    $detail['tenantConfigAddressId'] = $configAddressId;
+                }
+
+                // Get documentation metadata (without full file data)
+                $docs = WorkorderDocumentationModel::getAll(
+                    ['workorderId' => $woId],
+                    null, 0,
+                    ['key' => 'create', 'order' => 'ASC']
+                );
+
+                $docMeta = [];
+                foreach ($docs as $doc) {
+                    $file = new File($doc->fileId);
+                    $docMeta[] = [
+                        'id' => $doc->id,
+                        'fileId' => $doc->fileId,
+                        'documentType' => $doc->documentType,
+                        'description' => $doc->description,
+                        'mimetype' => $file->mimetype ?? 'application/octet-stream',
+                        'create' => $doc->create,
+                        'thumbnailUrl' => "/MobileApp/Workorder/Workorder/getThumbnail?fileId={$doc->fileId}",
+                        'previewUrl' => "/File/Download/{$doc->fileId}",
+                    ];
+                }
+                $detail['documentation'] = $docMeta;
+
+                // Get journals
+                $journals = WorkorderJournalModel::getAll(
+                    ['workorderId' => $woId],
+                    null, 0,
+                    ['key' => 'create', 'order' => 'DESC']
+                );
+
+                $journalData = [];
+                foreach ($journals as $journal) {
+                    $journalData[] = [
+                        'id' => $journal->id,
+                        'text' => $journal->text,
+                        'statusChange' => $journal->statusChange ?? null,
+                        'createByName' => UserModel::getOne($journal->createBy)->name ?? 'Unbekannt',
+                        'create' => $journal->create,
+                    ];
+                }
+                $detail['journals'] = $journalData;
+
+                $workorderDetails[] = $detail;
+            }
+        }
+
+        self::returnJson([
+            'success' => true,
+            'workorders' => $result,
+            'workorderDetails' => $workorderDetails,
+            'tenantConfigs' => array_values($tenantConfigCache),
+            'serverTimestamp' => time(),
+            'isFullSync' => $lastSyncTimestamp === 0
+        ]);
+    }
+
+    /**
+     * Get list of workorder IDs assigned to this company
+     * Used for reassignment detection
+     * GET /MobileApp/Workorder/Workorder/getWorkorderIds
+     */
+    public function getWorkorderIdsAction() {
+        $company = WorkorderCompanyModel::getFirst(['addressId' => $this->user->address_id]);
+        if (!$company) {
+            self::returnJson(['success' => true, 'workorderIds' => [], 'serverTimestamp' => time()]);
+            return;
+        }
+
+        $activeStatuses = ['new', 'assigned', 'scheduled', 'in_progress', 'correction_requested',
+                          'intervention_required', 'civil_engineering_required', 'civil_engineering_completed',
+                          'problem_solved', 'documented'];
+
+        $db = $this->db();
+        $fronkDbName = FRONKDB_DBNAME;
+
+        $statusIn = "'" . implode("','", $activeStatuses) . "'";
+        $sql = "SELECT id FROM `{$fronkDbName}`.`Workorder`
+                WHERE companyId = " . intval($company->id) . "
+                AND status IN ({$statusIn})";
+
+        $result = $db->query($sql);
+        $ids = [];
+        while ($row = $result->fetch_assoc()) {
+            $ids[] = intval($row['id']);
+        }
+
+        self::returnJson([
+            'success' => true,
+            'workorderIds' => $ids,
+            'serverTimestamp' => time()
+        ]);
+    }
+
+    /**
+     * Process batch of queued operations from offline sync
+     * POST /MobileApp/Workorder/Workorder/syncBatch
+     */
+    public function syncBatchAction() {
+        $postData = $this->getPostData();
+        $operations = $postData['operations'] ?? [];
+
+        if (empty($operations)) {
+            self::returnJson(['success' => true, 'results' => [], 'processedCount' => 0]);
+            return;
+        }
+
+        $results = [];
+        $processedCount = 0;
+
+        foreach ($operations as $op) {
+            $idempotencyKey = $op['idempotencyKey'] ?? null;
+            $operationType = $op['type'] ?? '';
+            $payload = $op['payload'] ?? [];
+            $clientTimestamp = intval($op['clientTimestamp'] ?? 0);
+
+            // Check idempotency cache
+            if ($idempotencyKey) {
+                $cached = $this->getIdempotencyCache($idempotencyKey);
+                if ($cached !== null) {
+                    $results[] = [
+                        'idempotencyKey' => $idempotencyKey,
+                        'success' => true,
+                        'cached' => true,
+                        'result' => $cached
+                    ];
+                    $processedCount++;
+                    continue;
+                }
+            }
+
+            // Process operation
+            $opResult = $this->processOfflineOperation($operationType, $payload, $clientTimestamp);
+
+            // Store in idempotency cache
+            if ($idempotencyKey && $opResult['success']) {
+                $this->setIdempotencyCache($idempotencyKey, $opResult);
+            }
+
+            $results[] = [
+                'idempotencyKey' => $idempotencyKey,
+                'success' => $opResult['success'],
+                'cached' => false,
+                'result' => $opResult,
+                'error' => $opResult['error'] ?? null
+            ];
+
+            if ($opResult['success']) {
+                $processedCount++;
+            }
+        }
+
+        self::returnJson([
+            'success' => true,
+            'results' => $results,
+            'processedCount' => $processedCount,
+            'totalOperations' => count($operations),
+            'serverTimestamp' => time()
+        ]);
+    }
+
+    /**
+     * Process a single offline operation
+     */
+    private function processOfflineOperation($type, $payload, $clientTimestamp) {
+        try {
+            switch ($type) {
+                case 'ADD_JOURNAL':
+                    return $this->processAddJournal($payload, $clientTimestamp);
+
+                case 'UPDATE_NOTES':
+                    return $this->processUpdateNotes($payload, $clientTimestamp);
+
+                case 'SCHEDULE_APPOINTMENT':
+                    return $this->processScheduleAppointment($payload, $clientTimestamp);
+
+                case 'REQUEST_INTERVENTION':
+                    return $this->processRequestIntervention($payload, $clientTimestamp);
+
+                case 'UPDATE_CABLE_DATA':
+                    return $this->processUpdateCableData($payload, $clientTimestamp);
+
+                case 'COMPLETE_WORKORDER':
+                    return $this->processCompleteWorkorder($payload, $clientTimestamp);
+
+                default:
+                    return ['success' => false, 'error' => 'Unknown operation type: ' . $type];
+            }
+        } catch (Exception $e) {
+            return ['success' => false, 'error' => $e->getMessage()];
+        }
+    }
+
+    private function processAddJournal($payload, $clientTimestamp) {
+        $workorderId = intval($payload['workorderId'] ?? 0);
+        $text = trim($payload['text'] ?? '');
+
+        if (!$workorderId || !$text) {
+            return ['success' => false, 'error' => 'Missing required fields'];
+        }
+
+        $journalId = WorkorderJournalModel::create([
+            'workorderId' => $workorderId,
+            'text' => $text,
+            'createBy' => $this->user->id,
+            'create' => $clientTimestamp ?: time()
+        ]);
+
+        return ['success' => true, 'journalId' => $journalId];
+    }
+
+    private function processUpdateNotes($payload, $clientTimestamp) {
+        $workorderId = intval($payload['workorderId'] ?? 0);
+
+        if (!$workorderId) {
+            return ['success' => false, 'error' => 'Missing workorderId'];
+        }
+
+        $workorder = WorkorderModel::get($workorderId);
+        if (!$workorder) {
+            return ['success' => false, 'error' => 'Workorder not found'];
+        }
+
+        $oldInfo = $workorder->additionalInfo;
+        $newInfo = $payload['additionalInfo'] ?? null;
+
+        // Conflict resolution: concatenate if server has newer changes
+        // For now, we use last-write-wins but log the change
+        $workorder->additionalInfo = $newInfo;
+        WorkorderModel::update((array)$workorder);
+
+        WorkorderJournalModel::create([
+            'workorderId' => $workorder->id,
+            'text' => "Zusatzinfo geändert (Offline-Sync).\nAlt: '{$oldInfo}'\nNeu: '{$newInfo}'",
+            'create' => $clientTimestamp ?: time(),
+            'createBy' => $this->user->id,
+        ]);
+
+        return ['success' => true, 'newInfo' => $newInfo];
+    }
+
+    private function processScheduleAppointment($payload, $clientTimestamp) {
+        $workorderId = intval($payload['workorderId'] ?? 0);
+        $appointmentDate = intval($payload['appointmentDate'] ?? 0);
+
+        if (!$workorderId || !$appointmentDate) {
+            return ['success' => false, 'error' => 'Missing required fields'];
+        }
+
+        $workorder = WorkorderModel::get($workorderId);
+        if (!$workorder) {
+            return ['success' => false, 'error' => 'Workorder not found'];
+        }
+
+        $workorder->appointmentDate = $appointmentDate;
+        $workorder->status = 'scheduled';
+        WorkorderModel::update((array)$workorder);
+
+        WorkorderJournalModel::create([
+            'workorderId' => $workorder->id,
+            'text' => 'Termin festgelegt auf: ' . date('d.m.Y H:i', $appointmentDate) . ' (Offline-Sync)',
+            'create' => $clientTimestamp ?: time(),
+            'createBy' => $this->user->id,
+        ]);
+
+        return ['success' => true, 'appointmentDate' => $appointmentDate];
+    }
+
+    private function processRequestIntervention($payload, $clientTimestamp) {
+        $workorderId = intval($payload['workorderId'] ?? 0);
+        $journalText = trim($payload['journalText'] ?? '');
+        $interventionType = $payload['interventionType'] ?? '';
+
+        if (!$workorderId || !$journalText) {
+            return ['success' => false, 'error' => 'Missing required fields'];
+        }
+
+        $workorder = WorkorderModel::get($workorderId);
+        if (!$workorder) {
+            return ['success' => false, 'error' => 'Workorder not found'];
+        }
+
+        $oldStatus = $workorder->status;
+        $workorder->status = 'intervention_required';
+        WorkorderModel::update((array)$workorder);
+
+        $fullText = $interventionType ? "{$interventionType}: {$journalText}" : "Eingriff erforderlich: {$journalText}";
+        $fullText .= ' (Offline-Sync)';
+
+        WorkorderJournalModel::create([
+            'workorderId' => $workorder->id,
+            'text' => $fullText,
+            'statusChange' => $this->getStatusText($oldStatus) . " -> " . $this->getStatusText('intervention_required'),
+            'create' => $clientTimestamp ?: time(),
+            'createBy' => $this->user->id,
+        ]);
+
+        return ['success' => true, 'newStatus' => 'intervention_required'];
+    }
+
+    private function processUpdateCableData($payload, $clientTimestamp) {
+        $workorderId = intval($payload['workorderId'] ?? 0);
+
+        if (!$workorderId) {
+            return ['success' => false, 'error' => 'Missing workorderId'];
+        }
+
+        $workorder = WorkorderModel::get($workorderId);
+        if (!$workorder) {
+            return ['success' => false, 'error' => 'Workorder not found'];
+        }
+
+        $journalText = "Zusatzdaten aktualisiert (Offline-Sync):\n";
+        $changed = false;
+
+        if (isset($payload['cableLength'])) {
+            if ($workorder->cableLength != $payload['cableLength']) {
+                $journalText .= "Kabellänge: '{$workorder->cableLength}' -> '{$payload['cableLength']}'\n";
+                $workorder->cableLength = $payload['cableLength'];
+                $changed = true;
+            }
+        }
+
+        if (isset($payload['cableType'])) {
+            if ($workorder->cableType != $payload['cableType']) {
+                $journalText .= "Kabeltyp: '{$workorder->cableType}' -> '{$payload['cableType']}'\n";
+                $workorder->cableType = $payload['cableType'];
+                $changed = true;
+            }
+        }
+
+        if ($changed) {
+            WorkorderModel::update((array)$workorder);
+            WorkorderJournalModel::create([
+                'workorderId' => $workorder->id,
+                'text' => $journalText,
+                'create' => $clientTimestamp ?: time(),
+                'createBy' => $this->user->id,
+            ]);
+        }
+
+        return ['success' => true, 'changed' => $changed];
+    }
+
+    private function processCompleteWorkorder($payload, $clientTimestamp) {
+        $workorderId = intval($payload['workorderId'] ?? 0);
+
+        if (!$workorderId) {
+            return ['success' => false, 'error' => 'Missing workorderId'];
+        }
+
+        $workorder = WorkorderModel::get($workorderId);
+        if (!$workorder) {
+            return ['success' => false, 'error' => 'Workorder not found'];
+        }
+
+        // Validate cable data if required
+        $tenantConfig = $this->getTenantConfigFromWorkorder($workorderId);
+        if ($tenantConfig) {
+            if ($tenantConfig->requireCableLength && empty(trim($workorder->cableLength))) {
+                return ['success' => false, 'error' => 'Cable length required', 'validationError' => true];
+            }
+            if ($tenantConfig->requireCableType && empty(trim($workorder->cableType))) {
+                return ['success' => false, 'error' => 'Cable type required', 'validationError' => true];
+            }
+        }
+
+        // Validate checklist
+        $docTypes = $tenantConfig ? json_decode($tenantConfig->documentationTypes, true) : [];
+        $docs = WorkorderDocumentationModel::getAll(['workorderId' => $workorderId]);
+        $uploadedTypes = array_column((array)$docs, 'documentType');
+        $uploadedTypeCounts = array_count_values($uploadedTypes);
+
+        foreach ($docTypes as $type) {
+            if (($type['required'] ?? false) && empty($uploadedTypeCounts[$type['value']])) {
+                return [
+                    'success' => false,
+                    'error' => 'Required documentation missing: ' . $type['text'],
+                    'validationError' => true,
+                    'checklistIncomplete' => true
+                ];
+            }
+        }
+
+        $oldStatus = $workorder->status;
+        $workorder->status = 'documented';
+        WorkorderModel::update((array)$workorder);
+
+        WorkorderJournalModel::create([
+            'workorderId' => $workorder->id,
+            'text' => 'Arbeitsauftrag zur Prüfung eingereicht (Offline-Sync).',
+            'statusChange' => $this->getStatusText($oldStatus) . " -> " . $this->getStatusText('documented'),
+            'create' => $clientTimestamp ?: time(),
+            'createBy' => $this->user->id,
+        ]);
+
+        return ['success' => true, 'newStatus' => 'documented'];
+    }
+
+    /**
+     * Get thumbnail for documentation image
+     * GET /MobileApp/Workorder/Workorder/getThumbnail?fileId=X
+     */
+    public function getThumbnailAction() {
+        $fileId = intval($this->request->fileId ?? 0);
+
+        if (!$fileId) {
+            header('HTTP/1.1 400 Bad Request');
+            echo 'File ID required';
+            return;
+        }
+
+        $file = new File($fileId);
+        if (!$file->id) {
+            header('HTTP/1.1 404 Not Found');
+            echo 'File not found';
+            return;
+        }
+
+        // Check if it's an image
+        $mimetype = $file->mimetype ?? '';
+        if (strpos($mimetype, 'image/') !== 0) {
+            // For non-images, redirect to download
+            header('Location: /File/Download/' . $fileId);
+            return;
+        }
+
+        // Generate thumbnail path
+        $thumbDir = DATADIR . 'thumbnails/workorder/';
+        if (!is_dir($thumbDir)) {
+            mkdir($thumbDir, 0755, true);
+        }
+
+        $thumbPath = $thumbDir . $fileId . '_200x200.jpg';
+
+        // Generate thumbnail if it doesn't exist
+        if (!file_exists($thumbPath)) {
+            $sourcePath = $file->getFilepath();
+            if (!$sourcePath || !file_exists($sourcePath)) {
+                header('HTTP/1.1 404 Not Found');
+                echo 'Source file not found';
+                return;
+            }
+
+            // Create thumbnail
+            $this->createThumbnail($sourcePath, $thumbPath, 200, 200, $mimetype);
+        }
+
+        // Serve the thumbnail
+        if (file_exists($thumbPath)) {
+            header('Content-Type: image/jpeg');
+            header('Cache-Control: public, max-age=31536000'); // Cache for 1 year
+            header('Content-Length: ' . filesize($thumbPath));
+            readfile($thumbPath);
+        } else {
+            // Fallback to original
+            header('Location: /File/Download/' . $fileId);
+        }
+    }
+
+    /**
+     * Create a thumbnail from an image
+     */
+    private function createThumbnail($sourcePath, $destPath, $maxWidth, $maxHeight, $mimetype) {
+        // Get source image info
+        $imageInfo = getimagesize($sourcePath);
+        if (!$imageInfo) {
+            return false;
+        }
+
+        $srcWidth = $imageInfo[0];
+        $srcHeight = $imageInfo[1];
+
+        // Calculate new dimensions
+        $ratio = min($maxWidth / $srcWidth, $maxHeight / $srcHeight);
+        $newWidth = round($srcWidth * $ratio);
+        $newHeight = round($srcHeight * $ratio);
+
+        // Create source image resource
+        switch ($mimetype) {
+            case 'image/jpeg':
+            case 'image/jpg':
+                $srcImage = imagecreatefromjpeg($sourcePath);
+                break;
+            case 'image/png':
+                $srcImage = imagecreatefrompng($sourcePath);
+                break;
+            case 'image/gif':
+                $srcImage = imagecreatefromgif($sourcePath);
+                break;
+            case 'image/webp':
+                $srcImage = imagecreatefromwebp($sourcePath);
+                break;
+            default:
+                return false;
+        }
+
+        if (!$srcImage) {
+            return false;
+        }
+
+        // Create destination image
+        $destImage = imagecreatetruecolor($newWidth, $newHeight);
+
+        // Preserve transparency for PNG
+        if ($mimetype === 'image/png') {
+            imagealphablending($destImage, false);
+            imagesavealpha($destImage, true);
+            $transparent = imagecolorallocatealpha($destImage, 255, 255, 255, 127);
+            imagefilledrectangle($destImage, 0, 0, $newWidth, $newHeight, $transparent);
+        } else {
+            // White background for other formats
+            $white = imagecolorallocate($destImage, 255, 255, 255);
+            imagefilledrectangle($destImage, 0, 0, $newWidth, $newHeight, $white);
+        }
+
+        // Resize
+        imagecopyresampled(
+            $destImage, $srcImage,
+            0, 0, 0, 0,
+            $newWidth, $newHeight,
+            $srcWidth, $srcHeight
+        );
+
+        // Save as JPEG
+        $result = imagejpeg($destImage, $destPath, 85);
+
+        // Clean up
+        imagedestroy($srcImage);
+        imagedestroy($destImage);
+
+        return $result;
+    }
+
+    // =====================
+    // IDEMPOTENCY HELPERS
+    // =====================
+
+    /**
+     * Get cached idempotency response
+     */
+    private function getIdempotencyCache($key) {
+        $cacheKey = self::IDEMPOTENCY_CACHE_PREFIX . $key;
+
+        // Try APC cache first (if available)
+        if (function_exists('apcu_fetch')) {
+            $success = false;
+            $data = apcu_fetch($cacheKey, $success);
+            if ($success) {
+                return $data;
+            }
+        }
+
+        // Fall back to file cache
+        $cachePath = sys_get_temp_dir() . '/' . $cacheKey . '.json';
+        if (file_exists($cachePath)) {
+            $data = json_decode(file_get_contents($cachePath), true);
+            if ($data && isset($data['expires']) && $data['expires'] > time()) {
+                return $data['response'];
+            }
+            // Expired, delete
+            unlink($cachePath);
+        }
+
+        return null;
+    }
+
+    /**
+     * Store idempotency response in cache
+     */
+    private function setIdempotencyCache($key, $response) {
+        $cacheKey = self::IDEMPOTENCY_CACHE_PREFIX . $key;
+
+        // Try APC cache first (if available)
+        if (function_exists('apcu_store')) {
+            apcu_store($cacheKey, $response, self::IDEMPOTENCY_TTL);
+            return;
+        }
+
+        // Fall back to file cache
+        $cachePath = sys_get_temp_dir() . '/' . $cacheKey . '.json';
+        $data = [
+            'response' => $response,
+            'expires' => time() + self::IDEMPOTENCY_TTL
+        ];
+        file_put_contents($cachePath, json_encode($data));
+    }
+
     // =====================
     // HELPER METHODS
     // =====================
diff --git a/public/mobile/app.js b/public/mobile/app.js
index 1373cc5d6..2442bc899 100644
--- a/public/mobile/app.js
+++ b/public/mobile/app.js
@@ -4,6 +4,11 @@ import MainMenu from '/mobile/components/MainMenu.js';
 import LagerModule from '/mobile/modules/lager/LagerModule.js';
 import ShippingNoteModule from '/mobile/modules/lager/shippingnote/ShippingNoteModule.js';
 import WorkorderModule from '/mobile/modules/workorder/WorkorderModule.js';
+import OfflineIndicator from '/mobile/components/OfflineIndicator.js';
+import SyncStatus from '/mobile/components/SyncStatus.js';
+import { initDatabase, clearAllData, getStorageEstimate } from '/mobile/shared/db.js';
+import offlineSettings from '/mobile/shared/offlineSettings.js';
+import SyncManager from '/mobile/shared/syncManager.js';
 
 const { createApp, ref, computed, onMounted, onUnmounted, watch } = Vue;
 
@@ -33,7 +38,9 @@ const App = {
         MainMenu,
         LagerModule,
         ShippingNoteModule,
-        WorkorderModule
+        WorkorderModule,
+        OfflineIndicator,
+        SyncStatus
     },
 
     setup() {
@@ -55,6 +62,20 @@ const App = {
         const workorderDetailOpen = ref(false);
         const workorderRef = ref(null);
 
+        // Offline mode state
+        const offlineModeEnabled = ref(false);
+        const offlineAutoSync = ref(true);
+        const offlinePendingCount = ref(0);
+        const offlinePendingOps = ref(0);
+        const offlinePendingPhotos = ref(0);
+        const offlineFailedCount = ref(0);
+        const offlineIsSyncing = ref(false);
+        const offlineLastSyncText = ref('Nie synchronisiert');
+        const offlineFreshness = ref('unknown');
+        const offlineSyncProgress = ref(null);
+        const offlineStorageUsed = ref(0);
+        const isOnline = ref(navigator.onLine);
+
         const applyTheme = () => {
             const isDark = localStorage.theme === 'dark' ||
                 (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches);
@@ -112,6 +133,109 @@ const App = {
             } catch (e) {}
         };
 
+        // Offline mode functions
+        const loadOfflineSettings = () => {
+            const settings = offlineSettings.load();
+            offlineModeEnabled.value = settings.enabled;
+            offlineAutoSync.value = settings.autoSync;
+            offlineLastSyncText.value = offlineSettings.getLastSyncText();
+            offlineFreshness.value = offlineSettings.getFreshness();
+        };
+
+        const toggleOfflineMode = async () => {
+            if (offlineModeEnabled.value) {
+                offlineSettings.disable();
+                offlineModeEnabled.value = false;
+            } else {
+                offlineSettings.enable();
+                offlineModeEnabled.value = true;
+                // Initialize database
+                try {
+                    await initDatabase();
+                    SyncManager.init();
+                } catch (error) {
+                    console.error('Failed to initialize offline mode:', error);
+                    showToast('Offline-Modus konnte nicht aktiviert werden', 'error');
+                    offlineSettings.disable();
+                    offlineModeEnabled.value = false;
+                }
+            }
+        };
+
+        const setOfflineAutoSync = (value) => {
+            offlineAutoSync.value = value;
+            offlineSettings.setAutoSync(value);
+        };
+
+        const triggerManualSync = async () => {
+            if (!navigator.onLine) {
+                showToast('Keine Internetverbindung', 'error');
+                return;
+            }
+            const result = await SyncManager.sync();
+            if (result.success) {
+                showToast('Synchronisation abgeschlossen', 'success');
+            } else {
+                showToast(result.error || 'Synchronisation fehlgeschlagen', 'error');
+            }
+        };
+
+        const clearOfflineData = async () => {
+            try {
+                await clearAllData();
+                offlineSettings.clear();
+                offlineModeEnabled.value = false;
+                offlinePendingCount.value = 0;
+                showToast('Offline-Daten gelöscht', 'success');
+            } catch (error) {
+                showToast('Fehler beim Löschen', 'error');
+            }
+        };
+
+        const updateOfflineStatus = async () => {
+            if (offlineModeEnabled.value) {
+                const summary = await SyncManager.getPendingSummary();
+                offlinePendingCount.value = summary.total;
+                offlinePendingOps.value = summary.operations;
+                offlinePendingPhotos.value = summary.photos;
+                offlineFailedCount.value = summary.failed;
+                offlineLastSyncText.value = offlineSettings.getLastSyncText();
+                offlineFreshness.value = offlineSettings.getFreshness();
+                const storage = await getStorageEstimate();
+                offlineStorageUsed.value = storage.usage;
+            }
+        };
+
+        const handleSyncEvent = (event, data) => {
+            switch (event) {
+                case 'sync-start':
+                    offlineIsSyncing.value = true;
+                    offlineSyncProgress.value = null;
+                    break;
+                case 'sync-progress':
+                    offlineSyncProgress.value = data;
+                    break;
+                case 'sync-complete':
+                    offlineIsSyncing.value = false;
+                    offlineSyncProgress.value = null;
+                    updateOfflineStatus();
+                    if (data.reassigned?.length > 0) {
+                        for (const wo of data.reassigned) {
+                            showToast(`Arbeitsauftrag #${wo.id} wurde neu zugewiesen`, 'warning');
+                        }
+                    }
+                    break;
+                case 'sync-error':
+                    offlineIsSyncing.value = false;
+                    offlineSyncProgress.value = null;
+                    break;
+            }
+        };
+
+        const handleOnlineStatusChange = () => {
+            isOnline.value = navigator.onLine;
+        };
+
         const saveLastWorkflow = (module, submodule) => {
             if (module) {
                 const workflow = { module, submodule: submodule || null, timestamp: Date.now() };
@@ -252,7 +376,22 @@ const App = {
             mediaQuery.addEventListener('change', applyTheme);
             window.addEventListener('popstate', handlePopstate);
             window.addEventListener('beforeinstallprompt', handleInstallPrompt);
+            window.addEventListener('online', handleOnlineStatusChange);
+            window.addEventListener('offline', handleOnlineStatusChange);
             loadLagerSettings();
+            loadOfflineSettings();
+
+            // Initialize offline mode if enabled
+            if (offlineModeEnabled.value) {
+                try {
+                    await initDatabase();
+                    SyncManager.init();
+                    SyncManager.subscribe(handleSyncEvent);
+                    await updateOfflineStatus();
+                } catch (error) {
+                    console.error('Failed to initialize offline mode:', error);
+                }
+            }
 
             if (shouldRequirePWA() && !isPWAInstalled()) {
                 showInstallPrompt.value = true;
@@ -288,6 +427,11 @@ const App = {
             mediaQuery.removeEventListener('change', applyTheme);
             window.removeEventListener('popstate', handlePopstate);
             window.removeEventListener('beforeinstallprompt', handleInstallPrompt);
+            window.removeEventListener('online', handleOnlineStatusChange);
+            window.removeEventListener('offline', handleOnlineStatusChange);
+            if (offlineModeEnabled.value) {
+                SyncManager.destroy();
+            }
         });
 
         return {
@@ -322,6 +466,23 @@ const App = {
             workorderRef,
             handleWorkorderDetailOpen,
             handleWorkorderDetailClose,
+            // Offline mode
+            offlineModeEnabled,
+            offlineAutoSync,
+            offlinePendingCount,
+            offlinePendingOps,
+            offlinePendingPhotos,
+            offlineFailedCount,
+            offlineIsSyncing,
+            offlineLastSyncText,
+            offlineFreshness,
+            offlineSyncProgress,
+            offlineStorageUsed,
+            isOnline,
+            toggleOfflineMode,
+            setOfflineAutoSync,
+            triggerManualSync,
+            clearOfflineData,
         };
     },
 
@@ -458,9 +619,16 @@ const App = {
                             </svg>
                         </button>
 
-                        <div class="flex-1 flex justify-center">
+                        <div class="flex-1 flex items-center justify-center gap-2">
                             <img src="/assets/images/xinon-full-transparent.png" class="h-7 dark:hidden" alt="Logo">
                             <img src="/assets/images/xinon-full-transparent-white.png" class="h-7 hidden dark:block" alt="Logo">
+                            <OfflineIndicator
+                                :offline-mode-enabled="offlineModeEnabled"
+                                :pending-count="offlinePendingCount"
+                                :is-syncing="offlineIsSyncing"
+                                :freshness="offlineFreshness"
+                                @sync-click="triggerManualSync"
+                            />
                         </div>
 
                         <button
@@ -588,6 +756,68 @@ const App = {
                                         </button>
                                     </div>
                                 </div>
+
+                                <div class="px-4 py-3 border-t border-slate-100 dark:border-slate-700">
+                                    <p class="text-xs font-medium text-slate-500 dark:text-slate-400 uppercase tracking-wide mb-3">Offline-Modus (Workorder)</p>
+
+                                    <div class="flex items-center justify-between mb-3">
+                                        <div>
+                                            <p class="font-medium text-slate-800 dark:text-white text-sm">Offline-Modus</p>
+                                            <p class="text-xs text-slate-500 dark:text-slate-400">Arbeitsaufträge offline verfügbar</p>
+                                        </div>
+                                        <button
+                                            @click="toggleOfflineMode"
+                                            :class="[
+                                                'relative w-11 h-6 rounded-full transition-colors',
+                                                offlineModeEnabled ? 'bg-green-500' : 'bg-slate-300 dark:bg-slate-600'
+                                            ]"
+                                        >
+                                            <span :class="[
+                                                'absolute top-0.5 w-5 h-5 bg-white rounded-full shadow transition-transform',
+                                                offlineModeEnabled ? 'left-5' : 'left-0.5'
+                                            ]"></span>
+                                        </button>
+                                    </div>
+
+                                    <template v-if="offlineModeEnabled">
+                                        <div class="flex items-center justify-between mb-3">
+                                            <div>
+                                                <p class="font-medium text-slate-800 dark:text-white text-sm">Auto-Sync</p>
+                                                <p class="text-xs text-slate-500 dark:text-slate-400">Automatisch synchronisieren</p>
+                                            </div>
+                                            <button
+                                                @click="setOfflineAutoSync(!offlineAutoSync)"
+                                                :class="[
+                                                    'relative w-11 h-6 rounded-full transition-colors',
+                                                    offlineAutoSync ? 'bg-green-500' : 'bg-slate-300 dark:bg-slate-600'
+                                                ]"
+                                            >
+                                                <span :class="[
+                                                    'absolute top-0.5 w-5 h-5 bg-white rounded-full shadow transition-transform',
+                                                    offlineAutoSync ? 'left-5' : 'left-0.5'
+                                                ]"></span>
+                                            </button>
+                                        </div>
+
+                                        <SyncStatus
+                                            :pending-operations="offlinePendingOps"
+                                            :pending-photos="offlinePendingPhotos"
+                                            :failed-count="offlineFailedCount"
+                                            :last-sync-text="offlineLastSyncText"
+                                            :is-syncing="offlineIsSyncing"
+                                            :is-online="isOnline"
+                                            :sync-progress="offlineSyncProgress"
+                                            @sync="triggerManualSync"
+                                        />
+
+                                        <button
+                                            @click="clearOfflineData"
+                                            class="w-full mt-3 py-2 px-4 text-sm text-red-600 dark:text-red-400 border border-red-200 dark:border-red-800 rounded-lg hover:bg-red-50 dark:hover:bg-red-900/20 transition"
+                                        >
+                                            Offline-Daten löschen
+                                        </button>
+                                    </template>
+                                </div>
                             </div>
 
                             <div class="p-3 border-t border-slate-100 dark:border-slate-700">
diff --git a/public/mobile/components/OfflineIndicator.js b/public/mobile/components/OfflineIndicator.js
new file mode 100644
index 000000000..f47d311ff
--- /dev/null
+++ b/public/mobile/components/OfflineIndicator.js
@@ -0,0 +1,211 @@
+/**
+ * Offline Indicator Component
+ *
+ * Displays network status and sync state in the header.
+ * Shows: Online, Offline, Syncing states with appropriate colors.
+ */
+
+const { ref, computed, onMounted, onUnmounted, watch } = Vue;
+
+export default {
+    name: 'OfflineIndicator',
+
+    props: {
+        // Whether offline mode is enabled in settings
+        offlineModeEnabled: {
+            type: Boolean,
+            default: false
+        },
+        // Number of pending changes
+        pendingCount: {
+            type: Number,
+            default: 0
+        },
+        // Whether sync is currently running
+        isSyncing: {
+            type: Boolean,
+            default: false
+        },
+        // Data freshness level: 'fresh', 'stale', 'old', 'unknown'
+        freshness: {
+            type: String,
+            default: 'unknown'
+        }
+    },
+
+    emits: ['sync-click'],
+
+    setup(props, { emit }) {
+        const isOnline = ref(navigator.onLine);
+
+        // Update online status
+        const updateOnlineStatus = () => {
+            isOnline.value = navigator.onLine;
+        };
+
+        onMounted(() => {
+            window.addEventListener('online', updateOnlineStatus);
+            window.addEventListener('offline', updateOnlineStatus);
+        });
+
+        onUnmounted(() => {
+            window.removeEventListener('online', updateOnlineStatus);
+            window.removeEventListener('offline', updateOnlineStatus);
+        });
+
+        // Computed display state
+        const displayState = computed(() => {
+            if (!props.offlineModeEnabled) {
+                return isOnline.value ? 'online' : 'offline-no-cache';
+            }
+
+            if (props.isSyncing) {
+                return 'syncing';
+            }
+
+            if (!isOnline.value) {
+                return 'offline';
+            }
+
+            if (props.pendingCount > 0) {
+                return 'pending';
+            }
+
+            return 'online';
+        });
+
+        // Status text
+        const statusText = computed(() => {
+            switch (displayState.value) {
+                case 'syncing':
+                    return 'Synchronisiere...';
+                case 'offline':
+                    return 'Offline';
+                case 'offline-no-cache':
+                    return 'Keine Verbindung';
+                case 'pending':
+                    return `${props.pendingCount} ausstehend`;
+                case 'online':
+                    return props.offlineModeEnabled ? 'Synchronisiert' : '';
+                default:
+                    return '';
+            }
+        });
+
+        // Status icon
+        const statusIcon = computed(() => {
+            switch (displayState.value) {
+                case 'syncing':
+                    return 'sync';
+                case 'offline':
+                case 'offline-no-cache':
+                    return 'cloud-off';
+                case 'pending':
+                    return 'cloud-upload';
+                case 'online':
+                    return 'cloud-check';
+                default:
+                    return 'cloud';
+            }
+        });
+
+        // Status color classes
+        const statusClasses = computed(() => {
+            switch (displayState.value) {
+                case 'syncing':
+                    return 'bg-blue-100 text-blue-700 dark:bg-blue-900 dark:text-blue-300';
+                case 'offline':
+                    return 'bg-orange-100 text-orange-700 dark:bg-orange-900 dark:text-orange-300';
+                case 'offline-no-cache':
+                    return 'bg-red-100 text-red-700 dark:bg-red-900 dark:text-red-300';
+                case 'pending':
+                    return 'bg-yellow-100 text-yellow-700 dark:bg-yellow-900 dark:text-yellow-300';
+                case 'online':
+                    return 'bg-green-100 text-green-700 dark:bg-green-900 dark:text-green-300';
+                default:
+                    return 'bg-gray-100 text-gray-700 dark:bg-gray-800 dark:text-gray-300';
+            }
+        });
+
+        // Freshness indicator color
+        const freshnessColor = computed(() => {
+            switch (props.freshness) {
+                case 'fresh':
+                    return 'bg-green-500';
+                case 'stale':
+                    return 'bg-yellow-500';
+                case 'old':
+                    return 'bg-red-500';
+                default:
+                    return 'bg-gray-400';
+            }
+        });
+
+        // Click handler
+        const handleClick = () => {
+            if (isOnline.value && props.pendingCount > 0) {
+                emit('sync-click');
+            }
+        };
+
+        // Should show (only show if offline mode enabled or offline)
+        const shouldShow = computed(() => {
+            return props.offlineModeEnabled || !isOnline.value;
+        });
+
+        return {
+            isOnline,
+            displayState,
+            statusText,
+            statusIcon,
+            statusClasses,
+            freshnessColor,
+            handleClick,
+            shouldShow
+        };
+    },
+
+    template: `
+        <div
+            v-if="shouldShow"
+            :class="[
+                'inline-flex items-center gap-1.5 px-2 py-1 rounded-full text-xs font-medium transition-all',
+                statusClasses,
+                (isOnline && pendingCount > 0) ? 'cursor-pointer hover:opacity-80' : ''
+            ]"
+            @click="handleClick"
+        >
+            <!-- Syncing spinner -->
+            <svg v-if="displayState === 'syncing'" class="w-3.5 h-3.5 animate-spin" fill="none" viewBox="0 0 24 24">
+                <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+                <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+            </svg>
+
+            <!-- Cloud off icon (offline) -->
+            <svg v-else-if="displayState === 'offline' || displayState === 'offline-no-cache'" class="w-3.5 h-3.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 3l18 18M10.5 6.5A7.5 7.5 0 0118 12m-3.5 4.5H6a4 4 0 01-.5-7.97"/>
+            </svg>
+
+            <!-- Cloud upload icon (pending) -->
+            <svg v-else-if="displayState === 'pending'" class="w-3.5 h-3.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 16a4 4 0 01-.88-7.903A5 5 0 1115.9 6L16 6a5 5 0 011 9.9M15 13l-3-3m0 0l-3 3m3-3v12"/>
+            </svg>
+
+            <!-- Cloud check icon (synced) -->
+            <svg v-else-if="displayState === 'online'" class="w-3.5 h-3.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 15a4 4 0 004 4h9a5 5 0 10-.1-9.999 5.002 5.002 0 10-9.78 2.096A4.001 4.001 0 003 15z"/>
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4"/>
+            </svg>
+
+            <!-- Status text -->
+            <span v-if="statusText">{{ statusText }}</span>
+
+            <!-- Freshness dot (when showing cached data) -->
+            <span
+                v-if="offlineModeEnabled && displayState !== 'syncing'"
+                :class="['w-1.5 h-1.5 rounded-full', freshnessColor]"
+                :title="freshness === 'fresh' ? 'Aktuell' : freshness === 'stale' ? 'Etwas älter' : freshness === 'old' ? 'Veraltet' : ''"
+            ></span>
+        </div>
+    `
+};
diff --git a/public/mobile/components/SyncStatus.js b/public/mobile/components/SyncStatus.js
new file mode 100644
index 000000000..bef0db9cd
--- /dev/null
+++ b/public/mobile/components/SyncStatus.js
@@ -0,0 +1,225 @@
+/**
+ * Sync Status Component
+ *
+ * Shows detailed sync status including pending count,
+ * last sync time, and manual sync button.
+ */
+
+const { ref, computed } = Vue;
+
+export default {
+    name: 'SyncStatus',
+
+    props: {
+        // Number of pending operations
+        pendingOperations: {
+            type: Number,
+            default: 0
+        },
+        // Number of pending photos
+        pendingPhotos: {
+            type: Number,
+            default: 0
+        },
+        // Number of failed operations
+        failedCount: {
+            type: Number,
+            default: 0
+        },
+        // Last sync timestamp text
+        lastSyncText: {
+            type: String,
+            default: 'Nie synchronisiert'
+        },
+        // Whether sync is running
+        isSyncing: {
+            type: Boolean,
+            default: false
+        },
+        // Whether device is online
+        isOnline: {
+            type: Boolean,
+            default: true
+        },
+        // Sync progress info
+        syncProgress: {
+            type: Object,
+            default: null
+        }
+    },
+
+    emits: ['sync', 'retry-failed'],
+
+    setup(props, { emit }) {
+        // Total pending count
+        const totalPending = computed(() => {
+            return props.pendingOperations + props.pendingPhotos;
+        });
+
+        // Status summary text
+        const summaryText = computed(() => {
+            const parts = [];
+
+            if (props.pendingOperations > 0) {
+                parts.push(`${props.pendingOperations} Änderung${props.pendingOperations === 1 ? '' : 'en'}`);
+            }
+
+            if (props.pendingPhotos > 0) {
+                parts.push(`${props.pendingPhotos} Foto${props.pendingPhotos === 1 ? '' : 's'}`);
+            }
+
+            if (parts.length === 0) {
+                return 'Keine ausstehenden Änderungen';
+            }
+
+            return parts.join(', ') + ' ausstehend';
+        });
+
+        // Progress text during sync
+        const progressText = computed(() => {
+            if (!props.syncProgress) return '';
+
+            const { phase, current, total, fileName } = props.syncProgress;
+
+            if (phase === 'operations') {
+                return `Synchronisiere ${current}/${total} Änderungen...`;
+            }
+
+            if (phase === 'photos') {
+                return fileName
+                    ? `Lade ${current}/${total} hoch: ${fileName}`
+                    : `Lade ${current}/${total} Fotos hoch...`;
+            }
+
+            return 'Synchronisiere...';
+        });
+
+        // Handle sync button click
+        const handleSync = () => {
+            if (!props.isSyncing && props.isOnline) {
+                emit('sync');
+            }
+        };
+
+        // Handle retry failed click
+        const handleRetryFailed = () => {
+            if (!props.isSyncing) {
+                emit('retry-failed');
+            }
+        };
+
+        return {
+            totalPending,
+            summaryText,
+            progressText,
+            handleSync,
+            handleRetryFailed
+        };
+    },
+
+    template: `
+        <div class="bg-white dark:bg-slate-800 rounded-xl p-4 shadow-sm border border-slate-200 dark:border-slate-700">
+            <!-- Header -->
+            <div class="flex items-center justify-between mb-3">
+                <h3 class="font-medium text-slate-900 dark:text-white flex items-center gap-2">
+                    <svg class="w-5 h-5 text-primary" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"/>
+                    </svg>
+                    Synchronisation
+                </h3>
+
+                <!-- Online/Offline badge -->
+                <span
+                    :class="[
+                        'px-2 py-0.5 rounded text-xs font-medium',
+                        isOnline
+                            ? 'bg-green-100 text-green-700 dark:bg-green-900 dark:text-green-300'
+                            : 'bg-red-100 text-red-700 dark:bg-red-900 dark:text-red-300'
+                    ]"
+                >
+                    {{ isOnline ? 'Online' : 'Offline' }}
+                </span>
+            </div>
+
+            <!-- Sync progress bar (when syncing) -->
+            <div v-if="isSyncing && syncProgress" class="mb-3">
+                <div class="flex items-center justify-between text-xs text-slate-500 dark:text-slate-400 mb-1">
+                    <span>{{ progressText }}</span>
+                    <span v-if="syncProgress.total">{{ Math.round((syncProgress.current / syncProgress.total) * 100) }}%</span>
+                </div>
+                <div class="w-full bg-slate-200 dark:bg-slate-700 rounded-full h-1.5">
+                    <div
+                        class="bg-primary h-1.5 rounded-full transition-all duration-300"
+                        :style="{ width: syncProgress.total ? ((syncProgress.current / syncProgress.total) * 100) + '%' : '50%' }"
+                    ></div>
+                </div>
+            </div>
+
+            <!-- Summary -->
+            <div class="space-y-2 mb-4">
+                <!-- Pending count -->
+                <div class="flex items-center justify-between text-sm">
+                    <span class="text-slate-600 dark:text-slate-400">Ausstehend</span>
+                    <span
+                        :class="[
+                            'font-medium',
+                            totalPending > 0 ? 'text-orange-600 dark:text-orange-400' : 'text-slate-900 dark:text-white'
+                        ]"
+                    >
+                        {{ summaryText }}
+                    </span>
+                </div>
+
+                <!-- Failed count (if any) -->
+                <div v-if="failedCount > 0" class="flex items-center justify-between text-sm">
+                    <span class="text-slate-600 dark:text-slate-400">Fehlgeschlagen</span>
+                    <button
+                        @click="handleRetryFailed"
+                        class="text-red-600 dark:text-red-400 font-medium hover:underline"
+                        :disabled="isSyncing"
+                    >
+                        {{ failedCount }} - Erneut versuchen
+                    </button>
+                </div>
+
+                <!-- Last sync -->
+                <div class="flex items-center justify-between text-sm">
+                    <span class="text-slate-600 dark:text-slate-400">Letzte Synchronisation</span>
+                    <span class="text-slate-900 dark:text-white">{{ lastSyncText }}</span>
+                </div>
+            </div>
+
+            <!-- Sync button -->
+            <button
+                @click="handleSync"
+                :disabled="isSyncing || !isOnline || totalPending === 0"
+                :class="[
+                    'w-full py-2.5 px-4 rounded-lg font-medium transition-colors flex items-center justify-center gap-2',
+                    (isSyncing || !isOnline || totalPending === 0)
+                        ? 'bg-slate-100 dark:bg-slate-700 text-slate-400 dark:text-slate-500 cursor-not-allowed'
+                        : 'bg-primary text-white hover:bg-primary/90'
+                ]"
+            >
+                <!-- Spinner when syncing -->
+                <svg v-if="isSyncing" class="w-4 h-4 animate-spin" fill="none" viewBox="0 0 24 24">
+                    <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+                    <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+                </svg>
+
+                <!-- Sync icon -->
+                <svg v-else class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"/>
+                </svg>
+
+                <span>
+                    {{ isSyncing ? 'Synchronisiere...' : !isOnline ? 'Offline' : totalPending === 0 ? 'Alles synchronisiert' : 'Jetzt synchronisieren' }}
+                </span>
+            </button>
+
+            <!-- Offline hint -->
+            <p v-if="!isOnline && totalPending > 0" class="mt-2 text-xs text-slate-500 dark:text-slate-400 text-center">
+                Änderungen werden synchronisiert, sobald Sie wieder online sind.
+            </p>
+        </div>
+    `
+};
diff --git a/public/mobile/modules/workorder/WorkorderModule.js b/public/mobile/modules/workorder/WorkorderModule.js
index 32c0cf0f5..512625d1d 100644
--- a/public/mobile/modules/workorder/WorkorderModule.js
+++ b/public/mobile/modules/workorder/WorkorderModule.js
@@ -3,8 +3,13 @@
  *
  * Main module for workorder management in MobileApp.
  * Provides list view and full-screen detail view with collapsible cards.
+ * Supports offline mode via WorkorderOfflineService.
  */
 
+import workorderService from '/mobile/shared/workorderOfflineService.js';
+import photoQueue from '/mobile/shared/photoQueue.js';
+import { isOfflineModeEnabled } from '/mobile/shared/offlineSettings.js';
+
 export default {
     name: 'WorkorderModule',
     emits: ['navigate', 'toast', 'detail-open', 'detail-close'],
@@ -184,15 +189,14 @@ export default {
         const fetchWorkorders = async () => {
             isLoading.value = true;
             try {
-                const response = await fetch('/MobileApp/Workorder/Workorder/get', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    credentials: 'include',
-                    body: JSON.stringify({ pagination: { page: 1, per_page: 500 } })
-                });
-                const data = await response.json();
+                const data = await workorderService.getWorkorders({ pagination: { page: 1, per_page: 500 } });
                 if (data.success) {
                     workorders.value = data.workorders;
+                    if (data.fromCache) {
+                        console.log('[WorkorderModule] Loaded from cache');
+                    }
+                } else if (data.offline) {
+                    emit('toast', 'Offline - Daten aus Cache', 'info');
                 }
             } catch (error) {
                 console.error('Error fetching workorders:', error);
@@ -209,9 +213,8 @@ export default {
             emit('detail-open', workorder.id);
 
             try {
-                // Fetch all workorder details in a single request
-                const response = await fetch(`/MobileApp/Workorder/Workorder/getWorkorderDetail?id=${workorder.id}`, { credentials: 'include' });
-                const data = await response.json();
+                // Fetch all workorder details via offline service
+                const data = await workorderService.getWorkorderDetail(workorder.id);
 
                 if (data.success) {
                     selectedWorkorder.value = data.workorder;
@@ -219,10 +222,16 @@ export default {
                         cableLength: data.workorder.cableLength || '',
                         cableType: data.workorder.cableType || ''
                     };
-                    documentation.value = { docs: data.docs, journals: data.journals };
+                    documentation.value = data.documentation || { docs: [], journals: [] };
                     tenantConfig.value = data.tenantConfig;
-                    checklist.value = data.checklist;
+                    checklist.value = data.checklist || [];
                     technicalData.value = data.technicalData || null;
+                    if (data.fromCache) {
+                        console.log('[WorkorderModule] Detail loaded from cache');
+                    }
+                } else if (data.offline) {
+                    emit('toast', 'Offline - keine gecachten Details', 'error');
+                    closeDetail();
                 } else {
                     emit('toast', data.message || 'Fehler beim Laden', 'error');
                 }
@@ -261,24 +270,20 @@ export default {
 
         const saveNotes = async () => {
             try {
-                const response = await fetch('/MobileApp/Workorder/Workorder/updateAdditionalInfo', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    credentials: 'include',
-                    body: JSON.stringify({
-                        workorderId: selectedWorkorder.value.id,
-                        additionalInfo: tempNotes.value
-                    })
-                });
-                const data = await response.json();
+                const data = await workorderService.updateNotes(selectedWorkorder.value.id, tempNotes.value);
                 if (data.success) {
-                    selectedWorkorder.value.additionalInfo = data.newInfo;
+                    selectedWorkorder.value.additionalInfo = tempNotes.value;
                     isEditingNotes.value = false;
-                    emit('toast', 'Notiz gespeichert', 'success');
-                    // Refresh journals
-                    const docRes = await fetch(`/MobileApp/Workorder/Workorder/getDocumentation?workorderId=${selectedWorkorder.value.id}`, { credentials: 'include' });
-                    const docData = await docRes.json();
-                    if (docData.success) documentation.value.journals = docData.journals;
+                    if (data.queued) {
+                        emit('toast', 'Notiz wird synchronisiert', 'info');
+                    } else {
+                        emit('toast', 'Notiz gespeichert', 'success');
+                        // Refresh detail to get updated journals
+                        const detailData = await workorderService.getWorkorderDetail(selectedWorkorder.value.id);
+                        if (detailData.success && detailData.documentation) {
+                            documentation.value.journals = detailData.documentation.journals || [];
+                        }
+                    }
                 }
             } catch (error) {
                 emit('toast', 'Fehler beim Speichern', 'error');
@@ -289,20 +294,22 @@ export default {
         const addJournalEntry = async () => {
             if (!newJournalText.value.trim()) return;
             try {
-                const response = await fetch('/MobileApp/Workorder/Workorder/addJournal', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    credentials: 'include',
-                    body: JSON.stringify({
-                        workorderId: selectedWorkorder.value.id,
-                        text: newJournalText.value
-                    })
-                });
-                const data = await response.json();
+                const data = await workorderService.addJournal(selectedWorkorder.value.id, newJournalText.value);
                 if (data.success) {
-                    documentation.value.journals = data.journals;
+                    if (data.queued) {
+                        // Add pending journal entry to local display
+                        documentation.value.journals.unshift({
+                            id: 'pending-' + data.localId,
+                            text: newJournalText.value,
+                            create: Math.floor(Date.now() / 1000),
+                            _pending: true
+                        });
+                        emit('toast', 'Eintrag wird synchronisiert', 'info');
+                    } else if (data.journals) {
+                        documentation.value.journals = data.journals;
+                        emit('toast', 'Eintrag hinzugefügt', 'success');
+                    }
                     newJournalText.value = '';
-                    emit('toast', 'Eintrag hinzugefügt', 'success');
                 }
             } catch (error) {
                 emit('toast', 'Fehler beim Hinzufügen', 'error');
@@ -312,19 +319,17 @@ export default {
         // Cable data
         const saveCableData = async () => {
             try {
-                const response = await fetch('/MobileApp/Workorder/Workorder/updateWorkorderData', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    credentials: 'include',
-                    body: JSON.stringify({
-                        workorderId: selectedWorkorder.value.id,
-                        cableLength: cableDataForm.value.cableLength,
-                        cableType: cableDataForm.value.cableType
-                    })
-                });
-                const data = await response.json();
+                const data = await workorderService.updateCableData(
+                    selectedWorkorder.value.id,
+                    cableDataForm.value.cableLength,
+                    cableDataForm.value.cableType
+                );
                 if (data.success) {
-                    emit('toast', 'Daten gespeichert', 'success');
+                    if (data.queued) {
+                        emit('toast', 'Daten werden synchronisiert', 'info');
+                    } else {
+                        emit('toast', 'Daten gespeichert', 'success');
+                    }
                 }
             } catch (error) {
                 emit('toast', 'Fehler beim Speichern', 'error');
@@ -351,6 +356,45 @@ export default {
 
             isUploading.value = true;
             const wasFromChecklist = pendingChecklistUpload.value !== null;
+
+            // Check if offline mode is enabled and we're offline
+            const offlineEnabled = isOfflineModeEnabled();
+            const isOffline = !navigator.onLine;
+
+            if (offlineEnabled && isOffline) {
+                // Queue files for later upload
+                try {
+                    for (let i = 0; i < files.length; i++) {
+                        const result = await photoQueue.queue(
+                            selectedWorkorder.value.id,
+                            files[i],
+                            uploadDocType.value,
+                            ''
+                        );
+                        if (result.success) {
+                            // Add pending doc to local display
+                            documentation.value.docs.push({
+                                id: 'pending-' + result.localId,
+                                documentType: uploadDocType.value,
+                                fileName: files[i].name,
+                                _pending: true
+                            });
+                        }
+                    }
+                    triggerHaptic('light');
+                    emit('toast', 'Foto wird bei Verbindung hochgeladen', 'info');
+                    showDocUploadSheet.value = false;
+                } catch (error) {
+                    emit('toast', 'Fehler beim Speichern', 'error');
+                } finally {
+                    isUploading.value = false;
+                    if (fileInputRef.value) fileInputRef.value.value = '';
+                    pendingChecklistUpload.value = null;
+                }
+                return;
+            }
+
+            // Online upload
             const formData = new FormData();
             formData.append('workorderId', selectedWorkorder.value.id);
             formData.append('documentType', uploadDocType.value);
@@ -372,14 +416,11 @@ export default {
                     showDocUploadSheet.value = false;
 
                     // Refresh documentation and checklist
-                    const [docRes, checkRes] = await Promise.all([
-                        fetch(`/MobileApp/Workorder/Workorder/getDocumentation?workorderId=${selectedWorkorder.value.id}`, { credentials: 'include' }),
-                        fetch(`/MobileApp/Workorder/Workorder/getChecklist?workorderId=${selectedWorkorder.value.id}`, { credentials: 'include' })
-                    ]);
-                    const docData = await docRes.json();
-                    const checkData = await checkRes.json();
-                    if (docData.success) documentation.value = { docs: docData.docs, journals: docData.journals };
-                    if (checkData.success) checklist.value = checkData.checklist;
+                    const detailData = await workorderService.getWorkorderDetail(selectedWorkorder.value.id);
+                    if (detailData.success) {
+                        documentation.value = detailData.documentation || { docs: [], journals: [] };
+                        checklist.value = detailData.checklist || [];
+                    }
 
                     // Auto-advance: If upload was from checklist, open camera for next item
                     if (wasFromChecklist) {
@@ -395,7 +436,15 @@ export default {
                     }
                 }
             } catch (error) {
-                emit('toast', 'Upload fehlgeschlagen', 'error');
+                // If upload fails and offline mode is enabled, queue for later
+                if (offlineEnabled) {
+                    for (let i = 0; i < files.length; i++) {
+                        await photoQueue.queue(selectedWorkorder.value.id, files[i], uploadDocType.value, '');
+                    }
+                    emit('toast', 'Foto wird bei Verbindung hochgeladen', 'info');
+                } else {
+                    emit('toast', 'Upload fehlgeschlagen', 'error');
+                }
             } finally {
                 isUploading.value = false;
                 if (fileInputRef.value) fileInputRef.value.value = '';
@@ -418,19 +467,17 @@ export default {
             const typeText = tenantConfig.value?.interventionTypes?.find(t => t.value === problemType.value)?.text || problemType.value;
 
             try {
-                const response = await fetch('/MobileApp/Workorder/Workorder/requestIntervention', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    credentials: 'include',
-                    body: JSON.stringify({
-                        workorderId: selectedWorkorder.value.id,
-                        interventionType: typeText,
-                        journalText: problemComment.value || typeText
-                    })
-                });
-                const data = await response.json();
+                const data = await workorderService.requestIntervention(
+                    selectedWorkorder.value.id,
+                    typeText,
+                    problemComment.value || typeText
+                );
                 if (data.success) {
-                    emit('toast', 'Problem gemeldet', 'success');
+                    if (data.queued) {
+                        emit('toast', 'Problem wird bei Verbindung gemeldet', 'info');
+                    } else {
+                        emit('toast', 'Problem gemeldet', 'success');
+                    }
                     showProblemSheet.value = false;
                     closeDetail();
                     fetchWorkorders();
@@ -449,21 +496,16 @@ export default {
 
         const submitComplete = async () => {
             try {
-                const response = await fetch('/MobileApp/Workorder/Workorder/completeWorkorder', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    credentials: 'include',
-                    body: JSON.stringify({
-                        workorderId: selectedWorkorder.value.id
-                    })
-                });
-                const data = await response.json();
+                const data = await workorderService.completeWorkorder(selectedWorkorder.value.id);
                 if (data.success) {
                     triggerHaptic('success');
                     emit('toast', 'Auftrag abgeschlossen', 'success');
                     showCompleteSheet.value = false;
                     closeDetail();
                     fetchWorkorders();
+                } else if (data.blocked) {
+                    // Completion blocked when offline
+                    emit('toast', data.message || 'Bitte zuerst synchronisieren', 'warning');
                 } else {
                     emit('toast', data.message || 'Fehler', 'error');
                 }
diff --git a/public/mobile/shared/db.js b/public/mobile/shared/db.js
new file mode 100644
index 000000000..4e1df108c
--- /dev/null
+++ b/public/mobile/shared/db.js
@@ -0,0 +1,188 @@
+/**
+ * IndexedDB setup using Dexie.js for workorder offline mode
+ *
+ * Schema mirrors the backend models:
+ * - WorkorderModel
+ * - WorkorderDocumentationModel
+ * - WorkorderJournalModel
+ * - WorkorderTenantConfigModel
+ */
+
+import Dexie from 'https://cdn.jsdelivr.net/npm/dexie@4/dist/dexie.min.mjs';
+
+// Database instance
+export const db = new Dexie('xinon-workorder-offline');
+
+// Schema definition
+db.version(1).stores({
+    // Workorder list and basic data
+    // Mirrors WorkorderModel from backend
+    workorders: 'id, companyId, status, [companyId+status], _syncStatus, _lastModified',
+
+    // Full workorder details (lazy-loaded)
+    // Contains customer info, address, etc.
+    workorderDetails: 'workorderId, lastFetched',
+
+    // Documentation metadata with thumbnail references
+    // Mirrors WorkorderDocumentationModel
+    documentation: 'id, workorderId, documentType, _syncStatus',
+
+    // Documentation thumbnails (blob storage)
+    thumbnails: 'documentationId, workorderId',
+
+    // Journal entries (audit trail)
+    // Mirrors WorkorderJournalModel
+    journals: 'id, workorderId, create, _localId',
+
+    // Tenant configurations
+    // Mirrors WorkorderTenantConfigModel
+    tenantConfigs: 'addressId, lastFetched',
+
+    // Sync queue for pending mutations
+    syncQueue: '++localId, operation, workorderId, status, createdAt',
+
+    // Pending file uploads
+    pendingFiles: '++localId, workorderId, documentType, status',
+
+    // Sync metadata (lastSync, etc.)
+    syncMeta: 'key'
+});
+
+// Sync status enum
+export const SyncStatus = {
+    SYNCED: 'synced',
+    PENDING: 'pending',
+    CONFLICT: 'conflict',
+    ERROR: 'error'
+};
+
+// Operation types for sync queue
+export const OperationType = {
+    ADD_JOURNAL: 'addJournal',
+    UPDATE_NOTES: 'updateNotes',
+    SCHEDULE_APPOINTMENT: 'scheduleAppointment',
+    REQUEST_INTERVENTION: 'requestIntervention',
+    UPDATE_CABLE_DATA: 'updateCableData',
+    UPLOAD_DOCUMENTATION: 'uploadDocumentation',
+    COMPLETE_WORKORDER: 'completeWorkorder'
+};
+
+// Operation priority (lower = higher priority)
+export const OperationPriority = {
+    [OperationType.SCHEDULE_APPOINTMENT]: 1,
+    [OperationType.UPDATE_NOTES]: 2,
+    [OperationType.ADD_JOURNAL]: 3,
+    [OperationType.UPDATE_CABLE_DATA]: 4,
+    [OperationType.UPLOAD_DOCUMENTATION]: 5,
+    [OperationType.REQUEST_INTERVENTION]: 6,
+    [OperationType.COMPLETE_WORKORDER]: 7  // Must be last
+};
+
+/**
+ * Initialize database and return instance
+ */
+export async function initDatabase() {
+    try {
+        await db.open();
+        console.log('[DB] Database opened successfully');
+        return db;
+    } catch (error) {
+        console.error('[DB] Failed to open database:', error);
+        throw error;
+    }
+}
+
+/**
+ * Clear all offline data (for logout or cache clear)
+ */
+export async function clearAllData() {
+    try {
+        await db.transaction('rw',
+            db.workorders,
+            db.workorderDetails,
+            db.documentation,
+            db.thumbnails,
+            db.journals,
+            db.tenantConfigs,
+            db.syncQueue,
+            db.pendingFiles,
+            db.syncMeta,
+            async () => {
+                await db.workorders.clear();
+                await db.workorderDetails.clear();
+                await db.documentation.clear();
+                await db.thumbnails.clear();
+                await db.journals.clear();
+                await db.tenantConfigs.clear();
+                await db.syncQueue.clear();
+                await db.pendingFiles.clear();
+                await db.syncMeta.clear();
+            }
+        );
+        console.log('[DB] All offline data cleared');
+    } catch (error) {
+        console.error('[DB] Failed to clear data:', error);
+        throw error;
+    }
+}
+
+/**
+ * Get sync metadata value
+ */
+export async function getSyncMeta(key) {
+    const meta = await db.syncMeta.get(key);
+    return meta?.value ?? null;
+}
+
+/**
+ * Set sync metadata value
+ */
+export async function setSyncMeta(key, value) {
+    await db.syncMeta.put({ key, value });
+}
+
+/**
+ * Get pending operations count
+ */
+export async function getPendingCount() {
+    const queueCount = await db.syncQueue.where('status').equals('pending').count();
+    const filesCount = await db.pendingFiles.where('status').equals('pending').count();
+    return queueCount + filesCount;
+}
+
+/**
+ * Check if database has any cached workorders
+ */
+export async function hasOfflineData() {
+    const count = await db.workorders.count();
+    return count > 0;
+}
+
+/**
+ * Get storage usage estimate
+ */
+export async function getStorageEstimate() {
+    if (navigator.storage && navigator.storage.estimate) {
+        const estimate = await navigator.storage.estimate();
+        return {
+            usage: estimate.usage || 0,
+            quota: estimate.quota || 0,
+            usagePercent: estimate.quota ? Math.round((estimate.usage / estimate.quota) * 100) : 0
+        };
+    }
+    return { usage: 0, quota: 0, usagePercent: 0 };
+}
+
+/**
+ * Request persistent storage (important for iOS Safari)
+ */
+export async function requestPersistentStorage() {
+    if (navigator.storage && navigator.storage.persist) {
+        const isPersisted = await navigator.storage.persist();
+        console.log('[DB] Persistent storage:', isPersisted ? 'granted' : 'denied');
+        return isPersisted;
+    }
+    return false;
+}
+
+export default db;
diff --git a/public/mobile/shared/offlineSettings.js b/public/mobile/shared/offlineSettings.js
new file mode 100644
index 000000000..7ca3f1f66
--- /dev/null
+++ b/public/mobile/shared/offlineSettings.js
@@ -0,0 +1,250 @@
+/**
+ * Offline mode settings management
+ *
+ * Stores settings in localStorage following the existing pattern
+ * used by theme and movement_settings.
+ */
+
+const STORAGE_KEY = 'workorder_offline';
+
+// Default settings
+const defaultSettings = {
+    enabled: false,
+    autoSync: true,
+    lastSyncTimestamp: null,
+    deviceId: null  // Generated on first enable
+};
+
+// In-memory cache of settings
+let cachedSettings = null;
+
+/**
+ * Generate a unique device ID using crypto API
+ */
+function generateDeviceId() {
+    if (crypto.randomUUID) {
+        return crypto.randomUUID();
+    }
+    // Fallback for older browsers
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+        const r = Math.random() * 16 | 0;
+        const v = c === 'x' ? r : (r & 0x3 | 0x8);
+        return v.toString(16);
+    });
+}
+
+/**
+ * Load settings from localStorage
+ */
+export function loadOfflineSettings() {
+    try {
+        const saved = localStorage.getItem(STORAGE_KEY);
+        if (saved) {
+            cachedSettings = { ...defaultSettings, ...JSON.parse(saved) };
+        } else {
+            cachedSettings = { ...defaultSettings };
+        }
+    } catch (error) {
+        console.error('[OfflineSettings] Failed to load settings:', error);
+        cachedSettings = { ...defaultSettings };
+    }
+    return cachedSettings;
+}
+
+/**
+ * Save settings to localStorage
+ */
+export function saveOfflineSettings(settings) {
+    try {
+        cachedSettings = { ...cachedSettings, ...settings };
+        localStorage.setItem(STORAGE_KEY, JSON.stringify(cachedSettings));
+        return true;
+    } catch (error) {
+        console.error('[OfflineSettings] Failed to save settings:', error);
+        return false;
+    }
+}
+
+/**
+ * Get current settings (from cache or load)
+ */
+export function getOfflineSettings() {
+    if (!cachedSettings) {
+        loadOfflineSettings();
+    }
+    return { ...cachedSettings };
+}
+
+/**
+ * Check if offline mode is enabled
+ */
+export function isOfflineModeEnabled() {
+    const settings = getOfflineSettings();
+    return settings.enabled === true;
+}
+
+/**
+ * Check if auto-sync is enabled
+ */
+export function isAutoSyncEnabled() {
+    const settings = getOfflineSettings();
+    return settings.autoSync === true;
+}
+
+/**
+ * Enable offline mode
+ * Generates device ID if not exists
+ */
+export function enableOfflineMode() {
+    const settings = getOfflineSettings();
+    if (!settings.deviceId) {
+        settings.deviceId = generateDeviceId();
+    }
+    settings.enabled = true;
+    return saveOfflineSettings(settings);
+}
+
+/**
+ * Disable offline mode
+ * Does NOT clear cached data (user must do that explicitly)
+ */
+export function disableOfflineMode() {
+    return saveOfflineSettings({ enabled: false });
+}
+
+/**
+ * Toggle offline mode
+ */
+export function toggleOfflineMode() {
+    if (isOfflineModeEnabled()) {
+        return disableOfflineMode();
+    } else {
+        return enableOfflineMode();
+    }
+}
+
+/**
+ * Set auto-sync preference
+ */
+export function setAutoSync(enabled) {
+    return saveOfflineSettings({ autoSync: enabled });
+}
+
+/**
+ * Get device ID (generates if needed)
+ */
+export function getDeviceId() {
+    const settings = getOfflineSettings();
+    if (!settings.deviceId) {
+        settings.deviceId = generateDeviceId();
+        saveOfflineSettings(settings);
+    }
+    return settings.deviceId;
+}
+
+/**
+ * Update last sync timestamp
+ */
+export function updateLastSyncTimestamp() {
+    return saveOfflineSettings({ lastSyncTimestamp: Date.now() });
+}
+
+/**
+ * Get last sync timestamp
+ */
+export function getLastSyncTimestamp() {
+    const settings = getOfflineSettings();
+    return settings.lastSyncTimestamp;
+}
+
+/**
+ * Get last sync as human-readable string
+ */
+export function getLastSyncText() {
+    const timestamp = getLastSyncTimestamp();
+    if (!timestamp) {
+        return 'Nie synchronisiert';
+    }
+
+    const now = Date.now();
+    const diff = now - timestamp;
+    const minutes = Math.floor(diff / 60000);
+    const hours = Math.floor(diff / 3600000);
+    const days = Math.floor(diff / 86400000);
+
+    if (minutes < 1) {
+        return 'Gerade eben';
+    } else if (minutes < 60) {
+        return `Vor ${minutes} Minute${minutes === 1 ? '' : 'n'}`;
+    } else if (hours < 24) {
+        return `Vor ${hours} Stunde${hours === 1 ? '' : 'n'}`;
+    } else {
+        return `Vor ${days} Tag${days === 1 ? '' : 'en'}`;
+    }
+}
+
+/**
+ * Get data freshness level based on last sync
+ * Returns: 'fresh' (<1h), 'stale' (1-24h), 'old' (>24h)
+ */
+export function getDataFreshness() {
+    const timestamp = getLastSyncTimestamp();
+    if (!timestamp) {
+        return 'unknown';
+    }
+
+    const now = Date.now();
+    const diff = now - timestamp;
+    const hours = diff / 3600000;
+
+    if (hours < 1) {
+        return 'fresh';      // Green
+    } else if (hours < 24) {
+        return 'stale';      // Yellow
+    } else {
+        return 'old';        // Red
+    }
+}
+
+/**
+ * Clear all offline settings (for logout)
+ */
+export function clearOfflineSettings() {
+    try {
+        localStorage.removeItem(STORAGE_KEY);
+        cachedSettings = null;
+        return true;
+    } catch (error) {
+        console.error('[OfflineSettings] Failed to clear settings:', error);
+        return false;
+    }
+}
+
+// Reactive state for Vue components
+export const offlineSettingsState = {
+    get enabled() { return isOfflineModeEnabled(); },
+    get autoSync() { return isAutoSyncEnabled(); },
+    get lastSync() { return getLastSyncTimestamp(); },
+    get lastSyncText() { return getLastSyncText(); },
+    get freshness() { return getDataFreshness(); },
+    get deviceId() { return getDeviceId(); }
+};
+
+export default {
+    load: loadOfflineSettings,
+    save: saveOfflineSettings,
+    get: getOfflineSettings,
+    isEnabled: isOfflineModeEnabled,
+    isAutoSyncEnabled,
+    enable: enableOfflineMode,
+    disable: disableOfflineMode,
+    toggle: toggleOfflineMode,
+    setAutoSync,
+    getDeviceId,
+    updateLastSync: updateLastSyncTimestamp,
+    getLastSync: getLastSyncTimestamp,
+    getLastSyncText,
+    getFreshness: getDataFreshness,
+    clear: clearOfflineSettings,
+    state: offlineSettingsState
+};
diff --git a/public/mobile/shared/photoQueue.js b/public/mobile/shared/photoQueue.js
new file mode 100644
index 000000000..d03366902
--- /dev/null
+++ b/public/mobile/shared/photoQueue.js
@@ -0,0 +1,437 @@
+/**
+ * Photo Queue - Image compression and upload queue
+ *
+ * Handles image capture, compression, storage, and upload queueing for offline mode.
+ * Converts HEIC (iOS) to JPEG, compresses images, and stores them for later upload.
+ */
+
+import { db, OperationType } from './db.js';
+import { isOfflineModeEnabled, getDeviceId } from './offlineSettings.js';
+
+// Import image compression from CDN
+const imageCompression = await import('https://cdn.jsdelivr.net/npm/browser-image-compression@2/dist/browser-image-compression.mjs').then(m => m.default);
+
+// Compression settings
+const COMPRESSION_OPTIONS = {
+    maxSizeMB: 1,           // Max 1MB after compression
+    maxWidthOrHeight: 1920, // Max dimension
+    useWebWorker: true,
+    fileType: 'image/jpeg',
+    initialQuality: 0.8
+};
+
+// Upload status
+export const UploadStatus = {
+    PENDING: 'pending',
+    COMPRESSING: 'compressing',
+    UPLOADING: 'uploading',
+    COMPLETED: 'completed',
+    FAILED: 'failed'
+};
+
+const API_BASE = '/MobileApp/Workorder/Workorder';
+
+/**
+ * Generate unique local ID
+ */
+function generateLocalId() {
+    if (crypto.randomUUID) {
+        return crypto.randomUUID();
+    }
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+        const r = Math.random() * 16 | 0;
+        const v = c === 'x' ? r : (r & 0x3 | 0x8);
+        return v.toString(16);
+    });
+}
+
+/**
+ * Check if file is HEIC format (iOS)
+ */
+function isHeicFile(file) {
+    const type = file.type?.toLowerCase() || '';
+    const name = file.name?.toLowerCase() || '';
+    return type === 'image/heic' ||
+           type === 'image/heif' ||
+           name.endsWith('.heic') ||
+           name.endsWith('.heif');
+}
+
+/**
+ * Convert HEIC to JPEG
+ */
+async function convertHeicToJpeg(file) {
+    try {
+        // Dynamically import heic2any
+        const heic2any = await import('https://cdn.jsdelivr.net/npm/heic2any@0.0.4/dist/heic2any.min.js').then(m => m.default || window.heic2any);
+
+        const result = await heic2any({
+            blob: file,
+            toType: 'image/jpeg',
+            quality: 0.9
+        });
+
+        // heic2any can return array or single blob
+        const jpegBlob = Array.isArray(result) ? result[0] : result;
+
+        // Create new file with .jpg extension
+        const newName = file.name.replace(/\.(heic|heif)$/i, '.jpg');
+        return new File([jpegBlob], newName, { type: 'image/jpeg' });
+    } catch (error) {
+        console.error('[PhotoQueue] HEIC conversion failed:', error);
+        throw new Error('HEIC-Konvertierung fehlgeschlagen');
+    }
+}
+
+/**
+ * Compress image file
+ */
+async function compressImage(file, onProgress) {
+    try {
+        // Handle HEIC files first
+        let processedFile = file;
+        if (isHeicFile(file)) {
+            onProgress?.({ phase: 'converting', message: 'Konvertiere HEIC...' });
+            processedFile = await convertHeicToJpeg(file);
+        }
+
+        // Check if compression needed
+        const fileSizeMB = processedFile.size / (1024 * 1024);
+        if (fileSizeMB <= COMPRESSION_OPTIONS.maxSizeMB && processedFile.type === 'image/jpeg') {
+            // Already small enough and correct format
+            return processedFile;
+        }
+
+        onProgress?.({ phase: 'compressing', message: 'Komprimiere Bild...' });
+
+        const compressedFile = await imageCompression(processedFile, {
+            ...COMPRESSION_OPTIONS,
+            onProgress: (progress) => {
+                onProgress?.({ phase: 'compressing', progress });
+            }
+        });
+
+        console.log(`[PhotoQueue] Compressed ${file.name}: ${fileSizeMB.toFixed(2)}MB -> ${(compressedFile.size / (1024 * 1024)).toFixed(2)}MB`);
+
+        return compressedFile;
+    } catch (error) {
+        console.error('[PhotoQueue] Compression failed:', error);
+        throw new Error('Bildkomprimierung fehlgeschlagen');
+    }
+}
+
+/**
+ * Queue photo for upload
+ */
+export async function queuePhoto(workorderId, file, documentType, description = '') {
+    const localId = generateLocalId();
+
+    // Create initial entry
+    const entry = {
+        localId,
+        workorderId,
+        documentType,
+        description,
+        originalFileName: file.name,
+        originalSize: file.size,
+        mimeType: file.type,
+        status: UploadStatus.COMPRESSING,
+        progress: 0,
+        createdAt: Date.now(),
+        deviceId: getDeviceId(),
+        error: null
+    };
+
+    // Store entry
+    await db.pendingFiles.add(entry);
+
+    try {
+        // Compress image
+        const compressedFile = await compressImage(file, (progressInfo) => {
+            // Update status
+            db.pendingFiles.update(localId, { progress: progressInfo.progress || 0 });
+        });
+
+        // Convert to blob and store
+        const blob = new Blob([compressedFile], { type: 'image/jpeg' });
+
+        await db.pendingFiles.update(localId, {
+            status: UploadStatus.PENDING,
+            blob,
+            compressedSize: blob.size,
+            fileName: compressedFile.name || `photo_${localId}.jpg`,
+            progress: 100
+        });
+
+        console.log(`[PhotoQueue] Queued photo ${localId} for workorder ${workorderId}`);
+
+        return {
+            success: true,
+            localId,
+            message: 'Foto wird bei nächster Verbindung hochgeladen'
+        };
+    } catch (error) {
+        await db.pendingFiles.update(localId, {
+            status: UploadStatus.FAILED,
+            error: error.message
+        });
+
+        return {
+            success: false,
+            localId,
+            error: error.message
+        };
+    }
+}
+
+/**
+ * Get pending photos
+ */
+export async function getPendingPhotos() {
+    return db.pendingFiles
+        .where('status')
+        .equals(UploadStatus.PENDING)
+        .toArray();
+}
+
+/**
+ * Get pending photos for workorder
+ */
+export async function getWorkorderPendingPhotos(workorderId) {
+    return db.pendingFiles
+        .where('workorderId')
+        .equals(workorderId)
+        .toArray();
+}
+
+/**
+ * Get pending photos count
+ */
+export async function getPendingCount() {
+    return db.pendingFiles
+        .where('status')
+        .anyOf([UploadStatus.PENDING, UploadStatus.UPLOADING])
+        .count();
+}
+
+/**
+ * Upload single photo
+ */
+export async function uploadPhoto(localId, onProgress) {
+    const entry = await db.pendingFiles.get(localId);
+    if (!entry || entry.status !== UploadStatus.PENDING) {
+        return { success: false, error: 'Foto nicht gefunden oder bereits verarbeitet' };
+    }
+
+    await db.pendingFiles.update(localId, { status: UploadStatus.UPLOADING });
+
+    try {
+        const formData = new FormData();
+        formData.append('workorderId', entry.workorderId);
+        formData.append('documentType', entry.documentType);
+        formData.append('description', entry.description || '');
+        formData.append('files[]', entry.blob, entry.fileName);
+
+        const response = await fetch(`${API_BASE}/uploadDocumentation`, {
+            method: 'POST',
+            credentials: 'include',
+            body: formData
+        });
+
+        const result = await response.json();
+
+        if (result.success) {
+            // Mark as completed but keep for a while (cleanup later)
+            await db.pendingFiles.update(localId, {
+                status: UploadStatus.COMPLETED,
+                completedAt: Date.now(),
+                serverResponse: result
+            });
+
+            console.log(`[PhotoQueue] Uploaded photo ${localId}`);
+            return { success: true, localId, serverResponse: result };
+        } else {
+            await db.pendingFiles.update(localId, {
+                status: UploadStatus.FAILED,
+                error: result.error || 'Upload fehlgeschlagen'
+            });
+
+            return { success: false, localId, error: result.error };
+        }
+    } catch (error) {
+        console.error(`[PhotoQueue] Upload failed for ${localId}:`, error);
+
+        await db.pendingFiles.update(localId, {
+            status: UploadStatus.PENDING, // Back to pending for retry
+            error: error.message
+        });
+
+        return { success: false, localId, error: error.message, retriable: true };
+    }
+}
+
+/**
+ * Upload all pending photos
+ */
+export async function uploadAllPending(onProgress) {
+    const pending = await getPendingPhotos();
+    const total = pending.length;
+    let uploaded = 0;
+    let failed = 0;
+
+    for (const photo of pending) {
+        onProgress?.({
+            current: uploaded + 1,
+            total,
+            fileName: photo.fileName
+        });
+
+        const result = await uploadPhoto(photo.localId);
+        if (result.success) {
+            uploaded++;
+        } else {
+            failed++;
+        }
+    }
+
+    return { uploaded, failed, total };
+}
+
+/**
+ * Delete pending photo
+ */
+export async function deletePendingPhoto(localId) {
+    await db.pendingFiles.delete(localId);
+    console.log(`[PhotoQueue] Deleted pending photo ${localId}`);
+}
+
+/**
+ * Delete all pending photos for workorder
+ */
+export async function deleteWorkorderPhotos(workorderId) {
+    const count = await db.pendingFiles
+        .where('workorderId')
+        .equals(workorderId)
+        .delete();
+    console.log(`[PhotoQueue] Deleted ${count} pending photos for workorder ${workorderId}`);
+    return count;
+}
+
+/**
+ * Retry failed photo
+ */
+export async function retryPhoto(localId) {
+    await db.pendingFiles.update(localId, {
+        status: UploadStatus.PENDING,
+        error: null
+    });
+}
+
+/**
+ * Cleanup completed photos older than specified time
+ */
+export async function cleanupCompleted(maxAgeMs = 24 * 60 * 60 * 1000) {
+    const cutoff = Date.now() - maxAgeMs;
+    const count = await db.pendingFiles
+        .where('status')
+        .equals(UploadStatus.COMPLETED)
+        .filter(p => p.completedAt && p.completedAt < cutoff)
+        .delete();
+    console.log(`[PhotoQueue] Cleaned up ${count} completed photos`);
+    return count;
+}
+
+/**
+ * Get thumbnail blob for pending photo (for preview)
+ */
+export async function getPhotoThumbnail(localId) {
+    const entry = await db.pendingFiles.get(localId);
+    if (!entry || !entry.blob) return null;
+
+    // Create small thumbnail using canvas
+    return new Promise((resolve) => {
+        const img = new Image();
+        img.onload = () => {
+            const canvas = document.createElement('canvas');
+            const maxSize = 200;
+            let width = img.width;
+            let height = img.height;
+
+            if (width > height) {
+                if (width > maxSize) {
+                    height = Math.round((height * maxSize) / width);
+                    width = maxSize;
+                }
+            } else {
+                if (height > maxSize) {
+                    width = Math.round((width * maxSize) / height);
+                    height = maxSize;
+                }
+            }
+
+            canvas.width = width;
+            canvas.height = height;
+
+            const ctx = canvas.getContext('2d');
+            ctx.drawImage(img, 0, 0, width, height);
+
+            canvas.toBlob(resolve, 'image/jpeg', 0.7);
+        };
+        img.onerror = () => resolve(null);
+        img.src = URL.createObjectURL(entry.blob);
+    });
+}
+
+/**
+ * Get photo URL for display (creates object URL)
+ */
+export async function getPhotoUrl(localId) {
+    const entry = await db.pendingFiles.get(localId);
+    if (!entry || !entry.blob) return null;
+    return URL.createObjectURL(entry.blob);
+}
+
+/**
+ * Get storage size used by pending photos
+ */
+export async function getStorageUsed() {
+    const photos = await db.pendingFiles.toArray();
+    let totalSize = 0;
+    for (const photo of photos) {
+        if (photo.blob) {
+            totalSize += photo.blob.size;
+        }
+    }
+    return totalSize;
+}
+
+/**
+ * Check if there's enough storage for new photo
+ */
+export async function hasStorageSpace(estimatedSize = 2 * 1024 * 1024) {
+    if (navigator.storage && navigator.storage.estimate) {
+        const estimate = await navigator.storage.estimate();
+        const available = (estimate.quota || 0) - (estimate.usage || 0);
+        const buffer = 10 * 1024 * 1024; // 10MB buffer
+        return available > (estimatedSize + buffer);
+    }
+    return true; // Assume we have space if we can't check
+}
+
+export default {
+    UploadStatus,
+    queue: queuePhoto,
+    getPending: getPendingPhotos,
+    getWorkorderPhotos: getWorkorderPendingPhotos,
+    getPendingCount,
+    upload: uploadPhoto,
+    uploadAll: uploadAllPending,
+    delete: deletePendingPhoto,
+    deleteForWorkorder: deleteWorkorderPhotos,
+    retry: retryPhoto,
+    cleanup: cleanupCompleted,
+    getThumbnail: getPhotoThumbnail,
+    getUrl: getPhotoUrl,
+    getStorageUsed,
+    hasSpace: hasStorageSpace
+};
diff --git a/public/mobile/shared/syncManager.js b/public/mobile/shared/syncManager.js
new file mode 100644
index 000000000..471983bdc
--- /dev/null
+++ b/public/mobile/shared/syncManager.js
@@ -0,0 +1,414 @@
+/**
+ * Sync Manager - iOS-compatible sync orchestration
+ *
+ * Background Sync API is NOT supported on iOS Safari.
+ * This manager uses visibility-based and online-event sync as primary strategy.
+ */
+
+import { db, getPendingCount as getDbPendingCount } from './db.js';
+import { isOfflineModeEnabled, isAutoSyncEnabled, updateLastSyncTimestamp } from './offlineSettings.js';
+import syncQueue from './syncQueue.js';
+import photoQueue from './photoQueue.js';
+import workorderService from './workorderOfflineService.js';
+
+const API_BASE = '/MobileApp/Workorder/Workorder';
+
+// Sync state
+const syncState = {
+    isSyncing: false,
+    lastSyncAttempt: null,
+    lastSyncSuccess: null,
+    syncError: null,
+    listeners: new Set()
+};
+
+// Minimum time between auto-syncs (prevent rapid fire)
+const MIN_SYNC_INTERVAL = 30000; // 30 seconds
+
+/**
+ * Notify listeners of state change
+ */
+function notifyListeners(event, data) {
+    for (const listener of syncState.listeners) {
+        try {
+            listener(event, data);
+        } catch (error) {
+            console.error('[SyncManager] Listener error:', error);
+        }
+    }
+}
+
+/**
+ * Subscribe to sync events
+ */
+export function subscribe(listener) {
+    syncState.listeners.add(listener);
+    return () => syncState.listeners.delete(listener);
+}
+
+/**
+ * Get current sync state
+ */
+export function getSyncState() {
+    return { ...syncState };
+}
+
+/**
+ * Check if sync is currently running
+ */
+export function isSyncing() {
+    return syncState.isSyncing;
+}
+
+/**
+ * Initialize sync manager
+ * Sets up event listeners for iOS-compatible sync
+ */
+export function initSyncManager() {
+    // Primary iOS strategy: sync when app becomes visible
+    document.addEventListener('visibilitychange', handleVisibilityChange);
+
+    // Sync when network reconnects
+    window.addEventListener('online', handleOnline);
+
+    // Also handle page show (for bfcache restoration)
+    window.addEventListener('pageshow', handlePageShow);
+
+    // Initial sync check on load
+    window.addEventListener('load', () => {
+        if (navigator.onLine && isOfflineModeEnabled()) {
+            // Delay initial sync slightly to let app stabilize
+            setTimeout(() => maybeTriggerSync('load'), 2000);
+        }
+    });
+
+    // Try to register for Background Sync (Chrome/Edge only)
+    registerBackgroundSync().catch(() => {
+        console.log('[SyncManager] Background Sync not available, using fallback');
+    });
+
+    console.log('[SyncManager] Initialized');
+}
+
+/**
+ * Handle visibility change
+ */
+function handleVisibilityChange() {
+    if (document.visibilityState === 'visible' && navigator.onLine) {
+        maybeTriggerSync('visibility');
+    }
+}
+
+/**
+ * Handle online event
+ */
+function handleOnline() {
+    maybeTriggerSync('online');
+}
+
+/**
+ * Handle pageshow event
+ */
+function handlePageShow(event) {
+    if (event.persisted && navigator.onLine) {
+        // Page was restored from bfcache
+        maybeTriggerSync('pageshow');
+    }
+}
+
+/**
+ * Maybe trigger sync (with throttling)
+ */
+async function maybeTriggerSync(trigger) {
+    if (!isOfflineModeEnabled() || !isAutoSyncEnabled()) {
+        return;
+    }
+
+    if (syncState.isSyncing) {
+        console.log('[SyncManager] Sync already in progress, skipping');
+        return;
+    }
+
+    // Throttle syncs
+    const now = Date.now();
+    if (syncState.lastSyncAttempt && (now - syncState.lastSyncAttempt) < MIN_SYNC_INTERVAL) {
+        console.log('[SyncManager] Sync throttled, too recent');
+        return;
+    }
+
+    // Check if there's anything to sync
+    const pendingOps = await syncQueue.getPendingCount();
+    const pendingPhotos = await photoQueue.getPendingCount();
+
+    if (pendingOps === 0 && pendingPhotos === 0) {
+        console.log('[SyncManager] No pending changes to sync');
+        return;
+    }
+
+    console.log(`[SyncManager] Auto-sync triggered by ${trigger} (${pendingOps} ops, ${pendingPhotos} photos)`);
+    await performSync();
+}
+
+/**
+ * Register for Background Sync API (Chrome/Edge only)
+ */
+async function registerBackgroundSync() {
+    if ('serviceWorker' in navigator && 'sync' in window.SyncManager?.prototype) {
+        const registration = await navigator.serviceWorker.ready;
+        if ('sync' in registration) {
+            await registration.sync.register('workorder-sync');
+            console.log('[SyncManager] Background Sync registered');
+        }
+    }
+}
+
+/**
+ * Perform sync - main sync logic
+ */
+export async function performSync(options = {}) {
+    if (syncState.isSyncing && !options.force) {
+        return { success: false, error: 'Sync already in progress' };
+    }
+
+    if (!navigator.onLine) {
+        return { success: false, error: 'Offline' };
+    }
+
+    syncState.isSyncing = true;
+    syncState.lastSyncAttempt = Date.now();
+    syncState.syncError = null;
+    notifyListeners('sync-start', {});
+
+    const results = {
+        operations: { success: 0, failed: 0, total: 0 },
+        photos: { success: 0, failed: 0, total: 0 },
+        conflicts: [],
+        reassigned: []
+    };
+
+    try {
+        // 1. Process pending operations
+        const pendingOps = await syncQueue.getPending();
+        results.operations.total = pendingOps.length;
+
+        for (const op of pendingOps) {
+            notifyListeners('sync-progress', {
+                phase: 'operations',
+                current: results.operations.success + results.operations.failed + 1,
+                total: results.operations.total
+            });
+
+            const opResult = await processOperation(op);
+            if (opResult.success) {
+                results.operations.success++;
+            } else {
+                results.operations.failed++;
+                if (opResult.conflict) {
+                    results.conflicts.push({
+                        operation: op,
+                        serverData: opResult.serverData
+                    });
+                }
+            }
+        }
+
+        // 2. Upload pending photos
+        const pendingPhotos = await photoQueue.getPending();
+        results.photos.total = pendingPhotos.length;
+
+        for (const photo of pendingPhotos) {
+            notifyListeners('sync-progress', {
+                phase: 'photos',
+                current: results.photos.success + results.photos.failed + 1,
+                total: results.photos.total,
+                fileName: photo.fileName
+            });
+
+            const photoResult = await photoQueue.upload(photo.localId);
+            if (photoResult.success) {
+                results.photos.success++;
+            } else {
+                results.photos.failed++;
+            }
+        }
+
+        // 3. Check for reassigned workorders (if enabled)
+        if (options.checkReassigned !== false) {
+            const serverWorkorderIds = await fetchServerWorkorderIds();
+            if (serverWorkorderIds) {
+                results.reassigned = await workorderService.checkReassignedWorkorders(serverWorkorderIds);
+            }
+        }
+
+        // 4. Cleanup old completed items
+        await syncQueue.cleanup();
+        await photoQueue.cleanup();
+
+        // Update last sync time
+        updateLastSyncTimestamp();
+        syncState.lastSyncSuccess = Date.now();
+
+        console.log('[SyncManager] Sync completed:', results);
+        notifyListeners('sync-complete', results);
+
+        return { success: true, results };
+
+    } catch (error) {
+        console.error('[SyncManager] Sync error:', error);
+        syncState.syncError = error.message;
+        notifyListeners('sync-error', { error: error.message });
+        return { success: false, error: error.message };
+
+    } finally {
+        syncState.isSyncing = false;
+    }
+}
+
+/**
+ * Process single operation from queue
+ */
+async function processOperation(op) {
+    await syncQueue.markProcessing(op.localId);
+
+    try {
+        const result = await executeOperation(op);
+
+        if (result.success) {
+            await syncQueue.markCompleted(op.localId, result);
+            return { success: true };
+        }
+
+        if (result.conflict) {
+            // Conflict detected - don't retry automatically
+            await syncQueue.markFailed(op.localId, 'Konflikt erkannt', false);
+            return { success: false, conflict: true, serverData: result.serverData };
+        }
+
+        // Check if retriable
+        const retriable = syncQueue.isRetriableError(result._status, result.error);
+        await syncQueue.markFailed(op.localId, result.error, retriable);
+        return { success: false, error: result.error };
+
+    } catch (error) {
+        await syncQueue.markFailed(op.localId, error.message, true);
+        return { success: false, error: error.message };
+    }
+}
+
+/**
+ * Execute operation via API
+ */
+async function executeOperation(op) {
+    const endpoint = getOperationEndpoint(op.operation);
+    if (!endpoint) {
+        return { success: false, error: `Unknown operation: ${op.operation}` };
+    }
+
+    const response = await fetch(`${API_BASE}/${endpoint}`, {
+        method: 'POST',
+        credentials: 'include',
+        headers: {
+            'Content-Type': 'application/json',
+            'Idempotency-Key': op.operationId,
+            'X-Client-Timestamp': String(op.clientTimestamp),
+            'X-Device-Id': op.deviceId
+        },
+        body: JSON.stringify(op.payload)
+    });
+
+    const data = await response.json();
+    return { ...data, _status: response.status };
+}
+
+/**
+ * Map operation type to API endpoint
+ */
+function getOperationEndpoint(operation) {
+    const endpoints = {
+        'addJournal': 'addJournal',
+        'updateNotes': 'updateAdditionalInfo',
+        'scheduleAppointment': 'scheduleAppointment',
+        'requestIntervention': 'requestIntervention',
+        'updateCableData': 'updateWorkorderData',
+        'completeWorkorder': 'completeWorkorder'
+    };
+    return endpoints[operation];
+}
+
+/**
+ * Fetch server workorder IDs for reassignment check
+ */
+async function fetchServerWorkorderIds() {
+    try {
+        const response = await fetch(`${API_BASE}/getWorkorderIds`, {
+            credentials: 'include'
+        });
+        if (response.ok) {
+            const data = await response.json();
+            return data.success ? data.ids : null;
+        }
+    } catch (error) {
+        console.warn('[SyncManager] Failed to fetch workorder IDs:', error);
+    }
+    return null;
+}
+
+/**
+ * Manual sync trigger
+ */
+export async function triggerManualSync() {
+    console.log('[SyncManager] Manual sync triggered');
+    return performSync({ force: true });
+}
+
+/**
+ * Get pending changes count
+ */
+export async function getPendingCount() {
+    const ops = await syncQueue.getPendingCount();
+    const photos = await photoQueue.getPendingCount();
+    return ops + photos;
+}
+
+/**
+ * Get detailed pending summary
+ */
+export async function getPendingSummary() {
+    const ops = await syncQueue.getPendingCount();
+    const photos = await photoQueue.getPendingCount();
+    const failedOps = await syncQueue.getFailed();
+
+    return {
+        operations: ops,
+        photos: photos,
+        total: ops + photos,
+        failed: failedOps.length,
+        hasFailures: failedOps.length > 0
+    };
+}
+
+/**
+ * Cleanup and stop sync manager
+ */
+export function destroySyncManager() {
+    document.removeEventListener('visibilitychange', handleVisibilityChange);
+    window.removeEventListener('online', handleOnline);
+    window.removeEventListener('pageshow', handlePageShow);
+    syncState.listeners.clear();
+    console.log('[SyncManager] Destroyed');
+}
+
+// Export for service worker communication
+export const SyncManager = {
+    init: initSyncManager,
+    destroy: destroySyncManager,
+    sync: performSync,
+    triggerSync: triggerManualSync,
+    subscribe,
+    getState: getSyncState,
+    isSyncing,
+    getPendingCount,
+    getPendingSummary
+};
+
+export default SyncManager;
diff --git a/public/mobile/shared/syncQueue.js b/public/mobile/shared/syncQueue.js
new file mode 100644
index 000000000..7f0ef5763
--- /dev/null
+++ b/public/mobile/shared/syncQueue.js
@@ -0,0 +1,349 @@
+/**
+ * Sync Queue - Operation queue for pending mutations
+ *
+ * Handles queueing operations when offline and processing them when online.
+ * Implements idempotency keys, retry logic with exponential backoff, and priority ordering.
+ */
+
+import { db, OperationType, OperationPriority, SyncStatus } from './db.js';
+import { getDeviceId } from './offlineSettings.js';
+
+// Queue entry status
+export const QueueStatus = {
+    PENDING: 'pending',
+    PROCESSING: 'processing',
+    COMPLETED: 'completed',
+    FAILED: 'failed'
+};
+
+// Retry configuration
+const RETRY_CONFIG = {
+    maxRetries: 5,
+    baseDelay: 1000,      // 1 second
+    maxDelay: 30000,      // 30 seconds
+    factor: 2,
+    jitter: 0.3           // +/- 30%
+};
+
+/**
+ * Generate a unique operation ID (idempotency key)
+ */
+function generateOperationId() {
+    if (crypto.randomUUID) {
+        return crypto.randomUUID();
+    }
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+        const r = Math.random() * 16 | 0;
+        const v = c === 'x' ? r : (r & 0x3 | 0x8);
+        return v.toString(16);
+    });
+}
+
+/**
+ * Calculate delay with exponential backoff and jitter
+ */
+function calculateDelay(retryCount) {
+    const delay = Math.min(
+        RETRY_CONFIG.baseDelay * Math.pow(RETRY_CONFIG.factor, retryCount),
+        RETRY_CONFIG.maxDelay
+    );
+    // Add jitter
+    const jitter = delay * RETRY_CONFIG.jitter * (Math.random() * 2 - 1);
+    return Math.round(delay + jitter);
+}
+
+/**
+ * Add operation to sync queue
+ */
+export async function queueOperation(operation, workorderId, payload, options = {}) {
+    const entry = {
+        operationId: options.operationId || generateOperationId(),
+        operation,
+        workorderId,
+        payload,
+        status: QueueStatus.PENDING,
+        priority: OperationPriority[operation] || 99,
+        retryCount: 0,
+        createdAt: Date.now(),
+        clientTimestamp: Date.now(),
+        deviceId: getDeviceId(),
+        lastAttempt: null,
+        nextAttempt: null,
+        error: null
+    };
+
+    const localId = await db.syncQueue.add(entry);
+    console.log(`[SyncQueue] Queued operation: ${operation} for workorder ${workorderId}, localId: ${localId}`);
+
+    return { localId, operationId: entry.operationId };
+}
+
+/**
+ * Get all pending operations sorted by priority
+ */
+export async function getPendingOperations() {
+    const now = Date.now();
+    const pending = await db.syncQueue
+        .where('status')
+        .equals(QueueStatus.PENDING)
+        .toArray();
+
+    // Filter out operations that are scheduled for later (retry delay)
+    const ready = pending.filter(op => !op.nextAttempt || op.nextAttempt <= now);
+
+    // Sort by priority (lower = higher priority), then by createdAt
+    return ready.sort((a, b) => {
+        if (a.priority !== b.priority) {
+            return a.priority - b.priority;
+        }
+        return a.createdAt - b.createdAt;
+    });
+}
+
+/**
+ * Get operations for a specific workorder
+ */
+export async function getWorkorderOperations(workorderId) {
+    return db.syncQueue
+        .where('workorderId')
+        .equals(workorderId)
+        .toArray();
+}
+
+/**
+ * Get pending count
+ */
+export async function getPendingCount() {
+    return db.syncQueue
+        .where('status')
+        .equals(QueueStatus.PENDING)
+        .count();
+}
+
+/**
+ * Get failed operations
+ */
+export async function getFailedOperations() {
+    return db.syncQueue
+        .where('status')
+        .equals(QueueStatus.FAILED)
+        .toArray();
+}
+
+/**
+ * Mark operation as processing
+ */
+export async function markProcessing(localId) {
+    await db.syncQueue.update(localId, {
+        status: QueueStatus.PROCESSING,
+        lastAttempt: Date.now()
+    });
+}
+
+/**
+ * Mark operation as completed
+ */
+export async function markCompleted(localId, serverResponse = null) {
+    await db.syncQueue.update(localId, {
+        status: QueueStatus.COMPLETED,
+        serverResponse,
+        completedAt: Date.now()
+    });
+    console.log(`[SyncQueue] Operation ${localId} completed`);
+}
+
+/**
+ * Mark operation as failed with retry scheduling
+ */
+export async function markFailed(localId, error, isRetriable = true) {
+    const operation = await db.syncQueue.get(localId);
+    if (!operation) return;
+
+    const newRetryCount = operation.retryCount + 1;
+
+    if (isRetriable && newRetryCount < RETRY_CONFIG.maxRetries) {
+        // Schedule retry
+        const delay = calculateDelay(newRetryCount);
+        await db.syncQueue.update(localId, {
+            status: QueueStatus.PENDING,  // Back to pending for retry
+            retryCount: newRetryCount,
+            lastAttempt: Date.now(),
+            nextAttempt: Date.now() + delay,
+            error: error?.message || String(error)
+        });
+        console.log(`[SyncQueue] Operation ${localId} failed, retry ${newRetryCount}/${RETRY_CONFIG.maxRetries} in ${delay}ms`);
+    } else {
+        // Max retries reached or non-retriable error
+        await db.syncQueue.update(localId, {
+            status: QueueStatus.FAILED,
+            retryCount: newRetryCount,
+            lastAttempt: Date.now(),
+            error: error?.message || String(error)
+        });
+        console.log(`[SyncQueue] Operation ${localId} permanently failed after ${newRetryCount} attempts`);
+    }
+}
+
+/**
+ * Check if error is retriable
+ * Retriable: 408, 429, 500, 502, 503, 504, network errors
+ * Non-retriable: 400, 401, 403, 404, 409, 422
+ */
+export function isRetriableError(status, error) {
+    // Network errors are retriable
+    if (!status && error) {
+        return true;
+    }
+
+    // Retriable status codes
+    const retriableCodes = [408, 429, 500, 502, 503, 504];
+    return retriableCodes.includes(status);
+}
+
+/**
+ * Remove completed operations older than specified time
+ */
+export async function cleanupCompleted(maxAgeMs = 24 * 60 * 60 * 1000) {
+    const cutoff = Date.now() - maxAgeMs;
+    const count = await db.syncQueue
+        .where('status')
+        .equals(QueueStatus.COMPLETED)
+        .filter(op => op.completedAt && op.completedAt < cutoff)
+        .delete();
+    console.log(`[SyncQueue] Cleaned up ${count} completed operations`);
+    return count;
+}
+
+/**
+ * Retry a failed operation
+ */
+export async function retryOperation(localId) {
+    await db.syncQueue.update(localId, {
+        status: QueueStatus.PENDING,
+        nextAttempt: null,
+        error: null
+    });
+    console.log(`[SyncQueue] Operation ${localId} marked for retry`);
+}
+
+/**
+ * Retry all failed operations
+ */
+export async function retryAllFailed() {
+    const failed = await getFailedOperations();
+    for (const op of failed) {
+        await retryOperation(op.localId);
+    }
+    return failed.length;
+}
+
+/**
+ * Delete an operation from queue
+ */
+export async function deleteOperation(localId) {
+    await db.syncQueue.delete(localId);
+    console.log(`[SyncQueue] Operation ${localId} deleted`);
+}
+
+/**
+ * Delete all operations for a workorder (e.g., when reassigned)
+ */
+export async function deleteWorkorderOperations(workorderId) {
+    const count = await db.syncQueue
+        .where('workorderId')
+        .equals(workorderId)
+        .delete();
+    console.log(`[SyncQueue] Deleted ${count} operations for workorder ${workorderId}`);
+    return count;
+}
+
+/**
+ * Get queue statistics
+ */
+export async function getQueueStats() {
+    const all = await db.syncQueue.toArray();
+    const stats = {
+        total: all.length,
+        pending: 0,
+        processing: 0,
+        completed: 0,
+        failed: 0,
+        byOperation: {}
+    };
+
+    for (const op of all) {
+        stats[op.status]++;
+        stats.byOperation[op.operation] = (stats.byOperation[op.operation] || 0) + 1;
+    }
+
+    return stats;
+}
+
+/**
+ * Check if there are pending changes for a workorder
+ */
+export async function hasPendingChanges(workorderId) {
+    const count = await db.syncQueue
+        .where('workorderId')
+        .equals(workorderId)
+        .filter(op => op.status === QueueStatus.PENDING || op.status === QueueStatus.PROCESSING)
+        .count();
+    return count > 0;
+}
+
+/**
+ * Get the optimistic state for a workorder (apply pending operations)
+ */
+export async function getOptimisticState(workorderId, baseState) {
+    const operations = await getWorkorderOperations(workorderId);
+    const pendingOps = operations.filter(
+        op => op.status === QueueStatus.PENDING || op.status === QueueStatus.PROCESSING
+    );
+
+    let state = { ...baseState };
+
+    for (const op of pendingOps) {
+        switch (op.operation) {
+            case OperationType.UPDATE_NOTES:
+                state.additionalInfo = op.payload.additionalInfo;
+                break;
+            case OperationType.SCHEDULE_APPOINTMENT:
+                state.appointmentDate = op.payload.appointmentDate;
+                state.status = 'scheduled';
+                break;
+            case OperationType.UPDATE_CABLE_DATA:
+                state.cableLength = op.payload.cableLength;
+                state.cableType = op.payload.cableType;
+                break;
+            case OperationType.REQUEST_INTERVENTION:
+                state.status = 'intervention_required';
+                break;
+            case OperationType.COMPLETE_WORKORDER:
+                state.status = 'documented';
+                break;
+        }
+    }
+
+    return state;
+}
+
+export default {
+    QueueStatus,
+    queue: queueOperation,
+    getPending: getPendingOperations,
+    getWorkorderOps: getWorkorderOperations,
+    getPendingCount,
+    getFailed: getFailedOperations,
+    markProcessing,
+    markCompleted,
+    markFailed,
+    isRetriableError,
+    cleanup: cleanupCompleted,
+    retry: retryOperation,
+    retryAll: retryAllFailed,
+    delete: deleteOperation,
+    deleteForWorkorder: deleteWorkorderOperations,
+    getStats: getQueueStats,
+    hasPending: hasPendingChanges,
+    getOptimistic: getOptimisticState
+};
diff --git a/public/mobile/shared/workorderOfflineService.js b/public/mobile/shared/workorderOfflineService.js
new file mode 100644
index 000000000..2be29cc22
--- /dev/null
+++ b/public/mobile/shared/workorderOfflineService.js
@@ -0,0 +1,710 @@
+/**
+ * Workorder Offline Service - Data access layer
+ *
+ * Abstracts data access to route through IndexedDB or network based on
+ * offline mode setting and connectivity status.
+ */
+
+import { db, SyncStatus, OperationType } from './db.js';
+import { isOfflineModeEnabled, getDeviceId, updateLastSyncTimestamp } from './offlineSettings.js';
+import syncQueue from './syncQueue.js';
+
+const API_BASE = '/MobileApp/Workorder/Workorder';
+
+/**
+ * Check if device is online
+ */
+function isOnline() {
+    return navigator.onLine;
+}
+
+/**
+ * Check if we should use offline storage
+ */
+function shouldUseOfflineStorage() {
+    return isOfflineModeEnabled() && (!isOnline() || !navigator.onLine);
+}
+
+/**
+ * Make API request with error handling
+ */
+async function apiRequest(endpoint, options = {}) {
+    const url = `${API_BASE}/${endpoint}`;
+    const config = {
+        credentials: 'include',
+        headers: {
+            'Content-Type': 'application/json',
+            ...(options.idempotencyKey && { 'Idempotency-Key': options.idempotencyKey }),
+            ...(options.headers || {})
+        },
+        ...options
+    };
+
+    if (options.body && typeof options.body === 'object') {
+        config.body = JSON.stringify(options.body);
+    }
+
+    try {
+        const response = await fetch(url, config);
+
+        if (response.status === 401) {
+            // Auth error - should be handled by app
+            return { success: false, error: 'Nicht autorisiert', authError: true };
+        }
+
+        const data = await response.json();
+        return { ...data, _status: response.status };
+    } catch (error) {
+        console.error(`[OfflineService] API error for ${endpoint}:`, error);
+        return { success: false, error: 'Netzwerkfehler', networkError: true };
+    }
+}
+
+// ============================================================================
+// READ OPERATIONS
+// ============================================================================
+
+/**
+ * Get workorders list
+ * If offline mode enabled: serve from cache, fallback to network
+ * If online: fetch from network, update cache
+ */
+export async function getWorkorders(filters = {}) {
+    if (isOfflineModeEnabled()) {
+        // Try to get from cache first
+        const cached = await getCachedWorkorders(filters);
+
+        if (!isOnline()) {
+            // Offline - return cached data
+            return {
+                success: true,
+                workorders: cached,
+                fromCache: true,
+                offline: true
+            };
+        }
+
+        // Online - fetch fresh data and update cache
+        const result = await apiRequest('get', {
+            method: 'POST',
+            body: { filters }
+        });
+
+        if (result.success && result.workorders) {
+            await updateWorkordersCache(result.workorders);
+            return { ...result, fromCache: false };
+        }
+
+        // Network failed but we have cache
+        if (cached.length > 0) {
+            return {
+                success: true,
+                workorders: cached,
+                fromCache: true,
+                stale: true
+            };
+        }
+
+        return result;
+    }
+
+    // Offline mode disabled - direct API call
+    return apiRequest('get', {
+        method: 'POST',
+        body: { filters }
+    });
+}
+
+/**
+ * Get cached workorders from IndexedDB
+ */
+async function getCachedWorkorders(filters = {}) {
+    let query = db.workorders.toCollection();
+
+    if (filters.companyId) {
+        query = db.workorders.where('companyId').equals(filters.companyId);
+    }
+
+    if (filters.status) {
+        query = query.filter(w => w.status === filters.status);
+    }
+
+    const workorders = await query.toArray();
+
+    // Apply optimistic updates from sync queue
+    const result = [];
+    for (const wo of workorders) {
+        const optimistic = await syncQueue.getOptimistic(wo.id, wo);
+        result.push(optimistic);
+    }
+
+    return result;
+}
+
+/**
+ * Update workorders cache
+ */
+async function updateWorkordersCache(workorders) {
+    await db.transaction('rw', db.workorders, async () => {
+        for (const wo of workorders) {
+            await db.workorders.put({
+                ...wo,
+                _syncStatus: SyncStatus.SYNCED,
+                _lastModified: Date.now()
+            });
+        }
+    });
+}
+
+/**
+ * Get workorder detail
+ */
+export async function getWorkorderDetail(workorderId) {
+    if (isOfflineModeEnabled()) {
+        // Try cache first
+        const cached = await getCachedWorkorderDetail(workorderId);
+
+        if (!isOnline()) {
+            if (cached) {
+                return {
+                    success: true,
+                    ...cached,
+                    fromCache: true,
+                    offline: true
+                };
+            }
+            return { success: false, error: 'Offline - keine gecachten Daten', offline: true };
+        }
+
+        // Online - fetch fresh
+        const result = await apiRequest(`getWorkorderDetail?id=${workorderId}`);
+
+        if (result.success) {
+            await cacheWorkorderDetail(workorderId, result);
+            return { ...result, fromCache: false };
+        }
+
+        // Network failed, return cache if available
+        if (cached) {
+            return {
+                success: true,
+                ...cached,
+                fromCache: true,
+                stale: true
+            };
+        }
+
+        return result;
+    }
+
+    // Offline mode disabled
+    return apiRequest(`getWorkorderDetail?id=${workorderId}`);
+}
+
+/**
+ * Get cached workorder detail
+ */
+async function getCachedWorkorderDetail(workorderId) {
+    const detail = await db.workorderDetails.get(workorderId);
+    if (!detail) return null;
+
+    // Get related data
+    const documentation = await db.documentation
+        .where('workorderId')
+        .equals(workorderId)
+        .toArray();
+
+    const journals = await db.journals
+        .where('workorderId')
+        .equals(workorderId)
+        .toArray();
+
+    // Get pending journals from sync queue
+    const pendingOps = await syncQueue.getWorkorderOps(workorderId);
+    const pendingJournals = pendingOps
+        .filter(op => op.operation === OperationType.ADD_JOURNAL && op.status !== 'completed')
+        .map(op => ({
+            id: `pending-${op.localId}`,
+            workorderId,
+            text: op.payload.text,
+            create: op.clientTimestamp,
+            _pending: true
+        }));
+
+    // Apply optimistic state to workorder
+    const workorder = await db.workorders.get(workorderId);
+    const optimisticWorkorder = workorder
+        ? await syncQueue.getOptimistic(workorderId, { ...detail.workorder, ...workorder })
+        : detail.workorder;
+
+    return {
+        workorder: optimisticWorkorder,
+        documentation: {
+            docs: documentation,
+            journals: [...journals, ...pendingJournals].sort((a, b) => b.create - a.create)
+        },
+        tenantConfig: detail.tenantConfig,
+        checklist: detail.checklist,
+        technicalData: detail.technicalData
+    };
+}
+
+/**
+ * Cache workorder detail
+ */
+async function cacheWorkorderDetail(workorderId, data) {
+    await db.transaction('rw', [db.workorderDetails, db.documentation, db.journals, db.tenantConfigs], async () => {
+        // Store main detail
+        await db.workorderDetails.put({
+            workorderId,
+            workorder: data.workorder,
+            tenantConfig: data.tenantConfig,
+            checklist: data.checklist,
+            technicalData: data.technicalData,
+            lastFetched: Date.now()
+        });
+
+        // Store documentation
+        if (data.documentation?.docs) {
+            for (const doc of data.documentation.docs) {
+                await db.documentation.put({
+                    ...doc,
+                    workorderId,
+                    _syncStatus: SyncStatus.SYNCED
+                });
+            }
+        }
+
+        // Store journals
+        if (data.documentation?.journals) {
+            for (const journal of data.documentation.journals) {
+                await db.journals.put({
+                    ...journal,
+                    workorderId
+                });
+            }
+        }
+
+        // Store tenant config
+        if (data.tenantConfig) {
+            await db.tenantConfigs.put({
+                ...data.tenantConfig,
+                lastFetched: Date.now()
+            });
+        }
+    });
+}
+
+// ============================================================================
+// WRITE OPERATIONS
+// ============================================================================
+
+/**
+ * Add journal entry
+ */
+export async function addJournal(workorderId, text) {
+    if (isOfflineModeEnabled() && !isOnline()) {
+        // Queue for later sync
+        const { localId, operationId } = await syncQueue.queue(
+            OperationType.ADD_JOURNAL,
+            workorderId,
+            { workorderId, text }
+        );
+
+        return {
+            success: true,
+            queued: true,
+            localId,
+            operationId,
+            message: 'Eintrag wird bei nächster Verbindung synchronisiert'
+        };
+    }
+
+    // Online - direct API call
+    const result = await apiRequest('addJournal', {
+        method: 'POST',
+        body: { workorderId, text }
+    });
+
+    if (result.success && isOfflineModeEnabled()) {
+        // Update cache with new journal
+        await db.journals.add({
+            ...result.journal,
+            workorderId
+        });
+    }
+
+    return result;
+}
+
+/**
+ * Update notes (additional info)
+ */
+export async function updateNotes(workorderId, additionalInfo) {
+    if (isOfflineModeEnabled() && !isOnline()) {
+        const { localId, operationId } = await syncQueue.queue(
+            OperationType.UPDATE_NOTES,
+            workorderId,
+            { workorderId, additionalInfo }
+        );
+
+        // Optimistic update in cache
+        await db.workorders.update(workorderId, {
+            additionalInfo,
+            _syncStatus: SyncStatus.PENDING
+        });
+
+        return {
+            success: true,
+            queued: true,
+            localId,
+            operationId,
+            message: 'Änderungen werden bei nächster Verbindung synchronisiert'
+        };
+    }
+
+    const result = await apiRequest('updateAdditionalInfo', {
+        method: 'POST',
+        body: { workorderId, additionalInfo }
+    });
+
+    if (result.success && isOfflineModeEnabled()) {
+        await db.workorders.update(workorderId, { additionalInfo });
+    }
+
+    return result;
+}
+
+/**
+ * Schedule appointment
+ */
+export async function scheduleAppointment(workorderId, appointmentDate) {
+    if (isOfflineModeEnabled() && !isOnline()) {
+        const { localId, operationId } = await syncQueue.queue(
+            OperationType.SCHEDULE_APPOINTMENT,
+            workorderId,
+            { workorderId, appointmentDate }
+        );
+
+        await db.workorders.update(workorderId, {
+            appointmentDate,
+            status: 'scheduled',
+            _syncStatus: SyncStatus.PENDING
+        });
+
+        return {
+            success: true,
+            queued: true,
+            localId,
+            operationId,
+            message: 'Termin wird bei nächster Verbindung synchronisiert'
+        };
+    }
+
+    const result = await apiRequest('scheduleAppointment', {
+        method: 'POST',
+        body: { workorderId, appointmentDate }
+    });
+
+    if (result.success && isOfflineModeEnabled()) {
+        await db.workorders.update(workorderId, {
+            appointmentDate,
+            status: 'scheduled'
+        });
+    }
+
+    return result;
+}
+
+/**
+ * Request intervention
+ */
+export async function requestIntervention(workorderId, interventionType, journalText) {
+    if (isOfflineModeEnabled() && !isOnline()) {
+        const { localId, operationId } = await syncQueue.queue(
+            OperationType.REQUEST_INTERVENTION,
+            workorderId,
+            { workorderId, interventionType, journalText }
+        );
+
+        await db.workorders.update(workorderId, {
+            status: 'intervention_required',
+            _syncStatus: SyncStatus.PENDING
+        });
+
+        return {
+            success: true,
+            queued: true,
+            localId,
+            operationId,
+            message: 'Intervention wird bei nächster Verbindung gemeldet'
+        };
+    }
+
+    const result = await apiRequest('requestIntervention', {
+        method: 'POST',
+        body: { workorderId, interventionType, journalText }
+    });
+
+    if (result.success && isOfflineModeEnabled()) {
+        await db.workorders.update(workorderId, { status: 'intervention_required' });
+    }
+
+    return result;
+}
+
+/**
+ * Update cable data
+ */
+export async function updateCableData(workorderId, cableLength, cableType) {
+    if (isOfflineModeEnabled() && !isOnline()) {
+        const { localId, operationId } = await syncQueue.queue(
+            OperationType.UPDATE_CABLE_DATA,
+            workorderId,
+            { workorderId, cableLength, cableType }
+        );
+
+        await db.workorders.update(workorderId, {
+            cableLength,
+            cableType,
+            _syncStatus: SyncStatus.PENDING
+        });
+
+        return {
+            success: true,
+            queued: true,
+            localId,
+            operationId,
+            message: 'Kabeldaten werden bei nächster Verbindung synchronisiert'
+        };
+    }
+
+    const result = await apiRequest('updateWorkorderData', {
+        method: 'POST',
+        body: { workorderId, cableLength, cableType }
+    });
+
+    if (result.success && isOfflineModeEnabled()) {
+        await db.workorders.update(workorderId, { cableLength, cableType });
+    }
+
+    return result;
+}
+
+/**
+ * Complete workorder
+ * BLOCKED when offline - requires sync to validate checklist
+ */
+export async function completeWorkorder(workorderId) {
+    if (!isOnline()) {
+        return {
+            success: false,
+            blocked: true,
+            error: 'Abschluss nur online möglich',
+            message: 'Bitte synchronisieren Sie zuerst, um die Checkliste zu validieren'
+        };
+    }
+
+    const result = await apiRequest('completeWorkorder', {
+        method: 'POST',
+        body: { workorderId }
+    });
+
+    if (result.success && isOfflineModeEnabled()) {
+        await db.workorders.update(workorderId, { status: 'documented' });
+    }
+
+    return result;
+}
+
+// ============================================================================
+// FULL SYNC (Initial download of all workorders)
+// ============================================================================
+
+/**
+ * Perform full sync - download all workorders for offline use
+ */
+export async function performFullSync(onProgress = () => {}) {
+    if (!isOnline()) {
+        return { success: false, error: 'Keine Internetverbindung' };
+    }
+
+    onProgress({ phase: 'fetching', message: 'Lade Arbeitsaufträge...' });
+
+    // Fetch all workorders
+    const result = await apiRequest('getAllForOffline', {
+        method: 'POST',
+        body: {}
+    });
+
+    if (!result.success) {
+        return result;
+    }
+
+    const { workorders, totalCount } = result;
+    onProgress({ phase: 'storing', message: `Speichere ${totalCount} Arbeitsaufträge...`, total: totalCount });
+
+    // Store all workorders
+    let processed = 0;
+    await db.transaction('rw', [db.workorders, db.workorderDetails, db.documentation, db.thumbnails, db.tenantConfigs], async () => {
+        for (const wo of workorders) {
+            // Store workorder
+            await db.workorders.put({
+                ...wo.workorder,
+                _syncStatus: SyncStatus.SYNCED,
+                _lastModified: Date.now()
+            });
+
+            // Store detail
+            await db.workorderDetails.put({
+                workorderId: wo.workorder.id,
+                workorder: wo.workorder,
+                tenantConfig: wo.tenantConfig,
+                checklist: wo.checklist,
+                lastFetched: Date.now()
+            });
+
+            // Store documentation
+            if (wo.documentation) {
+                for (const doc of wo.documentation) {
+                    await db.documentation.put({
+                        ...doc,
+                        workorderId: wo.workorder.id,
+                        _syncStatus: SyncStatus.SYNCED
+                    });
+                }
+            }
+
+            // Store tenant config
+            if (wo.tenantConfig) {
+                await db.tenantConfigs.put({
+                    ...wo.tenantConfig,
+                    lastFetched: Date.now()
+                });
+            }
+
+            processed++;
+            if (processed % 10 === 0) {
+                onProgress({ phase: 'storing', current: processed, total: totalCount });
+            }
+        }
+    });
+
+    // Download thumbnails
+    if (result.thumbnailsToDownload && result.thumbnailsToDownload.length > 0) {
+        onProgress({ phase: 'thumbnails', message: 'Lade Vorschaubilder...', total: result.thumbnailsToDownload.length });
+        await downloadThumbnails(result.thumbnailsToDownload, onProgress);
+    }
+
+    updateLastSyncTimestamp();
+    onProgress({ phase: 'complete', message: 'Synchronisation abgeschlossen' });
+
+    return {
+        success: true,
+        workordersCount: totalCount,
+        message: `${totalCount} Arbeitsaufträge synchronisiert`
+    };
+}
+
+/**
+ * Download thumbnails
+ */
+async function downloadThumbnails(thumbnails, onProgress) {
+    let downloaded = 0;
+    for (const thumb of thumbnails) {
+        try {
+            const response = await fetch(`${API_BASE}/getThumbnail?id=${thumb.documentationId}`, {
+                credentials: 'include'
+            });
+
+            if (response.ok) {
+                const blob = await response.blob();
+                await db.thumbnails.put({
+                    documentationId: thumb.documentationId,
+                    workorderId: thumb.workorderId,
+                    blob,
+                    downloadedAt: Date.now()
+                });
+            }
+
+            downloaded++;
+            if (downloaded % 5 === 0) {
+                onProgress({ phase: 'thumbnails', current: downloaded, total: thumbnails.length });
+            }
+        } catch (error) {
+            console.warn(`[OfflineService] Failed to download thumbnail ${thumb.documentationId}:`, error);
+        }
+    }
+}
+
+/**
+ * Check for reassigned workorders after sync
+ */
+export async function checkReassignedWorkorders(serverWorkorderIds) {
+    const localWorkorders = await db.workorders.toArray();
+    const serverIdSet = new Set(serverWorkorderIds);
+
+    const reassigned = [];
+    for (const wo of localWorkorders) {
+        if (!serverIdSet.has(wo.id)) {
+            reassigned.push({
+                id: wo.id,
+                customer: wo.customer || `#${wo.id}`,
+                hasPendingChanges: await syncQueue.hasPending(wo.id)
+            });
+
+            // Remove from local cache
+            await db.workorders.delete(wo.id);
+            await db.workorderDetails.delete(wo.id);
+            await db.documentation.where('workorderId').equals(wo.id).delete();
+            await db.journals.where('workorderId').equals(wo.id).delete();
+            await db.thumbnails.where('workorderId').equals(wo.id).delete();
+        }
+    }
+
+    if (reassigned.length > 0) {
+        console.log(`[OfflineService] ${reassigned.length} workorders were reassigned`);
+    }
+
+    return reassigned;
+}
+
+/**
+ * Get pending changes summary for a workorder
+ */
+export async function getPendingChangesSummary(workorderId) {
+    const ops = await syncQueue.getWorkorderOps(workorderId);
+    const pending = ops.filter(op => op.status === 'pending' || op.status === 'processing');
+
+    return pending.map(op => {
+        switch (op.operation) {
+            case OperationType.ADD_JOURNAL:
+                return `Journaleintrag: "${op.payload.text?.substring(0, 50)}..."`;
+            case OperationType.UPDATE_NOTES:
+                return 'Zusatzinfo aktualisiert';
+            case OperationType.SCHEDULE_APPOINTMENT:
+                return 'Termin geplant';
+            case OperationType.UPDATE_CABLE_DATA:
+                return 'Kabeldaten aktualisiert';
+            case OperationType.REQUEST_INTERVENTION:
+                return 'Intervention gemeldet';
+            default:
+                return op.operation;
+        }
+    });
+}
+
+export default {
+    getWorkorders,
+    getWorkorderDetail,
+    addJournal,
+    updateNotes,
+    scheduleAppointment,
+    requestIntervention,
+    updateCableData,
+    completeWorkorder,
+    performFullSync,
+    checkReassignedWorkorders,
+    getPendingChangesSummary,
+    isOnline
+};
diff --git a/public/mobile/sw.js b/public/mobile/sw.js
index 80ee45176..9ea6bed38 100644
--- a/public/mobile/sw.js
+++ b/public/mobile/sw.js
@@ -1,84 +1,303 @@
 /**
  * MobileApp Service Worker
- * Provides basic caching for the PWA shell and assets.
+ * Provides caching for PWA shell, assets, and offline workorder support.
  */
 
-const CACHE_NAME = 'xinon-mobile-v1';
+const CACHE_NAME = 'xinon-mobile-v2';
 const ASSETS_TO_CACHE = [
     '/MobileApp',
     '/mobile/app.js',
     '/mobile/shared/auth.js',
+    '/mobile/shared/api.js',
     '/mobile/shared/base.css',
+    '/mobile/shared/db.js',
+    '/mobile/shared/offlineSettings.js',
+    '/mobile/shared/syncQueue.js',
+    '/mobile/shared/workorderOfflineService.js',
+    '/mobile/shared/photoQueue.js',
+    '/mobile/shared/syncManager.js',
     '/mobile/components/LoginScreen.js',
     '/mobile/components/MainMenu.js',
+    '/mobile/components/OfflineIndicator.js',
+    '/mobile/components/SyncStatus.js',
     '/mobile/modules/lager/LagerModule.js',
     '/mobile/modules/lager/inventur/StocktakeList.js',
     '/mobile/modules/lager/inventur/Scanner.js',
+    '/mobile/modules/workorder/WorkorderModule.js',
     '/assets/images/xinon-full-transparent.png',
     '/assets/images/xinon-full-transparent-white.png',
     '/assets/images/xinon-sm.png'
 ];
 
+// Workorder API endpoints that can be served from cache
+const WORKORDER_CACHEABLE_ENDPOINTS = [
+    '/MobileApp/Workorder/Workorder/get',
+    '/MobileApp/Workorder/Workorder/getWorkorder',
+    '/MobileApp/Workorder/Workorder/getWorkorderDetail',
+    '/MobileApp/Workorder/Workorder/getDocumentation',
+    '/MobileApp/Workorder/Workorder/getChecklist',
+    '/MobileApp/Workorder/Workorder/getTenantConfig'
+];
+
 // Install: cache assets
 self.addEventListener('install', (event) => {
+    console.log('[SW] Installing...');
     event.waitUntil(
         caches.open(CACHE_NAME)
             .then(cache => cache.addAll(ASSETS_TO_CACHE))
-            .then(() => self.skipWaiting())
+            .then(() => {
+                console.log('[SW] Assets cached');
+                return self.skipWaiting();
+            })
+            .catch(err => {
+                console.error('[SW] Cache failed:', err);
+            })
     );
 });
 
 // Activate: clean old caches
 self.addEventListener('activate', (event) => {
+    console.log('[SW] Activating...');
     event.waitUntil(
         caches.keys().then(cacheNames => {
             return Promise.all(
                 cacheNames
-                    .filter(name => name !== CACHE_NAME)
-                    .map(name => caches.delete(name))
+                    .filter(name => name.startsWith('xinon-mobile-') && name !== CACHE_NAME)
+                    .map(name => {
+                        console.log('[SW] Deleting old cache:', name);
+                        return caches.delete(name);
+                    })
             );
         }).then(() => self.clients.claim())
     );
 });
 
-// Fetch: network-first for API, cache-first for assets
+// Fetch: handle requests with offline support
 self.addEventListener('fetch', (event) => {
-    // Only handle GET requests
-    if (event.request.method !== 'GET') return;
-
     const url = new URL(event.request.url);
 
-    // API calls: network only
+    // Only handle same-origin requests
+    if (url.origin !== location.origin) return;
+
+    // Handle workorder API requests specially
+    if (url.pathname.startsWith('/MobileApp/Workorder/')) {
+        event.respondWith(handleWorkorderRequest(event.request, url));
+        return;
+    }
+
+    // Other API calls: network only (no caching)
     if (url.pathname.startsWith('/MobileApp/') &&
         url.pathname !== '/MobileApp' &&
         url.pathname !== '/MobileApp/') {
         return;
     }
 
-    // Everything else: cache-first, falling back to network
-    event.respondWith(
-        caches.match(event.request).then(cached => {
-            if (cached) {
-                // Return cached, but update in background
-                fetch(event.request).then(response => {
-                    if (response.ok) {
-                        caches.open(CACHE_NAME).then(cache => {
-                            cache.put(event.request, response);
-                        });
-                    }
-                }).catch(() => {});
-                return cached;
-            }
-
-            return fetch(event.request).then(response => {
-                if (response.ok && url.origin === location.origin) {
-                    const clone = response.clone();
-                    caches.open(CACHE_NAME).then(cache => {
-                        cache.put(event.request, clone);
-                    });
-                }
-                return response;
-            });
-        })
-    );
+    // Static assets: cache-first with background update
+    if (event.request.method === 'GET') {
+        event.respondWith(handleAssetRequest(event.request, url));
+    }
+});
+
+/**
+ * Handle workorder API requests with offline fallback
+ */
+async function handleWorkorderRequest(request, url) {
+    const isGet = request.method === 'GET';
+    const isPost = request.method === 'POST';
+    const endpoint = url.pathname;
+
+    // Check if offline mode is enabled via message or localStorage check
+    const offlineEnabled = await isOfflineModeEnabled();
+
+    // For GET requests to cacheable endpoints
+    if (isGet && WORKORDER_CACHEABLE_ENDPOINTS.some(ep => endpoint.startsWith(ep))) {
+        try {
+            // Try network first
+            const response = await fetch(request);
+            if (response.ok && offlineEnabled) {
+                // Cache successful response for offline use
+                const cache = await caches.open(CACHE_NAME + '-api');
+                cache.put(request, response.clone());
+            }
+            return response;
+        } catch (error) {
+            // Network failed, try cache
+            if (offlineEnabled) {
+                const cached = await caches.match(request);
+                if (cached) {
+                    console.log('[SW] Serving from cache:', endpoint);
+                    return cached;
+                }
+            }
+            // Return offline error response
+            return new Response(JSON.stringify({
+                success: false,
+                error: 'Offline - keine gecachten Daten',
+                offline: true
+            }), {
+                status: 503,
+                headers: { 'Content-Type': 'application/json' }
+            });
+        }
+    }
+
+    // For POST requests (mutations) - let them through, main thread handles queueing
+    if (isPost) {
+        try {
+            return await fetch(request);
+        } catch (error) {
+            // Network error - return error response
+            // The main thread WorkorderOfflineService handles queueing
+            return new Response(JSON.stringify({
+                success: false,
+                error: 'Netzwerkfehler',
+                networkError: true
+            }), {
+                status: 503,
+                headers: { 'Content-Type': 'application/json' }
+            });
+        }
+    }
+
+    // Default: try network
+    return fetch(request);
+}
+
+/**
+ * Handle static asset requests with cache-first strategy
+ */
+async function handleAssetRequest(request, url) {
+    const cached = await caches.match(request);
+
+    if (cached) {
+        // Return cached, update in background
+        fetch(request).then(response => {
+            if (response.ok) {
+                caches.open(CACHE_NAME).then(cache => {
+                    cache.put(request, response);
+                });
+            }
+        }).catch(() => {});
+        return cached;
+    }
+
+    // Not cached, fetch from network
+    try {
+        const response = await fetch(request);
+        if (response.ok && url.origin === location.origin) {
+            const cache = await caches.open(CACHE_NAME);
+            cache.put(request, response.clone());
+        }
+        return response;
+    } catch (error) {
+        // Return offline page or error
+        return new Response('Offline', { status: 503 });
+    }
+}
+
+/**
+ * Check if offline mode is enabled
+ * This is a simplified check - the main thread handles the full logic
+ */
+async function isOfflineModeEnabled() {
+    // Try to get from clients
+    const clients = await self.clients.matchAll();
+    for (const client of clients) {
+        // Ask client for offline status
+        // For now, assume enabled if we have cached API data
+        const apiCache = await caches.open(CACHE_NAME + '-api');
+        const keys = await apiCache.keys();
+        return keys.length > 0;
+    }
+    return false;
+}
+
+// Background Sync event (Chrome/Edge only)
+self.addEventListener('sync', (event) => {
+    console.log('[SW] Background sync triggered:', event.tag);
+
+    if (event.tag === 'workorder-sync') {
+        event.waitUntil(handleBackgroundSync());
+    }
+});
+
+/**
+ * Handle background sync
+ * Notify main thread to process sync queue
+ */
+async function handleBackgroundSync() {
+    const clients = await self.clients.matchAll({ type: 'window' });
+
+    for (const client of clients) {
+        client.postMessage({
+            type: 'BACKGROUND_SYNC',
+            tag: 'workorder-sync'
+        });
+    }
+}
+
+// Message handler for communication with main thread
+self.addEventListener('message', (event) => {
+    const { type, data } = event.data || {};
+
+    switch (type) {
+        case 'SKIP_WAITING':
+            self.skipWaiting();
+            break;
+
+        case 'CLEAR_API_CACHE':
+            caches.delete(CACHE_NAME + '-api').then(() => {
+                console.log('[SW] API cache cleared');
+                event.ports[0]?.postMessage({ success: true });
+            });
+            break;
+
+        case 'CACHE_WORKORDER_DATA':
+            // Cache workorder data from main thread
+            if (data && data.url && data.response) {
+                caches.open(CACHE_NAME + '-api').then(cache => {
+                    const response = new Response(JSON.stringify(data.response), {
+                        headers: { 'Content-Type': 'application/json' }
+                    });
+                    cache.put(data.url, response);
+                    console.log('[SW] Cached workorder data:', data.url);
+                });
+            }
+            break;
+
+        case 'GET_CACHE_STATUS':
+            getCacheStatus().then(status => {
+                event.ports[0]?.postMessage(status);
+            });
+            break;
+
+        default:
+            console.log('[SW] Unknown message type:', type);
+    }
+});
+
+/**
+ * Get cache status for debugging
+ */
+async function getCacheStatus() {
+    const assetCache = await caches.open(CACHE_NAME);
+    const apiCache = await caches.open(CACHE_NAME + '-api');
+
+    const assetKeys = await assetCache.keys();
+    const apiKeys = await apiCache.keys();
+
+    return {
+        cacheName: CACHE_NAME,
+        assetsCached: assetKeys.length,
+        apiCached: apiKeys.length,
+        apiEndpoints: apiKeys.map(k => new URL(k.url).pathname)
+    };
+}
+
+// Periodic sync (if supported - experimental)
+self.addEventListener('periodicsync', (event) => {
+    if (event.tag === 'workorder-periodic-sync') {
+        console.log('[SW] Periodic sync triggered');
+        event.waitUntil(handleBackgroundSync());
+    }
 });

From 9b6ed35ddcf49d9f99a2e7fba5d9f752a58592b0 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Tue, 27 Jan 2026 10:55:10 +0100
Subject: [PATCH 69/88] added date filter

---
 .../PreorderlogisticsController.php           | 10 ++++++
 .../PreorderLogistics/PreorderLogistics.css   | 29 ++++++++++++++++
 .../PreorderLogistics/PreorderLogistics.js    | 34 +++++++++++--------
 3 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/application/Preorderlogistics/PreorderlogisticsController.php b/application/Preorderlogistics/PreorderlogisticsController.php
index 3254f53e1..b39cfe0fb 100644
--- a/application/Preorderlogistics/PreorderlogisticsController.php
+++ b/application/Preorderlogistics/PreorderlogisticsController.php
@@ -337,6 +337,16 @@ class PreorderlogisticsController extends mfBaseController {
             }
         }
 
+        // Date filter for sent date (Versanddatum range)
+        if (!empty($filter['sent_date']) && is_array($filter['sent_date'])) {
+            if (!empty($filter['sent_date']['from'])) {
+                $new_filter['add-where'] .= " AND Preorderlogistics.sent >= " . intval($filter['sent_date']['from']);
+            }
+            if (!empty($filter['sent_date']['to'])) {
+                $new_filter['add-where'] .= " AND Preorderlogistics.sent <= " . intval($filter['sent_date']['to']);
+            }
+        }
+
         $new_filter["status_code"] = 140;
         $new_filter["deleted"] = 0;
         $new_filter["unit_count<="] = 2;
diff --git a/public/js/pages/PreorderLogistics/PreorderLogistics.css b/public/js/pages/PreorderLogistics/PreorderLogistics.css
index 6678ffa59..5513bac12 100644
--- a/public/js/pages/PreorderLogistics/PreorderLogistics.css
+++ b/public/js/pages/PreorderLogistics/PreorderLogistics.css
@@ -10,4 +10,33 @@
 
 .col-form-label {
     padding-top: 0 !important
+}
+
+/* Filter panel styles */
+.filter-panel {
+    padding: 1rem !important;
+}
+
+.filter-panel .header-title {
+    font-size: 1.1rem;
+    margin-bottom: 0.75rem !important;
+}
+
+.filter-panel .row.g-2 > [class*="col-"] {
+    padding-left: 0.5rem;
+    padding-right: 0.5rem;
+}
+
+.filter-panel .form-group {
+    margin-bottom: 0;
+}
+
+.filter-actions {
+    display: flex;
+    gap: 0.5rem;
+    flex-wrap: wrap;
+}
+
+.filter-actions .btn {
+    margin-right: 0;
 }
\ No newline at end of file
diff --git a/public/js/pages/PreorderLogistics/PreorderLogistics.js b/public/js/pages/PreorderLogistics/PreorderLogistics.js
index 7bda1d003..41f82d9c6 100644
--- a/public/js/pages/PreorderLogistics/PreorderLogistics.js
+++ b/public/js/pages/PreorderLogistics/PreorderLogistics.js
@@ -2,35 +2,38 @@ Vue.component('preorder-logistics', {
     template: `
       <tt-card>
         <div class="card mb-3">
-          <div class="card-body">
-            <h4 class="header-title mb-3">Filter</h4>
-            <div class="row">
-              <div class="col-md-3">
+          <div class="card-body filter-panel">
+            <h4 class="header-title mb-2">Filter</h4>
+            <div class="row g-2 align-items-end">
+              <div class="col-lg-2 col-md-4">
                 <tt-select label="Kampagne" :options="campaigns" v-model="filters.preordercampaign_id" sm multiple/>
               </div>
-              <div class="col-md-3">
+              <div class="col-lg-2 col-md-4">
                 <tt-select label="FCP" :options="fcps" v-model="filters.fcp" sm multiple searchable/>
               </div>
-              <div class="col-md-2">
+              <div class="col-lg-2 col-md-4">
                 <tt-select label="Versandstatus" :options="sentStatusOptions" v-model="filters.sent" sm/>
               </div>
-              <div class="col-md-2">
+              <div class="col-lg-2 col-md-4">
                 <tt-input label="Bestellcode" v-model="filters.ucode" sm/>
               </div>
-              <div class="col-md-2">
+              <div class="col-lg-2 col-md-4">
                 <tt-input label="OAID" v-model="filters.oaid" sm/>
               </div>
+              <div class="col-lg-2 col-md-4">
+                <tt-date-picker label="Versanddatum" v-model="filters.sent_date" sm :time-picker="false"/>
+              </div>
             </div>
-            <div class="row mt-2">
-              <div class="col-md-6">
+            <div class="row g-2 mt-1 align-items-end">
+              <div class="col-lg-4 col-md-6">
                 <tt-input label="Anschlussadresse" v-model="filters.address" sm/>
               </div>
-              <div class="col-md-6">
+              <div class="col-lg-4 col-md-6">
                 <tt-input label="Kunde" v-model="filters.kunde" sm/>
               </div>
             </div>
-            <div class="row mt-3">
-              <div class="col">
+            <div class="row mt-2">
+              <div class="col filter-actions">
                 <tt-button text="Filter anwenden" @click="applyFilters" icon="fas fa-filter"
                            additional-class="btn-primary"/>
                 <tt-button text="Filter zurücksetzen" @click="resetFilters" icon="fas fa-undo"
@@ -91,7 +94,8 @@ Vue.component('preorder-logistics', {
                 sent: 'no',
                 address: '',
                 kunde: '',
-                fcp: []
+                fcp: [],
+                sent_date: null
             },
             tableConfig: {
                 key: 'preorderlogistics',
@@ -155,7 +159,7 @@ Vue.component('preorder-logistics', {
         },
         resetFilters() {
             this.filters = {
-                preordercampaign_id: '', ucode: '', oaid: '', sent: 'no', address: '', kunde: '', fcp: []
+                preordercampaign_id: '', ucode: '', oaid: '', sent: 'no', address: '', kunde: '', fcp: [], sent_date: null
             };
             this.applyFilters();
         },

From da101a9196781ae151c8349c246d0fa6b0876673 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Tue, 27 Jan 2026 09:57:37 +0000
Subject: [PATCH 70/88] fixed typo

---
 ...rehousearticle_rename_revenueaccount_to_vatgroupid.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/db/migrations/20260126120000_warehousearticle_rename_revenueaccount_to_vatgroupid.php b/db/migrations/20260126120000_warehousearticle_rename_revenueaccount_to_vatgroupid.php
index 0ab388300..0b1933697 100644
--- a/db/migrations/20260126120000_warehousearticle_rename_revenueaccount_to_vatgroupid.php
+++ b/db/migrations/20260126120000_warehousearticle_rename_revenueaccount_to_vatgroupid.php
@@ -8,9 +8,9 @@ final class WarehousearticleRenameRevenueaccountToVatgroupid extends AbstractMig
     public function up(): void
     {
         if($this->getEnvironment() == "thetool") {
-            $this->execute("ALTER TABLE warehousearticle CHANGE revenueAccount vatgroup_id INT(11) NOT NULL DEFAULT 2");
+            $this->execute("ALTER TABLE WarehouseArticle CHANGE revenueAccount vatgroup_id INT(11) NOT NULL DEFAULT 2");
 
-            $this->execute("UPDATE warehousearticle SET vatgroup_id = CASE
+            $this->execute("UPDATE WarehouseArticle SET vatgroup_id = CASE
                 WHEN vatgroup_id = 0 THEN 2
                 WHEN vatgroup_id = 1 THEN 3
                 ELSE vatgroup_id
@@ -21,13 +21,13 @@ final class WarehousearticleRenameRevenueaccountToVatgroupid extends AbstractMig
     public function down(): void
     {
         if($this->getEnvironment() == "thetool") {
-            $this->execute("UPDATE warehousearticle SET vatgroup_id = CASE
+            $this->execute("UPDATE WarehouseArticle SET vatgroup_id = CASE
                 WHEN vatgroup_id = 2 THEN 0
                 WHEN vatgroup_id = 3 THEN 1
                 ELSE vatgroup_id
             END");
 
-            $this->execute("ALTER TABLE warehousearticle CHANGE vatgroup_id revenueAccount INT(11) NOT NULL DEFAULT 0");
+            $this->execute("ALTER TABLE WarehouseArticle CHANGE vatgroup_id revenueAccount INT(11) NOT NULL DEFAULT 0");
         }
     }
 }

From 4507b392bc1e9d9ac0efc35cb39c9c732cca9159 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Tue, 27 Jan 2026 09:58:19 +0000
Subject: [PATCH 71/88] fixed typo

---
 ...126130000_manualinvoice_column_cleanup.php | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/db/migrations/20260126130000_manualinvoice_column_cleanup.php b/db/migrations/20260126130000_manualinvoice_column_cleanup.php
index 967850e86..4feef0ec7 100644
--- a/db/migrations/20260126130000_manualinvoice_column_cleanup.php
+++ b/db/migrations/20260126130000_manualinvoice_column_cleanup.php
@@ -16,28 +16,28 @@ final class ManualinvoiceColumnCleanup extends AbstractMigration
                 $position->removeColumn("contract_id")->save();
             }
             // ManualInvoiceposition: Rename columns
-            $this->execute("ALTER TABLE manualinvoiceposition CHANGE product_id warehousearticle_id INT(11) NOT NULL");
-            $this->execute("ALTER TABLE manualinvoiceposition CHANGE product_name warehousearticle_name VARCHAR(255) NOT NULL");
+            $this->execute("ALTER TABLE ManualInvoiceposition CHANGE product_id warehousearticle_id INT(11) NOT NULL");
+            $this->execute("ALTER TABLE ManualInvoiceposition CHANGE product_name warehousearticle_name VARCHAR(255) NOT NULL");
 
             $invoice = $this->table("ManualInvoice");
             if ($invoice->hasColumn("billing_delivery")) {
                 $invoice->removeColumn("billing_delivery")->save();
             }
 
-            $this->execute("ALTER TABLE manualinvoice CHANGE leistungszeitraum performance_period VARCHAR(255) NULL");
-            $this->execute("ALTER TABLE manualinvoice CHANGE einleitender_text introductory_text TEXT NULL");
-            $this->execute("ALTER TABLE manualinvoice CHANGE externe_referenz external_reference VARCHAR(255) NULL");
-            $this->execute("ALTER TABLE manualinvoice CHANGE gesamtrabatt total_discount DECIMAL(6,2) NOT NULL DEFAULT 0.00");
+            $this->execute("ALTER TABLE ManualInvoice CHANGE leistungszeitraum performance_period VARCHAR(255) NULL");
+            $this->execute("ALTER TABLE ManualInvoice CHANGE einleitender_text introductory_text TEXT NULL");
+            $this->execute("ALTER TABLE ManualInvoice CHANGE externe_referenz external_reference VARCHAR(255) NULL");
+            $this->execute("ALTER TABLE ManualInvoice CHANGE gesamtrabatt total_discount DECIMAL(6,2) NOT NULL DEFAULT 0.00");
         }
     }
 
     public function down(): void
     {
         if($this->getEnvironment() == "thetool") {
-            $this->execute("ALTER TABLE manualinvoice CHANGE performance_period leistungszeitraum VARCHAR(255) NULL");
-            $this->execute("ALTER TABLE manualinvoice CHANGE introductory_text einleitender_text TEXT NULL");
-            $this->execute("ALTER TABLE manualinvoice CHANGE external_reference externe_referenz VARCHAR(255) NULL");
-            $this->execute("ALTER TABLE manualinvoice CHANGE total_discount gesamtrabatt DECIMAL(6,2) NOT NULL DEFAULT 0.00");
+            $this->execute("ALTER TABLE ManualInvoice CHANGE performance_period leistungszeitraum VARCHAR(255) NULL");
+            $this->execute("ALTER TABLE ManualInvoice CHANGE introductory_text einleitender_text TEXT NULL");
+            $this->execute("ALTER TABLE ManualInvoice CHANGE external_reference externe_referenz VARCHAR(255) NULL");
+            $this->execute("ALTER TABLE ManualInvoice CHANGE total_discount gesamtrabatt DECIMAL(6,2) NOT NULL DEFAULT 0.00");
 
             $invoice = $this->table("ManualInvoice");
             $invoice->addColumn("billing_delivery", "enum", [
@@ -46,8 +46,8 @@ final class ManualinvoiceColumnCleanup extends AbstractMigration
                 "after" => "billing_type"
             ])->save();
 
-            $this->execute("ALTER TABLE manualinvoiceposition CHANGE warehousearticle_id product_id INT(11) NOT NULL");
-            $this->execute("ALTER TABLE manualinvoiceposition CHANGE warehousearticle_name product_name VARCHAR(255) NOT NULL");
+            $this->execute("ALTER TABLE ManualInvoiceposition CHANGE warehousearticle_id product_id INT(11) NOT NULL");
+            $this->execute("ALTER TABLE ManualInvoiceposition CHANGE warehousearticle_name product_name VARCHAR(255) NOT NULL");
 
             $position = $this->table("ManualInvoiceposition");
             $position->addColumn("billing_id", "integer", ["null" => true, "after" => "position_group"]);

From 60e3c7b765da6475660a1d43f8bc27501e69e8ca Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Tue, 27 Jan 2026 11:20:25 +0100
Subject: [PATCH 72/88] added tiefbau flag

---
 .../default/VueViews/WorkorderCompanyPWA.php  | 64 ++++++++++++++-----
 .../WorkorderCompanyController.php            |  1 +
 .../WorkorderTenantConfigModel.php            |  1 +
 ...127120000_add_tiefbau_sees_normal_docs.php | 32 ++++++++++
 .../WorkorderTenantConfig.js                  |  4 ++
 5 files changed, 85 insertions(+), 17 deletions(-)
 create mode 100644 db/migrations/20260127120000_add_tiefbau_sees_normal_docs.php

diff --git a/Layout/default/VueViews/WorkorderCompanyPWA.php b/Layout/default/VueViews/WorkorderCompanyPWA.php
index 37634e7dd..a6c1c3fe1 100644
--- a/Layout/default/VueViews/WorkorderCompanyPWA.php
+++ b/Layout/default/VueViews/WorkorderCompanyPWA.php
@@ -247,6 +247,14 @@
                 return documentation.journals.filter(j => !j.text.toLowerCase().includes('wurde zugewiesen.'));
             });
 
+            const isCivilEngineering = computed(() => {
+                return selectedWorkorder.value?.status === 'civil_engineering_required';
+            });
+
+            const showNormalDocsForCivilEng = computed(() => {
+                return isCivilEngineering.value && tenantConfig.value?.tiefbauSeesNormalDocs;
+            });
+
 
             // --- METHODS ---
             const applyTheme = () => {
@@ -485,6 +493,22 @@
                 }
             };
 
+            const completeCivilEngineering = async () => {
+                if (!confirm("Möchten Sie den Tiefbau wirklich abschließen?")) return;
+                try {
+                    const response = await api.post('/completeCivilEngineering', { workorderId: selectedWorkorder.value.id });
+                    if (response.data.success) {
+                        await fetchWorkorders();
+                        closeDetails();
+                    } else {
+                        alert(response.data.message);
+                    }
+                } catch(e) {
+                    console.error("Failed to complete civil engineering", e);
+                    alert(e.response?.data?.message || 'Fehler beim Abschließen des Tiefbaus.');
+                }
+            };
+
             const selectFcp = (fcpValue) => {
                 selectedFcp.value = fcpValue;
                 isFcpSelectOpen.value = false;
@@ -520,10 +544,11 @@
                 checklist, fullscreenViewer, missingTasksPopover, translatedDocs, filteredJournals, installModal, isStandalone,
                 selectedFcp, isFcpSelectOpen, fcpOptions, selectedFcpText, fcpSearchTerm, filteredFcpOptions, fcpInputRef,
                 isSettingsOpen, theme, showThemePicker,
-                savingData, // <-- ADDED
+                savingData,
+                isCivilEngineering, showNormalDocsForCivilEng,
                 fetchWorkorders, openDetails, closeDetails, getStatusInfo, formatDate, googleMapsLink, startEditInfo, saveAdditionalInfo,
                 handleFileSelect, executeUpload, addJournalEntry, submitProblem, handleCompleteClick, selectFcp, setTheme,
-                saveWorkorderData // <-- ADDED
+                saveWorkorderData, completeCivilEngineering
             };
         },
         template: `
@@ -673,7 +698,7 @@
                       {{ savingData ? 'Speichert...' : 'Daten speichern' }}
                     </button>
                   </div>
-                  <div class="bg-white dark:bg-slate-900 p-4 rounded-lg border border-slate-200 dark:border-slate-800">
+                  <div v-if="!isCivilEngineering || showNormalDocsForCivilEng" class="bg-white dark:bg-slate-900 p-4 rounded-lg border border-slate-200 dark:border-slate-800">
                     <h3 class="font-bold text-slate-700 dark:text-secondary mb-3">Checkliste</h3>
                     <div v-if="isDetailsLoading" class="space-y-3 animate-pulse">
                       <div v-for="i in 4" :key="i" class="flex items-center">
@@ -693,7 +718,7 @@
                     </div>
                   </div>
 
-                  <div class="bg-white dark:bg-slate-900 p-4 rounded-lg border border-slate-200 dark:border-slate-800">
+                  <div v-if="!isCivilEngineering || showNormalDocsForCivilEng" class="bg-white dark:bg-slate-900 p-4 rounded-lg border border-slate-200 dark:border-slate-800">
                     <h3 class="font-bold text-slate-700 dark:text-secondary mb-2">Dokumentation</h3>
                     <label for="file-upload" class="w-full inline-flex items-center justify-center px-4 py-2 border border-dashed border-slate-300 dark:border-slate-700 text-sm font-medium rounded-md text-slate-700 dark:text-slate-200 bg-slate-50 dark:bg-slate-800 hover:bg-slate-100 dark:hover:bg-slate-700 cursor-pointer">
                       <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-2" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-8l-4-4m0 0L8 8m4-4v12" /></svg>
@@ -718,7 +743,7 @@
                     </div>
                   </div>
 
-                  <div class="bg-white dark:bg-slate-900 p-4 rounded-lg border border-slate-200 dark:border-slate-800">
+                  <div v-if="!isCivilEngineering || showNormalDocsForCivilEng" class="bg-white dark:bg-slate-900 p-4 rounded-lg border border-slate-200 dark:border-slate-800">
                     <h3 class="font-bold text-slate-700 dark:text-secondary mb-4">Journal</h3>
                     <div v-if="isDetailsLoading" class="animate-pulse">
                       <div class="flex items-start">
@@ -748,18 +773,23 @@
 
                 <footer class="bg-white dark:bg-slate-900 p-2 border-t border-slate-200 dark:border-slate-800 flex-shrink-0 grid grid-cols-2 gap-2 pt-2 px-2 pb-[calc(0.5rem+env(safe-area-inset-bottom))]">
                   <button @click="problemModal.show = true" class="w-full px-4 py-3 bg-red-600 text-white font-bold rounded-md text-center">Problem melden</button>
-                  <div class="relative">
-                    <button @click="handleCompleteClick" class="w-full px-4 py-3 bg-green-600 text-white font-bold rounded-md text-center disabled:bg-slate-300">Abschließen</button>
-                    <transition name="fade">
-                      <div v-if="missingTasksPopover.show" class="absolute bottom-full right-0 mb-2 w-72 bg-red-700 text-white text-sm rounded-lg shadow-lg p-3">
-                        <h4 class="font-bold mb-1">Fehlende Punkte:</h4>
-                        <ul class="list-disc list-inside space-y-1">
-                          <li v-for="task in missingTasksPopover.tasks" :key="task">{{ task }}</li>
-                        </ul>
-                        <div class="absolute bottom-[-5px] right-[calc(6rem-8px)] w-0 h-0 border-x-8 border-x-transparent border-t-8 border-t-red-700"></div>
-                      </div>
-                    </transition>
-                  </div>
+                  <template v-if="isCivilEngineering">
+                    <button @click="completeCivilEngineering" class="w-full px-4 py-3 bg-green-600 text-white font-bold rounded-md text-center">Tiefbau abschließen</button>
+                  </template>
+                  <template v-else>
+                    <div class="relative">
+                      <button @click="handleCompleteClick" class="w-full px-4 py-3 bg-green-600 text-white font-bold rounded-md text-center disabled:bg-slate-300">Abschließen</button>
+                      <transition name="fade">
+                        <div v-if="missingTasksPopover.show" class="absolute bottom-full right-0 mb-2 w-72 bg-red-700 text-white text-sm rounded-lg shadow-lg p-3">
+                          <h4 class="font-bold mb-1">Fehlende Punkte:</h4>
+                          <ul class="list-disc list-inside space-y-1">
+                            <li v-for="task in missingTasksPopover.tasks" :key="task">{{ task }}</li>
+                          </ul>
+                          <div class="absolute bottom-[-5px] right-[calc(6rem-8px)] w-0 h-0 border-x-8 border-x-transparent border-t-8 border-t-red-700"></div>
+                        </div>
+                      </transition>
+                    </div>
+                  </template>
                 </footer>
               </div>
             </transition>
diff --git a/application/WorkorderCompany/WorkorderCompanyController.php b/application/WorkorderCompany/WorkorderCompanyController.php
index 553465c3a..fd6f93d53 100644
--- a/application/WorkorderCompany/WorkorderCompanyController.php
+++ b/application/WorkorderCompany/WorkorderCompanyController.php
@@ -193,6 +193,7 @@ class WorkorderCompanyController extends WorkorderBaseController {
             'requireCableLength' => $tenantConfig->requireCableLength,
             'requireCableType' => $tenantConfig->requireCableType,
             'showTechnicalData' => (bool)$tenantConfig->showTechnicalData,
+            'tiefbauSeesNormalDocs' => (bool)$tenantConfig->tiefbauSeesNormalDocs,
         ];
 
         if ($tenantConfig->showTechnicalData) {
diff --git a/application/WorkorderTenantConfig/WorkorderTenantConfigModel.php b/application/WorkorderTenantConfig/WorkorderTenantConfigModel.php
index ec380a89a..3386d18dc 100644
--- a/application/WorkorderTenantConfig/WorkorderTenantConfigModel.php
+++ b/application/WorkorderTenantConfig/WorkorderTenantConfigModel.php
@@ -13,6 +13,7 @@ class WorkorderTenantConfigModel extends TTCrudBaseModel {
     public int $requireCableLength;
     public int $requireCableType;
     public int $showTechnicalData = 0;
+    public int $tiefbauSeesNormalDocs = 0;
     public int $enableWorkorder;
     public int $enableWorkorderMph;
     public int $create;
diff --git a/db/migrations/20260127120000_add_tiefbau_sees_normal_docs.php b/db/migrations/20260127120000_add_tiefbau_sees_normal_docs.php
new file mode 100644
index 000000000..c896f981a
--- /dev/null
+++ b/db/migrations/20260127120000_add_tiefbau_sees_normal_docs.php
@@ -0,0 +1,32 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class AddTiefbauSeesNormalDocs extends AbstractMigration
+{
+    public function up(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            $table = $this->table('WorkorderTenantConfig');
+
+            $table->addColumn('tiefbauSeesNormalDocs', 'boolean', [
+                'default' => false,
+                'null' => false,
+                'after' => 'showTechnicalData',
+                'comment' => 'Allow civil engineering status to see and use normal documentation steps'
+            ]);
+
+            $table->update();
+        }
+    }
+
+    public function down(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            $this->table('WorkorderTenantConfig')
+                ->removeColumn('tiefbauSeesNormalDocs')
+                ->save();
+        }
+    }
+}
diff --git a/public/js/pages/WorkorderTenantConfig/WorkorderTenantConfig.js b/public/js/pages/WorkorderTenantConfig/WorkorderTenantConfig.js
index d2a1b36a4..4eaba32cb 100644
--- a/public/js/pages/WorkorderTenantConfig/WorkorderTenantConfig.js
+++ b/public/js/pages/WorkorderTenantConfig/WorkorderTenantConfig.js
@@ -91,6 +91,8 @@ Vue.component('workorder-tenant-config', {
                                  v-model="editableItem.requireCableType" sm/>
                     <tt-checkbox label="Technische Daten anzeigen (Patchposition, AHA Blatt)"
                                  v-model="editableItem.showTechnicalData" sm/>
+                    <tt-checkbox label="Tiefbau sieht normale Dokumentationsschritte"
+                                 v-model="editableItem.tiefbauSeesNormalDocs" sm/>
                   </div>
                   <div v-else>
                     <p>Workorder: <strong>{{ config.enableWorkorder ? 'Aktiviert' : 'Deaktiviert' }}</strong></p>
@@ -100,6 +102,7 @@ Vue.component('workorder-tenant-config', {
                     <p>Kabellänge-Doku: <strong>{{ config.requireCableLength ? 'Ja' : 'Nein' }}</strong></p>
                     <p>Kabeltyp-Doku: <strong>{{ config.requireCableType ? 'Ja' : 'Nein' }}</strong></p>
                     <p>Technische Daten: <strong>{{ config.showTechnicalData ? 'Ja' : 'Nein' }}</strong></p>
+                    <p>Tiefbau sieht Doku: <strong>{{ config.tiefbauSeesNormalDocs ? 'Ja' : 'Nein' }}</strong></p>
                   </div>
                 </div>
                 <div class="col-md-6">
@@ -337,6 +340,7 @@ Vue.component('workorder-tenant-config', {
                     requireCableLength: 0,
                     requireCableType: 0,
                     showTechnicalData: 0,
+                    tiefbauSeesNormalDocs: 0,
                     enableWorkorder: 1,
                     enableWorkorderMph: 1
                 }

From df79284c351ddca79e7559b17d1a240932c2659b Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Tue, 27 Jan 2026 11:26:23 +0100
Subject: [PATCH 73/88] fixed xinon networks

---
 scripts/workorder-mph-create-from-hausnummer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/workorder-mph-create-from-hausnummer.php b/scripts/workorder-mph-create-from-hausnummer.php
index 21f0df667..0d504e812 100644
--- a/scripts/workorder-mph-create-from-hausnummer.php
+++ b/scripts/workorder-mph-create-from-hausnummer.php
@@ -29,8 +29,8 @@ $sql = "
     SELECT hn.id, hn.netzgebiet_id, COUNT(we.id) as we_count
     FROM Hausnummer hn
     LEFT JOIN Wohneinheit we ON hn.id = we.hausnummer_id
-    WHERE hn.rimo_ex_state NOT IN ('grossplaning', 'not2connect')
-      AND hn.rimo_op_state NOT IN ('grossplaning', 'not2connect')
+    WHERE COALESCE(hn.rimo_ex_state, '') NOT IN ('grossplaning', 'not2connect')
+      AND COALESCE(hn.rimo_op_state, '') NOT IN ('grossplaning', 'not2connect')
       $netzgebietFilter
     GROUP BY hn.id
     HAVING we_count > 2

From 8bfc639a44db7c890d30b46f4c711431682bf2c0 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Tue, 27 Jan 2026 11:40:34 +0100
Subject: [PATCH 74/88] fixed offline mode

---
 .../MobileApp/Modules/Workorder/Workorder/WorkorderHandler.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/MobileApp/Modules/Workorder/Workorder/WorkorderHandler.php b/application/MobileApp/Modules/Workorder/Workorder/WorkorderHandler.php
index 62d6a58a7..6861bcdc7 100644
--- a/application/MobileApp/Modules/Workorder/Workorder/WorkorderHandler.php
+++ b/application/MobileApp/Modules/Workorder/Workorder/WorkorderHandler.php
@@ -165,6 +165,7 @@ class WorkorderHandler extends MobileAppBaseHandler {
             );
 
             $tenantConfigData = [
+                'addressId' => $tenantConfig->addressId,
                 'documentationTypes' => $customTypes,
                 'civilEngineeringDocsRequired' => (bool)$tenantConfig->civilEngineeringDocsRequired,
                 'interventionTypes' => json_decode($tenantConfig->interventionTypes, true) ?? [],

From 71c94fd7bed9f13232dfcc484195722a0a1a3d82 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Tue, 27 Jan 2026 12:11:24 +0100
Subject: [PATCH 75/88] fixed aha parsing

---
 application/RimoWorkorder/RimoWorkorder.php | 27 +++++--
 scripts/workorder-reparse-aha.php           | 87 +++++++++++++++++++++
 2 files changed, 108 insertions(+), 6 deletions(-)
 create mode 100644 scripts/workorder-reparse-aha.php

diff --git a/application/RimoWorkorder/RimoWorkorder.php b/application/RimoWorkorder/RimoWorkorder.php
index 5c9eb0767..e08448269 100644
--- a/application/RimoWorkorder/RimoWorkorder.php
+++ b/application/RimoWorkorder/RimoWorkorder.php
@@ -97,11 +97,11 @@ class RimoWorkorder extends mfBaseModel {
         }
     }
 
-    public static function autoParseForWorkorder(int $workorderId): void {
+    public static function autoParseForWorkorder(int $workorderId, bool $force = false): void {
         $wo = WorkorderModel::get($workorderId);
         if (!$wo) return;
         $meta = json_decode($wo->metadata ?? '{}', true);
-        if (empty($meta['dropcable']['parsed_at']) && $wo->preorderId) {
+        if (($force || empty($meta['dropcable']['parsed_at'])) && $wo->preorderId) {
             $pre = new Preorder($wo->preorderId);
             $rimos = $pre->adb_wohneinheit_id ? RimoWorkorderModel::search(['adb_wohneinheit_id' => $pre->adb_wohneinheit_id]) : [];
             if (!empty($rimos[0])) (new self($rimos[0]->id))->parseAha();
@@ -111,15 +111,29 @@ class RimoWorkorder extends mfBaseModel {
     private function parseDropkabelFromPdf(string $pdf): array {
         $result = [];
         $text = (new Parser())->parseContent($pdf)->getPages()[0]?->getText() ?? '';
-        if (!preg_match('/Dropkabel:\s*\n(.+?)(?:Lage:|$)/s', $text, $m)) return $result;
+
+        if (!preg_match('/Dropkabel:\s*\n(.+?)(?:Lage:|$)/s', $text, $m)) {
+            // Try alternative pattern without strict newline requirement
+            if (!preg_match('/Dropkabel[:\s]*(.+?)(?:Lage|Anschluss|$)/si', $text, $m)) {
+                return $result;
+            }
+        }
+
         $started = false;
         foreach (explode("\n", $m[1]) as $line) {
             $line = trim($line);
             if (!$line) continue;
-            if (stripos($line, 'ID') !== false && stripos($line, 'Type') !== false) { $started = true; continue; }
-            if ($started && preg_match('/^(F-[A-Z0-9\(\)-]+K\d+)\s+(.+)$/i', $line, $p)) {
+
+            // Check for header line (ID and Type columns)
+            if (stripos($line, 'ID') !== false && (stripos($line, 'Type') !== false || stripos($line, 'Typ') !== false)) {
+                $started = true;
+                continue;
+            }
+
+            // Flexible cable ID pattern - matches F26-K009, F-ABC123-K01, F-XYZ(1)-K02, etc.
+            if ($started && preg_match('#^([A-Z][A-Z0-9()/_-]*-K\d+)\s+(.+)$#i', $line, $p)) {
                 $rest = $p[2]; $status = '';
-                foreach (['Planfreigabe', 'Plan released', 'Grobplanung', 'Executed', 'Ausgeführt'] as $s)
+                foreach (['Planfreigabe', 'Plan released', 'Grobplanung', 'Executed', 'Ausgeführt', 'Detailed planning', 'Detailplanung'] as $s)
                     if (preg_match('/\b' . preg_quote($s, '/') . '\s*$/i', $rest)) {
                         $status = $s; $rest = trim(preg_replace('/\b' . preg_quote($s, '/') . '\s*$/i', '', $rest)); break;
                     }
@@ -132,6 +146,7 @@ class RimoWorkorder extends mfBaseModel {
                     'laenge_plan' => $lp, 'laenge_ist' => $li, 'status' => $status];
             }
         }
+
         return $result;
     }
 
diff --git a/scripts/workorder-reparse-aha.php b/scripts/workorder-reparse-aha.php
new file mode 100644
index 000000000..170e104da
--- /dev/null
+++ b/scripts/workorder-reparse-aha.php
@@ -0,0 +1,87 @@
+#!/usr/bin/php
+<?php
+
+require("../config/config.php");
+
+define('FRONKDB_SQLDEBUG',false);
+error_reporting(E_ALL & ~(E_NOTICE | E_STRICT | E_DEPRECATED));
+
+require_once(LIBDIR."/mvcfronk/mfRouter/mfRouter.php");
+require_once(LIBDIR."/mvcfronk/mfBase/mfBaseModel.php");
+require_once(LIBDIR."/mvcfronk/mfBase/mfBaseController.php");
+
+$me = new User(1);
+
+echo "[" . date('Y-m-d H:i:s') . "] Starting AHA re-parse for workorders with technical data enabled\n";
+
+// Get all tenant configs with showTechnicalData enabled
+$tenantConfigs = WorkorderTenantConfigModel::getAll(['showTechnicalData' => 1]);
+$addressIds = array_column($tenantConfigs, 'addressId');
+
+if (empty($addressIds)) {
+    echo "[" . date('Y-m-d H:i:s') . "] No tenant configs with showTechnicalData enabled found\n";
+    exit;
+}
+
+echo "[" . date('Y-m-d H:i:s') . "] Found " . count($tenantConfigs) . " tenant configs with technical data enabled\n";
+
+// Get all active workorders
+$activeStatuses = ['new', 'assigned', 'scheduled', 'in_progress', 'correction_requested',
+                   'intervention_required', 'civil_engineering_required', 'civil_engineering_completed',
+                   'problem_solved', 'documented'];
+
+$workorders = WorkorderModel::getAll(['status' => $activeStatuses]);
+
+echo "[" . date('Y-m-d H:i:s') . "] Found " . count($workorders) . " active workorders\n";
+
+$parsedCount = 0;
+$skippedCount = 0;
+$errorCount = 0;
+
+foreach ($workorders as $workorder) {
+    // Check if workorder belongs to a tenant with technical data enabled
+    if (!$workorder->preorderId) {
+        $skippedCount++;
+        continue;
+    }
+
+    $preorder = new Preorder($workorder->preorderId);
+    if (!$preorder->id || !$preorder->adb_wohneinheit_id) {
+        $skippedCount++;
+        continue;
+    }
+
+    // Find RimoWorkorder for this preorder's wohneinheit
+    $rimoWorkorders = RimoWorkorderModel::search(['adb_wohneinheit_id' => $preorder->adb_wohneinheit_id]);
+    if (empty($rimoWorkorders)) {
+        $skippedCount++;
+        continue;
+    }
+
+    $rimoWorkorder = new RimoWorkorder($rimoWorkorders[0]->id);
+    if (!$rimoWorkorder->id) {
+        $skippedCount++;
+        continue;
+    }
+
+    echo "[" . date('Y-m-d H:i:s') . "] Parsing AHA for Workorder #{$workorder->id} (RimoWorkorder #{$rimoWorkorder->id})... ";
+
+    try {
+        $result = $rimoWorkorder->parseAha();
+        if ($result['success']) {
+            echo "OK - {$result['dropkabel_count']} cables, map: " . ($result['has_map'] ? 'yes' : 'no') . "\n";
+            $parsedCount++;
+        } else {
+            echo "FAILED - {$result['message']}\n";
+            $errorCount++;
+        }
+    } catch (Exception $e) {
+        echo "ERROR - " . $e->getMessage() . "\n";
+        $errorCount++;
+    }
+
+    // Small delay to avoid overloading the Rimo API
+    usleep(100000); // 100ms
+}
+
+echo "[" . date('Y-m-d H:i:s') . "] Completed: Parsed: $parsedCount, Skipped: $skippedCount, Errors: $errorCount\n";

From 45f8be2f3a71c6c95d6013680a9671229be786d5 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 27 Jan 2026 13:27:35 +0100
Subject: [PATCH 76/88] SnoppCitycom API: not checking home status anymore

---
 application/Api/v1/Modules/Operationaldata/SnoppCitycom.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/Api/v1/Modules/Operationaldata/SnoppCitycom.php b/application/Api/v1/Modules/Operationaldata/SnoppCitycom.php
index f5d51a2bb..d8434a062 100644
--- a/application/Api/v1/Modules/Operationaldata/SnoppCitycom.php
+++ b/application/Api/v1/Modules/Operationaldata/SnoppCitycom.php
@@ -132,9 +132,9 @@ class SnoppCitycom extends Modules\ApiControllerModule
 
 
         // Home must have Status 300, else return deferred
-        if($wohneinheit->status->code < 300) {
+        /*if($wohneinheit->status->code < 300) {
             return \mfResponse::Ok(["message" => "ONT not yet installed. Deferred", "activation_status" => "deferred"]);
-        }
+        }*/
 
         /*
         $cc_home_id = \Citycom_OanApiHelper::hausnummerExtrefToCitycomId($wohneinheit->extref);

From e021a51ef0bc59e04448be3f41e5d56a90d884fa Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 27 Jan 2026 16:08:31 +0100
Subject: [PATCH 77/88] Added FileType if available in
 Rimoapi:getWorkorderAhaReport

---
 lib/Rimoapi/Rimoapi.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/Rimoapi/Rimoapi.php b/lib/Rimoapi/Rimoapi.php
index 16f1e8218..a371a9ffd 100644
--- a/lib/Rimoapi/Rimoapi.php
+++ b/lib/Rimoapi/Rimoapi.php
@@ -395,12 +395,18 @@ class Rimoapi {
             return false;
         }
 
+        $filename = false;
+        $filetype = false;
+
         foreach($items->item as $item) {
             if(!$item->name) continue;
 
             if(!preg_match('/_AHA.pdf$/i', $item->name)) continue;
 
             $filename = $item->name;
+            if(property_exists($item, "fileType") && is_object($item->fileType) && property_exists($item->fileType, "name")) {
+                $filetype = $item->fileType->name;
+            }
         }
 
         if(!$filename) {
@@ -413,6 +419,9 @@ class Rimoapi {
         $params['apiKey'] = $apikey;
         $params['objectId'] = $rimo_id;
         $params['fileNames'] = $filename;
+        if($filetype) {
+            $params["fileTypeNames"] = $filetype;
+        }
 
         $ctx_opts = [
             'http' => [

From 4bfd0eddceb69b90e62a1179b43df80aa740f424 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Tue, 27 Jan 2026 16:09:10 +0100
Subject: [PATCH 78/88] fixed workorder civil engineering

---
 application/RimoWorkorder/RimoWorkorder.php   |   2 +-
 .../js/pages/WorkorderAdmin/WorkorderAdmin.js |   4 +-
 .../js/pages/WorkorderBase/WorkorderBase.js   | 113 +++++++++++++++---
 3 files changed, 99 insertions(+), 20 deletions(-)

diff --git a/application/RimoWorkorder/RimoWorkorder.php b/application/RimoWorkorder/RimoWorkorder.php
index e08448269..0b6bccc89 100644
--- a/application/RimoWorkorder/RimoWorkorder.php
+++ b/application/RimoWorkorder/RimoWorkorder.php
@@ -79,7 +79,7 @@ class RimoWorkorder extends mfBaseModel {
                 $fn = 'aha_lageplan_' . $this->id . '_' . time() . '.png';
                 $file = FileModel::create(['name' => 'AHA Lageplan ' . $this->rimo_name, 'filename' => $fn,
                     'store_filename' => $fn, 'orig_filename' => 'AHA_Lageplan_' . $this->rimo_name . '.png',
-                    'mimetype' => 'image/png', 'subfolder' => 'aha_maps']);
+                    'mimetype' => 'image/png', 'subfolder' => 'aha_maps', 'create_by' => 1]);
                 if ($file->save()) {
                     $dir = MFUPLOAD_FILE_SAVE_PATH . '/aha_maps';
                     if (!is_dir($dir)) mkdir($dir, 0755, true);
diff --git a/public/js/pages/WorkorderAdmin/WorkorderAdmin.js b/public/js/pages/WorkorderAdmin/WorkorderAdmin.js
index 561f6f1ab..0cf9a40d4 100644
--- a/public/js/pages/WorkorderAdmin/WorkorderAdmin.js
+++ b/public/js/pages/WorkorderAdmin/WorkorderAdmin.js
@@ -90,8 +90,8 @@ Vue.component('workorder-admin', {
           <template v-slot:appointmentdate="{ row }">{{ formatDate(row.appointmentDate, true) }}</template>
 
           <template v-slot:expandedRow="{ row }">
-            <civil-engineering-manager v-if="row.status === 'civil_engineering_required'" :workorder-id="row.id" :is-admin="true"/>
-            <workorder-details-manager v-else :workorder-id="row.id" :is-admin="true"
+            <civil-engineering-manager v-if="row.status === 'civil_engineering_required'" :workorder-id="row.id" :is-admin="true" class="mb-3"/>
+            <workorder-details-manager :workorder-id="row.id" :is-admin="true"
                                        @workorder-completed="$refs.table.$refs.table.refreshTable()"
                                        @accept-documentation="acceptDocumentation(row.id)"/>
           </template>
diff --git a/public/js/pages/WorkorderBase/WorkorderBase.js b/public/js/pages/WorkorderBase/WorkorderBase.js
index 9a4f914c5..758b31278 100644
--- a/public/js/pages/WorkorderBase/WorkorderBase.js
+++ b/public/js/pages/WorkorderBase/WorkorderBase.js
@@ -27,25 +27,56 @@ Vue.component('civil-engineering-manager', {
         <div v-if="loading" class="text-center p-5"><i class="fas fa-spinner fa-spin fa-2x"></i></div>
         <div v-else class="row">
           <div class="col-lg-4">
-            <div class="card h-100">
+            <div class="card mb-3">
               <div class="card-body">
-                <h5 class="card-title">Tiefbau-Arbeiten</h5>
+                <h5 class="card-title"><i class="fas fa-hard-hat text-orange mr-2"></i>Tiefbau-Arbeiten</h5>
                 <p class="small text-muted">Schließen Sie den Tiefbau-Auftrag ab. Laden Sie Dokumente hoch, falls erforderlich.</p>
+
+                <div v-if="tiefbauSeesNormalDocs && documentationTypes.length" class="mb-3">
+                  <h6 class="small font-weight-bold">Checkliste</h6>
+                  <ul class="list-unstyled mb-0">
+                    <li v-for="docType in documentationTypes" :key="docType.value" class="mb-1 d-flex align-items-center small">
+                      <i :class="isUploaded(docType.value) ? 'fas fa-check-circle text-success' : 'far fa-circle text-muted'" class="fa-fw mr-2"></i>
+                      <span>{{ docType.text }}</span>
+                    </li>
+                  </ul>
+                </div>
+
                 <hr>
                 <tt-button text="Tiefbau abschließen" @click="showCompleteModal = true"
                            :disabled="!canComplete || completing"
                            :loading="completing" additional-class="btn-success w-100" icon="fas fa-check-double"
                 />
-                <small v-if="docsRequired && !canComplete" class="form-text text-muted text-center mt-2">
-                  Bitte laden Sie mindestens ein Dokument hoch, um den Auftrag abzuschließen.
+                <small v-if="docsRequired && !canComplete && !tiefbauSeesNormalDocs" class="form-text text-muted text-center mt-2">
+                  Bitte laden Sie mindestens ein Tiefbau-Dokument hoch, um den Auftrag abzuschließen.
                 </small>
               </div>
             </div>
+
+            <div class="card">
+              <div class="card-header py-2"><h6 class="mb-0"><i class="fas fa-history mr-2"></i>Journal</h6></div>
+              <div class="card-body p-0" style="max-height: 200px; overflow-y: auto;">
+                <ul v-if="journals.length" class="list-group list-group-flush">
+                  <li v-for="log in journals" :key="log.id" class="list-group-item small py-2">
+                    <strong>{{ formatDate(log.create) }} ({{ log.createByName }}):</strong>
+                    <div class="text-muted" style="white-space: pre-wrap;">{{ log.text }}</div>
+                  </li>
+                </ul>
+                <div v-else class="p-3 text-muted text-center small">Keine Journaleinträge.</div>
+              </div>
+              <div class="card-footer py-2">
+                <tt-textarea v-model="newJournalMessage" placeholder="Nachricht..." rows="2" sm no-form-group/>
+                <tt-button text="Eintrag speichern" @click="addJournalEntry" :loading="addingJournalEntry"
+                           additional-class="btn-info btn-sm w-100 mt-2" icon="fas fa-paper-plane"/>
+              </div>
+            </div>
           </div>
+
           <div class="col-lg-8">
-            <div class="card mb-3" v-if="docsRequired">
+            <div class="card mb-3">
               <div class="card-body">
                 <h5 class="card-title">Dokument hochladen</h5>
+                <tt-select v-if="tiefbauSeesNormalDocs && allDocTypes.length" label="Dokumententyp" :options="allDocTypes" v-model="uploadData.documentType" sm row/>
                 <tt-input label="Beschreibung" v-model="uploadData.description" sm row placeholder="Optional"/>
                 <div class="form-group row">
                   <label class="col-form-label col-sm-4 col-form-label-sm">Dateien</label>
@@ -56,14 +87,21 @@ Vue.component('civil-engineering-manager', {
                 <tt-button text="Hochladen" @click="uploadFiles" :loading="uploading" additional-class="btn-primary float-right" icon="fas fa-upload"/>
               </div>
             </div>
+
             <tt-file-gallery
-                v-if="docsRequired"
                 :files="uploadedFiles"
-                :edit-mode="false"
+                :edit-mode="tiefbauSeesNormalDocs"
                 :delete-mode="true"
-                @delete-file="deleteDocumentation">
+                @delete-file="deleteDocumentation"
+                @update-file="updateDocumentation">
+              <template v-if="tiefbauSeesNormalDocs" v-slot:file-edit="{ file }">
+                <tt-select label="Dokumententyp" :options="allDocTypes" v-model="file.documentType" sm/>
+              </template>
             </tt-file-gallery>
-            <div v-else class="alert alert-info">Für diesen Auftraggeber ist keine Dokumentation für Tiefbau-Arbeiten erforderlich.</div>
+
+            <div v-if="!docsRequired && !tiefbauSeesNormalDocs" class="alert alert-info">
+              Für diesen Auftraggeber ist keine Dokumentation für Tiefbau-Arbeiten erforderlich.
+            </div>
           </div>
         </div>
         <tt-modal :show.sync="showCompleteModal" title="Tiefbau abschließen" @submit="completeTask" @close="showCompleteModal = false" :delete="false">
@@ -72,25 +110,43 @@ Vue.component('civil-engineering-manager', {
       </div>
     `,
     data: () => ({
-        loading: true, uploading: false, completing: false, docsRequired: false,
-        uploadedFiles: [], uploadData: { files: [], description: '' }, showCompleteModal: false
+        loading: true, uploading: false, completing: false,
+        docsRequired: false, tiefbauSeesNormalDocs: false, documentationTypes: [],
+        uploadedFiles: [], journals: [],
+        uploadData: { files: [], description: '', documentType: 'civil_engineering_photo' },
+        showCompleteModal: false,
+        newJournalMessage: '', addingJournalEntry: false
     }),
     computed: {
         canComplete() {
+            if (this.tiefbauSeesNormalDocs) {
+                // When tiefbauSeesNormalDocs is enabled, can always complete (no strict requirements)
+                return true;
+            }
+            // Original logic: require at least one civil engineering doc if docsRequired
             return !this.docsRequired || this.uploadedFiles.length > 0;
+        },
+        allDocTypes() {
+            return [...this.documentationTypes, { value: 'civil_engineering_photo', text: 'Tiefbau Foto' }, { value: 'other', text: 'Sonstiges' }];
         }
     },
     methods: {
+        formatDate(timestamp) { return timestamp ? window.moment.unix(timestamp).format('DD.MM.YYYY HH:mm') : '–'; },
+        isUploaded(docType) {
+            return Array.isArray(this.uploadedFiles) && this.uploadedFiles.some(doc => doc.documentType === docType);
+        },
         async fetchInitialData() {
             this.loading = true;
             try {
                 const configRes = await axios.get(`${window.TT_CONFIG.BASE_PATH}/WorkorderCompany/getTenantConfig`, { params: { workorderId: this.workorderId } });
                 this.docsRequired = configRes.data.civilEngineeringDocsRequired || false;
+                this.tiefbauSeesNormalDocs = configRes.data.tiefbauSeesNormalDocs || false;
+                this.documentationTypes = configRes.data.documentationTypes || [];
 
-                if(this.docsRequired) {
-                    const docRes = await axios.get(`${window.TT_CONFIG.BASE_PATH}/${this.isAdmin ? 'WorkorderAdmin' : 'WorkorderCompany'}/getDocumentation`, { params: { workorderId: this.workorderId } });
-                    this.uploadedFiles = docRes.data.docs || [];
-                }
+                // Always load docs and journals
+                const docRes = await axios.get(`${window.TT_CONFIG.BASE_PATH}/${this.isAdmin ? 'WorkorderAdmin' : 'WorkorderCompany'}/getDocumentation`, { params: { workorderId: this.workorderId } });
+                this.uploadedFiles = docRes.data.docs || [];
+                this.journals = docRes.data.journals || [];
             } catch (e) {
                 window.notify('error', 'Konfiguration konnte nicht geladen werden.');
                 console.error(e);
@@ -104,7 +160,7 @@ Vue.component('civil-engineering-manager', {
             this.uploading = true;
             const formData = new FormData();
             formData.append('workorderId', this.workorderId);
-            formData.append('documentType', 'civil_engineering_photo');
+            formData.append('documentType', this.uploadData.documentType || 'civil_engineering_photo');
             formData.append('description', this.uploadData.description);
             for (const file of this.uploadData.files) formData.append('files[]', file);
             try {
@@ -112,7 +168,7 @@ Vue.component('civil-engineering-manager', {
                 if (data.success) {
                     window.notify('success', data.message);
                     this.$refs.fileInput.value = '';
-                    this.uploadData = { files: [], description: '' };
+                    this.uploadData = { files: [], description: '', documentType: this.tiefbauSeesNormalDocs ? this.documentationTypes[0]?.value : 'civil_engineering_photo' };
                     await this.fetchInitialData();
                 } else window.notify('error', data.error || 'Upload fehlgeschlagen.');
             } catch (e) {
@@ -131,6 +187,29 @@ Vue.component('civil-engineering-manager', {
                 window.notify('error', 'Netzwerkfehler beim Löschen.');
             }
         },
+        async updateDocumentation(file) {
+            try {
+                const {data} = await axios.post(`${window.TT_CONFIG.BASE_PATH}/WorkorderCompany/updateDocumentation`, { id: file.id, documentType: file.documentType });
+                if (data.success) {
+                    window.notify('success', data.message);
+                    await this.fetchInitialData();
+                } else window.notify('error', data.message || 'Update fehlgeschlagen.');
+            } catch (e) {
+                window.notify('error', 'Netzwerkfehler beim Update.');
+            }
+        },
+        async addJournalEntry() {
+            if (!this.newJournalMessage.trim()) return;
+            this.addingJournalEntry = true;
+            try {
+                const {data} = await axios.post(`${window.TT_CONFIG.BASE_PATH}/${this.isAdmin ? 'WorkorderAdmin' : 'WorkorderCompany'}/addJournal`, { workorderId: this.workorderId, text: this.newJournalMessage });
+                if (data.success) {
+                    this.newJournalMessage = '';
+                    this.journals = data.journals || [];
+                } else window.notify('error', data.message);
+            } catch (e) { window.notify('error', 'Netzwerkfehler'); }
+            finally { this.addingJournalEntry = false; }
+        },
         async completeTask() {
             this.completing = true;
             try {

From 7273c830006d7a7fe8b8811023d48728e8caa78e Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Tue, 27 Jan 2026 16:43:38 +0100
Subject: [PATCH 79/88] created test creation invoice script for mock data

---
 .../ManualInvoice/create-mock-invoices.php    | 314 ------------
 .../ManualInvoice/create-test-invoices.php    | 464 ++++++++++++++++++
 2 files changed, 464 insertions(+), 314 deletions(-)
 delete mode 100644 scripts/ManualInvoice/create-mock-invoices.php
 create mode 100644 scripts/ManualInvoice/create-test-invoices.php

diff --git a/scripts/ManualInvoice/create-mock-invoices.php b/scripts/ManualInvoice/create-mock-invoices.php
deleted file mode 100644
index 57cc5835e..000000000
--- a/scripts/ManualInvoice/create-mock-invoices.php
+++ /dev/null
@@ -1,314 +0,0 @@
-#!/usr/bin/php
-<?php
-require("../../config/config.php");
-
-define('FRONKDB_SQLDEBUG', false);
-error_reporting(E_ALL & ~(E_NOTICE | E_STRICT | E_DEPRECATED));
-
-require_once(LIBDIR."/mvcfronk/mfRouter/mfRouter.php");
-require_once(LIBDIR."/mvcfronk/mfBase/mfBaseModel.php");
-require_once(LIBDIR."/mvcfronk/mfBase/mfBaseController.php");
-
-$layout = \Layout::singleton();
-
-$me = new User(1);
-define("INTERNAL_USER_ID", $me->id);
-define("INTERNAL_USER_USERNAME", $me->username);
-
-echo "========================================\n";
-echo "Creating 20 mock manual invoices...\n";
-echo "========================================\n\n";
-
-$db = FronkDB::singleton();
-
-// Get random customers with valid data for invoicing
-$customerSql = "SELECT * FROM Address
-                WHERE customer_number IS NOT NULL
-                AND customer_number > 0
-                AND (company IS NOT NULL OR firstname IS NOT NULL)
-                AND street IS NOT NULL
-                AND zip IS NOT NULL
-                AND city IS NOT NULL
-                ORDER BY RAND()
-                LIMIT 50";
-$customerRes = $db->query($customerSql);
-$customers = [];
-while ($row = $db->fetch_object($customerRes)) {
-    $customers[] = $row;
-}
-
-if (empty($customers)) {
-    echo "ERROR: No valid customers found in database!\n";
-    exit(1);
-}
-
-echo "Found " . count($customers) . " random customers to use.\n\n";
-
-// Get last 20 shipping notes for position data
-$sql = "SELECT * FROM WarehouseShippingNote ORDER BY `create` DESC LIMIT 20";
-$res = $db->query($sql);
-
-$shippingNotes = [];
-while ($row = $db->fetch_object($res)) {
-    $shippingNotes[] = new WarehouseShippingNote($row);
-}
-
-$count = 0;
-$errors = 0;
-
-foreach ($shippingNotes as $index => $shippingNote) {
-    echo "Processing shipping note #{$shippingNote->id}...\n";
-
-    // Pick a random customer
-    $customer = $customers[array_rand($customers)];
-    $address = new Address($customer->id);
-
-    if (!$address || !$address->id) {
-        echo "  - Skipping: Could not load customer address\n";
-        $errors++;
-        continue;
-    }
-
-    // Build positions from shipping note
-    $positions = json_decode($shippingNote->positions, true) ?: [];
-    $enrichedPositions = [];
-
-    foreach ($positions as $position) {
-        if (isset($position['article'])) {
-            $article = WarehouseArticleModel::get($position['article']);
-            if (!$article) continue;
-
-            $prices = json_decode($article->cheapestSellPrice, true) ?: [];
-            $price = 0;
-            foreach ($prices as $p) {
-                if (isset($p['price'])) {
-                    $price = $p['price'];
-                    break;
-                }
-            }
-            // Use random price if no price found
-            if ($price == 0) {
-                $price = rand(10, 500);
-            }
-
-            $enrichedPositions[] = [
-                'product_name' => $article->articleNumber . " | " . $article->title,
-                'product_info' => $article->description ?: '',
-                'amount' => $position['amount'] ?: 1,
-                'unit' => $article->unit ?: 'Stk.',
-                'price' => $price,
-                'discount' => 0,
-                'vatrate' => 20,
-                'article_id' => $article->id
-            ];
-        } elseif (isset($position['articlePacket'])) {
-            $packet = WarehouseArticlePacketModel::get($position['articlePacket']);
-            if (!$packet) continue;
-
-            $enrichedPositions[] = [
-                'product_name' => $packet->title,
-                'product_info' => $packet->description ?? '',
-                'amount' => $position['amount'] ?: 1,
-                'unit' => 'Pau.',
-                'price' => rand(50, 300),
-                'discount' => 0,
-                'vatrate' => 20
-            ];
-        } elseif (isset($position['articleText'])) {
-            $enrichedPositions[] = [
-                'product_name' => $position['articleText'],
-                'product_info' => '',
-                'amount' => $position['amount'] ?? 1,
-                'unit' => 'Stk.',
-                'price' => rand(10, 100),
-                'discount' => 0,
-                'vatrate' => 20
-            ];
-        }
-    }
-
-    // Add hours entries
-    $hoursEntries = json_decode($shippingNote->hoursEntries, true) ?: [];
-    foreach ($hoursEntries as $hoursEntry) {
-        $hourCount = floatval(str_replace(",", ".", $hoursEntry['hourCount'] ?? 0));
-        if ($hourCount <= 0) continue;
-
-        $userName = 'Mitarbeiter';
-        if (!empty($hoursEntry['userId']) && is_numeric($hoursEntry['userId'])) {
-            $user = UserModel::getOne($hoursEntry['userId']);
-            $userName = $user ? $user->name : 'Mitarbeiter';
-        } elseif (!empty($hoursEntry['userId_text'])) {
-            $userName = $hoursEntry['userId_text'];
-        }
-
-        $enrichedPositions[] = [
-            'product_name' => 'Arbeitsstunden - ' . $userName,
-            'product_info' => 'Datum: ' . (isset($hoursEntry['date']) ? date('d.m.Y', strtotime($hoursEntry['date'])) : date('d.m.Y')),
-            'amount' => $hourCount,
-            'unit' => 'h',
-            'price' => 60,
-            'discount' => 0,
-            'vatrate' => 20
-        ];
-    }
-
-    // If still no positions, create some mock positions
-    if (empty($enrichedPositions)) {
-        $mockPositions = [
-            ['name' => 'Beratungsleistung', 'unit' => 'h', 'price' => 85],
-            ['name' => 'Installationsarbeiten', 'unit' => 'Pau.', 'price' => 250],
-            ['name' => 'Netzwerkkabel Cat6', 'unit' => 'm', 'price' => 3.50],
-            ['name' => 'Router TP-Link', 'unit' => 'Stk.', 'price' => 89.90],
-            ['name' => 'Montage vor Ort', 'unit' => 'h', 'price' => 65],
-        ];
-
-        // Add 1-3 random mock positions
-        $numPositions = rand(1, 3);
-        for ($i = 0; $i < $numPositions; $i++) {
-            $mock = $mockPositions[array_rand($mockPositions)];
-            $enrichedPositions[] = [
-                'product_name' => $mock['name'],
-                'product_info' => 'Mock-Position für Testzwecke',
-                'amount' => rand(1, 10),
-                'unit' => $mock['unit'],
-                'price' => $mock['price'],
-                'discount' => rand(0, 1) ? rand(5, 15) : 0,
-                'vatrate' => 20
-            ];
-        }
-    }
-
-    // Use random invoice date within last 90 days
-    $randomDaysAgo = rand(0, 90);
-    $invoiceDate = strtotime("-{$randomDaysAgo} days");
-
-    // Create invoice data
-    $invoiceData = [
-        'invoice_number' => ManualInvoiceModel::getNextInvoiceNumber(),
-        'invoice_date' => $invoiceDate,
-        'owner_id' => $address->id,
-        'billingaddress_id' => $address->id,
-        'customer_number' => $address->customer_number,
-        'company' => $address->company,
-        'firstname' => $address->firstname,
-        'lastname' => $address->lastname,
-        'street' => $address->street,
-        'zip' => $address->zip,
-        'city' => $address->city,
-        'country' => $address->country ?: 'Österreich',
-        'email' => $address->email,
-        'uid' => $address->uid,
-        'fibu_account_number' => $address->fibu_account_number,
-        'fibu_payment_due' => $address->fibu_payment_due ?: 14,
-        'fibu_payment_skonto' => $address->fibu_payment_skonto ?: 0,
-        'fibu_payment_skonto_rate' => $address->fibu_payment_skonto_rate ?: 0,
-        'billing_type' => $address->billing_type ?: 'invoice',
-        'billing_delivery' => $address->billing_delivery ?: 'email',
-        'bank_account_bank' => $address->bank_account_bank,
-        'bank_account_owner' => $address->bank_account_owner,
-        'bank_account_iban' => $address->bank_account_iban,
-        'bank_account_bic' => $address->bank_account_bic,
-        'sepa_date' => $address->sepa_date ? (is_numeric($address->sepa_date) ? date('Y-m-d', $address->sepa_date) : $address->sepa_date) : null,
-        'leistungszeitraum' => date('m/Y', $invoiceDate),
-        'einleitender_text' => 'Testrechnung basierend auf Lieferschein #' . $shippingNote->id,
-        'externe_referenz' => 'TEST-LS-' . $shippingNote->id,
-        'gesamtrabatt' => rand(0, 1) ? rand(0, 10) : 0,
-        'total' => 0,
-        'total_gross' => 0,
-        'vatgroup_id' => rand(1, 3),
-        'status' => 'erstellt',
-        'lock' => 0,
-        'exported' => 0,
-        'create_by' => 1,
-        'edit_by' => 1,
-        'create' => time(),
-        'edit' => time()
-    ];
-
-    // Create the invoice
-    $invoiceId = ManualInvoiceModel::create($invoiceData);
-
-    if (!$invoiceId) {
-        echo "  - Error creating invoice\n";
-        $errors++;
-        continue;
-    }
-
-    // Create positions
-    $total = 0;
-    $totalGross = 0;
-    $gesamtrabatt = floatval($invoiceData['gesamtrabatt']);
-
-    foreach ($enrichedPositions as $pos) {
-        $amount = floatval($pos['amount']);
-        $price = floatval($pos['price']);
-        $discount = floatval($pos['discount'] ?? 0);
-        $vatrate = floatval($pos['vatrate'] ?? 20);
-
-        // Validate amount is within reasonable bounds
-        if ($amount <= 0 || $amount > 999999) {
-            $amount = 1;
-        }
-        if ($price < 0 || $price > 999999) {
-            $price = 0;
-        }
-
-        $priceTotal = $amount * $price * (1 - $discount / 100);
-        $priceTotalAfterGesamtrabatt = $priceTotal * (1 - $gesamtrabatt / 100);
-        $priceGross = $priceTotalAfterGesamtrabatt * (1 + $vatrate / 100);
-
-        // Use direct SQL to bypass model validation for mock data
-        $posProduct = $db->escape($pos['product_name']);
-        $posInfo = $db->escape($pos['product_info'] ?? '');
-        $posProductId = intval($pos['article_id'] ?? 0);
-        $posUnit = $db->escape($pos['unit'] ?? 'Stk.');
-        $posTime = time();
-
-        // Ensure values are numeric and within DB limits
-        $amount = round($amount, 2);
-        $price = round($price, 2);
-        $priceTotal = round($priceTotal, 2);
-        $priceGross = round($priceGross, 2);
-
-        $insertSql = "INSERT INTO ManualInvoiceposition
-            (manualinvoice_id, position_group, product_id, product_name, product_info, amount, unit, price, discount, vatrate, price_total, price_gross, matchcode, fibu_cost_account, fibu_cost_account_legacy, fibu_taxcode, contract_id, billing_id, create_by, edit_by, `create`, edit)
-            VALUES
-            ($invoiceId, NULL, $posProductId, '$posProduct', '$posInfo', $amount, '$posUnit', $price, $discount, $vatrate, $priceTotal, $priceGross, NULL, NULL, NULL, NULL, 0, NULL, 1, 1, $posTime, $posTime)";
-
-        try {
-            $db->query($insertSql);
-        } catch (Throwable $e) {
-            echo "    Warning: Position skipped (amount=$amount, price=$price): " . $e->getMessage() . "\n";
-            continue;
-        }
-
-        $total += $priceTotal;
-        $totalGross += $priceGross;
-    }
-
-    // Apply gesamtrabatt to total
-    $totalAfterRabatt = $total * (1 - $gesamtrabatt / 100);
-
-    // Update invoice totals using direct SQL (bypass model validation)
-    $db->query("UPDATE ManualInvoice SET total = " . floatval($totalAfterRabatt) . ", total_gross = " . floatval($totalGross) . " WHERE id = " . intval($invoiceId));
-
-    // Create journal entry using direct SQL
-    $journalText = $db->escape('Mock-Rechnung erstellt (basierend auf LS #' . $shippingNote->id . ')');
-    $journalTime = time();
-    $db->query("INSERT INTO ManualInvoiceJournal (manualinvoiceId, text, statusChange, createBy, `create`)
-                VALUES ($invoiceId, '$journalText', 'erstellt', 1, $journalTime)");
-
-    $invoiceNumber = $invoiceData['invoice_number'];
-    $customerName = trim(($address->company ?: '') . ' ' . $address->firstname . ' ' . $address->lastname);
-    echo "  - Created invoice #{$invoiceId} ({$invoiceNumber})\n";
-    echo "    Customer: {$customerName}\n";
-    echo "    Positions: " . count($enrichedPositions) . ", Total: €" . number_format($totalAfterRabatt, 2) . "\n";
-    $count++;
-}
-
-echo "\n========================================\n";
-echo "Mock invoice creation complete!\n";
-echo "Created: {$count} invoices\n";
-echo "Errors/Skipped: {$errors}\n";
-echo "========================================\n";
-echo "\nNOTE: No emails were sent. These are test invoices only.\n";
diff --git a/scripts/ManualInvoice/create-test-invoices.php b/scripts/ManualInvoice/create-test-invoices.php
new file mode 100644
index 000000000..f98a27558
--- /dev/null
+++ b/scripts/ManualInvoice/create-test-invoices.php
@@ -0,0 +1,464 @@
+#!/usr/bin/php
+<?php
+require(__DIR__ . "/../../config/config.php");
+
+define('FRONKDB_SQLDEBUG', false);
+error_reporting(E_ALL & ~(E_NOTICE | E_STRICT | E_DEPRECATED));
+
+require_once(LIBDIR."/mvcfronk/mfRouter/mfRouter.php");
+require_once(LIBDIR."/mvcfronk/mfBase/mfBaseModel.php");
+require_once(LIBDIR."/mvcfronk/mfBase/mfBaseController.php");
+
+$layout = \Layout::singleton();
+$me = new User(1);
+define("INTERNAL_USER_ID", $me->id);
+define("INTERNAL_USER_USERNAME", $me->username);
+
+$db = FronkDB::singleton();
+
+echo "========================================\n";
+echo "Manual Invoice Test Data Generator\n";
+echo "========================================\n\n";
+
+echo "Do you want to truncate ManualInvoice tables first? (y/n): ";
+$handle = fopen("php://stdin", "r");
+$answer = trim(fgets($handle));
+fclose($handle);
+
+if (strtolower($answer) === 'y') {
+    echo "Truncating tables...\n";
+    $db->query("SET FOREIGN_KEY_CHECKS = 0");
+    $db->query("TRUNCATE TABLE ManualInvoiceJournal");
+    $db->query("TRUNCATE TABLE ManualInvoiceposition");
+    $db->query("TRUNCATE TABLE ManualInvoice");
+    $db->query("SET FOREIGN_KEY_CHECKS = 1");
+    echo "Tables truncated.\n\n";
+}
+
+$vatgroups = [];
+$res = $db->query("SELECT * FROM Vatgroup WHERE id IN (2, 3) ORDER BY id");
+while ($row = $db->fetch_object($res)) {
+    $vatgroups[$row->id] = $row;
+}
+
+if (empty($vatgroups)) {
+    echo "ERROR: No VAT groups found!\n";
+    exit(1);
+}
+
+echo "Found " . count($vatgroups) . " VAT group(s)\n";
+
+$vatrates = [];
+$res = $db->query("SELECT * FROM Vatrate WHERE vatgroup_id IN (2, 3)");
+while ($row = $db->fetch_object($res)) {
+    $vatrates[$row->vatgroup_id][$row->area] = $row;
+}
+
+$articlesByVatgroup = [];
+$res = $db->query("SELECT * FROM WarehouseArticle WHERE vatgroup_id IN (2, 3) AND (isEndOfLife = 0 OR isEndOfLife IS NULL)");
+while ($row = $db->fetch_object($res)) {
+    if (!isset($articlesByVatgroup[$row->vatgroup_id])) {
+        $articlesByVatgroup[$row->vatgroup_id] = [];
+    }
+    $articlesByVatgroup[$row->vatgroup_id][] = $row;
+}
+
+$totalArticles = array_sum(array_map('count', $articlesByVatgroup));
+if ($totalArticles == 0) {
+    echo "ERROR: No warehouse articles found!\n";
+    exit(1);
+}
+
+echo "Found $totalArticles warehouse articles\n";
+
+function getCustomersByRegion($db, $region) {
+    $customers = [];
+    switch ($region) {
+        case 'domestic':
+            $sql = "SELECT a.* FROM Address a
+                    LEFT JOIN Country c ON a.country_id = c.id
+                    WHERE a.customer_number > 0
+                    AND (a.company IS NOT NULL OR a.firstname IS NOT NULL)
+                    AND a.street IS NOT NULL AND a.zip IS NOT NULL AND a.city IS NOT NULL
+                    AND (c.isocode = 'AT' OR a.uid LIKE 'ATU%' OR a.country_id IS NULL)
+                    ORDER BY RAND() LIMIT 20";
+            break;
+        case 'eu':
+            $sql = "SELECT a.* FROM Address a
+                    JOIN Country c ON a.country_id = c.id
+                    WHERE a.customer_number > 0
+                    AND (a.company IS NOT NULL OR a.firstname IS NOT NULL)
+                    AND a.street IS NOT NULL AND a.zip IS NOT NULL AND a.city IS NOT NULL
+                    AND c.is_eu = 1 AND c.isocode != 'AT'
+                    AND (a.uid IS NULL OR a.uid NOT LIKE 'ATU%')
+                    ORDER BY RAND() LIMIT 20";
+            break;
+        case 'other':
+            $sql = "SELECT a.* FROM Address a
+                    JOIN Country c ON a.country_id = c.id
+                    WHERE a.customer_number > 0
+                    AND (a.company IS NOT NULL OR a.firstname IS NOT NULL)
+                    AND a.street IS NOT NULL AND a.zip IS NOT NULL AND a.city IS NOT NULL
+                    AND c.is_eu = 0
+                    ORDER BY RAND() LIMIT 20";
+            break;
+    }
+    $res = $db->query($sql);
+    while ($row = $db->fetch_object($res)) {
+        $customers[] = $row;
+    }
+    return $customers;
+}
+
+$domesticCustomers = getCustomersByRegion($db, 'domestic');
+$euCustomers = getCustomersByRegion($db, 'eu');
+$nonEuCustomers = getCustomersByRegion($db, 'other');
+
+echo "Found customers: " . count($domesticCustomers) . " domestic, " . count($euCustomers) . " EU, " . count($nonEuCustomers) . " non-EU\n\n";
+
+function getVatArea($address, $db) {
+    $uid = preg_replace('/[^a-z0-9]/i', '', $address->uid ?? '');
+    if (strtolower(substr($uid, 0, 3)) === 'atu') return 'domestic';
+    if ($address->country_id) {
+        $res = $db->query("SELECT * FROM Country WHERE id = " . intval($address->country_id));
+        if ($country = $db->fetch_object($res)) {
+            if ($country->isocode === TT_HOMECOUNTRY_ISOCODE) return 'domestic';
+            if ($country->is_eu) return 'eu';
+            return 'other';
+        }
+    }
+    return 'domestic';
+}
+
+function getArticlePrice($article) {
+    if ($article->cheapestSellPrice) {
+        $prices = json_decode($article->cheapestSellPrice, true);
+        if (is_array($prices)) {
+            foreach ($prices as $p) {
+                if (isset($p['price']) && $p['price'] > 0) return floatval($p['price']);
+            }
+        }
+    }
+    return rand(10, 500);
+}
+
+function createInvoice($db, $data) {
+    $invoiceNumber = ManualInvoiceModel::getNextInvoiceNumber();
+    $now = time();
+    $sql = "INSERT INTO ManualInvoice (
+        invoice_number, invoice_date, performance_period, introductory_text, external_reference, total_discount,
+        owner_id, billingaddress_id, customer_number, fibu_account_number, fibu_payment_due, fibu_payment_skonto, fibu_payment_skonto_rate,
+        sepa_date, fibu_cost_area, fibu_cost_account, fibu_cost_account_legacy, fibu_taxcode, tax_text,
+        company, firstname, lastname, street, zip, city, country, email, uid,
+        billing_type, bank_account_bank, bank_account_owner, bank_account_iban, bank_account_bic,
+        total, total_gross, vatgroup_id, status, `lock`, exported, create_by, edit_by, `create`, edit
+    ) VALUES (
+        '{$db->escape($invoiceNumber)}', " . intval($data['invoice_date']) . ",
+        '{$db->escape($data['performance_period'])}', '{$db->escape($data['introductory_text'])}',
+        '{$db->escape($data['external_reference'])}', " . floatval($data['total_discount']) . ",
+        " . intval($data['owner_id']) . ", " . intval($data['billingaddress_id']) . ", " . intval($data['customer_number']) . ",
+        " . ($data['fibu_account_number'] ? intval($data['fibu_account_number']) : 'NULL') . ",
+        " . ($data['fibu_payment_due'] ? intval($data['fibu_payment_due']) : 'NULL') . ",
+        " . intval($data['fibu_payment_skonto']) . ", " . intval($data['fibu_payment_skonto_rate']) . ",
+        " . ($data['sepa_date'] ? "'{$db->escape($data['sepa_date'])}'" : 'NULL') . ",
+        " . ($data['fibu_cost_area'] ? "'{$db->escape($data['fibu_cost_area'])}'" : 'NULL') . ",
+        " . ($data['fibu_cost_account'] ? intval($data['fibu_cost_account']) : 'NULL') . ",
+        " . ($data['fibu_cost_account_legacy'] ? intval($data['fibu_cost_account_legacy']) : 'NULL') . ",
+        " . ($data['fibu_taxcode'] ? intval($data['fibu_taxcode']) : 'NULL') . ",
+        " . ($data['tax_text'] ? "'{$db->escape($data['tax_text'])}'" : 'NULL') . ",
+        '{$db->escape($data['company'])}', '{$db->escape($data['firstname'])}', '{$db->escape($data['lastname'])}',
+        '{$db->escape($data['street'])}', '{$db->escape($data['zip'])}', '{$db->escape($data['city'])}',
+        '{$db->escape($data['country'])}', '{$db->escape($data['email'])}', '{$db->escape($data['uid'])}',
+        '{$db->escape($data['billing_type'])}',
+        '{$db->escape($data['bank_account_bank'])}', '{$db->escape($data['bank_account_owner'])}',
+        '{$db->escape($data['bank_account_iban'])}', '{$db->escape($data['bank_account_bic'])}',
+        0, 0, " . intval($data['vatgroup_id']) . ", 'erstellt', 0, 0, 1, 1, {$now}, {$now}
+    )";
+    $db->query($sql);
+    return ['id' => $db->link->insert_id, 'invoice_number' => $invoiceNumber];
+}
+
+function createPosition($db, $invoiceId, $pos) {
+    $now = time();
+    $fibuAccount = $pos['fibu_cost_account'] ? intval($pos['fibu_cost_account']) : 'NULL';
+    $fibuAccountLegacy = $pos['fibu_cost_account_legacy'] ? intval($pos['fibu_cost_account_legacy']) : 'NULL';
+    $fibuTaxcode = $pos['fibu_taxcode'] ? intval($pos['fibu_taxcode']) : 'NULL';
+    $sql = "INSERT INTO ManualInvoiceposition (
+        manualinvoice_id, warehousearticle_id, warehousearticle_name, product_info,
+        amount, unit, price, discount, vatrate, price_total, price_gross,
+        fibu_cost_account, fibu_cost_account_legacy, fibu_taxcode, create_by, edit_by, `create`, edit
+    ) VALUES (
+        $invoiceId, " . intval($pos['warehousearticle_id']) . ", '{$db->escape($pos['warehousearticle_name'])}',
+        '{$db->escape($pos['product_info'])}', {$pos['amount']}, '{$db->escape($pos['unit'])}',
+        {$pos['price']}, {$pos['discount']}, {$pos['vatrate']},
+        " . round($pos['price_total'], 2) . ", " . round($pos['price_gross'], 2) . ",
+        $fibuAccount, $fibuAccountLegacy, $fibuTaxcode, 1, 1, $now, $now
+    )";
+    $db->query($sql);
+}
+
+$regions = [
+    'domestic' => ['name' => 'Domestic (AT)', 'customers' => $domesticCustomers],
+    'eu' => ['name' => 'EU', 'customers' => $euCustomers],
+    'other' => ['name' => 'Non-EU', 'customers' => $nonEuCustomers]
+];
+
+$totalCreated = 0;
+$errors = 0;
+
+echo "Generating invoices...\n";
+echo "----------------------------------------\n";
+
+foreach ($vatgroups as $vatgroupId => $vatgroup) {
+    $vgArticles = $articlesByVatgroup[$vatgroupId] ?? [];
+    if (empty($vgArticles)) {
+        echo "[Vatgroup: {$vatgroup->name}] SKIPPED - No articles\n";
+        continue;
+    }
+
+    foreach ($regions as $regionKey => $regionData) {
+        $customers = $regionData['customers'];
+        if (empty($customers)) {
+            echo "[Vatgroup: {$vatgroup->name}] [Region: {$regionData['name']}] SKIPPED - No customers\n";
+            continue;
+        }
+
+        for ($i = 1; $i <= 4; $i++) {
+            $customer = $customers[array_rand($customers)];
+            $address = new Address($customer->id);
+            if (!$address || !$address->id) { $errors++; continue; }
+
+            $vatarea = getVatArea($address, $db);
+            $vatrate = $vatrates[$vatgroupId][$vatarea] ?? null;
+            $vatrateValue = $vatrate ? floatval($vatrate->rate) : 20.0;
+            $fibuCostAccount = $vatrate ? intval($vatrate->account) : null;
+            $fibuCostAccountLegacy = $vatrate ? ($vatrate->legacy_account ? intval($vatrate->legacy_account) : null) : null;
+            $fibuTaxcode = $vatrate ? ($vatrate->taxcode ? intval($vatrate->taxcode) : null) : null;
+            $taxText = $vatrate ? ($vatrate->invoice_text ?? '') : '';
+
+            $numPositions = rand(1, 5);
+            shuffle($vgArticles);
+            $selectedArticles = array_slice($vgArticles, 0, min($numPositions, count($vgArticles)));
+            $totalDiscount = rand(0, 1) ? rand(0, 10) : 0;
+
+            $positions = [];
+            foreach ($selectedArticles as $article) {
+                $amount = rand(1, 10);
+                $price = getArticlePrice($article);
+                $discount = rand(0, 1) ? rand(0, 15) : 0;
+                $priceTotal = $amount * $price * (1 - $discount / 100);
+                $priceTotalAfterDiscount = $priceTotal * (1 - $totalDiscount / 100);
+                $priceGross = $priceTotalAfterDiscount * (1 + $vatrateValue / 100);
+
+                $positions[] = [
+                    'warehousearticle_id' => $article->id,
+                    'warehousearticle_name' => $article->articleNumber . ' | ' . $article->title,
+                    'product_info' => $article->description ?? '',
+                    'amount' => $amount,
+                    'unit' => $article->unit ?: 'Stk.',
+                    'price' => $price,
+                    'discount' => $discount,
+                    'vatrate' => $vatrateValue,
+                    'price_total' => $priceTotal,
+                    'price_gross' => $priceGross,
+                    'fibu_cost_account' => $fibuCostAccount,
+                    'fibu_cost_account_legacy' => $fibuCostAccountLegacy,
+                    'fibu_taxcode' => $fibuTaxcode
+                ];
+            }
+
+            $randomDaysAgo = rand(0, 60);
+            $invoiceDate = strtotime("-{$randomDaysAgo} days");
+
+            $invoiceData = [
+                'invoice_date' => $invoiceDate,
+                'owner_id' => $address->id,
+                'billingaddress_id' => $address->id,
+                'customer_number' => $address->customer_number ?: 0,
+                'company' => $address->company ?: '',
+                'firstname' => $address->firstname ?: '',
+                'lastname' => $address->lastname ?: '',
+                'street' => $address->street ?: '',
+                'zip' => $address->zip ?: '',
+                'city' => $address->city ?: '',
+                'country' => 'Österreich',
+                'email' => $address->email ?: '',
+                'uid' => $address->uid ?: '',
+                'fibu_account_number' => $address->fibu_account_number ?: 0,
+                'fibu_payment_due' => $address->fibu_payment_due ?: 14,
+                'fibu_payment_skonto' => $address->fibu_payment_skonto ?: 0,
+                'fibu_payment_skonto_rate' => $address->fibu_payment_skonto_rate ?: 0,
+                'fibu_cost_area' => $vatarea,
+                'fibu_cost_account' => $fibuCostAccount,
+                'fibu_cost_account_legacy' => $fibuCostAccountLegacy,
+                'fibu_taxcode' => $fibuTaxcode,
+                'billing_type' => $address->billing_type ?: 'invoice',
+                'bank_account_bank' => $address->bank_account_bank ?: '',
+                'bank_account_owner' => $address->bank_account_owner ?: '',
+                'bank_account_iban' => $address->bank_account_iban ?: '',
+                'bank_account_bic' => $address->bank_account_bic ?: '',
+                'sepa_date' => $address->sepa_date ? (is_numeric($address->sepa_date) ? date('Y-m-d', $address->sepa_date) : $address->sepa_date) : null,
+                'performance_period' => date('m/Y', $invoiceDate),
+                'introductory_text' => "Test invoice for '{$vatgroup->name}' in '{$regionData['name']}'",
+                'external_reference' => "TEST-VG{$vatgroupId}-{$regionKey}-{$i}",
+                'total_discount' => $totalDiscount,
+                'vatgroup_id' => $vatgroupId,
+                'tax_text' => $taxText
+            ];
+
+            $result = createInvoice($db, $invoiceData);
+            $invoiceId = $result['id'];
+            $invoiceNumber = $result['invoice_number'];
+
+            if (!$invoiceId) { echo "[Vatgroup: {$vatgroup->name}] [Region: {$regionData['name']}] Invoice #{$i}: ERROR\n"; $errors++; continue; }
+
+            $total = 0;
+            $totalGross = 0;
+            foreach ($positions as $pos) {
+                createPosition($db, $invoiceId, $pos);
+                $total += $pos['price_total'];
+                $totalGross += $pos['price_gross'];
+            }
+
+            $totalAfterRabatt = $total * (1 - $totalDiscount / 100);
+            $db->query("UPDATE ManualInvoice SET total = " . round($totalAfterRabatt, 2) . ", total_gross = " . round($totalGross, 2) . " WHERE id = $invoiceId");
+
+            $journalText = $db->escape("Test invoice created (Vatgroup: {$vatgroup->name}, Region: {$regionData['name']})");
+            $db->query("INSERT INTO ManualInvoiceJournal (manualinvoiceId, text, statusChange, createBy, `create`) VALUES ($invoiceId, '$journalText', 'erstellt', 1, " . time() . ")");
+
+            $customerName = trim(($address->company ?: '') . ' ' . ($address->firstname ?: '') . ' ' . ($address->lastname ?: '')) ?: 'Unknown';
+            echo "[{$vatgroup->name}] [{$regionData['name']}] #{$i}: {$invoiceNumber} - {$customerName} - " . count($positions) . " pos - " . number_format($totalAfterRabatt, 2) . " EUR\n";
+            $totalCreated++;
+        }
+    }
+}
+
+echo "\n----------------------------------------\n";
+echo "Creating mixed VAT group invoices...\n";
+echo "----------------------------------------\n";
+
+foreach ($regions as $regionKey => $regionData) {
+    $customers = $regionData['customers'];
+    if (empty($customers)) { echo "[Mixed] [{$regionData['name']}] SKIPPED - No customers\n"; continue; }
+
+    for ($i = 1; $i <= 4; $i++) {
+        $customer = $customers[array_rand($customers)];
+        $address = new Address($customer->id);
+        if (!$address || !$address->id) { $errors++; continue; }
+
+        $vatarea = getVatArea($address, $db);
+        $positions = [];
+        $usedVatgroups = [];
+
+        foreach ($articlesByVatgroup as $vgId => $vgArticles) {
+            if (empty($vgArticles)) continue;
+            $article = $vgArticles[array_rand($vgArticles)];
+            $articleVatrate = $vatrates[$vgId][$vatarea] ?? null;
+            $posVatrateValue = $articleVatrate ? floatval($articleVatrate->rate) : 20.0;
+            $posFibuCostAccount = $articleVatrate ? intval($articleVatrate->account) : null;
+            $posFibuCostAccountLegacy = $articleVatrate ? ($articleVatrate->legacy_account ? intval($articleVatrate->legacy_account) : null) : null;
+            $posFibuTaxcode = $articleVatrate ? ($articleVatrate->taxcode ? intval($articleVatrate->taxcode) : null) : null;
+
+            $amount = rand(1, 5);
+            $price = getArticlePrice($article);
+            $discount = rand(0, 1) ? rand(0, 10) : 0;
+            $priceTotal = $amount * $price * (1 - $discount / 100);
+            $priceGross = $priceTotal * (1 + $posVatrateValue / 100);
+
+            $positions[] = [
+                'warehousearticle_id' => $article->id,
+                'warehousearticle_name' => $article->articleNumber . ' | ' . $article->title,
+                'product_info' => $article->description ?? '',
+                'amount' => $amount,
+                'unit' => $article->unit ?: 'Stk.',
+                'price' => $price,
+                'discount' => $discount,
+                'vatrate' => $posVatrateValue,
+                'price_total' => $priceTotal,
+                'price_gross' => $priceGross,
+                'fibu_cost_account' => $posFibuCostAccount,
+                'fibu_cost_account_legacy' => $posFibuCostAccountLegacy,
+                'fibu_taxcode' => $posFibuTaxcode
+            ];
+            $usedVatgroups[] = $vgId;
+        }
+
+        if (count($positions) < 2) { echo "[Mixed] [{$regionData['name']}] #{$i}: SKIPPED - Not enough vatgroups\n"; continue; }
+
+        $primaryVatgroupId = $usedVatgroups[0];
+        $primaryVatrate = $vatrates[$primaryVatgroupId][$vatarea] ?? null;
+        $fibuCostAccount = $primaryVatrate ? intval($primaryVatrate->account) : null;
+        $fibuCostAccountLegacy = $primaryVatrate ? ($primaryVatrate->legacy_account ? intval($primaryVatrate->legacy_account) : null) : null;
+        $fibuTaxcode = $primaryVatrate ? ($primaryVatrate->taxcode ? intval($primaryVatrate->taxcode) : null) : null;
+        $taxText = $primaryVatrate ? ($primaryVatrate->invoice_text ?? '') : '';
+
+        $randomDaysAgo = rand(0, 60);
+        $invoiceDate = strtotime("-{$randomDaysAgo} days");
+        $totalDiscount = 0;
+
+        $vatgroupNames = array_map(fn($vgId) => $vatgroups[$vgId]->name ?? "VG$vgId", $usedVatgroups);
+
+        $invoiceData = [
+            'invoice_date' => $invoiceDate,
+            'owner_id' => $address->id,
+            'billingaddress_id' => $address->id,
+            'customer_number' => $address->customer_number ?: 0,
+            'company' => $address->company ?: '',
+            'firstname' => $address->firstname ?: '',
+            'lastname' => $address->lastname ?: '',
+            'street' => $address->street ?: '',
+            'zip' => $address->zip ?: '',
+            'city' => $address->city ?: '',
+            'country' => 'Österreich',
+            'email' => $address->email ?: '',
+            'uid' => $address->uid ?: '',
+            'fibu_account_number' => $address->fibu_account_number ?: 0,
+            'fibu_payment_due' => $address->fibu_payment_due ?: 14,
+            'fibu_payment_skonto' => $address->fibu_payment_skonto ?: 0,
+            'fibu_payment_skonto_rate' => $address->fibu_payment_skonto_rate ?: 0,
+            'fibu_cost_area' => $vatarea,
+            'fibu_cost_account' => $fibuCostAccount,
+            'fibu_cost_account_legacy' => $fibuCostAccountLegacy,
+            'fibu_taxcode' => $fibuTaxcode,
+            'billing_type' => $address->billing_type ?: 'invoice',
+            'bank_account_bank' => $address->bank_account_bank ?: '',
+            'bank_account_owner' => $address->bank_account_owner ?: '',
+            'bank_account_iban' => $address->bank_account_iban ?: '',
+            'bank_account_bic' => $address->bank_account_bic ?: '',
+            'sepa_date' => $address->sepa_date ? (is_numeric($address->sepa_date) ? date('Y-m-d', $address->sepa_date) : $address->sepa_date) : null,
+            'performance_period' => date('m/Y', $invoiceDate),
+            'introductory_text' => "Mixed VAT group test (" . implode(' + ', $vatgroupNames) . ") in '{$regionData['name']}'",
+            'external_reference' => "TEST-MIXED-{$regionKey}-{$i}",
+            'total_discount' => $totalDiscount,
+            'vatgroup_id' => $primaryVatgroupId,
+            'tax_text' => $taxText
+        ];
+
+        $result = createInvoice($db, $invoiceData);
+        $invoiceId = $result['id'];
+        $invoiceNumber = $result['invoice_number'];
+
+        if (!$invoiceId) { echo "[Mixed] [{$regionData['name']}] #{$i}: ERROR\n"; $errors++; continue; }
+
+        $total = 0;
+        $totalGross = 0;
+        foreach ($positions as $pos) {
+            createPosition($db, $invoiceId, $pos);
+            $total += $pos['price_total'];
+            $totalGross += $pos['price_gross'];
+        }
+
+        $db->query("UPDATE ManualInvoice SET total = " . round($total, 2) . ", total_gross = " . round($totalGross, 2) . " WHERE id = $invoiceId");
+
+        $journalText = $db->escape("Mixed VAT group test invoice (" . implode(', ', $vatgroupNames) . ", {$regionData['name']})");
+        $db->query("INSERT INTO ManualInvoiceJournal (manualinvoiceId, text, statusChange, createBy, `create`) VALUES ($invoiceId, '$journalText', 'erstellt', 1, " . time() . ")");
+
+        $customerName = trim(($address->company ?: '') . ' ' . ($address->firstname ?: '') . ' ' . ($address->lastname ?: '')) ?: 'Unknown';
+        echo "[Mixed] [{$regionData['name']}] #{$i}: {$invoiceNumber} - {$customerName} - " . count($positions) . " pos - " . number_format($total, 2) . " EUR\n";
+        $totalCreated++;
+    }
+}
+
+echo "\n========================================\n";
+echo "Complete! Created: {$totalCreated} invoices, Errors: {$errors}\n";
+echo "========================================\n";

From 6a85d4a98050cc1cb6b016e41500426fa599472b Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Wed, 28 Jan 2026 10:12:16 +0100
Subject: [PATCH 80/88] improve and add dashboard

---
 Layout/default/menu.php                       |   2 +-
 .../WorkorderAdminController.php              |   1 +
 .../WorkorderBase/WorkorderBaseController.php |  45 +++
 .../WorkorderDashboardController.php          | 295 ++++++++++++++++++
 .../WorkorderTenantConfigController.php       |   1 +
 .../WorkorderTenantConfigModel.php            |   1 +
 ...0260128074700_add_auto_complete_filter.php |  36 +++
 .../WorkorderDashboard/WorkorderDashboard.css | 135 ++++++++
 .../WorkorderDashboard/WorkorderDashboard.js  | 276 ++++++++++++++++
 9 files changed, 791 insertions(+), 1 deletion(-)
 create mode 100644 application/WorkorderDashboard/WorkorderDashboardController.php
 create mode 100644 db/migrations/20260128074700_add_auto_complete_filter.php
 create mode 100644 public/js/pages/WorkorderDashboard/WorkorderDashboard.css
 create mode 100644 public/js/pages/WorkorderDashboard/WorkorderDashboard.js

diff --git a/Layout/default/menu.php b/Layout/default/menu.php
index 82ce59296..7061bab1a 100644
--- a/Layout/default/menu.php
+++ b/Layout/default/menu.php
@@ -141,9 +141,9 @@
               <?php if($me->is(["Admin","netowner","pipeplanner","pipeplanner"]) && $me->is("employee")): ?><li><a href="<?=self::getUrl("FiberPlanDispatcher")?>"><i class="fas fa-building-circle-arrow-right text-info"></i> Verteiler und Schächte</a></li><?php endif; ?>
               <?php if($me->is(["Admin","netowner","lineplanner","lineworker"]) && $me->is("employee")): ?><li><a href="<?=self::getUrl("FiberPlanPipe")?>"><i class="fas fa-pipe text-info pl-1"></i> Rohrverzeichnis</a></li><?php endif; ?>
             <?php if($me->is(["Admin","netowner","lineplanner","lineworker"]) && $me->is("employee")): ?><li><a href="<?=self::getUrl("FiberPlanCable")?>"><i class="fa-solid fa-timeline text-info "></i> Kabelverzeichnis</a></li><?php endif; ?>
-<!--                add a new line Arbeitsaufträge for RMLCompany, add a new line Arbeitsaufträge-Management for RMLAdmin -->
                 <?php if($me->can("RMLCompany")): ?><li><a href="<?=self::getUrl("WorkorderCompany")?>"><i class="far fa-fw fa-clipboard-question text-info"></i> Arbeitsaufträge</a></li><?php endif; ?>
                 <?php if($me->can("RMLAdmin")): ?><li><a href="<?=self::getUrl("WorkorderAdmin")?>"><i class="far fa-fw fa-clipboard-question text-info"></i> Arbeitsaufträge-Management</a></li><?php endif; ?>
+                <?php if($me->can("RMLAdmin")): ?><li><a href="<?=self::getUrl("WorkorderDashboard")?>"><i class="far fa-fw fa-chart-line text-info"></i> Arbeitsaufträge-Dashboard</a></li><?php endif; ?>
                 <?php if($me->can("WorkorderMph")): ?><li><a href="<?=self::getUrl("WorkorderMphCompany")?>"><i class="far fa-fw fa-buildings text-info"></i> MPH Arbeitsaufträge</a></li><?php endif; ?>
                 <?php if($me->can("WorkorderMphAdmin")): ?><li><a href="<?=self::getUrl("WorkorderMphAdmin")?>"><i class="far fa-fw fa-buildings text-info"></i> MPH Arbeitsaufträge Verwaltung</a></li><?php endif; ?>
             </ul>
diff --git a/application/WorkorderAdmin/WorkorderAdminController.php b/application/WorkorderAdmin/WorkorderAdminController.php
index c0771036f..40259cb0b 100644
--- a/application/WorkorderAdmin/WorkorderAdminController.php
+++ b/application/WorkorderAdmin/WorkorderAdminController.php
@@ -54,6 +54,7 @@ class WorkorderAdminController extends WorkorderBaseController
     public function indexAction()
     {
         $this->createWorkordersFromPreorders();
+        $this->autoCompleteDocumentedWorkorders();
         $this->archiveWorkorders();
         parent::indexAction();
     }
diff --git a/application/WorkorderBase/WorkorderBaseController.php b/application/WorkorderBase/WorkorderBaseController.php
index 68e2066d0..8fac50f33 100644
--- a/application/WorkorderBase/WorkorderBaseController.php
+++ b/application/WorkorderBase/WorkorderBaseController.php
@@ -283,5 +283,50 @@ class WorkorderBaseController extends TTCrud
         }
         file_put_contents($lockFile, time());
     }
+
+    protected function autoCompleteDocumentedWorkorders()
+    {
+        $lockFile = TEMP_DIR . "/task_auto_complete_workorders.lock";
+        if (file_exists($lockFile) && (time() - intval(file_get_contents($lockFile))) < 300) return;
+
+        foreach (WorkorderTenantConfigModel::getAll() as $config) {
+            $filter = json_decode($config->autoCompleteFilter ?? '', true);
+            if (empty($filter)) continue;
+
+            $networks = NetworkModel::search(['owner_id' => $config->addressId]);
+            if (empty($networks)) continue;
+
+            $networkIds = array_map(fn($n) => $n->id, $networks);
+            $campaignIds = array_map(fn($c) => $c->id, PreordercampaignModel::search(['network_id' => $networkIds]));
+            if (empty($campaignIds)) continue;
+
+            $filter['preordercampaign_id'] = $campaignIds;
+            $matchingPreorders = PreorderModel::searchActive($filter);
+            if (empty($matchingPreorders)) continue;
+
+            $preorderIds = array_map(fn($p) => $p->id, $matchingPreorders);
+            $preorderIdSet = array_flip($preorderIds);
+
+            $workorders = WorkorderModel::getAll([
+                'status' => ['new', 'assigned', 'scheduled', 'in_progress', 'correction_requested', 'intervention_required', 'civil_engineering_required', 'civil_engineering_completed', 'problem_solved', 'documented', 'archived'],
+                'preorderId' => $preorderIds
+            ]);
+
+            foreach ($workorders as $workorder) {
+                if (!isset($preorderIdSet[$workorder->preorderId])) continue;
+                $oldStatus = $workorder->status;
+                $workorder->status = 'completed';
+                WorkorderModel::update((array)$workorder);
+                WorkorderJournalModel::create([
+                    'workorderId' => $workorder->id,
+                    'text' => 'Dokumentation automatisch akzeptiert (Auto-Complete Filter).',
+                    'statusChange' => $this->getStatusText($oldStatus) . " -> " . $this->getStatusText('completed'),
+                    'create' => time(),
+                    'createBy' => 1,
+                ]);
+            }
+        }
+        file_put_contents($lockFile, time());
+    }
     //endregion
 }
diff --git a/application/WorkorderDashboard/WorkorderDashboardController.php b/application/WorkorderDashboard/WorkorderDashboardController.php
new file mode 100644
index 000000000..ccb654cf2
--- /dev/null
+++ b/application/WorkorderDashboard/WorkorderDashboardController.php
@@ -0,0 +1,295 @@
+<?php
+
+class WorkorderDashboardController extends TTCrud
+{
+    protected string $headerTitle = 'Arbeitsaufträge Dashboard';
+    protected bool $createText = false;
+    protected array $columns = [];
+    protected array $permissionCheck = ['RMLAdmin'];
+    protected array $additionalHead = [
+        "<link rel='stylesheet' href='/js/pages/WorkorderDashboard/WorkorderDashboard.css'>",
+        "<script src='https://cdn.jsdelivr.net/npm/chart.js'></script>",
+        "<script src='https://cdn.jsdelivr.net/npm/moment@2.29.4/moment.min.js'></script>",
+        "<script src='https://cdn.jsdelivr.net/npm/chartjs-adapter-moment@1.0.1/dist/chartjs-adapter-moment.min.js'></script>"
+    ];
+
+    protected array $statusLabels = [
+        'new' => 'Neu', 'assigned' => 'Zugewiesen', 'scheduled' => 'Geplant', 'in_progress' => 'In Bearbeitung',
+        'correction_requested' => 'Korrektur angefordert', 'intervention_required' => 'Eingriff erforderlich',
+        'civil_engineering_required' => 'Tiefbau benötigt', 'civil_engineering_completed' => 'Tiefbau abgeschlossen',
+        'problem_solved' => 'Problem gelöst', 'documented' => 'Dokumentiert', 'completed' => 'Abgeschlossen',
+        'charged' => 'Verrechnet', 'cancelled' => 'Abgebrochen', 'archived' => 'Archiviert',
+    ];
+
+    protected array $statusColors = [
+        'new' => '#3b82f6', 'assigned' => '#06b6d4', 'scheduled' => '#8b5cf6', 'in_progress' => '#f59e0b',
+        'correction_requested' => '#ef4444', 'intervention_required' => '#dc2626', 'civil_engineering_required' => '#ea580c',
+        'civil_engineering_completed' => '#65a30d', 'problem_solved' => '#22c55e', 'documented' => '#14b8a6',
+        'completed' => '#10b981', 'charged' => '#8b5cf6', 'cancelled' => '#6b7280', 'archived' => '#9ca3af',
+    ];
+
+    protected function indexAction()
+    {
+        $this->layout()->set('additionalHead', $this->additionalHead);
+        Helper::renderVue($this, 'WorkorderDashboard', $this->headerTitle, []);
+    }
+
+    protected function getFilterOptionsAction()
+    {
+        $tenants = WorkorderTenantConfigModel::getAll([], null, 0, ['key' => 'name', 'order' => 'ASC']);
+        $companies = WorkorderCompanyModel::getAll([], null, 0, ['key' => 'name', 'order' => 'ASC']);
+
+        self::returnJson([
+            'tenants' => array_map(fn($t) => ['value' => $t->id, 'text' => $t->name], $tenants),
+            'companies' => array_map(fn($c) => ['value' => $c->id, 'text' => $c->name], $companies),
+            'statuses' => array_map(fn($key, $label) => ['value' => $key, 'text' => $label], array_keys($this->statusLabels), $this->statusLabels),
+            'campaigns' => []
+        ]);
+    }
+
+    protected function getCampaignsForTenantAction()
+    {
+        $tenantId = $this->postData['tenantId'] ?? null;
+        if (!$tenantId || !($config = WorkorderTenantConfigModel::get($tenantId))) {
+            self::returnJson([]);
+            return;
+        }
+
+        $networks = NetworkModel::search(['owner_id' => $config->addressId]);
+        if (empty($networks)) {
+            self::returnJson([]);
+            return;
+        }
+
+        $campaigns = PreordercampaignModel::search(['network_id' => array_map(fn($n) => $n->id, $networks)]);
+        $options = array_map(fn($c) => ['value' => $c->id, 'text' => $c->name], $campaigns);
+        usort($options, fn($a, $b) => strcmp($a['text'], $b['text']));
+        self::returnJson($options);
+    }
+
+    protected function getDashboardDataAction()
+    {
+        $tenantId = $this->postData['tenantId'] ?? null;
+        $dateFrom = $this->postData['dateFrom'] ?? null;
+        $dateTo = $this->postData['dateTo'] ?? null;
+        $companyIds = $this->postData['companyIds'] ?? [];
+        $statuses = $this->postData['statuses'] ?? [];
+        $campaignIds = $this->postData['campaignIds'] ?? [];
+
+        if (!$tenantId) self::sendError('Mandant muss ausgewählt werden.');
+        $config = WorkorderTenantConfigModel::get($tenantId);
+        if (!$config) self::sendError('Mandant nicht gefunden.');
+
+        $networks = NetworkModel::search(['owner_id' => $config->addressId]);
+        $tenantCampaignIds = array_map(fn($c) => $c->id, PreordercampaignModel::search(['network_id' => array_map(fn($n) => $n->id, $networks)]));
+
+        if (empty($tenantCampaignIds)) {
+            self::returnJson($this->getEmptyDashboardData());
+            return;
+        }
+
+        if (!empty($campaignIds)) $tenantCampaignIds = array_intersect($tenantCampaignIds, $campaignIds);
+
+        $db = FronkDB::singleton();
+        $whereConditions = ["p.preordercampaign_id IN (" . implode(',', $tenantCampaignIds) . ")"];
+        if ($dateFrom) $whereConditions[] = "w.`create` >= " . intval($dateFrom);
+        if ($dateTo) $whereConditions[] = "w.`create` <= " . intval($dateTo);
+        if (!empty($companyIds)) $whereConditions[] = "w.companyId IN (" . implode(',', array_map('intval', $companyIds)) . ")";
+        if (!empty($statuses)) $whereConditions[] = "w.status IN (" . implode(',', array_map(fn($s) => "'" . $db->escape($s) . "'", $statuses)) . ")";
+        $whereClause = implode(' AND ', $whereConditions);
+
+        self::returnJson([
+            'kpis' => $this->getKPIs($db, $whereClause, $tenantCampaignIds, $dateFrom, $dateTo),
+            'statusDistribution' => $this->getStatusDistribution($db, $whereClause),
+            'companyPerformance' => $this->getCompanyPerformance($db, $whereClause),
+            'timeTrends' => $this->getTimeTrends($db, $tenantCampaignIds, $dateFrom, $dateTo, $companyIds),
+            'companyStatusCampaign' => $this->getCompanyStatusCampaign($db, $whereClause),
+            'interventionRates' => $this->getInterventionRates($db, $whereClause),
+            'statusTransitions' => $this->getStatusTransitions($db, $tenantCampaignIds, $dateFrom, $dateTo),
+        ]);
+    }
+
+    private function getKPIs($db, $whereClause, $tenantCampaignIds, $dateFrom, $dateTo): array
+    {
+        $total = $db->query("SELECT COUNT(*) as c FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id WHERE $whereClause")->fetch_assoc()['c'] ?? 0;
+        $completed = $db->query("SELECT COUNT(*) as c FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id WHERE $whereClause AND w.status IN ('completed', 'charged')")->fetch_assoc()['c'] ?? 0;
+        $pending = $db->query("SELECT COUNT(*) as c FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id WHERE $whereClause AND w.status IN ('new', 'assigned', 'scheduled', 'in_progress', 'documented')")->fetch_assoc()['c'] ?? 0;
+        $issues = $db->query("SELECT COUNT(*) as c FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id WHERE $whereClause AND w.status IN ('intervention_required', 'correction_requested')")->fetch_assoc()['c'] ?? 0;
+
+        return [
+            'total' => (int)$total,
+            'completed' => (int)$completed,
+            'pending' => (int)$pending,
+            'issues' => (int)$issues,
+            'interventionRate' => $total > 0 ? round(($issues / $total) * 100, 1) : 0,
+            'avgCompletionDays' => $this->calculateAvgCompletionTime($db, $tenantCampaignIds),
+        ];
+    }
+
+    private function calculateAvgCompletionTime($db, $tenantCampaignIds): ?float
+    {
+        $sql = "SELECT w.id,
+                MIN(CASE WHEN wj.statusChange LIKE '%Zugewiesen%' OR wj.statusChange LIKE '%-> Zugewiesen' THEN wj.`create` END) as assigned_time,
+                MIN(CASE WHEN wj.statusChange LIKE '%-> Abgeschlossen%' THEN wj.`create` END) as completed_time
+                FROM thetool.Workorder w
+                JOIN thetool.Preorder p ON w.preorderId = p.id
+                JOIN thetool.WorkorderJournal wj ON w.id = wj.workorderId
+                WHERE p.preordercampaign_id IN (" . implode(',', $tenantCampaignIds) . ") AND w.status IN ('completed', 'charged')
+                GROUP BY w.id HAVING assigned_time IS NOT NULL AND completed_time IS NOT NULL";
+
+        $result = $db->query($sql);
+        $totalDays = $count = 0;
+        while ($row = $result->fetch_assoc()) {
+            if ($row['completed_time'] > $row['assigned_time']) {
+                $totalDays += ($row['completed_time'] - $row['assigned_time']) / 86400;
+                $count++;
+            }
+        }
+        return $count > 0 ? round($totalDays / $count, 1) : null;
+    }
+
+    private function getStatusDistribution($db, $whereClause): array
+    {
+        $result = $db->query("SELECT w.status, COUNT(*) as count FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id WHERE $whereClause GROUP BY w.status ORDER BY count DESC");
+        $distribution = [];
+        while ($row = $result->fetch_assoc()) {
+            $distribution[] = [
+                'status' => $row['status'],
+                'label' => $this->statusLabels[$row['status']] ?? $row['status'],
+                'count' => (int)$row['count'],
+                'color' => $this->statusColors[$row['status']] ?? '#6b7280',
+            ];
+        }
+        return $distribution;
+    }
+
+    private function getCompanyPerformance($db, $whereClause): array
+    {
+        $sql = "SELECT wc.name as company, wc.id as companyId,
+                SUM(CASE WHEN w.status IN ('completed', 'charged') THEN 1 ELSE 0 END) as completed,
+                SUM(CASE WHEN w.status IN ('new', 'assigned', 'scheduled', 'in_progress', 'documented') THEN 1 ELSE 0 END) as pending,
+                SUM(CASE WHEN w.status IN ('intervention_required', 'correction_requested') THEN 1 ELSE 0 END) as issues,
+                COUNT(*) as total
+                FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id
+                LEFT JOIN thetool.WorkorderCompany wc ON w.companyId = wc.id
+                WHERE $whereClause AND w.companyId IS NOT NULL GROUP BY wc.id, wc.name ORDER BY total DESC";
+
+        $result = $db->query($sql);
+        $performance = [];
+        while ($row = $result->fetch_assoc()) {
+            $performance[] = [
+                'company' => $row['company'] ?? 'Nicht zugewiesen',
+                'companyId' => (int)$row['companyId'],
+                'completed' => (int)$row['completed'],
+                'pending' => (int)$row['pending'],
+                'issues' => (int)$row['issues'],
+                'total' => (int)$row['total'],
+            ];
+        }
+        return $performance;
+    }
+
+    private function getTimeTrends($db, $tenantCampaignIds, $dateFrom, $dateTo, $companyIds): array
+    {
+        $where = ["p.preordercampaign_id IN (" . implode(',', $tenantCampaignIds) . ")"];
+        if ($dateFrom) $where[] = "w.`create` >= " . intval($dateFrom);
+        if ($dateTo) $where[] = "w.`create` <= " . intval($dateTo);
+        if (!empty($companyIds)) $where[] = "w.companyId IN (" . implode(',', array_map('intval', $companyIds)) . ")";
+
+        $sql = "SELECT DATE(FROM_UNIXTIME(w.`create`)) as date, COUNT(*) as created,
+                SUM(CASE WHEN w.status IN ('completed', 'charged') THEN 1 ELSE 0 END) as completed
+                FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id
+                WHERE " . implode(' AND ', $where) . " GROUP BY DATE(FROM_UNIXTIME(w.`create`)) ORDER BY date ASC";
+
+        $result = $db->query($sql);
+        $trends = [];
+        while ($row = $result->fetch_assoc()) {
+            $trends[] = ['date' => $row['date'], 'created' => (int)$row['created'], 'completed' => (int)$row['completed']];
+        }
+        return $trends;
+    }
+
+    private function getCompanyStatusCampaign($db, $whereClause): array
+    {
+        $sql = "SELECT wc.name as company, w.status, pc.name as campaign, COUNT(*) as count
+                FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id
+                JOIN thetool.Preordercampaign pc ON p.preordercampaign_id = pc.id
+                LEFT JOIN thetool.WorkorderCompany wc ON w.companyId = wc.id
+                WHERE $whereClause AND w.companyId IS NOT NULL
+                GROUP BY wc.name, w.status, pc.name ORDER BY wc.name, count DESC";
+
+        $result = $db->query($sql);
+        $data = [];
+        while ($row = $result->fetch_assoc()) {
+            $key = ($row['company'] ?? 'Nicht zugewiesen') . '|' . $row['status'];
+            if (!isset($data[$key])) {
+                $data[$key] = [
+                    'company' => $row['company'] ?? 'Nicht zugewiesen',
+                    'status' => $row['status'],
+                    'statusLabel' => $this->statusLabels[$row['status']] ?? $row['status'],
+                    'count' => 0,
+                    'campaigns' => [],
+                ];
+            }
+            $data[$key]['count'] += (int)$row['count'];
+            $data[$key]['campaigns'][] = ['name' => $row['campaign'], 'count' => (int)$row['count']];
+        }
+
+        $result = array_values($data);
+        usort($result, fn($a, $b) => $b['count'] - $a['count']);
+        return $result;
+    }
+
+    private function getInterventionRates($db, $whereClause): array
+    {
+        $sql = "SELECT wc.name as company, COUNT(*) as total,
+                SUM(CASE WHEN w.status = 'intervention_required' THEN 1 ELSE 0 END) as interventions,
+                SUM(CASE WHEN w.status = 'correction_requested' THEN 1 ELSE 0 END) as corrections
+                FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id
+                LEFT JOIN thetool.WorkorderCompany wc ON w.companyId = wc.id
+                WHERE $whereClause AND w.companyId IS NOT NULL GROUP BY wc.name
+                HAVING COUNT(*) >= 5 ORDER BY (SUM(CASE WHEN w.status IN ('intervention_required', 'correction_requested') THEN 1 ELSE 0 END) / COUNT(*)) DESC";
+
+        $result = $db->query($sql);
+        $rates = [];
+        while ($row = $result->fetch_assoc()) {
+            $total = (int)$row['total'];
+            $issueCount = (int)$row['interventions'] + (int)$row['corrections'];
+            $rates[] = [
+                'company' => $row['company'] ?? 'Nicht zugewiesen',
+                'total' => $total,
+                'interventions' => (int)$row['interventions'],
+                'corrections' => (int)$row['corrections'],
+                'rate' => $total > 0 ? round(($issueCount / $total) * 100, 1) : 0,
+            ];
+        }
+        return $rates;
+    }
+
+    private function getStatusTransitions($db, $tenantCampaignIds, $dateFrom, $dateTo): array
+    {
+        $where = ["p.preordercampaign_id IN (" . implode(',', $tenantCampaignIds) . ")", "wj.statusChange IS NOT NULL"];
+        if ($dateFrom) $where[] = "wj.`create` >= " . intval($dateFrom);
+        if ($dateTo) $where[] = "wj.`create` <= " . intval($dateTo);
+
+        $sql = "SELECT wj.statusChange, COUNT(*) as count FROM thetool.WorkorderJournal wj
+                JOIN thetool.Workorder w ON wj.workorderId = w.id JOIN thetool.Preorder p ON w.preorderId = p.id
+                WHERE " . implode(' AND ', $where) . " GROUP BY wj.statusChange ORDER BY count DESC LIMIT 15";
+
+        $result = $db->query($sql);
+        $transitions = [];
+        while ($row = $result->fetch_assoc()) {
+            $transitions[] = ['transition' => $row['statusChange'], 'count' => (int)$row['count']];
+        }
+        return $transitions;
+    }
+
+    private function getEmptyDashboardData(): array
+    {
+        return [
+            'kpis' => ['total' => 0, 'completed' => 0, 'pending' => 0, 'issues' => 0, 'interventionRate' => 0, 'avgCompletionDays' => null],
+            'statusDistribution' => [], 'companyPerformance' => [], 'timeTrends' => [],
+            'companyStatusCampaign' => [], 'interventionRates' => [], 'statusTransitions' => [],
+        ];
+    }
+}
diff --git a/application/WorkorderTenantConfig/WorkorderTenantConfigController.php b/application/WorkorderTenantConfig/WorkorderTenantConfigController.php
index 8a7dc0099..064fd2787 100644
--- a/application/WorkorderTenantConfig/WorkorderTenantConfigController.php
+++ b/application/WorkorderTenantConfig/WorkorderTenantConfigController.php
@@ -20,6 +20,7 @@ class WorkorderTenantConfigController extends TTCrud {
         $data['interventionTypes'] = json_encode($data['interventionTypes'] ?? []);
         $data['workorderCreationFilters'] ??= '{}';
         $data['workorderActiveFilters'] ??= '{}';
+        $data['autoCompleteFilter'] ??= null;
 
         if (empty($data['id'])) {
             $data['create'] = time();
diff --git a/application/WorkorderTenantConfig/WorkorderTenantConfigModel.php b/application/WorkorderTenantConfig/WorkorderTenantConfigModel.php
index 3386d18dc..723830a83 100644
--- a/application/WorkorderTenantConfig/WorkorderTenantConfigModel.php
+++ b/application/WorkorderTenantConfig/WorkorderTenantConfigModel.php
@@ -8,6 +8,7 @@ class WorkorderTenantConfigModel extends TTCrudBaseModel {
     public string $documentationTypes; // JSON
     public string $workorderCreationFilters; // JSON
     public ?string $workorderActiveFilters; // JSON
+    public ?string $autoCompleteFilter; // JSON
     public ?string $interventionTypes; // JSON
     public int $civilEngineeringDocsRequired;
     public int $requireCableLength;
diff --git a/db/migrations/20260128074700_add_auto_complete_filter.php b/db/migrations/20260128074700_add_auto_complete_filter.php
new file mode 100644
index 000000000..cb95ef5d5
--- /dev/null
+++ b/db/migrations/20260128074700_add_auto_complete_filter.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class AddAutoCompleteFilter extends AbstractMigration
+{
+    public function up(): void
+    {
+        if ($this->getEnvironment() !== 'thetool') {
+            return;
+        }
+
+        $workorderTenantConfigTable = $this->table('WorkorderTenantConfig');
+        if (!$workorderTenantConfigTable->hasColumn('autoCompleteFilter'))
+            $workorderTenantConfigTable->addColumn('autoCompleteFilter', 'text', [
+                'null' => true,
+                'default' => null,
+                'limit' => \Phinx\Db\Adapter\MysqlAdapter::TEXT_LONG,
+                'after' => 'workorderActiveFilters',
+            ])
+                ->save();
+    }
+
+    public function down(): void
+    {
+        if ($this->getEnvironment() !== 'thetool') {
+            return;
+        }
+
+        $workorderTenantConfigTable = $this->table('WorkorderTenantConfig');
+        if ($workorderTenantConfigTable->hasColumn('autoCompleteFilter'))
+            $workorderTenantConfigTable->removeColumn('autoCompleteFilter')->save();
+    }
+}
diff --git a/public/js/pages/WorkorderDashboard/WorkorderDashboard.css b/public/js/pages/WorkorderDashboard/WorkorderDashboard.css
new file mode 100644
index 000000000..7aad806cb
--- /dev/null
+++ b/public/js/pages/WorkorderDashboard/WorkorderDashboard.css
@@ -0,0 +1,135 @@
+.tt-scope.workorder-dashboard {
+    --wd-primary: #4f46e5; --wd-primary-light: #6366f1;
+    --wd-success: #10b981; --wd-success-light: #34d399;
+    --wd-warning: #f59e0b; --wd-warning-light: #fbbf24;
+    --wd-danger: #ef4444; --wd-danger-light: #f87171;
+    --wd-info: #06b6d4; --wd-info-light: #22d3ee;
+    --wd-gray: #6b7280; --wd-gray-light: #9ca3af;
+    --wd-card-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06);
+    --wd-card-shadow-hover: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05);
+    --wd-card-radius: 12px; --wd-card-radius-sm: 8px;
+    padding: 0; min-height: 100vh;
+    background: linear-gradient(135deg, #f5f7fa 0%, #e4e8ec 100%);
+}
+
+.tt-scope.workorder-dashboard .filter-bar {
+    background: white; padding: 1rem 1.5rem; border-bottom: 1px solid #e5e7eb;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05); position: sticky; top: 0; z-index: 100;
+}
+.tt-scope.workorder-dashboard .filter-bar__inner { display: flex; flex-wrap: wrap; gap: 1rem; align-items: flex-end; }
+.tt-scope.workorder-dashboard .filter-bar__inner > .form-group { margin-bottom: 0; }
+.tt-scope.workorder-dashboard .filter-bar .tt-select { min-width: 200px; }
+.tt-scope.workorder-dashboard .filter-bar .tt-select:first-child { min-width: 220px; }
+.tt-scope.workorder-dashboard .filter-bar .form-group input[type="text"] { min-width: 240px; }
+.tt-scope.workorder-dashboard .filter-bar .refresh-btn { height: 31px; margin-bottom: 0; align-self: flex-end; }
+
+.tt-scope.workorder-dashboard .refresh-btn {
+    display: flex; align-items: center; gap: 0.5rem; padding: 0.5rem 1rem;
+    background: linear-gradient(135deg, var(--wd-primary), var(--wd-primary-light));
+    border: none; border-radius: var(--wd-card-radius-sm); color: white; font-weight: 500;
+    transition: transform 0.2s, box-shadow 0.2s;
+}
+.tt-scope.workorder-dashboard .refresh-btn:hover:not(:disabled) { transform: translateY(-1px); box-shadow: 0 4px 12px rgba(79, 70, 229, 0.4); }
+.tt-scope.workorder-dashboard .refresh-btn:disabled { opacity: 0.6; cursor: not-allowed; }
+
+.tt-scope.workorder-dashboard .dashboard-content { padding: 1.5rem; display: flex; flex-direction: column; gap: 1.5rem; }
+
+.tt-scope.workorder-dashboard .kpi-row { display: grid; grid-template-columns: repeat(auto-fit, minmax(200px, 1fr)); gap: 1rem; }
+.tt-scope.workorder-dashboard .kpi-card {
+    display: flex; align-items: center; gap: 1rem; padding: 1.25rem;
+    border-radius: var(--wd-card-radius); box-shadow: var(--wd-card-shadow);
+    color: white; transition: transform 0.2s, box-shadow 0.2s;
+}
+.tt-scope.workorder-dashboard .kpi-card:hover { transform: translateY(-2px); box-shadow: var(--wd-card-shadow-hover); }
+.tt-scope.workorder-dashboard .kpi-card--primary { background: linear-gradient(135deg, var(--wd-primary), var(--wd-primary-light)); }
+.tt-scope.workorder-dashboard .kpi-card--success { background: linear-gradient(135deg, var(--wd-success), var(--wd-success-light)); }
+.tt-scope.workorder-dashboard .kpi-card--warning { background: linear-gradient(135deg, var(--wd-warning), var(--wd-warning-light)); }
+.tt-scope.workorder-dashboard .kpi-card--danger { background: linear-gradient(135deg, var(--wd-danger), var(--wd-danger-light)); }
+.tt-scope.workorder-dashboard .kpi-card--info { background: linear-gradient(135deg, var(--wd-info), var(--wd-info-light)); }
+.tt-scope.workorder-dashboard .kpi-card__icon {
+    width: 48px; height: 48px; display: flex; align-items: center; justify-content: center;
+    background: rgba(255, 255, 255, 0.2); border-radius: 50%; font-size: 1.25rem;
+}
+.tt-scope.workorder-dashboard .kpi-card__content { flex: 1; }
+.tt-scope.workorder-dashboard .kpi-card__value { font-size: 1.75rem; font-weight: 700; line-height: 1.2; }
+.tt-scope.workorder-dashboard .kpi-card__title { font-size: 0.875rem; font-weight: 500; opacity: 0.9; }
+.tt-scope.workorder-dashboard .kpi-card__subtitle { font-size: 0.75rem; opacity: 0.75; margin-top: 0.25rem; }
+
+.tt-scope.workorder-dashboard .charts-row { display: grid; grid-template-columns: 1fr 2fr; gap: 1.5rem; }
+.tt-scope.workorder-dashboard .analytics-row { display: grid; grid-template-columns: 1fr 1fr; gap: 1.5rem; }
+@media (max-width: 1024px) { .tt-scope.workorder-dashboard .charts-row, .tt-scope.workorder-dashboard .analytics-row { grid-template-columns: 1fr; } }
+
+.tt-scope.workorder-dashboard .chart-card {
+    background: white; border-radius: var(--wd-card-radius); box-shadow: var(--wd-card-shadow);
+    padding: 1.5rem; transition: box-shadow 0.2s;
+}
+.tt-scope.workorder-dashboard .chart-card:hover { box-shadow: var(--wd-card-shadow-hover); }
+.tt-scope.workorder-dashboard .chart-card--wide { grid-column: span 1; }
+.tt-scope.workorder-dashboard .chart-card--full { width: 100%; }
+.tt-scope.workorder-dashboard .chart-card__title {
+    display: flex; align-items: center; gap: 0.5rem; font-size: 1rem; font-weight: 600;
+    color: #1f2937; margin: 0 0 1rem 0; padding-bottom: 0.75rem; border-bottom: 1px solid #f3f4f6;
+}
+.tt-scope.workorder-dashboard .chart-card__title i { color: var(--wd-primary); }
+
+.tt-scope.workorder-dashboard .chart-wrapper { height: 250px; position: relative; }
+.tt-scope.workorder-dashboard .chart-wrapper--large { height: 300px; }
+.tt-scope.workorder-dashboard .chart-wrapper--wide { height: 200px; }
+
+.tt-scope.workorder-dashboard .detail-table-wrapper { overflow-x: auto; max-height: 400px; overflow-y: auto; }
+.tt-scope.workorder-dashboard .detail-table { width: 100%; border-collapse: collapse; font-size: 0.875rem; }
+.tt-scope.workorder-dashboard .detail-table th {
+    position: sticky; top: 0; background: #f9fafb; padding: 0.75rem 1rem;
+    text-align: left; font-weight: 600; color: #374151; border-bottom: 2px solid #e5e7eb;
+}
+.tt-scope.workorder-dashboard .detail-table td { padding: 0.75rem 1rem; border-bottom: 1px solid #f3f4f6; vertical-align: top; }
+.tt-scope.workorder-dashboard .detail-table tr:hover td { background: #f9fafb; }
+.tt-scope.workorder-dashboard .company-cell { font-weight: 500; color: #1f2937; }
+.tt-scope.workorder-dashboard .count-cell { font-weight: 600; color: var(--wd-primary); }
+.tt-scope.workorder-dashboard .campaigns-cell { display: flex; flex-wrap: wrap; gap: 0.5rem; }
+.tt-scope.workorder-dashboard .campaign-tag { display: inline-block; padding: 0.25rem 0.5rem; background: #f3f4f6; border-radius: 4px; font-size: 0.75rem; color: #4b5563; }
+
+.tt-scope.workorder-dashboard .status-badge {
+    display: inline-block; padding: 0.25rem 0.75rem; border-radius: 9999px;
+    font-size: 0.75rem; font-weight: 500; text-transform: uppercase; letter-spacing: 0.025em;
+}
+.tt-scope.workorder-dashboard .status-badge--completed, .tt-scope.workorder-dashboard .status-badge--charged { background: rgba(16, 185, 129, 0.1); color: #059669; }
+.tt-scope.workorder-dashboard .status-badge--assigned, .tt-scope.workorder-dashboard .status-badge--new { background: rgba(59, 130, 246, 0.1); color: #2563eb; }
+.tt-scope.workorder-dashboard .status-badge--scheduled, .tt-scope.workorder-dashboard .status-badge--in_progress { background: rgba(245, 158, 11, 0.1); color: #d97706; }
+.tt-scope.workorder-dashboard .status-badge--intervention_required, .tt-scope.workorder-dashboard .status-badge--correction_requested { background: rgba(239, 68, 68, 0.1); color: #dc2626; }
+.tt-scope.workorder-dashboard .status-badge--documented, .tt-scope.workorder-dashboard .status-badge--problem_solved { background: rgba(20, 184, 166, 0.1); color: #0d9488; }
+.tt-scope.workorder-dashboard .status-badge--archived, .tt-scope.workorder-dashboard .status-badge--cancelled { background: rgba(107, 114, 128, 0.1); color: #4b5563; }
+
+.tt-scope.workorder-dashboard .intervention-rates { display: flex; flex-direction: column; gap: 0.375rem; max-height: 300px; overflow-y: auto; }
+.tt-scope.workorder-dashboard .intervention-rate-item { display: flex; align-items: center; gap: 0.75rem; padding: 0.375rem 0.5rem; background: #f9fafb; border-radius: var(--wd-card-radius-sm); }
+.tt-scope.workorder-dashboard .intervention-rate-item .company-name { flex: 0 0 120px; font-weight: 500; font-size: 0.8125rem; color: #1f2937; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+.tt-scope.workorder-dashboard .intervention-rate-item__bar { flex: 1; height: 6px; background: #e5e7eb; border-radius: 3px; overflow: hidden; min-width: 60px; }
+.tt-scope.workorder-dashboard .intervention-rate-item__bar .bar-fill { height: 100%; border-radius: 3px; transition: width 0.5s ease; }
+.tt-scope.workorder-dashboard .intervention-rate-item__bar .bar-fill.rate--success { background: var(--wd-success); }
+.tt-scope.workorder-dashboard .intervention-rate-item__bar .bar-fill.rate--warning { background: var(--wd-warning); }
+.tt-scope.workorder-dashboard .intervention-rate-item__bar .bar-fill.rate--danger { background: var(--wd-danger); }
+.tt-scope.workorder-dashboard .intervention-rate-item .rate-value { flex: 0 0 50px; font-weight: 600; font-size: 0.8125rem; text-align: right; }
+.tt-scope.workorder-dashboard .intervention-rate-item .rate-value.rate--success { color: var(--wd-success); }
+.tt-scope.workorder-dashboard .intervention-rate-item .rate-value.rate--warning { color: var(--wd-warning); }
+.tt-scope.workorder-dashboard .intervention-rate-item .rate-value.rate--danger { color: var(--wd-danger); }
+.tt-scope.workorder-dashboard .intervention-rate-item__details { flex: 0 0 auto; display: flex; gap: 0.5rem; font-size: 0.6875rem; color: var(--wd-gray); }
+
+.tt-scope.workorder-dashboard .transitions-list { display: flex; flex-direction: column; gap: 0.5rem; max-height: 300px; overflow-y: auto; }
+.tt-scope.workorder-dashboard .transition-item { display: flex; justify-content: space-between; align-items: center; padding: 0.5rem 0.75rem; background: #f9fafb; border-radius: var(--wd-card-radius-sm); font-size: 0.875rem; }
+.tt-scope.workorder-dashboard .transition-label { color: #374151; }
+.tt-scope.workorder-dashboard .transition-count { font-weight: 600; color: var(--wd-primary); background: rgba(79, 70, 229, 0.1); padding: 0.25rem 0.5rem; border-radius: 4px; }
+
+.tt-scope.workorder-dashboard .loading-overlay { display: flex; flex-direction: column; align-items: center; justify-content: center; padding: 4rem; color: var(--wd-gray); }
+.tt-scope.workorder-dashboard .spinner { width: 48px; height: 48px; border: 3px solid #e5e7eb; border-top-color: var(--wd-primary); border-radius: 50%; animation: spin 1s linear infinite; margin-bottom: 1rem; }
+@keyframes spin { to { transform: rotate(360deg); } }
+.tt-scope.workorder-dashboard .empty-state { display: flex; flex-direction: column; align-items: center; justify-content: center; padding: 4rem; text-align: center; color: var(--wd-gray); }
+.tt-scope.workorder-dashboard .empty-state i { font-size: 4rem; margin-bottom: 1rem; opacity: 0.3; }
+.tt-scope.workorder-dashboard .empty-state h3 { margin: 0 0 0.5rem 0; color: #374151; }
+.tt-scope.workorder-dashboard .empty-state p { margin: 0; }
+.tt-scope.workorder-dashboard .no-data { text-align: center; padding: 2rem; color: var(--wd-gray); font-style: italic; }
+
+@media (max-width: 768px) {
+    .tt-scope.workorder-dashboard .filter-bar__inner { flex-direction: column; align-items: stretch; }
+    .tt-scope.workorder-dashboard .kpi-row { grid-template-columns: 1fr 1fr; }
+    .tt-scope.workorder-dashboard .kpi-card { flex-direction: column; text-align: center; }
+}
diff --git a/public/js/pages/WorkorderDashboard/WorkorderDashboard.js b/public/js/pages/WorkorderDashboard/WorkorderDashboard.js
new file mode 100644
index 000000000..2506dead6
--- /dev/null
+++ b/public/js/pages/WorkorderDashboard/WorkorderDashboard.js
@@ -0,0 +1,276 @@
+Vue.component('wd-kpi-card', {
+    props: {
+        title: { type: String, required: true },
+        value: { type: [Number, String], required: true },
+        icon: { type: String, default: 'fas fa-chart-bar' },
+        color: { type: String, default: 'primary' },
+        suffix: { type: String, default: '' },
+        subtitle: { type: String, default: '' }
+    },
+    template: `
+        <div class="kpi-card" :class="'kpi-card--' + color">
+            <div class="kpi-card__icon"><i :class="icon"></i></div>
+            <div class="kpi-card__content">
+                <div class="kpi-card__value">{{ value }}{{ suffix }}</div>
+                <div class="kpi-card__title">{{ title }}</div>
+                <div v-if="subtitle" class="kpi-card__subtitle">{{ subtitle }}</div>
+            </div>
+        </div>
+    `
+});
+
+Vue.component('wd-status-chart', {
+    props: { data: { type: Array, required: true } },
+    template: '<div class="chart-wrapper"><canvas ref="chart"></canvas></div>',
+    data() { return { chart: null }; },
+    mounted() { this.renderChart(); },
+    watch: { data: { handler() { this.renderChart(); }, deep: true } },
+    methods: {
+        renderChart() {
+            if (this.chart) this.chart.destroy();
+            if (!this.data || this.data.length === 0) return;
+            this.chart = new Chart(this.$refs.chart.getContext('2d'), {
+                type: 'doughnut',
+                data: {
+                    labels: this.data.map(d => d.label),
+                    datasets: [{ data: this.data.map(d => d.count), backgroundColor: this.data.map(d => d.color), borderWidth: 2, borderColor: '#fff' }]
+                },
+                options: {
+                    responsive: true, maintainAspectRatio: false, cutout: '60%',
+                    plugins: {
+                        legend: { position: 'right', labels: { padding: 15, usePointStyle: true, font: { size: 11 } } },
+                        tooltip: { callbacks: { label: (ctx) => `${ctx.label}: ${ctx.raw} (${((ctx.raw / ctx.dataset.data.reduce((a, b) => a + b, 0)) * 100).toFixed(1)}%)` } }
+                    }
+                }
+            });
+        }
+    }
+});
+
+Vue.component('wd-company-chart', {
+    props: { data: { type: Array, required: true } },
+    template: '<div class="chart-wrapper chart-wrapper--large"><canvas ref="chart"></canvas></div>',
+    data() { return { chart: null }; },
+    mounted() { this.renderChart(); },
+    watch: { data: { handler() { this.renderChart(); }, deep: true } },
+    methods: {
+        renderChart() {
+            if (this.chart) this.chart.destroy();
+            if (!this.data || this.data.length === 0) return;
+            this.chart = new Chart(this.$refs.chart.getContext('2d'), {
+                type: 'bar',
+                data: {
+                    labels: this.data.map(d => d.company),
+                    datasets: [
+                        { label: 'Abgeschlossen', data: this.data.map(d => d.completed), backgroundColor: '#10b981', borderRadius: 4 },
+                        { label: 'In Bearbeitung', data: this.data.map(d => d.pending), backgroundColor: '#f59e0b', borderRadius: 4 },
+                        { label: 'Probleme', data: this.data.map(d => d.issues), backgroundColor: '#ef4444', borderRadius: 4 }
+                    ]
+                },
+                options: {
+                    responsive: true, maintainAspectRatio: false, indexAxis: 'y',
+                    plugins: { legend: { position: 'top', labels: { usePointStyle: true } } },
+                    scales: { x: { stacked: true, grid: { display: false } }, y: { stacked: true, grid: { display: false } } }
+                }
+            });
+        }
+    }
+});
+
+Vue.component('wd-trends-chart', {
+    props: { data: { type: Array, required: true } },
+    template: '<div class="chart-wrapper chart-wrapper--wide"><canvas ref="chart"></canvas></div>',
+    data() { return { chart: null }; },
+    mounted() { this.renderChart(); },
+    watch: { data: { handler() { this.renderChart(); }, deep: true } },
+    methods: {
+        renderChart() {
+            if (this.chart) this.chart.destroy();
+            if (!this.data || this.data.length === 0) return;
+            this.chart = new Chart(this.$refs.chart.getContext('2d'), {
+                type: 'line',
+                data: {
+                    labels: this.data.map(d => d.date),
+                    datasets: [
+                        { label: 'Erstellt', data: this.data.map(d => d.created), borderColor: '#3b82f6', backgroundColor: 'rgba(59, 130, 246, 0.1)', fill: true, tension: 0.3, pointRadius: 4, pointHoverRadius: 6 },
+                        { label: 'Abgeschlossen', data: this.data.map(d => d.completed), borderColor: '#10b981', backgroundColor: 'rgba(16, 185, 129, 0.1)', fill: true, tension: 0.3, pointRadius: 4, pointHoverRadius: 6 }
+                    ]
+                },
+                options: {
+                    responsive: true, maintainAspectRatio: false,
+                    plugins: { legend: { position: 'top', labels: { usePointStyle: true } } },
+                    scales: {
+                        x: { type: 'time', time: { unit: 'day', displayFormats: { day: 'DD.MM' } }, grid: { display: false } },
+                        y: { beginAtZero: true, grid: { color: 'rgba(0,0,0,0.05)' } }
+                    }
+                }
+            });
+        }
+    }
+});
+
+Vue.component('wd-intervention-rates', {
+    props: { data: { type: Array, required: true } },
+    template: `
+        <div class="intervention-rates">
+            <div v-for="item in data" :key="item.company" class="intervention-rate-item">
+                <span class="company-name" :title="item.company">{{ item.company }}</span>
+                <div class="intervention-rate-item__bar">
+                    <div class="bar-fill" :style="{ width: Math.min(item.rate * 2, 100) + '%' }" :class="getRateClass(item.rate)"></div>
+                </div>
+                <span class="rate-value" :class="getRateClass(item.rate)">{{ item.rate }}%</span>
+                <div class="intervention-rate-item__details"><span>{{ item.total }} Ges.</span></div>
+            </div>
+            <div v-if="data.length === 0" class="no-data">Keine Daten verfügbar</div>
+        </div>
+    `,
+    methods: {
+        getRateClass(rate) { return rate >= 20 ? 'rate--danger' : rate >= 10 ? 'rate--warning' : 'rate--success'; }
+    }
+});
+
+Vue.component('workorder-dashboard', {
+    template: `
+        <div class="tt-scope workorder-dashboard">
+            <div class="filter-bar">
+                <div class="filter-bar__inner">
+                    <tt-select sm label="Mandant" :value="selectedTenant" :options="[{value: '', text: 'Bitte wählen...'}, ...filterOptions.tenants]" @input="onTenantChange" />
+                    <tt-date-picker sm label="Zeitraum" :value="dateRange" :date-range="true" :time-picker="false" @input="onDateRangeChange" />
+                    <tt-select sm label="Firma" :value="selectedCompany" :options="[{value: '', text: 'Alle'}, ...filterOptions.companies]" @input="selectedCompany = $event; onFilterChange()" />
+                    <tt-select sm label="Status" :value="selectedStatus" :options="[{value: '', text: 'Alle'}, ...filterOptions.statuses]" @input="selectedStatus = $event; onFilterChange()" />
+                    <tt-select sm label="Kampagne" :value="selectedCampaign" :options="[{value: '', text: 'Alle'}, ...filterOptions.campaigns]" @input="selectedCampaign = $event; onFilterChange()" />
+                    <button class="btn btn-primary btn-sm refresh-btn" @click="fetchDashboardData" :disabled="!selectedTenant || loading">
+                        <i class="fas fa-sync-alt" :class="{ 'fa-spin': loading }"></i> Aktualisieren
+                    </button>
+                </div>
+            </div>
+            <div v-if="loading" class="loading-overlay"><div class="spinner"></div><p>Dashboard wird geladen...</p></div>
+            <div v-else-if="!selectedTenant" class="empty-state">
+                <i class="fas fa-building"></i>
+                <h3>Bitte wählen Sie einen Mandanten aus</h3>
+                <p>Wählen Sie oben einen Mandanten, um das Dashboard anzuzeigen.</p>
+            </div>
+            <div v-else class="dashboard-content">
+                <div v-if="kpis" class="kpi-row">
+                    <wd-kpi-card title="Gesamt" :value="kpis.total || 0" icon="fas fa-clipboard-list" color="primary" />
+                    <wd-kpi-card title="Abgeschlossen" :value="kpis.completed || 0" icon="fas fa-check-circle" color="success" />
+                    <wd-kpi-card title="In Bearbeitung" :value="kpis.pending || 0" icon="fas fa-clock" color="warning" />
+                    <wd-kpi-card title="Problemrate" :value="kpis.interventionRate || 0" suffix="%" icon="fas fa-exclamation-triangle" color="danger" :subtitle="(kpis.issues || 0) + ' Probleme'" />
+                    <wd-kpi-card title="Ø Bearbeitungszeit" :value="kpis.avgCompletionDays || '-'" :suffix="kpis.avgCompletionDays ? ' Tage' : ''" icon="fas fa-hourglass-half" color="info" />
+                </div>
+                <div class="charts-row">
+                    <div class="chart-card">
+                        <h3 class="chart-card__title"><i class="fas fa-chart-pie"></i> Status-Verteilung</h3>
+                        <wd-status-chart :data="statusDistribution" />
+                    </div>
+                    <div class="chart-card chart-card--wide">
+                        <h3 class="chart-card__title"><i class="fas fa-building"></i> Firmen-Performance</h3>
+                        <wd-company-chart :data="companyPerformance" />
+                    </div>
+                </div>
+                <div class="chart-card chart-card--full">
+                    <h3 class="chart-card__title"><i class="fas fa-chart-line"></i> Zeitlicher Verlauf</h3>
+                    <wd-trends-chart :data="timeTrends" />
+                </div>
+                <div class="chart-card chart-card--full">
+                    <h3 class="chart-card__title"><i class="fas fa-table"></i> Firma → Status → Kampagne (Detailansicht)</h3>
+                    <div class="detail-table-wrapper">
+                        <table class="detail-table">
+                            <thead><tr><th>Firma</th><th>Status</th><th>Anzahl</th><th>Kampagnen-Aufschlüsselung</th></tr></thead>
+                            <tbody>
+                                <tr v-for="(row, index) in companyStatusCampaign" :key="index">
+                                    <td class="company-cell">{{ row.company }}</td>
+                                    <td><span class="status-badge" :class="'status-badge--' + row.status">{{ row.statusLabel }}</span></td>
+                                    <td class="count-cell">{{ row.count }}</td>
+                                    <td class="campaigns-cell"><span v-for="(c, i) in row.campaigns" :key="i" class="campaign-tag">{{ c.name }}: {{ c.count }}</span></td>
+                                </tr>
+                                <tr v-if="companyStatusCampaign.length === 0"><td colspan="4" class="no-data">Keine Daten verfügbar</td></tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+                <div class="analytics-row">
+                    <div class="chart-card">
+                        <h3 class="chart-card__title"><i class="fas fa-exclamation-circle"></i> Problemquote pro Firma</h3>
+                        <wd-intervention-rates :data="interventionRates" />
+                    </div>
+                    <div class="chart-card">
+                        <h3 class="chart-card__title"><i class="fas fa-exchange-alt"></i> Häufigste Status-Übergänge</h3>
+                        <div class="transitions-list">
+                            <div v-for="(t, index) in statusTransitions" :key="index" class="transition-item">
+                                <span class="transition-label">{{ t.transition }}</span>
+                                <span class="transition-count">{{ t.count }}</span>
+                            </div>
+                            <div v-if="statusTransitions.length === 0" class="no-data">Keine Daten verfügbar</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    `,
+    data() {
+        return {
+            selectedTenant: '', dateRange: null, selectedCompany: '', selectedStatus: '', selectedCampaign: '',
+            filterOptions: { tenants: [], companies: [], statuses: [], campaigns: [] },
+            kpis: null, statusDistribution: [], companyPerformance: [], timeTrends: [],
+            companyStatusCampaign: [], interventionRates: [], statusTransitions: [],
+            loading: false
+        };
+    },
+    async mounted() {
+        const today = new Date();
+        today.setHours(23, 59, 59, 0);
+        const threeMonthsAgo = new Date(today);
+        threeMonthsAgo.setMonth(threeMonthsAgo.getMonth() - 3);
+        threeMonthsAgo.setHours(0, 0, 0, 0);
+        this.dateRange = { from: Math.floor(threeMonthsAgo.getTime() / 1000), to: Math.floor(today.getTime() / 1000) };
+        await this.fetchFilterOptions();
+    },
+    methods: {
+        async fetchFilterOptions() {
+            try {
+                const response = await axios.get(`${window.TT_CONFIG['BASE_URL']}/getFilterOptions`);
+                this.filterOptions.tenants = response.data.tenants;
+                this.filterOptions.companies = response.data.companies;
+                this.filterOptions.statuses = response.data.statuses;
+            } catch (error) { console.error('Error fetching filter options:', error); }
+        },
+        async onTenantChange(tenantId) {
+            this.selectedTenant = tenantId;
+            this.selectedCampaign = '';
+            if (tenantId) {
+                try {
+                    const response = await axios.post(`${window.TT_CONFIG['BASE_URL']}/getCampaignsForTenant`, { tenantId });
+                    this.filterOptions.campaigns = response.data;
+                } catch (error) { console.error('Error fetching campaigns:', error); }
+                await this.fetchDashboardData();
+            }
+        },
+        onDateRangeChange(range) { this.dateRange = range; this.onFilterChange(); },
+        onFilterChange() { if (this.selectedTenant) this.fetchDashboardData(); },
+        async fetchDashboardData() {
+            if (!this.selectedTenant) return;
+            this.loading = true;
+            try {
+                const response = await axios.post(`${window.TT_CONFIG['BASE_URL']}/getDashboardData`, {
+                    tenantId: this.selectedTenant,
+                    dateFrom: this.dateRange?.from || null,
+                    dateTo: this.dateRange?.to || null,
+                    companyIds: this.selectedCompany ? [this.selectedCompany] : [],
+                    statuses: this.selectedStatus ? [this.selectedStatus] : [],
+                    campaignIds: this.selectedCampaign ? [this.selectedCampaign] : []
+                });
+                this.kpis = response.data.kpis;
+                this.statusDistribution = response.data.statusDistribution;
+                this.companyPerformance = response.data.companyPerformance;
+                this.timeTrends = response.data.timeTrends;
+                this.companyStatusCampaign = response.data.companyStatusCampaign;
+                this.interventionRates = response.data.interventionRates;
+                this.statusTransitions = response.data.statusTransitions;
+            } catch (error) {
+                console.error('Error fetching dashboard data:', error);
+                alert('Fehler beim Laden der Dashboard-Daten.');
+            } finally { this.loading = false; }
+        }
+    }
+});

From e4561dbd7f391c656eae8b3d323096ca6543dc73 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Wed, 28 Jan 2026 10:24:14 +0100
Subject: [PATCH 81/88] fixed permissions

---
 .../WorkorderDashboardController.php                  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/application/WorkorderDashboard/WorkorderDashboardController.php b/application/WorkorderDashboard/WorkorderDashboardController.php
index ccb654cf2..ed0b0bef1 100644
--- a/application/WorkorderDashboard/WorkorderDashboardController.php
+++ b/application/WorkorderDashboard/WorkorderDashboardController.php
@@ -36,7 +36,11 @@ class WorkorderDashboardController extends TTCrud
 
     protected function getFilterOptionsAction()
     {
-        $tenants = WorkorderTenantConfigModel::getAll([], null, 0, ['key' => 'name', 'order' => 'ASC']);
+        if ($this->me->isAdmin()) {
+            $tenants = WorkorderTenantConfigModel::getAll([], null, 0, ['key' => 'name', 'order' => 'ASC']);
+        } else {
+            $tenants = WorkorderTenantConfigModel::getAll(['addressId' => $this->me->address_id], null, 0, ['key' => 'name', 'order' => 'ASC']);
+        }
         $companies = WorkorderCompanyModel::getAll([], null, 0, ['key' => 'name', 'order' => 'ASC']);
 
         self::returnJson([
@@ -54,6 +58,10 @@ class WorkorderDashboardController extends TTCrud
             self::returnJson([]);
             return;
         }
+        if (!$this->me->isAdmin() && $config->addressId != $this->me->address_id) {
+            self::returnJson([]);
+            return;
+        }
 
         $networks = NetworkModel::search(['owner_id' => $config->addressId]);
         if (empty($networks)) {
@@ -79,6 +87,7 @@ class WorkorderDashboardController extends TTCrud
         if (!$tenantId) self::sendError('Mandant muss ausgewählt werden.');
         $config = WorkorderTenantConfigModel::get($tenantId);
         if (!$config) self::sendError('Mandant nicht gefunden.');
+        if (!$this->me->isAdmin() && $config->addressId != $this->me->address_id) self::sendError('Keine Berechtigung für diesen Mandanten.');
 
         $networks = NetworkModel::search(['owner_id' => $config->addressId]);
         $tenantCampaignIds = array_map(fn($c) => $c->id, PreordercampaignModel::search(['network_id' => array_map(fn($n) => $n->id, $networks)]));

From 5a6bf351b2a2954a5cad6226716ddcee09b89c7f Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Wed, 28 Jan 2026 10:31:07 +0100
Subject: [PATCH 82/88] fixed permissions

---
 .../WorkorderDashboard/WorkorderDashboardController.php   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/WorkorderDashboard/WorkorderDashboardController.php b/application/WorkorderDashboard/WorkorderDashboardController.php
index ed0b0bef1..8f2fe61f6 100644
--- a/application/WorkorderDashboard/WorkorderDashboardController.php
+++ b/application/WorkorderDashboard/WorkorderDashboardController.php
@@ -36,10 +36,10 @@ class WorkorderDashboardController extends TTCrud
 
     protected function getFilterOptionsAction()
     {
-        if ($this->me->isAdmin()) {
+        if ($this->user->isAdmin()) {
             $tenants = WorkorderTenantConfigModel::getAll([], null, 0, ['key' => 'name', 'order' => 'ASC']);
         } else {
-            $tenants = WorkorderTenantConfigModel::getAll(['addressId' => $this->me->address_id], null, 0, ['key' => 'name', 'order' => 'ASC']);
+            $tenants = WorkorderTenantConfigModel::getAll(['addressId' => $this->user->address_id], null, 0, ['key' => 'name', 'order' => 'ASC']);
         }
         $companies = WorkorderCompanyModel::getAll([], null, 0, ['key' => 'name', 'order' => 'ASC']);
 
@@ -58,7 +58,7 @@ class WorkorderDashboardController extends TTCrud
             self::returnJson([]);
             return;
         }
-        if (!$this->me->isAdmin() && $config->addressId != $this->me->address_id) {
+        if (!$this->user->isAdmin() && $config->addressId != $this->user->address_id) {
             self::returnJson([]);
             return;
         }
@@ -87,7 +87,7 @@ class WorkorderDashboardController extends TTCrud
         if (!$tenantId) self::sendError('Mandant muss ausgewählt werden.');
         $config = WorkorderTenantConfigModel::get($tenantId);
         if (!$config) self::sendError('Mandant nicht gefunden.');
-        if (!$this->me->isAdmin() && $config->addressId != $this->me->address_id) self::sendError('Keine Berechtigung für diesen Mandanten.');
+        if (!$this->user->isAdmin() && $config->addressId != $this->user->address_id) self::sendError('Keine Berechtigung für diesen Mandanten.');
 
         $networks = NetworkModel::search(['owner_id' => $config->addressId]);
         $tenantCampaignIds = array_map(fn($c) => $c->id, PreordercampaignModel::search(['network_id' => array_map(fn($n) => $n->id, $networks)]));

From a3bd470fcc56735804e5d2d644d5d648b8d47b73 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Wed, 28 Jan 2026 11:41:56 +0100
Subject: [PATCH 83/88] changed dashboard

---
 .../WorkorderDashboardController.php                   | 10 +++++-----
 .../js/pages/WorkorderDashboard/WorkorderDashboard.js  |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/WorkorderDashboard/WorkorderDashboardController.php b/application/WorkorderDashboard/WorkorderDashboardController.php
index 8f2fe61f6..204609ee8 100644
--- a/application/WorkorderDashboard/WorkorderDashboardController.php
+++ b/application/WorkorderDashboard/WorkorderDashboardController.php
@@ -121,14 +121,14 @@ class WorkorderDashboardController extends TTCrud
     private function getKPIs($db, $whereClause, $tenantCampaignIds, $dateFrom, $dateTo): array
     {
         $total = $db->query("SELECT COUNT(*) as c FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id WHERE $whereClause")->fetch_assoc()['c'] ?? 0;
-        $completed = $db->query("SELECT COUNT(*) as c FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id WHERE $whereClause AND w.status IN ('completed', 'charged')")->fetch_assoc()['c'] ?? 0;
-        $pending = $db->query("SELECT COUNT(*) as c FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id WHERE $whereClause AND w.status IN ('new', 'assigned', 'scheduled', 'in_progress', 'documented')")->fetch_assoc()['c'] ?? 0;
+        $offen = $db->query("SELECT COUNT(*) as c FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id WHERE $whereClause AND w.status NOT IN ('completed', 'charged', 'archived')")->fetch_assoc()['c'] ?? 0;
+        $terminisiert = $db->query("SELECT COUNT(*) as c FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id WHERE $whereClause AND w.status NOT IN ('completed', 'charged', 'archived') AND w.appointmentDate IS NOT NULL")->fetch_assoc()['c'] ?? 0;
         $issues = $db->query("SELECT COUNT(*) as c FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id WHERE $whereClause AND w.status IN ('intervention_required', 'correction_requested')")->fetch_assoc()['c'] ?? 0;
 
         return [
             'total' => (int)$total,
-            'completed' => (int)$completed,
-            'pending' => (int)$pending,
+            'offen' => (int)$offen,
+            'terminisiert' => (int)$terminisiert,
             'issues' => (int)$issues,
             'interventionRate' => $total > 0 ? round(($issues / $total) * 100, 1) : 0,
             'avgCompletionDays' => $this->calculateAvgCompletionTime($db, $tenantCampaignIds),
@@ -296,7 +296,7 @@ class WorkorderDashboardController extends TTCrud
     private function getEmptyDashboardData(): array
     {
         return [
-            'kpis' => ['total' => 0, 'completed' => 0, 'pending' => 0, 'issues' => 0, 'interventionRate' => 0, 'avgCompletionDays' => null],
+            'kpis' => ['total' => 0, 'offen' => 0, 'terminisiert' => 0, 'issues' => 0, 'interventionRate' => 0, 'avgCompletionDays' => null],
             'statusDistribution' => [], 'companyPerformance' => [], 'timeTrends' => [],
             'companyStatusCampaign' => [], 'interventionRates' => [], 'statusTransitions' => [],
         ];
diff --git a/public/js/pages/WorkorderDashboard/WorkorderDashboard.js b/public/js/pages/WorkorderDashboard/WorkorderDashboard.js
index 2506dead6..5a9adb5f5 100644
--- a/public/js/pages/WorkorderDashboard/WorkorderDashboard.js
+++ b/public/js/pages/WorkorderDashboard/WorkorderDashboard.js
@@ -153,8 +153,8 @@ Vue.component('workorder-dashboard', {
             <div v-else class="dashboard-content">
                 <div v-if="kpis" class="kpi-row">
                     <wd-kpi-card title="Gesamt" :value="kpis.total || 0" icon="fas fa-clipboard-list" color="primary" />
-                    <wd-kpi-card title="Abgeschlossen" :value="kpis.completed || 0" icon="fas fa-check-circle" color="success" />
-                    <wd-kpi-card title="In Bearbeitung" :value="kpis.pending || 0" icon="fas fa-clock" color="warning" />
+                    <wd-kpi-card title="Offen" :value="kpis.offen || 0" icon="fas fa-folder-open" color="warning" />
+                    <wd-kpi-card title="Terminisiert" :value="kpis.terminisiert || 0" icon="fas fa-calendar-check" color="success" />
                     <wd-kpi-card title="Problemrate" :value="kpis.interventionRate || 0" suffix="%" icon="fas fa-exclamation-triangle" color="danger" :subtitle="(kpis.issues || 0) + ' Probleme'" />
                     <wd-kpi-card title="Ø Bearbeitungszeit" :value="kpis.avgCompletionDays || '-'" :suffix="kpis.avgCompletionDays ? ' Tage' : ''" icon="fas fa-hourglass-half" color="info" />
                 </div>

From a5c82bbf2483a046f8c22c21e93630e3b44d4af3 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Wed, 28 Jan 2026 22:50:16 +0100
Subject: [PATCH 84/88] initial commit api Investigator

---
 .../Api/v1/InvestigatorApicontroller.php      | 176 ++++++++++++++++++
 application/Radius/RadiusController.php       | 107 +++++++++--
 2 files changed, 265 insertions(+), 18 deletions(-)
 create mode 100644 application/Api/v1/InvestigatorApicontroller.php

diff --git a/application/Api/v1/InvestigatorApicontroller.php b/application/Api/v1/InvestigatorApicontroller.php
new file mode 100644
index 000000000..396db8eeb
--- /dev/null
+++ b/application/Api/v1/InvestigatorApicontroller.php
@@ -0,0 +1,176 @@
+<?php
+
+class InvestigatorApicontroller extends mfBaseApicontroller
+{
+    protected function init() {}
+
+    protected function registerRoutes()
+    {
+        $this->addRoute("/investigator/customer/:id", "getCustomer", "GET");
+        $this->addRoute("/investigator/customer/:id/contract", "getCustomerContract", "GET");
+        $this->addRoute("/investigator/customer/:id/cpe", "getCustomerCpe", "GET");
+        $this->addRoute("/investigator/customer/:id/address", "getCustomerAddress", "GET");
+        $this->addRoute("/investigator/search/customer", "searchCustomer", "GET");
+    }
+
+    protected function authenticated()
+    {
+        $this->registerRoutes();
+    }
+
+    public function getCustomer($customerId)
+    {
+        if (!$customerId) return mfResponse::BadRequest(['message' => 'Customer ID is required']);
+
+        $addresses = AddressModel::search(['customer_number' => $customerId]);
+        if (empty($addresses)) return mfResponse::NotFound(['message' => 'Customer not found']);
+
+        $address = $addresses[0];
+        return mfResponse::Ok([
+            'customer' => [
+                'id' => $address->id,
+                'customerNumber' => $address->customer_number,
+                'company' => $address->company,
+                'firstName' => $address->firstname,
+                'lastName' => $address->lastname,
+                'email' => $address->email,
+                'phone' => $address->phone,
+                'street' => $address->street,
+                'zip' => $address->zip,
+                'city' => $address->city,
+                'country' => $address->country,
+            ]
+        ]);
+    }
+
+    public function getCustomerContract($customerId)
+    {
+        if (!$customerId) return mfResponse::BadRequest(['message' => 'Customer ID is required']);
+
+        $addresses = AddressModel::search(['customer_number' => $customerId]);
+        if (empty($addresses)) return mfResponse::NotFound(['message' => 'Customer not found']);
+
+        $contracts = ContractModel::search(['owner_id' => $addresses[0]->id]);
+        $contractData = [];
+
+        foreach ($contracts as $contract) {
+            $contractData[] = [
+                'contractId' => $contract->contract_id,
+                'productName' => $contract->product_name,
+                'productExternal' => $contract->product_external,
+                'price' => $contract->price,
+                'billingPeriod' => $contract->billing_period,
+                'orderDate' => $contract->order_date,
+                'finishDate' => $contract->finish_date,
+                'cancelDate' => $contract->cancel_date,
+                'slaId' => $contract->sla_id,
+                'status' => $contract->cancel_date ? 'Cancelled' : ($contract->finish_date ? 'Active' : 'Pending'),
+            ];
+        }
+
+        return mfResponse::Ok([
+            'customerId' => $customerId,
+            'contractCount' => count($contractData),
+            'contracts' => $contractData,
+        ]);
+    }
+
+    public function getCustomerCpe($customerId)
+    {
+        if (!$customerId) return mfResponse::BadRequest(['message' => 'Customer ID is required']);
+
+        $addresses = AddressModel::search(['customer_number' => $customerId]);
+        if (empty($addresses)) return mfResponse::NotFound(['message' => 'Customer not found']);
+
+        $db = $this->db();
+        $sql = "SELECT cp.* FROM Cpeprovisioning cp
+                INNER JOIN `Order` o ON cp.order_id = o.id
+                WHERE o.owner_id = " . intval($addresses[0]->id) . "
+                ORDER BY cp.id DESC LIMIT 10";
+
+        $res = $db->query($sql);
+        $cpeData = [];
+
+        while ($row = $db->fetch_object($res)) {
+            $cpeData[] = [
+                'orderId' => $row->order_id ?? null,
+                'routerType' => $row->routertype ?? null,
+                'routerConfigFinished' => (bool)($row->routerconfig_finished ?? false),
+                'mac' => $row->mac ?? null,
+                'ontSerial' => $row->ont_sn ?? null,
+                'wifiSsid' => $row->wifi_ssid ?? null,
+                'wifiPasswordSet' => !empty($row->wifi_pass),
+                'vlanPublic' => $row->vlan_public ?? null,
+                'vlanNat' => $row->vlan_nat ?? null,
+                'vlanIpv6' => $row->vlan_ipv6 ?? null,
+                'shipping' => (bool)($row->shipping ?? false),
+            ];
+        }
+
+        return mfResponse::Ok([
+            'customerId' => $customerId,
+            'cpeCount' => count($cpeData),
+            'cpeProvisioning' => $cpeData,
+        ]);
+    }
+
+    public function getCustomerAddress($customerId)
+    {
+        if (!$customerId) return mfResponse::BadRequest(['message' => 'Customer ID is required']);
+
+        $addresses = AddressModel::search(['customer_number' => $customerId]);
+        if (empty($addresses)) return mfResponse::NotFound(['message' => 'Customer not found']);
+
+        $address = $addresses[0];
+        return mfResponse::Ok([
+            'customerId' => $customerId,
+            'address' => [
+                'company' => $address->company,
+                'name' => trim(($address->firstname ?? '') . ' ' . ($address->lastname ?? '')),
+                'street' => $address->street,
+                'zip' => $address->zip,
+                'city' => $address->city,
+                'country' => $address->country,
+                'email' => $address->email,
+                'phone' => $address->phone,
+            ]
+        ]);
+    }
+
+    public function searchCustomer()
+    {
+        $searchTerm = $this->get['q'] ?? '';
+        $limit = intval($this->get['limit'] ?? 10);
+
+        if (empty($searchTerm)) return mfResponse::BadRequest(['message' => 'Search term required']);
+
+        $db = $this->db();
+        $searchTerm = $db->escape($searchTerm);
+
+        $sql = "SELECT * FROM Address
+                WHERE customer_number LIKE '%$searchTerm%'
+                   OR CONCAT(firstname, ' ', lastname) LIKE '%$searchTerm%'
+                   OR company LIKE '%$searchTerm%'
+                   OR email LIKE '%$searchTerm%'
+                   OR street LIKE '%$searchTerm%'
+                LIMIT $limit";
+
+        $results = $db->queryRows($sql);
+        $customers = [];
+
+        foreach ($results as $row) {
+            $customers[] = [
+                'customerId' => $row['customer_number'],
+                'name' => trim(($row['firstname'] ?? '') . ' ' . ($row['lastname'] ?? '')) ?: $row['company'],
+                'email' => $row['email'],
+                'city' => $row['city'],
+            ];
+        }
+
+        return mfResponse::Ok([
+            'searchTerm' => $searchTerm,
+            'count' => count($customers),
+            'customers' => $customers,
+        ]);
+    }
+}
diff --git a/application/Radius/RadiusController.php b/application/Radius/RadiusController.php
index 54822e554..e39a5f6d8 100644
--- a/application/Radius/RadiusController.php
+++ b/application/Radius/RadiusController.php
@@ -4,9 +4,45 @@ use PHPMailer\PHPMailer\Exception;
 
 class RadiusController extends mfBaseController {
     private User $me;
+    private bool $isApiCall = false;
+
+    private array $apiAllowedActions = [
+        'ProxyUnsecureHTTPRequestToRadius',
+        'GenieacsRunSpeedtest',
+        'GenieacsGetSpeedtestResult',
+        'GenieacsGetDeviceByIp',
+        'GenieacsGetDeviceByMac',
+        'GenieacsRefreshDevice',
+        'GenieacsRebootDevice',
+        'GenieacsGetDeviceInfo',
+        'GenieacsPing',
+        'GenieacsRemoteAccess',
+        'GenieacsEventLog',
+        'GenieacsNetworkStructure',
+    ];
 
     protected function init(): void {
-        $this->needlogin=true;
+        $apiKey = $_SERVER['HTTP_X_API_KEY'] ?? null;
+
+        if ($apiKey && in_array($this->action, $this->apiAllowedActions)) {
+            $me = new User();
+            $me->loadByApikey($apiKey);
+
+            if ($me->id) {
+                $this->me = $me;
+                $this->isApiCall = true;
+                $this->needlogin = false;
+                if (!defined('INTERNAL_USER_ID')) {
+                    define('INTERNAL_USER_ID', $me->id);
+                }
+                header("Access-Control-Allow-Origin: *");
+                header("Access-Control-Allow-Methods: GET, POST, OPTIONS");
+                header("Access-Control-Allow-Headers: Content-Type, X-API-Key");
+                return;
+            }
+        }
+
+        $this->needlogin = true;
         $me = new User();
         $me->loadMe();
         $this->layout()->set("me", $me);
@@ -51,20 +87,32 @@ class RadiusController extends mfBaseController {
 
             $acs = $this->getGenieACS();
 
-            // Set speedtest parameters on the device
-            $acs->setParameterValues($deviceId, [
+            $resolvedId = $this->resolveDeviceId($deviceId, $acs);
+            if (!$resolvedId) self::sendError("Device not found in GenieACS");
+
+            $acs->getParameterValues($resolvedId, [
+                'InternetGatewayDevice.X_AVM-DE_SpeedtestServer.UDP.Start',
+                'InternetGatewayDevice.X_AVM-DE_SpeedtestServer.UDP.StartBidirect',
+                'InternetGatewayDevice.X_AVM-DE_SpeedtestServer.UDP.WANAccess',
+                'InternetGatewayDevice.X_AVM-DE_SpeedtestServer.UDP.Result'
+            ]);
+
+            sleep(2);
+
+            $acs->setParameterValues($resolvedId, [
                 'InternetGatewayDevice.X_AVM-DE_SpeedtestServer.UDP.Start' => 1,
                 'InternetGatewayDevice.X_AVM-DE_SpeedtestServer.UDP.StartBidirect' => 1,
                 'InternetGatewayDevice.X_AVM-DE_SpeedtestServer.UDP.WANAccess' => true
             ]);
 
-            // Get device and extract IP
-            $device = $acs->getDevice($deviceId);
-            $ip = GenieACS::getExternalIP($device);
+            sleep(3);
+
+            $device = $acs->getDevice($resolvedId);
+            $managementIp = GenieACS::getManagementIP($device);
+            $externalIp = GenieACS::getExternalIP($device);
+            $ip = $externalIp ?: $managementIp;
 
             if (!$ip) self::sendError("Could not determine device IP");
-
-            // Trigger speedtest via external API
             $url = "http://acs.xinon.at:5000/run-speedtest";
             $apiKey = "2H9zWrgxPEJL9MZ1yTGtWh16cPCu0AsQ";
             $data = json_encode(['ip' => $ip]);
@@ -84,9 +132,8 @@ class RadiusController extends mfBaseController {
 
             if ($response === false) self::sendError("Failed to connect to speedtest server");
 
-            self::returnJson(['success' => true, 'message' => 'Speedtest started']);
+            self::returnJson(['success' => true, 'message' => 'Speedtest started', 'ip' => $ip, 'serverResponse' => json_decode($response, true)]);
         } catch (Exception $e) {
-            $this->log->debug("Speedtest Error", ['error' => $e->getMessage()]);
             self::sendError("Error running speedtest: " . $e->getMessage());
         }
     }
@@ -101,11 +148,12 @@ class RadiusController extends mfBaseController {
 
             $acs = $this->getGenieACS();
 
-            // Request parameter refresh
-            $acs->getParameterValues($deviceId, ['InternetGatewayDevice.X_AVM-DE_SpeedtestServer.UDP.Result']);
+            $resolvedId = $this->resolveDeviceId($deviceId, $acs);
+            if (!$resolvedId) self::sendError("Device not found in GenieACS");
 
-            // Get device info with full data
-            $device = $acs->getDevice($deviceId);
+            $acs->getParameterValues($resolvedId, ['InternetGatewayDevice.X_AVM-DE_SpeedtestServer.UDP.Result']);
+
+            $device = $acs->getDevice($resolvedId);
 
             if (!$device) self::sendError("Device not found");
 
@@ -178,6 +226,19 @@ class RadiusController extends mfBaseController {
         return new GenieACS($host, $username, $password);
     }
 
+    private function resolveDeviceId(string $deviceId, GenieACS $acs): ?string {
+        if (strpos($deviceId, ':') !== false) {
+            $device = $acs->getDeviceByMac($deviceId);
+            if ($device) {
+                $resolvedId = GenieACS::getDeviceId($device);
+                if ($resolvedId) return $resolvedId;
+                if (isset($device['_id'])) return $device['_id'];
+            }
+            return null;
+        }
+        return $deviceId;
+    }
+
     protected function genieacsGetDeviceByIpAction() {
         try {
             $ip = $_GET['ip'] ?? null;
@@ -255,7 +316,11 @@ class RadiusController extends mfBaseController {
             if (!$deviceId) self::sendError("Device ID is required");
 
             $acs = $this->getGenieACS();
-            $acs->getParameterValues($deviceId, [
+
+            $resolvedId = $this->resolveDeviceId($deviceId, $acs);
+            if (!$resolvedId) self::sendError("Device not found in GenieACS");
+
+            $acs->getParameterValues($resolvedId, [
                 'InternetGatewayDevice.DeviceInfo.HardwareVersion',
                 'InternetGatewayDevice.DeviceInfo.SoftwareVersion',
                 'InternetGatewayDevice.WANDevice.*.WANConnectionDevice.*.WANIPConnection.*.MACAddress',
@@ -267,7 +332,7 @@ class RadiusController extends mfBaseController {
                 'InternetGatewayDevice.LANDevice.*.Hosts.Host.*.MACAddress'
             ]);
 
-            $device = $acs->getDevice($deviceId);
+            $device = $acs->getDevice($resolvedId);
 
             self::returnJson([
                 'success' => true,
@@ -373,8 +438,11 @@ class RadiusController extends mfBaseController {
             if (!$deviceId) self::sendError("Device ID is required");
 
             $acs = $this->getGenieACS();
-            $creds = $acs->createRemoteUser($deviceId);
 
+            $resolvedId = $this->resolveDeviceId($deviceId, $acs);
+            if (!$resolvedId) self::sendError("Device not found in GenieACS");
+
+            $creds = $acs->createRemoteUser($resolvedId);
             if (!$creds) self::sendError("Could not obtain credentials for FritzBox");
 
             $url = "http://acs.xinon.at:5000/read-fritz-eventlog";
@@ -425,8 +493,11 @@ class RadiusController extends mfBaseController {
             if (!$deviceId) self::sendError("Device ID is required");
 
             $acs = $this->getGenieACS();
-            $creds = $acs->createRemoteUser($deviceId);
 
+            $resolvedId = $this->resolveDeviceId($deviceId, $acs);
+            if (!$resolvedId) self::sendError("Device not found in GenieACS");
+
+            $creds = $acs->createRemoteUser($resolvedId);
             if (!$creds) self::sendError("Could not obtain credentials for FritzBox");
 
             $url = "http://acs.xinon.at:5000/read-fritz";

From 55dc9c1cee5146396cac6aa116c3163308127640 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Thu, 29 Jan 2026 10:09:16 +0100
Subject: [PATCH 85/88] added avm scanner module to radius

---
 application/Radius/RadiusController.php    | 307 +++++++++++++++++++--
 public/js/pages/Radius/Radius.js           |   7 +-
 public/js/pages/Radius/RadiusAVMScanner.js | 268 ++++++++++++++++++
 scripts/avm_scanner.php                    | 277 +++++++++++++++++++
 4 files changed, 832 insertions(+), 27 deletions(-)
 create mode 100644 public/js/pages/Radius/RadiusAVMScanner.js
 create mode 100644 scripts/avm_scanner.php

diff --git a/application/Radius/RadiusController.php b/application/Radius/RadiusController.php
index e39a5f6d8..7c8e96be3 100644
--- a/application/Radius/RadiusController.php
+++ b/application/Radius/RadiusController.php
@@ -657,47 +657,302 @@ class RadiusController extends mfBaseController {
     
     
         private function getVendor($mac) {
-    
+
             $mac = strtoupper(str_replace([':', '-', '.'], '', $mac));
-    
+
             if (strlen($mac) < 6) return null;
-    
-            
-    
+
+
+
             $path = TEMP_DIR . '/mac-vendors.csv';
-    
+
             if (!file_exists($path)) return null;
-    
-    
-    
+
+
+
             // Format as XX:XX:XX
-    
+
             $prefix = substr($mac, 0, 2) . ':' . substr($mac, 2, 2) . ':' . substr($mac, 4, 2);
-    
-            
-    
-            // Use grep for speed if available, else fallback to basic search? 
-    
+
+
+
+            // Use grep for speed if available, else fallback to basic search?
+
             // Assuming Linux env as per docker context.
-    
+
             $cmd = "grep -m 1 \"^" . $prefix . "\" " . escapeshellarg($path);
-    
+
             $output = shell_exec($cmd);
-    
-            
-    
+
+
+
             if ($output) {
-    
+
                 $parts = str_getcsv($output);
-    
+
                 if (isset($parts[1])) return $parts[1];
-    
+
             }
-    
+
             return null;
-    
+
         }
-    
+
+    // ========== AVM Scanner Methods ==========
+
+    private static $avmScannerStateFile = null;
+
+    private static $avmPrefixes = [
+        '00:04:0E', '00:15:0C', '00:1A:4F', '00:1C:4A', '00:1F:3F', '00:24:FE',
+        '04:B4:FE', '08:96:D7', '08:B6:57', '0C:72:74',
+        '1C:ED:6F',
+        '24:65:11', '2C:3A:FD', '2C:91:AB',
+        '34:31:C4', '34:81:C4', '34:E1:A9', '38:10:D5', '3C:37:12', '3C:A6:2F',
+        '44:4E:6D', '48:5D:35',
+        '50:E6:36', '5C:49:79',
+        '60:B5:8D',
+        '74:42:7F', '7C:FF:4D',
+        '80:23:95',
+        '98:9B:CB', '98:A9:65', '9C:C7:A6',
+        'B0:F2:08', 'B4:FC:7D', 'BC:05:43',
+        'C0:25:06', 'C8:0E:14', 'CC:CE:1E',
+        'D0:12:CB', 'D4:24:DD', 'DC:15:C8', 'DC:39:6F',
+        'E0:08:55', 'E0:28:6D', 'E8:DF:70',
+        'F0:B0:14'
+    ];
+
+    private function getAvmScannerStatePath(): string {
+        return BASEDIR . '/files/avm_scanner.json';
+    }
+
+    private function loadAvmScannerState(): array {
+        $path = $this->getAvmScannerStatePath();
+        if (file_exists($path)) {
+            $content = file_get_contents($path);
+            $state = json_decode($content, true);
+            if (is_array($state)) return $state;
+        }
+        return [
+            'scanning' => false,
+            'stopRequested' => false,
+            'progress' => ['current' => 0, 'total' => 0],
+            'currentDevice' => null,
+            'startedAt' => null,
+            'startedBy' => null,
+            'lastUpdated' => date('c'),
+            'devices' => []
+        ];
+    }
+
+    private function saveAvmScannerState(array $state): void {
+        $dir = dirname($this->getAvmScannerStatePath());
+        if (!is_dir($dir)) @mkdir($dir, 0777, true);
+        $state['lastUpdated'] = date('c');
+        file_put_contents($this->getAvmScannerStatePath(), json_encode($state, JSON_PRETTY_PRINT));
+    }
+
+    private function isAvmMac(string $mac): bool {
+        $mac = strtoupper(trim($mac));
+        $prefix = substr($mac, 0, 8);
+        return in_array($prefix, self::$avmPrefixes);
+    }
+
+    private function fetchRadiusUsersFromApi(): array {
+        $url = "http://radius.xinon.at/api.php";
+        $opts = [
+            "http" => [
+                "method" => "GET",
+                "header" => "Authorization: Basic " . base64_encode("admin:saveman"),
+                "timeout" => 120
+            ]
+        ];
+        $context = stream_context_create($opts);
+        $response = @file_get_contents($url, false, $context);
+        if ($response === false) return [];
+        $data = json_decode($response, true);
+        return is_array($data) ? $data : [];
+    }
+
+    private function fetchRadacctForUser(string $username): ?array {
+        $url = "http://radius.xinon.at/api.php?action2=fetchRadacct&username=" . urlencode($username);
+        $opts = [
+            "http" => [
+                "method" => "GET",
+                "header" => "Authorization: Basic " . base64_encode("admin:saveman"),
+                "timeout" => 10
+            ]
+        ];
+        $context = stream_context_create($opts);
+        $response = @file_get_contents($url, false, $context);
+        if ($response === false) return null;
+        $data = json_decode($response, true);
+        return is_array($data) ? $data : null;
+    }
+
+    protected function avmScannerGetStateAction() {
+        $state = $this->loadAvmScannerState();
+        header('Content-Type: application/json');
+        echo json_encode($state);
+        die();
+    }
+
+    protected function avmScannerGetUsersAction() {
+        $users = $this->fetchRadiusUsersFromApi();
+        $debug = $_GET['debug'] ?? false;
+
+        $macUsers = 0;
+        $avmMacUsers = 0;
+        $notInAcs = 0;
+        $macPrefixCounts = [];
+
+        $avmUsers = [];
+        foreach ($users as $user) {
+            $username = trim($user['username'] ?? '');
+            if (!preg_match('/^([0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}$/i', $username)) continue;
+            $macUsers++;
+
+            $prefix = strtoupper(substr($username, 0, 8));
+            $macPrefixCounts[$prefix] = ($macPrefixCounts[$prefix] ?? 0) + 1;
+
+            if (!$this->isAvmMac($username)) continue;
+            $avmMacUsers++;
+
+            $info = $user['info'] ?? '';
+            if (stripos($info, 'ACS') !== false) continue;
+            $notInAcs++;
+
+            $user['username'] = $username;
+            $avmUsers[] = $user;
+        }
+
+        if ($debug) {
+            arsort($macPrefixCounts);
+            header('Content-Type: application/json');
+            echo json_encode([
+                'totalFromApi' => count($users),
+                'macAddressUsers' => $macUsers,
+                'avmMacUsers' => $avmMacUsers,
+                'notInAcs' => $notInAcs,
+                'topMacPrefixes' => array_slice($macPrefixCounts, 0, 30, true),
+                'avmPrefixes' => self::$avmPrefixes
+            ]);
+            die();
+        }
+
+        header('Content-Type: application/json');
+        echo json_encode(['users' => $avmUsers, 'count' => count($avmUsers)]);
+        die();
+    }
+
+    protected function avmScannerStartAction() {
+        $state = $this->loadAvmScannerState();
+        if ($state['scanning']) {
+            header('Content-Type: application/json');
+            echo json_encode(['success' => false, 'message' => 'Scan already running']);
+            die();
+        }
+
+        // Count how many users will be scanned (for immediate feedback)
+        $users = $this->fetchRadiusUsersFromApi();
+        $count = 0;
+        foreach ($users as $user) {
+            $username = trim($user['username'] ?? '');
+            if (!preg_match('/^([0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}$/i', $username)) continue;
+            if (!$this->isAvmMac($username)) continue;
+            $info = $user['info'] ?? '';
+            if (stripos($info, 'ACS') !== false) continue;
+            $count++;
+        }
+
+        // Spawn background script using nohup to ensure it runs independently
+        $scriptPath = BASEDIR . '/scripts/avm_scanner.php';
+        $logPath = BASEDIR . '/files/avm_scanner.log';
+        $cmd = "nohup php " . escapeshellarg($scriptPath) . " >> " . escapeshellarg($logPath) . " 2>&1 &";
+        shell_exec($cmd);
+
+        header('Content-Type: application/json');
+        echo json_encode(['success' => true, 'message' => 'Scan started', 'total' => $count]);
+        die();
+    }
+
+    protected function avmScannerStopAction() {
+        $state = $this->loadAvmScannerState();
+        $state['stopRequested'] = true;
+        $this->saveAvmScannerState($state);
+        header('Content-Type: application/json');
+        echo json_encode(['success' => true, 'message' => 'Stop requested']);
+        die();
+    }
+
+    protected function avmScannerToggleErledigtAction() {
+        $input = json_decode(file_get_contents('php://input'), true);
+        $mac = $input['mac'] ?? null;
+        if (!$mac) {
+            header('Content-Type: application/json');
+            http_response_code(400);
+            echo json_encode(['error' => 'MAC address required']);
+            die();
+        }
+
+        $state = $this->loadAvmScannerState();
+        foreach ($state['devices'] as &$device) {
+            if ($device['mac'] === $mac) {
+                $device['erledigt'] = !($device['erledigt'] ?? false);
+                break;
+            }
+        }
+        $this->saveAvmScannerState($state);
+        header('Content-Type: application/json');
+        echo json_encode(['success' => true]);
+        die();
+    }
+
+    private function detectFritzPort(string $ip): ?int {
+        $url = "https://acs.xinon.at/detect-port";
+        $data = json_encode(['fritz_ip' => $ip, 'timeout' => 3]);
+        $opts = [
+            "http" => [
+                "method" => "POST",
+                "header" => "Content-Type: application/json\r\nContent-Length: " . strlen($data) . "\r\n",
+                "content" => $data,
+                "timeout" => 15
+            ],
+            "ssl" => ["verify_peer" => false, "verify_peer_name" => false]
+        ];
+        $context = stream_context_create($opts);
+        $response = @file_get_contents($url, false, $context);
+        if ($response) {
+            $json = json_decode($response, true);
+            if ($json && $json['success'] && isset($json['port'])) {
+                return (int)$json['port'];
+            }
+        }
+        return null;
+    }
+
+    private function detectFritzDevice(string $ip, int $port): ?array {
+        $url = "https://acs.xinon.at/detect-device";
+        $data = json_encode(['fritz_ip' => $ip, 'fritz_port' => (string)$port]);
+        $opts = [
+            "http" => [
+                "method" => "POST",
+                "header" => "Content-Type: application/json\r\nContent-Length: " . strlen($data) . "\r\n",
+                "content" => $data,
+                "timeout" => 15
+            ],
+            "ssl" => ["verify_peer" => false, "verify_peer_name" => false]
+        ];
+        $context = stream_context_create($opts);
+        $response = @file_get_contents($url, false, $context);
+        if ($response) {
+            $json = json_decode($response, true);
+            if ($json && $json['success'] && isset($json['device'])) {
+                return $json['device'];
+            }
+        }
+        return null;
+    }
+
     }
     
     
\ No newline at end of file
diff --git a/public/js/pages/Radius/Radius.js b/public/js/pages/Radius/Radius.js
index f7f97cd2a..14bbb860f 100644
--- a/public/js/pages/Radius/Radius.js
+++ b/public/js/pages/Radius/Radius.js
@@ -44,6 +44,9 @@ const Radius = {
           <section v-show="view === 'ontReverse'" class="card-in">
             <radius-ont-finder />
           </section>
+          <section v-show="view === 'avmscanner'" class="card-in">
+            <radius-avm-scanner ref="avmScannerView" />
+          </section>
         </section>
       </div>
     `,
@@ -59,7 +62,8 @@ const Radius = {
             const options = [
                 { id: 'users', name: 'Benutzer', icon: 'fa-duotone fa-users' },
                 { id: 'free', name: 'Freie Benutzer', icon: 'fa-duotone fa-user-plus' },
-                { id: 'unused', name: 'Ungenutzte Benutzer', icon: 'fa-duotone fa-user-clock' }
+                { id: 'unused', name: 'Ungenutzte Benutzer', icon: 'fa-duotone fa-user-clock' },
+                { id: 'avmscanner', name: 'AVM Scanner', icon: 'fa-duotone fa-router' }
             ];
 
             if (window.TT_CONFIG.CAN_BILLING === '1') {
@@ -84,6 +88,7 @@ const Radius = {
             let refName = '';
             if (v === 'free') refName = 'freeView';
             else if (v === 'unused') refName = 'unusedView';
+            else if (v === 'avmscanner') refName = 'avmScannerView';
 
             if (refName) {
                 this.$nextTick(() => {
diff --git a/public/js/pages/Radius/RadiusAVMScanner.js b/public/js/pages/Radius/RadiusAVMScanner.js
new file mode 100644
index 000000000..e8f1e944a
--- /dev/null
+++ b/public/js/pages/Radius/RadiusAVMScanner.js
@@ -0,0 +1,268 @@
+const RadiusAVMScanner = {
+    name: 'RadiusAVMScanner',
+    template: `
+      <div class="tt-scope">
+        <div class="filters-layout" style="margin-bottom: 16px;">
+          <div class="field">
+            <div class="input-wrap">
+              <i class="fa-duotone fa-router input-icon"></i>
+              <select class="ri" v-model="deviceTypeFilter" style="padding-left: 36px;">
+                <option value="">Alle Gerätetypen</option>
+                <option v-for="dt in deviceTypes" :key="dt" :value="dt">{{ dt }}</option>
+              </select>
+            </div>
+          </div>
+          <div class="field">
+            <label class="switch-field">
+              <span class="mini muted">Erledigte anzeigen</span>
+              <span class="switch">
+                <input type="checkbox" v-model="showErledigt">
+                <span class="switch-track">
+                  <i class="fa-duotone fa-eye on"></i>
+                  <i class="fa-duotone fa-eye-slash off"></i>
+                </span>
+              </span>
+            </label>
+          </div>
+          <div class="cluster" style="gap: 8px;">
+            <button
+              class="primary-btn"
+              @click="startScan"
+              :disabled="state?.scanning"
+              v-if="!state?.scanning"
+            >
+              <i class="fa-duotone fa-play"></i> Scan starten
+            </button>
+            <button
+              class="danger-btn"
+              @click="stopScan"
+              v-if="state?.scanning"
+            >
+              <i class="fa-duotone fa-stop"></i> Scan stoppen
+            </button>
+            <button class="ghost-btn" @click="refreshState" :disabled="isLoading" data-tooltip="Aktualisieren">
+              <i class="fa-duotone fa-refresh" :class="{ 'fa-spin': isLoading }"></i>
+            </button>
+          </div>
+        </div>
+
+        <div v-if="state?.scanning" class="progress-container" style="margin-bottom: 16px;">
+          <div class="card" style="padding: 16px;">
+            <div class="cluster" style="justify-content: space-between; margin-bottom: 8px;">
+              <span class="fw-500">Scan läuft...</span>
+              <span class="mono">{{ state.progress?.current || 0 }} / {{ state.progress?.total || 0 }}</span>
+            </div>
+            <div class="progress-bar" style="height: 8px; background: var(--tt-bg-muted); border-radius: 4px; overflow: hidden;">
+              <div
+                class="progress-fill"
+                :style="{ width: progressPercent + '%', background: 'var(--tt-primary)', height: '100%', transition: 'width 0.3s' }"
+              ></div>
+            </div>
+            <div v-if="state.currentDevice" class="mt-between" style="font-size: 13px; color: var(--tt-text-muted);">
+              Aktuell: <span class="mono">{{ state.currentDevice.mac }}</span>
+              <span v-if="state.currentDevice.ip"> ({{ state.currentDevice.ip }})</span>
+            </div>
+          </div>
+        </div>
+
+        <div class="results-container">
+          <tt-data-table
+            :items="filteredDevices"
+            :is-loading="isLoading && !state"
+            :has-searched="true"
+            :skeleton-row-count="6"
+            initial-placeholder-text="Keine Geräte gescannt. Klicken Sie auf 'Scan starten'."
+          >
+            <template #head>
+              <thead>
+              <tr>
+                <th style="width: 170px;">MAC-Adresse</th>
+                <th style="width: 140px;">IP-Adresse</th>
+                <th style="width: 150px;">Kunde</th>
+                <th>Gerätetyp</th>
+                <th style="width: 80px; text-align: center;">Port</th>
+                <th style="width: 80px; text-align: center;">Erledigt</th>
+                <th style="width: 120px;">Gescannt</th>
+              </tr>
+              </thead>
+            </template>
+            <template #skeleton-row>
+              <td><tt-skeleton /></td>
+              <td><tt-skeleton /></td>
+              <td><tt-skeleton /></td>
+              <td><tt-skeleton /></td>
+              <td><tt-skeleton /></td>
+              <td><tt-skeleton /></td>
+              <td><tt-skeleton /></td>
+            </template>
+            <template #row="{ item }">
+              <td class="mono nowrap">
+                <tt-copy-button :text="item.mac" tooltip-align="right" />
+                {{ item.mac }}
+              </td>
+              <td class="mono">
+                <template v-if="item.ip">
+                  <tt-copy-button :text="item.ip" tooltip-align="right" />
+                  {{ item.ip }}
+                </template>
+                <span v-else class="muted">—</span>
+              </td>
+              <td>
+                <a
+                  v-if="item.customerId"
+                  class="link"
+                  target="_blank"
+                  :href="window.TT_CONFIG.BASE_PATH + '/Address?filter%5Bcustomer_number%5D=' + item.customerId"
+                >
+                  {{ item.customerId }}
+                </a>
+                <div v-if="item.customerName" class="mini muted clamp-1">{{ item.customerName }}</div>
+              </td>
+              <td>
+                <span v-if="item.deviceType" class="fw-500">{{ item.deviceType }}</span>
+                <span v-else-if="item.error" class="text-danger mini">{{ item.error }}</span>
+                <span v-else class="muted">—</span>
+                <div v-if="item.isRepeater" class="mini muted">Repeater</div>
+                <div v-if="item.isGateway" class="mini muted">Gateway</div>
+              </td>
+              <td class="mono" style="text-align: center;">
+                <span v-if="item.port">{{ item.port }}</span>
+                <span v-else class="muted">—</span>
+              </td>
+              <td style="text-align: center;">
+                <label class="switch">
+                  <input type="checkbox" :checked="item.erledigt" @change="toggleErledigt(item.mac)">
+                  <span class="switch-track">
+                    <i class="fa-duotone fa-check on"></i>
+                    <i class="fa-duotone fa-xmark off"></i>
+                  </span>
+                </label>
+              </td>
+              <td class="mini muted nowrap">
+                {{ formatDate(item.scannedAt) }}
+              </td>
+            </template>
+          </tt-data-table>
+
+          <div class="results-summary" style="margin-top: 12px;">
+            <span v-if="state?.devices?.length">
+              {{ filteredDevices.length }} von {{ state.devices.length }} Geräten
+              <template v-if="state.scanning"> (Scan läuft...)</template>
+            </span>
+            <span v-else class="muted">Keine Geräte</span>
+          </div>
+        </div>
+      </div>
+    `,
+    data: () => ({
+        window: window,
+        state: null,
+        isLoading: false,
+        polling: null,
+        deviceTypeFilter: '',
+        showErledigt: true
+    }),
+    computed: {
+        progressPercent() {
+            if (!this.state?.progress?.total) return 0;
+            return Math.round((this.state.progress.current / this.state.progress.total) * 100);
+        },
+        deviceTypes() {
+            if (!this.state?.devices) return [];
+            const types = new Set();
+            this.state.devices.forEach(d => {
+                if (d.deviceType) types.add(d.deviceType);
+            });
+            return Array.from(types).sort();
+        },
+        filteredDevices() {
+            if (!this.state?.devices) return [];
+            return this.state.devices.filter(d => {
+                if (this.deviceTypeFilter && d.deviceType !== this.deviceTypeFilter) return false;
+                if (!this.showErledigt && d.erledigt) return false;
+                return true;
+            });
+        }
+    },
+    methods: {
+        initIfNeeded() {
+            this.refreshState();
+        },
+        startPolling() {
+            if (this.polling) return;
+            this.polling = setInterval(() => {
+                this.refreshState(true);
+            }, 3000); // Poll every 3 seconds
+        },
+        stopPolling() {
+            if (this.polling) {
+                clearInterval(this.polling);
+                this.polling = null;
+            }
+        },
+        async refreshState(silent = false) {
+            if (!silent) this.isLoading = true;
+            try {
+                const { data } = await axios.get(`${window.TT_CONFIG.BASE_PATH}/Radius/avmScannerGetState`);
+                this.state = data;
+
+                // Start/stop polling based on scanning state
+                if (data.scanning && !this.polling) {
+                    this.startPolling();
+                } else if (!data.scanning && this.polling) {
+                    this.stopPolling();
+                }
+            } catch (e) {
+                console.error('Failed to fetch AVM scanner state:', e);
+            }
+            if (!silent) this.isLoading = false;
+        },
+        async startScan() {
+            try {
+                const { data } = await axios.post(`${window.TT_CONFIG.BASE_PATH}/Radius/avmScannerStart`);
+                if (data.success) {
+                    window.notify('success', `Scan gestartet für ${data.total} Geräte`);
+                    this.startPolling(); // Start polling immediately
+                } else {
+                    window.notify('warning', data.message || 'Scan konnte nicht gestartet werden');
+                }
+                this.refreshState();
+            } catch (e) {
+                console.error('Failed to start scan:', e);
+                window.notify('error', 'Fehler beim Starten des Scans');
+            }
+        },
+        async stopScan() {
+            try {
+                const { data } = await axios.post(`${window.TT_CONFIG.BASE_PATH}/Radius/avmScannerStop`);
+                if (data.success) {
+                    window.notify('info', 'Scan wird gestoppt...');
+                }
+            } catch (e) {
+                console.error('Failed to stop scan:', e);
+                window.notify('error', 'Fehler beim Stoppen des Scans');
+            }
+        },
+        async toggleErledigt(mac) {
+            try {
+                await axios.post(`${window.TT_CONFIG.BASE_PATH}/Radius/avmScannerToggleErledigt`, { mac });
+                this.refreshState(true);
+            } catch (e) {
+                console.error('Failed to toggle erledigt:', e);
+                window.notify('error', 'Fehler beim Aktualisieren');
+            }
+        },
+        formatDate(dateStr) {
+            if (!dateStr) return '—';
+            const d = new Date(dateStr);
+            return d.toLocaleDateString('de-DE', { day: '2-digit', month: '2-digit', hour: '2-digit', minute: '2-digit' });
+        }
+    },
+    beforeUnmount() {
+        this.stopPolling();
+    }
+};
+
+if (window.VueApp) {
+    window.VueApp.component('radius-avm-scanner', RadiusAVMScanner);
+}
diff --git a/scripts/avm_scanner.php b/scripts/avm_scanner.php
new file mode 100644
index 000000000..becb53fe5
--- /dev/null
+++ b/scripts/avm_scanner.php
@@ -0,0 +1,277 @@
+#!/usr/bin/env php
+<?php
+/**
+ * AVM Scanner Background Script
+ * Run with: php scripts/avm_scanner.php
+ */
+
+// Bootstrap the application
+require_once(__DIR__ . "/../config/config.php");
+
+define('FRONKDB_SQLDEBUG', false);
+error_reporting(E_ALL & ~(E_NOTICE | E_STRICT | E_DEPRECATED));
+
+require_once(LIBDIR . "/mvcfronk/mfRouter/mfRouter.php");
+require_once(LIBDIR . "/mvcfronk/mfBase/mfBaseModel.php");
+require_once(LIBDIR . "/mvcfronk/mfBase/mfBaseController.php");
+
+$avmPrefixes = [
+    '00:04:0E', '00:15:0C', '00:1A:4F', '00:1C:4A', '00:1F:3F', '00:24:FE',
+    '04:B4:FE', '08:96:D7', '08:B6:57', '0C:72:74',
+    '1C:ED:6F',
+    '24:65:11', '2C:3A:FD', '2C:91:AB',
+    '34:31:C4', '34:81:C4', '34:E1:A9', '38:10:D5', '3C:37:12', '3C:A6:2F',
+    '44:4E:6D', '48:5D:35',
+    '50:E6:36', '5C:49:79',
+    '60:B5:8D',
+    '74:42:7F', '7C:FF:4D',
+    '80:23:95',
+    '98:9B:CB', '98:A9:65', '9C:C7:A6',
+    'B0:F2:08', 'B4:FC:7D', 'BC:05:43',
+    'C0:25:06', 'C8:0E:14', 'CC:CE:1E',
+    'D0:12:CB', 'D4:24:DD', 'DC:15:C8', 'DC:39:6F',
+    'E0:08:55', 'E0:28:6D', 'E8:DF:70',
+    'F0:B0:14'
+];
+
+function getStatePath() {
+    return dirname(__DIR__) . '/files/avm_scanner.json';
+}
+
+function loadState() {
+    $path = getStatePath();
+    if (file_exists($path)) {
+        $content = file_get_contents($path);
+        $state = json_decode($content, true);
+        if (is_array($state)) return $state;
+    }
+    return [
+        'scanning' => false,
+        'stopRequested' => false,
+        'progress' => ['current' => 0, 'total' => 0],
+        'currentDevice' => null,
+        'startedAt' => null,
+        'startedBy' => null,
+        'lastUpdated' => date('c'),
+        'devices' => []
+    ];
+}
+
+function saveState($state) {
+    $dir = dirname(getStatePath());
+    if (!is_dir($dir)) @mkdir($dir, 0777, true);
+    $state['lastUpdated'] = date('c');
+    file_put_contents(getStatePath(), json_encode($state, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE));
+}
+
+function isAvmMac($mac) {
+    global $avmPrefixes;
+    $mac = strtoupper(trim($mac));
+    $prefix = substr($mac, 0, 8);
+    return in_array($prefix, $avmPrefixes);
+}
+
+function fetchRadiusUsers() {
+    $url = "http://radius.xinon.at/api.php";
+    $opts = [
+        "http" => [
+            "method" => "GET",
+            "header" => "Authorization: Basic " . base64_encode("admin:saveman"),
+            "timeout" => 120
+        ]
+    ];
+    $context = stream_context_create($opts);
+    $response = @file_get_contents($url, false, $context);
+    if ($response === false) return [];
+    $data = json_decode($response, true);
+    return is_array($data) ? $data : [];
+}
+
+function fetchRadacct($username) {
+    $url = "http://radius.xinon.at/api.php?action2=fetchRadacct&username=" . urlencode($username);
+    $opts = [
+        "http" => [
+            "method" => "GET",
+            "header" => "Authorization: Basic " . base64_encode("admin:saveman"),
+            "timeout" => 10
+        ]
+    ];
+    $context = stream_context_create($opts);
+    $response = @file_get_contents($url, false, $context);
+    if ($response === false) return null;
+    $data = json_decode($response, true);
+    return is_array($data) ? $data : null;
+}
+
+function detectFritzPort($ip) {
+    $url = "http://acs.xinon.at:5000/detect-port";
+    $data = json_encode(['fritz_ip' => $ip, 'timeout' => 3]);
+    $opts = [
+        "http" => [
+            "method" => "POST",
+            "header" => "Content-Type: application/json\r\nContent-Length: " . strlen($data) . "\r\n",
+            "content" => $data,
+            "timeout" => 20
+        ]
+    ];
+    $context = stream_context_create($opts);
+    $response = @file_get_contents($url, false, $context);
+    if ($response) {
+        $json = json_decode($response, true);
+        if ($json && $json['success'] && isset($json['port'])) {
+            return (int)$json['port'];
+        }
+    }
+    return null;
+}
+
+function detectFritzDevice($ip, $port) {
+    $url = "http://acs.xinon.at:5000/detect-device";
+    $data = json_encode(['fritz_ip' => $ip, 'fritz_port' => (string)$port]);
+    $opts = [
+        "http" => [
+            "method" => "POST",
+            "header" => "Content-Type: application/json\r\nContent-Length: " . strlen($data) . "\r\n",
+            "content" => $data,
+            "timeout" => 20
+        ]
+    ];
+    $context = stream_context_create($opts);
+    $response = @file_get_contents($url, false, $context);
+    if ($response) {
+        $json = json_decode($response, true);
+        if ($json && $json['success'] && isset($json['device'])) {
+            return $json['device'];
+        }
+    }
+    return null;
+}
+
+// Main execution
+echo "AVM Scanner starting...\n";
+
+$state = loadState();
+if ($state['scanning']) {
+    echo "Scan already running, exiting.\n";
+    exit(1);
+}
+
+// Fetch all users
+echo "Fetching users from RADIUS API...\n";
+$users = fetchRadiusUsers();
+echo "Got " . count($users) . " users from API\n";
+
+// Filter AVM users
+$avmUsers = [];
+foreach ($users as $user) {
+    $username = trim($user['username'] ?? '');
+    if (!preg_match('/^([0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}$/i', $username)) continue;
+    if (!isAvmMac($username)) continue;
+    $info = $user['info'] ?? '';
+    if (stripos($info, 'ACS') !== false) continue;
+    $user['username'] = $username;
+    $avmUsers[] = $user;
+}
+echo "Found " . count($avmUsers) . " AVM users to scan\n";
+
+if (count($avmUsers) === 0) {
+    echo "No users to scan, exiting.\n";
+    exit(0);
+}
+
+// Preserve existing device data (for erledigt status)
+$existingDevices = [];
+foreach ($state['devices'] ?? [] as $dev) {
+    $existingDevices[$dev['mac']] = $dev;
+}
+
+// Initialize scan state
+$state['scanning'] = true;
+$state['stopRequested'] = false;
+$state['progress'] = ['current' => 0, 'total' => count($avmUsers)];
+$state['startedAt'] = date('c');
+$state['startedBy'] = 'script';
+saveState($state);
+
+// Process each user
+foreach ($avmUsers as $idx => $user) {
+    // Check for stop request
+    $state = loadState();
+    if ($state['stopRequested']) {
+        echo "Stop requested, terminating.\n";
+        $state['scanning'] = false;
+        $state['stopRequested'] = false;
+        $state['currentDevice'] = null;
+        saveState($state);
+        exit(0);
+    }
+
+    $mac = $user['username'];
+    $customerId = $user['customerNumber'] ?? '';
+    $customerName = $user['info'] ?? '';
+
+    echo "[" . ($idx + 1) . "/" . count($avmUsers) . "] Scanning $mac...\n";
+
+    $state['progress']['current'] = $idx + 1;
+    $state['currentDevice'] = ['mac' => $mac, 'ip' => null];
+    saveState($state);
+
+    // Fetch IP from radacct
+    $radacct = fetchRadacct($mac);
+    $ip = $radacct['ip'] ?? null;
+
+    $deviceResult = [
+        'mac' => $mac,
+        'ip' => $ip,
+        'customerId' => $customerId,
+        'customerName' => $customerName,
+        'deviceType' => null,
+        'oem' => null,
+        'port' => null,
+        'isRepeater' => false,
+        'isGateway' => false,
+        'erledigt' => $existingDevices[$mac]['erledigt'] ?? false,
+        'scannedAt' => date('c'),
+        'error' => null
+    ];
+
+    if ($ip) {
+        echo "  IP: $ip - detecting port...\n";
+        $port = detectFritzPort($ip);
+        if ($port) {
+            echo "  Port: $port - detecting device...\n";
+            $deviceResult['port'] = $port;
+            $deviceInfo = detectFritzDevice($ip, $port);
+            if ($deviceInfo) {
+                $deviceResult['deviceType'] = $deviceInfo['product_name'] ?? null;
+                $deviceResult['oem'] = $deviceInfo['oem'] ?? null;
+                $deviceResult['isRepeater'] = $deviceInfo['is_repeater'] ?? false;
+                $deviceResult['isGateway'] = $deviceInfo['is_gateway'] ?? false;
+                echo "  Device: " . ($deviceResult['deviceType'] ?? 'unknown') . "\n";
+            } else {
+                echo "  Could not detect device info\n";
+            }
+        } else {
+            $deviceResult['error'] = 'No port detected';
+            echo "  No port detected\n";
+        }
+    } else {
+        $deviceResult['error'] = 'No IP address';
+        echo "  No IP address\n";
+    }
+
+    $existingDevices[$mac] = $deviceResult;
+    $state['devices'] = array_values($existingDevices);
+    saveState($state);
+
+    // Small delay between requests
+    usleep(50000);
+}
+
+// Done
+$state = loadState();
+$state['scanning'] = false;
+$state['currentDevice'] = null;
+saveState($state);
+
+echo "Scan complete!\n";

From fb4624b09aa7b5987f8d00c1dc34dad1d919605f Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Thu, 29 Jan 2026 10:19:07 +0100
Subject: [PATCH 86/88] added new cancelled status ids

---
 Layout/default/Preorder/Index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index 159f49077..2f8219386 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -891,7 +891,7 @@ $pagination_entity_name = "Vorbestellungen";
                                         <li><a class="dropdown-item" href="<?=self::getUrl("Preorder", "Index", ["filter" => ["status" => [21,22,23,24,25,930,931,932,933,934], "rimo_workorder" => 1, "rimo_workorder_status" => ["Clarify","Accepted","Plan released","Assigned","Executed","Documented","Review"]]])?>">Gelöschte Bestellungen mit Workorder</a></li>
                                         <li><a class="dropdown-item" href="<?=self::getUrl("Preorder", "Index", ["filter" => ["preorder_status_flags" => [4], "connection_type" => ["apartment", "apartment-building"], "borderpoint" => "all"]])?>">Wohnung - Verkabelung erledigt</a></li>
                                         <li><a class="dropdown-item" href="<?=self::getUrl("Preorder", "Index", ["filter" => ["status" => [1,2,3,4,5,6,7,8,9,10,11,12,13,15,16,17,18,28,34]]])?>">Offene Bestellungen Status 10-299</a></li>
-                                        <li><a class="dropdown-item" href="<?=self::getUrl("Preorder", "Index", ["filter" => ["status" => [21,22,23,24,25]]])?>">Storniert</a></li>
+                                        <li><a class="dropdown-item" href="<?=self::getUrl("Preorder", "Index", ["filter" => ["status" => [21,22,23,24,25,29,30,31,32,33]]])?>">Storniert</a></li>
                                         <?php if ($me->isAdmin() || $me->address->id == 209): ?>
                                         <li><a class="dropdown-item" href="<?=self::getUrl("Preorder", "Index", ["filter" => ["onlyShowCustomMailSent" => 1]])?>">Bestellungen mit gesendeter Custom-300 Benachrichtigung</a></li>
                                         <input type="hidden" name="filter[onlyShowCustomMailSent]" value="<?= (isset($filter['onlyShowCustomMailSent']) && $filter['onlyShowCustomMailSent'] == 1) ? 1 : 0 ?>"/>

From 47828f51f2cf602a12e66c8dc38f9e6b0f80844c Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Thu, 29 Jan 2026 10:44:03 +0100
Subject: [PATCH 87/88] added new wundschuh import

---
 .../wundschuh_import/import.php               | 124 ++++++++++
 .../wundschuh_consent_import.csv              | 212 ++++++++++++++++++
 2 files changed, 336 insertions(+)
 create mode 100644 scripts/constructionconsent/wundschuh_import/import.php
 create mode 100644 scripts/constructionconsent/wundschuh_import/wundschuh_consent_import.csv

diff --git a/scripts/constructionconsent/wundschuh_import/import.php b/scripts/constructionconsent/wundschuh_import/import.php
new file mode 100644
index 000000000..a5eeb3ba1
--- /dev/null
+++ b/scripts/constructionconsent/wundschuh_import/import.php
@@ -0,0 +1,124 @@
+<?php
+require_once(__DIR__ . "/../../../config/config.php");
+define('FRONKDB_SQLDEBUG', false);
+error_reporting(E_ALL & ~(E_NOTICE | E_STRICT | E_DEPRECATED));
+
+$dryRun = in_array('--dry-run', $argv);
+$kgMap = ['Kasten' => '63241', 'Wundschuh' => '63293'];
+
+$pdo = new PDO(
+    "mysql:host=" . FRONKDB_DBHOST . ";dbname=" . FRONKDB_DBNAME . ";charset=utf8mb4",
+    FRONKDB_DBUSER, FRONKDB_DBPASS,
+    [PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC]
+);
+
+$csvFile = __DIR__ . '/wundschuh_consent_import.csv';
+$handle = fopen($csvFile, 'r') or die("CSV not found\n");
+$cols = array_flip(fgetcsv($handle));
+
+$missingLog = fopen(__DIR__ . '/missing_consents.csv', 'w');
+fputcsv($missingLog, ['Row', 'Name', 'Address', 'GST_Numbers']);
+
+$stmt = $pdo->prepare("SELECT id, gst, kg FROM ConstructionConsent WHERE constructionconsentproject_id = 11 AND gst IS NOT NULL AND gst != ''");
+$stmt->execute();
+$consentIndex = [];
+foreach ($stmt->fetchAll() as $c) {
+    $consentIndex[$c['kg'] . '_' . $c['gst']][] = $c['id'];
+}
+
+echo "=== Wundschuh Import ===" . ($dryRun ? " [DRY RUN]" : "") . "\n";
+echo count($consentIndex) . " consent GST entries loaded\n\n";
+
+$stats = ['processed' => 0, 'created' => 0, 'skipped' => 0, 'missing' => 0];
+$rowNum = 1;
+
+while (($row = fgetcsv($handle)) !== false) {
+    $rowNum++;
+    $stats['processed']++;
+
+    $get = fn($k) => trim($row[$cols[$k]] ?? '');
+    $lastname = $get('Person_Name1');
+    $firstname = $get('Person_Name2');
+    $anrede = $get('Person_Anrede');
+    $fullName = "$firstname $lastname";
+
+    $gstStr = $get('Person_Grundstuecksnummern');
+    $gstStr = preg_replace('/^Gst\.Nr\.\s*/i', '', $gstStr);
+    preg_match_all('/([^()]+)\s*\(KG\s+([^)]+)\)/i', $gstStr, $m, PREG_SET_ORDER);
+
+    $gstList = [];
+    foreach ($m as $match) {
+        $kg = $kgMap[trim($match[2])] ?? null;
+        if (!$kg) continue;
+        foreach (explode(',', $match[1]) as $g) {
+            if ($g = trim($g)) $gstList[] = ['gst' => $g, 'kg' => $kg];
+        }
+    }
+
+    $consentIds = [];
+    foreach ($gstList as $g) {
+        foreach ($consentIndex[$g['kg'] . '_' . $g['gst']] ?? [] as $id) {
+            $consentIds[$id] = true;
+        }
+    }
+
+    if (empty($consentIds)) {
+        $addr = $get('Person_Anschrift_Straßenbezeichnung') . ' ' . $get('Person_Anschrift_Hausnummer_Von');
+        fputcsv($missingLog, [$rowNum, $fullName, trim($addr), $get('Person_Grundstuecksnummern')]);
+        $stats['missing']++;
+        echo "[$rowNum] $fullName - NO CONSENT FOUND\n";
+        continue;
+    }
+
+    $isCompany = in_array($anrede, ['Firma', 'Herrn/Frau/Firma']);
+    $street = $get('Person_Anschrift_Straßenbezeichnung');
+    $hn = $get('Person_Anschrift_Hausnummer_Von');
+    $fl = $get('Person_Anschrift_Hausnummer_Stock');
+    $dr = $get('Person_Anschrift_Hausnummer_Tuer');
+    $fullStreet = $street . ($hn ? " $hn" : '') . ($fl ? "/$fl" : '') . ($dr ? "/$dr" : '');
+
+    $bd = explode('/', $get('Person_Gebdat'));
+    $birthdate = count($bd) === 3 ? sprintf('%04d-%02d-%02d', $bd[2], $bd[0], $bd[1]) : null;
+
+    $title = $get('Person_Titelakad') ?: $get('Person_Titelakadn') ?: null;
+    $country = ['A' => 'Österreich', 'I' => 'Italien'][$get('Person_Anschrift_Staat')] ?? $get('Person_Anschrift_Staat');
+
+    $ownerData = [
+        $title,
+        $isCompany ? "$firstname $lastname" : null,
+        $isCompany ? null : $firstname,
+        $isCompany ? null : $lastname,
+        $fullStreet,
+        $get('Person_Anschrift_PLZ'),
+        $get('Person_Anschrift_Ort'),
+        $country,
+        $birthdate
+    ];
+
+    echo "[$rowNum] $fullName - " . count($consentIds) . " consent(s)";
+
+    foreach (array_keys($consentIds) as $cid) {
+        $chk = $pdo->prepare("SELECT 1 FROM ConstructionConsentOwner WHERE constructionconsent_id = ? AND ((firstname = ? AND lastname = ?) OR (company = ? AND company IS NOT NULL AND company != ''))");
+        $chk->execute([$cid, $ownerData[2], $ownerData[3], $ownerData[1]]);
+
+        if ($chk->fetch()) {
+            $stats['skipped']++;
+            continue;
+        }
+
+        if (!$dryRun) {
+            $ins = $pdo->prepare("INSERT INTO ConstructionConsentOwner (constructionconsent_id, title, company, firstname, lastname, street, zip, city, country, birthdate, status, result, create_by, edit_by, `create`, `edit`) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'new', 'open', 118, 118, UNIX_TIMESTAMP(), UNIX_TIMESTAMP())");
+            $ins->execute([$cid, ...$ownerData]);
+        }
+        $stats['created']++;
+    }
+    echo "\n";
+}
+
+fclose($handle);
+fclose($missingLog);
+
+echo "\n=== Summary ===\n";
+echo "Processed: {$stats['processed']} | Created: {$stats['created']} | Skipped: {$stats['skipped']} | Missing: {$stats['missing']}\n";
+echo "Missing consents logged to: missing_consents.csv\n";
+if ($dryRun) echo "[DRY RUN - no changes made]\n";
diff --git a/scripts/constructionconsent/wundschuh_import/wundschuh_consent_import.csv b/scripts/constructionconsent/wundschuh_import/wundschuh_consent_import.csv
new file mode 100644
index 000000000..b52e23b29
--- /dev/null
+++ b/scripts/constructionconsent/wundschuh_import/wundschuh_consent_import.csv
@@ -0,0 +1,212 @@
+Person_Anrede,Person_Name1,Person_Name2,Person_Titelakad,Person_Geschl,Person_Gebdat,Person_Titelakadn,Person_Name_mit_Titel,Person_Anschrift_Adresse,Person_Anschrift_Straßenbezeichnung,Person_Anschrift_PLZ,Person_Anschrift_Ort,Person_Anschrift_Staat,Person_Anschrift_Staat_PLZ_Ort,Person_Anschrift_PLZ_Ort,Person_Anschrift_Hausnummer_Von,Person_Anschrift_Hausnummer_Stock,Person_Anschrift_Hausnummer_Tuer,Person_Grundstuecksnummern,Person_Grundstueckgesamtflaechen,Person_GrundstueckgesamtAnteile
+Herr,Blattl,Johann,,1,8/24/1957,,Johann Blattl,Hauptstraße 173,Hauptstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,173,,,Gst.Nr. 77/3 (KG Kasten),5920,2960
+Frau,Blattl,Martina,,2,8/7/1962,,Martina Blattl,Hauptstraße 173,Hauptstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,173,,,Gst.Nr. 77/3 (KG Kasten),5920,2960
+Frau,Stoißer-Hubmann,Bettina,,2,6/23/1980,,Bettina Stoißer-Hubmann,Am Dorfplatz 8,Am Dorfplatz,8410,Wildon,A,A-8410 Wildon,8410 Wildon,8,,,Gst.Nr. 78/5 (KG Kasten),4470,2235
+Herr,Stoißer,Johannes,,1,7/4/1978,,Johannes Stoißer,Am Dorfplatz 8,Am Dorfplatz,8410,Wildon,A,A-8410 Wildon,8410 Wildon,8,,,Gst.Nr. 78/5 (KG Kasten),4470,2235
+Herr,Brunner,Hermann,,1,4/29/1957,,Hermann Brunner,Hauptstraße 63,Hauptstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,63,,,"Gst.Nr. 788/3,826 (KG Kasten)",15752,15752
+Herr,Zury,Alois,,1,7/7/1950,,Alois Zury,Bachweg 3,Bachweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,3,,,Gst.Nr. 775/4 (KG Kasten),324,81
+Frau,Zury,Theresia,,2,10/2/1951,,Theresia Zury,Bachweg 3,Bachweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,3,,,Gst.Nr. 775/4 (KG Kasten),324,81
+Herr,Gartler,Wolfgang,,1,11/2/1967,,Wolfgang Gartler,Hauptstraße 87,Hauptstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,87,,,Gst.Nr. 798/2 (KG Kasten),755,755
+Frau,Hüttig,Theresia,,2,12/10/1950,,Theresia Hüttig,Hauptstraße 97,Hauptstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,97,,,"Gst.Nr. 323/1,866/8 (KG Kasten)",9260,9260
+Herr,Stiefmaier,Josef,,1,3/4/1958,,Josef Stiefmaier,Hauptstraße 101,Hauptstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,101,,,"Gst.Nr. 807/1,809/3 (KG Kasten)",7485,2131.681697
+Frau,Stiefmaier,Eva,,2,9/30/1959,,Eva Stiefmaier,Hauptstraße 101,Hauptstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,101,,,"Gst.Nr. 807/1,809/3 (KG Kasten)",7485,2131.681697
+Frau,Reininger,Renate,,2,1/11/1972,,Renate Reininger,Hauptstraße 58,Hauptstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,58,,,Gst.Nr. 763/1 (KG Kasten),1077,508.583332
+Frau,Fürnschuß,Monika,,2,5/17/1972,,Monika Fürnschuß,Hauptstraße 109,Hauptstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,109,,,Gst.Nr. 813/1 (KG Kasten),4830,4830
+Herr,Winter,Horst,,1,7/10/1958,,Horst Winter,Moosweg 10,Moosweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,10,,,Gst.Nr. 852/1 (KG Kasten),3294,1647
+Frau,Winter,Gertrude,,2,10/22/1962,,Gertrude Winter,Schubertgasse 3/11,Schubertgasse,8570,Voitsberg,A,A-8570 Voitsberg,8570 Voitsberg,3,,11,Gst.Nr. 852/1 (KG Kasten),3294,1647
+Frau,Likawetz,Magdalena,,2,10/19/1932,,Magdalena Likawetz,Schulweg 6,Schulweg,8143,Dobl-Zwaring,A,A-8143 Dobl-Zwaring,8143 Dobl-Zwaring,6,,,Gst.Nr. 847/4 (KG Kasten),212,159
+Herr,Hirtenfellner,Friedrich,,1,3/6/1947,,Friedrich Hirtenfellner,Sperlingweg 2,Sperlingweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,2,,,Gst.Nr. 835/3 (KG Kasten),500,250
+Herr,Binder,Josef,,1,3/29/1949,,Josef Binder,Schattenbauerweg 12,Schattenbauerweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,12,,,"Gst.Nr. 827/1,829 (KG Kasten)",3974,1987
+Herr,Seidler,Wolfgang,,1,10/5/1979,,Wolfgang Seidler,Bienenweg 1,Bienenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,1,,,Gst.Nr. 822/2 (KG Kasten),5638,2819
+Frau,Seidler,Elke,,2,9/2/1979,,Elke Seidler,Bienenweg 1,Bienenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,1,,,Gst.Nr. 822/2 (KG Kasten),5638,2819
+Herr,Kainz,Franz,,1,12/12/1955,,Franz Kainz,Forster Straße 55,Forster Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,55,,,Gst.Nr. 277 (KG Kasten),19950,19950
+Herr,Kölbl,Heinz,,1,4/28/1964,,Heinz Kölbl,Forster Straße 52,Forster Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,52,,,Gst.Nr. 253/2 (KG Kasten),843,843
+Herr,Kandinger,Johann,,1,12/24/1946,,Johann Kandinger,Dexenberg 25,Dexenberg,8403,Lang,A,A-8403 Lang,8403 Lang,25,,,"Gst.Nr. 273/2,274/2,275/4 (KG Kasten)",4805,2402.499995
+Frau,Kandinger,Christine,,2,1/4/1951,,Christine Kandinger,Dexenberg 25,Dexenberg,8403,Lang,A,A-8403 Lang,8403 Lang,25,,,"Gst.Nr. 273/2,274/2,275/4 (KG Kasten)",4805,2402.499995
+Frau,Mascher,Elfriede,,2,8/25/1977,,Elfriede Mascher,Forster Straße 56,Forster Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,56,,,Gst.Nr. 839/5 (KG Kasten),1350,675
+Herr,Lehr,Philipp,,1,1/16/1997,,Philipp Lehr,Erlenweg 3,Erlenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,3,,,"Gst.Nr. 795/6,795/7 (KG Kasten)",240,240
+Herr,Strommer,Alois,,1,4/17/1971,,Alois Strommer,Hauptstraße 115/2,Hauptstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,115,,2,"Gst.Nr. 322/2,322/4 (KG Kasten)",2464,616
+Frau,Behawy-Strommer,Heidelinde,,2,11/25/1973,,Heidelinde Behawy-Strommer,Amselgasse 12,Amselgasse,8073,Feldkirchen bei Graz,A,A-8073 Feldkirchen bei Graz,8073 Feldkirchen bei Graz,12,,,"Gst.Nr. 322/2,322/4 (KG Kasten)",2464,1266
+Herr,Mitterecker,Horst,,1,6/26/1976,,Horst Mitterecker,Sperlingweg 5,Sperlingweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,5,,,Gst.Nr. 835/3 (KG Kasten),500,25
+Herr,Zirngast,Gerhard,,0,3/8/1986,,Gerhard Zirngast,Dorfstraße 22/2,Dorfstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,22-Feb,,,Gst.Nr. 108/14 (KG Wundschuh),2030,2030
+Herr,Winter,Adolf,,1,4/3/1942,,Adolf Winter,Moosweg 8,Moosweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,8,,,Gst.Nr. 849/5 (KG Kasten),4,4
+Herr,Gödl,Martin,,1,11/13/1951,,Martin Gödl,Forster Straße 31,Forster Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,31,,,"Gst.Nr. 821/7,821/8 (KG Kasten)",261,130.5
+Herr,Wassertheurer,Gerhard,,1,8/17/1961,,Gerhard Wassertheurer,Kaiserwaldweg 45,Kaiserwaldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,45,,,Gst.Nr. 780/5 (KG Kasten),3534,174.540733
+Frau,Wassertheurer,Monika,,2,8/1/1964,,Monika Wassertheurer,Kaiserwaldweg 45,Kaiserwaldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,45,,,Gst.Nr. 780/5 (KG Kasten),3534,174.540733
+Firma,Energienetze Steiermark GmbH,,,0,,,Energienetze Steiermark GmbH ,Leonhardgürtel 10,Leonhardgürtel,8010,Graz,A,A-8010 Graz,8010 Graz,10,,,Gst.Nr. 275/3 (KG Wundschuh),39,39
+Frau,Zury,Sonja,,2,5/18/1979,,Sonja Zury,Kirchbach in Steiermark 279,Kirchbach in Steiermark,8082,Kirchbach-Zerlach,A,A-8082 Kirchbach-Zerlach,8082 Kirchbach-Zerlach,279,,,Gst.Nr. 775/4 (KG Kasten),324,162
+Herrn/Frau/Firma,Gemeinde Wundschuh,,,0,,,Gemeinde Wundschuh ,Am Kirchplatz 6,Am Kirchplatz,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,6,,,"Gst.Nr. 400/3,869/1 (KG Kasten), .38/1,24,109/32,109/71,485/2,486,510/5,511/4,757/4,762/1 (KG Wundschuh)",40166,40166
+Herr,Leinholz,Martin,,1,8/30/1967,,Martin Leinholz,Hauptstraße 107,Hauptstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,107,,,Gst.Nr. 322/1 (KG Kasten),3853,3853
+Frau,Rupp,Hermine,,2,9/29/1959,,Hermine Rupp,Waldweg 3/2,Waldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,3,,2,Gst.Nr. .27 (KG Wundschuh),522,261
+Herr,Politsch,Wilhelm,Ing.,1,10/29/1965,,Ing. Wilhelm Politsch,Sperlingweg 17,Sperlingweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,17,,,"Gst.Nr. 835/3,835/9 (KG Kasten)",1094,322
+Frau,Köstl-Politsch,Christina,,2,10/8/1971,,Christina Köstl-Politsch,Sperlingweg 17,Sperlingweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,17,,,"Gst.Nr. 835/3,835/9 (KG Kasten)",1094,322
+Frau,Stöger-Mitterecker,Birgit,,2,9/28/1976,,Birgit Stöger-Mitterecker,Sperlingweg 5,Sperlingweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,5,,,Gst.Nr. 835/3 (KG Kasten),500,25
+Herr,Lepold,Dieter,,1,9/27/1977,,Dieter Lepold,Sperlingweg 7,Sperlingweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,7,,,Gst.Nr. 835/3 (KG Kasten),500,25
+Frau,Lepold,Romana,,2,5/5/1977,,Romana Lepold,Sperlingweg 7,Sperlingweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,7,,,Gst.Nr. 835/3 (KG Kasten),500,25
+Frau,Mitterecker,Karin,,2,2/1/1949,,Karin Mitterecker,Marktplatz 6/Neubau/1,Marktplatz,2486,Pottendorf,A,A-2486 Pottendorf,2486 Pottendorf,6,Neubau,1,Gst.Nr. 835/3 (KG Kasten),500,50
+Frau,Hausegger,Anna,,2,6/24/1982,,Anna Hausegger,Am Ramberg 44,Am Ramberg,8733,Sankt Marein-Feistritz,A,A-8733 Sankt Marein-Feistritz,8733 Sankt Marein-Feistritz,44,,,Gst.Nr. 835/3 (KG Kasten),500,50
+Herr,Payer,Mario,,1,1/8/1977,,Mario Payer,Hauptstraße 75a,Hauptstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,75a,,,Gst.Nr. 792/5 (KG Kasten),1241,1241
+Frau,Lichtenegger,Manuela,,2,9/5/1979,,Manuela Lichtenegger,Forster Straße 43,Forster Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,43,,,Gst.Nr. 264 (KG Kasten),121,60.5
+Herr,Lichtenegger,Clemens,DI,1,10/4/1973,,DI Clemens Lichtenegger,Forster Straße 43,Forster Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,43,,,Gst.Nr. 264 (KG Kasten),121,60.5
+Frau,Gartler,Karin,,0,3/28/1958,,Karin Gartler,Großsulzer Straße 12,Großsulzer Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,12,,,Gst.Nr. 133/1 (KG Wundschuh),2583,2583
+Herr,Kainz,Thomas,,1,7/9/1984,,Thomas Kainz,Torbauerweg 1,Torbauerweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,1,,,Gst.Nr. 847/4 (KG Kasten),212,26.5
+Herr,Berisha,Kastriot,,1,1/13/1982,,Kastriot Berisha,Hüttenbrennergasse 45/19,Hüttenbrennergasse,8010,Graz,A,A-8010 Graz,8010 Graz,45,,19,Gst.Nr. 763/1 (KG Kasten),1077,59.833333
+Herr,Hanse,Andreas,,1,4/29/1991,,Andreas Hanse,Schneiderweg 10,Schneiderweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,10,,,Gst.Nr. 763/1 (KG Kasten),1077,29.916666
+Frau,Hanse,Sabrina,,2,1/18/1993,,Sabrina Hanse,Schneiderweg 10,Schneiderweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,10,,,Gst.Nr. 763/1 (KG Kasten),1077,29.916666
+Herr,Hodžic,Armin,,1,7/15/1984,,Armin Hodžic,Schneiderweg 9,Schneiderweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,9,,,Gst.Nr. 763/1 (KG Kasten),1077,59.833333
+Firma,WOHNbeFINDEN Immobilien GmbH (405856y),,,0,,,WOHNbeFINDEN Immobilien GmbH (405856y) ,Florianigasse 16,Florianigasse,8160,Weiz,A,A-8160 Weiz,8160 Weiz,16,,,Gst.Nr. 763/1 (KG Kasten),1077,37.395833
+Herr,Heitzmann,Markus,DI,1,8/15/1982,,DI Markus Heitzmann,Rainweg 10,Rainweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,10,,,Gst.Nr. 795/8 (KG Kasten),301,150.5
+Frau,Heitzmann,Christina,,2,7/9/1986,,Christina Heitzmann,Rainweg 10,Rainweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,10,,,Gst.Nr. 795/8 (KG Kasten),301,150.5
+Herr,Lienhart,Herbert,,0,3/11/1974,,Herbert Lienhart,Dorfstraße 21,Dorfstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,21,,,Gst.Nr. 75/3 (KG Wundschuh),410,410
+Herr,Des Enffans Avernas,Peter,,1,4/9/1956,,Peter Des Enffans Avernas,Neuschloß 3,Neuschloß,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,3,,,"Gst.Nr. 440,739 (KG Wundschuh)",3107,3107
+Firma,Pfarrpfründe Sct. Nikolai zu Wundschuh,,,0,,,Pfarrpfründe Sct. Nikolai zu Wundschuh ,Am Kirchplatz 4,Am Kirchplatz,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,4,,,Gst.Nr. .72 (KG Wundschuh),224,224
+Herr,Kölbl,Franz Valentin,,0,9/17/1988,,Franz Valentin Kölbl,Hauptplatz 9,Hauptplatz,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,9,,,Gst.Nr. 270/1 (KG Wundschuh),9580,4790
+Frau,Kölbl,Elfriede,,0,3/31/1963,,Elfriede Kölbl,Hauptplatz 9/1,Hauptplatz,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,9,,1,Gst.Nr. 270/1 (KG Wundschuh),9580,4790
+Herr,Haiden,Erwin,,0,12/11/1977,,Erwin Haiden,Bachweg 23/2,Bachweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,23-Feb,,,"Gst.Nr. 368/1,369/2 (KG Wundschuh)",3431,3431
+Herr,Strohrigl,Franz,,0,11/4/1972,,Franz Strohrigl,Dorfstraße 9,Dorfstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,9,,,Gst.Nr. 31/2 (KG Wundschuh),2857,2857
+Frau,Bacher,Veronika,Mag. phil.,0,1/18/1982,,Mag. phil. Veronika Bacher,Dorfstraße 20/1,Dorfstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,20-Jan,,,"Gst.Nr. .50,377 (KG Wundschuh)",1576,535.189488
+Herr,Almer,Johannes,DI,0,9/6/1955,,DI Johannes Almer,Dorfstraße 20/2,Dorfstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,20-Feb,,,"Gst.Nr. .50,377 (KG Wundschuh)",1576,1040.810502
+Frau,Karner,Silvia,,0,8/4/1967,,Silvia Karner,Dorfstraße 16,Dorfstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,16,,,"Gst.Nr. 23/1,375 (KG Wundschuh)",14382,7191
+Herr,Karner,Günter,,0,10/6/1965,,Günter Karner,Dorfstraße 16,Dorfstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,16,,,"Gst.Nr. 23/1,375 (KG Wundschuh)",14382,7191
+Herr,Brumen,Franz,,1,12/29/1965,,Franz Brumen,Hauptplatz 16/1,Hauptplatz,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,16,,1,"Gst.Nr. 47/1,473/10,767/1 (KG Wundschuh)",15667,15667
+Frau,Weiner,Hilda,,0,10/30/1934,,Hilda Weiner,Waldweg 5,Waldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,5,,,Gst.Nr. 478/3 (KG Wundschuh),3585,3585
+Herr,Rossmann,Franz,,0,7/24/1947,,Franz Rossmann,Ponigler Straße 54,Ponigler Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,54,,,Gst.Nr. 621/3 (KG Wundschuh),1325,1325
+Herr,Gartler,Walter,,0,12/24/1952,,Walter Gartler,Kapellenweg 1,Kapellenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,1,,,"Gst.Nr. 558/2,558/6 (KG Wundschuh)",829,414.5
+Frau,Gartler,Helene,,0,8/6/1958,,Helene Gartler,Kapellenweg 1,Kapellenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,1,,,"Gst.Nr. 558/2,558/6 (KG Wundschuh)",829,414.5
+Frau,Schneider,Irmgard,,0,2/5/1967,,Irmgard Schneider,Preit-Äcker-Weg 16/13,Preit-Äcker-Weg,8071,Hausmannstätten,A,A-8071 Hausmannstätten,8071 Hausmannstätten,16/13,,,"Gst.Nr. .6,672/1,678/9 (KG Wundschuh)",14140,14140
+Frau,Galler,Martha Elisabeth,,0,4/8/1966,,Martha Elisabeth Galler,Edelweißstraße 475/9,Edelweißstraße,8911,Admont,A,A-8911 Admont,8911 Admont,475/9,,,Gst.Nr. 123/3 (KG Wundschuh),1211,1211
+Herr,Reicher,Andreas Josef,,0,6/23/1981,,Andreas Josef Reicher,Großsulzer Straße 9,Großsulzer Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,9,,,Gst.Nr. 108/10 (KG Wundschuh),7211,7211
+Herr,Baier,Thomas,,1,3/26/1967,,Thomas Baier,Kalvarienbergstraße 25/2,Kalvarienbergstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,25,,2,"Gst.Nr. 109/34,109/36 (KG Wundschuh)",8376,7595.5
+Frau,Kainz,Anita,,0,10/24/1949,,Anita Kainz,Dorfstraße 26,Dorfstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,26,,,"Gst.Nr. .53,278/1 (KG Wundschuh)",9913,9913
+Herr,Wango,Jörg,,0,1/15/1971,,Jörg Wango,Waldweg 16,Waldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,16,,,"Gst.Nr. 495/1,495/3 (KG Wundschuh)",1865,932.5
+Frau,Wango,Renate,,0,9/11/1974,,Renate Wango,Waldweg 16,Waldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,16,,,"Gst.Nr. 495/1,495/3 (KG Wundschuh)",1865,932.5
+Herr,Trofaier,Markus,,1,3/5/1986,,Markus Trofaier,Uhlandgasse 11/2,Uhlandgasse,8010,Graz,A,A-8010 Graz,8010 Graz,11,,2,"Gst.Nr. 109/41,510/4 (KG Wundschuh)",1808,904
+Herr,Trofaier,Nikolas,,1,8/16/1982,,Nikolas Trofaier,Leystraße 147/34,Leystraße,1020,Wien,A,A-1020 Wien,1020 Wien,147,,34,"Gst.Nr. 109/41,510/4 (KG Wundschuh)",1808,904
+Herr,Stampler,Johann,DI,0,1/16/1951,,DI Johann Stampler,Waldweg 9/1,Waldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,9-Jan,,,Gst.Nr. 494/3 (KG Wundschuh),961,480.5
+Frau,Stampler,Friederike,,0,11/23/1949,,Friederike Stampler,Waldweg 9/1,Waldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,9-Jan,,,Gst.Nr. 494/3 (KG Wundschuh),961,480.5
+Frau,Binder,Stephanie,,2,9/21/1950,,Stephanie Binder,Schattenbauerweg 12,Schattenbauerweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,12,,,"Gst.Nr. 827/1,829 (KG Kasten)",3974,1987
+Herr,Ebner,Klaus,,0,7/5/1969,BA MA,Klaus Ebner BA MA,Waldweg 12,Waldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,12,,,Gst.Nr. 491/10 (KG Wundschuh),30,15
+Frau,Ebner,Isabella,,0,11/12/1976,MA MA,Isabella Ebner MA MA,Waldweg 12,Waldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,12,,,Gst.Nr. 491/10 (KG Wundschuh),30,15
+Herr,Gaggl,Walter,,1,4/22/1962,,Walter Gaggl,Dorfstraße 29,Dorfstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,29,,,Gst.Nr. .133 (KG Wundschuh),666,333
+Frau,Gaggl,Veronika,Mag.,2,12/22/1964,,Mag. Veronika Gaggl,Dorfstraße 29,Dorfstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,29,,,Gst.Nr. .133 (KG Wundschuh),666,333
+Herr,Stulnig,Willibald,Dr.,0,8/8/1954,,Dr. Willibald Stulnig,Lindenweg 3,Lindenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,3,,,Gst.Nr. 129/2 (KG Wundschuh),4804,2402
+Frau,Stulnig,Ingrid,Dr.,0,12/20/1952,,Dr. Ingrid Stulnig,Lindenweg 3,Lindenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,3,,,Gst.Nr. 129/2 (KG Wundschuh),4804,2402
+Herr,Neuhold,Robert,,0,3/18/1972,,Robert Neuhold,Hauptstraße 25,Hauptstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,25,,,Gst.Nr. 46/3 (KG Wundschuh),1200,600
+Frau,Neuhold-Lorenzer,Daniela,,0,11/20/1985,,Daniela Neuhold-Lorenzer,Hauptstraße 25,Hauptstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,25,,,Gst.Nr. 46/3 (KG Wundschuh),1200,600
+Herr,Macher,Franz,,0,7/25/1967,,Franz Macher,Lindenweg 7,Lindenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,7,,,Gst.Nr. 264/3 (KG Wundschuh),739,369.5
+Frau,Macher,Gabriele,,0,9/19/1970,,Gabriele Macher,Lindenweg 7,Lindenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,7,,,Gst.Nr. 264/3 (KG Wundschuh),739,369.5
+Herr,Lienhart,Johann,,0,3/19/1966,,Johann Lienhart,Werndorfer Straße 10,Werndorfer Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,10,,,Gst.Nr. 350/1 (KG Wundschuh),176,44
+Frau,Lienhart,Christa,,0,8/24/1968,,Christa Lienhart,Werndorfer Straße 10,Werndorfer Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,10,,,Gst.Nr. 350/1 (KG Wundschuh),176,44
+Herr,Aichelsreiter-Holzmann,Otto,,0,10/26/1936,,Otto Aichelsreiter-Holzmann,Sternweg 2,Sternweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,2,,,Gst.Nr. 46/2 (KG Wundschuh),1201,1201
+Herr,Reinisch,Heinz,,0,2/26/1945,,Heinz Reinisch,Waldweg 13,Waldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,13,,,Gst.Nr. 498/1 (KG Wundschuh),2493,2493
+Frau,Lorencic,Brigitte,,0,10/23/1949,,Brigitte Lorencic,Hangweg 10,Hangweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,10,,,Gst.Nr. 109/82 (KG Wundschuh),566,188.666666
+Herrn/Frau/Firma,Pesenti-Heric,Ingeborg,,0,1/2/1948,,Ingeborg Pesenti-Heric,Via Monterotondo 21,Via Monterotondo,9999,----,I,I-9999 ----,9999 ----,21,,,Gst.Nr. 109/82 (KG Wundschuh),566,94.333333
+Herr,Rosenberger,Markus,,0,8/25/1989,,Markus Rosenberger,Ponigler Straße 34,Ponigler Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,34,,,Gst.Nr. 678/4 (KG Wundschuh),200,50
+Frau,Scherz,Hermine Dorothea,,0,5/18/1956,,Hermine Dorothea Scherz,Hauptstraße 24,Hauptstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,24,,,Gst.Nr. 40/2 (KG Wundschuh),1038,519
+Herr,Scherz,Josef,,0,1/14/1951,,Josef Scherz,Hauptstraße 24,Hauptstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,24,,,Gst.Nr. 40/2 (KG Wundschuh),1038,519
+Herr,Gogg,Georg,Ing.,0,1/18/1976,,Ing. Georg Gogg,Komberg 6,Komberg,8411,Hengsberg,A,A-8411 Hengsberg,8411 Hengsberg,6,,,"Gst.Nr. 475/3,498/2 (KG Wundschuh)",2801,2801
+Herr,Roßmann,Leo Karl,,0,3/7/1945,,Leo Karl Roßmann,Ponigler Straße 35,Ponigler Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,35,,,Gst.Nr. 620/4 (KG Wundschuh),1106,1106
+Herr,Kollmann,Karl,,1,4/24/1953,,Karl Kollmann,Schneiderweg 2/3,Schneiderweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,2,,3,Gst.Nr. 763/1 (KG Kasten),1077,3.739583
+Frau,Kollmann,Christine,,2,12/4/1959,,Christine Kollmann,Schneiderweg 2/3,Schneiderweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,2,,3,Gst.Nr. 763/1 (KG Kasten),1077,3.739583
+Herr,Nachtnebel,Manfred,,0,4/4/1960,,Manfred Nachtnebel,Waldweg 10,Waldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,10,,,Gst.Nr. 491/8 (KG Wundschuh),162,81
+Frau,Nachtnebel,Johanna,,0,6/1/1960,,Johanna Nachtnebel,Waldweg 10,Waldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,10,,,Gst.Nr. 491/8 (KG Wundschuh),162,81
+Frau,Trammer,Annemarie,,0,4/10/1962,,Annemarie Trammer,Sonnenweg 7,Sonnenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,7,,,Gst.Nr. 395/4 (KG Wundschuh),1042,151.958333
+Herr,Trammer,Fritz,,0,12/22/1962,,Fritz Trammer,Sonnenweg 7,Sonnenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,7,,,Gst.Nr. 395/4 (KG Wundschuh),1042,151.958333
+Herr,Kraxner,Peter,,0,3/28/1961,,Peter Kraxner,Rosenweg 6,Rosenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,6,,,Gst.Nr. 31/6 (KG Wundschuh),1214,607
+Frau,Kraxner,Helga,,0,2/21/1962,,Helga Kraxner,Rosenweg 6,Rosenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,6,,,"Gst.Nr. 31/5,31/6 (KG Wundschuh)",1681,1074
+Herr,Mörth,Friedrich,,0,9/20/1985,,Friedrich Mörth,Ponigler Straße 37/1,Ponigler Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,37/1,,,Gst.Nr. 620/3 (KG Wundschuh),1609,1609
+Herr,List,Nikolaus Andreas,,0,4/10/1992,,Nikolaus Andreas List,Neuschloßweg 6/2,Neuschloßweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,6-Feb,,,Gst.Nr. 276/9 (KG Wundschuh),400,400
+Herr,Aichelsreiter-Holzmann,Franz,,1,11/3/1962,,Franz Aichelsreiter-Holzmann,Sternweg 6,Sternweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,6,,,Gst.Nr. 46/5 (KG Wundschuh),738,738
+Frau,Schragl,Brigitte,,0,11/4/1965,,Brigitte Schragl,Sternweg 4/1,Sternweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,4-Jan,,,Gst.Nr. 46/7 (KG Wundschuh),1142,1142
+Herr,Rosenberger,Norbert,,1,6/6/1964,,Norbert Rosenberger,Hauptplatz 14,Hauptplatz,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,14,,,Gst.Nr. .97 (KG Wundschuh),498,498
+Herr,Bosankic,Darko,,0,6/10/1984,,Darko Bosankic,Großsulzer Straße 8,Großsulzer Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,8,,,Gst.Nr. 263/2 (KG Wundschuh),444,222
+Frau,Bosankic,Andelka,,0,12/14/1983,,Andelka Bosankic,Großsulzer Straße 8,Großsulzer Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,8,,,Gst.Nr. 263/2 (KG Wundschuh),444,222
+Herr,Schramel,Martin,Ing.,0,3/17/1973,,Ing. Martin Schramel,Sonnenweg 8,Sonnenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,8,,,Gst.Nr. 395/4 (KG Wundschuh),1042,130.25
+Herr,Adam,Hubert,Ing.,0,6/28/1975,,Ing. Hubert Adam,Sonnenweg 4,Sonnenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,4,,,Gst.Nr. 395/4 (KG Wundschuh),1042,65.125
+Frau,Adam,Daniela,,0,5/3/1969,,Daniela Adam,Sonnenweg 4,Sonnenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,4,,,Gst.Nr. 395/4 (KG Wundschuh),1042,65.125
+Frau,Riffl,Marion,,0,8/27/1963,,Marion Riffl,Sonnenweg 6,Sonnenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,6,,,Gst.Nr. 395/4 (KG Wundschuh),1042,97.6875
+Frau,Rußold,Christine,,0,6/20/1962,,Christine Rußold,Sonnenweg 6,Sonnenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,6,,,Gst.Nr. 395/4 (KG Wundschuh),1042,32.5625
+Herr,Krispel,Manfred,,0,7/1/1966,,Manfred Krispel,Sonnenweg 3,Sonnenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,3,,,Gst.Nr. 395/4 (KG Wundschuh),1042,173.666666
+Herr,Nager,Anton,,0,3/9/1959,,Anton Nager,Finkenweg 2,Finkenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,2,,,Gst.Nr. 476/4 (KG Wundschuh),1245,1245
+Frau,Stodola,Ida,,0,9/4/1969,,Ida Stodola,Waldweg 4,Waldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,4,,,Gst.Nr. 110/1 (KG Wundschuh),3227,3227
+Herr,Hüller,Rene,,0,8/19/1975,,Rene Hüller,Ponigler Straße 7,Ponigler Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,7,,,Gst.Nr. 393/1 (KG Wundschuh),1604,1604
+Herr,Hartner,Gerhard,,0,9/21/1961,,Gerhard Hartner,Ponigler Straße 36,Ponigler Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,36,,,Gst.Nr. 678/4 (KG Wundschuh),200,50
+Frau,Hartner,Renate,,0,9/29/1967,,Renate Hartner,Ponigler Straße 36,Ponigler Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,36,,,Gst.Nr. 678/4 (KG Wundschuh),200,50
+Frau,Weber,Gerlinde,,0,7/16/1955,,Gerlinde Weber,Kapellenweg 18,Kapellenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,18,,,Gst.Nr. 557/1 (KG Wundschuh),423,211.5
+Herr,Hermann,Kurt Josef,,0,12/21/1969,,Kurt Josef Hermann,Kapellenweg 16,Kapellenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,16,,,Gst.Nr. 557/1 (KG Wundschuh),423,105.75
+Frau,Müller,Marion,,2,2/26/1972,,Marion Müller,Steinkläublweg 7/1,Steinkläublweg,8075,Hart bei Graz,A,A-8075 Hart bei Graz,8075 Hart bei Graz,7,,1,Gst.Nr. 557/1 (KG Wundschuh),423,105.75
+Herr,Stampler,Stefan,DI,0,8/27/1975,,DI Stefan Stampler,Waldweg 8,Waldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,8,,,Gst.Nr. 491/7 (KG Wundschuh),155,77.5
+Frau,Stampler,Bettina,,0,1/19/1980,,Bettina Stampler,Waldweg 8,Waldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,8,,,Gst.Nr. 491/7 (KG Wundschuh),155,77.5
+Herr,Steininger,Thomas,,0,3/25/1972,,Thomas Steininger,Ponigler Straße 42,Ponigler Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,42,,,Gst.Nr. 678/6 (KG Wundschuh),187,93.5
+Frau,Zafnik,Susanne,,0,1/21/1968,,Susanne Zafnik,Ponigler Straße 44,Ponigler Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,44,,,Gst.Nr. 678/6 (KG Wundschuh),187,46.75
+Herr,Maliqi,Abedin,,0,1/1/1969,,Abedin Maliqi,Ponigler Straße 44,Ponigler Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,44,,,Gst.Nr. 678/6 (KG Wundschuh),187,46.75
+Herr,Schlegel,Christoph,Dr. phil.,0,4/3/1976,,Dr. phil. Christoph Schlegel,Waldweg 14,Waldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,14,,,Gst.Nr. 494/2 (KG Wundschuh),1144,572
+Frau,Zirngast,Sandra,,0,12/19/1981,,Sandra Zirngast,Werndorfer Straße 12,Werndorfer Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,12,,,Gst.Nr. 349/3 (KG Wundschuh),227,227
+Frau,Radl,Silvia,,0,10/6/1970,,Silvia Radl,Höhenweg 17,Höhenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,17,,,Gst.Nr. 109/98 (KG Wundschuh),252,63
+Herr,Kainz,Alexander,,1,7/29/1985,,Alexander Kainz,Hauptplatz 15,Hauptplatz,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,15,,,"Gst.Nr. 108/11,108/12,109/14,474/1 (KG Wundschuh)",18606,18606
+Herr,Bogner,Werner,,1,3/9/1979,MBA,Werner Bogner MBA,Teichweg 3/2,Teichweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,3-Feb,,,"Gst.Nr. 657/2,767/2 (KG Wundschuh)",1744,1744
+Herr,Schullatz,Kevin,,1,1/24/1991,,Kevin Schullatz,Großsulzer Straße 3,Großsulzer Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,3,,,Gst.Nr. 131/4 (KG Wundschuh),870,870
+Frau,Wimmer,Maria,Mag. iur.,0,6/23/1976,,Mag. iur. Maria Wimmer,Lindenweg 12,Lindenweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,12,,,"Gst.Nr. 109/96,109/98 (KG Wundschuh)",3133,3070
+Frau,Rappold,Andrea,,2,3/25/1966,,Andrea Rappold,Kornfeldweg 1/1,Kornfeldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,1,,1,Gst.Nr. 780/5 (KG Kasten),3534,417.458248
+Frau,Unterschwaiger,Brigitte,,2,1/4/1949,,Brigitte Unterschwaiger,Kornfeldweg 1/3,Kornfeldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,1,,3,Gst.Nr. 780/5 (KG Kasten),3534,392.266802
+Herr,Loibner,Mario,,1,2/10/1993,,Mario Loibner,Kornfeldweg 3/1,Kornfeldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,3,,1,Gst.Nr. 780/5 (KG Kasten),3534,226.723014
+Frau,Loibner,Lisa,,2,2/15/1994,,Lisa Loibner,Kornfeldweg 3/1,Kornfeldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,3,,1,Gst.Nr. 780/5 (KG Kasten),3534,226.723014
+Herr,Fleischhacker,Patrick,,1,8/7/1992,,Patrick Fleischhacker,Kornfeldweg 3/3,Kornfeldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,3,,3,Gst.Nr. 780/5 (KG Kasten),3534,194.334012
+Herr,Kainz,Gabriel,,1,9/12/1988,,Gabriel Kainz,Wiesenhofweg 19,Wiesenhofweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,19,,,Gst.Nr. 780/5 (KG Kasten),3534,359.8778
+Herr,Fleischhacker,René,,1,8/7/1992,,René Fleischhacker,Kornfeldweg 5/3,Kornfeldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,5,,3,Gst.Nr. 780/5 (KG Kasten),3534,392.266802
+Herr,Heric,Erwin,,1,6/12/1959,,Erwin Heric,Hangweg 8,Hangweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,8,,,Gst.Nr. 109/82 (KG Wundschuh),566,141.5
+Herr,Bessenyei,Zoltan,,1,1/3/1976,,Zoltan Bessenyei,Schneiderweg 3,Schneiderweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,3,,,Gst.Nr. 763/1 (KG Kasten),1077,29.916666
+Frau,Bessenyei-Antal,Mónika,,2,8/13/1974,,Mónika Bessenyei-Antal,Schneiderweg 3,Schneiderweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,3,,,Gst.Nr. 763/1 (KG Kasten),1077,29.916666
+Herr,Lovše,Sascha,,1,6/11/1991,,Sascha Lovše,Schneiderweg 8,Schneiderweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,8,,,Gst.Nr. 763/1 (KG Kasten),1077,29.916666
+Frau,Lovše,Dominique,,2,3/5/1993,,Dominique Lovše,Schneiderweg 8,Schneiderweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,8,,,Gst.Nr. 763/1 (KG Kasten),1077,29.916666
+Frau,Baier,Anita,,2,10/2/1975,,Anita Baier,Kalvarienbergstraße 25/2,Kalvarienbergstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,25,,2,Gst.Nr. 109/34 (KG Wundschuh),1561,780.5
+Herr,Gödl,Martin,,0,12/21/1994,,Martin Gödl,Ponigler Straße 41,Ponigler Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,41,,,Gst.Nr. 556/1 (KG Wundschuh),1275,1275
+Herr,Brodschneider,Herbert,,1,11/22/1970,,Herbert Brodschneider,Kalvarienbergstraße 10/2,Kalvarienbergstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,10,,2,"Gst.Nr. 763/1 (KG Kasten), 41/4 (KG Wundschuh)",1175,101.739583
+Frau,Brodschneider,Birgit,,2,5/4/1966,,Birgit Brodschneider,Kalvarienbergstraße 10/2,Kalvarienbergstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,10,,2,Gst.Nr. 763/1 (KG Kasten),1077,3.739583
+Herr,Höber,Markus,,1,7/28/1992,,Markus Höber,Schneiderweg 1/2,Schneiderweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,1,,2,Gst.Nr. 763/1 (KG Kasten),1077,3.739583
+Frau,Petelinsek,Sarah,,2,8/7/1995,,Sarah Petelinsek,Schneiderweg 1/2,Schneiderweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,1,,2,Gst.Nr. 763/1 (KG Kasten),1077,3.739583
+Herr,Rath,Christian,Ing.,1,2/24/1987,,Ing. Christian Rath,Schneiderweg 1/3,Schneiderweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,1,,3,Gst.Nr. 763/1 (KG Kasten),1077,7.479166
+Herr,Kainz-Zach,Manuel,,1,7/25/1991,,Manuel Kainz-Zach,Schneiderweg 2/2,Schneiderweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,2,,2,Gst.Nr. 763/1 (KG Kasten),1077,3.739583
+Herr,Strohmaier,Robert,,1,4/20/1981,,Robert Strohmaier,Glesingerstraße 9,Glesingerstraße,8053,Graz,A,A-8053 Graz,8053 Graz,9,,,Gst.Nr. 273/1 (KG Kasten),13527,13527
+Herr,Kurz,Johannes,,1,8/13/1989,,Johannes Kurz,Hauptplatz 6,Hauptplatz,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,6,,,Gst.Nr. 109/6 (KG Wundschuh),11741,11741
+Herr,Stubenrauch,Martin,,1,3/17/1981,,Martin Stubenrauch,Forster Straße 53,Forster Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,53,,,Gst.Nr. 839/5 (KG Kasten),1350,168.75
+Frau,Rosenberger,Julia,,0,12/7/1995,,Julia Rosenberger,Ponigler Straße 34,Ponigler Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,34,,,Gst.Nr. 678/4 (KG Wundschuh),200,50
+Herr,Sammer,Christoph,,1,10/8/1990,,Christoph Sammer,Schneiderweg 7,Schneiderweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,7,,,Gst.Nr. 763/1 (KG Kasten),1077,29.916666
+Frau,Fleischhacker,Sabrina,,2,6/17/1993,,Sabrina Fleischhacker,Kornfeldweg 3/3,Kornfeldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,3,,3,Gst.Nr. 780/5 (KG Kasten),3534,194.334012
+Herr,Berghold,Michael,,1,2/9/1986,,Michael Berghold,Kornfeldweg 5/1,Kornfeldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,5,,1,Gst.Nr. 780/5 (KG Kasten),3534,219.525458
+Frau,Hinterberger,Birgit,,2,2/20/1989,,Birgit Hinterberger,Ponigler Straße 20,Ponigler Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,20,,,Gst.Nr. 445/1 (KG Wundschuh),470,235
+Herr,Hinterberger,Daniel,,1,7/1/1985,,Daniel Hinterberger,Ponigler Straße 20,Ponigler Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,20,,,Gst.Nr. 445/1 (KG Wundschuh),470,235
+Herr,Areh,Stefan,,1,4/23/1990,,Stefan Areh,Arbeitergasse 50/24-25,Arbeitergasse,1050,Wien,A,A-1050 Wien,1050 Wien,50,,24-25,Gst.Nr. 780/5 (KG Kasten),3534,160.145621
+Frau,Areh,Claudia,,2,2/22/1987,,Claudia Areh,Kirchweg 12/4,Kirchweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,12,,4,Gst.Nr. 780/5 (KG Kasten),3534,160.145621
+Firma,LNS 2020 GmbH,,,0,,,LNS 2020 GmbH ,Forster Straße 18,Forster Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,18,,,Gst.Nr. 63/4 (KG Wundschuh),3603,3603
+Herr,Duller,Daniel,,1,3/12/1992,,Daniel Duller,Schneiderweg 6,Schneiderweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,6,,,Gst.Nr. 763/1 (KG Kasten),1077,39.888888
+Frau,Hanschitz,Valentina,,2,8/14/1994,,Valentina Hanschitz,Schneiderweg 6,Schneiderweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,6,,,Gst.Nr. 763/1 (KG Kasten),1077,19.944444
+Herr,Lienhart,Johannes,,0,8/24/1988,,Johannes Lienhart,Neuschloßweg 3,Neuschloßweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,3,,,Gst.Nr. 350/1 (KG Wundschuh),176,44
+Frau,Lienhart,Franziska,,0,11/8/1993,,Franziska Lienhart,Neuschloßweg 3,Neuschloßweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,3,,,Gst.Nr. 350/1 (KG Wundschuh),176,44
+Frau,Rossmann,Martina,DI (FH),2,12/6/1984,,DI (FH) Martina Rossmann,Ponigler Straße 29,Ponigler Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,29,,,Gst.Nr. 643/2 (KG Wundschuh),604,302
+Herr,Perchtold,Gerald,DI,1,4/14/1975,,DI Gerald Perchtold,Ponigler Straße 29,Ponigler Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,29,,,Gst.Nr. 643/2 (KG Wundschuh),604,302
+Herr,Gödl,Martin,,1,11/13/1951,,Martin Gödl,Forster Straße 31,Forster Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,31,,,"Gst.Nr. 821/7,821/8 (KG Kasten)",261,130.5
+Frau,Lafer,Nina,,0,9/29/1994,,Nina Lafer,Ponigler Straße 45,Ponigler Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,45,,,Gst.Nr. 614/4 (KG Wundschuh),560,280
+Herr,Des Enffans Avernas,Alexander,,0,3/7/1994,,Alexander Des Enffans Avernas,Ponigler Straße 45,Ponigler Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,45,,,Gst.Nr. 614/4 (KG Wundschuh),560,280
+Herr,Strohrigl,Stefan,,0,11/22/1990,,Stefan Strohrigl,Hauptstraße 10,Hauptstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,10,,,Gst.Nr. 25 (KG Wundschuh),13385,13385
+Frau,Berghold,Selina,,2,1/4/1996,,Selina Berghold,Kornfeldweg 5/1,Kornfeldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,5,,1,Gst.Nr. 780/5 (KG Kasten),3534,219.525458
+Firma,immo.st Projektgesellschaft m.b.H. (412202f),,,0,,,immo.st Projektgesellschaft m.b.H. (412202f) ,Flamberg 106,Flamberg,8505,Flamberg,A,A-8505 Flamberg,8505 Flamberg,106,,,Gst.Nr. 780/5 (KG Kasten),3534,21.592668
+Herr,Matheis,Andreas,,1,5/16/1981,,Andreas Matheis,Hauptstraße 103,Hauptstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,103,,,"Gst.Nr. 807/1,809/3 (KG Kasten)",7485,1610.818295
+Frau,Stiefmaier-Matheis,Sabine,Mag. phil.,2,8/6/1980,,Mag. phil. Sabine Stiefmaier-Matheis,Hauptstraße 103,Hauptstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,103,,,"Gst.Nr. 807/1,809/3 (KG Kasten)",7485,1610.818295
+Herr,Behawy,Sven,,1,4/3/1970,,Sven Behawy,Amselgasse 12,Amselgasse,8073,Feldkirchen bei Graz,A,A-8073 Feldkirchen bei Graz,8073 Feldkirchen bei Graz,12,,,Gst.Nr. 322/2 (KG Kasten),1164,582
+Frau,Heric,Monika,,2,4/24/1960,,Monika Heric,Hangweg 8,Hangweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,8,,,Gst.Nr. 109/82 (KG Wundschuh),566,141.5
+Frau,Kainz-Zach,Elisa,,2,6/9/1985,,Elisa Kainz-Zach,Schneiderweg 2/2,Schneiderweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,2,,2,Gst.Nr. 763/1 (KG Kasten),1077,3.739583
+Frau,Sammer,Michaela,,2,6/2/1992,,Michaela Sammer,Schneiderweg 7,Schneiderweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,7,,,Gst.Nr. 763/1 (KG Kasten),1077,29.916666
+Frau,Handl,Daniela,,2,11/11/1996,,Daniela Handl,Schneiderweg 5,Schneiderweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,5,,,Gst.Nr. 763/1 (KG Kasten),1077,29.916666
+Herr,Pinter,Pascal,,1,9/5/1984,,Pascal Pinter,Schneiderweg 5,Schneiderweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,5,,,Gst.Nr. 763/1 (KG Kasten),1077,29.916666
+Herr,Amschl,Dominik,,1,10/10/1989,,Dominik Amschl,Schneiderweg 2/4,Schneiderweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,2,,4,Gst.Nr. 763/1 (KG Kasten),1077,7.479166
+Frau,Jöller,Magdalena,,0,4/24/1996,,Magdalena Jöller,Feldgasse 43/11,Feldgasse,8020,Graz,A,A-8020 Graz,8020 Graz,43/11,,,Gst.Nr. 395/4 (KG Wundschuh),1042,86.833333
+Herr,Jöller,Ajun Simorg,,0,10/20/1990,MSc,Ajun Simorg Jöller MSc,Feldgasse 43/11,Feldgasse,8020,Graz,A,A-8020 Graz,8020 Graz,43/11,,,Gst.Nr. 395/4 (KG Wundschuh),1042,86.833333
+Herr,Rupp,Andreas,,1,8/22/1982,,Andreas Rupp,Petzendorf 18,Petzendorf,8143,Dobl-Zwaring,A,A-8143 Dobl-Zwaring,8143 Dobl-Zwaring,18,,,Gst.Nr. .27 (KG Wundschuh),522,261
+Frau,Stubenrauch,Maria,,2,7/2/1992,,Maria Stubenrauch,Forster Straße 53,Forster Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,53,,,Gst.Nr. 839/5 (KG Kasten),1350,337.5
+Frau,Stubenrauch,Marlies,,2,8/9/1995,,Marlies Stubenrauch,Forster Straße 53,Forster Straße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,53,,,Gst.Nr. 839/5 (KG Kasten),1350,168.75
+Herr,Strasser,Felix,,1,10/19/1999,,Felix Strasser,Eckertstraße 141,Eckertstraße,8020,Graz,A,A-8020 Graz,8020 Graz,141,,,Gst.Nr. 763/1 (KG Kasten),1077,7.479166
+Frau,Likawetz-Kopp,Edith,,2,1/19/1961,,Edith Likawetz-Kopp,Klosterwiesgasse 44/2,Klosterwiesgasse,8010,Graz,A,A-8010 Graz,8010 Graz,44,,2,Gst.Nr. 847/4 (KG Kasten),212,26.5
+Frau,Lang,Sophia,,2,2/18/2003,,Sophia Lang,Hauptstraße 105/1,Hauptstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,105,,1,Gst.Nr. 810/3 (KG Kasten),1551,1551
+Herr,Lang,Johannes,,1,5/19/1995,,Johannes Lang,Hauptstraße 105a,Hauptstraße,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,105a,,,Gst.Nr. 810/1 (KG Kasten),732,732
+Frau,Schlegel,Maria,Mag. (FH),2,12/1/1982,,Mag. (FH) Maria Schlegel,Waldweg 14,Waldweg,8142,Wundschuh,A,A-8142 Wundschuh,8142 Wundschuh,14,,,Gst.Nr. 494/2 (KG Wundschuh),1144,572

From 9eb7e1c83c1a856a6bb9f106256fd368dc5eaed2 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Thu, 29 Jan 2026 14:34:23 +0100
Subject: [PATCH 88/88] addded openreplay to thetool

---
 Layout/andom-tec/header.php                   |  1 +
 .../VueViews/WarehouseStocktakePWA.php        | 36 +++++++++
 .../default/VueViews/WorkorderCompanyPWA.php  | 37 +++++++++
 Layout/default/header.php                     |  1 +
 Layout/default/includes/openreplay.php        | 79 +++++++++++++++++++
 Layout/default/vueHeader3.php                 |  2 +
 6 files changed, 156 insertions(+)
 create mode 100644 Layout/default/includes/openreplay.php

diff --git a/Layout/andom-tec/header.php b/Layout/andom-tec/header.php
index 0a71e3700..6813341bb 100644
--- a/Layout/andom-tec/header.php
+++ b/Layout/andom-tec/header.php
@@ -55,6 +55,7 @@
         </style>
     <?php endif; ?>
 
+    <?php $openreplayUserType = 'internal'; include(__DIR__ . "/../default/includes/openreplay.php"); ?>
 </head>
 
 <body>
diff --git a/Layout/default/VueViews/WarehouseStocktakePWA.php b/Layout/default/VueViews/WarehouseStocktakePWA.php
index 9c65502bb..8da06d02c 100644
--- a/Layout/default/VueViews/WarehouseStocktakePWA.php
+++ b/Layout/default/VueViews/WarehouseStocktakePWA.php
@@ -1,4 +1,12 @@
 <?php
+// Prepare OpenReplay user data
+$openreplayUserId = '';
+if (class_exists('mfUser') && class_exists('mfLoginController') && mfLoginController::isLoggedIn()) {
+    $user = mfUser::singleton();
+    if ($user && $user->id) {
+        $openreplayUserId = (string) $user->id;
+    }
+}
 ?>
 <!DOCTYPE html>
 <html lang="de">
@@ -32,6 +40,34 @@
         }
     </script>
 
+    <!-- OpenReplay Session Recording -->
+    <script>
+    var initOpts = {
+        projectKey: "96MdXVcId8Ph3eOirMWj",
+        ingestPoint: "https://openreplay.xinon.at/ingest",
+        defaultInputMode: 2,
+        obscureTextNumbers: false,
+        obscureTextEmails: true,
+    };
+    var startOpts = { userID: <?= json_encode($openreplayUserId) ?> };
+    (function(A,s,a,y,e,r){
+        r=window.OpenReplay=[e,r,y,[s-1, e]];
+        s=document.createElement('script');s.src=A;s.async=!a;
+        document.getElementsByTagName('head')[0].appendChild(s);
+        r.start=function(v){r.push([0])};
+        r.stop=function(v){r.push([1])};
+        r.setUserID=function(id){r.push([2,id])};
+        r.setUserAnonymousID=function(id){r.push([3,id])};
+        r.setMetadata=function(k,v){r.push([4,k,v])};
+        r.event=function(k,p,i){r.push([5,k,p,i])};
+        r.issue=function(k,p){r.push([6,k,p])};
+        r.isActive=function(){return false};
+        r.getSessionToken=function(){};
+    })("//static.openreplay.com/17.0.0/openreplay.js",1,0,initOpts,startOpts);
+    window.OpenReplay.setMetadata('userType', 'internal');
+    window.OpenReplay.setMetadata('app', 'warehouse-stocktake-pwa');
+    </script>
+
     <style>
         html, body {
             overscroll-behavior: none;
diff --git a/Layout/default/VueViews/WorkorderCompanyPWA.php b/Layout/default/VueViews/WorkorderCompanyPWA.php
index a6c1c3fe1..b25ad5bdc 100644
--- a/Layout/default/VueViews/WorkorderCompanyPWA.php
+++ b/Layout/default/VueViews/WorkorderCompanyPWA.php
@@ -1,4 +1,13 @@
 <?php
+// Prepare OpenReplay user data for external company users
+$openreplayUserId = '';
+$openreplayCompanyId = $JSGlobals['COMPANY_ID'] ?? '';
+if (class_exists('mfUser') && class_exists('mfLoginController') && mfLoginController::isLoggedIn()) {
+    $user = mfUser::singleton();
+    if ($user && $user->id) {
+        $openreplayUserId = 'company_' . $user->id;
+    }
+}
 ?>
 <!DOCTYPE html>
 <html lang="de">
@@ -34,6 +43,34 @@
         }
     </script>
 
+    <!-- OpenReplay Session Recording -->
+    <script>
+    var initOpts = {
+        projectKey: "96MdXVcId8Ph3eOirMWj",
+        ingestPoint: "https://openreplay.xinon.at/ingest",
+        defaultInputMode: 2,
+        obscureTextNumbers: false,
+        obscureTextEmails: true,
+    };
+    var startOpts = { userID: <?= json_encode($openreplayUserId) ?> };
+    (function(A,s,a,y,e,r){
+        r=window.OpenReplay=[e,r,y,[s-1, e]];
+        s=document.createElement('script');s.src=A;s.async=!a;
+        document.getElementsByTagName('head')[0].appendChild(s);
+        r.start=function(v){r.push([0])};
+        r.stop=function(v){r.push([1])};
+        r.setUserID=function(id){r.push([2,id])};
+        r.setUserAnonymousID=function(id){r.push([3,id])};
+        r.setMetadata=function(k,v){r.push([4,k,v])};
+        r.event=function(k,p,i){r.push([5,k,p,i])};
+        r.issue=function(k,p){r.push([6,k,p])};
+        r.isActive=function(){return false};
+        r.getSessionToken=function(){};
+    })("//static.openreplay.com/17.0.0/openreplay.js",1,0,initOpts,startOpts);
+    window.OpenReplay.setMetadata('userType', 'external');
+    window.OpenReplay.setMetadata('companyId', <?= json_encode($openreplayCompanyId) ?>);
+    </script>
+
     <style>
         html, body {
             /* Prevents the rubber-band scroll effect on iOS and pull-to-refresh on Android */
diff --git a/Layout/default/header.php b/Layout/default/header.php
index 96ffbbad7..e27ba457b 100644
--- a/Layout/default/header.php
+++ b/Layout/default/header.php
@@ -99,6 +99,7 @@
         </style>
     <?php endif; ?>
 
+    <?php $openreplayUserType = 'internal'; include(__DIR__ . "/includes/openreplay.php"); ?>
 </head>
 
 <body>
diff --git a/Layout/default/includes/openreplay.php b/Layout/default/includes/openreplay.php
new file mode 100644
index 000000000..b82a4148f
--- /dev/null
+++ b/Layout/default/includes/openreplay.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * OpenReplay Session Recording Integration
+ * Include this file in header templates to enable session recording.
+ *
+ * Usage: <?php include(__DIR__ . "/includes/openreplay.php"); ?>
+ *
+ * Variables that can be set before including:
+ * - $openreplayUserType: 'internal' (default) or 'external'
+ * - $openreplayDisabled: set to true to disable tracking
+ */
+
+if (!empty($openreplayDisabled)) return;
+
+$openreplayUserId = '';
+$openreplayUserName = '';
+$openreplayUserType = $openreplayUserType ?? 'internal';
+$openreplayMetadata = [];
+
+// Get user info for internal users
+if (class_exists('mfUser') && class_exists('mfLoginController') && mfLoginController::isLoggedIn()) {
+    $user = mfUser::singleton();
+    if ($user && $user->id) {
+        $openreplayUserId = (string) $user->id;
+        $openreplayUserName = $user->username ?? '';
+        $openreplayMetadata['userType'] = $openreplayUserType;
+        $openreplayMetadata['username'] = $openreplayUserName;
+    }
+}
+
+// Allow override from JSGlobals (for PWA contexts)
+if (isset($JSGlobals['OPENREPLAY_USER_ID'])) {
+    $openreplayUserId = (string) $JSGlobals['OPENREPLAY_USER_ID'];
+}
+if (isset($JSGlobals['OPENREPLAY_USER_TYPE'])) {
+    $openreplayUserType = $JSGlobals['OPENREPLAY_USER_TYPE'];
+    $openreplayMetadata['userType'] = $openreplayUserType;
+}
+if (isset($JSGlobals['OPENREPLAY_COMPANY_ID'])) {
+    $openreplayMetadata['companyId'] = $JSGlobals['OPENREPLAY_COMPANY_ID'];
+}
+
+// Disable on dev environment if needed
+$openreplayEnabled = true;
+if (defined('MFAPPNAME') && MFAPPNAME === 'devthetool') {
+    // Optionally disable on dev - comment out to enable on dev too
+    // $openreplayEnabled = false;
+}
+
+if ($openreplayEnabled):
+?>
+<script>
+var initOpts = {
+    projectKey: "96MdXVcId8Ph3eOirMWj",
+    ingestPoint: "https://openreplay.xinon.at/ingest",
+    defaultInputMode: 2,
+    obscureTextNumbers: false,
+    obscureTextEmails: true,
+};
+var startOpts = { userID: <?= json_encode($openreplayUserId) ?> };
+(function(A,s,a,y,e,r){
+    r=window.OpenReplay=[e,r,y,[s-1, e]];
+    s=document.createElement('script');s.src=A;s.async=!a;
+    document.getElementsByTagName('head')[0].appendChild(s);
+    r.start=function(v){r.push([0])};
+    r.stop=function(v){r.push([1])};
+    r.setUserID=function(id){r.push([2,id])};
+    r.setUserAnonymousID=function(id){r.push([3,id])};
+    r.setMetadata=function(k,v){r.push([4,k,v])};
+    r.event=function(k,p,i){r.push([5,k,p,i])};
+    r.issue=function(k,p){r.push([6,k,p])};
+    r.isActive=function(){return false};
+    r.getSessionToken=function(){};
+})("//static.openreplay.com/17.0.0/openreplay.js",1,0,initOpts,startOpts);
+<?php foreach ($openreplayMetadata as $key => $value): ?>
+window.OpenReplay.setMetadata(<?= json_encode($key) ?>, <?= json_encode($value) ?>);
+<?php endforeach; ?>
+</script>
+<?php endif; ?>
diff --git a/Layout/default/vueHeader3.php b/Layout/default/vueHeader3.php
index f4a126f50..fe4ede8ca 100644
--- a/Layout/default/vueHeader3.php
+++ b/Layout/default/vueHeader3.php
@@ -69,6 +69,8 @@
 
         <?php endif; ?>
     </style>
+
+    <?php $openreplayUserType = 'internal'; include(__DIR__ . "/includes/openreplay.php"); ?>
 </head>
 <body>