|
|
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 |
|
|
|
44c5595173
|
terminado a falta del resumen
|
2024-05-21 20:43:47 +02:00 |
|
|
|
77c284c9b4
|
finalizando el edit
|
2024-05-21 17:33:10 +02:00 |
|
|
|
2364edb684
|
Actualizacion automatica: 2024-05-21 15:49:10
|
2024-05-21 15:49:11 +02:00 |
|
|
|
3cb756a42f
|
Añadiendo preview thumbnail y detalles
|
2024-05-20 22:45:11 +02:00 |
|
|
|
8b1114dc7f
|
hay que corregir el checkeo de lineas con las paginas
|
2024-05-20 21:20:09 +02:00 |
|
|
|
75df199c5d
|
trabajando en edit
|
2024-05-20 16:18:54 +02:00 |
|
|
|
5d80eacb3f
|
Merge branch 'dev/default_permisos' into 'main'
Merge branch 'main' into 'dev/default_permisos'
See merge request jjimenez/safekat!249
|
2024-05-19 18:37:40 +00:00 |
|
|
|
6d31cbe33e
|
Merge branch 'main' into 'dev/default_permisos'
Main
See merge request jjimenez/safekat!248
|
2024-05-19 18:36:18 +00:00 |
|
|
|
0ac3414a95
|
Merge branch 'dev/añadir_palets_cajas' into 'main'
Dev/añadir palets cajas
See merge request jjimenez/safekat!247
|
2024-05-19 18:34:52 +00:00 |
|
|
|
e3e21d2b1e
|
trabajando en editar y rellenar el presupuesto
|
2024-05-19 20:33:20 +02:00 |
|
|
|
79d89b9718
|
trabajando en el editar
|
2024-05-18 21:13:58 +02:00 |
|
|
|
1741d6cd60
|
terminado añadir presupuesto a falta de volver en el botón
|
2024-05-18 12:07:30 +02:00 |
|
|
|
6c748a8a2d
|
haciendo pruebas
|
2024-05-18 10:19:25 +02:00 |
|
|
|
efa327fb48
|
Merge branch 'bug/presupuesto_cliente' into 'dev/añadir_palets_cajas'
Bug/presupuesto cliente
See merge request jjimenez/safekat!246
|
2024-05-17 09:27:48 +00:00 |
|
|
|
9fd701a6b4
|
Merge branch 'main' into 'bug/presupuesto_cliente'
Main
See merge request jjimenez/safekat!245
|
2024-05-17 09:27:00 +00:00 |
|
|
|
5bfdb50a83
|
Merge branch 'bug/orden_tarifas_enc_2' into 'main'
medio arreglado
See merge request jjimenez/safekat!244
|
2024-05-16 16:40:29 +00:00 |
|
|
|
01eff4f323
|
medio arreglado
|
2024-05-16 18:39:59 +02:00 |
|
|
|
b110fd063c
|
falta guardar tiradas
|
2024-05-16 14:52:18 +02:00 |
|
|
|
fdb1fe77db
|
trabajando en guardar presupuesto
|
2024-05-14 17:39:28 +02:00 |
|
|
|
0c78f0af7a
|
añadida entrega a pie de calle y lomo_cubierta
|
2024-05-13 14:00:43 +02:00 |
|
|
|
4a12aad3dc
|
Merge branch 'bug/presupuesto_cliente' into 'dev/añadir_palets_cajas'
Integrando preview de cliente
See merge request jjimenez/safekat!243
|
2024-05-13 08:22:28 +00:00 |
|
|
|
745474a37f
|
cambio en dim máximo cubierta y expuesto lomo
|
2024-05-13 10:22:03 +02:00 |
|
|
|
fa0e344b76
|
Integrando preview de cliente
|
2024-05-12 22:55:02 +02:00 |
|
|
|
d5c4068c11
|
flechas boton anterior corregidas
|
2024-05-10 18:06:23 +02:00 |
|
|
|
782c0e7c88
|
cambios realizados y bug direcciones corregidos
|
2024-05-10 17:59:54 +02:00 |
|
|
|
bba9dab9ba
|
Merge branch 'dev/core_updates_3' into 'main'
Arreglando profile y pequeños bugs
See merge request jjimenez/safekat!242
|
2024-05-10 12:24:57 +00:00 |
|
|
|
4510c86122
|
Merge branch 'main' into 'dev/core_updates_3'
# Conflicts:
# ci4/app/Views/themes/vuexy/main/menu_impresion.php
|
2024-05-10 12:24:49 +00:00 |
|
|
|
b3ce3e202d
|
Merge branch 'dev/presupuesto_cliente_2' into 'main'
Dev/presupuesto cliente 2
See merge request jjimenez/safekat!241
|
2024-05-10 11:58:03 +00:00 |
|
|
|
9a66357a89
|
finalizado a espera de pruebas
|
2024-05-10 12:35:47 +02:00 |
|
|
|
39dccf2bfd
|
finalizado a espera de pruebas
|
2024-05-10 12:33:14 +02:00 |
|
|
|
5ae6618c37
|
falta sumar envios
|
2024-05-09 22:08:38 +02:00 |
|
|
|
4debac578a
|
trabajando en resumen
|
2024-05-09 19:09:21 +02:00 |
|
|
|
fe382c0bed
|
Arreglando profile y pequeños bugs
|
2024-05-08 23:42:54 +02:00 |
|
|
|
4452ab02bd
|
arreglados un par de fallos
|
2024-05-08 23:39:45 +02:00 |
|
|
|
eec9ac60de
|
arreglado problemas despues de merge conflictivo
|
2024-05-08 23:28:44 +02:00 |
|
|
|
e04c978c38
|
Merge branch 'main' into 'dev/presupuesto_cliente_2'
Main
See merge request jjimenez/safekat!240
|
2024-05-08 18:45:04 +00:00 |
|
