|
|
79fcb1e3fe
|
arreglado problema
|
2025-04-12 10:18:32 +02:00 |
|
|
|
3d535e4ed5
|
Merge branch 'main' into 'mod/pedidos_user_fechas'
Main
See merge request jjimenez/safekat!689
|
2025-04-12 08:01:59 +00:00 |
|
|
|
bb9f6210e7
|
terminado añadir usuarios y fechas a pedidos. añadido inaplazable. color en rojo en fechas cuando inaplazable
|
2025-04-12 10:00:24 +02:00 |
|
|
|
da8917b0d3
|
Merge branch 'fix/sk-41' into 'main'
Fix/sk 41
See merge request jjimenez/safekat!688
|
2025-04-12 06:01:17 +00:00 |
|
|
|
38d60402c0
|
constraint btn-edit event inside table not in $(document)
|
2025-04-12 08:00:32 +02:00 |
|
|
|
e7394999ab
|
constraint btn-edit event inside table not in $(document)
|
2025-04-12 08:00:26 +02:00 |
|
|
|
ba54d99185
|
remove doble slash ad form url
|
2025-04-12 07:59:57 +02:00 |
|
|
|
efb50383b7
|
add class table-responsive
|
2025-04-12 07:59:33 +02:00 |
|
|
|
de8ae93871
|
Merge branch 'fix/sk-36' into 'main'
Fix/sk 36
See merge request jjimenez/safekat!687
|
2025-04-11 05:04:09 +00:00 |
|
|
|
defb7373c4
|
remove unused imports
|
2025-04-11 07:03:08 +02:00 |
|
|
|
a4f6f8cdb3
|
migration drop is_deleted
|
2025-04-11 07:01:39 +02:00 |
|
|
|
1e339b5503
|
delete is_deleted field
|
2025-04-11 06:56:55 +02:00 |
|
|
|
9e591a099d
|
Merge branch 'fix/user-import-model' into 'main'
Fix/user import model
See merge request jjimenez/safekat!686
|
2025-04-11 01:36:08 +00:00 |
|
|
|
269410c2c7
|
Merge branch 'main' of https://git.imnavajas.es/jjimenez/safekat
|
2025-04-11 03:34:10 +02:00 |
|
|
|
49f3430f12
|
Merge branch 'fix/facturas_pdf' into 'main'
Arreglado bug al generar PDF de facturas
See merge request jjimenez/safekat!685
|
2025-04-10 20:42:05 +00:00 |
|
|
|
64e4f51e13
|
Arreglado bug al generar PDF de facturas
|
2025-04-10 22:41:38 +02:00 |
|
|
|
10781c40a9
|
Merge branch 'mod/facturas_trello' into 'main'
Mod/facturas trello
See merge request jjimenez/safekat!684
|
2025-04-10 14:59:28 +00:00 |
|
|
|
026a109b5e
|
terminado
|
2025-04-10 16:58:54 +02:00 |
|
|
|
cce8b1845f
|
Merge branch 'main' into 'mod/facturas_trello'
Main
See merge request jjimenez/safekat!683
|
2025-04-10 13:34:31 +00:00 |
|
|
|
7139bb377c
|
falta autonumeric
|
2025-04-10 15:34:14 +02:00 |
|
|
|
29e130458a
|
Merge branch 'mod/pdf_facturas' into 'main'
Actualizado el pdf de facturas para eliminar precio por linea
See merge request jjimenez/safekat!682
|
2025-04-10 12:34:22 +00:00 |
|
|
|
d8cb02271e
|
Actualizado el pdf de facturas para eliminar precio por linea
|
2025-04-10 14:33:35 +02:00 |
|
|
|
b37f3f663a
|
Merge branch 'main' of https://git.imnavajas.es/jjimenez/safekat
|
2025-04-09 07:05:11 +02:00 |
|
|
|
014b48e693
|
fix user model imports
|
2025-04-09 07:04:06 +02:00 |
|
|
|
84155d1f71
|
Merge branch 'fix/rolesPermissions_view' into 'main'
modificada la vista cuando hay más de 3 permisos
See merge request jjimenez/safekat!680
|
2025-04-08 20:38:29 +00:00 |
|
|
|
fc52417b53
|
modificada la vista cuando hay más de 3 permisos
|
2025-04-08 22:37:53 +02:00 |
|
|
|
ae9af197ac
|
Merge branch 'fix/arreglar_resumen_cliente_vs_admin' into 'main'
Fix/arreglar resumen cliente vs admin
See merge request jjimenez/safekat!679
|
2025-04-07 22:44:08 +00:00 |
|
|
|
ab4afe7492
|
Merge branch 'main' into 'fix/arreglar_resumen_cliente_vs_admin'
Main
See merge request jjimenez/safekat!678
|
2025-04-07 22:43:25 +00:00 |
|
|
|
982b008ada
|
Merge branch 'fix/compras_proveedores' into 'main'
Arreglado menu compras/proveedores
See merge request jjimenez/safekat!677
|
2025-04-07 22:42:27 +00:00 |
|
|
|
036c11b4ab
|
Arreglado menu compras/proveedores
|
2025-04-08 00:41:31 +02:00 |
|
|
|
644ad41001
|
todo okgit pullgit pull
|
2025-04-08 00:28:45 +02:00 |
|
|
|
b413245683
|
Merge branch 'main' into 'fix/arreglar_resumen_cliente_vs_admin'
Main
See merge request jjimenez/safekat!676
|
2025-04-07 22:19:36 +00:00 |
|
|
|
0116553b2b
|
Merge branch 'rev/roles_2' into 'main'
Rev/roles 2
See merge request jjimenez/safekat!675
|
2025-04-07 21:59:31 +00:00 |
|
|
|
4b57c716ab
|
Refactorizazion
|
2025-04-07 23:58:44 +02:00 |
|
|
|
df05f4b5b4
|
Revisados roles de pedidos y corregidos bugs de poner autoroute = false
|
2025-04-07 23:49:35 +02:00 |
|
|
|
6c20121f0c
|
Merge branch 'main' into 'fix/arreglar_resumen_cliente_vs_admin'
Main
See merge request jjimenez/safekat!674
|
2025-04-07 21:39:12 +00:00 |
|
|
|
885aea495c
|
falta factores cliente
|
2025-04-07 23:38:31 +02:00 |
|
|
|
a6f07a15b5
|
Añadidos permisos para Produccion
|
2025-04-07 23:20:07 +02:00 |
|
|
|
432567e964
|
Permisos produccion
|
2025-04-07 22:56:07 +02:00 |
|
|
|
470732ca39
|
Merge branch 'rev/roles_1' into 'main'
Rev/roles 1
See merge request jjimenez/safekat!673
|
2025-04-07 20:35:18 +00:00 |
|
|
|
5b15d7a72e
|
Subiendo menu importador
|
2025-04-07 22:34:40 +02:00 |
|
|
|
64a6e0c5f4
|
Merge branch 'main' into 'rev/roles_1'
Main
See merge request jjimenez/safekat!672
|
2025-04-07 20:30:49 +00:00 |
|
|
|
c8598cbd27
|
Resolviendo conflictos
|
2025-04-07 22:30:29 +02:00 |
|
|
|
e96c738839
|
Merge branch 'mod/ajustes_mail' into 'main'
Mod/ajustes mail
See merge request jjimenez/safekat!671
|
2025-04-07 20:17:28 +00:00 |
|
|
|
a62e51d31c
|
Merge branch 'main' into 'mod/ajustes_mail'
Main
See merge request jjimenez/safekat!670
|
2025-04-07 20:16:02 +00:00 |
|
|
|
4f5bc3301f
|
Eliminados ajustes de sistemas. Ahora estan en variables del ERP
|
2025-04-07 22:14:44 +02:00 |
|
|
|
4633fa623a
|
Merge branch 'add/tablaCredito_presuAdmin_old_erp' into 'main'
añadido pendiente en erp antiguo
See merge request jjimenez/safekat!669
|
2025-04-07 19:32:56 +00:00 |
|
|
|
ce1d94bbda
|
añadido pendiente en erp antiguo
|
2025-04-07 21:32:36 +02:00 |
|
|
|
387667b0c2
|
Merge branch 'fix/lista_papel_impre_activo' into 'main'
quitada la condición isactivo en el listado
See merge request jjimenez/safekat!668
|
2025-04-07 16:38:50 +00:00 |
|
|
|
66825d3286
|
quitada la condición isactivo en el listado
|
2025-04-07 18:38:29 +02:00 |
|
