Merge branch 'main' into develop

# Conflicts:
#	backend/app/api/key_visits.py
#	backend/app/api/mini_business.py
#	backend/app/api/visits.py
#	backend/app/api/work_plans.py
#	backend/app/main.py
#	backend/app/models/__init__.py
#	backend/app/schemas/key_visit.py
#	backend/app/schemas/mini_business.py
#	backend/app/schemas/work_plan.py
#	backend/app/services/light_board.py
#	frontend/src/components/DesktopLayout.vue
#	frontend/src/stores/theme.ts
#	frontend/src/views/desktop/ManagerWorkspace.vue
#	frontend/src/views/desktop/WorkPlans.vue
#	frontend/src/views/mobile/KeyVisitForm.vue
#	frontend/src/views/mobile/LeaveForm.vue
#	frontend/src/views/mobile/PlansList.vue
#	frontend/src/views/mobile/VisitForm.vue
#	frontend/src/views/mobile/WorkPlanForm.vue

backend/app/services/dashboard.py

@@ -132,10 +132,14 @@ async def get_reporting_progress(db: AsyncSession, reference_date: date | None =
             } if leave else None,
         })
 
-    # Check today's reporting — visits OR daily notes
-    today_visits = await db.execute(
-        select(Visit.manager_id).where(Visit.visit_date == today)
+    # Check today's reporting — visits (direct + companions) OR daily notes
+    from sqlalchemy import union_all
+    today_direct = select(Visit.manager_id).where(Visit.visit_date == today)
+    today_companion = select(func.unnest(Visit.companions).label("manager_id")).where(
+        Visit.visit_date == today, Visit.companions.isnot(None)
     )
+    today_combined = union_all(today_direct, today_companion).subquery()
+    today_visits = await db.execute(select(today_combined.c.manager_id))
     today_notes = await db.execute(
         select(DailyNote.manager_id).where(DailyNote.note_date == today)
     )
@@ -173,9 +177,13 @@ async def get_weekly_report(
     # ── Visits ──
     visit_query = select(Visit).where(Visit.visit_date >= monday, Visit.visit_date <= sunday)
     if role == "manager":
-        visit_query = visit_query.where(Visit.manager_id == user_id)
+        visit_query = visit_query.where(
+            (Visit.manager_id == user_id) | (Visit.companions.any(user_id))
+        )
     elif filter_manager_id:
-        visit_query = visit_query.where(Visit.manager_id == filter_manager_id)
+        visit_query = visit_query.where(
+            (Visit.manager_id == filter_manager_id) | (Visit.companions.any(filter_manager_id))
+        )
     if filter_customer_id:
         visit_query = visit_query.where(Visit.customer_id == filter_customer_id)
     visit_query = visit_query.order_by(Visit.visit_date.desc())