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

12291 Commits

Author SHA1 Message Date
Jorge Penadés 25fce95265 Merge pull request '#8581 invoiceIn e2e' (!1452) from 8581-invoiceinE2e into dev 
Reviewed-on: verdnatura/salix-front#1452
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-20 08:57:59 +00:00
Jorge Penadés af3b64b86f fix: refs #8581 update test to check cardDescriptor_subtitle instead of descriptor_id 2025-03-20 08:59:41 +01:00
Jorge Penadés 5c0f519073 Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e 2025-03-20 08:59:35 +01:00
Jon Elias f9bb8d2a93 Merge pull request '#7869: Added include and exclude event from list' (!1574) from 7869-ModifyZones into dev 
Reviewed-on: verdnatura/salix-front#1574
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-03-20 07:39:08 +00:00
Jon Elias 5ec0da63f2 Merge branch 'dev' into 7869-ModifyZones 2025-03-20 07:01:41 +00:00
Alex Moreno edb3c0cbce Merge pull request '6994-vnLog_descriptors' (!1579) from 6994-vnLog_descriptors into dev 
Reviewed-on: verdnatura/salix-front#1579
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-03-20 06:58:19 +00:00
Alex Moreno 9f3c068245 Merge branch 'dev' into 6994-vnLog_descriptors 2025-03-20 06:46:07 +00:00
Alex Moreno 872d89339a Merge pull request 'feat: refs #6695 clean up Cypress screenshots and archive artifacts in Jenkins pipeline' (!1596) from 6695-artifacts into dev 
Reviewed-on: verdnatura/salix-front#1596
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2025-03-20 06:44:03 +00:00
Alex Moreno 72d1281bde Merge branch 'dev' into 6994-vnLog_descriptors 2025-03-20 06:20:13 +00:00
Alex Moreno ccbd624389 Merge branch 'dev' into 6695-artifacts 2025-03-20 06:19:16 +00:00
Alex Moreno 30d287bbf6 Merge pull request '5926-refactor_docuware' (!1613) from 5926-refactor_docuware into dev 
Reviewed-on: verdnatura/salix-front#1613
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-03-18 13:59:04 +00:00
Jorge Penadés f107684473 fix: refs #8581 update data-cy attribute concatenation in VnInputDate component 2025-03-18 14:21:16 +01:00
Alex Moreno 0160897030 Merge branch 'dev' into 5926-refactor_docuware 2025-03-18 13:20:00 +00:00
Alex Moreno c55304e1d2 refactor: refs #5926 simplify sendDocuware function to accept multiple tickets 2025-03-18 12:32:25 +01:00
Jorge Penadés 6e801e8f64 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e 2025-03-18 11:49:02 +01:00
Jose Antonio Tubau d698275ba2 Merge pull request 'refactor: refs #8721 swap 'client' and 'street' columns' (!1608) from 8721-reorderColumnsRouteTickets into dev 
Reviewed-on: verdnatura/salix-front#1608
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-18 10:44:45 +00:00
Jose Antonio Tubau 6d1f1770dd Merge branch 'dev' into 8721-reorderColumnsRouteTickets 2025-03-18 10:32:13 +00:00
Jorge Penadés ce5be197ce Merge branch '8581-invoiceinE2e' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e 2025-03-18 11:27:37 +01:00
Jorge Penadés 7ed7a38df2 fix: refs #8581 rollback 2025-03-18 11:27:35 +01:00
Jorge Penadés bfd62eaa54 Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e 2025-03-18 11:23:01 +01:00
Jose Antonio Tubau acbe0730bb refactor: refs #8721 swap 'client' and 'street' columns 2025-03-18 10:15:18 +01:00
Alex Moreno 25799cd1da build: init new version 2025-03-18 09:48:11 +01:00
Alex Moreno 6f87af39e4 fix: align Article label to the left in EntryBuys component 2025-03-18 09:47:13 +01:00
Alex Moreno ce430c6a8f chore: downgrade version from 25.14.0 to 25.12.0 in package.json 2025-03-18 09:46:16 +01:00
Pablo Natek be7350cd34 Merge pull request '8602-refatorAndCreateEntry' (!1584) from 8602-refatorAndCreateEntry into test 
Reviewed-on: verdnatura/salix-front#1584
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-18 08:41:58 +00:00
Pablo Natek 551967410f test: refs #8602 skip custom value dialog and order creation tests in OrderCatalog and OrderList 2025-03-18 09:28:14 +01:00
Pablo Natek 300d0aad22 Merge branch '8602-refatorAndCreateEntry' of https://gitea.verdnatura.es/verdnatura/salix-front into 8602-refatorAndCreateEntry 2025-03-18 09:00:38 +01:00
Pablo Natek 935ac752f5 test: refs #8602 skip ClaimDevelopment test suite 2025-03-18 09:00:36 +01:00
Pablo Natek 90c07d36cd Merge branch 'dev' into 8602-refatorAndCreateEntry 2025-03-18 07:40:23 +00:00
Alex Moreno 9014c148c5 build: init new version 2025-03-18 08:24:37 +01:00
Pablo Natek 96b4d9c51f refactor: refs #8602 remove redundant date input test from entryList.spec.js 2025-03-18 08:24:02 +01:00
Alex Moreno 99a40dba14 refactor: remove unnecessary login and reload calls in ClaimDevelopment tests 2025-03-18 08:12:31 +01:00
Jon Elias fdf3af0550 refactor: refs #7869 undo skip test 2025-03-18 08:12:15 +01:00
Pablo Natek 1961750c86 test: refs #8602 skip edit line and filter client tests in claimDevelopment and ticketList specs 2025-03-18 08:09:37 +01:00
Jon Elias ff39addd67 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7869-ModifyZones 2025-03-18 07:57:45 +01:00
Alex Moreno 22bdd0ef08 refactor: refs #5926 call Docuwares/upload-delivery-note 2025-03-18 07:17:33 +01:00
Jorge Penadés c8dafb65e4 Merge pull request 'fix: simplify menu structure in monitor router module' (!1602) from fix_monitor_leftMenu into dev 
Reviewed-on: verdnatura/salix-front#1602
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-03-17 16:32:00 +00:00
Jorge Penadés 43c15f141c Merge branch 'dev' into fix_monitor_leftMenu 2025-03-17 14:27:47 +00:00
Alex Moreno d744b22119 feat: integrate vue-router to enhance routing capabilities in ZoneCard component 2025-03-17 14:24:24 +01:00
Alex Moreno e0e15b3b3f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-17 14:05:48 +01:00
Alex Moreno 2b4a24a6af Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-17 14:04:02 +01:00
Alex Moreno 0b3130b4de feat: update URL generation in ZoneCard component to include route parameter 2025-03-17 14:03:23 +01:00
Pablo Natek 0ae4a98ea2 fix: refs #8602 delete unused entryDms and stockBought test files 2025-03-17 13:37:40 +01:00
Pablo Natek 53f7492d68 Merge branch 'dev' of https: refs #8602//gitea.verdnatura.es/verdnatura/salix-front into 8602-refatorAndCreateEntry 2025-03-17 13:36:29 +01:00
Jose Antonio Tubau e4b509c94d Merge pull request 'test: refs #8626 addTestCases' (!1422) from 8626-addTestCasesInRouteListTest into dev 
Reviewed-on: verdnatura/salix-front#1422
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-17 11:43:38 +00:00
Jorge Penadés 1c4421aaa2 refactor: refs #8581 remove unused checkNumber command from Cypress support 2025-03-17 12:18:30 +01:00
Jorge Penadés 260d3dd133 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e 2025-03-17 12:17:06 +01:00
Jose Antonio Tubau 02f3cbbf02 Merge branch 'dev' into 8626-addTestCasesInRouteListTest 2025-03-17 11:16:32 +00:00
Pablo Natek 64cee8b915 test: refs #8602 skip Logout test suite in logout.spec.js 2025-03-17 11:56:49 +01:00
Pablo Natek 2813322003 Merge branch '8602-refatorAndCreateEntry' of https://gitea.verdnatura.es/verdnatura/salix-front into 8602-refatorAndCreateEntry 2025-03-17 11:34:51 +01:00