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

9422 Commits

Author SHA1 Message Date
Alex Moreno 16ca18c945 Merge pull request 'fix: refs #8347 remove skip, fix unpaid' (!1273) from 8347-fixCustomerUnpaidTest into dev 
Reviewed-on: verdnatura/salix-front#1273
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-24 10:28:57 +00:00
Alex Moreno 4476df4608 Merge branch 'dev' into 8347-fixCustomerUnpaidTest 2025-01-24 10:28:04 +00:00
Alex Moreno ae96349cff Merge branch 'dev' of https: refs #8316//gitea.verdnatura.es/verdnatura/salix-front into 8316-invoiceInCardWithVnCardBeta 2025-01-24 10:39:41 +01:00
Alex Moreno a8a74cdb48 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1146) from 8316-invoiceOutCardWithVnCardBeta into dev 
Reviewed-on: verdnatura/salix-front#1146
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-24 09:35:18 +00:00
Alex Moreno 28905063b2 fix: refs #8316 filter 2025-01-24 10:34:01 +01:00
Alex Moreno 661f7bacd6 Merge branch 'dev' of https: refs #8316//gitea.verdnatura.es/verdnatura/salix-front into 8316-invoiceOutCardWithVnCardBeta 2025-01-24 10:28:20 +01:00
Alex Moreno cfcbb8bce5 Merge pull request 'refactor: #8322 changed Travel component to use VnSection/VnCardBeta' (!1220) from 8322-travel into dev 
Reviewed-on: verdnatura/salix-front#1220
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-24 09:14:18 +00:00
Alex Moreno 1dc19a6eaa fix: refs #8322 filter and params 2025-01-24 10:11:30 +01:00
Alex Moreno 6ff1ae96d5 Merge branch 'dev' into 8322-travel 2025-01-24 09:04:53 +00:00
Alex Moreno cbf7ef7ccf Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1150) from 8316-parkingCardWithVnCardBeta into dev 
Reviewed-on: verdnatura/salix-front#1150
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-24 09:04:05 +00:00
Alex Moreno c6f613c5e5 fix: refs #8316 redirections 2025-01-24 10:02:23 +01:00
Robert Ferrús 2ee3ba5251 Merge branch 'dev' into 6822-createEntryTransferOption 2025-01-24 08:31:13 +00:00
Alex Moreno 221dda174a Merge branch 'dev' into 8316-parkingCardWithVnCardBeta 2025-01-24 08:08:25 +00:00
Alex Moreno 10448b9d77 Merge pull request 'refactor: refs #8316 used VnSection and VnBetaCard' (!1147) from 8316-itemCardWithVnCardBeta into dev 
Reviewed-on: verdnatura/salix-front#1147
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-24 08:06:47 +00:00
Alex Moreno 6e588278d8 Merge branch 'dev' into 8316-itemCardWithVnCardBeta 2025-01-24 08:05:49 +00:00
Alex Moreno 1455d8ce02 fix: refs #8316 filter 2025-01-24 09:04:01 +01:00
Alex Moreno e38e9b1dd7 fix: refs #8316 filter 2025-01-24 09:01:54 +01:00
Alex Moreno 8e3fad60c0 fix: refs #8316 icon 2025-01-24 08:59:47 +01:00
Carlos Satorres 227d3a8c88 fix: refs #8352 fix rightPanel vnLog 2025-01-24 08:59:12 +01:00
Jon Elias 26bc5401f1 Merge pull request '#8339 - fix_preview' (!1277) from 8339_fix_preview into dev 
Reviewed-on: verdnatura/salix-front#1277
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-01-24 07:55:19 +00:00
Javier Segarra a3acb3b190 Merge branch 'dev' into 8339_fix_preview 2025-01-24 07:51:20 +00:00
Alex Moreno 55d86d3153 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-24 08:40:50 +01:00
Alex Moreno e6279ff261 build: merge master in test 2025-01-24 08:38:24 +01:00
Alex Moreno d0176303da Merge pull request 'fix: order when is string' (!1279) from hotFix_fixOrderStringArray into master 
Reviewed-on: verdnatura/salix-front#1279
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-24 07:32:58 +00:00
Javier Segarra 2c6d3de784 Merge branch 'master' into hotFix_fixOrderStringArray 2025-01-24 07:25:46 +00:00
Javier Segarra c61e4d30f6 Merge pull request 'Replace GoToUser by NewOrder from CustomerDescriptor' (!1276) from hotfix_customerDescriptor_orderBtn into master 
Reviewed-on: verdnatura/salix-front#1276
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-01-24 07:24:59 +00:00
Alex Moreno 5b448e5bb3 fix: order when is string 2025-01-24 08:24:12 +01:00
Jose Antonio Tubau 878845627a Merge branch 'dev' into 7322-addSelectAddressOnTicketTransfer 2025-01-24 07:20:31 +00:00
Javier Segarra f0dc7b4a41 fix: import component 2025-01-24 08:19:53 +01:00
Javier Segarra bddfd91de1 perf: refs #8339 minor changes 2025-01-24 08:09:48 +01:00
Javier Segarra d9cc35280b feat: refs #8339 define global.spreview 2025-01-24 08:09:31 +01:00
Javier Segarra 58fd5a8326 perf: refs #8339 removew preview tag 2025-01-24 08:09:14 +01:00
Alex Moreno 23e1a58f28 fix: refs #8316 advanced-menu 2025-01-24 07:32:02 +01:00
Alex Moreno e53990d880 Merge branch 'dev' into 8316-itemCardWithVnCardBeta 2025-01-24 06:19:26 +00:00
Jon Elias 3a20752ed3 Merge branch '7317-SupplierWarnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 7317-SupplierWarnings 2025-01-24 07:13:49 +01:00
Jon Elias 2298d4582f Merge branch 'dev' of https: refs #7317//gitea.verdnatura.es/verdnatura/salix-front into 7317-SupplierWarnings 2025-01-24 07:13:39 +01:00
Javier Segarra d5ea4fb46d perf: eslint 2025-01-24 00:26:31 +01:00
Javier Segarra 00c90b29e9 fix: remove "Go to module index" i18n value 2025-01-24 00:24:19 +01:00
Javier Segarra f4adedb4f1 fix: replace GoToUser by NewOrder 2025-01-24 00:23:31 +01:00
Jon Elias 867ac12042 Merge branch 'dev' into 8120-CompactSummaryPopup 2025-01-23 15:41:39 +00:00
Jon Elias 3453e1007b fix: refs #8120 ticket descriptor & summary 2025-01-23 16:40:22 +01:00
Jon Elias c59bc170a6 refactor: refs #8351 put appropriate name 2025-01-23 16:07:04 +01:00
Jon Elias b67a6d5d75 refactor: refs #8351 deleted skip and fixed TicketList e2e 2025-01-23 15:49:00 +01:00
Jose Antonio Tubau 5bb165757a Merge pull request 'test: refs #7073 add unit tests for VnDms component' (!1198) from 7073-createTestToVnDms into dev 
Reviewed-on: verdnatura/salix-front#1198
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-23 13:55:32 +00:00
Jose Antonio Tubau 9b3ebff1c7 Merge branch 'dev' into 7073-createTestToVnDms 2025-01-23 13:54:31 +00:00
Jose Antonio Tubau ff6e1c178d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7322-addSelectAddressOnTicketTransfer 2025-01-23 14:43:54 +01:00
Jose Antonio Tubau 99df3c5df2 refactor: refs #7322 extract repeated functions and create tests 2025-01-23 14:28:21 +01:00
Jon Elias ac998d33aa feat: refs #8409 added VnSelectSupplier 2025-01-23 14:03:47 +01:00
Javier Segarra 31a5dd653c fix: refs #7826 init 2025-01-23 13:49:21 +01:00
Carlos Satorres c77a462cb6 fix: refs #8347 remove skip, fix unpaid 2025-01-23 13:34:09 +01:00