Merge origin/development: resolved conflicts in scripts/init_first_time.sh, backend/api/v1/modules/a76/invoices/services.py, .gitignore and others

This commit is contained in:
hreyes
2026-02-27 11:46:16 -07:00
169 changed files with 20436 additions and 2257 deletions

View File

@@ -7,7 +7,7 @@ from typing import List, Optional
from core.database import get_core_db
from core.security import get_current_user, validate_access_to_resource
from fastapi import APIRouter, Depends, HTTPException, Query
from sqlalchemy.orm import Session
from sqlalchemy.orm import Session, joinedload
from api.v1.common.tenant_crud_routes import TenantCRUDRoutes
from .models import ClientOrProviderEnum
@@ -44,7 +44,10 @@ async def get_clients_and_providers(
"""Get clients and providers"""
tenant_id = validate_access_to_resource(db, company_id, current_user)
query = db.query(ClientProvider).filter(
query = db.query(ClientProvider).options(
joinedload(ClientProvider.address),
joinedload(ClientProvider.programs)
).filter(
ClientProvider.tenant_id == tenant_id,
ClientProvider.company_id == company_id,
)