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

8761 Commits

Author SHA1 Message Date
Javier Segarra 6965c5ea78 Merge branch 'dev' into update_quasar_version 2025-01-20 08:57:16 +00:00
Javier Segarra 06d42ca876 feat: downgrade pnpm 2025-01-20 09:56:32 +01:00
Jon Elias ad2e502010 fix: move dialog to descriptorMenu 2025-01-20 08:44:48 +01:00
Jon Elias b447df7217 Merge pull request 'Hotfix: Redirect to Ticketsale when confirming an order' (!1245) from Hotfix-RedirectOrderToTicketSale into master 
Reviewed-on: verdnatura/salix-front#1245
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-20 07:07:30 +00:00
Jon Elias ed0e4fadf8 Merge branch 'master' into Hotfix-RedirectOrderToTicketSale 2025-01-20 07:06:14 +00:00
Javier Segarra 7b42fac56c Merge branch 'dev' into warning_defaultValue_firstParam 2025-01-20 07:05:01 +00:00
Jon Elias 3b9ccab48c fix: redirect to Ticketsale when confirming an order 2025-01-20 08:01:46 +01:00
PAU ROVIRA ROSALENY c43a8d0a38 Merge pull request 'feat: #8258 added uppercase option to VnInput' (!1184) from 8258-uppercaseInputs into dev 
Reviewed-on: verdnatura/salix-front#1184
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-01-20 06:01:32 +00:00
PAU ROVIRA ROSALENY c4cf372333 Merge branch 'dev' into 8258-uppercaseInputs 2025-01-17 13:54:22 +00:00
PAU ROVIRA ROSALENY dd88598072 Merge branch 'dev' into 8395-invoiceInVatTotal 2025-01-17 13:23:18 +00:00
PAU ROVIRA ROSALENY 57804f9f2d feat: refs #8395 added total column in invoiceInVat 2025-01-17 14:08:36 +01:00
Javier Segarra 238817285d perf: remove warning default value 2025-01-17 12:35:14 +00:00
Jon Elias 9d35dc08dd Merge pull request 'Fix: Redirect when confirming lines' (!1236) from Fix-RedirectOrderToTicketSale into dev 
Reviewed-on: verdnatura/salix-front#1236
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-17 12:21:32 +00:00
PAU ROVIRA ROSALENY 6d4405c1fe Merge branch 'dev' into 8258-uppercaseInputs 2025-01-17 12:19:46 +00:00
PAU ROVIRA ROSALENY 32909a96bd feat: refs #8258 added uppercase validation on supplier create 2025-01-17 13:19:12 +01:00
Jon Elias 63f433a6d3 Merge branch 'dev' into Fix-RedirectOrderToTicketSale 2025-01-17 12:09:37 +00:00
Jon Elias e1a395b015 refactor: redirect using params 2025-01-17 13:07:30 +01:00
Jose Antonio Tubau dac99dc132 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1144) from 8316-entryCardWithVnCardBeta into dev 
Reviewed-on: verdnatura/salix-front#1144
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-17 11:49:15 +00:00
Javier Segarra 92311accb0 Merge branch 'master' into hotfix_checbox_css 2025-01-17 12:33:37 +01:00
Javier Segarra 7994f3c791 fix: remove departmentCode 2025-01-17 11:13:37 +00:00
Jose Antonio Tubau 3305bb4222 Merge branch 'dev' into 8380-createTestToVnImg 2025-01-17 10:33:08 +00:00
Javier Segarra 179f5a684f Merge branch 'dev' into 8197-fix_filters 2025-01-17 09:09:11 +00:00
Javier Segarra 04bbf9e9d7 Merge pull request 'HOTFIX: Add acl in description button' (!1231) from hotfix_ticketService_acl into master 
Reviewed-on: verdnatura/salix-front#1231
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-01-17 09:05:46 +00:00
Jose Antonio Tubau 872cf63b5f Merge branch 'dev' into 8316-entryCardWithVnCardBeta 2025-01-17 08:21:17 +00:00
Jose Antonio Tubau c2cbcb3309 refactor: refs #8316 add new localization keys and update existing ones for entry components 2025-01-17 08:58:25 +01:00
PAU ROVIRA ROSALENY 11e05433b8 Merge branch 'dev' into 8258-uppercaseInputs 2025-01-17 07:40:49 +00:00
PAU ROVIRA ROSALENY 6b3c510057 Merge pull request 'fix: #8243 fixed SkeletonSummary' (!1230) from 8243-arreglarSkeletonSummary into dev 
Reviewed-on: verdnatura/salix-front#1230
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2025-01-17 07:34:42 +00:00
Jon Elias 972b377e13 fix: redirect when confirming lines 2025-01-17 07:35:23 +01:00
Alex Moreno a738fe1579 Merge branch 'dev' into 8197-fix_filters 2025-01-17 06:16:53 +00:00
PAU ROVIRA ROSALENY 98cdf00c88 Merge branch 'dev' into 8243-arreglarSkeletonSummary 2025-01-17 06:16:36 +00:00
Alex Moreno 94c0cccb1e perf: refs #8197 default is object 2025-01-17 07:16:24 +01:00
Jon Elias b00e654fdd Merge pull request 'Fix: Redirect to TicketSale' (!1233) from Fix-RedirectToTicketSale into dev 
Reviewed-on: verdnatura/salix-front#1233
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-17 05:01:42 +00:00
Jorge Penadés fb530d8408 chore: refs #8198 rollback 2025-01-16 16:29:28 +01:00
Jorge Penadés b5ae3a1901 chore: refs #8198 rollback 2025-01-16 16:27:18 +01:00
Jorge Penadés 21bcfdc997 feat: skip tests 2025-01-16 16:20:02 +01:00
Alex Moreno d95350a8eb perf: refs #8197 fix and imrpove filters 2025-01-16 13:32:12 +01:00
Jon Elias eed895b21c fix: redirect to TicketSale from OrderLines 2025-01-16 13:25:00 +01:00
Jorge Penadés 31795ae40b test: refs #8198 skip tests 2025-01-16 12:51:35 +01:00
Javier Segarra 3ab3f146d4 feat: add acl in description button 2025-01-16 12:45:24 +01:00
PAU ROVIRA ROSALENY e0bf2db42e Merge branch 'dev' into 8243-arreglarSkeletonSummary 2025-01-16 11:41:04 +00:00
PAU ROVIRA ROSALENY 4b3c78dd65 fix: refs #8243 fixed SkeletonSummary 2025-01-16 12:40:28 +01:00
Jorge Penadés b89293a9a3 Merge pull request 'fix: refs #7936 allow negative values' (!1226) from 7936-hotfix-allowNegative into master 
Reviewed-on: verdnatura/salix-front#1226
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-16 11:37:55 +00:00
Alex Moreno 755fca504d Merge branch 'master' into 7936-hotfix-allowNegative 2025-01-16 11:06:49 +00:00
Pablo Natek cc7f16b635 Merge pull request 'fix: refs #8407 close date and time popups on keydown' (!1229) from 8407-fixVnInputDate into master 
Reviewed-on: verdnatura/salix-front#1229
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-01-16 11:01:35 +00:00
Pablo Natek 6c2fbea6d5 fix: refs #8407 close date and time popups on keydown 2025-01-16 11:59:08 +01:00
Jorge Penadés 39adfb3693 fix: refs #8198 update query param 2025-01-16 10:43:40 +01:00
Jorge Penadés 64c4729edb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8198-keepSectionFilter 2025-01-16 10:40:50 +01:00
Jorge Penadés ee66704a92 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-hotfix-allowNegative 2025-01-16 09:53:13 +01:00
Jorge Penadés e335322d5f fix: refs #7936 allow negative values 2025-01-16 09:45:15 +01:00
Jorge Penadés 6ca732986d Merge pull request 'hotfix: #7323 catch mail err' (!1225) from hotfix-7323-catchMailErr into master 
Reviewed-on: verdnatura/salix-front#1225
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-01-16 08:38:06 +00:00