|
|
c5feb39e8b
|
Merge branch 'feat/listados_cliente_form' of https://git.imnavajas.es/jjimenez/safekat into feat/listados_cliente_form
|
2025-03-31 09:58:06 +02:00 |
|
|
|
d5534269b3
|
añadido facturas. faltan filtros pedidos
|
2025-03-31 09:57:45 +02:00 |
|
|
|
dde339ad44
|
Merge branch 'main' into 'feat/listados_cliente_form'
Main
See merge request jjimenez/safekat!629
|
2025-03-31 07:48:41 +00:00 |
|
|
|
cdc4bf6fcd
|
Merge branch 'feat/corte-ot-planning' into 'main'
toggle corte rotativa planning
See merge request jjimenez/safekat!628
|
2025-03-31 07:06:51 +00:00 |
|
|
|
460cb0344f
|
toggle corte rotativa planning
|
2025-03-31 09:05:03 +02:00 |
|
|
|
c7fdd1a9a3
|
Merge branch 'fix/sk-7/bugs' into 'main'
Fix/sk 7/bugs
See merge request jjimenez/safekat!627
|
2025-03-30 22:22:34 +00:00 |
|
|
|
c65c6571cd
|
Merge branch 'main' into fix/sk-7/bugs
|
2025-03-31 00:19:12 +02:00 |
|
|
|
ba0ad10935
|
fix bugs sk-7
|
2025-03-31 00:17:49 +02:00 |
|
|
|
e1fa993fcd
|
añadido facturas. faltan filtros pedidos
|
2025-03-30 21:36:17 +02:00 |
|
|
|
4991642d48
|
feat delete portada and remove loader
|
2025-03-30 19:30:30 +02:00 |
|
|
|
053ce49279
|
fix encuadernacion pliegos ot pdf and tareas maquinas primera
|
2025-03-30 18:20:05 +02:00 |
|
|
|
bc969828b9
|
ot pdf download
|
2025-03-30 14:22:43 +02:00 |
|
|
|
f553641818
|
Merge branch 'fix/varios_presupuesto_admin' into 'main'
arreglado calculo de credito total y vista en euros del toast del total de presupuesto en admin
See merge request jjimenez/safekat!626
|
2025-03-30 08:30:08 +00:00 |
|
|
|
5a5ce4835b
|
arreglado calculo de credito total y vista en euros del toast del total de presupuesto en admin
|
2025-03-30 10:29:38 +02:00 |
|
|
|
4810ab99c1
|
Merge branch 'fix/calculo_creditos_presupuesto' into 'main'
arreglado problema con el resumen y valores totales a la hora de crear presupuestr
See merge request jjimenez/safekat!625
|
2025-03-29 13:04:25 +00:00 |
|
|
|
18f391a733
|
arreglado problema con el resumen y valores totales a la hora de crear presupuestr
|
2025-03-29 14:03:56 +01:00 |
|
|
|
1bd27776f4
|
Merge branch 'add/tabla_credito_presupuesto' into 'main'
Add/tabla credito presupuesto
See merge request jjimenez/safekat!624
|
2025-03-29 10:32:27 +00:00 |
|
|
|
30a6de5e75
|
Merge branch 'main' into 'add/tabla_credito_presupuesto'
Main
See merge request jjimenez/safekat!623
|
2025-03-29 10:31:40 +00:00 |
|
|
|
d1a9aaac77
|
añadida tabla de credito al presupuesto
|
2025-03-29 11:31:03 +01:00 |
|
|
|
e520b5b621
|
Merge branch 'feat/sk-7/planning' into 'main'
Feat/sk 7/planning
See merge request jjimenez/safekat!622
|
2025-03-29 10:09:22 +00:00 |
|
|
|
50cd951755
|
Merge branch 'main' into feat/sk-7/planning
|
2025-03-29 11:08:34 +01:00 |
|
|
|
8c64b678fe
|
planning plana
|
2025-03-29 11:07:36 +01:00 |
|
|
|
8d289fde15
|
Merge branch 'fix/tarifas_encuadernacion_view' into 'main'
arreglado form de tarifas enc
See merge request jjimenez/safekat!621
|
2025-03-28 12:29:27 +00:00 |
|
|
|
c4b1620c1b
|
arreglado form de tarifas enc
|
2025-03-28 13:29:01 +01:00 |
|
|
|
adfa8bc465
|
Merge branch 'add/calculo_credito_cliente' into 'main'
Add/calculo credito cliente
See merge request jjimenez/safekat!620
|
2025-03-27 23:53:07 +00:00 |
|
|
|
33ce64df0f
|
terminada revision de pedidos
|
2025-03-28 00:52:49 +01:00 |
|
|
|
0e91105f68
|
Merge branch 'main' into 'add/calculo_credito_cliente'
Main
See merge request jjimenez/safekat!619
|
2025-03-27 16:54:12 +00:00 |
|
|
|
06bd6d4870
|
Merge branch 'mod/add_pedidos_facturas_produccion' into 'main'
modificado select de añadir pedidos en facturas
See merge request jjimenez/safekat!618
|
2025-03-27 16:39:06 +00:00 |
|
|
|
e3c494e68d
|
modificado select de añadir pedidos en facturas
|
2025-03-27 17:38:42 +01:00 |
|
|
|
47455cd9c2
|
Merge branch 'fix/email_service' into 'main'
Añadido archivos EmailServies.php
See merge request jjimenez/safekat!617
|
2025-03-27 13:29:13 +00:00 |
|
|
|
5623df8797
|
Añadido archivos EmailServies.php
|
2025-03-27 14:28:56 +01:00 |
|
|
|
08cbee4ae8
|
Merge branch 'main' into 'add/calculo_credito_cliente'
Main
See merge request jjimenez/safekat!616
|
2025-03-27 13:02:39 +00:00 |
|
|
|
6929db5abc
|
Merge branch 'feat/sk-7/planning' into 'main'
Feat/sk 7/planning
See merge request jjimenez/safekat!615
|
2025-03-27 13:01:32 +00:00 |
|
|
|
f43dd069d6
|
email Service merge
|
2025-03-27 14:00:55 +01:00 |
|
|
|
5a5e0be855
|
planning rot
|
2025-03-27 13:57:37 +01:00 |
|
|
|
3430b2d9d1
|
Merge branch 'main' into 'add/calculo_credito_cliente'
Main
See merge request jjimenez/safekat!614
|
2025-03-27 11:24:03 +00:00 |
|
|
|
793f378f98
|
cambiado controlador test para evitar errores en el merge
|
2025-03-27 12:23:49 +01:00 |
|
|
|
670c10fdde
|
Merge branch 'dev/mail_service' into 'main'
Implementado servicio de envio de emails y funcion de envio a correo unico en etorno de desarrollo
See merge request jjimenez/safekat!613
|
2025-03-27 11:08:35 +00:00 |
|
|
|
f37805d310
|
Implementado servicio de envio de emails y funcion de envio a correo unico en etorno de desarrollo
|
2025-03-27 12:08:09 +01:00 |
|
|
|
e6ce820480
|
papel rotativa
|
2025-03-27 01:21:52 +01:00 |
|
|
|
1b38861465
|
credito
|
2025-03-26 23:31:31 +01:00 |
|
|
|
e44421fb4d
|
fix store ot
|
2025-03-26 23:29:19 +01:00 |
|
|
|
81573eede4
|
rotativa planning
|
2025-03-26 21:01:31 +01:00 |
|
|
|
09e8af15cc
|
probando todo
|
2025-03-26 20:59:04 +01:00 |
|
|
|
4a6b974e94
|
Merge branch 'fix/max_solapas_admin' into 'main'
arreglado
See merge request jjimenez/safekat!612
|
2025-03-26 18:37:23 +00:00 |
|
|
|
ee7c161ef2
|
arreglado
|
2025-03-26 19:36:50 +01:00 |
|
|
|
ff73caec21
|
Merge branch 'fix/open_cliente_presupuesto' into 'main'
modificado el link a cliente (icono busqueda) desde presupuesto admin
See merge request jjimenez/safekat!611
|
2025-03-26 18:03:31 +00:00 |
|
|
|
f89f3bf00f
|
modificado el link a cliente (icono busqueda) desde presupuesto admin
|
2025-03-26 19:03:08 +01:00 |
|
|
|
77093e7311
|
añadidas las conexiones a las vistas
|
2025-03-26 14:50:45 +01:00 |
|
|
|
f2aa8f6287
|
Merge branch 'fix/generar_albaranes_ocultar' into 'main'
arreglado bug en albaranes
See merge request jjimenez/safekat!610
|
2025-03-25 23:06:21 +00:00 |
|
