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

11351 Commits

Author SHA1 Message Date
Jose Antonio Tubau d096c34943 Merge branch 'dev' into 8619-fixRouteExtendedListTest 2025-03-05 09:59:54 +00:00
Pau Rovira 07055dcfec Merge pull request 'feat: #8612 changed shelving to VnTable & created e2e tests' (!1432) from 8612-shelvinge2e into dev 
Reviewed-on: verdnatura/salix-front#1432
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-03-05 07:42:34 +00:00
Pau Rovira e87d99f408 Merge branch 'dev' into 8612-shelvinge2e 2025-03-05 07:27:24 +00:00
Pau Rovira 14d782dff0 Merge pull request 'fix: #8417 fixed claimPhoto e2e test' (!1512) from 8417-e2eClaimPhoto into dev 
Reviewed-on: verdnatura/salix-front#1512
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-03-05 07:26:54 +00:00
Pau Rovira 4d1613d587 Merge branch 'dev' into 8417-e2eClaimPhoto 2025-03-05 06:42:32 +00:00
Alex Moreno 520e5060db Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-05 07:40:19 +01:00
Alex Moreno 322333e7fb Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-05 07:40:13 +01:00
Alex Moreno f030fcd8b7 fix(CustomerDescriptor): reposition isFreezed icon for better visibility 2025-03-05 07:40:07 +01:00
Alex Moreno 094edb6796 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-05 07:37:06 +01:00
Alex Moreno a1d69149f2 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-05 07:36:57 +01:00
Alex Moreno fa8e8a7d4d fix(CustomerDescriptor): isFreezed icon 2025-03-05 07:35:53 +01:00
Pau Rovira 240d436c32 Merge branch 'dev' into 8612-shelvinge2e 2025-03-05 06:01:26 +00:00
Javier Segarra e80813598c Merge branch 'dev' into 8417-e2eClaimPhoto 2025-03-04 18:56:33 +00:00
Jose Antonio Tubau 0518a780d1 Merge branch 'dev' into 8619-fixRouteExtendedListTest 2025-03-04 18:22:55 +00:00
Alex Moreno b7b9dbb4d7 build: init version 2025-03-04 15:10:50 +01:00
Alex Moreno 5f0f9e6475 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-04 15:10:09 +01:00
Alex Moreno 49140b5fe6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-04 15:08:18 +01:00
Alex Moreno 3a099084b4 Merge pull request '8714-devToTest' (!1547) from 8714-devToTest into test 
Reviewed-on: verdnatura/salix-front#1547
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-03-04 14:08:01 +00:00
Jon Elias 57de2466c2 Merge pull request '#8370: Change year param rely on month' (!1326) from 8370-WorkerTimeControl into dev 
Reviewed-on: verdnatura/salix-front#1326
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-04 14:00:38 +00:00
Pau Rovira 43e81096fc Merge branch '8417-e2eClaimPhoto' of https: refs #8417//gitea.verdnatura.es/verdnatura/salix-front into 8417-e2eClaimPhoto 2025-03-04 14:21:32 +01:00
Pau Rovira 2831dfc95b fix: refs #8417 fixed invoiceOutSummary e2e test 2025-03-04 14:20:28 +01:00
Pau Rovira 33c57531ed Merge branch 'dev' into 8417-e2eClaimPhoto 2025-03-04 13:09:06 +00:00
Alex Moreno 41f36de827 feat(Jenkinsfile): refs #8714 add CHANGE_TARGET environment variable logging 2025-03-04 13:53:50 +01:00
Jon Elias fe4225d814 Merge pull request 'Hotfix[ZoneBasicData]: Fixed distribution point options' (!1548) from Hotfix-ZoneBasicDataDistributionPoint into master 
Reviewed-on: verdnatura/salix-front#1548
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-04 12:41:04 +00:00
Jon Elias 66d9d5f760 Merge branch 'master' into Hotfix-ZoneBasicDataDistributionPoint 2025-03-04 12:39:57 +00:00
Jon Elias a9f27b4e52 fix: fixed distribution point options and e2e 2025-03-04 13:37:50 +01:00
Alex Moreno cf82a04942 Merge branch 'dev' into 8370-WorkerTimeControl 2025-03-04 12:33:18 +00:00
Alex Moreno 6b578b147d test(invoiceOutSummary): skip ticket list test 2025-03-04 12:34:11 +01:00
Alex Moreno 56e65aee4a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-04 12:04:56 +01:00
Alex Moreno 849d1b889a fix(TicketDescriptor): fix risk, adding client credit 2025-03-04 12:03:00 +01:00
Javier Segarra edfbeca915 Merge pull request 'fix: add order and sortBy' (!1541) from hotfix_agencyModes_sortBy into master 
Reviewed-on: verdnatura/salix-front#1541
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-03-04 10:35:44 +00:00
Jorge Penadés 5276dbee62 Merge pull request 'feat: refs #6919 add additional fields to filter options' (!1543) from 6919-hotfix-supplierFilter into master 
Reviewed-on: verdnatura/salix-front#1543
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-03-04 10:33:34 +00:00
Jorge Penadés 14cae9de45 feat: refs #6919 add additional fields to filter options 2025-03-04 11:31:16 +01:00
Jon Elias 50e3669655 Merge branch 'dev' into 8370-WorkerTimeControl 2025-03-04 10:26:57 +00:00
Jon Elias 4e5a698e94 refactor: refs #8370 modified function to get the correct date 2025-03-04 11:21:42 +01:00
Javier Segarra 9425e3e9bd Merge branch 'master' into hotfix_agencyModes_sortBy 2025-03-04 10:20:55 +00:00
Javier Segarra f317497ebd Merge pull request 'hotfix ctrlClick_vntable2' (!1542) from hotfix_ctrlClick_vntable2 into master 
Reviewed-on: verdnatura/salix-front#1542
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2025-03-04 10:20:37 +00:00
Javier Segarra 856ec7f6a5 feat: define rowCtrlClick 2025-03-04 11:16:08 +01:00
Javier Segarra 3d0e25f8de feat: define prop 2025-03-04 11:15:21 +01:00
Pau Rovira fa50108a96 fix: refs #8417 fixed claimPhoto e2e 2025-03-04 11:08:52 +01:00
Pau Rovira e59270848b Merge branch 'dev' into 8612-shelvinge2e 2025-03-04 09:14:00 +00:00
Pau Rovira 32e7a56cf2 Merge branch 'dev' into 8417-e2eClaimPhoto 2025-03-04 08:40:29 +00:00
Pau Rovira ae274ec004 Merge branch '8417-e2eClaimPhoto' of https://gitea.verdnatura.es/verdnatura/salix-front into 8417-e2eClaimPhoto 2025-03-04 09:39:41 +01:00
Pau Rovira 377e31a4bc fix: refs #8417 fixed e2e test case 2025-03-04 09:39:37 +01:00
Alex Moreno fd75613b52 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-04 09:36:15 +01:00
Javier Segarra 7e174a4306 Merge branch 'master' into hotfix_agencyModes_sortBy 2025-03-04 09:33:30 +01:00
Alex Moreno 8faf1aa97c fix(VnNotes): simplify attribute handling by removing unnecessary computed property 2025-03-04 09:29:50 +01:00
Alex Moreno f5204ed2fa fix(TicketProblems): update risk condition to use hasRisk property 2025-03-04 09:11:21 +01:00
Alex Moreno 71dd5fc73d fix(TicketProblems): handle null credit value in risk calculation 2025-03-04 09:05:59 +01:00
Pau Rovira c680e20a08 Merge branch 'dev' into 8417-e2eClaimPhoto 2025-03-04 07:55:48 +00:00