mirror of
https://git.imnavajas.es/jjimenez/safekat.git
synced 2025-07-25 22:52:08 +00:00
727 lines
45 KiB
JSON
727 lines
45 KiB
JSON
{
|
||
hash: 34701e5960aca768b07152d3cd20f91398f55ee4,
|
||
author: Jaime Jimenez Ortega,
|
||
date: 2025-06-30 14:26:06 +0000,
|
||
message: Merge branch 'mod/lineas_presupuesto_costes_margenes' into 'main'
|
||
},
|
||
{
|
||
hash: 364b9f8ccd33059b1b374f4e5d8974e6c3510746,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-30 16:25:42 +0200,
|
||
message: coste-margen de clicks y horas en las lineas y a├▒adidos colores. se toca resumen para que todo cuadrea con lo nuevo
|
||
},
|
||
{
|
||
hash: b3336273d0a78022ec41eb8182fb30bc83f55a9f,
|
||
author: Jaime Jimenez Ortega,
|
||
date: 2025-06-30 10:20:13 +0000,
|
||
message: Merge branch 'fix/cambio_sobrecubierta_infinite_loop' into 'main'
|
||
},
|
||
{
|
||
hash: bbd2a389af34577c8049cebcb6d7690e44e7824f,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-30 12:19:53 +0200,
|
||
message: arreglado
|
||
},
|
||
{
|
||
hash: 8007e3376085ff856c80953133ddcc9ebee6d992,
|
||
author: Jaime Jimenez Ortega,
|
||
date: 2025-06-30 10:13:58 +0000,
|
||
message: Merge branch 'fix/change_limite_paginas' into 'main'
|
||
},
|
||
{
|
||
hash: 266e872f8fc418daf01c5f5a35b722da4087f007,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-30 12:13:23 +0200,
|
||
message: arreglado
|
||
},
|
||
{
|
||
hash: b11b1807d85002d4fa57fc26b322f6aca137df1b,
|
||
author: Jaime Jimenez Ortega,
|
||
date: 2025-06-30 09:47:47 +0000,
|
||
message: Merge branch 'fix/change_faja_infinite_loop' into 'main'
|
||
},
|
||
{
|
||
hash: f5a58dc32d2fd965b014cb38c1983ec8f3e9ed01,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-30 11:47:20 +0200,
|
||
message: arreglado el bucle infinito the change faja
|
||
},
|
||
{
|
||
hash: 102ba8267be871510ea5af7b9763695587407ba0,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-29 21:27:23 +0000,
|
||
message: Merge branch 'mod/presupuesto_catalogoId' into 'main'
|
||
},
|
||
{
|
||
hash: 508758331d48ebeb6caa243b4658b633ab4baacf,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-29 23:27:03 +0200,
|
||
message: A├▒adida la logica en importador de RAMA
|
||
},
|
||
{
|
||
hash: 416b4db91507d35ce95c4eaa14c5c2516ec3d829,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-29 23:09:09 +0200,
|
||
message: A├▒adida la logica de crear la columna y modelo
|
||
},
|
||
{
|
||
hash: 4e2003b8b8d073b83eb63d3df7bd75e0bf09ea89,
|
||
author: Jaime Jimenez Ortega,
|
||
date: 2025-06-28 10:46:15 +0000,
|
||
message: Merge branch 'fix/forzar_rotativa_obtener_interior_cliente' into 'main'
|
||
},
|
||
{
|
||
hash: 5590076d7d1d54a291b40bcd3c42ba225f703ce8,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-28 12:45:52 +0200,
|
||
message: corregidos varios fallos que no permitian cogetr la rotativa cuando es un presupuesto con forzar_rotativa_pod
|
||
},
|
||
{
|
||
hash: ddf3255a8af9409ae7700e9c8a48acb9e05f31ac,
|
||
author: Jaime Jimenez Ortega,
|
||
date: 2025-06-28 09:59:48 +0000,
|
||
message: Merge branch 'mod/presupuesto_cliente' into 'main'
|
||
},
|
||
{
|
||
hash: 4694d62cd487ac6cca82be55e710522fa07185be,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-28 11:52:34 +0200,
|
||
message: Merge branch 'main' into mod/presupuesto_cliente
|
||
},
|
||
{
|
||
hash: 0c85af66da9517e9200e3bc8d708efc4bd59b7e4,
|
||
author: Jaime Jimenez Ortega,
|
||
date: 2025-06-28 09:51:28 +0000,
|
||
message: Merge branch 'fix/importador_erpold_gramajes' into 'main'
|
||
},
|
||
{
|
||
hash: f6ffa20d5fc66f875e66dfd6fd52ea83a07a8c09,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-28 11:50:59 +0200,
|
||
message: modificado error de obtener gramajes en comparador cubierta. tambien corregido problema con la obtencion de gramajes en presupuesto admin que no cogia el valor de las solapas
|
||
},
|
||
{
|
||
hash: 53ec5945e880f08aae5b1d81e1b7105075492ff7,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-28 11:29:21 +0200,
|
||
message: trabajando en el formulario envio de ferros
|
||
},
|
||
{
|
||
hash: 9fcda514f0d78872646e54ddfa48bb6651de0103,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-28 11:27:39 +0200,
|
||
message: guardando direcciones ferro en presupuesto cliente
|
||
},
|
||
{
|
||
hash: 410d21dc5f3fcfd18f92908ffe7fd0778c332834,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-27 12:44:55 +0200,
|
||
message: trabajando en las direcciones ferro / prototipo
|
||
},
|
||
{
|
||
hash: 4a60bcdd615635501016e7dcc24b479ff82da3be,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-27 08:38:23 +0200,
|
||
message: corregido el texto del error del tipo de libro y que se borre el error
|
||
},
|
||
{
|
||
hash: 33a196667e9a209507bef2773aed7380474c5869,
|
||
author: Jaime Jimenez,
|
||
date: 2025-06-26 09:34:41 +0200,
|
||
message: modificado archivo de config para evitar error
|
||
},
|
||
{
|
||
hash: 03b43de1853b882ea58e06b67c255923d21cb5a1,
|
||
author: Jaime Jimenez,
|
||
date: 2025-06-26 08:58:13 +0200,
|
||
message: terminado datosGenerales para la validacion
|
||
},
|
||
{
|
||
hash: 2d267386a65345ab866f87d92d7fdcb88a94bd5e,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-25 18:27:17 +0200,
|
||
message: nuevo docker
|
||
},
|
||
{
|
||
hash: 7e82142b3894b62eaa718c365360ae492eca1db5,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-25 18:26:27 +0200,
|
||
message: nuevo docker
|
||
},
|
||
{
|
||
hash: b240107565ab13a121927ccc9b1341cf18cb4c5a,
|
||
author: Jaime Jimenez,
|
||
date: 2025-06-25 13:55:54 +0200,
|
||
message: Merge branch 'main' into mod/presupuesto_cliente
|
||
},
|
||
{
|
||
hash: 647c0bd72d9fd48979152ea7aaa473ea48679807,
|
||
author: Jaime Jimenez,
|
||
date: 2025-06-25 13:55:31 +0200,
|
||
message: trabajando en la validaci├│n de los datosgenerales
|
||
},
|
||
{
|
||
hash: 847b4763415238b5aaf98965f8d318b4fee08260,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-25 09:21:49 +0000,
|
||
message: Merge branch 'fix/historico_catalogo' into 'main'
|
||
},
|
||
{
|
||
hash: 6081a34c0570c36a04a5afa3dbba66d509c50c42,
|
||
author: imnavajas,
|
||
date: 2025-06-25 11:20:05 +0200,
|
||
message: Filtrando por estados finalizados para catalogo del ERP antiguo
|
||
},
|
||
{
|
||
hash: c3bce03921f650a978e612957ef9e6f649f77f2d,
|
||
author: Jaime Jimenez,
|
||
date: 2025-06-25 11:14:09 +0200,
|
||
message: terminada validaci├│n nueva en diseniocubierta
|
||
},
|
||
{
|
||
hash: 0b598e14d75329a7a7ea935d29133fb95085d90b,
|
||
author: Jaime Jimenez,
|
||
date: 2025-06-25 10:06:42 +0200,
|
||
message: Merge branch 'main' into mod/presupuesto_cliente
|
||
},
|
||
{
|
||
hash: 83753d1784ae3deaca69665ebc6039f8836c825e,
|
||
author: Jaime Jimenez,
|
||
date: 2025-06-25 10:06:21 +0200,
|
||
message: trabajando en cubierta
|
||
},
|
||
{
|
||
hash: c35e68308955c1c00361b91a6e50c59d33540627,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-25 08:05:31 +0000,
|
||
message: Merge branch 'imnavajas-main-patch-59857' into 'main'
|
||
},
|
||
{
|
||
hash: c9b822c9c231b3a06a6db4564343872fb1aeb33f,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-25 08:05:16 +0000,
|
||
message: Delete wire-o.png:Zone.Identifier
|
||
},
|
||
{
|
||
hash: ff9ce9eda28acd40613ee77f721c2e2c13f642f2,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-25 07:50:01 +0200,
|
||
message: trabajando en la cubierta
|
||
},
|
||
{
|
||
hash: 41fde19f435e30aec1f6f633ea918c966116883d,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-24 17:56:22 +0200,
|
||
message: modificado disenio interior para que borre los errores
|
||
},
|
||
{
|
||
hash: 3b0da8d560d8fc6d5fa7c1aafbdbd894f2ea007a,
|
||
author: Jaime Jimenez Ortega,
|
||
date: 2025-06-24 15:07:20 +0000,
|
||
message: Merge branch 'mod/pedidos_produccion_a_facturas' into 'main'
|
||
},
|
||
{
|
||
hash: fc68676c296c4b7ecaae829a50e2049f79935126,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-24 17:05:53 +0200,
|
||
message: hecho
|
||
},
|
||
{
|
||
hash: 365a487791d81e2dd36866836c384f42a7098bcb,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-24 13:52:22 +0200,
|
||
message: Merge branch 'main' into mod/presupuesto_cliente
|
||
},
|
||
{
|
||
hash: 9c505584b1d892b96469e6d54f106e20b8cff7de,
|
||
author: Jaime Jimenez Ortega,
|
||
date: 2025-06-24 11:51:43 +0000,
|
||
message: Merge branch 'fix/lista_maquinas_en_papeles_solo_imp' into 'main'
|
||
},
|
||
{
|
||
hash: 94b72073e430a21f25dfd23a3e778af4f3726d79,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-24 13:50:47 +0200,
|
||
message: terminado
|
||
},
|
||
{
|
||
hash: 0b3574ca63a43767ecc11ad3a6988e70108cde46,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-24 13:44:20 +0200,
|
||
message: resolviendo errores
|
||
},
|
||
{
|
||
hash: cf8ddb315602f7027e9c161882f2cb5d41b453d9,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-24 13:34:57 +0200,
|
||
message: a├▒adidos js para edit y add
|
||
},
|
||
{
|
||
hash: fd81a188d46c07251444c533c39973d4d111d24e,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-24 13:09:59 +0200,
|
||
message: Merge branch 'main' into mod/presupuesto_cliente
|
||
},
|
||
{
|
||
hash: 4bfc679c3e3a3ea51e74569ce753f3227920d76a,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-24 13:06:46 +0200,
|
||
message: los acabados tienen que tener el check de mostrar en cliente a 1. Además se ha corregido un error al editar este check dentro de los servicios de acabado
|
||
},
|
||
{
|
||
hash: 819f297e9067384eb9fb7457ed732232eb841aa7,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-23 18:33:46 +0200,
|
||
message: a├▒adido checkeo de lomo en presupuesto admin
|
||
},
|
||
{
|
||
hash: da0ca27c8c933e52dacf8547b1eb0f26e5f645bd,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-20 19:51:32 +0200,
|
||
message: correjidas cosas en cuanto a mostrar lomo. Tambi├®n a├▒adido calculo de paginas pares
|
||
},
|
||
{
|
||
hash: 75ac2e0218427ee5bab4cba77fc258872b41c193,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-20 18:46:05 +0200,
|
||
message: a├▒adida migraci├│n para el tama├▒o de los lomos. Cambiado nombre de variables en el codigo tambi├®n
|
||
},
|
||
{
|
||
hash: d89d140dac90cf43e5d096888045bf015d056c63,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-19 21:50:07 +0200,
|
||
message: arreglado el calculo del coste del envio para cuando hay más tiradas
|
||
},
|
||
{
|
||
hash: 4da6ee19c6c9e4ea8b4bfba5ed1106191d57dc2d,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-19 17:39:18 +0200,
|
||
message: arreglado vista del mensaje de lomo máximo
|
||
},
|
||
{
|
||
hash: 4fde46a222ae4134a0e2db1bb704d4c3bcfebcd2,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-19 16:26:30 +0200,
|
||
message: quitado d-flex para que hide() funcione en tipodelibro
|
||
},
|
||
{
|
||
hash: 55b10a7266424a0a3edf971539406202920c9d0c,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-18 13:44:03 +0200,
|
||
message: a├▒adido wire-o
|
||
},
|
||
{
|
||
hash: 219bdfeaa307f043aaf5770276f79d0398e22463,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-18 09:45:50 +0200,
|
||
message: a├▒adida imagen wire-o
|
||
},
|
||
{
|
||
hash: 1f5a6255131b202d54e27fe422eea1bfb945a610,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-18 09:36:12 +0200,
|
||
message: arreglado total aceptado
|
||
},
|
||
{
|
||
hash: beefc2f416f8c7b8907bf30e68dc2aecfeeffe4c,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-18 09:29:16 +0200,
|
||
message: arreglado resumen de cliente y mensaje de cubierta sin plastificado
|
||
},
|
||
{
|
||
hash: 73fe7e5097c60b12ff289363abd2a132cbacc214,
|
||
author: Jaime Jimenez,
|
||
date: 2025-06-17 10:40:33 +0200,
|
||
message: se a├▒aden los limites del numero de paginas en el presupuesto admin dependiendo del tipo de libro
|
||
},
|
||
{
|
||
hash: 7d1eef9b2808535ac7a07e43a17cf88e21b50b40,
|
||
author: Jaime Jimenez,
|
||
date: 2025-06-17 09:38:44 +0200,
|
||
message: grapado s├│lo tapa blanda
|
||
},
|
||
{
|
||
hash: 018119a3c396746a972179e525cbbc37a222fca1,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-16 20:19:39 +0200,
|
||
message: corregidos varios problemas con los presupuestos (calculo envio base debido al peso de las guardas, resumen, etc)
|
||
},
|
||
{
|
||
hash: b2652fc2773990608c7a4e9f141f0e8c3740765b,
|
||
author: Jaime Jimenez,
|
||
date: 2025-06-16 15:13:23 +0200,
|
||
message: solucionado problema con solapas
|
||
},
|
||
{
|
||
hash: 6c020375be7304a4db8a239f90a86e657585d356,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-13 06:44:07 +0000,
|
||
message: Merge branch 'bug/delete_maquina' into 'main'
|
||
},
|
||
{
|
||
hash: 45bd9735078195f2faa152930bc6a589a87906fb,
|
||
author: imnavajas,
|
||
date: 2025-06-13 08:43:20 +0200,
|
||
message: Arreglada url delete
|
||
},
|
||
{
|
||
hash: 75020a075c8127a5528b1da85cbd033ad4b1f453,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-12 19:30:01 +0200,
|
||
message: validaci├│n correcta. Falta que no se guardan las solapas
|
||
},
|
||
{
|
||
hash: 900e0b373e70643c1dfb1e9e9bf6f7c0a509cd85,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-12 15:32:26 +0200,
|
||
message: Merge branch 'main' into mod/presupuesto_cliente
|
||
},
|
||
{
|
||
hash: 00073b3f7eb9d848823312a083238cc60f3e1a0f,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-12 15:31:56 +0200,
|
||
message: modificado mensaje de cubierta sin acabado
|
||
},
|
||
{
|
||
hash: 154dfd14f6d007be715596f00bbf7c57290c46df,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-12 12:58:16 +0000,
|
||
message: Merge branch 'feat/backups' into 'main'
|
||
},
|
||
{
|
||
hash: 82882198727b4e05411c18f5683adeaef8ec01c7,
|
||
author: imnavajas,
|
||
date: 2025-06-12 14:57:48 +0200,
|
||
message: Implementada logica para entornos dev/prod
|
||
},
|
||
{
|
||
hash: db91776747ef1b8a2ce13f1ff9ac78d913e25001,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-12 13:49:56 +0200,
|
||
message: terminada validaci├│n de cubierta
|
||
},
|
||
{
|
||
hash: 70087a24b6c9daf7fb6ca42780c1cf32e6a2f5d1,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-11 20:11:50 +0200,
|
||
message: modificado para que no checkee en el interior si ha habido problema previo
|
||
},
|
||
{
|
||
hash: 505cc6fb31e9bf87dc065ae7f55bb48768f93e39,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-11 20:08:17 +0200,
|
||
message: terminados datos generales e interior
|
||
},
|
||
{
|
||
hash: b0bceb20bc4f75c9bb90eb40d9deb7f4a14a0395,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-10 20:37:47 +0200,
|
||
message: Merge branch 'feat/backups' of https://git.imnavajas.es/jjimenez/safekat into feat/backups
|
||
},
|
||
{
|
||
hash: b31d9b94eb64ac47bfdd2ad1e3cf141bb56082e0,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-10 20:37:35 +0200,
|
||
message: Merge branch 'main' into feat/backups
|
||
},
|
||
{
|
||
hash: ae60955b3f4c4f04bb709d683c2f4d13980d4657,
|
||
author: Jaime Jimenez Ortega,
|
||
date: 2025-06-10 18:37:11 +0000,
|
||
message: Merge branch 'fix/review_OT_tables' into 'main'
|
||
},
|
||
{
|
||
hash: ee4de11cca1b25dcce1e53e656d03b714748fb24,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-10 20:36:41 +0200,
|
||
message: cambiadas las query de las OTs
|
||
},
|
||
{
|
||
hash: 7aa577f316b4d233e1993aa613350a8bf3e3e53b,
|
||
author: imnavajas,
|
||
date: 2025-06-10 15:10:19 +0200,
|
||
message: Avances
|
||
},
|
||
{
|
||
hash: 882cc913de51a2d1b4f0dc91ff1e4dfbd01dc2e7,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-09 21:25:27 +0200,
|
||
message: Merge branch 'main' into feat/backups
|
||
},
|
||
{
|
||
hash: 4fe8930217fdc78156e0cfdb9a4e0c1ee7eeece1,
|
||
author: Jaime Jimenez Ortega,
|
||
date: 2025-06-09 19:21:53 +0000,
|
||
message: Merge branch 'fix/tiempo_tarea_maquinista' into 'main'
|
||
},
|
||
{
|
||
hash: 0bcd9899ef034605bbc655f568343cac43ef7cfd,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-09 21:21:13 +0200,
|
||
message: corregido el error de que a├▒ad├¡a el tiempo desde la parada a la finalizaci├│n en la tarea del maquinista. Tambi├®n se cambia el label del boton continuar dependiendo si la tarea est├í pendiente o pausada
|
||
},
|
||
{
|
||
hash: 6967a61d93198d860baf2630245f9f72ab60dca7,
|
||
author: imnavajas,
|
||
date: 2025-06-09 15:18:12 +0200,
|
||
message: Avances
|
||
},
|
||
{
|
||
hash: e53626bbfe4f0fdf6448a1629187133964c97b9b,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-09 08:08:21 +0000,
|
||
message: Merge branch 'main' into 'feat/backups'
|
||
},
|
||
{
|
||
hash: 808bcd3847c774c6b65c6d4dc5c463eade0bc42b,
|
||
author: Jaime Jimenez Ortega,
|
||
date: 2025-06-07 09:41:52 +0000,
|
||
message: Merge branch 'fix/update_ot_object_after_reset_tareas' into 'main'
|
||
},
|
||
{
|
||
hash: e0974068a085256382bbd3d85b1e300c7cd889c0,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-07 11:40:59 +0200,
|
||
message: reinicializaci├│n del servicio despu├®s de resetear las tareas
|
||
},
|
||
{
|
||
hash: d3bcd295cb39721d30c0d75066f91b9eae4abafe,
|
||
author: Jaime Jimenez Ortega,
|
||
date: 2025-06-07 09:27:18 +0000,
|
||
message: Merge branch 'fix/orden_trabajo_tareas_tiempo_estimado' into 'main'
|
||
},
|
||
{
|
||
hash: 6a3a10c7e8c230b2723b687f1f0382fce6f66e74,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-07 11:26:52 +0200,
|
||
message: solucionado el problema que al borrar una fecha de la OT se quedaba en cach├® el objeto anterior y no actualizaba el progreso
|
||
},
|
||
{
|
||
hash: e2ff0f666762f376010137f415e97b935bffac95,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-06 15:15:56 +0200,
|
||
message: Merge branch 'main' into fix/orden_trabajo_tareas_tiempo_estimado
|
||
},
|
||
{
|
||
hash: 3a0f355ffeb92472d907b3da91764cc89f2a8787,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-06 08:45:49 +0000,
|
||
message: Merge branch 'mod/registro' into 'main'
|
||
},
|
||
{
|
||
hash: 87661d855d654ffc18e9beb3ccb9269b13121473,
|
||
author: imnavajas,
|
||
date: 2025-06-06 10:45:22 +0200,
|
||
message: Deshabilitado registro
|
||
},
|
||
{
|
||
hash: 95ffb22c84608ac31f06d817dbcb306ffcdf528f,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-06 08:03:58 +0000,
|
||
message: Merge branch 'fix/versioned_assets' into 'main'
|
||
},
|
||
{
|
||
hash: 0e802f791b2c486155063dc50fc48ffba17335e3,
|
||
author: imnavajas,
|
||
date: 2025-06-06 09:12:51 +0200,
|
||
message: Aplicado a JS estaticos
|
||
},
|
||
{
|
||
hash: 5a9326ae825019aaf2f83fef164b061e9311c537,
|
||
author: imnavajas,
|
||
date: 2025-06-06 09:06:28 +0200,
|
||
message: A├▒adido helper de gestion de assets caducados e implementado en CSS de PDFs
|
||
},
|
||
{
|
||
hash: 06ba0c05003d77df07a42ec8399a92cb9f61d698,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-05 23:48:21 +0200,
|
||
message: realizados cambios para que se calcule el tiempo estimado
|
||
},
|
||
{
|
||
hash: 760144b5fc217a5da8d9a73afa2b9f3490a3472b,
|
||
author: Jaime Jimenez Ortega,
|
||
date: 2025-06-05 19:27:29 +0000,
|
||
message: Merge branch 'fix/pdf_ot_albaranes' into 'main'
|
||
},
|
||
{
|
||
hash: 49140cea40c7990c217bf36000caeef23b7f4979,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-05 21:25:48 +0200,
|
||
message: arreglado albaranes para que muestren las cajas. tambien se ha actualizado para que cuando se modifiquen las cajas de la linea se modifiquen el total del albarán
|
||
},
|
||
{
|
||
hash: 6a9331747e2bf23e16fc659f75c4197b95be5a49,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-05 18:57:03 +0200,
|
||
message: solucionado el problema de la impresion de las ots
|
||
},
|
||
{
|
||
hash: fb292520a27a9d19907f5b291e5242aed6b96a00,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-05 09:45:28 +0000,
|
||
message: Merge branch 'feat/albaran_anonimo' into 'main'
|
||
},
|
||
{
|
||
hash: 909228512cd22682dbd244313d2bfdee9b00ea1d,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-05 11:45:00 +0200,
|
||
message: Feedback JM
|
||
},
|
||
{
|
||
hash: 602fb591f92ede4b8aca71cf1c41f8ca9a7a699c,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-05 11:38:16 +0200,
|
||
message: A├▒adida funcionalidad de albaran anonimo y corregidos bugs
|
||
},
|
||
{
|
||
hash: 764d5c8f29a71f1c75c0e602b0ba45721d560ad4,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-05 07:30:24 +0000,
|
||
message: Merge branch 'bug/catalogo_historico' into 'main'
|
||
},
|
||
{
|
||
hash: b1cd63f665a8a3af10e2bc96ae1a9360980901f9,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-05 09:28:30 +0200,
|
||
message: Arreglado precio ud en tabla
|
||
},
|
||
{
|
||
hash: 5058ae488b8b2c71d7c3f507e50af8e0a89fe82c,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-05 06:44:59 +0000,
|
||
message: Merge branch 'mod/historico_catalogo' into 'main'
|
||
},
|
||
{
|
||
hash: 10889a9e7f705025e10c02438b49849f704a3e6b,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-05 08:44:34 +0200,
|
||
message: Refactorizazion
|
||
},
|
||
{
|
||
hash: 8d363b8abd6205bc58a5d9a5503c45ad1f1b95cc,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-04 21:30:11 +0000,
|
||
message: Merge branch 'main' into 'mod/historico_catalogo'
|
||
},
|
||
{
|
||
hash: 63866b6f2fc11a28849d5bcc08bbf7a5c94ba15f,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-04 23:27:31 +0200,
|
||
message: COrregidos cambios JM
|
||
},
|
||
{
|
||
hash: 4e65361df8ad0441f3f888cae8c7410d7b5d23b4,
|
||
author: Jaime Jimenez Ortega,
|
||
date: 2025-06-04 13:51:48 +0000,
|
||
message: Merge branch 'fix/error_en_pais_save_direccionecliente_presupuestoadmin' into 'main'
|
||
},
|
||
{
|
||
hash: 391927aaf6fa041b9a64704df37928b30a5bfbcd,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-04 15:51:21 +0200,
|
||
message: solucionado
|
||
},
|
||
{
|
||
hash: 96e12c0192e96ac61fa0a11c0beec7807a6b242d,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-04 13:22:38 +0000,
|
||
message: Merge branch 'feat/catalogo_historico_pedidos' into 'main'
|
||
},
|
||
{
|
||
hash: 7f88ea7296f4847428ed5861127f2d6a21d1d559,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-04 13:21:11 +0000,
|
||
message: Merge branch 'main' into 'feat/catalogo_historico_pedidos'
|
||
},
|
||
{
|
||
hash: 884f9f1a675be6a27e44dc00956ccacec90980ea,
|
||
author: Jaime Jimenez Ortega,
|
||
date: 2025-06-03 13:17:36 +0000,
|
||
message: Merge branch 'fix/view_all_tickets_cliente' into 'main'
|
||
},
|
||
{
|
||
hash: c5dc026c33b3e673150576420bd9a486e25a0f86,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-03 15:17:11 +0200,
|
||
message: resuelto el problema de que los clientes veian todos los tickets
|
||
},
|
||
{
|
||
hash: 5fbb6cc8548988b1d6aec508e1b0fe11041f9286,
|
||
author: Jaime Jimenez Ortega,
|
||
date: 2025-06-03 11:42:52 +0000,
|
||
message: Merge branch 'fix/add_presupuesto_tirada_0' into 'main'
|
||
},
|
||
{
|
||
hash: 40439b532fe589965873a1cb68d01dcf952ffe55,
|
||
author: Jaime Jim├®nez,
|
||
date: 2025-06-03 13:41:52 +0200,
|
||
message: arreglada la comprobación de páginas y tirada cuando se añade un presupuesto
|
||
},
|
||
{
|
||
hash: 84693d5c6cb8a5e26675f22eb238abe73b4f6d20,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-03 11:24:44 +0200,
|
||
message: Iniciada implementacion de recuperacion de historicos erp antiguo
|
||
},
|
||
{
|
||
hash: 2c711c526b83b2c74809527f447649fc89a36a02,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-02 09:30:59 +0000,
|
||
message: Merge branch 'mod/iskn2' into 'main'
|
||
},
|
||
{
|
||
hash: a12f034daa54cd96304f2f6aff382554971b3724,
|
||
author: imnavajas,
|
||
date: 2025-06-02 11:30:36 +0200,
|
||
message: Eliminado contexto libro por defecto
|
||
},
|
||
{
|
||
hash: e732b36ece274282581be0fe734a7de37f12dcdf,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-02 09:16:29 +0000,
|
||
message: Merge branch 'mod/iskn' into 'main'
|
||
},
|
||
{
|
||
hash: 5fcc1bdd9ddccfdb97a151f0b8e5a41826828724,
|
||
author: imnavajas,
|
||
date: 2025-06-02 11:16:10 +0200,
|
||
message: Modificaciones en html
|
||
},
|
||
{
|
||
hash: da57cb23ee19ecea6fedef6970ad1be7457084d1,
|
||
author: Ignacio Martinez Navajas,
|
||
date: 2025-06-02 09:13:15 +0000,
|
||
message: Merge branch 'feat/importador_libros_catalogo_antiguo' into 'main'
|
||
},
|
||
{
|
||
hash: e1aa62f1980b163a89e19b0cdc9f7731a827c93b,
|
||
author: imnavajas,
|
||
date: 2025-06-02 11:12:45 +0200,
|
||
message: Cambio de isk a iskn, a├▒adido comando generador de iskn en libros del catalogo que no lo tengan
|
||
},
|
||
{
|
||
hash: 50e8c35ef33df96f1e6302d92f0d0f6f20d61369,
|
||
author: Alvaro,
|
||
date: 2025-05-31 06:38:02 +0000,
|
||
message: Merge branch 'feat/maquinas-corte-ot' into 'main'
|
||
},
|
||
{
|
||
hash: f10d58445381c351f0b451e32d2a8f8be461a640,
|
||
author: amazuecos,
|
||
date: 2025-05-31 08:35:50 +0200,
|
||
message: Merge branch 'fix/planning-plana-select-maquina-papel' into feat/maquinas-corte-ot
|
||
},
|
||
{
|
||
hash: 67c4b4bc9360ac247b33af22de41018a54ca7174,
|
||
author: amazuecos,
|
||
date: 2025-05-31 08:35:01 +0200,
|
||
message: add filter padre - hija - papel
|
||
},
|
||
{
|
||
hash: 23a577b55e67ce16040e4b5a1b06438ac577700e,
|
||
author: amazuecos,
|
||
date: 2025-05-31 07:58:43 +0200,
|
||
message: tareas corte y tiempo procesamiento
|
||
},
|