0
0
Fork 0
Commit Graph

238 Commits

Author SHA1 Message Date
William Buezas 22c49d9cf7 resolve conflicts 2024-03-14 09:50:27 -03:00
Kevin Martinez 8587d46943 Merge branch 'salix-dev' into feature/route-module
# Conflicts:
#	src/pages/Route/Card/RouteSummary.vue
2024-03-14 08:05:51 -03:00
Javi Gallego 4bc57d0287 Merge branch 'dev' into CambiosSolicitadosSuppliers 2024-03-13 14:37:06 +00: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 b994d39369 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections 2024-03-07 08:44:30 -03:00
Kevin Martinez d3a93da849 Merge branch 'salix-dev' into feature/route-module
# Conflicts:
#	src/components/ui/VnPaginate.vue
2024-03-06 23:19:47 -03:00
William Buezas 6a105d5d38 resolve conflicts 2024-03-06 08:35:49 -03:00
William Buezas 859c87940d Several changes 2024-03-06 08:15:50 -03:00
Alex Moreno 4484f431bf refs #6336 feat: polish claims 2024-03-04 14:42:15 +01:00
Kevin Martinez 31911be3ba Remove unused route 2024-03-03 23:36:30 -03:00
Pablo Natek b49db55892 Merge branch 'dev' into 6349-removeRma 2024-02-29 06:50:18 +00:00
Kevin Martinez 64490f7e5b Merge remote-tracking branch 'salix/dev' into feature/route-module
# Conflicts:
#	src/i18n/en/index.js
#	src/i18n/es/index.js
2024-02-28 21:27:01 -03:00
William Buezas b0d43edbce Route summary link logic improvement 2024-02-28 12:02:38 -03:00
Pablo Natek 546df84db1 remove(claimRma): refs #6349 remove all references 2024-02-26 19:06:21 +01:00
Kevin Martinez 185de3c931 Add roadmap stops 2024-02-23 00:46:57 -03:00
Alex Moreno de184e9cf8 refs #5509 feat(DMS): change icon 2024-02-22 10:57:11 +01:00
Kevin Martinez 75733fd530 Fix autonomous route 2024-02-20 20:51:25 -03:00
Kevin Martinez 0a03ef69ea Create roadmap basic data page 2024-02-20 08:00:17 -03:00
Kevin Martinez 343269fc02 Create roadmap summary page 2024-02-20 08:00:12 -03:00
Kevin Martinez 45d7b021a6 Create roadmap create page 2024-02-20 07:58:14 -03:00
Kevin Martinez 8ffa3b7626 Create roadmap list page 2024-02-20 07:57:59 -03:00
Kevin Martinez 046ac0406b Create invoice in autonomous page 2024-02-19 10:13:17 -03:00
Kevin Martinez e846582606 Create route autonomous 2024-02-19 10:13:00 -03:00
Kevin Martinez 76dd84fd87 Create route logs 2024-02-19 09:58:33 -03:00
Kevin Martinez 67f862ebe3 Create route tickets 2024-02-19 09:57:49 -03: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
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 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
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
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 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
William Buezas 4fae8e633b Create items module base structure, item descriptor and add it to supplier consumption 2024-01-26 16:36:27 -03:00