|
|
22deda2aea
|
Merge branch 'main' into 'dev/pedidos_v1'
Main
See merge request jjimenez/safekat!270
|
2024-06-11 06:54:06 +00:00 |
|
|
|
2143660cf6
|
añadidos entidades y modelos. Hecha lista de todos
|
2024-06-11 08:53:20 +02:00 |
|
|
|
e5004e762a
|
Merge branch 'dev/vista_cliente' into 'main'
Configurada vista de clientes
See merge request jjimenez/safekat!269
|
2024-06-07 15:22:57 +00:00 |
|
|
|
720346e8e3
|
Configurada vista de clientes
|
2024-06-07 17:22:25 +02:00 |
|
|
|
bc85572610
|
Merge branch 'main' into 'dev/pedidos_v1'
Main
See merge request jjimenez/safekat!268
|
2024-06-07 14:49:05 +00:00 |
|
|
|
8815319577
|
Merge branch 'bug/filtros_cabecera_presu' into 'main'
ya se filtra bien
See merge request jjimenez/safekat!267
|
2024-06-07 14:47:54 +00:00 |
|
|
|
38abbe22a7
|
ya se filtra bien
|
2024-06-07 16:47:11 +02:00 |
|
|
|
aac17468c3
|
Merge branch 'mod/presu_cliente' into 'main'
Mod/presu cliente
See merge request jjimenez/safekat!266
|
2024-06-07 13:36:18 +00:00 |
|
|
|
94cf67a47f
|
Arreglado bug del lomo cubierta
|
2024-06-07 13:10:32 +02:00 |
|
|
|
120e46f994
|
Falta lomo
|
2024-06-06 19:55:51 +02:00 |
|
|
|
af6780b36c
|
Merge branch 'bug/siguiente_presu_cliente' into 'main'
Bug/siguiente presu cliente
See merge request jjimenez/safekat!265
|
2024-06-06 10:22:56 +00:00 |
|
|
|
d2f5b77f16
|
Corregido bug
|
2024-06-06 12:22:32 +02:00 |
|
|
|
db3ada3830
|
modificando las cosas
|
2024-06-06 12:00:44 +02:00 |
|
|
|
552ef89cd7
|
Merge branch 'main' into 'dev/pedidos_v1'
Main
See merge request jjimenez/safekat!264
|
2024-06-05 14:13:23 +00:00 |
|
|
|
5ee6a2c97e
|
Merge branch 'dev/anadir_ficheros_presu' into 'main'
Dev/anadir ficheros presu
See merge request jjimenez/safekat!263
|
2024-06-05 09:47:51 +00:00 |
|
|
|
dd65b1fd88
|
Merge branch 'main' into 'dev/anadir_ficheros_presu'
Main
See merge request jjimenez/safekat!262
|
2024-06-05 09:47:04 +00:00 |
|
|
|
96a1faf97a
|
Delete xdebug.log
|
2024-06-05 09:46:39 +00:00 |
|
|
|
673a903c75
|
Delete xdebug.log
|
2024-06-05 09:43:43 +00:00 |
|
|
|
c588936f00
|
modificado gitignore
|
2024-06-05 11:38:55 +02:00 |
|
|
|
1453140005
|
terminado dropzone
|
2024-06-05 11:35:29 +02:00 |
|
|
|
7e68ec5948
|
Añadido clase intranet para exponer archivos detras del root_path
|
2024-06-04 23:10:10 +02:00 |
|
|
|
7e878c00b2
|
falta cargar thumbail y preview
|
2024-06-04 20:05:12 +02:00 |
|
|
|
51d4f988cc
|
queda preview y cargar ficheros del server
|
2024-06-04 15:16:32 +02:00 |
|
|
|
78126f6549
|
falta backend meter en bbdd y borrar antiguos
|
2024-06-03 17:34:38 +02:00 |
|
|
|
8833999e8d
|
trabajando en el dropzone 2
|
2024-06-03 15:33:51 +02:00 |
|
|
|
b4bddaea6a
|
Actualizacion automatica: 2024-06-03 13:40:32
|
2024-06-03 13:40:34 +02:00 |
|
|
|
9ee559fd2f
|
Merge branch 'dev/clientes_lista_soporte' into 'main'
añadida busqueda correcta de persona de soporte en clientes
See merge request jjimenez/safekat!260
|
2024-06-03 10:15:32 +00:00 |
|
|
|
3151d95ec2
|
añadida busqueda correcta de persona de soporte en clientes
|
2024-06-03 12:14:52 +02:00 |
|
|
|
234006783c
|
trabajando en dropzone
|
2024-06-03 12:01:40 +02:00 |
|
|
|
1146929beb
|
Merge branch 'bug/cliente_error' into 'main'
resuelto problema de la tabla de precios y añadida lista a los comerciales
See merge request jjimenez/safekat!259
|
2024-06-02 17:56:21 +00:00 |
|
|
|
1d969e5c9f
|
resuelto problema de la tabla de precios y añadida lista a los comerciales
|
2024-06-02 19:55:38 +02:00 |
|
|
|
ce753ef926
|
Merge branch 'bug/new_user' into 'main'
ya se pueden añadir usuarios
See merge request jjimenez/safekat!258
|
2024-06-02 17:12:16 +00:00 |
|
|
|
42b213922c
|
ya se pueden añadir usuarios
|
2024-06-02 19:11:30 +02:00 |
|
|
|
3119005688
|
Merge branch 'bug/tamanio_personalizado' into 'main'
arreglado bug de tamanio personalizado y presupuesto solo a color
See merge request jjimenez/safekat!257
|
2024-05-23 14:33:25 +00:00 |
|
|
|
84e1bc8d27
|
arreglado bug de tamanio personalizado y presupuesto solo a color
|
2024-05-23 16:32:25 +02:00 |
|
|
|
0b5741de7c
|
Merge branch 'func/copiar_tarifas_encuadernacion' into 'main'
creada funcion en controlador de Test para clonar tarifas de encuadernacion existentes
See merge request jjimenez/safekat!256
|
2024-05-23 13:42:25 +00:00 |
|
|
|
56c828f387
|
creada funcion en controlador de Test para clonar tarifas de encuadernacion existentes
|
2024-05-23 15:41:10 +02:00 |
|
|
|
ef2649c3fd
|
Merge branch 'bug/guardas_cliente' into 'main'
arraglados algunos bugs
See merge request jjimenez/safekat!255
|
2024-05-22 15:15:47 +00:00 |
|
|
|
9e0ff7501e
|
arraglados algunos bugs
|
2024-05-22 17:14:49 +02:00 |
|
|
|
9a98ffd6e6
|
Merge branch 'bug/add-presu-cliente' into 'main'
Bug/add presu cliente
See merge request jjimenez/safekat!254
|
2024-05-22 14:30:59 +00:00 |
|
|
|
667a2ab679
|
reparados bugs
|
2024-05-22 16:30:05 +02:00 |
|
|
|
e4f6295597
|
reparando bugs
|
2024-05-22 16:22:55 +02:00 |
|
|
|
1063c95fc0
|
Merge branch 'dev/editar_presu_cliente' into 'main'
Dev/editar presu cliente
See merge request jjimenez/safekat!253
|
2024-05-22 13:07:15 +00:00 |
|
|
|
b036e2ce32
|
adaptado el preview a presupuestos confirmados
|
2024-05-22 15:06:19 +02:00 |
|
|
|
a3962da518
|
Merge branch 'main' into 'dev/editar_presu_cliente'
Main
See merge request jjimenez/safekat!252
|
2024-05-22 11:26:57 +00:00 |
|
|
|
e2c8cb0f7c
|
arreglando resumen
|
2024-05-22 13:26:36 +02:00 |
|
|
|
3d80216780
|
terminado editar cliente
|
2024-05-22 13:22:14 +02:00 |
|
|
|
d205fb7c6b
|
Merge branch 'dev/preview' into 'main'
Dev/preview
See merge request jjimenez/safekat!251
|
2024-05-22 09:39:12 +00:00 |
|
|
|
7ad551238d
|
Terminado previews listos para verificar por cliente
|
2024-05-22 11:28:56 +02:00 |
|
|
|
889ad57adc
|
Actualizacion automatica: 2024-05-22 09:24:56
|
2024-05-22 09:24:57 +02:00 |
|
