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

3424 Commits

Author SHA1 Message Date
Alex Moreno 75f3d4f410 fix: refs #6539 VnSelect use url 2024-05-17 14:32:39 +02:00
Carlos Satorres 488c6b3f94 Merge branch '7396-addBasicDataWorker' of https://gitea.verdnatura.es/verdnatura/salix-front into 7396-addBasicDataWorker 2024-05-17 14:23:02 +02:00
Carlos Satorres d359063e5d refs #7396 fix summary 2024-05-17 14:23:00 +02:00
Javier Segarra ce444c7e5c first approach 2024-05-17 14:19:29 +02:00
Carlos Satorres cd21d7817d refs #7396 fix summary basicData 2024-05-17 14:16:06 +02:00
Javier Segarra 41e2462b49 Merge branch 'dev' into 6957_refactorFetechedTags 2024-05-17 11:58:38 +00:00
Javier Segarra 08e6703853 style updates 2024-05-17 13:57:01 +02:00
Javier Segarra 24eeb5519a style updates 2024-05-17 13:52:45 +02:00
Carlos Satorres d7e3303d68 refs #7396 add fiDueDate, machine 2024-05-17 13:19:59 +02:00
Carlos Satorres 2c41c31b6f Merge pull request '6914-fixWorkerCreateErrors' (!380) from 6914-fixWorkerCreateErrors into dev 
Reviewed-on: verdnatura/salix-front#380
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-17 11:18:31 +00:00
Carlos Satorres 067df2d56b Merge branch 'dev' into 6914-fixWorkerCreateErrors 2024-05-17 11:15:25 +00:00
Javier Segarra 49b562ca44 Merge branch 'dev' into feature/UpcomingDeliveries 2024-05-17 12:30:55 +02:00
Javier Segarra 8e4c74c1cc fix: style 2024-05-17 12:26:45 +02:00
Pablo Natek 676e020928 fix: refs #6095 add reFfk null on search 2024-05-17 10:55:43 +02:00
Jon Elias 8b835e299b Merge branch 'dev' into 7361-TicketSummaryRefactor 2024-05-17 08:31:52 +00:00
Jon Elias d754e5efce Merge branch '7361-TicketSummaryRefactor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7361-TicketSummaryRefactor 2024-05-17 10:30:51 +02:00
Jon Elias 4ca7df5bfb refactor: refs #7361 changes in css 2024-05-17 10:30:50 +02:00
Javier Segarra 01ad6d9bea Merge branch 'dev' into feature/ZoneDelivery 2024-05-17 09:52:21 +02:00
Javier Segarra dc597f73e2 fix: style 2024-05-17 09:50:18 +02:00
Pablo Natek b704692f3f Merge branch '7187-refactorWokerPda' of https://gitea.verdnatura.es/verdnatura/salix-front into 7187-refactorWokerPda 2024-05-17 08:55:07 +02:00
Pablo Natek e8ba975be2 fix: spec name 2024-05-17 08:55:07 +02:00
Javier Segarra dba42a6001 feat: #6957: Rename FetchedTags instance tag 2024-05-16 23:02:49 +02:00
Javier Segarra 38d7c96c00 feat: #6957: Rename FetchedTags instance tag 2024-05-16 23:01:55 +02:00
Javier Segarra 77a454b590 feat: refactor template 2024-05-16 20:59:51 +00:00
Carlos Satorres 660577c9fe refs #6914 fix vnLocation workerCreate 2024-05-16 16:02:38 +02:00
Jorge Penadés 475f0eda48 Merge pull request '#6891 fix: hide across only on disable' (!379) from 6891-fixSearchbar into dev 
Reviewed-on: verdnatura/salix-front#379
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-05-16 13:15:09 +00:00
Carlos Satorres b19d9ec473 refs #6914 fix VnLocationCountry 2024-05-16 14:18:41 +02:00
Pablo Natek a5dd7c817e Merge branch 'dev' into 7187-refactorWokerPda 2024-05-16 12:08:51 +00:00
Pablo Natek 108533d475 fix: delete translates 2024-05-16 12:57:35 +02:00
Jorge Penadés 2855499148 fix: refs #6891 hide across only on disable 2024-05-16 12:07:47 +02:00
Jorge Penadés 0854fa67a8 Merge pull request '#7281 solve terminal warnings' (!376) from 7281-solveTerminalWarnings into dev 
Reviewed-on: verdnatura/salix-front#376
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-05-16 07:19:16 +00:00
Jorge Penadés d4cbdb469a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7281-solveTerminalWarnings 2024-05-16 09:06:48 +02:00
Jorge Penadés 1654fb93d4 fix: refs #6598 build 2024-05-16 09:06:12 +02:00
Jorge Penadés 03553dd9bc Merge pull request '#7274 fixCustomer' (!374) from 7274-fixCustomer into dev 
Reviewed-on: verdnatura/salix-front#374
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-16 07:05:01 +00:00
Jorge Penadés 288f776c9c Merge branch 'dev' into 7274-fixCustomer 2024-05-16 07:01:08 +00:00
Jorge Penadés ed9310cbb1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7281-solveTerminalWarnings 2024-05-16 08:58:00 +02:00
Alex Moreno cf16db2e33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-05-16 08:52:03 +02:00
Alex Moreno c7cb591008 warmFix(customerFiscalData): fix vnRows 2024-05-16 08:52:02 +02:00
Robert Ferrús f4053b5d7c Merge pull request 'feat: refs #7039 country change column country - name' (!326) from 7039-country-country into dev 
Reviewed-on: verdnatura/salix-front#326
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-16 06:50:45 +00:00
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