fix: cambios locales antes del merge

frontend/src/lib/components/dashboard/general_catalogs/doda/columns.ts

@@ -2,9 +2,12 @@ import type { ColumnDef } from '@tanstack/table-core';
 import type { Doda } from '$lib/api/dashboard/a76/general_catalogs/doda';
 import { renderComponent, renderSnippet } from '$lib/components/ui/data-table';
 import { createRawSnippet } from 'svelte';
+<<<<<<< HEAD
 import DataTableActions from './data-table-actions.svelte';
+=======
 import { getLocale } from '$lib/paraglide/runtime';
 import { dodaFormT, type DodaFormKey } from '$lib/i18n/doda-form-strings';
+>>>>>>> 103363c6315f9235252cc443c8e0093ba401c6c2
 
 /**
  * doda_date se almacena como Integer con formato YYYYMMDD (ej. 20180409).
@@ -31,6 +34,12 @@ function formatDodaDate(val?: number | string | null): string {
     }
 }
 
+<<<<<<< HEAD
+export function createColumns(
+    onSuccess?: () => void,
+    { canEdit = true, canDelete = true }: { canEdit?: boolean; canDelete?: boolean } = {}
+): ColumnDef<Doda>[] {
+=======
 const STATUS_CLASSES: Record<string, string> = {
     GENERADO:   'bg-blue-100   text-blue-800   dark:bg-blue-900/30   dark:text-blue-300',
     'EN PROCESO':'bg-yellow-100 text-yellow-800 dark:bg-yellow-900/30 dark:text-yellow-300',
@@ -39,13 +48,9 @@ const STATUS_CLASSES: Record<string, string> = {
     ELIMINADO:  'bg-red-100    text-red-700    dark:bg-red-900/30    dark:text-red-300',
 };
 
-export function createColumns(
-    onSuccess?: () => void,
-    { canEdit = true, canDelete = true }: { canEdit?: boolean; canDelete?: boolean } = {}
-): ColumnDef<Doda>[] {
-    const loc = getLocale() as 'en' | 'es';
+export function createColumns(loc: 'en' | 'es'): ColumnDef<Doda>[] {
     const t = (k: DodaFormKey) => dodaFormT(loc, k);
-
+>>>>>>> 103363c6315f9235252cc443c8e0093ba401c6c2
     return [
         {
             accessorKey: 'id',

frontend/src/lib/components/dashboard/general_catalogs/doda/data-table-actions.svelte

@@ -59,8 +59,9 @@
     </DropdownMenu.Trigger>
     <DropdownMenu.Content align="end">
         <DropdownMenu.Label>Acciones</DropdownMenu.Label>
+<<<<<<< HEAD
         {#if canEdit}
-            <DropdownMenu.Item onclick={() => goto(`/dashboard/general_catalogs/doda?doda_id=${item.id}`)}>
+            <DropdownMenu.Item onclick={() => goto(`/dashboard/general_catalogs/doda/edit/${item.id}`)}>
                 <Pencil class="mr-2 h-4 w-4" />
                 Editar
             </DropdownMenu.Item>
@@ -75,5 +76,20 @@
                 Eliminar
             </DropdownMenu.Item>
         {/if}
+=======
+        <DropdownMenu.Item onclick={() => goto(`/dashboard/general_catalogs/doda?doda_id=${item.id}`)}>
+            <Pencil class="mr-2 h-4 w-4" />
+            Editar
+        </DropdownMenu.Item>
+        <DropdownMenu.Item onclick={handleDelete} class="text-red-600">
+            {#if loading}
+                <LoaderCircle class="mr-2 h-4 w-4 animate-spin" />
+            {:else}
+                <Trash2 class="mr-2 h-4 w-4" />
+            {/if}
+            Eliminar
+        </DropdownMenu.Item>
+>>>>>>> 103363c6315f9235252cc443c8e0093ba401c6c2
     </DropdownMenu.Content>
 </DropdownMenu.Root>
+

frontend/src/lib/components/sidebar/modules.ts

@@ -13,7 +13,6 @@ import {
 	Hash,
 	LayoutDashboard,
 	Package,
-	PackageCheck,
 	Settings2,
 	Shield,
 	Ship,
@@ -291,6 +290,10 @@ export function getSidebarData(): SidebarData {
 						title: m["sidebar.general_catalogs.customs_warehouses"](),
 						url: "/dashboard/reference_data/customs_warehouses",
 					},
+					{
+						title: m["sidebar.general_catalogs.doda"](),
+						url: "/dashboard/general_catalogs/doda",
+					},
 					{
 						title: m["sidebar.general_catalogs.prevalidators"](),
 						url: "/dashboard/general_catalogs/prevalidators",
@@ -448,8 +451,12 @@ export function getSidebarData(): SidebarData {
 				items: [
 					{
 						title: m["sidebar.export_invoices.exportation"](),
-						url: "/dashboard/invoices?operation_type=exp&invoice_type=EXDEF",
+<<<<<<< HEAD
+						url: "/dashboard/invoices?operation_type=exp",
 						permission: "invoice.exp.view"
+=======
+						url: "/dashboard/invoices?operation_type=exp&invoice_type=EXDEF",
+>>>>>>> 88ab6b45df947b2091e7cd5fff7468284a0ceef6
 					},
 					{
 						title: m["sidebar.export_invoices.repair"](),
@@ -530,19 +537,10 @@ export function getSidebarData(): SidebarData {
 				],
 			},
 			{
-				title: m["sidebar.despacho.title"](),
-				url: "#",
-				icon: PackageCheck,
-				items: [
-					{
-						title: m["sidebar.despacho.digitalizacion"](),
-						url: "/dashboard/digitalizacion",
-					},
-					{
-						title: m["sidebar.despacho.doda"](),
-						url: "/dashboard/despacho/doda",
-					},
-				],
+				title: m["sidebar.digitalizacion.title"](),
+				url: "/dashboard/digitalizacion",
+				icon: FolderArchive,
+				items: [],
 			},
 			{
 				title: m["sidebar.reference_data.configuracion"](),