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

2069 Commits

Author SHA1 Message Date
Javier Segarra 674b8bb1dc refs #6321 perf: updates 2024-03-15 09:36:30 +01:00
Javier Segarra e264a13234 warnings 2024-03-15 09:36:15 +01:00
Javier Segarra 5326d9db88 refs #6321 perf: update 2024-03-14 15:26:07 +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
Javier Segarra 278ebbe070 Merge pull request 'Modulo de rutas' (!195) from hyervoni/salix-front-mindshore:feature/route-module into dev 
Reviewed-on: verdnatura/salix-front#195
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-03-14 12:44:43 +00: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
Alex Moreno 7a75238695 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-03-14 08:16:15 +01:00
Alex Moreno ab8e1fdc04 Merge pull request 'CambiosSolicitadosEntries' (!201) from hyervoni/salix-front-mindshore:CambiosSolicitadosEntries into dev 
Reviewed-on: verdnatura/salix-front#201
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-14 06:39:45 +00:00
William Buezas f26d14e875 resolve conflicts 2024-03-13 12:57:41 -03:00
Javi Gallego e1cf13076f Merge pull request 'CambiosSolicitadosSuppliers' (!214) from hyervoni/salix-front-mindshore:CambiosSolicitadosSuppliers into dev 
Reviewed-on: verdnatura/salix-front#214
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-13 14:37:59 +00:00
Javi Gallego 4bc57d0287 Merge branch 'dev' into CambiosSolicitadosSuppliers 2024-03-13 14:37:06 +00:00
Javi Gallego 9e87365bd7 Merge pull request 'Workers PDA' (!234) from hyervoni/salix-front-mindshore:feature/WorkerPDA into dev 
Reviewed-on: verdnatura/salix-front#234
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-03-13 14:36:48 +00:00
Javier Segarra 322c195175 refs #6321 feat: i18n improves 2024-03-13 14:27:21 +01:00
Kevin Martinez 77e29a2b87 Fix tickets feedback 2024-03-12 21:26:17 -03:00
Kevin Martinez e4553659cf Update translation from population to city 2024-03-12 21:23:46 -03:00
William Buezas ff0b0c8131 Remove innecesary prop 2024-03-12 12:38:44 -03: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 433843ea09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into CambiosSolicitadosSuppliers 2024-03-12 08:16:40 -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
Javier Segarra 63f00c24d7 Merge pull request 'Create date and time utility' (!233) from hyervoni/salix-front-mindshore:feature/date-utility into dev 
Reviewed-on: verdnatura/salix-front#233
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
 2024-03-11 11:13:05 +00:00
Kevin Martinez 5011fd5f83 Create date and time utility 2024-03-10 21:41:36 -03:00
Javier Segarra 6baa158d43 Merge pull request 'EntryLatestBuysFilters' (!226) from hyervoni/salix-front-mindshore:EntryLatestBuysFilters into dev 
Reviewed-on: verdnatura/salix-front#226
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-08 12:08:56 +00:00
William Buezas 9ced305797 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into EntryLatestBuysFilters 2024-03-08 09:03:33 -03:00
Pablo Natek 3f1a731ac7 Merge pull request 'remove(claimRma): refs #6349 remove all references' (!208) from 6349-removeRma into dev 
Reviewed-on: verdnatura/salix-front#208
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-03-08 11:27:23 +00:00
Javier Segarra 79801d0be8 Merge pull request '#6940 - Fix CmrList Filter Panel' (!209) from 6940_hotFix_cmrFilterPanel into test 
Reviewed-on: verdnatura/salix-front#209
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-08 07:38:14 +00:00
Pablo Natek e5e0d8f806 Merge branch 'dev' into 6349-removeRma 2024-03-08 07:08:36 +00:00
Kevin Martinez 1ab9bfefed Centralize roadmap add stop form 2024-03-07 20:37:14 -03:00
Javier Segarra baf01f6720 Merge branch 'test' into 6940_hotFix_cmrFilterPanel 2024-03-07 12:53:00 +00:00
Javier Segarra 13cfbf0224 Merge pull request 'Update input date/time behaviour' (!223) from hyervoni/salix-front-mindshore:feature/input-date-updates into dev 
Reviewed-on: verdnatura/salix-front#223
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-07 11:20:07 +00:00
Kevin Martinez 80b2683001 Merge branch 'salix-dev' into feature/input-date-updates 2024-03-07 08:11:48 -03:00
Carlos Satorres d189ebca28 Merge pull request 'fix px' (!231) from fixCheckbox into dev 
Reviewed-on: verdnatura/salix-front#231
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-07 10:27:58 +00:00
Carlos Satorres 39009d055d fix px 2024-03-07 11:19:25 +01:00
Javier Segarra 80b881edb5 refs #6321 fix: bug when retrieve token 2024-03-07 09:50:19 +01:00
Carlos Satorres aefc237c3f Merge pull request 'refs #6892 fix checkbox' (!230) from 6892-fixCheckbox into dev 
Reviewed-on: verdnatura/salix-front#230
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-07 08:38:05 +00:00
Carlos Satorres cd8eb4ce5c refs #6892 fix checkbox 2024-03-07 09:24:17 +01:00
Guillermo Bonet d8331dcfa5 Merge pull request 'refactor: refs #6948 Bank to Accouting' (!224) from 6948-bank into dev 
Reviewed-on: verdnatura/salix-front#224
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-07 06:19:45 +00:00
Guillermo Bonet 61f13861f8 Merge branch 'dev' into 6948-bank 2024-03-07 06:17:20 +00:00
Kevin Martinez e8e2bc8403 Fix route list worker field 2024-03-06 23:25:41 -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
Kevin Martinez 7974725da0 Fix with feedback 2024-03-06 23:15:26 -03:00
Kevin Martinez c34fc0f79e Fix date time timezone 2024-03-06 22:45:23 -03:00
William Buezas 2449488927 Changes 2024-03-06 19:00:50 -03:00
William Buezas 44d7f98cdc Add item descriptor 2024-03-06 18:22:15 -03:00
William Buezas a828ac5954 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into EntryLatestBuysFilters 2024-03-06 18:08:02 -03:00
Javier Segarra d10c04d4f2 refs #6321 feat: change dialog header 2024-03-06 20:46:13 +01:00