0
0
Fork 0
Commit Graph

2885 Commits

Author SHA1 Message Date
Guillermo Bonet b4462fcdb5 Merge branch 'dev' into 6968-groupingModeRefactor 2024-04-17 06:44:24 +00:00
Javier Segarra 248416b676 fix(lilium) #7180 SupplierList Scroll 2024-04-17 08:41:47 +02:00
William Buezas a397c6ed30 remove component import 2024-04-16 12:18:36 -03:00
William Buezas ba2499db9d resolve conflicts 2024-04-16 12:11:57 -03:00
William Buezas df2760ef60 Add dense attr to inputs 2024-04-16 11:49:59 -03:00
William Buezas 8e6538b369 Item request view 2024-04-16 11:47:15 -03:00
William Buezas 813bab4e9d manage QCalendar customization classes from wrapper 2024-04-16 10:47:16 -03:00
William Buezas e36949ad07 resolve conflicts 2024-04-16 10:11:03 -03:00
William Buezas c82f4652f5 Move capitalize header week day to wrapper 2024-04-16 09:44:52 -03:00
William Buezas 256461a5bb Change current day colors 2024-04-16 09:41:03 -03:00
William Buezas a808491c5e use the color of calendar background for the border of panel card 2024-04-16 09:37:31 -03:00
Alex Moreno 892c5986c0 Merge pull request 'fix: refs #6425 fixed dev translations' (!294) from 6425-fixDevTranslations into dev
Reviewed-on: verdnatura/salix-front#294
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-16 12:35:36 +00:00
Alex Moreno 4f286cd032 Merge branch 'dev' into 6425-fixDevTranslations 2024-04-16 12:32:46 +00:00
William Buezas 1577fb701b remove unused span 2024-04-16 09:30:17 -03:00
William Buezas 51eba2ea77 Add calendar wrapper 2024-04-16 09:28:48 -03:00
Alex Moreno 5d6a10050e Merge pull request 'WorkerCalendar' (!270) from hyervoni/salix-front-mindshore:WorkerCalendar into dev
Reviewed-on: verdnatura/salix-front#270
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-16 12:26:20 +00:00
William Buezas 2ab7a45114 resolve conflicts 2024-04-16 08:49:34 -03:00
William Buezas 5664ec1313 WIP 2024-04-16 08:21:44 -03:00
Javier Segarra adb31497e5 Merge branch 'dev' into 6907_fix_input_clearable_hover 2024-04-16 10:20:25 +00:00
Jon Elias b216112d2a refactor: refs #6425 fix failed tests 2024-04-16 11:42:43 +02:00
Guillermo Bonet 7b29832966 feat: refs #6968 Changed groupingMode to enum 2024-04-16 11:12:23 +02:00
Jon Elias 73c5a5b7d2 fix: refs #6425 fixed dev translations 2024-04-16 11:00:38 +02:00
Robert Ferrús 5feb4a21a5 Merge pull request 'feat: refs #6679 add icon' (!276) from 6679-addCreateIcon into dev
Reviewed-on: verdnatura/salix-front#276
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-04-16 07:38:35 +00:00
Robert Ferrús 81f29d815d Merge branch '6679-addCreateIcon' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon 2024-04-16 09:33:58 +02:00
Robert Ferrús 87ae6870a9 feat: refs #6679 add icon 2024-04-16 09:33:56 +02:00
Robert Ferrús 130869dcdb Merge branch 'dev' into 6679-addCreateIcon 2024-04-16 07:30:27 +00:00
Jorge Penadés c2048afb53 Merge pull request '#6938 hide personal phone' (!290) from 6938-hideWorkerPhone into dev
Reviewed-on: verdnatura/salix-front#290
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-16 06:38:56 +00:00
Robert Ferrús d178d7dc6a feat: refs #6679 add icon 2024-04-16 08:04:57 +02:00
Robert Ferrús d70da976c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon 2024-04-16 08:04:23 +02:00
Pablo Natek c65c09c39c feat(agency): refs #4988 add agency router and sections 2024-04-16 07:45:33 +02:00
Guillermo Bonet 46fa06cf1e feat: refs #6724 Restriction QCheckbox entry isBooked 2024-04-16 07:14:00 +02:00
William Buezas 00dfa171b0 WIP 2024-04-15 15:37:41 -03:00
Guillermo Bonet de68af5e13 feat: refs #6724 Disabled QCheckbox entry isBooked 2024-04-15 14:17:23 +02:00
William Buezas d9d868a6af Waste breakdown 2024-04-15 09:02:35 -03:00
William Buezas c50741b4bf Remove single quotes 2024-04-15 08:51:48 -03:00
William Buezas fcce2b5070 Add filter 2024-04-15 08:46:26 -03:00
Jorge Penadés b2211369ea fix: refs #6938 remove personal phone 2024-04-15 13:30:42 +02:00
Jorge Penadés 1e77e82784 fix: refs #6938 id filter 2024-04-15 13:28:10 +02:00
Robert Ferrús 058ddc8e9a feat: refs #6500 2024-04-15 13:18:39 +02:00
Javier Segarra e1716b9ea4 Merge branch 'dev' into 6907_fix_input_clearable_hover 2024-04-15 13:11:21 +02:00
Jorge Penadés 68069ba9c6 feat: refs #6938 hide personal phone 2024-04-15 12:48:07 +02:00
Alex Moreno f176312163 feat(VnNotes): refs #6336 better design 2024-04-15 12:28:43 +02:00
Alex Moreno fe13125085 Merge pull request 'feat(supplierSummary): refs #6898 use VnTitle' (!289) from 6898-supplierSummary_use_VnTitle into test
Reviewed-on: verdnatura/salix-front#289
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-04-15 09:56:01 +00:00
Alex Moreno 6e0510f0bd feat(supplierSummary): refs #6898 use VnTitle 2024-04-15 08:58:39 +02:00
Alex Moreno 4efe09722f refs #6336 feat(claim): improvements 2024-04-15 08:40:15 +02:00
William Buezas 9c7c98d64d Merge with dev 2024-04-12 16:55:51 -03:00
William Buezas 2699040f0e Item request view 2024-04-12 16:50:41 -03:00
William Buezas 5f46ad225e Fix genus and specie value 2024-04-12 10:44:56 -03:00
William Buezas 92429295cd more translations 2024-04-12 10:44:25 -03:00
William Buezas 4d418c9cb7 Pull new traduction yml files and add translations 2024-04-12 10:32:19 -03:00