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

3688 Commits

Author SHA1 Message Date
Robert Ferrús ca5cf66f56 Merge branch 'dev' into 7039-country-country 2024-05-16 06:46:32 +00:00
Carlos Satorres 4a4550351d Merge pull request '6905-fixUserPanel2' (!375) from 6905-fixUserPanel2 into dev 
Reviewed-on: verdnatura/salix-front#375
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-16 06:20:58 +00:00
Carlos Satorres 8b86846530 Merge branch 'dev' into 6905-fixUserPanel2 2024-05-16 06:18:49 +00:00
Robert Ferrús b7fce0917e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7039-country-country 2024-05-16 07:29:07 +02:00
Jon Elias 6603c81aa3 Merge branch 'dev' into 7361-TicketSummaryRefactor 2024-05-16 05:18:13 +00:00
Pablo Natek c24062fccb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7187-refactorWokerPda 2024-05-15 22:18:40 +02:00
Pablo Natek bc9c1fdf8e feat: pda duplicates 2024-05-15 22:17:40 +02:00
Carlos Satorres adde8d1ab8 refs #6332 fix colors 2024-05-15 16:00:56 +02:00
Jorge Penadés 3cb02d5e5f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7281-solveTerminalWarnings 2024-05-15 15:42:13 +02:00
Jorge Penadés 662dfb15a4 Merge pull request '#6891 showRightSideFilterPanel' (!353) from 6891-showRightSideFilterPanel into dev 
Reviewed-on: verdnatura/salix-front#353
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-15 13:39:22 +00:00
Jorge Penadés 185b9daa25 Merge branch 'dev' into 6891-showRightSideFilterPanel 2024-05-15 13:38:31 +00:00
William Buezas 5677a1af1b remove unused onMounted 2024-05-15 10:31:33 -03:00
William Buezas f3a5ebbcec Bug fix 2024-05-15 10:27:45 -03:00
William Buezas cd8095d3b8 Last changes 2024-05-15 09:39:15 -03:00
Jon Elias e766bdfdfb Merge branch 'dev' into 7361-TicketSummaryRefactor 2024-05-15 12:35:59 +00:00
Jon Elias 5e3fca3f81 Merge branch '7361-TicketSummaryRefactor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7361-TicketSummaryRefactor 2024-05-15 14:35:09 +02:00
Jon Elias ccaf993841 refactor: refs #7361 requested changes 2024-05-15 14:35:08 +02:00
Jorge Penadés 0b59206caa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7281-solveTerminalWarnings 2024-05-15 14:32:39 +02:00
Jorge Penadés 628fc888ba fix: refs #7281 fix warnings 2024-05-15 14:31:51 +02:00
Jorge Penadés bf43893b05 fix: refs #7274 use VnInputDate 2024-05-15 14:06:42 +02:00
Alex Moreno d99ef43e0d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-05-15 13:54:01 +02:00
Carlos Satorres 0819d00d05 refs #6905 fix pr 2024-05-15 12:55:39 +02:00
Jorge Penadés 872aee51ca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel 2024-05-15 12:34:21 +02:00
Jorge Penadés 2eca98d31d feat: refs #7274 show total on rightMenu 2024-05-15 11:54:14 +02:00
Carlos Satorres 942efc319a refs #6905 fix userState 2024-05-15 11:46:04 +02:00
Jorge Penadés 31573c0f0b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7274-fixCustomer 2024-05-15 11:22:23 +02:00
Jon Elias fef2704f3c Merge branch 'dev' into 6464-fixNegativeBases 2024-05-15 09:21:32 +00:00
Jon Elias 77f058944a style: refs #6464 changed checkbox and qbtn styles 2024-05-15 11:20:45 +02:00
Jorge Penadés 546a5150ae fix: refs #7274 fix duplicate rows 2024-05-15 10:39:59 +02:00
Carlos Satorres a3f074ea0a refs #6905 fix data 2024-05-15 10:13:49 +02:00
Javier Segarra 9b64a82a71 Merge pull request 'Zone create' (!371) from hyervoni/salix-front-mindshore:feature/ZoneCreate into dev 
Reviewed-on: verdnatura/salix-front#371
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-05-15 07:49:35 +00:00
Alex Moreno 2b27e39d72 fix: zone icon and isVolumetric default false 2024-05-15 09:37:33 +02:00
Jorge Penadés 7e66fc38ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases 2024-05-15 09:06:47 +02:00
Jon Elias b97f7e6b42 6464 2024-05-15 09:05:29 +02:00
Jorge Penadés 9d9d3db43b fix: refs #7274 defaulterFilter 2024-05-14 17:29:15 +02:00
William Buezas cbe44c97f6 Upcoming deliveries 2024-05-14 12:03:43 -03:00
Jorge Penadés e4637b7d15 fix: refs #7274 add note 2024-05-14 14:39:55 +02:00
Jorge Penadés a6c761c031 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_Customer_1 2024-05-14 13:42:38 +02:00
Jorge Penadés 90a9a7dcc7 fix: refs #6891 fix invoiceIntrastat test 2024-05-14 13:07:29 +02:00
Jorge Penadés 189c3e0218 fix: refs #6891 fix invoiceInVat test 2024-05-14 13:00:03 +02:00
Jorge Penadés a095670ff1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel 2024-05-14 12:42:14 +02:00
Javier Segarra fc6bd82ea0 Merge branch 'dev' into feature/ZoneCreate 2024-05-14 11:52:29 +02:00
Javier Segarra 19bdd4fc36 Merge pull request 'feat: refs #7271 basicData and Log' (!369) from 7271-EndZoneMigration into dev 
Reviewed-on: verdnatura/salix-front#369
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-05-14 09:49:20 +00:00
Javier Segarra f4dd9b84fd fix: VnLocation > fiscal-data 2024-05-14 11:42:34 +02:00
Javier Segarra cb40505f82 fix: VnLocation > workercreate 2024-05-14 11:11:28 +02:00
Javier Segarra c443b0a00f feat: input validations 2024-05-14 10:50:29 +02:00
Javier Segarra 20f9b53afb Merge branch 'dev' into 7271-EndZoneMigration 2024-05-14 10:42:43 +02:00
Javier Segarra fa82efe5d2 fix: limit width some fields 2024-05-14 10:41:28 +02:00
Javier Segarra 289bdeecae fix: Workers/isActive 2024-05-14 10:41:07 +02:00
jcasado bdfafe9319 Merge branch '6911-saveOnEnter' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter 2024-05-14 08:49:19 +02:00