0
0
Fork 0
Commit Graph

3180 Commits

Author SHA1 Message Date
Pablo Natek 0c3dc30b8c fix(styles): refs #7001 create VnTitle and correct background-page color 2024-03-12 09:49:58 +01:00
William Buezas 319295f2c2 Workers PDA 2024-03-11 16:53:33 -03:00
Jorge Penadés b44dcdb28a fix: refs #5186 tests 2024-03-11 15:17:49 +01:00
Jorge Penadés 3c3988b4f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-11 15:13:49 +01: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
Jorge Penadés 37f155aa85 fix: refs #5186 css, required files & routes 2024-03-11 10:06:11 +01:00
Jorge Penadés 33ef118dea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-11 09:32:30 +01:00
carlosfonseca 5ff90d127b Solucion a comentarios 33 2024-03-10 21:20:19 -05:00
Kevin Martinez 5011fd5f83 Create date and time utility 2024-03-10 21:41:36 -03:00
William Buezas 049e3c722a Fix translation 2024-03-08 15:09:28 -03:00
William Buezas ed99aea4a3 Finish create manual invoice popup form 2024-03-08 15:05:11 -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
William Buezas 0e79676f58 Create manual invoice WIP 2024-03-08 09:02:49 -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
Jorge Penadés 300e384f75 feat: refs #5186 add e2e 2024-03-08 10:32:41 +01: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
carlosfonseca c844d26ccb Solucion a comentarios 32 2024-03-07 20:45:52 -05:00
Kevin Martinez 1ab9bfefed Centralize roadmap add stop form 2024-03-07 20:37:14 -03:00
Jorge Penadés d8a0adb852 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-07 15:57:54 +01:00
carlosfonseca dc3b91032c Solucion a comentarios 31 2024-03-07 09:21:20 -05:00
Javier Segarra 764ccbd151 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6907_fix_input_clearable_hover 2024-03-07 14:25:33 +01:00
Javier Segarra baf01f6720 Merge branch 'test' into 6940_hotFix_cmrFilterPanel 2024-03-07 12:53:00 +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
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
Alex Moreno 212fe0e5b4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front 2024-03-07 07:57:32 +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
Javier Segarra 0dd89ec3f0 refs #6321 perf: rename files 2024-03-06 20:45:53 +01:00
Pablo Natek d549077ffa Merge pull request 'fix(ticket): refs #6486 add a and style to card headers' (!229) from 6486-fix-TicketHeaders into dev
Reviewed-on: verdnatura/salix-front#229
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-03-06 13:48:01 +00:00
Pablo Natek 00df197653 Merge branch 'dev' into 6486-fix-TicketHeaders 2024-03-06 13:27:52 +00:00
Pablo Natek 70dc144019 fix(ticket): refs #6486 add a and style to card headers 2024-03-06 14:28:33 +01:00
William Buezas fe8e4a8342 add VnSelectDialog refill to action icon 2024-03-06 09:52:43 -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
Alex Moreno 4443edd800 fix(claimSummary) header color 2024-03-06 13:45:02 +01:00