wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
2,128 Commits 155 Branches 0 Tags 30 MiB
Commit Graph

342 Commits

Author SHA1 Message Date
Javier Segarra 527c845356 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets 2024-03-21 07:48:07 +01:00
Javier Segarra b3cbc64efb refs #6321 perf: i18n 2024-03-15 12:15:03 +01:00
Javier Segarra 92555f8ddb refs #6321 feat: negativeOrigin modal 2024-03-15 11:31:19 +01:00
Javier Segarra 79e2bddeea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets 2024-03-14 15:01:58 +01:00
Javier Segarra 2436db1c28 refs #6321 perf: update 2024-03-14 14:21:02 +01:00
William Buezas 22c49d9cf7 resolve conflicts 2024-03-14 09:50:27 -03:00
Javier Segarra bffc496965 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets 2024-03-14 13:04:05 +01: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
William Buezas f26d14e875 resolve conflicts 2024-03-13 12:57:41 -03:00
Javier Segarra 322c195175 refs #6321 feat: i18n improves 2024-03-13 14:27:21 +01:00
William Buezas bd5eb1a1c3 remove assignPDA translation 2024-03-12 11:34:38 -03:00
William Buezas 632049c13b Assign button change 2024-03-12 11:31:32 -03:00
William Buezas dad2711311 fix translation 2024-03-12 08:13:27 -03:00
William Buezas 029fc043de Change title translation 2024-03-12 08:08:20 -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
Javier Segarra 51b8667938 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets 2024-03-06 13:51:59 +01:00
Javier Segarra 7e769164d7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-refactor-claimSummary 2024-03-06 09:48:34 +01:00
William Buezas 992ada0984 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections 2024-03-05 18:21:00 -03:00
Javier Segarra 7254f91645 refs #6321 feat: updates i18n dialog 2024-03-05 12:59:59 +01:00
Javier Segarra 3a7e092efe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets 2024-03-05 08:06:05 +01:00
Javier Segarra 67eb21b707 refs #6321 feat: updates 2024-03-05 08:05:16 +01:00
Alex Moreno 4484f431bf refs #6336 feat: polish claims 2024-03-04 14:42:15 +01:00
Carlos Satorres adc290da6d refs #6935 restyle card 2024-03-04 12:26:14 +01: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
Alex Moreno 284eefa8f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-27 08:23:02 +01:00
Alex Moreno c8a4854df9 refs #5509 fix(vnDms): fix issues 2024-02-27 08:22:38 +01:00
Pablo Natek 546df84db1 remove(claimRma): refs #6349 remove all references 2024-02-26 19:06:21 +01:00
Alex Moreno 4988df882c refs #5509 fix: transaltions 2024-02-26 15:06:49 +01:00
Jorge Penadés b6d84a5fc6 fix: refs #6904 VnLv icon, customer summary & extendedList 2024-02-26 14:17:02 +01:00
Kevin Martinez 185de3c931 Add roadmap stops 2024-02-23 00:46:57 -03:00
Alex Moreno 9abac4a8fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-22 09:11:36 +01:00
Kevin Martinez 616d8519fa Fix translations 2024-02-20 08:14:31 -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 e846582606 Create route autonomous 2024-02-19 10:13:00 -03:00
Kevin Martinez 988362ab69 Fix route ticket sms event 2024-02-19 10:02:48 -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
William Buezas 2f08b64215 merge with dev 2024-02-15 09:20:28 -03:00
Carlos Satorres 7aab50ffff Merge branch 'dev' into 6795-claimRefact 2024-02-12 16:46:51 +00:00
Alex Moreno aa4d5bffc3 refs #5509 feat: VnDms & VnDmsList 2024-02-12 15:06:20 +01:00
William Buezas df620566ef Invoice out globals corrections 2024-02-12 08:11:44 -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