Commit Graph

611 Commits

Author SHA1 Message Date
63254f0bf3 Merge branch 'main' into 'feat/catalogo'
Main

See merge request jjimenez/safekat!718
2025-04-21 12:07:04 +00:00
12e06937c4 add 755 app 2025-04-21 12:55:45 +02:00
969966ac78 add select imposicion datatable 2025-04-21 08:32:21 +02:00
14b5f4bf95 Revisados formularios de crear y editar, con su validacion 2025-04-20 21:35:24 +02:00
c3d38e29a4 imposiciones 2025-04-20 19:26:07 +02:00
f93ecda648 Creado concepto de ISK 2025-04-20 15:58:43 +02:00
2a8c4b9da6 fix ot 2025-04-16 19:55:30 +02:00
c42f223b9a Configurando la logica del catalogo (JS) 2025-04-16 16:10:04 +02:00
c76f4428a6 ot general features 2025-04-16 15:51:09 +02:00
7ee844fb0c colores header pdf ot 2025-04-16 09:14:16 +02:00
a74021f97d Merge branch 'main' into 'feat/catalogo'
Main

See merge request jjimenez/safekat!707
2025-04-15 19:07:51 +00:00
c6db000057 fix update pedido espera update 2025-04-15 19:39:07 +02:00
7cf1bf006d Prrrrrrrrrrr 2025-04-15 16:05:11 +02:00
2102a44a1e Merge branch 'feat/ot-messages' into feat/sk-38+messages+dates 2025-04-15 01:32:20 +02:00
ab99baaa81 add new dates in form 2025-04-15 01:30:46 +02:00
9f46569b01 add messages to ot 2025-04-15 00:42:24 +02:00
14c5cf493c add new dates 2025-04-14 23:36:39 +02:00
c75a2f9ef4 Construyendo el formulario de edicion 2025-04-14 14:45:35 +02:00
0d21a7ab3b Merge branch 'main' into feat/sk-40/sk-37 2025-04-14 08:50:36 +02:00
e9827c3557 fechas pedido and imposiciones 2025-04-14 08:05:03 +02:00
f343071311 fix deleted at 2025-04-13 09:54:17 +02:00
e2da90926d Listado de libros de catalogo 2025-04-13 09:46:47 +02:00
08a91294b4 dates users ot 2025-04-13 09:43:15 +02:00
f5d01e520a Merge branch 'main' into feat/imposiciones/sk-40 2025-04-12 23:54:52 +02:00
ba9c4dc339 imposiciones 2025-04-12 23:53:48 +02:00
5e8da603f9 Merge branch 'main' into 'feat/catalogo'
Main

See merge request jjimenez/safekat!697
2025-04-12 20:21:30 +00:00
abc8db6b8b Merge branch 'main' into 'mod/autoroute'
terminado añadir usuarios y fechas a pedidos. añadido inaplazable. color en...

See merge request jjimenez/safekat!695
2025-04-12 20:18:05 +00:00
9981f878d1 Inicializacion del modulo catalogo 2025-04-12 22:04:34 +02:00
89531f1a1b terminado el flujo completo de facturas, incluyendo cambio en el texto de pedidos y facturas cuando no tiene factura validada 2025-04-12 17:47:36 +02:00
bb9f6210e7 terminado añadir usuarios y fechas a pedidos. añadido inaplazable. color en rojo en fechas cuando inaplazable 2025-04-12 10:00:24 +02:00
1e339b5503 delete is_deleted field 2025-04-11 06:56:55 +02:00
7139bb377c falta autonumeric 2025-04-10 15:34:14 +02:00
af57f7d5ae Modificado Paises al metodo JS 2025-04-09 00:37:30 +02:00
3cfdc584e5 Añadida estructura de rutas en carpeta dedicada 2025-04-08 15:04:14 +02:00
644ad41001 todo okgit pullgit pull 2025-04-08 00:28:45 +02:00
6c20121f0c Merge branch 'main' into 'fix/arreglar_resumen_cliente_vs_admin'
Main

See merge request jjimenez/safekat!674
2025-04-07 21:39:12 +00:00
885aea495c falta factores cliente 2025-04-07 23:38:31 +02:00
a62e51d31c Merge branch 'main' into 'mod/ajustes_mail'
Main

See merge request jjimenez/safekat!670
2025-04-07 20:16:02 +00:00
4f5bc3301f Eliminados ajustes de sistemas. Ahora estan en variables del ERP 2025-04-07 22:14:44 +02:00
ce1d94bbda añadido pendiente en erp antiguo 2025-04-07 21:32:36 +02:00
66825d3286 quitada la condición isactivo en el listado 2025-04-07 18:38:29 +02:00
78584f22c3 cambiado a papel generico la descripción del pedido (y de facturas por tanto) 2025-04-07 07:10:17 +02:00
2de72e4278 añadidos totales a tarifas de clientes 2025-04-06 19:35:39 +02:00
ce325d73dc Merge branch 'main' into fix/permisos-mensajeria-sidebar 2025-04-06 09:49:46 +02:00
c42a7bae44 Merge branch 'main' into fix/permisos-mensajeria-sidebar 2025-04-06 09:40:09 +02:00
75eea1a736 Merge branch 'main' into feat/sk-32 2025-04-06 06:03:44 +02:00
139724ae8a update model with files and new attributes 2025-04-05 09:40:08 +02:00
244361a1ce Merge branch 'main' into 'add/ajustar_margen'
Mergeados UserModel's y eliminadas referencias a App\Models\UserModel a favor...

See merge request jjimenez/safekat!654
2025-04-04 15:03:45 +00:00
cddf64b025 terminada modificacion 2025-04-04 17:03:08 +02:00
3d6e8b4886 update with ot files 2025-04-04 00:52:41 +02:00