|
|
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 |
|
|
|
13693655f1
|
arreglado bug en albaranes
|
2025-03-26 00:05:44 +01:00 |
|
|
|
927b58245d
|
Merge branch 'feat/sk-31' into 'main'
add all message datatable and alertboxes instead of toast
See merge request jjimenez/safekat!609
|
2025-03-25 19:15:09 +00:00 |
|
|
|
d15bbb42f1
|
add all message datatable and alertboxes instead of toast
|
2025-03-25 20:14:07 +01:00 |
|
|
|
99bd10b979
|
Merge branch 'fix/preview-presupuesto-cliente' into 'main'
Fix/preview presupuesto cliente
See merge request jjimenez/safekat!608
|
2025-03-25 17:55:11 +00:00 |
|
|
|
9c3ee4b24a
|
Merge branch 'main' into fix/preview-presupuesto-cliente
|
2025-03-25 18:54:45 +01:00 |
|
|
|
43dd04a0a2
|
fix preview download
|
2025-03-25 18:51:44 +01:00 |
|
|
|
8caa6e8bab
|
fix download
|
2025-03-25 18:29:39 +01:00 |
|
|
|
9ebdc4441f
|
Merge branch 'fix/guardar_tiradas_alternativas' into 'main'
arreglado el guardar tiradas alternativas en presupuesto admin
See merge request jjimenez/safekat!607
|
2025-03-25 17:25:36 +00:00 |
|
|
|
37fba3604a
|
arreglado el guardar tiradas alternativas en presupuesto admin
|
2025-03-25 18:25:11 +01:00 |
|
|
|
c3ab272de3
|
Merge branch 'mod/pedidos_albaranes' into 'main'
Mod/pedidos albaranes
See merge request jjimenez/safekat!606
|
2025-03-25 17:00:25 +00:00 |
|
|
|
c54242eb24
|
terminadas modificaciones albaranes
|
2025-03-25 18:00:02 +01:00 |
|
|
|
180b845b1a
|
modificando albaranes
|
2025-03-25 17:44:43 +01:00 |
|
|
|
7b3096efb3
|
Merge branch 'feat/sk-31' into 'main'
Feat/sk 31
See merge request jjimenez/safekat!605
|
2025-03-24 21:47:38 +00:00 |
|
|
|
20db840bf9
|
Merge branch 'main' into feat/sk-31
|
2025-03-24 22:46:25 +01:00 |
|
|
|
74867ca1ac
|
send email
|
2025-03-24 22:45:02 +01:00 |
|
|
|
3c4b7e71e4
|
Merge branch 'fix/falta_ficheros' into 'main'
añadidos ficheros faltantes
See merge request jjimenez/safekat!604
|
2025-03-24 10:49:00 +00:00 |
|
|
|
9d6ead4472
|
añadidos ficheros faltantes
|
2025-03-24 11:48:11 +01:00 |
|
|
|
c0d54e28b7
|
message refactor
|
2025-03-24 08:12:06 +01:00 |
|
|
|
754bea37a8
|
Merge branch 'mod/pedido_form' into 'main'
Mod/pedido form
See merge request jjimenez/safekat!603
|
2025-03-23 18:41:27 +00:00 |
|
|
|
67546d347f
|
añadido calculo y aviso de unidades en albaranes
|
2025-03-23 19:41:10 +01:00 |
|
|
|
a18207202c
|
añadido generar factura desde pedido
|
2025-03-23 13:14:46 +01:00 |
|
|
|
fc62ef582a
|
Merge branch 'mod/vista_factura_list' into 'main'
mejorada la vista de lista de facturas
See merge request jjimenez/safekat!602
|
2025-03-22 17:51:17 +00:00 |
|
