|
|
2d0732c218
|
Añadidas tarifas extras, trabajando en permisos de tarifas
|
2024-06-18 22:33:07 +02:00 |
|
|
|
20702a47f8
|
Merge branch 'feat/presu_cliente_pass_id' into 'main'
Feat/presu cliente pass
See merge request jjimenez/safekat!279
|
2024-06-18 15:47:57 +00:00 |
|
|
|
5e876f07fb
|
terminado y arreglado otros bugs
|
2024-06-18 17:47:21 +02:00 |
|
|
|
e235165499
|
falta comprobar que se puede cambiar el tipo de presupuesto
|
2024-06-18 15:26:15 +02:00 |
|
|
|
c476c9a938
|
Merge branch 'dev/usuarios_clientes' into 'main'
añadido cliente id a users
See merge request jjimenez/safekat!278
|
2024-06-18 11:19:24 +00:00 |
|
|
|
1fa4e1cd9c
|
añadido cliente id a users
|
2024-06-18 13:18:25 +02:00 |
|
|
|
52633ef695
|
Merge branch 'dev/albaranes_pdf_2' into 'main'
Implementada la logica para la creacion de albaranes en PDF
See merge request jjimenez/safekat!277
|
2024-06-16 20:54:18 +00:00 |
|
|
|
2147452125
|
Implementada la logica para la creacion de albaranes en PDF
|
2024-06-16 22:53:52 +02:00 |
|
|
|
57194b5dd3
|
Merge branch 'feat/confirmar_presupuesto_admin' into 'main'
ya se puede confirmar
See merge request jjimenez/safekat!276
|
2024-06-16 16:04:33 +00:00 |
|
|
|
8335c458ed
|
ya se puede confirmar
|
2024-06-16 18:02:50 +02:00 |
|
|
|
aed64581c9
|
Merge branch 'dev/pdf_albaranes' into 'main'
Dev/pdf albaranes
See merge request jjimenez/safekat!275
|
2024-06-16 07:19:00 +00:00 |
|
|
|
e6e46c84e7
|
Añadida impresion dummy pdf
|
2024-06-16 09:18:33 +02:00 |
|
|
|
4686e5040e
|
Arreglado archivo de rutas
|
2024-06-16 08:35:30 +02:00 |
|
|
|
953b07497d
|
Merge branch 'main' into 'dev/pdf_albaranes'
Main
See merge request jjimenez/safekat!274
|
2024-06-16 06:30:06 +00:00 |
|
|
|
17e9f8e52f
|
Arreglar conflictos locales del Routes.php
|
2024-06-16 08:29:13 +02:00 |
|
|
|
31565ff6dd
|
Merge branch 'dev/pedidos_v1' into 'main'
Dev/pedidos v1
See merge request jjimenez/safekat!273
|
2024-06-16 00:10:32 +00:00 |
|
|
|
2f1f6f9631
|
terminado
|
2024-06-16 02:10:01 +02:00 |
|
|
|
3171c32283
|
faltan las fechas
|
2024-06-16 01:47:34 +02:00 |
|
|
|
4076fff844
|
haciendo los eventos
|
2024-06-15 19:42:36 +02:00 |
|
|
|
87e6b029e2
|
falta mostrar precios albaran
|
2024-06-15 11:14:02 +02:00 |
|
|
|
3e0443927c
|
trabajando
|
2024-06-14 15:04:41 +02:00 |
|
|
|
ef7cbf853b
|
Merge branch 'main' into 'dev/pedidos_v1'
Main
See merge request jjimenez/safekat!272
|
2024-06-14 07:11:10 +00:00 |
|
|
|
c9d8875392
|
trabajando en pedidos 3
|
2024-06-13 23:53:20 +02:00 |
|
|
|
d7de7b0778
|
Primera version del pdf de albaran
|
2024-06-13 22:45:49 +02:00 |
|
|
|
40279095a3
|
Merge branch 'dev/exponer_tablas' into 'main'
Dev/exponer tablas
See merge request jjimenez/safekat!271
|
2024-06-13 19:05:48 +00:00 |
|
|
|
324d4774f3
|
Arreglado bug de validaciones
|
2024-06-13 21:05:15 +02:00 |
|
|
|
405afd0cf1
|
Terminada exposicion de tablas ubicacion y series
|
2024-06-13 21:00:33 +02:00 |
|
|
|
b1734e169b
|
trabajando en el form
|
2024-06-13 19:23:50 +02:00 |
|
|
|
02ba5d75d1
|
Añadidos ubicaciones y series de facturas
|
2024-06-13 18:58:54 +02:00 |
|
|
|
e491172b28
|
cambiado el obtener la lista a pedidos_linea
|
2024-06-11 11:11:02 +02:00 |
|
|
|
3f876a0b81
|
Merge branch 'dev/pedidos_v1' of https://git.imnavajas.es/jjimenez/safekat into dev/pedidos_v1
|
2024-06-11 11:04:33 +02:00 |
|
|
|
8aa7751060
|
trabajando en el form de cliente
|
2024-06-11 11:02:36 +02:00 |
|
|
|
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 |
|
