Commit Graph

241 Commits

Author SHA1 Message Date
Carlos Fonseca a3097a9223 Merge branch 'dev' into PR-CUSTOMER 2024-03-14 10:55:02 +00:00
Javi Gallego 4bc57d0287 Merge branch 'dev' into CambiosSolicitadosSuppliers 2024-03-13 14:37:06 +00:00
William Buezas 4925bed845 resolve conflicts 2024-03-13 11:31:55 -03:00
William Buezas 433843ea09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into CambiosSolicitadosSuppliers 2024-03-12 08:16:40 -03:00
William Buezas 319295f2c2 Workers PDA 2024-03-11 16:53:33 -03:00
Pablo Natek e5e0d8f806 Merge branch 'dev' into 6349-removeRma 2024-03-08 07:08:36 +00:00
William Buezas 6a105d5d38 resolve conflicts 2024-03-06 08:35:49 -03:00
Alex Moreno 4484f431bf refs #6336 feat: polish claims 2024-03-04 14:42:15 +01:00
Pablo Natek b49db55892 Merge branch 'dev' into 6349-removeRma 2024-02-29 06:50:18 +00:00
William Buezas a0f9c811ff resolve conflicts 2024-02-28 12:56:13 -03:00
William Buezas b0d43edbce Route summary link logic improvement 2024-02-28 12:02:38 -03:00
carlosfonseca 0a33b8d92a Solucion a comentarios 24 2024-02-27 11:38:58 -05:00
Pablo Natek 546df84db1 remove(claimRma): refs #6349 remove all references 2024-02-26 19:06:21 +01:00
carlosfonseca 9ae0874ccf Solucion a comentarios 2024-02-22 10:44:29 -05:00
William Buezas f69b25716d Merge branch 'PR-CUSTOMER' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into PR-CUSTOMER 2024-02-22 10:38:30 -03:00
William Buezas 1b67b7ab36 Customer description corrections and creation of tickets create view 2024-02-22 10:38:15 -03:00
carlosfonseca 3bcd4984f5 Solucion a comentarios 17 2024-02-22 05:11:02 -05:00
Alex Moreno de184e9cf8 refs #5509 feat(DMS): change icon 2024-02-22 10:57:11 +01:00
carlosfonseca 01d68734b6 Correccion de conflictos 2024-02-20 12:15:27 -05:00
carlosfonseca ab20ec1738 Solucion a comentarios 8 2024-02-14 12:21:00 -05:00
Alex Moreno 1d4179cfa1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-13 08:09:25 +01:00
William Buezas cd2eb71efd Fix view icon 2024-02-12 08:14:10 -03:00
Alex Moreno cb6ba483d0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-09 14:43:50 +01:00
William Buezas 399f47b17c merge with salix-front dev branch and resolve conflicts 2024-02-09 08:59:46 -03:00
Alex Moreno 34e907eb32 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-09 09:41:21 +01:00
Alex Moreno 2fb1688af4 Merge branch 'dev' into 4666-invoiceInCorrection 2024-02-08 17:30:47 +00:00
Alex Moreno 76680dd715 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-08 07:26:27 +01:00
Kevin Martinez 15f7f85734 Merge remote-tracking branch 'salix/dev' into bugfix/shelving-154
# Conflicts:
#	src/components/ui/VnSearchbar.vue
#	src/pages/Route/RouteList.vue
2024-02-07 22:38:57 -03:00
William Buezas f59c2409f1 travels corrections and improvements 2024-02-07 15:01:51 -03:00
Jorge Penadés c162f34ee5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-07 10:22:23 +01:00
William Buezas 0ff70a378d Travel termographs and general improvements 2024-02-06 14:08:44 -03:00
William Buezas 7b542dc3bb WIP 2024-02-06 14:06:24 -03:00
William Buezas 71e2cdebe4 WIP 2024-02-06 14:05:57 -03:00
Carlos Fonseca f2a877557f Merge branch 'dev' into features/ms_164_file_management_card 2024-02-06 16:06:14 +00:00
carlosfonseca 01ffe3adb7 Se termina desarrollo de las tarjetas gestion documental e impagado 2024-02-05 15:51:09 -05:00
Alex Moreno 7b68f15781 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-05 12:54:58 +01:00
William Buezas a88b1137dc Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into dev 2024-02-02 14:11:36 -03:00
William Buezas dc554f03d0 merge with salix-front dev 2024-02-02 14:11:12 -03:00
William Buezas 59c8ada077 merge with salix-front branch dev 2024-02-02 13:26:34 -03:00
Jorge Penadés fed382d1fd fix: refs #4466 conficts 2024-02-02 15:28:10 +01:00
carlosfonseca b06e5b9252 Correcciones comentarios pr 2024-02-02 08:21:23 -05:00
Jorge Penadés 814c8dc0e2 fix: refs #4466 conficts 2024-02-02 14:07:33 +01:00
Jorge Penadés 3d6f9f9dd2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-02 14:06:34 +01:00
carlosfonseca 7b3ff319d4 Desarrollo de tarjetas varias en el modulo de clientes en el summary 2024-01-31 07:32:34 -05:00
Alex Moreno 5b6a526932 refs #5509 feat: VnDms feat: EntryDms 2024-01-29 15:12:30 +01:00
William Buezas 7d9b34d4c5 Latest buys WIP 2024-01-29 08:39:46 -03:00
William Buezas 8cc92f127c merge with dev 2024-01-27 16:10:15 -03:00
William Buezas 9757fdf70a Travel termographs and general improvements 2024-01-27 16:08:02 -03:00
William Buezas e9fe4a3cb9 improvement 2024-01-27 12:14:50 -03:00
William Buezas a01b80703e Create child submodules feature 2024-01-27 12:08:56 -03:00