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/api/customers.py

@@ -51,6 +51,7 @@ async def list_customers(
     industry: Optional[str] = Query(None),
     service: Optional[str] = Query(None),
     manager_id: Optional[str] = Query(None),
+    customer_type: Optional[str] = Query(None),
     page: int = Query(1, ge=1),
     page_size: int = Query(100, ge=1, le=1000),
     current_user: dict = Depends(get_current_user),
@@ -61,6 +62,8 @@ async def list_customers(
 
     base_query = select(Customer)
 
+    if customer_type:
+        base_query = base_query.where(Customer.customer_type == customer_type)
     if industry:
         base_query = base_query.where(Customer.industry.ilike(f"%{industry}%"))
     if service:
@@ -90,7 +93,7 @@ async def list_customers(
 
     # Paginate
     offset = (page - 1) * page_size
-    query = base_query.order_by(Customer.name).offset(offset).limit(page_size)
+    query = base_query.order_by(Customer.customer_type, Customer.name).offset(offset).limit(page_size)
     result = await db.execute(query)
     items = result.scalars().all()