fix: corriegiendo la compilaciond el frontend de script mal ejecutado

backend/api/v1/modules/a76/general_catalogs/classification_concepts/routes.py

@@ -11,13 +11,10 @@ router = TenantCRUDRoutes(
     tags=["a76.general_catalogs.classification_concepts"],
     resource_name="Classification Concept",
     enable_list=True,
-<<<<<<< HEAD
     list_permissions=["cat_classification.view"],
     get_permissions=["cat_classification.view"],
     create_permissions=["cat_classification.create"],
     update_permissions=["cat_classification.edit"],
     delete_permissions=["cat_classification.delete"],
-=======
     enable_filters=True,
->>>>>>> 88ab6b45df947b2091e7cd5fff7468284a0ceef6
 ).router

backend/api/v1/modules/a76/general_catalogs/doda/routes.py

@@ -169,13 +169,7 @@ _crud_router = TenantCRUDRoutes(
     enable_list=True,
     enable_filters=True,
 ).router
-<<<<<<< HEAD
-
-router = crud_router
-
-=======
 router.include_router(_crud_router)
->>>>>>> 103363c6315f9235252cc443c8e0093ba401c6c2
 
 
 @router.get(
@@ -199,8 +193,6 @@ async def get_doda_detail(
     return DodaDetailResponseDTO.model_validate(doda)
 
 
-<<<<<<< HEAD
-=======
 @router.get(
     "/{doda_id}/print",
     summary="Imprimir DODA (PDF)",
@@ -282,7 +274,6 @@ async def print_doda_pdf(
 
 
 # ============ CONTAINERS ENDPOINTS ============
->>>>>>> 103363c6315f9235252cc443c8e0093ba401c6c2
 @router.get(
     "/{doda_id}/containers",
     response_model=List[DodaContainerResponseDTO],
@@ -341,8 +332,6 @@ async def update_container(
     return DodaContainerResponseDTO.model_validate(container)
 
 
-<<<<<<< HEAD
-=======
 @router.delete(
     "/{doda_id}/containers/{container_line}",
     status_code=status.HTTP_204_NO_CONTENT,
@@ -418,7 +407,6 @@ async def delete_container_seal(
 
 
 # ============ AMERICAN PEDIMENTOS ENDPOINTS ============
->>>>>>> 103363c6315f9235252cc443c8e0093ba401c6c2
 @router.get(
     "/{doda_id}/american-pedimentos",
     response_model=List[DodaAmericanPedimentoResponseDTO],
@@ -454,8 +442,6 @@ async def add_american_pedimento(
     return DodaAmericanPedimentoResponseDTO.model_validate(pedimento)
 
 
-<<<<<<< HEAD
-=======
 # ============ AMERICAN PEDIMENTOS (DELETE) ============
 @router.delete(
     "/{doda_id}/american-pedimentos/{pedimento_line}",
@@ -473,7 +459,6 @@ async def delete_american_pedimento(
 
 
 # ============ PEDIMENTOS ENDPOINTS ============
->>>>>>> 103363c6315f9235252cc443c8e0093ba401c6c2
 @router.get(
     "/{doda_id}/pedimentos",
     response_model=List[DodaPedimentoResponseDTO],

backend/api/v1/modules/a76/general_catalogs/fractions/us_tariff_fractions/routes.py

@@ -42,13 +42,6 @@ def _sitar_row_to_us_response_payload(item: FraccionesUSAResponse) -> dict:
 main_router = APIRouter(
     prefix="/us-tariff-fractions",
     tags=["a76 / general catalogs / us tariff fractions"],
-    resource_name="US Tariff Fraction",
-    id_name="id",
-    enable_list=False, # We implement our custom list endpoint
-    create_permissions=["frac_american.create"],
-    update_permissions=["frac_american.edit"],
-    delete_permissions=["frac_american.delete"],
-    get_permissions=["frac_american.view"],
 )
 
 

backend/api/v1/modules/public/reference_data/containers/routes.py

@@ -16,11 +16,8 @@ router = APIRouter(prefix="/containers")
 async def list_containers(
     page: int = Query(1, ge=1, description="Número de página"),
     page_size: int = Query(50, ge=1, le=100, description="Tamaño de página"),
-<<<<<<< HEAD
     company_id: int = Query(..., description="ID de la empresa"),
-=======
     search: str = Query(None, description="Término de búsqueda"),
->>>>>>> 88ab6b45df947b2091e7cd5fff7468284a0ceef6
     db: Session = Depends(get_core_db),
     current_user: dict = Depends(get_current_user),
 ):